diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000000..a6327de3b6 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,33 @@ +# Description + + + +## Type of change + + + +- [ ] Bug fix (non-breaking change which fixes an issue) +- [ ] New feature (non-breaking change which adds functionality) +- [ ] Printer definition file(s) +- [ ] Translations + +# How Has This Been Tested? + + + +- [ ] Test A +- [ ] Test B + +**Test Configuration**: +* Operating System: + +# Checklist: + + +- [ ] My code follows the style guidelines of this project as described in [UltiMaker Meta](https://github.com/Ultimaker/Meta) and [Cura QML best practices](https://github.com/Ultimaker/Cura/wiki/QML-Best-Practices) +- [ ] I have read the [Contribution guide](https://github.com/Ultimaker/Cura/blob/main/contributing.md) +- [ ] I have commented my code, particularly in hard-to-understand areas +- [ ] I have uploaded any files required to test this change \ No newline at end of file diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index 345fad2220..ebd51de1ac 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -134,7 +134,8 @@ jobs: version = tools.Version(tag) except ConanException: continue - if version > latest_branch_version: + if version > latest_branch_version and version < tools.Version("10.0.0"): + # FIXME: stupid old Cura tags 13.04 etc. keep popping up latest_branch_version = version latest_branch_tag = repo.tag(tag) diff --git a/.github/workflows/cura-all-installers.yml b/.github/workflows/cura-all-installers.yml index e8501875a8..34ccffe54b 100644 --- a/.github/workflows/cura-all-installers.yml +++ b/.github/workflows/cura-all-installers.yml @@ -1,5 +1,5 @@ name: Cura All Installers -run-name: ${{ inputs.cura_conan_version }} for Windows ${{ inputs.build_windows }}, MacOS ${{ inputs.build_macos }}, Linux ${{ inputs.build_linux }} +run-name: ${{ inputs.cura_conan_version }} for exe ${{ inputs.build_windows_exe }}, msi ${{ inputs.build_windows_msi }}, dmg ${{ inputs.build_macos }}, appimage ${{ inputs.build_linux }} - enterprise ${{ inputs.enterprise }} on: workflow_dispatch: @@ -34,8 +34,13 @@ on: default: true required: true type: boolean - build_windows: - description: 'Build for Windows' + build_windows_exe: + description: 'Build for Windows exe' + default: false + required: true + type: boolean + build_windows_msi: + description: 'Build for Windows msi' default: true required: true type: boolean @@ -55,8 +60,8 @@ on: - cron: '25 3 * * 1-5' jobs: - windows-installer-create: - if: ${{ inputs.build_windows }} + windows-installer-create-exe: + if: ${{ inputs.build_windows_exe }} uses: ./.github/workflows/cura-installer.yml with: platform: 'windows-2022' @@ -67,6 +72,22 @@ jobs: enterprise: ${{ inputs.enterprise }} staging: ${{ inputs.staging }} installer: ${{ inputs.installer }} + msi_installer: false + secrets: inherit + + windows-installer-create-msi: + if: ${{ inputs.build_windows_msi }} + uses: ./.github/workflows/cura-installer.yml + with: + platform: 'windows-2022' + os_name: 'win64' + cura_conan_version: ${{ inputs.cura_conan_version }} + conan_args: ${{ inputs.conan_args }} + conan_config: ${{ inputs.conan_config }} + enterprise: ${{ inputs.enterprise }} + staging: ${{ inputs.staging }} + installer: ${{ inputs.installer }} + msi_installer: true secrets: inherit linux-installer-create: @@ -81,6 +102,7 @@ jobs: enterprise: ${{ inputs.enterprise }} staging: ${{ inputs.staging }} installer: ${{ inputs.installer }} + msi_installer: false secrets: inherit linux-modern-installer-create: @@ -95,6 +117,7 @@ jobs: enterprise: ${{ inputs.enterprise }} staging: ${{ inputs.staging }} installer: ${{ inputs.installer }} + msi_installer: false secrets: inherit macos-installer-create: @@ -109,4 +132,5 @@ jobs: enterprise: ${{ inputs.enterprise }} staging: ${{ inputs.staging }} installer: ${{ inputs.installer }} + msi_installer: false secrets: inherit diff --git a/.github/workflows/cura-installer.yml b/.github/workflows/cura-installer.yml index 042bdb7c5b..52220783d5 100644 --- a/.github/workflows/cura-installer.yml +++ b/.github/workflows/cura-installer.yml @@ -44,6 +44,11 @@ on: default: true required: true type: boolean + msi_installer: + description: 'Create the msi' + default: false + required: true + type: boolean env: CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }} @@ -62,6 +67,8 @@ env: MACOS_CERT_USER: ${{ secrets.MACOS_CERT_USER }} GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }} MACOS_CERT_PASSPHRASE: ${{ secrets.MACOS_CERT_PASSPHRASE }} + WIN_CERT_INSTALLER_CER: ${{ secrets.WIN_CERT_INSTALLER_CER }} + WIN_CERT_INSTALLER_CER_PASS: ${{ secrets.WIN_CERT_INSTALLER_CER_PASS }} CURA_CONAN_VERSION: ${{ inputs.cura_conan_version }} ENTERPRISE: ${{ inputs.enterprise }} STAGING: ${{ inputs.staging }} @@ -127,14 +134,14 @@ jobs: echo "APPIMAGETOOL_LOCATION=$GITHUB_WORKSPACE/appimagetool" >> $GITHUB_ENV - name: Install GCC-12 on ubuntu-22.04 - if: ${{ startsWith(inputs.runs_on, 'ubuntu-22.04') }} + if: ${{ startsWith(inputs.platform, '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: Use GCC-10 on ubuntu-20.04 - if: ${{ startsWith(inputs.runs_on, 'ubuntu-20.04') }} + if: ${{ startsWith(inputs.platform, 'ubuntu-20.04') }} run: | sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 10 sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 10 @@ -161,20 +168,27 @@ jobs: uses: apple-actions/import-codesign-certs@v1 with: keychain-password: ${{ secrets.MACOS_KEYCHAIN_PASSWORD }} - create-keychain: false # keychain is created in previous use of action. + create-keychain: false # keychain is created in previous use of action. p12-file-base64: ${{ secrets.MACOS_CERT_INSTALLER_P12 }} p12-password: ${{ secrets.MACOS_CERT_PASSPHRASE }} - - name: Clean Conan local cache - if: ${{ inputs.conan_clean_local_cache }} - run: conan remove "*" -f + - name: Create PFX certificate from BASE64_PFX_CONTENT secret + if: ${{ runner.os == 'Windows' }} + id: create-pfx + env: + PFX_CONTENT: ${{ secrets.WIN_CERT_INSTALLER_CER }} + run: | + $pfxPath = Join-Path -Path $env:RUNNER_TEMP -ChildPath "cert.pfx"; + $encodedBytes = [System.Convert]::FromBase64String($env:PFX_CONTENT); + Set-Content $pfxPath -Value $encodedBytes -AsByteStream; + echo "PFX_PATH=$pfxPath" >> $env:GITHUB_OUTPUT; - name: Get Conan configuration from branch - if: ${{ inputs.conan_config_branch != '' }} - run: conan config install https://github.com/Ultimaker/conan-config.git -a "-b ${{ inputs.conan_config_branch }}" + if: ${{ inputs.conan_config != '' }} + run: conan config install https://github.com/Ultimaker/conan-config.git -a "-b ${{ inputs.conan_config }}" - name: Get Conan configuration - if: ${{ inputs.conan_config_branch == '' }} + if: ${{ inputs.conan_config == '' }} run: conan config install https://github.com/Ultimaker/conan-config.git - name: Create the Packages (Bash) @@ -194,6 +208,7 @@ jobs: - name: Set Environment variables for Cura (Powershell) if: ${{ runner.os == 'Windows' }} run: | + echo "${Env:WIX}\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append .\cura_inst\Scripts\activate_github_actions_env.ps1 .\cura_inst\Scripts\activate_github_actions_version_env.ps1 @@ -226,44 +241,86 @@ jobs: - name: Create the Cura dist run: pyinstaller ./cura_inst/UltiMaker-Cura.spec + - name: Output the name file name and extension + id: filename + shell: python + run: | + import os + enterprise = "-Enterprise" if "${{ inputs.enterprise }}" == "true" else "" + installer_filename = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-${{ inputs.os_name }}" + if "${{ runner.os }}" == "Windows": + installer_ext = "msi" if "${{ inputs.msi_installer }}" == "true" else "exe" + elif "${{ runner.os }}" == "macOS": + installer_ext = "dmg" + else: + installer_ext = "AppImage" + output_env = os.environ["GITHUB_OUTPUT"] + content = "" + if os.path.exists(output_env): + with open(output_env, "r") as f: + content = f.read() + with open(output_env, "w") as f: + f.write(content) + f.writelines(f"INSTALLER_FILENAME={installer_filename}\n") + f.writelines(f"INSTALLER_EXT={installer_ext}\n") + f.writelines(f"FULL_INSTALLER_FILENAME={installer_filename}.{installer_ext}\n") + - name: Archive the artifacts (bash) - if: ${{ github.event.inputs.installer == 'false' && runner.os != 'Windows' }} - run: tar -zcf "./UltiMaker-Cura-$CURA_VERSION_FULL-${{ inputs.os_name }}.tar.gz" "./UltiMaker-Cura/" + if: ${{ !inputs.installer && runner.os != 'Windows' }} + run: tar -zcf "./${{ steps.filename.outputs.INSTALLER_FILENAME }}.tar.gz" "./UltiMaker-Cura/" working-directory: dist - name: Archive the artifacts (Powershell) - if: ${{ github.event.inputs.installer == 'false' && runner.os == 'Windows' }} - run: Compress-Archive -Path ".\UltiMaker-Cura" -DestinationPath ".\UltiMaker-Cura-$Env:CURA_VERSION_FULL-${{ inputs.os_name }}.zip" + if: ${{ !inputs.installer && runner.os == 'Windows' }} + run: Compress-Archive -Path ".\UltiMaker-Cura" -DestinationPath ".\${{ steps.filename.outputs.INSTALLER_FILENAME }}.zip" working-directory: dist - name: Create the Windows exe installer (Powershell) - if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Windows' }} + if: ${{ inputs.installer && runner.os == 'Windows' && !inputs.msi_installer }} run: | - python ..\cura_inst\packaging\NSIS\create_windows_installer.py ../cura_inst . "UltiMaker-Cura-$Env:CURA_VERSION_FULL-${{ inputs.os_name }}.exe" + python ..\cura_inst\packaging\NSIS\create_windows_installer.py ../cura_inst . "${{ steps.filename.outputs.FULL_INSTALLER_FILENAME }}" + working-directory: dist + + - name: Create the Windows msi installer (Powershell) + if: ${{ inputs.installer && runner.os == 'Windows' && inputs.msi_installer }} + run: | + python ..\cura_inst\packaging\msi\create_windows_msi.py ..\cura_inst .\UltiMaker-Cura "${{ steps.filename.outputs.FULL_INSTALLER_FILENAME }}" "$Env:CURA_APP_NAME" + working-directory: dist + + - name: Sign the Windows exe installer (Powershell) + if: ${{ inputs.installer && runner.os == 'Windows' && !inputs.msi_installer }} + env: + PFX_PATH: ${{ steps.create-pfx.outputs.PFX_PATH }} + run: | + & "C:/Program Files (x86)/Windows Kits/10/bin/10.0.17763.0/x86/signtool.exe" sign /f $Env:PFX_PATH /p "$Env:WIN_CERT_INSTALLER_CER_PASS" /fd SHA256 /t http://timestamp.digicert.com "${{ steps.filename.outputs.FULL_INSTALLER_FILENAME }}" + working-directory: dist + + - name: Sign the Windows msi installer (Powershell) + if: ${{ inputs.installer && runner.os == 'Windows' && inputs.msi_installer }} + env: + PFX_PATH: ${{ steps.create-pfx.outputs.PFX_PATH }} + run: | + & "C:/Program Files (x86)/Windows Kits/10/bin/10.0.17763.0/x86/signtool.exe" sign /f $Env:PFX_PATH /p "$Env:WIN_CERT_INSTALLER_CER_PASS" /fd SHA256 /t http://timestamp.digicert.com "${{ steps.filename.outputs.FULL_INSTALLER_FILENAME }}" working-directory: dist - name: Create the Linux AppImage (Bash) - if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Linux' }} - run: python ../cura_inst/packaging/AppImage/create_appimage.py ./UltiMaker-Cura $CURA_VERSION_FULL "UltiMaker-Cura-$CURA_VERSION_FULL-${{ inputs.os_name }}.AppImage" + if: ${{ inputs.installer && runner.os == 'Linux' }} + run: python ../cura_inst/packaging/AppImage/create_appimage.py ./UltiMaker-Cura $CURA_VERSION_FULL "${{ steps.filename.outputs.FULL_INSTALLER_FILENAME }}" working-directory: dist - name: Create the MacOS dmg and/or pkg (Bash) if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Macos' }} - run: python ../cura_inst/packaging/MacOs/build_macos.py ../cura_inst . "UltiMaker-Cura-$CURA_VERSION_FULL-${{ inputs.os_name }}" + run: python ../cura_inst/packaging/MacOs/build_macos.py ../cura_inst . "${{ steps.filename.outputs.FULL_INSTALLER_FILENAME }}" working-directory: dist - name: Upload the artifacts uses: actions/upload-artifact@v3 with: - name: UltiMaker-Cura-${{ env.CURA_VERSION_FULL }}-${{ inputs.os_name }} + name: ${{ steps.filename.outputs.INSTALLER_FILENAME }}-${{ steps.filename.outputs.INSTALLER_EXT }} path: | dist/*.tar.gz dist/*.zip - dist/*.exe - dist/*.msi - dist/*.dmg - dist/*.pkg - dist/*.AppImage + dist/${{ steps.filename.outputs.FULL_INSTALLER_FILENAME }} dist/*.asc retention-days: 5 diff --git a/.github/workflows/printer-linter-format.yml b/.github/workflows/printer-linter-format.yml index df4e049755..e5e1b5b1d6 100644 --- a/.github/workflows/printer-linter-format.yml +++ b/.github/workflows/printer-linter-format.yml @@ -3,7 +3,11 @@ name: printer-linter-format on: push: paths: - - 'resources/**' + - 'resources/definitions/**' + - 'resources/extruders/**' + - 'resources/intent/**' + - 'resources/quality/**' + - 'resources/variants/**' jobs: printer-linter-format: diff --git a/.github/workflows/printer-linter-pr-diagnose.yml b/.github/workflows/printer-linter-pr-diagnose.yml index 54bbda4c1d..0dac8ba7e7 100644 --- a/.github/workflows/printer-linter-pr-diagnose.yml +++ b/.github/workflows/printer-linter-pr-diagnose.yml @@ -52,7 +52,7 @@ jobs: path: printer-linter-result/ - name: Run clang-tidy-pr-comments action - uses: platisd/clang-tidy-pr-comments@master + uses: platisd/clang-tidy-pr-comments@bc0bb7da034a8317d54e7fe1e819159002f4cc40 with: github_token: ${{ secrets.GITHUB_TOKEN }} clang_tidy_fixes: result.yml diff --git a/.github/workflows/printer-linter-pr-post.yml b/.github/workflows/printer-linter-pr-post.yml index f6c0924d1c..81dbf96469 100644 --- a/.github/workflows/printer-linter-pr-post.yml +++ b/.github/workflows/printer-linter-pr-post.yml @@ -73,7 +73,7 @@ jobs: unzip printer-linter-result.zip -d printer-linter-result - name: Run clang-tidy-pr-comments action - uses: platisd/clang-tidy-pr-comments@master + uses: platisd/clang-tidy-pr-comments@bc0bb7da034a8317d54e7fe1e819159002f4cc40 with: github_token: ${{ secrets.GITHUB_TOKEN }} clang_tidy_fixes: printer-linter-result/fixes.yml diff --git a/UltiMaker-Cura.spec.jinja b/UltiMaker-Cura.spec.jinja index 6e07b1ece7..ba5b6e11c2 100644 --- a/UltiMaker-Cura.spec.jinja +++ b/UltiMaker-Cura.spec.jinja @@ -16,9 +16,9 @@ datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2] # Add dynamic libs in the venv bin/Script Path. This is needed because we might copy some additional libs # e.q.: OpenSSL 1.1.1l in that directory with a separate: # `conan install openssl@1.1.1l -g deploy && cp openssl/bin/*.so cura_inst/bin` -binaries.extend([(str(bin), ".") for bin in Path("{{ venv_script_path }}").glob("*.so*")]) -binaries.extend([(str(bin), ".") for bin in Path("{{ venv_script_path }}").glob("*.dll")]) -binaries.extend([(str(bin), ".") for bin in Path("{{ venv_script_path }}").glob("*.dylib")]) +binaries.extend([(str(bin), ".") for bin in Path(r"{{ venv_script_path }}").glob("*.so*")]) +binaries.extend([(str(bin), ".") for bin in Path(r"{{ venv_script_path }}").glob("*.dll")]) +binaries.extend([(str(bin), ".") for bin in Path(r"{{ venv_script_path }}").glob("*.dylib")]) block_cipher = None diff --git a/conandata.yml b/conandata.yml index 03aa4aac95..ec8839c6bd 100644 --- a/conandata.yml +++ b/conandata.yml @@ -12,10 +12,10 @@ # Subject to change in the future! "5.3.0-alpha": requirements: - - "pyarcus/(latest)@ultimaker/testing" + - "pyarcus/5.2.2" - "curaengine/(latest)@ultimaker/testing" - - "pysavitar/(latest)@ultimaker/testing" - - "pynest2d/(latest)@ultimaker/testing" + - "pysavitar/5.2.2" + - "pynest2d/5.2.2" - "uranium/(latest)@ultimaker/testing" - "fdm_materials/(latest)@ultimaker/testing" - "cura_binary_data/(latest)@ultimaker/testing" @@ -225,216 +225,6 @@ Windows: "./icons/Cura.ico" Macos: "./icons/cura.icns" Linux: "./icons/cura-128.png" -"5.2.0-beta.2": - requirements: - - "pyarcus/(latest)@ultimaker/stable" - - "curaengine/(latest)@ultimaker/stable" - - "pysavitar/(latest)@ultimaker/stable" - - "pynest2d/(latest)@ultimaker/stable" - - "uranium/(latest)@ultimaker/stable" - - "fdm_materials/(latest)@ultimaker/stable" - - "cura_binary_data/(latest)@ultimaker/stable" - - "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-beta.1": - requirements: - - "pyarcus/5.2.0-beta.1" - - "curaengine/5.2.0-beta.1" - - "pysavitar/5.2.0-beta.1" - - "pynest2d/5.2.0-beta.1" - - "uranium/5.2.0-beta.1" - - "fdm_materials/5.2.0-beta.1" - - "cura_binary_data/5.2.0-beta.1" - - "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": requirements: - "pyarcus/5.2.0" @@ -540,111 +330,6 @@ Windows: "./icons/Cura.ico" Macos: "./icons/cura.icns" Linux: "./icons/cura-128.png" -"5.2.0-alpha": - requirements: - - "pyarcus/5.2@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.1.0": requirements: - "arcus/5.1.0" diff --git a/conanfile.py b/conanfile.py index e9d3ba6742..b1ca074d74 100644 --- a/conanfile.py +++ b/conanfile.py @@ -85,6 +85,12 @@ class CuraConan(ConanFile): def _enterprise(self): return self.options.enterprise in ["True", 'true'] + @property + def _app_name(self): + if self._enterprise: + return str(self.options.display_name) + " Enterprise" + return str(self.options.display_name) + @property def _cloud_api_root(self): return "https://api-staging.ultimaker.com" if self._staging else "https://api.ultimaker.com" @@ -161,7 +167,7 @@ class CuraConan(ConanFile): with open(Path(location, "CuraVersion.py"), "w") as f: f.write(cura_version_py.render( cura_app_name = self.name, - cura_app_display_name = self.options.display_name, + cura_app_display_name = self._app_name, cura_version = cura_version, cura_build_type = "Enterprise" if self._enterprise else "", cura_debug_mode = self.options.cura_debug_mode, @@ -425,11 +431,13 @@ echo "CURA_VERSION_MINOR={{ cura_version_minor }}" >> ${{ env_prefix }}GITHUB_EN echo "CURA_VERSION_PATCH={{ cura_version_patch }}" >> ${{ env_prefix }}GITHUB_ENV echo "CURA_VERSION_BUILD={{ cura_version_build }}" >> ${{ env_prefix }}GITHUB_ENV echo "CURA_VERSION_FULL={{ cura_version_full }}" >> ${{ env_prefix }}GITHUB_ENV +echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV """).render(cura_version_major = cura_version.major, cura_version_minor = cura_version.minor, cura_version_patch = cura_version.patch, cura_version_build = cura_version.build if cura_version.build != "" else "0", cura_version_full = self.version, + cura_app_name = self._app_name, env_prefix = env_prefix) ext = ".sh" if self.settings.os != "Windows" else ".ps1" diff --git a/cura/Machines/Models/UserChangesModel.py b/cura/Machines/Models/UserChangesModel.py index 171e910dd8..daea45eb52 100644 --- a/cura/Machines/Models/UserChangesModel.py +++ b/cura/Machines/Models/UserChangesModel.py @@ -118,12 +118,14 @@ class UserChangesModel(ListModel): if original_value is not None: break - item_to_add = {"key": setting_key, - "label": label, - "user_value": str(user_changes.getProperty(setting_key, "value")), - "original_value": str(original_value), - "extruder": "", - "category": category_label} + item_to_add = { + "key": setting_key, + "label": label, + "user_value": str(user_changes.getProperty(setting_key, "value", default_value_resolve_context)), + "original_value": str(original_value), + "extruder": "", + "category": category_label, + } if stack != global_stack: item_to_add["extruder"] = stack.getName() diff --git a/packaging/AppImage/AppRun b/packaging/AppImage/AppRun index d0ebfe1742..fa2c73fb9d 100644 --- a/packaging/AppImage/AppRun +++ b/packaging/AppImage/AppRun @@ -17,4 +17,9 @@ export OPENSSL_CONF="$scriptdir/openssl.cnf" # unset `QT_STYLE_OVERRIDE` as a precaution unset QT_STYLE_OVERRIDE -$scriptdir/UltiMaker-Cura "$@" +BIN=`basename "$ARGV0" .AppImage` +if [ -f $scriptdir/$BIN ]; then + $scriptdir/$BIN "$@" +else + $scriptdir/UltiMaker-Cura "$@" +fi; diff --git a/packaging/msi/CustomizeCuraDlg.wxs b/packaging/msi/CustomizeCuraDlg.wxs new file mode 100644 index 0000000000..a9f1d7c462 --- /dev/null +++ b/packaging/msi/CustomizeCuraDlg.wxs @@ -0,0 +1,56 @@ + + + + + + + + + + + 1 + Installed + Installed + + + 1 + + + + 1 + + + + + + + + 1 + + + + + + + + + + + + + + + + + + + Installed + + + + Installed + + + + + \ No newline at end of file diff --git a/packaging/msi/ExcludeComponents.xslt b/packaging/msi/ExcludeComponents.xslt new file mode 100644 index 0000000000..b964484922 --- /dev/null +++ b/packaging/msi/ExcludeComponents.xslt @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packaging/msi/UltiMaker-Cura.wxs.jinja b/packaging/msi/UltiMaker-Cura.wxs.jinja new file mode 100644 index 0000000000..44a45297c2 --- /dev/null +++ b/packaging/msi/UltiMaker-Cura.wxs.jinja @@ -0,0 +1,158 @@ + + + + + + + + + + + + + + + + + {% if "Enterpise" in app_name %} + + + + + {% endif %} + + + = 600]]> + + + + + + + + + + 1 + + WixUI_InstallMode = "Change" + WixUI_InstallMode = "InstallCustom" + 1 + + WixUI_InstallMode = "InstallCustom" + WixUI_InstallMode = "Change" + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packaging/msi/banner_side.bmp b/packaging/msi/banner_side.bmp new file mode 100644 index 0000000000..125d6df25b Binary files /dev/null and b/packaging/msi/banner_side.bmp differ diff --git a/packaging/msi/banner_top.bmp b/packaging/msi/banner_top.bmp new file mode 100644 index 0000000000..6436dad278 Binary files /dev/null and b/packaging/msi/banner_top.bmp differ diff --git a/packaging/msi/create_windows_msi.py b/packaging/msi/create_windows_msi.py new file mode 100644 index 0000000000..a13238f836 --- /dev/null +++ b/packaging/msi/create_windows_msi.py @@ -0,0 +1,115 @@ +# Copyright (c) 2022 UltiMaker +# Cura is released under the terms of the LGPLv3 or higher. + + +import argparse # Command line arguments parsing and help. +import os +import shutil +import subprocess +import uuid +from datetime import datetime +from pathlib import Path + +from jinja2 import Template + + +def work_path(filename: Path) -> Path: + if not filename.is_absolute(): + return Path(os.getcwd(), filename.parent) + else: + return filename.parent + + +def generate_wxs(source_path: Path, dist_path: Path, filename: Path, app_name: str): + source_loc = Path(os.getcwd(), source_path) + dist_loc = Path(os.getcwd(), dist_path) + work_loc = work_path(filename) + work_loc.mkdir(parents=True, exist_ok=True) + + jinja_template_path = Path(source_loc.joinpath("packaging", "msi", "UltiMaker-Cura.wxs.jinja")) + with open(jinja_template_path, "r") as f: + template = Template(f.read()) + + wxs_content = template.render( + app_name=f"{app_name}", + main_app="UltiMaker-Cura.exe", + version=os.getenv('CURA_VERSION_FULL'), + version_major=os.environ.get("CURA_VERSION_MAJOR"), + version_minor=os.environ.get("CURA_VERSION_MINOR"), + version_patch=os.environ.get("CURA_VERSION_PATCH"), + company="UltiMaker", + web_site="https://ultimaker.com", + year=datetime.now().year, + upgrade_code=str(uuid.uuid5(uuid.NAMESPACE_DNS, app_name)), + shortcut_uuid=str(uuid.uuid5(uuid.NAMESPACE_DNS, f"Shortcut {app_name}")), + cura_license_file=str(source_loc.joinpath("packaging", "msi", "cura_license.rtf")), + cura_banner_top=str(source_loc.joinpath("packaging", "msi", "banner_top.bmp")), + cura_banner_side=str(source_loc.joinpath("packaging", "msi", "banner_side.bmp")), + cura_icon=str(source_loc.joinpath("packaging", "icons", "Cura.ico")), + ) + + with open(work_loc.joinpath("UltiMaker-Cura.wxs"), "w") as f: + f.write(wxs_content) + + try: + shutil.copy(source_loc.joinpath("packaging", "msi", "CustomizeCuraDlg.wxs"), + work_loc.joinpath("CustomizeCuraDlg.wxs")) + except shutil.SameFileError: + pass + + try: + shutil.copy(source_loc.joinpath("packaging", "msi", "ExcludeComponents.xslt"), + work_loc.joinpath("ExcludeComponents.xslt")) + except shutil.SameFileError: + pass + + +def cleanup_artifacts(dist_path: Path): + dist_loc = Path(os.getcwd(), dist_path) + dirt = [d for d in dist_loc.rglob("__pycache__") if d.is_dir()] + dirt += [d for d in dist_loc.rglob("*.dist-info") if d.is_dir()] + for d in dirt: + if d.exists(): + shutil.rmtree(d, ignore_errors=True) + + +def build(dist_path: Path, filename: Path): + dist_loc = Path(os.getcwd(), dist_path) + work_loc = work_path(filename) + wxs_loc = work_loc.joinpath("UltiMaker-Cura.wxs") + heat_loc = work_loc.joinpath("HeatFile.wxs") + exclude_components_loc = work_loc.joinpath("ExcludeComponents.xslt") + manageoldcuradlg_loc = work_loc.joinpath("CustomizeCuraDlg.wxs") + build_loc = work_loc.joinpath("build_msi") + + heat_command = ["heat", "dir", f"{dist_loc.as_posix()}\\", "-dr", "APPLICATIONFOLDER", "-cg", "NewFilesGroup", "-sw5150", + "-gg", "-g1", "-sf", "-srd", "-var", "var.CuraDir", "-t", f"{exclude_components_loc.as_posix()}", + "-out", f"{heat_loc.as_posix()}"] + subprocess.call(heat_command) + + build_command = ["candle", "-arch", "x64", f"-dCuraDir={dist_loc}\\", + "-ext", "WixFirewallExtension", + "-out", f"{build_loc.as_posix()}\\", + f"{wxs_loc.as_posix()}", f"{heat_loc.as_posix()}", f"{manageoldcuradlg_loc.as_posix()}"] + subprocess.call(build_command) + + link_command = ["light", f"{build_loc.joinpath(wxs_loc.name).with_suffix('.wixobj')}", + f"{build_loc.joinpath(heat_loc.name).with_suffix('.wixobj')}", + f"{build_loc.joinpath(manageoldcuradlg_loc.name).with_suffix('.wixobj')}", + "-ext", "WixUIExtension", + "-ext", "WixFirewallExtension", + "-out", f"{work_loc.joinpath(filename.name)}"] + subprocess.call(link_command) + + +if __name__ == "__main__": + parser = argparse.ArgumentParser(description="Create Windows msi installer of Cura.") + parser.add_argument("source_path", type=Path, help="Path to Conan install Cura folder.") + parser.add_argument("dist_path", type=Path, help="Path to Pyinstaller dist folder") + parser.add_argument("filename", type=Path, + help="Filename of the exe (e.g. 'UltiMaker-Cura-5.1.0-beta-Windows-X64.msi')") + parser.add_argument("name", type=str, help="App name (e.g. 'UltiMaker Cura')") + args = parser.parse_args() + generate_wxs(args.source_path.resolve(), args.dist_path.resolve(), args.filename.resolve(), args.name) + cleanup_artifacts(args.dist_path.resolve()) + build(args.dist_path.resolve(), args.filename) diff --git a/packaging/msi/cura_license.rtf b/packaging/msi/cura_license.rtf new file mode 100644 index 0000000000..67f58e099a --- /dev/null +++ b/packaging/msi/cura_license.rtf @@ -0,0 +1,183 @@ +{\rtf1\ansi\ansicpg1252\deff0\deflang1033\deflangfe1033{\fonttbl{\f0\froman\fprq2\fcharset0 Times New Roman;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\fmodern\fprq1\fcharset0 Courier New;}} +{\colortbl ;\red0\green0\blue255;} +{\stylesheet{ Normal;}{\s1 heading 1;}{\s2 heading 2;}{\s3 heading 3;}{\s4 heading 4;}} +{\*\generator Msftedit 5.41.21.2510;}\viewkind4\uc1\pard\s3\sb100\sa100\qc\b\f0\fs27 GNU LESSER GENERAL PUBLIC LICENSE\par +\pard\sb100\sa100\qc\b0\fs24 Version 3, 29 June 2007\par +\pard Copyright \'a9 2007 Free Software Foundation, Inc. <{\field{\*\fldinst{HYPERLINK "http://fsf.org/"}}{\fldrslt{\ul\cf1 http://fsf.org/}}}\f0\fs24 >\par +Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.\par +This version of the GNU Lesser General Public License incorporates the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below.\par +\pard\s4\sb100\sa100\b 0. Additional Definitions.\par +\pard\sb100\sa100\b0 As used herein, \ldblquote this License\rdblquote refers to version 3 of the GNU Lesser General Public License, and the \ldblquote GNU GPL\rdblquote refers to version 3 of the GNU General Public License.\par +\ldblquote The Library\rdblquote refers to a covered work governed by this License, other than an Application or a Combined Work as defined below.\par +An \ldblquote Application\rdblquote is any work that makes use of an interface provided by the Library, but which is not otherwise based on the Library. Defining a subclass of a class defined by the Library is deemed a mode of using an interface provided by the Library.\par +A \ldblquote Combined Work\rdblquote is a work produced by combining or linking an Application with the Library. The particular version of the Library with which the Combined Work was made is also called the \ldblquote Linked Version\rdblquote .\par +The \ldblquote Minimal Corresponding Source\rdblquote for a Combined Work means the Corresponding Source for the Combined Work, excluding any source code for portions of the Combined Work that, considered in isolation, are based on the Application, and not on the Linked Version.\par +The \ldblquote Corresponding Application Code\rdblquote for a Combined Work means the object code and/or source code for the Application, including any data and utility programs needed for reproducing the Combined Work from the Application, but excluding the System Libraries of the Combined Work.\par +\pard\s4\sb100\sa100\b 1. Exception to Section 3 of the GNU GPL.\par +\pard\sb100\sa100\b0 You may convey a covered work under sections 3 and 4 of this License without being bound by section 3 of the GNU GPL.\par +\pard\s4\sb100\sa100\b 2. Conveying Modified Versions.\par +\pard\sb100\sa100\b0 If you modify a copy of the Library, and, in your modifications, a facility refers to a function or data to be supplied by an Application that uses the facility (other than as an argument passed when the facility is invoked), then you may convey a copy of the modified version:\par +\pard\fi-360\li720\sb100\sa100\tx720\f1\fs20\'b7\tab\f0\fs24 a) under this License, provided that you make a good faith effort to ensure that, in the event an Application does not supply the function or data, the facility still operates, and performs whatever part of its purpose remains meaningful, or\par +\pard\fi-360\li720\sb100\sa100\f1\fs20\'b7\tab\f0\fs24 b) under the GNU GPL, with none of the additional permissions of this License applicable to that copy.\par +\pard\s4\sb100\sa100\b 3. Object Code Incorporating Material from Library Header Files.\par +\pard\sb100\sa100\b0 The object code form of an Application may incorporate material from a header file that is part of the Library. You may convey such object code under terms of your choice, provided that, if the incorporated material is not limited to numerical parameters, data structure layouts and accessors, or small macros, inline functions and templates (ten or fewer lines in length), you do both of the following:\par +\pard\fi-360\li720\sb100\sa100\tx720\f1\fs20\'b7\tab\f0\fs24 a) Give prominent notice with each copy of the object code that the Library is used in it and that the Library and its use are covered by this License.\par +\pard\fi-360\li720\sb100\sa100\f1\fs20\'b7\tab\f0\fs24 b) Accompany the object code with a copy of the GNU GPL and this license document.\par +\pard\s4\sb100\sa100\b 4. Combined Works.\par +\pard\sb100\sa100\b0 You may convey a Combined Work under terms of your choice that, taken together, effectively do not restrict modification of the portions of the Library contained in the Combined Work and reverse engineering for debugging such modifications, if you also do each of the following:\par +\pard\fi-360\li720\sb100\sa100\tx720\f1\fs20\'b7\tab\f0\fs24 a) Give prominent notice with each copy of the Combined Work that the Library is used in it and that the Library and its use are covered by this License.\par +\pard\fi-360\li720\sb100\sa100\f1\fs20\'b7\tab\f0\fs24 b) Accompany the Combined Work with a copy of the GNU GPL and this license document.\par +\f1\fs20\'b7\tab\f0\fs24 c) For a Combined Work that displays copyright notices during execution, include the copyright notice for the Library among these notices, as well as a reference directing the user to the copies of the GNU GPL and this license document.\par +\f1\fs20\'b7\tab\f0\fs24 d) Do one of the following: \par +\pard\fi-360\li1440\sb100\sa100\tx1440\f2\fs20 o\tab\f0\fs24 0) Convey the Minimal Corresponding Source under the terms of this License, and the Corresponding Application Code in a form suitable for, and under terms that permit, the user to recombine or relink the Application with a modified version of the Linked Version to produce a modified Combined Work, in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.\par +\pard\fi-360\li1440\sb100\sa100\f2\fs20 o\tab\f0\fs24 1) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (a) uses at run time a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked Version.\par +\pard\fi-360\li720\sb100\sa100\tx720\f1\fs20\'b7\tab\f0\fs24 e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the GNU GPL, and only to the extent that such information is necessary to install and execute a modified version of the Combined Work produced by recombining or relinking the Application with a modified version of the Linked Version. (If you use option 4d0, the Installation Information must accompany the Minimal Corresponding Source and Corresponding Application Code. If you use option 4d1, you must provide the Installation Information in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.)\par +\pard\s4\sb100\sa100\b 5. Combined Libraries.\par +\pard\sb100\sa100\b0 You may place library facilities that are a work based on the Library side by side in a single library together with other library facilities that are not Applications and are not covered by this License, and convey such a combined library under terms of your choice, if you do both of the following:\par +\pard\fi-360\li720\sb100\sa100\tx720\f1\fs20\'b7\tab\f0\fs24 a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities, conveyed under the terms of this License.\par +\pard\fi-360\li720\sb100\sa100\f1\fs20\'b7\tab\f0\fs24 b) Give prominent notice with the combined library that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.\par +\pard\s4\sb100\sa100\b 6. Revised Versions of the GNU Lesser General Public License.\par +\pard\sb100\sa100\b0 The Free Software Foundation may publish revised and/or new versions of the GNU Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.\par +Each version is given a distinguishing version number. If the Library as you received it specifies that a certain numbered version of the GNU Lesser General Public License \ldblquote or any later version\rdblquote applies to it, you have the option of following the terms and conditions either of that published version or of any later version published by the Free Software Foundation. If the Library as you received it does not specify a version number of the GNU Lesser General Public License, you may choose any version of the GNU Lesser General Public License ever published by the Free Software Foundation.\par +If the Library as you received it specifies that a proxy can decide whether future versions of the GNU Lesser General Public License shall apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library.\par +\par +\pard\s3\sb100\sa100\qc\b\fs27 GNU GENERAL PUBLIC LICENSE\par +\pard\sb100\sa100\qc\b0\fs24 Version 3, 29 June 2007\par +\pard Copyright \'a9 2007 Free Software Foundation, Inc. <{\field{\*\fldinst{HYPERLINK "http://fsf.org/"}}{\fldrslt{\ul\cf1 http://fsf.org/}}}\f0\fs24 >\par +Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.\par +\pard\s3\sb100\sa100\b\fs27 Preamble\par +\pard\sb100\sa100\b0\fs24 The GNU General Public License is a free, copyleft license for software and other kinds of works.\par +The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too.\par +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things.\par +To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others.\par +For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.\par +Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it.\par +For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions.\par +Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users.\par +Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free.\par +The precise terms and conditions for copying, distribution and modification follow.\par +\pard\s3\sb100\sa100\b\fs27 TERMS AND CONDITIONS\par +\pard\s4\sb100\sa100\fs24 0. Definitions.\par +\pard\sb100\sa100\b0\ldblquote This License\rdblquote refers to version 3 of the GNU General Public License.\par +\ldblquote Copyright\rdblquote also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.\par +\ldblquote The Program\rdblquote refers to any copyrightable work licensed under this License. Each licensee is addressed as \ldblquote you\rdblquote . \ldblquote Licensees\rdblquote and \ldblquote recipients\rdblquote may be individuals or organizations.\par +To \ldblquote modify\rdblquote a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a \ldblquote modified version\rdblquote of the earlier work or a work \ldblquote based on\rdblquote the earlier work.\par +A \ldblquote covered work\rdblquote means either the unmodified Program or a work based on the Program.\par +To \ldblquote propagate\rdblquote a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well.\par +To \ldblquote convey\rdblquote a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.\par +An interactive user interface displays \ldblquote Appropriate Legal Notices\rdblquote to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.\par +\pard\s4\sb100\sa100\b 1. Source Code.\par +\pard\sb100\sa100\b0 The \ldblquote source code\rdblquote for a work means the preferred form of the work for making modifications to it. \ldblquote Object code\rdblquote means any non-source form of a work.\par +A \ldblquote Standard Interface\rdblquote means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.\par +The \ldblquote System Libraries\rdblquote of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A \ldblquote Major Component\rdblquote , in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.\par +The \ldblquote Corresponding Source\rdblquote for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work.\par +The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.\par +The Corresponding Source for a work in source code form is that same work.\par +\pard\s4\sb100\sa100\b 2. Basic Permissions.\par +\pard\sb100\sa100\b0 All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.\par +You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.\par +Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.\par +\pard\s4\sb100\sa100\b 3. Protecting Users' Legal Rights From Anti-Circumvention Law.\par +\pard\sb100\sa100\b0 No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures.\par +When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures.\par +\pard\s4\sb100\sa100\b 4. Conveying Verbatim Copies.\par +\pard\sb100\sa100\b0 You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.\par +You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.\par +\pard\s4\sb100\sa100\b 5. Conveying Modified Source Versions.\par +\pard\sb100\sa100\b0 You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:\par +\pard\fi-360\li720\sb100\sa100\tx720\f1\fs20\'b7\tab\f0\fs24 a) The work must carry prominent notices stating that you modified it, and giving a relevant date.\par +\pard\fi-360\li720\sb100\sa100\f1\fs20\'b7\tab\f0\fs24 b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to \ldblquote keep intact all notices\rdblquote .\par +\f1\fs20\'b7\tab\f0\fs24 c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it.\par +\f1\fs20\'b7\tab\f0\fs24 d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.\par +\pard\sb100\sa100 A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an \ldblquote aggregate\rdblquote if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.\par +\pard\s4\sb100\sa100\b 6. Conveying Non-Source Forms.\par +\pard\sb100\sa100\b0 You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:\par +\pard\fi-360\li720\sb100\sa100\tx720\f1\fs20\'b7\tab\f0\fs24 a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.\par +\pard\fi-360\li720\sb100\sa100\f1\fs20\'b7\tab\f0\fs24 b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge.\par +\f1\fs20\'b7\tab\f0\fs24 c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b.\par +\f1\fs20\'b7\tab\f0\fs24 d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements.\par +\f1\fs20\'b7\tab\f0\fs24 e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.\par +\pard\sb100\sa100 A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.\par +A \ldblquote User Product\rdblquote is either (1) a \ldblquote consumer product\rdblquote , which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, \ldblquote normally used\rdblquote refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.\par +\ldblquote Installation Information\rdblquote for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.\par +If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).\par +The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.\par +Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying.\par +\pard\s4\sb100\sa100\b 7. Additional Terms.\par +\pard\sb100\sa100\b0\ldblquote Additional permissions\rdblquote are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.\par +When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.\par +Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:\par +\pard\fi-360\li720\sb100\sa100\tx720\f1\fs20\'b7\tab\f0\fs24 a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or\par +\pard\fi-360\li720\sb100\sa100\f1\fs20\'b7\tab\f0\fs24 b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or\par +\f1\fs20\'b7\tab\f0\fs24 c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or\par +\f1\fs20\'b7\tab\f0\fs24 d) Limiting the use for publicity purposes of names of licensors or authors of the material; or\par +\f1\fs20\'b7\tab\f0\fs24 e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or\par +\f1\fs20\'b7\tab\f0\fs24 f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors.\par +\pard\sb100\sa100 All other non-permissive additional terms are considered \ldblquote further restrictions\rdblquote within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.\par +If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.\par +Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.\par +\pard\s4\sb100\sa100\b 8. Termination.\par +\pard\sb100\sa100\b0 You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11).\par +However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.\par +Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.\par +Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.\par +\pard\s4\sb100\sa100\b 9. Acceptance Not Required for Having Copies.\par +\pard\sb100\sa100\b0 You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.\par +\pard\s4\sb100\sa100\b 10. Automatic Licensing of Downstream Recipients.\par +\pard\sb100\sa100\b0 Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License.\par +An \ldblquote entity transaction\rdblquote is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.\par +You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.\par +\pard\s4\sb100\sa100\b 11. Patents.\par +\pard\sb100\sa100\b0 A \ldblquote contributor\rdblquote is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's \ldblquote contributor version\rdblquote .\par +A contributor's \ldblquote essential patent claims\rdblquote are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, \ldblquote control\rdblquote includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.\par +Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.\par +In the following three paragraphs, a \ldblquote patent license\rdblquote is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To \ldblquote grant\rdblquote such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.\par +If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. \ldblquote Knowingly relying\rdblquote means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.\par +If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it.\par +A patent license is \ldblquote discriminatory\rdblquote if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.\par +Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.\par +\pard\s4\sb100\sa100\b 12. No Surrender of Others' Freedom.\par +\pard\sb100\sa100\b0 If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.\par +\pard\s4\sb100\sa100\b 13. Use with the GNU Affero General Public License.\par +\pard\sb100\sa100\b0 Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such.\par +\pard\s4\sb100\sa100\b 14. Revised Versions of this License.\par +\pard\sb100\sa100\b0 The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.\par +Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License \ldblquote or any later version\rdblquote applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation.\par +If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program.\par +Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.\par +\pard\s4\sb100\sa100\b 15. Disclaimer of Warranty.\par +\pard\sb100\sa100\b0 THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \ldblquote AS IS\rdblquote WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\par +\pard\s4\sb100\sa100\b 16. Limitation of Liability.\par +\pard\sb100\sa100\b0 IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.\par +\pard\s4\sb100\sa100\b 17. Interpretation of Sections 15 and 16.\par +\pard\sb100\sa100\b0 If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee.\par +END OF TERMS AND CONDITIONS\par +\pard\s3\sb100\sa100\b\fs27 How to Apply These Terms to Your New Programs\par +\pard\sb100\sa100\b0\fs24 If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.\par +To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the \ldblquote copyright\rdblquote line and a pointer to where the full notice is found.\par +\pard\tx916\tx1832\tx2748\tx3664\tx4580\tx5496\tx6412\tx7328\tx8244\tx9160\tx10076\tx10992\tx11908\tx12824\tx13740\tx14656\f2\fs20 \par + Copyright (C) \par +\par + This program is free software: you can redistribute it and/or modify\par + it under the terms of the GNU General Public License as published by\par + the Free Software Foundation, either version 3 of the License, or\par + (at your option) any later version.\par +\par + This program is distributed in the hope that it will be useful,\par + but WITHOUT ANY WARRANTY; without even the implied warranty of\par + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\par + GNU General Public License for more details.\par +\par + You should have received a copy of the GNU General Public License\par + along with this program. If not, see <{\field{\*\fldinst{HYPERLINK "http://www.gnu.org/licenses/"}}{\fldrslt{\ul\cf1 http://www.gnu.org/licenses/}}}\f2\fs20 >.\par +\pard\sb100\sa100\f0\fs24 Also add information on how to contact you by electronic and paper mail.\par +If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode:\par +\pard\tx916\tx1832\tx2748\tx3664\tx4580\tx5496\tx6412\tx7328\tx8244\tx9160\tx10076\tx10992\tx11908\tx12824\tx13740\tx14656\f2\fs20 Copyright (C) \par + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\par + This is free software, and you are welcome to redistribute it\par + under certain conditions; type `show c' for details.\par +\pard\sb100\sa100\f0\fs24 The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an \ldblquote about box\rdblquote .\par +\pard You should also get your employer (if you work as a programmer) or school, if any, to sign a \ldblquote copyright disclaimer\rdblquote for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see <{\field{\*\fldinst{HYPERLINK "http://www.gnu.org/licenses/"}}{\fldrslt{\ul\cf1 http://www.gnu.org/licenses/}}}\f0\fs24 >.\par +The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read <{\field{\*\fldinst{HYPERLINK "http://www.gnu.org/philosophy/why-not-lgpl.html"}}{\fldrslt{\ul\cf1 http://www.gnu.org/philosophy/why-not-lgpl.html}}}\f0\fs24 >.\par +\pard\sb100\sa100\par +} diff --git a/plugins/PostProcessingPlugin/scripts/FilamentChange.py b/plugins/PostProcessingPlugin/scripts/FilamentChange.py index ff62e1949c..ef85d5ae36 100644 --- a/plugins/PostProcessingPlugin/scripts/FilamentChange.py +++ b/plugins/PostProcessingPlugin/scripts/FilamentChange.py @@ -24,20 +24,29 @@ class FilamentChange(Script): "version": 2, "settings": { + "enabled": + { + "label": "Enable", + "description": "Uncheck to temporarily disable this feature.", + "type": "bool", + "default_value": true + }, "layer_number": { "label": "Layer", "description": "At what layer should color change occur. This will be before the layer starts printing. Specify multiple color changes with a comma.", "unit": "", "type": "str", - "default_value": "1" + "default_value": "1", + "enabled": "enabled" }, "firmware_config": { "label": "Use Firmware Configuration", "description": "Use the settings in your firmware, or customise the parameters of the filament change here.", "type": "bool", - "default_value": false + "default_value": false, + "enabled": "enabled" }, "initial_retract": { @@ -46,7 +55,7 @@ class FilamentChange(Script): "unit": "mm", "type": "float", "default_value": 30.0, - "enabled": "not firmware_config" + "enabled": "enabled and not firmware_config" }, "later_retract": { @@ -55,7 +64,7 @@ class FilamentChange(Script): "unit": "mm", "type": "float", "default_value": 300.0, - "enabled": "not firmware_config" + "enabled": "enabled and not firmware_config" }, "x_position": { @@ -64,7 +73,7 @@ class FilamentChange(Script): "unit": "mm", "type": "float", "default_value": 0, - "enabled": "not firmware_config" + "enabled": "enabled and not firmware_config" }, "y_position": { @@ -73,7 +82,7 @@ class FilamentChange(Script): "unit": "mm", "type": "float", "default_value": 0, - "enabled": "not firmware_config" + "enabled": "enabled and not firmware_config" }, "z_position": { @@ -82,7 +91,8 @@ class FilamentChange(Script): "unit": "mm", "type": "float", "default_value": 0, - "minimum_value": 0 + "minimum_value": 0, + "enabled": "enabled" }, "retract_method": { @@ -92,7 +102,7 @@ class FilamentChange(Script): "options": {"U": "Marlin (M600 U)", "L": "Reprap (M600 L)"}, "default_value": "U", "value": "\\\"L\\\" if machine_gcode_flavor==\\\"RepRap (RepRap)\\\" else \\\"U\\\"", - "enabled": "not firmware_config" + "enabled": "enabled and not firmware_config" }, "machine_gcode_flavor": { @@ -113,6 +123,40 @@ class FilamentChange(Script): }, "default_value": "RepRap (Marlin/Sprinter)", "enabled": "false" + }, + "enable_before_macro": + { + "label": "Enable G-code Before", + "description": "Use this to insert a custom G-code macro before the filament change happens", + "type": "bool", + "default_value": false, + "enabled": "enabled" + }, + "before_macro": + { + "label": "G-code Before", + "description": "Any custom G-code to run before the filament change happens, for example, M300 S1000 P10000 for a long beep.", + "unit": "", + "type": "str", + "default_value": "M300 S1000 P10000", + "enabled": "enabled and enable_before_macro" + }, + "enable_after_macro": + { + "label": "Enable G-code After", + "description": "Use this to insert a custom G-code macro after the filament change", + "type": "bool", + "default_value": false, + "enabled": "enabled" + }, + "after_macro": + { + "label": "G-code After", + "description": "Any custom G-code to run after the filament has been changed right before continuing the print, for example, you can add a sequence to purge filament and wipe the nozzle.", + "unit": "", + "type": "str", + "default_value": "M300 S440 P500", + "enabled": "enabled and enable_after_macro" } } }""" @@ -134,6 +178,7 @@ class FilamentChange(Script): :param data: A list of layers of g-code. :return: A similar list, with filament change commands inserted. """ + enabled = self.getSettingValueByKey("enabled") layer_nums = self.getSettingValueByKey("layer_number") initial_retract = self.getSettingValueByKey("initial_retract") later_retract = self.getSettingValueByKey("later_retract") @@ -141,8 +186,20 @@ class FilamentChange(Script): y_pos = self.getSettingValueByKey("y_position") z_pos = self.getSettingValueByKey("z_position") firmware_config = self.getSettingValueByKey("firmware_config") + enable_before_macro = self.getSettingValueByKey("enable_before_macro") + before_macro = self.getSettingValueByKey("before_macro") + enable_after_macro = self.getSettingValueByKey("enable_after_macro") + after_macro = self.getSettingValueByKey("after_macro") - color_change = "M600" + if not enabled: + return data + + color_change = ";BEGIN FilamentChange plugin\n" + + if enable_before_macro: + color_change = color_change + before_macro + "\n" + + color_change = color_change + "M600\n" if not firmware_config: if initial_retract is not None and initial_retract > 0.: @@ -163,7 +220,10 @@ class FilamentChange(Script): if z_pos is not None and z_pos > 0.: color_change = color_change + (" Z%.2f" % z_pos) - color_change = color_change + " ; Generated by FilamentChange plugin\n" + if enable_after_macro: + color_change = color_change + after_macro + "\n" + + color_change = color_change + ";END FilamentChange plugin\n" layer_targets = layer_nums.split(",") if len(layer_targets) > 0: diff --git a/plugins/UFPWriter/UFPWriter.py b/plugins/UFPWriter/UFPWriter.py index d76bcb1b83..c8064ac37f 100644 --- a/plugins/UFPWriter/UFPWriter.py +++ b/plugins/UFPWriter/UFPWriter.py @@ -229,22 +229,24 @@ class UFPWriter(MeshWriter): "quality": asdict(machine_manager.activeQualityDisplayNameMap()), } + def _retrieveValue(container: InstanceContainer, setting_: str): + value_ = container.getProperty(setting_, "value") + for _ in range(0, 1024): # Prevent possibly endless loop by not using a limit. + if not isinstance(value_, SettingFunction): + return value_ # Success! + value_ = value_(container) + return 0 # Fallback value after breaking possibly endless loop. + 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(): - value = global_flattened_changes.getProperty(setting, "value") - if isinstance(value, SettingFunction): - value = value(global_flattened_changes) - settings["global"]["changes"][setting] = value + settings["global"]["changes"][setting] = _retrieveValue(global_flattened_changes, setting) # Get global all settings values without user or quality changes for setting in global_stack.getAllKeys(): - value = global_stack.getProperty(setting, "value") - if isinstance(value, SettingFunction): - value = value(global_stack) - settings["global"]["all_settings"][setting] = value + settings["global"]["all_settings"][setting] = _retrieveValue(global_stack, setting) for i, extruder in enumerate(global_stack.extruderList): # Add extruder fields to settings dictionary @@ -256,16 +258,10 @@ class UFPWriter(MeshWriter): # Add extruder user or quality changes extruder_flattened_changes = InstanceContainer.createMergedInstanceContainer(extruder.userChanges, extruder.qualityChanges) for setting in extruder_flattened_changes.getAllKeys(): - value = extruder_flattened_changes.getProperty(setting, "value") - if isinstance(value, SettingFunction): - value = value(extruder_flattened_changes) - settings[f"extruder_{i}"]["changes"][setting] = value + settings[f"extruder_{i}"]["changes"][setting] = _retrieveValue(extruder_flattened_changes, setting) # Get extruder all settings values without user or quality changes for setting in extruder.getAllKeys(): - value = extruder.getProperty(setting, "value") - if isinstance(value, SettingFunction): - value = value(extruder) - settings[f"extruder_{i}"]["all_settings"][setting] = value + settings[f"extruder_{i}"]["all_settings"][setting] = _retrieveValue(extruder, setting) return settings diff --git a/printer-linter/src/printerlinter/linters/defintion.py b/printer-linter/src/printerlinter/linters/defintion.py index b0201976be..e27d8a7679 100644 --- a/printer-linter/src/printerlinter/linters/defintion.py +++ b/printer-linter/src/printerlinter/linters/defintion.py @@ -41,21 +41,28 @@ class Definition(Linter): definition = self._definitions[definition_name] if "overrides" in definition and definition_name not in ("fdmprinter", "fdmextruder"): for key, value_dict in definition["overrides"].items(): - is_redefined, value, parent = self._isDefinedInParent(key, value_dict, definition['inherits']) + is_redefined, child_key, child_value, parent = self._isDefinedInParent(key, value_dict, definition['inherits']) if is_redefined: redefined = re.compile(r'.*(\"' + key + r'\"[\s\:\S]*?)\{[\s\S]*?\},?') found = redefined.search(self._content) - yield Diagnostic( - file = self._file, - diagnostic_name = "diagnostic-definition-redundant-override", - message = f"Overriding {key} with the same value ({value}) as defined in parent definition: {definition['inherits']}", - level = "Warning", - offset = found.span(0)[0], + # TODO: Figure out a way to support multiline fixes in the PR review GH Action, for now suggest no fix to ensure no ill-formed json are created + # see: https://github.com/platisd/clang-tidy-pr-comments/issues/37 + if len(found.group().splitlines()) > 1: + replacements = [] + else: replacements = [Replacement( file = self._file, offset = found.span(1)[0], length = len(found.group()), replacement_text = "")] + + yield Diagnostic( + file = self._file, + diagnostic_name = "diagnostic-definition-redundant-override", + message = f"Overriding {key} with the same value ({child_key}: {child_value}) as defined in parent definition: {definition['inherits']}", + level = "Warning", + offset = found.span(0)[0], + replacements = replacements ) def _loadDefinitionFiles(self, definition_file) -> None: @@ -85,28 +92,31 @@ class Definition(Linter): is_number = False else: is_number = self._definitions[self.base_def]["overrides"][key]["type"] in ("float", "int") - for value in value_dict.values(): + for child_key, child_value in value_dict.items(): if key in parent: - check_values = [cv for cv in [parent[key].get("default_value", None), parent[key].get("value", None)] if cv is not None] + if child_key in ("default_value", "value"): + check_values = [cv for cv in [parent[key].get("default_value", None), parent[key].get("value", None)] if cv is not None] + else: + check_values = [parent[key].get(child_key, None)] for check_value in check_values: - if is_number: + if is_number and child_key in ("default_value", "value"): try: - v = str(float(value)) + v = str(float(child_value)) except: - v = value + v = child_value try: cv = str(float(check_value)) except: cv = check_value else: - v = value + v = child_value cv = check_value if v == cv: - return True, value, parent + return True, child_key, child_value, parent if "inherits" in parent: return self._isDefinedInParent(key, value_dict, parent["inherits"]) - return False, None, None + return False, None, None, None def _loadBasePrinterSettings(self): """ TODO @Jelle please explain why this """ diff --git a/printer-linter/src/printerlinter/linters/meshes.py b/printer-linter/src/printerlinter/linters/meshes.py index d49caf7dc9..3023d9bc77 100644 --- a/printer-linter/src/printerlinter/linters/meshes.py +++ b/printer-linter/src/printerlinter/linters/meshes.py @@ -4,12 +4,14 @@ from typing import Iterator from ..diagnostic import Diagnostic from .linter import Linter +MAX_MESH_FILE_SIZE = 1 * 1024 * 1024 # 1MB + class Meshes(Linter): def __init__(self, file: Path, settings: dict) -> None: """ Finds issues in model files, such as incorrect file format or too large size """ super().__init__(file, settings) - self._max_file_size = self._settings.get("diagnostic-mesh-file-size", 1e6) + self._max_file_size = self._settings.get("diagnostic-mesh-file-size", MAX_MESH_FILE_SIZE) def check(self) -> Iterator[Diagnostic]: if self._settings["checks"].get("diagnostic-mesh-file-extension", False): diff --git a/printer-linter/src/terminal.py b/printer-linter/src/terminal.py index e06ccb5e9a..71103a0db2 100644 --- a/printer-linter/src/terminal.py +++ b/printer-linter/src/terminal.py @@ -113,8 +113,11 @@ def extractFilePaths(paths: List[Path]) -> List[Path]: for path in paths: if path.is_dir(): file_paths.extend(path.rglob("**/*")) - else: + if not path.match("*"): file_paths.append(path) + else: + file_paths.extend(Path(*path.parts[:-1]).glob(path.parts[-1])) + continue return file_paths diff --git a/requirements-dev.txt b/requirements-dev.txt index b1e52571ca..cd7b19e389 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,5 +1,5 @@ pytest -pyinstaller +pyinstaller==5.6.2 pyinstaller-hooks-contrib pyyaml sip==6.5.1 diff --git a/resources/definitions/101Hero.def.json b/resources/definitions/101Hero.def.json index 613a9670fd..2921d403da 100644 --- a/resources/definitions/101Hero.def.json +++ b/resources/definitions/101Hero.def.json @@ -1,52 +1,46 @@ { - "version": 2, + "version": 2, "name": "101Hero", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "rikky", "manufacturer": "101Hero", "file_formats": "text/x-gcode", "platform": "101hero-platform.3mf", - "supports_usb_connection": true, + "machine_extruder_trains": { "0": "101Hero_extruder_0" }, "preferred_quality_type": "draft", - "machine_extruder_trains": - { - "0": "101Hero_extruder_0" - } + "supports_usb_connection": true }, - - "overrides": { - "machine_name": { "default_value": "101Hero" }, - "machine_shape": { "default_value": "elliptic"}, - "machine_heated_bed": { "default_value": false }, - "machine_width": { "default_value": 149.86 }, - "machine_depth": { "default_value": 149.86 }, - "machine_height": { "default_value": 99.822 }, + "overrides": + { + "gantry_height": { "value": "0" }, "machine_center_is_zero": { "default_value": true }, - "machine_head_with_fans_polygon": { + "machine_depth": { "default_value": 149.86 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit\nG1 Z0.5 E-5 F840 ;move Z up a bit and retract even more\nG28 X0 Y0 ;home X/Y, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { "default_value": [ - [ 0, 0 ], - [ 0, 0 ], - [ 0, 0 ], - [ 0, 0 ] + [0, 0], + [0, 0], + [0, 0], + [0, 0] ] }, - "speed_print": { "default_value": 14 }, - "speed_travel": { "value": "speed_print" }, - "speed_wall": { "value": "speed_print * 0.7" }, - "speed_topbottom": { "value": "speed_print * 0.7" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 99.822 }, + "machine_name": { "default_value": "101Hero" }, + "machine_shape": { "default_value": "elliptic" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 Z0 ;home Z\nG1 Z15.0 F840\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F840\n;Put printing message on LCD screen\nM117 Printing...\n" }, + "machine_width": { "default_value": 149.86 }, + "retraction_amount": { "default_value": 2.5 }, + "retraction_speed": { "default_value": 10 }, "speed_layer_0": { "value": "speed_print * 0.7" }, - "gantry_height": { "value": "0" }, - "retraction_speed": { "default_value" : 10 }, - "retraction_amount": { "default_value" : 2.5 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 Z0 ;home Z\nG1 Z15.0 F840\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F840\n;Put printing message on LCD screen\nM117 Printing...\n" - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit\nG1 Z0.5 E-5 F840 ;move Z up a bit and retract even more\nG28 X0 Y0 ;home X/Y, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" - } + "speed_print": { "default_value": 14 }, + "speed_topbottom": { "value": "speed_print * 0.7" }, + "speed_travel": { "value": "speed_print" }, + "speed_wall": { "value": "speed_print * 0.7" } } -} +} \ No newline at end of file diff --git a/resources/definitions/3dator.def.json b/resources/definitions/3dator.def.json index ece74ce0b4..dbcef20f24 100644 --- a/resources/definitions/3dator.def.json +++ b/resources/definitions/3dator.def.json @@ -2,34 +2,28 @@ "version": 2, "name": "3Dator", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "3Dator GmbH", "manufacturer": "3Dator GmbH", "file_formats": "text/x-gcode", - "supports_usb_connection": true, "platform": "3dator_platform.3mf", - "machine_extruder_trains": - { - "0": "3dator_extruder_0" - } + "machine_extruder_trains": { "0": "3dator_extruder_0" }, + "supports_usb_connection": true }, - - "overrides": { - "machine_name": { "default_value": "3Dator" }, - "prime_tower_size": { "default_value": 8.660254037844387 }, + "overrides": + { + "adhesion_type": { "default_value": "none" }, + "gantry_height": { "value": "30" }, "infill_sparse_density": { "default_value": 20 }, "layer_height": { "default_value": 0.2 }, - "speed_print": { "default_value": 50 }, - "machine_heated_bed": { "default_value": true }, "machine_center_is_zero": { "default_value": false }, - "machine_height": { "default_value": 260 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_depth": { "default_value": 170 }, - "machine_width": { "default_value": 180 }, - "retraction_speed": {"default_value":100}, - "adhesion_type": { "default_value": "none" }, - "machine_head_with_fans_polygon": { + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { "default_value": [ [-15, -25], [-15, 35], @@ -37,13 +31,13 @@ [40, -25] ] }, - "gantry_height": { - "value": "30" - }, - "machine_start_gcode": { - "default_value": ";Sliced at: {day} {date} {time}\nM104 S{material_print_temperature} ;set temperatures\nM140 S{material_bed_temperature}\nM109 S{material_print_temperature} ;wait for temperatures\nM190 S{material_bed_temperature}\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 Z0 ;move Z to min endstops\nG28 X0 Y0 ;move X/Y to min endstops\nG29 ;Auto Level\nG1 Z0.6 F{speed_travel} ;move the Nozzle near the Bed\nG92 E0\nG1 Y0 ;zero the extruded length\nG1 X10 E30 F500 ;printing a Line from right to left\nG92 E0 ;zero the extruded length again\nG1 Z2\nG1 F{speed_travel}\nM117 Printing...;Put printing message on LCD screen\nM150 R255 U255 B255 P4 ;Change LED Color to white" }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 260 }, + "machine_name": { "default_value": "3Dator" }, + "machine_start_gcode": { "default_value": ";Sliced at: {day} {date} {time}\nM104 S{material_print_temperature} ;set temperatures\nM140 S{material_bed_temperature}\nM109 S{material_print_temperature} ;wait for temperatures\nM190 S{material_bed_temperature}\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 Z0 ;move Z to min endstops\nG28 X0 Y0 ;move X/Y to min endstops\nG29 ;Auto Level\nG1 Z0.6 F{speed_travel} ;move the Nozzle near the Bed\nG92 E0\nG1 Y0 ;zero the extruded length\nG1 X10 E30 F500 ;printing a Line from right to left\nG92 E0 ;zero the extruded length again\nG1 Z2\nG1 F{speed_travel}\nM117 Printing...;Put printing message on LCD screen\nM150 R255 U255 B255 P4 ;Change LED Color to white" }, + "machine_width": { "default_value": 180 }, + "prime_tower_size": { "default_value": 8.660254037844387 }, + "retraction_speed": { "default_value": 100 }, + "speed_print": { "default_value": 50 } } -} +} \ No newline at end of file diff --git a/resources/definitions/3di_base.def.json b/resources/definitions/3di_base.def.json index b86ff4707c..e2972009f1 100644 --- a/resources/definitions/3di_base.def.json +++ b/resources/definitions/3di_base.def.json @@ -1,49 +1,26 @@ -{ - "version": 2, - "name": "3DI Base Printer", - "inherits": "fdmprinter", - "metadata": { - "visible": false, - "author": "Vaibhav Jain", - "manufacturer": "3Deometry Innovations", - "file_formats": "text/x-gcode", - "machine_extruder_trains": - { - "0": "3di_base_extruder_0" - } - }, - - "overrides": { - "machine_name":{ - "default_value": "3DI Base Printer" - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_width": { - "default_value": 220 - }, - "machine_height": { - "default_value": 220 - }, - "machine_depth": { - "default_value": 220 - }, - "machine_center_is_zero": { - "default_value": true - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 ;Home all axes (max endstops)\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG28 ;Home all axes (max endstops)\nM84 ;steppers off\nG90 ;absolute positioning" - }, - "machine_shape": { - "default_value": "elliptic" - } - } -} - +{ + "version": 2, + "name": "3DI Base Printer", + "inherits": "fdmprinter", + "metadata": + { + "visible": false, + "author": "Vaibhav Jain", + "manufacturer": "3Deometry Innovations", + "file_formats": "text/x-gcode", + "machine_extruder_trains": { "0": "3di_base_extruder_0" } + }, + "overrides": + { + "machine_center_is_zero": { "default_value": true }, + "machine_depth": { "default_value": 220 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG28 ;Home all axes (max endstops)\nM84 ;steppers off\nG90 ;absolute positioning" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 220 }, + "machine_name": { "default_value": "3DI Base Printer" }, + "machine_shape": { "default_value": "elliptic" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 ;Home all axes (max endstops)\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, + "machine_width": { "default_value": 220 } + } +} \ No newline at end of file diff --git a/resources/definitions/3di_d300.def.json b/resources/definitions/3di_d300.def.json index 3fad62d339..c3d5c4b8bd 100644 --- a/resources/definitions/3di_d300.def.json +++ b/resources/definitions/3di_d300.def.json @@ -1,26 +1,22 @@ -{ - "version": 2, - "name": "3DI D300", - "inherits": "3di_base", - "metadata": { - "visible": true, - "platform": "3di_d300_platform.STL", - "platform_offset": [-200, -5, 173.205] - }, - - "overrides": { - "machine_name": { - "default_value": "3DI D300" - }, - "machine_width": { - "default_value": 300 - }, - "machine_height": { - "default_value": 300 - }, - "machine_depth": { - "default_value": 300 - } - } -} - +{ + "version": 2, + "name": "3DI D300", + "inherits": "3di_base", + "metadata": + { + "visible": true, + "platform": "3di_d300_platform.STL", + "platform_offset": [ + -200, + -5, + 173.205 + ] + }, + "overrides": + { + "machine_depth": { "default_value": 300 }, + "machine_height": { "default_value": 300 }, + "machine_name": { "default_value": "3DI D300" }, + "machine_width": { "default_value": 300 } + } +} \ No newline at end of file diff --git a/resources/definitions/3dtech_semi_professional.def.json b/resources/definitions/3dtech_semi_professional.def.json index 42111c3d98..5058bb9a99 100644 --- a/resources/definitions/3dtech_semi_professional.def.json +++ b/resources/definitions/3dtech_semi_professional.def.json @@ -2,40 +2,29 @@ "version": 2, "name": "3DTech Semi-Professional", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "3DTech", "manufacturer": "3DTech", "file_formats": "text/x-gcode", "platform": "3dtech_semi_professional_platform.3mf", - "platform_offset": [0, -2.5, 0 ], - "machine_extruder_trains": - { - "0": "3dtech_semi_professional_extruder_0" - } + "machine_extruder_trains": { "0": "3dtech_semi_professional_extruder_0" }, + "platform_offset": [ + 0, + -2.5, + 0 + ] }, - "overrides": { + "overrides": + { + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 250 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0 ; Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_height": { "default_value": 300 }, "machine_name": { "default_value": "3DTECH SP Control" }, - "machine_width": { - "default_value": 250 - }, - "machine_depth": { - "default_value": 250 - }, - "machine_height": { - "default_value": 300 - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G28 ; home all axes\nG29 ;\nG1 Z5 F3000 ; lift\nG1 X5 Y25 F5000 ; move to prime\nG1 Z0.2 F3000 ; get ready to prime\nG92 E0 ; reset extrusion distance\nG1 Y100 E20 F600 ; prime nozzle\nG1 Y140 F5000 ; quick wipe" - }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0 ; Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" - } + "machine_start_gcode": { "default_value": "G28 ; home all axes\nG29 ;\nG1 Z5 F3000 ; lift\nG1 X5 Y25 F5000 ; move to prime\nG1 Z0.2 F3000 ; get ready to prime\nG92 E0 ; reset extrusion distance\nG1 Y100 E20 F600 ; prime nozzle\nG1 Y140 F5000 ; quick wipe" }, + "machine_width": { "default_value": 250 } } -} +} \ No newline at end of file diff --git a/resources/definitions/Geeetech_Base_Dual_Extruder.def.json b/resources/definitions/Geeetech_Base_Dual_Extruder.def.json new file mode 100644 index 0000000000..92dc13d7a9 --- /dev/null +++ b/resources/definitions/Geeetech_Base_Dual_Extruder.def.json @@ -0,0 +1,148 @@ +{ + "version": 2, + "name": "Geeetech Base Dual-Extruder Printer", + "inherits": "fdmprinter", + "metadata": + { + "visible": false, + "author": "Teddy.Hu", + "manufacturer": "Geeetech", + "file_formats": "text/x-gcode", + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": false, + "machine_extruder_trains": + { + "0": "Geeetech_Dual_Extruder_0", + "1": "Geeetech_Dual_Extruder_1" + }, + "preferred_material": "generic_pla", + "preferred_quality_type": "standard", + "preferred_variant_name": "0.4mm Nozzle", + "quality_definition": "Geeetech_Base_Single_Extruder", + "variants_name": "Nozzle Size" + }, + "overrides": + { + "acceleration_print": { "value": 500 }, + "acceleration_travel": { "value": 500 }, + "acceleration_travel_layer_0": { "value": "acceleration_travel" }, + "adhesion_type": { "value": "'skirt'" }, + "brim_replaces_support": { "value": false }, + "cool_min_layer_time": { "value": "1.3 if speed_infill>=200 else 5" }, + "gantry_height": { "value": 40 }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'grid'" }, + "line_width": { "value": "1.125*machine_nozzle_size if speed_infill<=100 else machine_nozzle_size" }, + "machine_acceleration": { "value": 500 }, + "machine_depth": { "default_value": 350 }, + "machine_end_gcode": { "default_value": ";Geeetech Custom end G-code\nG91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers\n\n\n" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-40, 40], + [40, 40], + [40, -40], + [-40, -40] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 350 }, + "machine_max_acceleration_e": { "value": 1000 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 111 }, + "machine_max_feedrate_e": { "value": 40 }, + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_jerk_e": { "value": 4.9 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.3 }, + "machine_name": { "default_value": "Geeetech Base Dual-Extruder Printer" }, + "machine_start_gcode": { "default_value": ";Geeetech Custom Start G-code\nM104 S{material_print_temperature_layer_0} ;Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ;Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ;Wait for Hotend Temperature\nG92 E0 ;Reset Extruder\nG28 ;Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ;ON Light\n;M106 P0 S383 ;ON MainFan 150% if need\n;M106 P1 S255 ;ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ;Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ;Draw the first line\nG92 E0 ;Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ;Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ;Scrape off nozzle residue" }, + "machine_width": { "default_value": 350 }, + "material_bed_temperature": { "maximum_value_warning": 110 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_initial_print_temperature": + { + "minimum_value_warning": "material_standby_temperature - 10", + "value": "material_print_temperature - 5" + }, + "material_print_temperature": + { + "maximum_value": "250", + "value": "200 if speed_infill <=100 else 210 if speed_infill <= 150 else 220 if speed_infill <= 180 else 230" + }, + "material_print_temperature_layer_0": + { + "maximum_value_warning": 250, + "value": "material_print_temperature + 5" + }, + "minimum_interface_area": { "value": 10 }, + "minimum_support_area": { "value": 2 }, + "optimize_wall_printing_order": { "value": true }, + "prime_tower_brim_enable": { "value": true }, + "prime_tower_min_volume": + { + "maximum_value_warning": 150, + "value": 85 + }, + "prime_tower_size": { "value": 30 }, + "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'all'" }, + "retraction_combing_max_distance": { "value": 30 }, + "retraction_hop": { "value": 0.5 }, + "retraction_speed": { "value": 35 }, + "skirt_brim_speed": + { + "maximum_value_warning": "60", + "value": "speed_print_layer_0" + }, + "skirt_gap": { "value": 6 }, + "small_hole_max_size": { "value": "5 if speed_infill>=150 else 0" }, + "speed_layer_0": + { + "maximum_value_warning": "100", + "value": "50 if speed_infill <= 150 else 75" + }, + "speed_print_layer_0": + { + "maximum_value_warning": "60", + "value": "25 if speed_infill <= 150 else 35" + }, + "speed_support": { "value": "speed_print*0.5" }, + "speed_support_bottom": { "value": "speed_support_roof" }, + "speed_support_interface": { "value": "speed_support / 0.8" }, + "speed_support_roof": { "value": "speed_support_interface / 2" }, + "speed_topbottom": { "value": "speed_print" }, + "speed_travel": { "value": "200 if 120<=speed_print<=200 else speed_print if speed_print>200 else 120" }, + "speed_travel_layer_0": + { + "maximum_value_warning": "150", + "value": "speed_layer_0" + }, + "speed_wall": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" }, + "speed_wall_0": { "value": "30 if speed_print==60 else math.ceil(round(speed_print*0.75))" }, + "speed_wall_x": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 5 }, + "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_height": { "value": "layer_height * 3" }, + "support_interface_pattern": { "value": "zigzag" }, + "support_interface_skip_height": { "value": 0.2 }, + "support_pattern": { "value": "'zigzag'" }, + "support_use_towers": { "value": false }, + "support_wall_count": { "value": 0 }, + "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" }, + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, + "travel_avoid_supports": { "value": true }, + "wall_thickness": { "value": "line_width * 2" }, + "wall_transition_filter_deviation": { "value": 0.15 }, + "z_seam_corner": { "value": "'z_seam_corner_inner'" }, + "z_seam_type": { "value": "'sharpest_corner'" } + } +} \ No newline at end of file diff --git a/resources/definitions/Geeetech_Base_Multi_Extruder.def.json b/resources/definitions/Geeetech_Base_Multi_Extruder.def.json new file mode 100644 index 0000000000..bb26709719 --- /dev/null +++ b/resources/definitions/Geeetech_Base_Multi_Extruder.def.json @@ -0,0 +1,149 @@ +{ + "version": 2, + "name": "Geeetech Base Multi-Extruder Printer", + "inherits": "fdmprinter", + "metadata": + { + "visible": false, + "author": "Teddy.Hu", + "manufacturer": "Geeetech", + "file_formats": "text/x-gcode", + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": false, + "machine_extruder_trains": + { + "0": "Geeetech_Multi_Extruder_0", + "1": "Geeetech_Multi_Extruder_1", + "2": "Geeetech_Multi_Extruder_2" + }, + "preferred_material": "generic_pla", + "preferred_quality_type": "standard", + "preferred_variant_name": "0.4mm Nozzle", + "quality_definition": "Geeetech_Base_Single_Extruder", + "variants_name": "Nozzle Size" + }, + "overrides": + { + "acceleration_print": { "value": 500 }, + "acceleration_travel": { "value": 500 }, + "acceleration_travel_layer_0": { "value": "acceleration_travel" }, + "adhesion_type": { "value": "'skirt'" }, + "brim_replaces_support": { "value": false }, + "cool_min_layer_time": { "value": "1.3 if speed_infill>=200 else 5" }, + "gantry_height": { "value": 40 }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'grid'" }, + "line_width": { "value": "1.125*machine_nozzle_size if speed_infill<=100 else machine_nozzle_size" }, + "machine_acceleration": { "value": 500 }, + "machine_depth": { "default_value": 350 }, + "machine_end_gcode": { "default_value": ";Geeetech Custom end G-code\nG91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers\n\n\n" }, + "machine_extruder_count": { "default_value": 3 }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-40, 40], + [40, 40], + [40, -40], + [-40, -40] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 350 }, + "machine_max_acceleration_e": { "value": 1000 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 111 }, + "machine_max_feedrate_e": { "value": 40 }, + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_jerk_e": { "value": 4.9 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.3 }, + "machine_name": { "default_value": "Geeetech Base Multi-Extruder Printer" }, + "machine_start_gcode": { "default_value": ";Geeetech Custom Start G-code\nM104 S{material_print_temperature_layer_0} ;Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ;Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ;Wait for Hotend Temperature\nG92 E0 ;Reset Extruder\nG28 ;Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ;ON Light\n;M106 P0 S383 ;ON MainFan 150% if need\n;M106 P1 S255 ;ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ;Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ;Draw the first line\nG92 E0 ;Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ;Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ;Scrape off nozzle residue" }, + "machine_width": { "default_value": 350 }, + "material_bed_temperature": { "maximum_value_warning": 110 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_initial_print_temperature": + { + "minimum_value_warning": "material_standby_temperature - 10", + "value": "material_print_temperature - 5" + }, + "material_print_temperature": + { + "maximum_value": "250", + "value": "200 if speed_infill <=100 else 210 if speed_infill <= 150 else 220 if speed_infill <= 180 else 230" + }, + "material_print_temperature_layer_0": + { + "maximum_value_warning": 250, + "value": "material_print_temperature + 5" + }, + "minimum_interface_area": { "value": 10 }, + "minimum_support_area": { "value": 2 }, + "optimize_wall_printing_order": { "value": true }, + "prime_tower_brim_enable": { "value": true }, + "prime_tower_min_volume": + { + "maximum_value_warning": 150, + "value": 85 + }, + "prime_tower_size": { "value": 30 }, + "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'all'" }, + "retraction_combing_max_distance": { "value": 30 }, + "retraction_hop": { "value": 0.5 }, + "retraction_speed": { "value": 35 }, + "skirt_brim_speed": + { + "maximum_value_warning": "60", + "value": "speed_print_layer_0" + }, + "skirt_gap": { "value": 6 }, + "small_hole_max_size": { "value": "5 if speed_infill>=150 else 0" }, + "speed_layer_0": + { + "maximum_value_warning": "100", + "value": "50 if speed_infill <= 150 else 75" + }, + "speed_print_layer_0": + { + "maximum_value_warning": "60", + "value": "25 if speed_infill <= 150 else 35" + }, + "speed_support": { "value": "speed_print*0.5" }, + "speed_support_bottom": { "value": "speed_support_roof" }, + "speed_support_interface": { "value": "speed_support / 0.8" }, + "speed_support_roof": { "value": "speed_support_interface / 2" }, + "speed_topbottom": { "value": "speed_print" }, + "speed_travel": { "value": "200 if 120<=speed_print<=200 else speed_print if speed_print>200 else 120" }, + "speed_travel_layer_0": + { + "maximum_value_warning": "150", + "value": "speed_layer_0" + }, + "speed_wall": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" }, + "speed_wall_0": { "value": "30 if speed_print==60 else math.ceil(round(speed_print*0.75))" }, + "speed_wall_x": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 5 }, + "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_height": { "value": "layer_height * 3" }, + "support_interface_pattern": { "value": "zigzag" }, + "support_interface_skip_height": { "value": 0.2 }, + "support_pattern": { "value": "'zigzag'" }, + "support_use_towers": { "value": false }, + "support_wall_count": { "value": 0 }, + "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" }, + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, + "travel_avoid_supports": { "value": true }, + "wall_thickness": { "value": "line_width * 2" }, + "wall_transition_filter_deviation": { "value": 0.15 }, + "z_seam_corner": { "value": "'z_seam_corner_inner'" }, + "z_seam_type": { "value": "'sharpest_corner'" } + } +} \ No newline at end of file diff --git a/resources/definitions/Geeetech_Base_Single_Extruder.def.json b/resources/definitions/Geeetech_Base_Single_Extruder.def.json new file mode 100644 index 0000000000..5a168c0b69 --- /dev/null +++ b/resources/definitions/Geeetech_Base_Single_Extruder.def.json @@ -0,0 +1,136 @@ +{ + "version": 2, + "name": "Geeetech Base Single Extruder Printer", + "inherits": "fdmprinter", + "metadata": + { + "visible": false, + "author": "Teddy.Hu", + "manufacturer": "Geeetech", + "file_formats": "text/x-gcode", + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" }, + "preferred_material": "generic_pla", + "preferred_quality_type": "standard", + "preferred_variant_name": "0.4mm Nozzle", + "quality_definition": "Geeetech_Base_Single_Extruder", + "variants_name": "Nozzle Size" + }, + "overrides": + { + "acceleration_print": { "value": 500 }, + "acceleration_travel": { "value": 500 }, + "acceleration_travel_layer_0": { "value": "acceleration_travel" }, + "adhesion_type": { "value": "'skirt'" }, + "brim_replaces_support": { "value": false }, + "cool_min_layer_time": { "value": "1.3 if speed_infill>=200 else 5" }, + "gantry_height": { "value": 40 }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'grid'" }, + "line_width": { "value": "1.125*machine_nozzle_size if speed_infill<=100 else machine_nozzle_size" }, + "machine_acceleration": { "value": 500 }, + "machine_depth": { "default_value": 350 }, + "machine_end_gcode": { "default_value": ";Geeetech Custom end G-code\nG91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers\n\n\n" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-40, 40], + [40, 40], + [40, -40], + [-40, -40] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 350 }, + "machine_max_acceleration_e": { "value": 1000 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 111 }, + "machine_max_feedrate_e": { "value": 40 }, + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_jerk_e": { "value": 4.9 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.3 }, + "machine_name": { "default_value": "Geeetech Base Single Extruder Printer" }, + "machine_start_gcode": { "default_value": ";Geeetech Custom Start G-code\nM104 S{material_print_temperature_layer_0} ;Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ;Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ;Wait for Hotend Temperature\nG92 E0 ;Reset Extruder\nG28 ;Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ;ON Light\n;M106 P0 S383 ;ON MainFan 150% if need\n;M106 P1 S255 ;ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ;Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ;Draw the first line\nG92 E0 ;Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ;Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ;Scrape off nozzle residue" }, + "machine_width": { "default_value": 350 }, + "material_bed_temperature": { "maximum_value_warning": 110 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_initial_print_temperature": + { + "minimum_value_warning": "material_standby_temperature - 10", + "value": "material_print_temperature - 5" + }, + "material_print_temperature": + { + "maximum_value": "250", + "value": "200 if speed_infill <=100 else 210 if speed_infill <= 150 else 220 if speed_infill <= 180 else 230" + }, + "material_print_temperature_layer_0": + { + "maximum_value_warning": 250, + "value": "material_print_temperature + 5" + }, + "minimum_interface_area": { "value": 10 }, + "minimum_support_area": { "value": 2 }, + "optimize_wall_printing_order": { "value": true }, + "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'all'" }, + "retraction_combing_max_distance": { "value": 30 }, + "retraction_hop": { "value": 0.5 }, + "retraction_speed": { "value": 40 }, + "skirt_brim_speed": + { + "maximum_value_warning": "60", + "value": "speed_print_layer_0" + }, + "skirt_gap": { "value": 6 }, + "small_hole_max_size": { "value": "5 if speed_infill>=150 else 0" }, + "speed_layer_0": + { + "maximum_value_warning": "100", + "value": "50 if speed_infill <= 150 else 75" + }, + "speed_print_layer_0": + { + "maximum_value_warning": "60", + "value": "25 if speed_infill <= 150 else 35" + }, + "speed_support": { "value": "speed_print*0.5" }, + "speed_support_bottom": { "value": "speed_support_roof" }, + "speed_support_interface": { "value": "speed_support / 0.8" }, + "speed_support_roof": { "value": "speed_support_interface / 2" }, + "speed_topbottom": { "value": "speed_print" }, + "speed_travel": { "value": "200 if 120<=speed_print<=200 else speed_print if speed_print>200 else 120" }, + "speed_travel_layer_0": + { + "maximum_value_warning": "150", + "value": "speed_layer_0" + }, + "speed_wall": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" }, + "speed_wall_0": { "value": "30 if speed_print==60 else math.ceil(round(speed_print*0.75))" }, + "speed_wall_x": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 5 }, + "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_height": { "value": "layer_height * 3" }, + "support_interface_pattern": { "value": "zigzag" }, + "support_interface_skip_height": { "value": 0.2 }, + "support_pattern": { "value": "'zigzag'" }, + "support_use_towers": { "value": false }, + "support_wall_count": { "value": 0 }, + "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" }, + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, + "travel_avoid_supports": { "value": true }, + "wall_thickness": { "value": "line_width * 2" }, + "wall_transition_filter_deviation": { "value": 0.15 }, + "z_seam_corner": { "value": "'z_seam_corner_inner'" }, + "z_seam_type": { "value": "'sharpest_corner'" } + } +} \ No newline at end of file diff --git a/resources/definitions/I3MetalMotion.def.json b/resources/definitions/I3MetalMotion.def.json index a9d55969bb..ad191301e1 100644 --- a/resources/definitions/I3MetalMotion.def.json +++ b/resources/definitions/I3MetalMotion.def.json @@ -2,32 +2,26 @@ "version": 2, "name": "I3 Metal Motion", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Peter Felecan", "manufacturer": "eMotionTech", "file_formats": "text/x-gcode", "has_materials": true, - "preferred_material": "emotiontech_pla", - "machine_extruder_trains": - { - "0": "I3MetalMotion_extruder_0" - } + "machine_extruder_trains": { "0": "I3MetalMotion_extruder_0" }, + "preferred_material": "emotiontech_pla" }, - - "overrides": { - "machine_name": { "default_value": "I3MetalMotion" }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 200 }, - "machine_height": { "default_value": 200 }, - "machine_depth": { "default_value": 200 }, + "overrides": + { "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "G28 Z\nG28 X\nG28 Y\nM107 ; Turn off the fan\nG91; Relative positioning\nG1 E-1 ; reduce filament pressure\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn the steppers off" }, "machine_gcode_flavor": { "default_value": "RepRap (RepRap)" }, - "machine_start_gcode": { - "default_value": "G21 ; set units to millimeters\nG90 ; use absolute positioning\nM82 ; absolute extrusion mode\nM104 S{material_print_temperature_layer_0} ; set extruder temp\nM140 S{material_bed_temperature_layer_0} ; set bed temp\nM190 S{material_bed_temperature_layer_0} ; wait for bed temp\nM109 S{material_print_temperature_layer_0} ; wait for extruder temp\nG28 W ; home all\nG92 E0.0 ; reset extruder distance position\nG1 Y-3.0 F1000.0 ; go outside print area\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E21.5 F1000.0 ; intro line\nG92 E0.0 ; reset extruder distance position" - }, - "machine_end_gcode": { - "default_value": "G28 Z\nG28 X\nG28 Y\nM107 ; Turn off the fan\nG91; Relative positioning\nG1 E-1 ; reduce filament pressure\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn the steppers off" - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 200 }, + "machine_name": { "default_value": "I3MetalMotion" }, + "machine_start_gcode": { "default_value": "G21 ; set units to millimeters\nG90 ; use absolute positioning\nM82 ; absolute extrusion mode\nM104 S{material_print_temperature_layer_0} ; set extruder temp\nM140 S{material_bed_temperature_layer_0} ; set bed temp\nM190 S{material_bed_temperature_layer_0} ; wait for bed temp\nM109 S{material_print_temperature_layer_0} ; wait for extruder temp\nG28 W ; home all\nG92 E0.0 ; reset extruder distance position\nG1 Y-3.0 F1000.0 ; go outside print area\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E21.5 F1000.0 ; intro line\nG92 E0.0 ; reset extruder distance position" }, + "machine_width": { "default_value": 200 } } -} +} \ No newline at end of file diff --git a/resources/definitions/Mark2_for_Ultimaker2.def.json b/resources/definitions/Mark2_for_Ultimaker2.def.json index 2418445a26..305a9b18da 100644 --- a/resources/definitions/Mark2_for_Ultimaker2.def.json +++ b/resources/definitions/Mark2_for_Ultimaker2.def.json @@ -2,179 +2,69 @@ "version": 2, "name": "Mark2 for Ultimaker2", "inherits": "ultimaker2_plus", - "metadata": { + "metadata": + { "visible": true, "author": "TheUltimakerCommunity", "manufacturer": "Foehnsturm", - "weight": 0, - "has_variants": true, - "has_materials": true, - "has_machine_quality": false, "file_formats": "text/x-gcode", - "icon": "icon_ultimaker.png", "platform": "ultimaker2_platform.obj", - "platform_texture": "Mark2_for_Ultimaker2_backplate.png", + "has_machine_quality": false, + "has_materials": true, + "has_variants": true, + "icon": "icon_ultimaker.png", "machine_extruder_trains": { "0": "Mark2_extruder1", "1": "Mark2_extruder2" }, - "supported_actions": ["MachineSettingsAction", "UpgradeFirmware"] + "platform_texture": "Mark2_for_Ultimaker2_backplate.png", + "supported_actions": [ + "MachineSettingsAction", + "UpgradeFirmware" + ], + "weight": 0 }, - "overrides": { - "machine_name": { "default_value": "Mark2_for_Ultimaker2" }, - "machine_width": { - "default_value": 223 - }, - "machine_depth": { - "default_value": 223 - }, - "machine_height": { - "default_value": 203 - }, - "gantry_height": { - "value": "52" - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "machine_nozzle_heat_up_speed": { - "default_value": 3.5 - }, - "machine_nozzle_cool_down_speed": { - "default_value": 1.5 - }, - "machine_min_cool_heat_time_window": - { - "default_value": 15.0 - }, - "machine_show_variants": { - "default_value": true - }, - "machine_nozzle_head_distance": { - "default_value": 5 - }, - "machine_heat_zone_length": { - "default_value": 20 - }, - "machine_heated_bed": { - "default_value": true - }, - "speed_wall_x": { - "value": "speed_wall" - }, - "layer_height_0": { - "value": "round(machine_nozzle_size / 1.5, 2)" - }, - "line_width": { - "value": "round(machine_nozzle_size * 0.875, 2)" - }, - "speed_support": { - "value": "speed_wall_0" - }, - "machine_max_feedrate_x": { - "default_value": 250 - }, - "machine_max_feedrate_y": { - "default_value": 250 - }, - "machine_max_feedrate_z": { - "default_value": 40 - }, - "machine_max_feedrate_e": { - "default_value": 45 - }, - "machine_acceleration": { - "default_value": 3000 - }, - "retraction_amount": { - "default_value": 5.1 - }, - "retraction_speed": { - "default_value": 25 - }, - "switch_extruder_retraction_amount": { - "value": "retraction_amount", - "enabled": false - }, - "switch_extruder_retraction_speeds": { - "value": "retraction_speed", - "enabled": false - }, - "switch_extruder_retraction_speed": { - "value": "retraction_retract_speed", - "enabled": false - }, - "switch_extruder_prime_speed": { - "value": "retraction_prime_speed", - "enabled": false - }, - "machine_head_with_fans_polygon": - { - "default_value": [ - [ -44, 14 ], - [ -44, -34 ], - [ 64, 14 ], - [ 64, -34 ] - ] - }, - "machine_use_extruder_offset_to_offset_coords": { - "default_value": false - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode" : { - "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \"G21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nM200 D0 T0 ;reset filament diameter\\nM200 D0 T1\\nG28 Z0; home all\\nG28 X0 Y0\\nG0 Z20 F2400 ;move the platform to 20mm\\nG92 E0\\nM190 S{material_bed_temperature_layer_0}\\nM109 T0 S{material_standby_temperature, 0}\\nM109 T1 S{material_print_temperature_layer_0, 1}\\nM104 T0 S{material_print_temperature_layer_0, 0}\\nT1 ; move to the 2th head\\nG0 Z20 F2400\\nG92 E-7.0 ;prime distance\\nG1 E0 F45 ;purge nozzle\\nG1 E-5.1 F1500 ; retract\\nG1 X90 Z0.01 F5000 ; move away from the prime poop\\nG1 X50 F9000\\nG0 Z20 F2400\\nT0 ; move to the first head\\nM104 T1 S{material_standby_temperature, 1}\\nG0 Z20 F2400\\nM104 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\\nG92 E-7.0\\nG1 E0 F45 ;purge nozzle\\nG1 X60 Z0.01 F5000 ; move away from the prime poop\\nG1 X20 F9000\\nM400 ;finish all moves\\nG92 E0\\n;end of startup sequence\\n\"" - }, - "machine_end_gcode" : { - "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \"G90 ;absolute positioning\\nM104 S0 T0 ;extruder heater off\\nM104 S0 T1\\nM140 S0 ;turn off bed\\nT0 ; move to the first head\\nM107 ;fan off\"" - }, - "machine_extruder_count": { - "default_value": 2 - }, - "acceleration_enabled": - { - "default_value": true - }, - "acceleration_print": - { - "value": "2000" - }, - "acceleration_travel": - { - "value": "acceleration_print if magic_spiralize else 3000" - }, + "overrides": + { + "acceleration_enabled": { "default_value": true }, "acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, + "acceleration_print": { "value": "2000" }, "acceleration_support": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, "acceleration_support_interface": { "value": "acceleration_topbottom" }, "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 500 / 4000)" }, + "acceleration_travel": { "value": "acceleration_print if magic_spiralize else 3000" }, "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 4000)" }, "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 500 / 1000)" }, - "jerk_enabled": + "extruder_prime_pos_abs": { "default_value": false }, + "extruder_prime_pos_x": { - "default_value": true + "default_value": 0.0, + "enabled": false }, - "jerk_travel": + "extruder_prime_pos_y": { - "value": "jerk_print if magic_spiralize else 20" + "default_value": 0.0, + "enabled": false }, + "extruder_prime_pos_z": + { + "default_value": 0.0, + "enabled": false + }, + "gantry_height": { "value": "52" }, + "jerk_enabled": { "default_value": true }, "jerk_layer_0": { "value": "jerk_topbottom" }, "jerk_prime_tower": { "value": "10 if jerk_print < 16 else math.ceil(jerk_print * 15 / 25)" }, "jerk_support": { "value": "10 if jerk_print < 16 else math.ceil(jerk_print * 15 / 25)" }, "jerk_support_interface": { "value": "jerk_topbottom" }, "jerk_topbottom": { "value": "10 if jerk_print < 25 else math.ceil(jerk_print * 10 / 25)" }, + "jerk_travel": { "value": "jerk_print if magic_spiralize else 20" }, + "jerk_travel_layer_0": { "value": "math.ceil(jerk_layer_0 * jerk_travel / jerk_print)" }, "jerk_wall": { "value": "10 if jerk_print < 16 else math.ceil(jerk_print * 15 / 25)" }, "jerk_wall_0": { "value": "10 if jerk_wall < 16 else math.ceil(jerk_wall * 6 / 10)" }, - "jerk_travel_layer_0": { "value": "math.ceil(jerk_layer_0 * jerk_travel / jerk_print)" }, - "extruder_prime_pos_abs": { "default_value": false }, - "extruder_prime_pos_x": { "default_value": 0.0, "enabled": false }, - "extruder_prime_pos_y": { "default_value": 0.0, "enabled": false }, - "extruder_prime_pos_z": { "default_value": 0.0, "enabled": false }, + "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, "layer_start_x": { "default_value": 105.0, @@ -185,19 +75,93 @@ "default_value": 27.0, "enabled": false }, - "prime_tower_position_x": { - "value": "185" - }, - "prime_tower_position_y": { - "value": "160" - }, - "machine_disallowed_areas": { + "line_width": { "value": "round(machine_nozzle_size * 0.875, 2)" }, + "machine_acceleration": { "default_value": 3000 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 223 }, + "machine_disallowed_areas": + { "default_value": [ - [[-115, 112.5], [ -10, 112.5], [ -10, 72.5], [-115, 72.5]], - [[ 115, 112.5], [ 115, 72.5], [ 15, 72.5], [ 15, 112.5]], - [[-115, -112.5], [-115, -87.5], [ 115, -87.5], [ 115, -112.5]], - [[-115, 72.5], [-97, 72.5], [-97, -112.5], [-115, -112.5]] + [ + [-115, 112.5], + [-10, 112.5], + [-10, 72.5], + [-115, 72.5] + ], + [ + [115, 112.5], + [115, 72.5], + [15, 72.5], + [15, 112.5] + ], + [ + [-115, -112.5], + [-115, -87.5], + [115, -87.5], + [115, -112.5] + ], + [ + [-115, 72.5], + [-97, 72.5], + [-97, -112.5], + [-115, -112.5] + ] ] + }, + "machine_end_gcode": { "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \"G90 ;absolute positioning\\nM104 S0 T0 ;extruder heater off\\nM104 S0 T1\\nM140 S0 ;turn off bed\\nT0 ; move to the first head\\nM107 ;fan off\"" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-44, 14], + [-44, -34], + [64, 14], + [64, -34] + ] + }, + "machine_heat_zone_length": { "default_value": 20 }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 203 }, + "machine_max_feedrate_e": { "default_value": 45 }, + "machine_max_feedrate_x": { "default_value": 250 }, + "machine_max_feedrate_y": { "default_value": 250 }, + "machine_max_feedrate_z": { "default_value": 40 }, + "machine_min_cool_heat_time_window": { "default_value": 15.0 }, + "machine_name": { "default_value": "Mark2_for_Ultimaker2" }, + "machine_nozzle_cool_down_speed": { "default_value": 1.5 }, + "machine_nozzle_head_distance": { "default_value": 5 }, + "machine_nozzle_heat_up_speed": { "default_value": 3.5 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "machine_show_variants": { "default_value": true }, + "machine_start_gcode": { "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \"G21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nM200 D0 T0 ;reset filament diameter\\nM200 D0 T1\\nG28 Z0; home all\\nG28 X0 Y0\\nG0 Z20 F2400 ;move the platform to 20mm\\nG92 E0\\nM190 S{material_bed_temperature_layer_0}\\nM109 T0 S{material_standby_temperature, 0}\\nM109 T1 S{material_print_temperature_layer_0, 1}\\nM104 T0 S{material_print_temperature_layer_0, 0}\\nT1 ; move to the 2th head\\nG0 Z20 F2400\\nG92 E-7.0 ;prime distance\\nG1 E0 F45 ;purge nozzle\\nG1 E-5.1 F1500 ; retract\\nG1 X90 Z0.01 F5000 ; move away from the prime poop\\nG1 X50 F9000\\nG0 Z20 F2400\\nT0 ; move to the first head\\nM104 T1 S{material_standby_temperature, 1}\\nG0 Z20 F2400\\nM104 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\\nG92 E-7.0\\nG1 E0 F45 ;purge nozzle\\nG1 X60 Z0.01 F5000 ; move away from the prime poop\\nG1 X20 F9000\\nM400 ;finish all moves\\nG92 E0\\n;end of startup sequence\\n\"" }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": false }, + "machine_width": { "default_value": 223 }, + "prime_tower_position_x": { "value": "185" }, + "prime_tower_position_y": { "value": "160" }, + "retraction_amount": { "default_value": 5.1 }, + "retraction_speed": { "default_value": 25 }, + "speed_support": { "value": "speed_wall_0" }, + "speed_wall_x": { "value": "speed_wall" }, + "switch_extruder_prime_speed": + { + "enabled": false, + "value": "retraction_prime_speed" + }, + "switch_extruder_retraction_amount": + { + "enabled": false, + "value": "retraction_amount" + }, + "switch_extruder_retraction_speed": + { + "enabled": false, + "value": "retraction_retract_speed" + }, + "switch_extruder_retraction_speeds": + { + "enabled": false, + "value": "retraction_speed" } } -} +} \ No newline at end of file diff --git a/resources/definitions/SV01.def.json b/resources/definitions/SV01.def.json index 81af2793dc..3a9d6522da 100644 --- a/resources/definitions/SV01.def.json +++ b/resources/definitions/SV01.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Sovol-SV01", + "name": "Sovol-SV01 (Legacy)", "inherits": "fdmprinter", "metadata": { @@ -15,7 +15,6 @@ }, "overrides": { - "acceleration_enabled": { "value": false }, "acceleration_print": { "value": 500 }, "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, "acceleration_travel": { "value": 500 }, @@ -38,7 +37,6 @@ "machine_max_acceleration_e": { "value": 5000 }, "machine_max_acceleration_x": { "value": 500 }, "machine_max_acceleration_y": { "value": 500 }, - "machine_max_acceleration_z": { "value": 100 }, "machine_max_feedrate_e": { "value": 50 }, "machine_max_feedrate_x": { "value": 500 }, "machine_max_feedrate_y": { "value": 500 }, @@ -56,7 +54,6 @@ "retraction_amount": { "default_value": 3 }, "retraction_speed": { "default_value": 50 }, "skin_overlap": { "value": 10.0 }, - "skirt_brim_speed": { "value": "speed_layer_0" }, "speed_print": { "value": 50.0 }, "wall_0_wipe_dist": { "value": 0.0 }, "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, diff --git a/resources/definitions/SV02.def.json b/resources/definitions/SV02.def.json index 57245e8e68..95b165075b 100644 --- a/resources/definitions/SV02.def.json +++ b/resources/definitions/SV02.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Sovol-SV02", + "name": "Sovol-SV02 (Legacy)", "inherits": "fdmprinter", "metadata": { @@ -19,7 +19,6 @@ }, "overrides": { - "acceleration_enabled": { "value": false }, "acceleration_print": { "value": 500 }, "acceleration_travel": { "value": 500 }, "acceleration_travel_layer_0": { "value": "acceleration_travel" }, @@ -40,11 +39,9 @@ "jerk_travel": { "value": "jerk_print" }, "jerk_travel_layer_0": { "value": "jerk_travel" }, "machine_acceleration": { "value": 500 }, - "machine_center_is_zero": { "default_value": false }, "machine_depth": { "default_value": 240 }, "machine_end_gcode": { "default_value": "M104 S0 ;hotend off\nM140 S0 ;bed off\nG92 E0\nG1 F2000 E-100 ;retract filament 100mm\nG92 E0\nG1 F3000 X0 Y240 ;move bed for easy part removal\nM84 ;disable steppers" }, "machine_extruder_count": { "default_value": 2 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 300 }, "machine_max_acceleration_e": { "value": 500 }, @@ -55,16 +52,14 @@ "machine_max_feedrate_x": { "value": 500 }, "machine_max_feedrate_y": { "value": 500 }, "machine_max_feedrate_z": { "value": 10 }, - "machine_max_jerk_e": { "default_value": 5.0 }, "machine_max_jerk_xy": { "default_value": 5.0 }, "machine_max_jerk_z": { "default_value": 0.4 }, "machine_name": { "default_value": "SV02" }, "machine_start_gcode": { "default_value": "G21 ;metric values\nG28 ;home all\nG90 ;absolute positioning\nM107 ;start with the fan off\nG1 F2400 Z15.0 ;raise the nozzle 15mm\nM109 S{material_print_temperature} ;Set Extruder Temperature and Wait\nM190 S{material_bed_temperature}; Wait for bed temperature to reach target temp\nT0 ;Switch to Extruder 1\nG1 F3000 X5 Y10 Z0.2 ;move to prime start position\nG92 E0 ;reset extrusion distance\nG1 F600 X160 E5 ;prime nozzle in a line\nG1 F5000 X180 ;quick wipe\nG92 E0 ;reset extrusion distance" }, "machine_width": { "default_value": 280 }, "material_diameter": { "default_value": 1.75 }, - "material_final_print_temperature": { "value": 195 }, "material_initial_print_temperature": { "value": "material_print_temperature" }, - "prime_tower_min_volume": { "value": "((resolveOrValue('prime_tower_size') * 0.5) ** 2 * 3.14159 * resolveOrValue('layer_height'))/2" }, + "prime_tower_min_volume": { "value": "((reveOrValue('layer_height'))/2" }, "prime_tower_position_x": { "value": "240" }, "prime_tower_position_y": { "value": "190" }, "prime_tower_size": { "value": "30" }, @@ -76,7 +71,6 @@ "skirt_line_count": { "value": 3 }, "speed_print": { "default_value": 50 }, "top_bottom_thickness": { "default_value": 1 }, - "travel_retract_before_outer_wall": { "default_value": true }, "wall_0_wipe_dist": { "value": 0.0 } } } \ No newline at end of file diff --git a/resources/definitions/SV03.def.json b/resources/definitions/SV03.def.json index 9a550c1960..b3ace64f4a 100644 --- a/resources/definitions/SV03.def.json +++ b/resources/definitions/SV03.def.json @@ -1,66 +1,64 @@ -{ - "version": 2, - "name": "Sovol-SV03", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Sovol", - "manufacturer": "Sovol 3D", - "file_formats": "text/x-gcode", - "has_variants": false, - "has_machine_quality": false, - "preferred_quality_type": "draft", - "machine_extruder_trains": { - "0": "SV03_extruder_0" - } - }, - - "overrides": { - "machine_name": { "default_value": "SV03" }, - "machine_extruder_count": { "default_value": 1 }, - "machine_width": { "default_value": 350 }, - "machine_depth": { "default_value": 350 }, - "machine_height": { "default_value": 400 }, - "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" }, - "acceleration_enabled": { "value": false }, - "jerk_enabled": { "value": false }, - "speed_print": { "value": 50.0 } , - "skirt_brim_speed": { "value": "speed_layer_0" }, - "optimize_wall_printing_order": { "value": "True" }, - "material_initial_print_temperature": { "value": "material_print_temperature" }, - "material_final_print_temperature": { "value": "material_print_temperature" }, - "z_seam_type": { "value": "'back'" }, - "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, - "infill_pattern": { "value": "'lines'" }, - "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 }, - "retraction_amount": { "default_value": 3}, - "retraction_speed": { "default_value": 50}, - "adhesion_type": { "value": "'skirt'" }, - "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\nG29 ;Automatic Leveling\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 X0 Y240 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" } - } -} +{ + "version": 2, + "name": "Sovol-SV03 (Legacy)", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Sovol", + "manufacturer": "Sovol 3D", + "file_formats": "text/x-gcode", + "has_machine_quality": false, + "has_variants": false, + "machine_extruder_trains": { "0": "SV03_extruder_0" }, + "preferred_quality_type": "draft" + }, + "overrides": + { + "acceleration_enabled": { "value": false }, + "acceleration_print": { "value": 500 }, + "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, + "acceleration_travel": { "value": 500 }, + "acceleration_travel_layer_0": { "value": "acceleration_travel" }, + "adhesion_type": { "value": "'skirt'" }, + "infill_before_walls": { "value": false }, + "infill_overlap": { "value": 30.0 }, + "infill_pattern": { "value": "'lines'" }, + "infill_wipe_dist": { "value": 0.0 }, + "jerk_enabled": { "value": false }, + "jerk_print": { "value": 8 }, + "jerk_travel": { "value": "jerk_print" }, + "jerk_travel_layer_0": { "value": "jerk_travel" }, + "machine_acceleration": { "value": 500 }, + "machine_depth": { "default_value": 350 }, + "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 X0 Y240 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_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 400 }, + "machine_max_acceleration_e": { "value": 5000 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 100 }, + "machine_max_feedrate_e": { "value": 50 }, + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_jerk_e": { "value": 5 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.4 }, + "machine_name": { "default_value": "SV03" }, + "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\nG29 ;Automatic Leveling\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_width": { "default_value": 350 }, + "material_diameter": { "default_value": 1.75 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "optimize_wall_printing_order": { "value": "True" }, + "retraction_amount": { "default_value": 3 }, + "retraction_speed": { "default_value": 50 }, + "skin_overlap": { "value": 10.0 }, + "skirt_brim_speed": { "value": "speed_layer_0" }, + "speed_print": { "value": 50.0 }, + "wall_0_wipe_dist": { "value": 0.0 }, + "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, + "z_seam_type": { "value": "'back'" } + } +} \ No newline at end of file diff --git a/resources/definitions/abax_pri3.def.json b/resources/definitions/abax_pri3.def.json index 7f73bea678..7e1aefe90f 100644 --- a/resources/definitions/abax_pri3.def.json +++ b/resources/definitions/abax_pri3.def.json @@ -1,60 +1,31 @@ { - "name": "Abax PRi3", "version": 2, + "name": "Abax PRi3", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "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" - } + "machine_extruder_trains": { "0": "abax_pri3_extruder_0" } }, - "overrides": { - "machine_start_gcode": { - "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 X0 Y0 ;move to the X/Y origin (Home)\nG28 Z0 ;move to the Z origin (Home)\nG1 Z5.0 F200 ;move Z to position 5.0 mm\nG92 E0 ;zero the extruded length\n; -- end of START GCODE --" - }, - "machine_end_gcode": { - "default_value": "; -- END GCODE --\nM104 S0 ;set extruder temperature to zero (turned off)\nM140 S0 ;set temp of bed to Zero \nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament a bit to release some of the pressure\nG1 F2000 X0 Y215 ;move X to min and Y to max \nG90 ;set to absolute positioning\nM84 ;turn off steppers\n; -- end of END GCODE --" - }, - "machine_width": { - "default_value": 225 - }, - "machine_depth": { - "default_value": 220 - }, - "machine_height": { - "default_value": 200 - }, - "machine_heated_bed": { - "default_value": false - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_gcode_flavor": { - "default_value": "RepRap" - }, - "layer_height": { - "default_value": 0.2 - }, - "layer_height_0": { - "default_value": 0.2 - }, - "wall_thickness": { - "value": "1" - }, - "top_bottom_thickness": { - "default_value": 1 - }, - "speed_print": { - "default_value": 40 - }, - "support_enable": { - "default_value": true - } + "overrides": + { + "layer_height": { "default_value": 0.2 }, + "layer_height_0": { "default_value": 0.2 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 220 }, + "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0 ;set extruder temperature to zero (turned off)\nM140 S0 ;set temp of bed to Zero \nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament a bit to release some of the pressure\nG1 F2000 X0 Y215 ;move X to min and Y to max \nG90 ;set to absolute positioning\nM84 ;turn off steppers\n; -- end of END GCODE --" }, + "machine_gcode_flavor": { "default_value": "RepRap" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 200 }, + "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 X0 Y0 ;move to the X/Y origin (Home)\nG28 Z0 ;move to the Z origin (Home)\nG1 Z5.0 F200 ;move Z to position 5.0 mm\nG92 E0 ;zero the extruded length\n; -- end of START GCODE --" }, + "machine_width": { "default_value": 225 }, + "speed_print": { "default_value": 40 }, + "support_enable": { "default_value": true }, + "top_bottom_thickness": { "default_value": 1 }, + "wall_thickness": { "value": "1" } } -} +} \ No newline at end of file diff --git a/resources/definitions/abax_pri5.def.json b/resources/definitions/abax_pri5.def.json index e97994bd61..64bf28d948 100644 --- a/resources/definitions/abax_pri5.def.json +++ b/resources/definitions/abax_pri5.def.json @@ -1,60 +1,31 @@ { - "name": "Abax PRi5", "version": 2, + "name": "Abax PRi5", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "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" - } + "machine_extruder_trains": { "0": "abax_pri5_extruder_0" } }, - "overrides": { - "machine_start_gcode": { - "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 X0 Y0 ;move to the X/Y origin (Home)\nG28 Z0 ;move to the Z origin (Home)\nG1 Z5.0 F200 ;move Z to position 5.0 mm\nG92 E0 ;zero the extruded length\n; -- end of START GCODE --" - }, - "machine_end_gcode": { - "default_value": "; -- END GCODE --\nM104 S0 ;set extruder temperature to zero (turned off)\nM140 S0 ;set temp of bed to Zero \nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament a bit to release some of the pressure\nG1 F2000 X0 Y300 ;move X to min and Y to max \nG90 ;set to absolute positioning\nM84 ;turn off steppers\n; -- end of END GCODE --" - }, - "machine_width": { - "default_value": 310 - }, - "machine_depth": { - "default_value": 310 - }, - "machine_height": { - "default_value": 300 - }, - "machine_heated_bed": { - "default_value": false - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_gcode_flavor": { - "default_value": "RepRap" - }, - "layer_height": { - "default_value": 0.2 - }, - "layer_height_0": { - "default_value": 0.2 - }, - "wall_thickness": { - "value": "1" - }, - "top_bottom_thickness": { - "default_value": 1 - }, - "speed_print": { - "default_value": 40 - }, - "support_enable": { - "default_value": true - } + "overrides": + { + "layer_height": { "default_value": 0.2 }, + "layer_height_0": { "default_value": 0.2 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 310 }, + "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0 ;set extruder temperature to zero (turned off)\nM140 S0 ;set temp of bed to Zero \nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament a bit to release some of the pressure\nG1 F2000 X0 Y300 ;move X to min and Y to max \nG90 ;set to absolute positioning\nM84 ;turn off steppers\n; -- end of END GCODE --" }, + "machine_gcode_flavor": { "default_value": "RepRap" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 300 }, + "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 X0 Y0 ;move to the X/Y origin (Home)\nG28 Z0 ;move to the Z origin (Home)\nG1 Z5.0 F200 ;move Z to position 5.0 mm\nG92 E0 ;zero the extruded length\n; -- end of START GCODE --" }, + "machine_width": { "default_value": 310 }, + "speed_print": { "default_value": 40 }, + "support_enable": { "default_value": true }, + "top_bottom_thickness": { "default_value": 1 }, + "wall_thickness": { "value": "1" } } -} +} \ No newline at end of file diff --git a/resources/definitions/abax_titan.def.json b/resources/definitions/abax_titan.def.json index 0b22634e1f..1c17ea8c8b 100644 --- a/resources/definitions/abax_titan.def.json +++ b/resources/definitions/abax_titan.def.json @@ -1,59 +1,30 @@ { - "name": "Abax Titan", "version": 2, + "name": "Abax Titan", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Abax 3D Technologies", "manufacturer": "Abax 3D Technologies", "file_formats": "text/x-gcode", - "machine_extruder_trains": - { - "0": "abax_titan_extruder_0" - } + "machine_extruder_trains": { "0": "abax_titan_extruder_0" } }, - "overrides": { - "machine_start_gcode": { - "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 X0 Y0 ;move to the X/Y origin (Home)\nG28 Z0 ;move to the Z origin (Home)\nG1 Z5.0 F200 ;move Z to position 5.0 mm\nG92 E0 ;zero the extruded length\n; -- end of START GCODE --" - }, - "machine_end_gcode": { - "default_value": "; -- END GCODE --\nM104 S0 ;set extruder temperature to zero (turned off)\nM140 S0 ;set temp of bed to Zero \nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament a bit to release some of the pressure\nG1 F2000 X0 Y300 ;move X to min and Y to max \nG90 ;set to absolute positioning\nM84 ;turn off steppers\n; -- end of END GCODE --" - }, - "machine_width": { - "default_value": 310 - }, - "machine_depth": { - "default_value": 310 - }, - "machine_height": { - "default_value": 300 - }, - "machine_heated_bed": { - "default_value": false - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_gcode_flavor": { - "default_value": "RepRap" - }, - "layer_height": { - "default_value": 0.2 - }, - "layer_height_0": { - "default_value": 0.2 - }, - "wall_thickness": { - "value": "1" - }, - "top_bottom_thickness": { - "default_value": 1 - }, - "speed_print": { - "default_value": 40 - }, - "support_enable": { - "default_value": true - } + "overrides": + { + "layer_height": { "default_value": 0.2 }, + "layer_height_0": { "default_value": 0.2 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 310 }, + "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0 ;set extruder temperature to zero (turned off)\nM140 S0 ;set temp of bed to Zero \nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament a bit to release some of the pressure\nG1 F2000 X0 Y300 ;move X to min and Y to max \nG90 ;set to absolute positioning\nM84 ;turn off steppers\n; -- end of END GCODE --" }, + "machine_gcode_flavor": { "default_value": "RepRap" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 300 }, + "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 X0 Y0 ;move to the X/Y origin (Home)\nG28 Z0 ;move to the Z origin (Home)\nG1 Z5.0 F200 ;move Z to position 5.0 mm\nG92 E0 ;zero the extruded length\n; -- end of START GCODE --" }, + "machine_width": { "default_value": 310 }, + "speed_print": { "default_value": 40 }, + "support_enable": { "default_value": true }, + "top_bottom_thickness": { "default_value": 1 }, + "wall_thickness": { "value": "1" } } -} +} \ No newline at end of file diff --git a/resources/definitions/alfawise_u20.def.json b/resources/definitions/alfawise_u20.def.json index 5b9b8471c6..fc35da2550 100644 --- a/resources/definitions/alfawise_u20.def.json +++ b/resources/definitions/alfawise_u20.def.json @@ -1,72 +1,35 @@ { - "name": "Alfawise U20", "version": 2, + "name": "Alfawise U20", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Samuel Pinches", "manufacturer": "Alfawise", "file_formats": "text/x-gcode", - "preferred_quality_type": "fast", - "machine_extruder_trains": - { - "0": "alfawise_u20_extruder_0" - } + "machine_extruder_trains": { "0": "alfawise_u20_extruder_0" }, + "preferred_quality_type": "fast" }, - "overrides": { - "machine_name": { - "default_value": "Alfawise U20" - }, - "machine_start_gcode": { - "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 ;home all axis\nG92 E0 ;zero the extruded length\nG1 Z1 F1000 ;move up slightly\nG1 Y60.0 Z0 E9.0 F1000.0;intro line\nG1 Y100.0 E21.5 F1000.0 ;continue line\nG92 E0 ;zero the extruded length again\n; -- end of START GCODE --" - }, - "machine_end_gcode": { - "default_value": "; -- END GCODE --\nM104 S0 ;turn off nozzle heater\nM140 S0 ;turn off bed heater\nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament slightly\nG90 ;set to absolute positioning\nG28 X0 ;move to the X-axis origin (Home)\nG0 Y280 F600 ;bring the bed to the front for easy print removal\nM84 ;turn off stepper motors\n; -- end of END GCODE --" - }, - "machine_width": { - "default_value": 300 - }, - "machine_height": { - "default_value": 400 - }, - "machine_depth": { - "default_value": 300 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_center_is_zero": { - "default_value": false - }, - "gantry_height": { - "value": "10" - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "material_diameter": { - "default_value": 1.75 - }, - "layer_height_0": { - "default_value": 0.2 - }, - "wall_thickness": { - "value": "1.2" - }, - "speed_print": { - "default_value": 40 - }, - "support_enable": { - "default_value": true - }, - "retraction_enable": { - "default_value": true - }, - "retraction_amount": { - "default_value": 5 - }, - "retraction_speed": { - "default_value": 45 - } + "overrides": + { + "gantry_height": { "value": "10" }, + "layer_height_0": { "default_value": 0.2 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 300 }, + "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0 ;turn off nozzle heater\nM140 S0 ;turn off bed heater\nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament slightly\nG90 ;set to absolute positioning\nG28 X0 ;move to the X-axis origin (Home)\nG0 Y280 F600 ;bring the bed to the front for easy print removal\nM84 ;turn off stepper motors\n; -- end of END GCODE --" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "Alfawise U20" }, + "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 ;home all axis\nG92 E0 ;zero the extruded length\nG1 Z1 F1000 ;move up slightly\nG1 Y60.0 Z0 E9.0 F1000.0;intro line\nG1 Y100.0 E21.5 F1000.0 ;continue line\nG92 E0 ;zero the extruded length again\n; -- end of START GCODE --" }, + "machine_width": { "default_value": 300 }, + "material_diameter": { "default_value": 1.75 }, + "retraction_amount": { "default_value": 5 }, + "retraction_enable": { "default_value": true }, + "retraction_speed": { "default_value": 45 }, + "speed_print": { "default_value": 40 }, + "support_enable": { "default_value": true }, + "wall_thickness": { "value": "1.2" } } -} +} \ No newline at end of file diff --git a/resources/definitions/alfawise_u30.def.json b/resources/definitions/alfawise_u30.def.json index b76a1773c5..1bfd6441c9 100644 --- a/resources/definitions/alfawise_u30.def.json +++ b/resources/definitions/alfawise_u30.def.json @@ -1,59 +1,54 @@ { - "name": "Alfawise U30", "version": 2, + "name": "Alfawise U30", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Nicolas Nussbaum", "manufacturer": "Alfawise", "file_formats": "text/x-gcode", - "preferred_quality_type": "fast", - "machine_extruder_trains": - { - "0": "alfawise_u30_extruder_0" - } + "machine_extruder_trains": { "0": "alfawise_u30_extruder_0" }, + "preferred_quality_type": "fast" }, - "overrides": { - "machine_name": { "default_value": "Alfawise U30" }, - "machine_start_gcode": { - "default_value": "; -- START GCODE --\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z1 F1000 ;move up slightly\nG1 Y60.0 Z0 E9.0 F1000.0;intro line\nG1 Y100.0 E21.5 F1000.0 ;continue line\nG92 E0 ;zero the extruded length again\nG1 F80\n;Put printing message on LCD screen\nM117 Printing...\n; -- end of START GCODE --" - }, - "machine_end_gcode": { - "default_value": "; -- END GCODE --\nM104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F80 ;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\nM107 ;turn the fan off; -- end of END GCODE --" - }, - "material_diameter": { "default_value": 1.75 }, - "layer_height_0": { "default_value": 0.2 }, - "wall_thickness": { "value": "1.2" }, - "speed_print": { "default_value": 40 }, - "support_enable": { "default_value": true }, - "retraction_enable": { "default_value": true }, - "retraction_amount": { "default_value": 5 }, - "retraction_speed": { "default_value": 45 }, + "overrides": + { "gantry_height": { "value": "25" }, - "machine_width": { "default_value": 220 }, - "machine_height": { "default_value": 250 }, - "machine_depth": { "default_value": 220 }, + "layer_height_0": { "default_value": 0.2 }, + "machine_acceleration": { "default_value": 300 }, "machine_center_is_zero": { "default_value": false }, - "machine_heated_bed": { "default_value": true }, + "machine_depth": { "default_value": 220 }, + "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F80 ;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\nM107 ;turn the fan off; -- end of END GCODE --" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_max_feedrate_x": { "default_value": 200 }, - "machine_max_feedrate_y": { "default_value": 200 }, - "machine_max_feedrate_z": { "default_value": 5 }, - "machine_max_feedrate_e": { "default_value": 100 }, - "speed_z_hop": { "value": "machine_max_feedrate_z" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 250 }, + "machine_max_acceleration_e": { "default_value": 3000 }, "machine_max_acceleration_x": { "default_value": 500 }, "machine_max_acceleration_y": { "default_value": 500 }, "machine_max_acceleration_z": { "default_value": 10 }, - "machine_max_acceleration_e": { "default_value": 3000 }, - "machine_acceleration": { "default_value": 300 }, + "machine_max_feedrate_e": { "default_value": 100 }, + "machine_max_feedrate_x": { "default_value": 200 }, + "machine_max_feedrate_y": { "default_value": 200 }, + "machine_max_feedrate_z": { "default_value": 5 }, + "machine_max_jerk_e": { "default_value": 5.0 }, "machine_max_jerk_xy": { "default_value": 20.0 }, "machine_max_jerk_z": { "default_value": 0.4 }, - "machine_max_jerk_e": { "default_value": 5.0 }, + "machine_name": { "default_value": "Alfawise U30" }, + "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z1 F1000 ;move up slightly\nG1 Y60.0 Z0 E9.0 F1000.0;intro line\nG1 Y100.0 E21.5 F1000.0 ;continue line\nG92 E0 ;zero the extruded length again\nG1 F80\n;Put printing message on LCD screen\nM117 Printing...\n; -- end of START GCODE --" }, + "machine_steps_per_mm_e": { "default_value": 93 }, "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_steps_per_mm_e": { "default_value": 93 }, + "machine_width": { "default_value": 220 }, + "material_diameter": { "default_value": 1.75 }, + "retraction_amount": { "default_value": 5 }, + "retraction_enable": { "default_value": true }, + "retraction_speed": { "default_value": 45 }, + "skirt_brim_minimal_length": { "default_value": 250 }, "skirt_line_count": { "default_value": 1 }, - "skirt_brim_minimal_length": { "default_value": 250 } + "speed_print": { "default_value": 40 }, + "speed_z_hop": { "value": "machine_max_feedrate_z" }, + "support_enable": { "default_value": true }, + "wall_thickness": { "value": "1.2" } } -} +} \ No newline at end of file diff --git a/resources/definitions/alya3dp.def.json b/resources/definitions/alya3dp.def.json index 4b800226cf..636a020184 100644 --- a/resources/definitions/alya3dp.def.json +++ b/resources/definitions/alya3dp.def.json @@ -9,41 +9,103 @@ "manufacturer": "Kati Hal ARGE", "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", "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", + "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" + ], "has_machine_quality": true, "has_materials": true, "has_variants": false, - "supports_usb_connection": false, - "machine_extruder_trains": - { - "0": "alya3dp_extruder_0" - } + "machine_extruder_trains": { "0": "alya3dp_extruder_0" }, + "platform_offset": [ + -60, + -45, + 75 + ], + "preferred_material": "generic_pla", + "supports_usb_connection": false }, - - "overrides": { + "overrides": + { + "adhesion_type": + { + "default_value": "raft", + "options": + { + "brim": "Brim", + "none": "None", + "raft": "Raft" + } + }, + "gantry_height": { "value": "55" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 100 }, + "machine_end_gcode": { "default_value": ";End GCode\nM104 S0 ;extruder heater off \nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nG28 Z0\nM84 ;steppers off\nG90 ;absolute positioning\n;{profile_string}" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [75, 18], + [18, 18], + [18, 35], + [75, 35] + ] + }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 133 }, "machine_name": { "default_value": "ALYA 3DP" }, - "machine_heated_bed": { "default_value": false }, - "machine_width": { "default_value": 100 }, - "machine_height": { "default_value": 133 }, - "machine_depth": { "default_value": 100 }, - "machine_center_is_zero": { "default_value": false }, - "gantry_height": { "value": "55"}, - "retraction_amount": { "default_value": 1.5 }, - "support_enable": { "default_value": true}, - "machine_head_with_fans_polygon": { - "default_value": [[75, 18],[18, 18],[18, 35],[75, 35]] - }, - "adhesion_type": {"options": {"raft": "Raft" ,"none": "None", "brim": "Brim"}, "default_value": "raft"}, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": - { - "default_value": ";Sliced at: {day} {date} {time} \n ;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density} \n ;Print time: {print_time} \n ;Filament used: {filament_amount}m {filament_weight}g \n ;Filament cost: {filament_cost} \n G28 X0 Y0 ;move X Y to endstops \n G28 Z0 ;move Z to endstops \n ; M190 S{material_bed_temperature} ;bed temp \n M107 ; switch fan off \n M109 S{material_print_temperature} ;extruder temp set \n G1 F3000 \n G1 Z10 \n G92 E0 ;zero the extruded length \n G1 F200 E1 ;extrude 1mm of feed stock \n G92 E0 ;zero the extruded length again \n G4 P7000 ; wait 7000ms \n M117 Printing... ;Put printing message on LCD screen" - }, - "machine_end_gcode": - { - "default_value": ";End GCode\nM104 S0 ;extruder heater off \nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nG28 Z0\nM84 ;steppers off\nG90 ;absolute positioning\n;{profile_string}" - } + "machine_start_gcode": { "default_value": ";Sliced at: {day} {date} {time} \n ;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density} \n ;Print time: {print_time} \n ;Filament used: {filament_amount}m {filament_weight}g \n ;Filament cost: {filament_cost} \n G28 X0 Y0 ;move X Y to endstops \n G28 Z0 ;move Z to endstops \n ; M190 S{material_bed_temperature} ;bed temp \n M107 ; switch fan off \n M109 S{material_print_temperature} ;extruder temp set \n G1 F3000 \n G1 Z10 \n G92 E0 ;zero the extruded length \n G1 F200 E1 ;extrude 1mm of feed stock \n G92 E0 ;zero the extruded length again \n G4 P7000 ; wait 7000ms \n M117 Printing... ;Put printing message on LCD screen" }, + "machine_width": { "default_value": 100 }, + "retraction_amount": { "default_value": 1.5 }, + "support_enable": { "default_value": true } } } \ No newline at end of file diff --git a/resources/definitions/alyanx3dp.def.json b/resources/definitions/alyanx3dp.def.json index 509f252488..2572e9db95 100644 --- a/resources/definitions/alyanx3dp.def.json +++ b/resources/definitions/alyanx3dp.def.json @@ -9,41 +9,103 @@ "manufacturer": "Kati Hal ARGE", "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", "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", + "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" + ], "has_machine_quality": true, "has_materials": true, "has_variants": false, - "supports_usb_connection": false, - "machine_extruder_trains": - { - "0": "alya3dp_extruder_0" - } + "machine_extruder_trains": { "0": "alya3dp_extruder_0" }, + "platform_offset": [ + -104, + 0, + 93 + ], + "preferred_material": "generic_pla", + "supports_usb_connection": false }, - - "overrides": { + "overrides": + { + "adhesion_type": + { + "default_value": "raft", + "options": + { + "brim": "Brim", + "none": "None", + "raft": "Raft" + } + }, + "gantry_height": { "value": "55" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 160 }, + "machine_end_gcode": { "default_value": ";End GCode\nM104 S0 ;extruder heater off \nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nG28 Z0\nM84 ;steppers off\nG90 ;absolute positioning\n;{profile_string}" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [75, 18], + [18, 18], + [18, 35], + [75, 35] + ] + }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 170 }, "machine_name": { "default_value": "ALYA NX 3DP" }, - "machine_heated_bed": { "default_value": false }, - "machine_width": { "default_value": 180 }, - "machine_height": { "default_value": 170 }, - "machine_depth": { "default_value": 160 }, - "machine_center_is_zero": { "default_value": false }, - "gantry_height": { "value": "55"}, - "retraction_amount": { "default_value": 1.5 }, - "support_enable": { "default_value": true}, - "machine_head_with_fans_polygon": { - "default_value": [[75, 18],[18, 18],[18, 35],[75, 35]] - }, - "adhesion_type": {"options": {"raft": "Raft" ,"none": "None", "brim": "Brim"}, "default_value": "raft"}, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": - { - "default_value": ";Sliced at: {day} {date} {time} \n ;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density} \n ;Print time: {print_time} \n ;Filament used: {filament_amount}m {filament_weight}g \n ;Filament cost: {filament_cost} \n G28 X0 Y0 ;move X Y to endstops \n G28 Z0 ;move Z to endstops \n ; M190 S{material_bed_temperature} ;bed temp \n M107 ; switch fan off \n M109 S{material_print_temperature} ;extruder temp set \n G1 F3000 \n G1 Z10 \n G92 E0 ;zero the extruded length \n G1 F200 E1 ;extrude 1mm of feed stock \n G92 E0 ;zero the extruded length again \n G4 P7000 ; wait 7000ms \n M117 Printing... ;Put printing message on LCD screen" - }, - "machine_end_gcode": - { - "default_value": ";End GCode\nM104 S0 ;extruder heater off \nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nG28 Z0\nM84 ;steppers off\nG90 ;absolute positioning\n;{profile_string}" - } + "machine_start_gcode": { "default_value": ";Sliced at: {day} {date} {time} \n ;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density} \n ;Print time: {print_time} \n ;Filament used: {filament_amount}m {filament_weight}g \n ;Filament cost: {filament_cost} \n G28 X0 Y0 ;move X Y to endstops \n G28 Z0 ;move Z to endstops \n ; M190 S{material_bed_temperature} ;bed temp \n M107 ; switch fan off \n M109 S{material_print_temperature} ;extruder temp set \n G1 F3000 \n G1 Z10 \n G92 E0 ;zero the extruded length \n G1 F200 E1 ;extrude 1mm of feed stock \n G92 E0 ;zero the extruded length again \n G4 P7000 ; wait 7000ms \n M117 Printing... ;Put printing message on LCD screen" }, + "machine_width": { "default_value": 180 }, + "retraction_amount": { "default_value": 1.5 }, + "support_enable": { "default_value": true } } } \ No newline at end of file diff --git a/resources/definitions/anet3d.def.json b/resources/definitions/anet3d.def.json index 1946b81bc0..8698d6b5d4 100644 --- a/resources/definitions/anet3d.def.json +++ b/resources/definitions/anet3d.def.json @@ -2,136 +2,120 @@ "version": 2, "name": "anet3d", "inherits": "fdmprinter", - "metadata": { + "metadata": + { + "visible": false, "author": "Tiger.He", "manufacturer": "Anet", - "visible": false, "file_formats": "text/x-gcode", - "first_start_actions": ["MachineSettingsAction"], - - "preferred_variant_name": "0.4mm Nozzle", - "preferred_quality_type": "standard", + "first_start_actions": [ "MachineSettingsAction" ], + "machine_extruder_trains": { "0": "anet3d_extruder_0" }, "preferred_material": "generic_pla", - "machine_extruder_trains": - { - "0": "anet3d_extruder_0" - } + "preferred_quality_type": "standard", + "preferred_variant_name": "0.4mm Nozzle" }, - "overrides": { - "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 }, - + "overrides": + { + "acceleration_enabled": { "value": true }, "acceleration_print": { "value": 1000 }, + "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, "acceleration_travel": { "value": 1000 }, "acceleration_travel_layer_0": { "value": "acceleration_travel" }, - "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, - + "adaptive_layer_height_variation": { "value": 0.04 }, + "adaptive_layer_height_variation_step": { "value": 0.04 }, + "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, + "cool_min_layer_time": { "value": 10 }, + "extruder_prime_pos_x": + { + "maximum_value": "machine_width", + "minimum_value": "0" + }, + "extruder_prime_pos_y": + { + "maximum_value": "machine_depth", + "minimum_value": "0" + }, + "fill_outline_gaps": { "value": false }, + "gantry_height": { "value": "0" }, + "infill_before_walls": { "value": true }, + "infill_overlap": { "value": 30.0 }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, + "infill_wipe_dist": { "value": 0 }, + "jerk_enabled": { "value": false }, "jerk_print": { "value": 30.0 }, "jerk_travel": { "value": "jerk_print" }, "jerk_travel_layer_0": { "value": "jerk_travel" }, - - "acceleration_enabled": { "value": true }, - "jerk_enabled": { "value": false }, - - "speed_print": { "value": 50.0 } , - "speed_infill": { "value": "speed_print * 2" }, - - "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": "speed_print / 2" }, - "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" }, - "speed_support_interface": { "value": "speed_print" }, - "speed_z_hop": { "value": 5 }, - - "skirt_brim_speed": { "value": "speed_layer_0" }, - - "optimize_wall_printing_order": { "value": true }, - - "material_initial_print_temperature": { "value": "material_print_temperature" }, + "machine_acceleration": { "value": 500 }, + "machine_center_is_zero": { "default_value": false }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_max_acceleration_e": { "value": 5000 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 100 }, + "machine_max_feedrate_e": { "value": 50 }, + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_jerk_e": { "value": 5 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.4 }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, + "material_bed_temperature": { "minimum_value": "0" }, + "material_diameter": { "default_value": 1.75 }, "material_final_print_temperature": { "value": "material_print_temperature" }, - - "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": true }, - "infill_overlap": { "value": 30.0 }, - "skin_overlap": { "value": 10.0 }, - "infill_wipe_dist": { "value": 0 }, - "wall_0_wipe_dist": { "value": 0.2 }, - - "fill_outline_gaps": { "value": false }, - - "retraction_speed": + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "material_print_temperature": { "minimum_value": "0" }, + "material_standby_temperature": { "minimum_value": "0" }, + "meshfix_maximum_resolution": { "value": "0.25" }, + "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" }, + "optimize_wall_printing_order": { "value": true }, + "relative_extrusion": { - "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", - "maximum_value": 200 + "enabled": false, + "value": false + }, + "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, + "retraction_combing_max_distance": { "value": 30 }, + "retraction_count_max": { "value": 100 }, + "retraction_extrusion_window": { "value": 10 }, + "retraction_hop": { "value": 1 }, + "retraction_min_travel": { "value": 1.5 }, + "retraction_prime_speed": + { + "maximum_value": 200, + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')" }, "retraction_retract_speed": { - "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", - "maximum_value": 200 + "maximum_value": 200, + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')" }, - "retraction_prime_speed": + "retraction_speed": { - "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", - "maximum_value": 200 + "maximum_value": 200, + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')" }, - - "retraction_hop": { "value": 1 }, - "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, - "retraction_combing_max_distance": { "value": 30 }, + "skin_overlap": { "value": 10.0 }, + "skirt_brim_speed": { "value": "speed_layer_0" }, + "speed_infill": { "value": "speed_print * 2" }, + "speed_layer_0": { "value": "speed_print / 2" }, + "speed_prime_tower": { "value": "speed_print" }, + "speed_print": { "value": 50.0 }, + "speed_roofing": { "value": "speed_topbottom" }, + "speed_support": { "value": "speed_print" }, + "speed_support_interface": { "value": "speed_print" }, + "speed_travel": { "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" }, + "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, + "speed_wall_x": { "value": "speed_wall" }, + "speed_z_hop": { "value": 5 }, + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, "travel_avoid_other_parts": { "value": true }, "travel_avoid_supports": { "value": true }, "travel_retract_before_outer_wall": { "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_min_layer_time": { "value": 10 }, - - "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" }, - - "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, - "wall_thickness": {"value": "line_width * 2" }, - - "material_print_temperature": {"minimum_value": "0"}, - "material_bed_temperature": {"minimum_value": "0"}, - "material_standby_temperature": {"minimum_value": "0"}, - - "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}, - - "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"} + "wall_0_wipe_dist": { "value": 0.2 }, + "wall_thickness": { "value": "line_width * 2" }, + "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, + "z_seam_type": { "value": "'back'" } } -} +} \ No newline at end of file diff --git a/resources/definitions/anet3d_a2.def.json b/resources/definitions/anet3d_a2.def.json index a6192d6c12..118e500de0 100644 --- a/resources/definitions/anet3d_a2.def.json +++ b/resources/definitions/anet3d_a2.def.json @@ -2,30 +2,18 @@ "version": 2, "name": "Anet A2", "inherits": "anet3d", - "metadata": { + "metadata": + { "visible": true, - "machine_extruder_trains": - { - "0": "anet3d_extruder_0" - } + "machine_extruder_trains": { "0": "anet3d_extruder_0" } }, - - "overrides": { + "overrides": + { + "machine_depth": { "default_value": 220 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" }, + "machine_height": { "default_value": 220 }, "machine_name": { "default_value": "Anet A2" }, - "machine_width": { - "default_value": 220 - }, - "machine_depth": { - "default_value": 220 - }, - "machine_height": { - "default_value": 220 - }, - "machine_start_gcode": { - "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" - }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" - } + "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" }, + "machine_width": { "default_value": 220 } } -} +} \ No newline at end of file diff --git a/resources/definitions/anet3d_a2_plus.def.json b/resources/definitions/anet3d_a2_plus.def.json index 8c766577ac..7e8a14a87e 100644 --- a/resources/definitions/anet3d_a2_plus.def.json +++ b/resources/definitions/anet3d_a2_plus.def.json @@ -2,30 +2,18 @@ "version": 2, "name": "Anet A2 Plus", "inherits": "anet3d", - "metadata": { + "metadata": + { "visible": true, - "machine_extruder_trains": - { - "0": "anet3d_extruder_0" - } + "machine_extruder_trains": { "0": "anet3d_extruder_0" } }, - - "overrides": { + "overrides": + { + "machine_depth": { "default_value": 270 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" }, + "machine_height": { "default_value": 220 }, "machine_name": { "default_value": "Anet A2 Plus" }, - "machine_width": { - "default_value": 220 - }, - "machine_depth": { - "default_value": 270 - }, - "machine_height": { - "default_value": 220 - }, - "machine_start_gcode": { - "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" - }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" - } + "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" }, + "machine_width": { "default_value": 220 } } -} +} \ No newline at end of file diff --git a/resources/definitions/anet3d_a6.def.json b/resources/definitions/anet3d_a6.def.json index a98d99a8ca..ecef00b5b5 100644 --- a/resources/definitions/anet3d_a6.def.json +++ b/resources/definitions/anet3d_a6.def.json @@ -2,30 +2,18 @@ "version": 2, "name": "Anet A6", "inherits": "anet3d", - "metadata": { + "metadata": + { "visible": true, - "machine_extruder_trains": - { - "0": "anet3d_extruder_0" - } + "machine_extruder_trains": { "0": "anet3d_extruder_0" } }, - - "overrides": { + "overrides": + { + "machine_depth": { "default_value": 220 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" }, + "machine_height": { "default_value": 250 }, "machine_name": { "default_value": "Anet A6" }, - "machine_width": { - "default_value": 220 - }, - "machine_depth": { - "default_value": 220 - }, - "machine_height": { - "default_value": 250 - }, - "machine_start_gcode": { - "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" - }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" - } + "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" }, + "machine_width": { "default_value": 220 } } -} +} \ No newline at end of file diff --git a/resources/definitions/anet3d_a8.def.json b/resources/definitions/anet3d_a8.def.json index ed0c2a0cc1..d2c8d1b06d 100644 --- a/resources/definitions/anet3d_a8.def.json +++ b/resources/definitions/anet3d_a8.def.json @@ -2,30 +2,18 @@ "version": 2, "name": "Anet A8", "inherits": "anet3d", - "metadata": { + "metadata": + { "visible": true, - "machine_extruder_trains": - { - "0": "anet3d_extruder_0" - } + "machine_extruder_trains": { "0": "anet3d_extruder_0" } }, - - "overrides": { + "overrides": + { + "machine_depth": { "default_value": 220 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" }, + "machine_height": { "default_value": 240 }, "machine_name": { "default_value": "Anet A8" }, - "machine_width": { - "default_value": 220 - }, - "machine_depth": { - "default_value": 220 - }, - "machine_height": { - "default_value": 240 - }, - "machine_start_gcode": { - "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" - }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" - } + "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" }, + "machine_width": { "default_value": 220 } } -} +} \ No newline at end of file diff --git a/resources/definitions/anet3d_a8_plus.def.json b/resources/definitions/anet3d_a8_plus.def.json index baafd53710..84da2bafe2 100644 --- a/resources/definitions/anet3d_a8_plus.def.json +++ b/resources/definitions/anet3d_a8_plus.def.json @@ -2,30 +2,18 @@ "version": 2, "name": "Anet A8 Plus", "inherits": "anet3d", - "metadata": { + "metadata": + { "visible": true, - "machine_extruder_trains": - { - "0": "anet3d_extruder_0" - } + "machine_extruder_trains": { "0": "anet3d_extruder_0" } }, - - "overrides": { + "overrides": + { + "machine_depth": { "default_value": 300 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" }, + "machine_height": { "default_value": 350 }, "machine_name": { "default_value": "Anet A8 Plus" }, - "machine_width": { - "default_value": 300 - }, - "machine_depth": { - "default_value": 300 - }, - "machine_height": { - "default_value": 350 - }, - "machine_start_gcode": { - "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" - }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" - } + "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" }, + "machine_width": { "default_value": 300 } } -} +} \ No newline at end of file diff --git a/resources/definitions/anet3d_e10.def.json b/resources/definitions/anet3d_e10.def.json index 1366751d63..4f742489ae 100644 --- a/resources/definitions/anet3d_e10.def.json +++ b/resources/definitions/anet3d_e10.def.json @@ -2,30 +2,18 @@ "version": 2, "name": "Anet E10", "inherits": "anet3d", - "metadata": { - "visible": true, - "machine_extruder_trains": - { - "0": "anet3d_extruder_0" - } + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "anet3d_extruder_0" } }, - - "overrides": { + "overrides": + { + "machine_depth": { "default_value": 270 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" }, + "machine_height": { "default_value": 300 }, "machine_name": { "default_value": "Anet E10" }, - "machine_width": { - "default_value": 220 - }, - "machine_depth": { - "default_value": 270 - }, - "machine_height": { - "default_value": 300 - }, - "machine_start_gcode": { - "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" - }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" - } + "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" }, + "machine_width": { "default_value": 220 } } -} +} \ No newline at end of file diff --git a/resources/definitions/anet3d_e12.def.json b/resources/definitions/anet3d_e12.def.json index d46db2a4bc..a7cc4ea902 100644 --- a/resources/definitions/anet3d_e12.def.json +++ b/resources/definitions/anet3d_e12.def.json @@ -2,30 +2,18 @@ "version": 2, "name": "Anet E12", "inherits": "anet3d", - "metadata": { - "visible": true, - "machine_extruder_trains": - { - "0": "anet3d_extruder_0" - } + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "anet3d_extruder_0" } }, - - "overrides": { + "overrides": + { + "machine_depth": { "default_value": 300 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" }, + "machine_height": { "default_value": 400 }, "machine_name": { "default_value": "Anet E12" }, - "machine_width": { - "default_value": 300 - }, - "machine_depth": { - "default_value": 300 - }, - "machine_height": { - "default_value": 400 - }, - "machine_start_gcode": { - "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" - }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" - } + "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" }, + "machine_width": { "default_value": 300 } } -} +} \ No newline at end of file diff --git a/resources/definitions/anet3d_e16.def.json b/resources/definitions/anet3d_e16.def.json index 6488b8292d..e0e848a38c 100644 --- a/resources/definitions/anet3d_e16.def.json +++ b/resources/definitions/anet3d_e16.def.json @@ -2,30 +2,18 @@ "version": 2, "name": "Anet E16", "inherits": "anet3d", - "metadata": { - "visible": true, - "machine_extruder_trains": - { - "0": "anet3d_extruder_0" - } + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "anet3d_extruder_0" } }, - - "overrides": { + "overrides": + { + "machine_depth": { "default_value": 300 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" }, + "machine_height": { "default_value": 400 }, "machine_name": { "default_value": "Anet E16" }, - "machine_width": { - "default_value": 300 - }, - "machine_depth": { - "default_value": 300 - }, - "machine_height": { - "default_value": 400 - }, - "machine_start_gcode": { - "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" - }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" - } + "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" }, + "machine_width": { "default_value": 300 } } -} +} \ No newline at end of file diff --git a/resources/definitions/anet3d_et4.def.json b/resources/definitions/anet3d_et4.def.json index 4f626f88aa..ee224f4d14 100644 --- a/resources/definitions/anet3d_et4.def.json +++ b/resources/definitions/anet3d_et4.def.json @@ -2,30 +2,18 @@ "version": 2, "name": "Anet ET4", "inherits": "anet3d", - "metadata": { - "visible": true, - "machine_extruder_trains": - { - "0": "anet3d_extruder_0" - } + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "anet3d_extruder_0" } }, - - "overrides": { + "overrides": + { + "machine_depth": { "default_value": 220 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" }, + "machine_height": { "default_value": 250 }, "machine_name": { "default_value": "Anet ET4" }, - "machine_width": { - "default_value": 220 - }, - "machine_depth": { - "default_value": 220 - }, - "machine_height": { - "default_value": 250 - }, - "machine_start_gcode": { - "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" - }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" - } + "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" }, + "machine_width": { "default_value": 220 } } -} +} \ No newline at end of file diff --git a/resources/definitions/anet3d_et4_pro.def.json b/resources/definitions/anet3d_et4_pro.def.json index 47cd08f50f..fd3f09f85c 100644 --- a/resources/definitions/anet3d_et4_pro.def.json +++ b/resources/definitions/anet3d_et4_pro.def.json @@ -2,30 +2,18 @@ "version": 2, "name": "Anet ET4 Pro", "inherits": "anet3d", - "metadata": { + "metadata": + { "visible": true, - "machine_extruder_trains": - { - "0": "anet3d_extruder_0" - } + "machine_extruder_trains": { "0": "anet3d_extruder_0" } }, - - "overrides": { + "overrides": + { + "machine_depth": { "default_value": 220 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" }, + "machine_height": { "default_value": 250 }, "machine_name": { "default_value": "Anet ET4 Pro" }, - "machine_width": { - "default_value": 220 - }, - "machine_depth": { - "default_value": 220 - }, - "machine_height": { - "default_value": 250 - }, - "machine_start_gcode": { - "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" - }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" - } + "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" }, + "machine_width": { "default_value": 220 } } -} +} \ No newline at end of file diff --git a/resources/definitions/anet3d_et4_x.def.json b/resources/definitions/anet3d_et4_x.def.json index 588bf346ab..1a0b004be3 100644 --- a/resources/definitions/anet3d_et4_x.def.json +++ b/resources/definitions/anet3d_et4_x.def.json @@ -2,30 +2,18 @@ "version": 2, "name": "Anet ET4 X", "inherits": "anet3d", - "metadata": { + "metadata": + { "visible": true, - "machine_extruder_trains": - { - "0": "anet3d_extruder_0" - } + "machine_extruder_trains": { "0": "anet3d_extruder_0" } }, - - "overrides": { + "overrides": + { + "machine_depth": { "default_value": 220 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" }, + "machine_height": { "default_value": 250 }, "machine_name": { "default_value": "Anet ET4 X" }, - "machine_width": { - "default_value": 220 - }, - "machine_depth": { - "default_value": 220 - }, - "machine_height": { - "default_value": 250 - }, - "machine_start_gcode": { - "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" - }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" - } + "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" }, + "machine_width": { "default_value": 220 } } -} +} \ No newline at end of file diff --git a/resources/definitions/anet3d_et5.def.json b/resources/definitions/anet3d_et5.def.json index 36ae4b7405..7c894b666b 100644 --- a/resources/definitions/anet3d_et5.def.json +++ b/resources/definitions/anet3d_et5.def.json @@ -2,30 +2,18 @@ "version": 2, "name": "Anet ET5", "inherits": "anet3d", - "metadata": { - "visible": true, - "machine_extruder_trains": - { - "0": "anet3d_extruder_0" - } + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "anet3d_extruder_0" } }, - - "overrides": { + "overrides": + { + "machine_depth": { "default_value": 300 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" }, + "machine_height": { "default_value": 400 }, "machine_name": { "default_value": "Anet ET5" }, - "machine_width": { - "default_value": 300 - }, - "machine_depth": { - "default_value": 300 - }, - "machine_height": { - "default_value": 400 - }, - "machine_start_gcode": { - "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" - }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" - } + "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" }, + "machine_width": { "default_value": 300 } } -} +} \ No newline at end of file diff --git a/resources/definitions/anet3d_et5_x.def.json b/resources/definitions/anet3d_et5_x.def.json index 471a7e68ba..bae2670362 100644 --- a/resources/definitions/anet3d_et5_x.def.json +++ b/resources/definitions/anet3d_et5_x.def.json @@ -2,30 +2,18 @@ "version": 2, "name": "Anet ET5 X", "inherits": "anet3d", - "metadata": { + "metadata": + { "visible": true, - "machine_extruder_trains": - { - "0": "anet3d_extruder_0" - } + "machine_extruder_trains": { "0": "anet3d_extruder_0" } }, - - "overrides": { + "overrides": + { + "machine_depth": { "default_value": 300 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" }, + "machine_height": { "default_value": 400 }, "machine_name": { "default_value": "Anet ET5 X" }, - "machine_width": { - "default_value": 300 - }, - "machine_depth": { - "default_value": 300 - }, - "machine_height": { - "default_value": 400 - }, - "machine_start_gcode": { - "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" - }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" - } + "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" }, + "machine_width": { "default_value": 300 } } -} +} \ No newline at end of file diff --git a/resources/definitions/ankermake_m5.def.json b/resources/definitions/ankermake_m5.def.json index a7eab04ebc..6d8b0b15e9 100644 --- a/resources/definitions/ankermake_m5.def.json +++ b/resources/definitions/ankermake_m5.def.json @@ -17,7 +17,37 @@ }, "overrides": { - "acceleration_print": { "value": "2500" }, + "acceleration_enabled": { "value": "true" }, + "acceleration_infill": { "maximum_value_warning": "2500" }, + "acceleration_layer_0": { "maximum_value_warning": "2500" }, + "acceleration_prime_tower": { "maximum_value_warning": "2500" }, + "acceleration_print": + { + "maximum_value_warning": "2500", + "value": "2500" + }, + "acceleration_print_layer_0": { "maximum_value_warning": "2500" }, + "acceleration_roofing": { "maximum_value_warning": "2500" }, + "acceleration_skirt_brim": { "maximum_value_warning": "2500" }, + "acceleration_support": { "maximum_value_warning": "2500" }, + "acceleration_support_bottom": { "maximum_value_warning": "2500" }, + "acceleration_support_infill": { "maximum_value_warning": "2500" }, + "acceleration_support_interface": { "maximum_value_warning": "2500" }, + "acceleration_support_roof": { "maximum_value_warning": "2500" }, + "acceleration_topbottom": { "maximum_value_warning": "2500" }, + "acceleration_travel": + { + "maximum_value_warning": "2500", + "value": "acceleration_print" + }, + "acceleration_travel_layer_0": + { + "maximum_value_warning": "2500", + "value": "acceleration_travel" + }, + "acceleration_wall": { "maximum_value_warning": "2500" }, + "acceleration_wall_0": { "maximum_value_warning": "2500" }, + "acceleration_wall_x": { "maximum_value_warning": "2500" }, "adhesion_type": { "default_value": "skirt" }, "cool_min_layer_time": { "value": 6 }, "cool_min_speed": { "value": 30 }, @@ -91,7 +121,6 @@ "top_bottom_thickness": { "value": "layer_height * 4" }, "wall_overhang_angle": { "value": 55 }, "wall_overhang_speed_factor": { "value": 55 }, - "xy_offset_layer_0": { "value": -0.2 }, "zig_zaggify_infill": { "value": "infill_pattern == 'cross' or infill_pattern == 'cross_3d' or infill_pattern == 'lines'" } } } \ No newline at end of file diff --git a/resources/definitions/anycubic_4max.def.json b/resources/definitions/anycubic_4max.def.json index bb27619175..8b9c26c89e 100644 --- a/resources/definitions/anycubic_4max.def.json +++ b/resources/definitions/anycubic_4max.def.json @@ -9,48 +9,15 @@ "manufacturer": "Anycubic", "file_formats": "text/x-gcode", "platform": "anycubic_4max_platform.3mf", - "has_materials": true, - "quality_definition": "anycubic_4max", "has_machine_quality": true, + "has_materials": true, + "machine_extruder_trains": { "0": "anycubic_4max_extruder_0" }, "preferred_quality_type": "normal", - "machine_extruder_trains": - { - "0": "anycubic_4max_extruder_0" - } + "quality_definition": "anycubic_4max" }, - "overrides": { - "machine_name": { "default_value": "Anycubic 4Max" }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 220 }, - "machine_height": {"default_value": 300 }, - "machine_depth": { "default_value": 220 }, - "machine_center_is_zero": { "default_value": false }, - "machine_max_feedrate_x": { "default_value": 300 }, - "machine_max_feedrate_y": { "default_value": 300 }, - "machine_max_feedrate_z": { "default_value": 10 }, - "machine_acceleration": { "default_value": 1500 }, - "machine_max_acceleration_x": { "default_value": 1500 }, - "machine_max_acceleration_y": { "default_value": 1500 }, - "machine_max_acceleration_z": { "default_value": 100 }, - "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)" }, - "jerk_print": { "value": "11" }, - "jerk_support": { "value": "math.ceil(jerk_print * 15 / 25)" }, - "jerk_support_interface": { "value": "jerk_topbottom" }, - "jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" }, - "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" }, - "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" }, - - "gantry_height": { "value": "25.0" }, - "skin_overlap": { "value": "10" }, - "acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, "acceleration_print": { "value": "900" }, @@ -60,7 +27,41 @@ "acceleration_travel": { "value": "acceleration_print" }, "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 3000)" }, "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 1000)" }, - + "adhesion_type": { "default_value": "skirt" }, + "gantry_height": { "value": "25.0" }, + "infill_before_walls": { "value": false }, + "infill_pattern": { "value": "'zigzag'" }, + "jerk_enabled": { "value": "True" }, + "jerk_layer_0": { "value": "jerk_topbottom" }, + "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" }, + "jerk_print": { "value": "11" }, + "jerk_support": { "value": "math.ceil(jerk_print * 15 / 25)" }, + "jerk_support_interface": { "value": "jerk_topbottom" }, + "jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" }, + "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" }, + "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" }, + "machine_acceleration": { "default_value": 1500 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 220 }, + "machine_end_gcode": { "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 P300 S4000" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 300 }, + "machine_max_acceleration_x": { "default_value": 1500 }, + "machine_max_acceleration_y": { "default_value": 1500 }, + "machine_max_acceleration_z": { "default_value": 100 }, + "machine_max_feedrate_x": { "default_value": 300 }, + "machine_max_feedrate_y": { "default_value": 300 }, + "machine_max_feedrate_z": { "default_value": 10 }, + "machine_max_jerk_e": { "default_value": 11.0 }, + "machine_max_jerk_xy": { "default_value": 11.0 }, + "machine_max_jerk_z": { "default_value": 0.4 }, + "machine_name": { "default_value": "Anycubic 4Max" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\nM117 Printing...\nG5" }, + "machine_width": { "default_value": 220 }, + "material_bed_temperature": { "maximum_value": "150" }, + "material_bed_temperature_layer_0": { "maximum_value": "150" }, + "skin_overlap": { "value": "10" }, "speed_layer_0": { "value": "20" }, "speed_print": { "value": "40" }, "speed_support": { "value": "speed_wall_0" }, @@ -69,17 +70,6 @@ "speed_travel": { "value": "60" }, "speed_wall": { "value": "math.ceil(speed_print * 30 / 35)" }, "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 30)" }, - "speed_wall_x": { "value": "speed_wall" }, - - "infill_pattern": {"value": "'zigzag'" }, - "infill_before_walls": {"value": false }, - - "adhesion_type": { "default_value": "skirt" }, - "material_bed_temperature": { "maximum_value": "150" }, - "material_bed_temperature_layer_0": { "maximum_value": "150" }, - - "machine_gcode_flavor":{"default_value": "RepRap (Marlin/Sprinter)"}, - "machine_start_gcode":{"default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\nM117 Printing...\nG5"}, - "machine_end_gcode":{"default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 P300 S4000"} + "speed_wall_x": { "value": "speed_wall" } } -} +} \ No newline at end of file diff --git a/resources/definitions/anycubic_chiron.def.json b/resources/definitions/anycubic_chiron.def.json index 7d6f53603f..56201c3dd2 100644 --- a/resources/definitions/anycubic_chiron.def.json +++ b/resources/definitions/anycubic_chiron.def.json @@ -9,70 +9,35 @@ "manufacturer": "Anycubic", "file_formats": "text/x-gcode", "platform": "anycubic_chiron_platform.obj", - "platform_texture": "anycubic-chiron.png", - "has_materials": true, - "preferred_material": "generic_pla", + "firmware_file": "MarlinChiron.hex", "has_machine_quality": true, - "quality_definition": "anycubic_chiron", + "has_materials": true, + "machine_extruder_trains": { "0": "anycubic_chiron_extruder_0" }, + "platform_texture": "anycubic-chiron.png", + "preferred_material": "generic_pla", "preferred_quality_type": "normal", - "machine_extruder_trains": - { - "0": "anycubic_chiron_extruder_0" - }, - "firmware_file": "MarlinChiron.hex" + "quality_definition": "anycubic_chiron" }, - "overrides": { - "machine_name": - { - "default_value": "Anycubic Chiron" - }, - "machine_heated_bed": - { - "default_value": true - }, - "machine_width": - { - "default_value": 400 - }, - "machine_height": - { - "default_value": 450 - }, - "machine_depth": - { - "default_value": 400 - }, - "machine_center_is_zero": - { - "default_value": false - }, - "gantry_height": - { - "value": "35" - }, + "gantry_height": { "value": "35" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 400 }, + "machine_end_gcode": { "default_value": "G91 ;Change to relative positioning mode for filament retraction and nozzle lifting\nG1 F200 E-4;Retract the filament a bit before lifting the nozzle\nG1 F1000 Z5;Lift nozzle 5mm\nG90 ;Change to absolute positioning mode to prepare for part rermoval\nG1 X0 Y400 ;Move the print to max y pos for part rermoval\nM104 S0 ; Turn off hotend\nM106 S0 ; Turn off cooling fan\nM140 S0 ; Turn off bed\nM84 ; Disable motors\n" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_head_with_fans_polygon": { - "default_value": - [ + "default_value": [ [-45, 50], [-45, -45], [45, 50], [45, -45] ] }, - "machine_gcode_flavor": - { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": - { - "default_value": "M107 ;Start with the fan off\nG21 ;Set units to millimeters\nG91 ;Change to relative positioning mode for retract filament and nozzle lifting\nG1 F200 E-3 ;Retract 3mm filament for a clean start\nG92 E0 ;Zero the extruded length\nG1 F1000 Z5 ;Lift the nozzle 5mm before homing axes\nG90 ;Absolute positioning\nM82 ;Set extruder to absolute mode too\nG28 X0 Y0 ;First move X/Y to min endstops\nG28 Z0 ;Then move Z to min endstops\nG1 F1000 Z15 ;After homing lift the nozzle 15mm before start printing\n" - }, - "machine_end_gcode": - { - "default_value": "G91 ;Change to relative positioning mode for filament retraction and nozzle lifting\nG1 F200 E-4;Retract the filament a bit before lifting the nozzle\nG1 F1000 Z5;Lift nozzle 5mm\nG90 ;Change to absolute positioning mode to prepare for part rermoval\nG1 X0 Y400 ;Move the print to max y pos for part rermoval\nM104 S0 ; Turn off hotend\nM106 S0 ; Turn off cooling fan\nM140 S0 ; Turn off bed\nM84 ; Disable motors\n" - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 450 }, + "machine_name": { "default_value": "Anycubic Chiron" }, + "machine_start_gcode": { "default_value": "M107 ;Start with the fan off\nG21 ;Set units to millimeters\nG91 ;Change to relative positioning mode for retract filament and nozzle lifting\nG1 F200 E-3 ;Retract 3mm filament for a clean start\nG92 E0 ;Zero the extruded length\nG1 F1000 Z5 ;Lift the nozzle 5mm before homing axes\nG90 ;Absolute positioning\nM82 ;Set extruder to absolute mode too\nG28 X0 Y0 ;First move X/Y to min endstops\nG28 Z0 ;Then move Z to min endstops\nG1 F1000 Z15 ;After homing lift the nozzle 15mm before start printing\n" }, + "machine_width": { "default_value": 400 } } -} +} \ No newline at end of file diff --git a/resources/definitions/anycubic_i3_mega.def.json b/resources/definitions/anycubic_i3_mega.def.json index 17817b982c..e52cc5a3a9 100644 --- a/resources/definitions/anycubic_i3_mega.def.json +++ b/resources/definitions/anycubic_i3_mega.def.json @@ -9,56 +9,22 @@ "manufacturer": "Anycubic", "file_formats": "text/x-gcode", "platform": "anycubic_i3_mega_platform.3mf", - "has_materials": true, "has_machine_quality": true, - "preferred_quality_type": "normal", - "machine_extruder_trains": - { - "0": "anycubic_i3_mega_extruder_0" - } + "has_materials": true, + "machine_extruder_trains": { "0": "anycubic_i3_mega_extruder_0" }, + "preferred_quality_type": "normal" }, - "overrides": { - "machine_name": - { - "default_value": "Anycubic i3 Mega" - }, - "machine_heated_bed": - { - "default_value": true - }, - "machine_width": - { - "default_value": 210 - }, - "machine_height": - { - "default_value": 205 - }, - "machine_depth": - { - "default_value": 210 - }, - "machine_center_is_zero": - { - "default_value": false - }, - "gantry_height": - { - "value": "0" - }, - "machine_gcode_flavor": - { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": - { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\nG0 Y20 F{speed_travel}\nM117 Printing...\nG5" - }, - "machine_end_gcode": - { - "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 P300 S4000" - } + "gantry_height": { "value": "0" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 210 }, + "machine_end_gcode": { "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 P300 S4000" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 205 }, + "machine_name": { "default_value": "Anycubic i3 Mega" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\nG0 Y20 F{speed_travel}\nM117 Printing...\nG5" }, + "machine_width": { "default_value": 210 } } -} +} \ No newline at end of file diff --git a/resources/definitions/anycubic_i3_mega_s.def.json b/resources/definitions/anycubic_i3_mega_s.def.json index 21919af4e1..d8e10f97e5 100644 --- a/resources/definitions/anycubic_i3_mega_s.def.json +++ b/resources/definitions/anycubic_i3_mega_s.def.json @@ -9,134 +9,122 @@ "manufacturer": "Anycubic", "file_formats": "text/x-gcode", "platform": "anycubic_i3_mega_s_platform.3mf", + "has_machine_quality": true, "has_materials": true, "has_variants": false, - "has_machine_quality": true, - "preferred_quality_type": "normal", - "machine_extruder_trains": - { - "0": "anycubic_i3_mega_s_extruder_0" - } + "machine_extruder_trains": { "0": "anycubic_i3_mega_s_extruder_0" }, + "preferred_quality_type": "normal" }, - "overrides": { - "machine_name": { "default_value": "Anycubic i3 Mega S/Pro" }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 210 }, - "machine_height": { "default_value": 205 }, - "machine_depth": { "default_value": 210 }, - "machine_center_is_zero": { "default_value": false }, - "gantry_height": { "value": "0" }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { "default_value": ";Profil Homepage: https://github.com/NilsRo/Cura_Anycubic_MegaS_Profile\n\n;Slicer Information - (Support for OctoPrint Slicer Estimator)\n;Slicer info:material_guid;{material_guid}\n;Slicer info:material_id;{material_id}\n;Slicer info:material_brand;{material_brand}\n;Slicer info:material_name;{material_name}\n;Slicer info:filament_cost;{filament_cost}\n;Slicer info:material_bed_temperature;{material_bed_temperature}\n;Slicer info:material_bed_temperature_layer_0;{material_bed_temperature_layer_0}\n;Slicer info:material_print_temperature;{material_print_temperature}\n;Slicer info:material_print_temperature_layer_0;{material_print_temperature_layer_0}\n;Slicer info:material_flow;{material_flow}\n;Slicer info:layer_height;{layer_height}\n;Slicer info:machine_nozzle_size;{machine_nozzle_size}\n;Slicer info:wall_thickness;{wall_thickness}\n;Slicer info:speed_print;{speed_print}\n;Slicer info:speed_topbottom;{speed_topbottom}\n;Slicer info:travel_speed;{travel_speed}\n;Slicer info:support;{support}\n;Slicer info:retraction_speed;{retraction_speed}\n;Slicer info:retraction_amount;{retraction_amount}\n;Slicer info:layer_height;{layer_height}\n;Slicer info:infill_pattern;{infill_pattern}\n;Slicer info:infill_sparse_density;{infill_sparse_density}\n;Slicer info:cool_fan_enabled;{cool_fan_enabled}\n;Slicer info:cool_fan_speed;{cool_fan_speed}\n;Slicer info:sliced_at;{day} {date} {time}\nG21 ; metric values \nG90 ; absolute positioning \nM82 ; set extruder to absolute mode \nM900 K0 ; disable lin. adv. if not set in GCODE\nM107 ; start with the fan off \nM140 S{material_bed_temperature_layer_0} ; Start heating the bed \nG4 S60 ; wait 1 minute \nM104 S{material_print_temperature_layer_0} ; start heating the hot end \nM190 S{material_bed_temperature_layer_0} ; wait for bed \nM109 S{material_print_temperature_layer_0} ; wait for hotend \nM300 S1000 P500 ; BEEP heating done \nG28 X0 Y10 Z0 ; move X/Y to min endstops \nM420 S1 ; Enable leveling \nM420 Z2.0 ; Set leveling fading height to 2 mm \nG0 Z0.15 ; lift nozzle a bit \nG92 E0 ; zero the extruded length \nG1 X50 E20 F500 ; Extrude 20mm of filament in a 5cm line. \nG92 E0 ; zero the extruded length again \nG1 E-2 F500 ; Retract a little \nG1 X50 F500 ; wipe away from the filament line\nG1 X100 F9000 ; Quickly wipe away from the filament line" }, - "machine_end_gcode": { "default_value": "M104 S0 ; Extruder off \nM140 S0 ; Heatbed off \nM107 ; Fan off \nG91 ; relative positioning \nG1 E-5 F300 ; retract a little \nG1 Z+10 E-5 ; X-20 Y-20 F{travel_xy_speed} ; lift print head \nG28 X0 Y0 ; homing \nG1 Y180 F2000 ; reset feedrate \nM84 ; disable stepper motors \nG90 ; absolute positioning \nM300 S440 P200 ; Make Print Completed Tones \nM300 S660 P250 ; beep \nM300 S880 P300 ; beep" }, - - "machine_max_acceleration_x": { "value": 3000 }, - "machine_max_acceleration_y": { "value": 2000 }, - "machine_max_acceleration_z": { "value": 60 }, - "machine_max_acceleration_e": { "value": 10000 }, - "machine_acceleration": { "value": 3000 }, - - "machine_max_feedrate_x": { "default_value": 500 }, - "machine_max_feedrate_y": { "default_value": 500 }, - "machine_max_feedrate_z": { "default_value": 8 }, - - "machine_max_jerk_xy": { "value": 10 }, - "machine_max_jerk_z": { "value": 0.4 }, - "machine_max_jerk_e": { "value": 5 }, - - "material_diameter": { "default_value": 1.75 }, - "material_print_temperature": { "maximum_value_warning": 260 }, - "material_print_temperature_layer_0": { "value": "material_print_temperature + 5", "maximum_value_warning": 260 }, - "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_bed_temperature": { "maximum_value_warning": 110 }, - "material_bed_temperature_layer_0": { "maximum_value_warning": 110 }, - - "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" }, - - "acceleration_print": { "value": 1500 }, "acceleration_enabled": { "value": false }, + "acceleration_print": { "value": 1500 }, + "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, "acceleration_travel": { "value": 3000 }, "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": 10 }, - "jerk_travel_layer_0": { "value": "jerk_travel" }, - "jerk_enabled": { "value": true }, - - "speed_print": { "value": 50.0 } , - - "speed_wall_x": { "value": "speed_wall" }, - "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_travel_layer_0": { "value": "speed_travel" }, - "speed_prime_tower": { "value": "speed_topbottom" }, - "speed_support": { "value": "speed_wall_0" }, - "speed_support_interface": { "value": "speed_topbottom" }, - "speed_z_hop": { "value": 8 }, - - "skirt_brim_speed": { "value": "speed_layer_0" }, - - "optimize_wall_printing_order": { "value": "True" }, - - "infill_sparse_density": { "value": 25 }, - "infill_before_walls": { "value": false }, - "infill_overlap": { "value": 15.0 }, - - "retraction_speed": { "value": 30, "maximum_value_warning": 60 }, - "retraction_retract_speed": { "maximum_value_warning": 60 }, - "retraction_prime_speed": { "maximum_value_warning": 60 }, - - "retraction_hop_enabled": { "value": true }, - "retraction_hop": { "value": 0.075 }, - "retraction_hop_only_when_collides": { "value": true }, - "retraction_amount": { "value": 6 }, - - "retraction_min_travel": { "value": 1.5 }, - "retraction_combing": { "value": "'off'" }, - "retraction_combing_max_distance": { "value": 30 }, - - "travel_avoid_other_parts": { "value": true }, - "travel_avoid_supports": { "value": true }, - "travel_retract_before_outer_wall": { "value": true }, - + "adhesion_type": { "value": "'none' if support_enable else 'skirt'" }, + "brim_replaces_support": { "value": false }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, "cool_fan_speed": { "value": 100 }, "cool_fan_speed_0": { "value": 30 }, - "cool_min_layer_time": { "value": 10 }, - - "adhesion_type": { "value": "'none' if support_enable else 'skirt'" }, - "brim_replaces_support": { "value": false }, + "gantry_height": { "value": "0" }, + "infill_before_walls": { "value": false }, + "infill_overlap": { "value": 15.0 }, + "infill_sparse_density": { "value": 25 }, + "jerk_enabled": { "value": true }, + "jerk_print": { "value": 8 }, + "jerk_travel": { "value": 10 }, + "jerk_travel_layer_0": { "value": "jerk_travel" }, + "machine_acceleration": { "value": 3000 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 210 }, + "machine_end_gcode": { "default_value": "M104 S0 ; Extruder off \nM140 S0 ; Heatbed off \nM107 ; Fan off \nG91 ; relative positioning \nG1 E-5 F300 ; retract a little \nG1 Z+10 E-5 ; X-20 Y-20 F{travel_xy_speed} ; lift print head \nG28 X0 Y0 ; homing \nG1 Y180 F2000 ; reset feedrate \nM84 ; disable stepper motors \nG90 ; absolute positioning \nM300 S440 P200 ; Make Print Completed Tones \nM300 S660 P250 ; beep \nM300 S880 P300 ; beep" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 205 }, + "machine_max_acceleration_e": { "value": 10000 }, + "machine_max_acceleration_x": { "value": 3000 }, + "machine_max_acceleration_y": { "value": 2000 }, + "machine_max_acceleration_z": { "value": 60 }, + "machine_max_feedrate_x": { "default_value": 500 }, + "machine_max_feedrate_y": { "default_value": 500 }, + "machine_max_feedrate_z": { "default_value": 8 }, + "machine_max_jerk_e": { "value": 5 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.4 }, + "machine_name": { "default_value": "Anycubic i3 Mega S/Pro" }, + "machine_start_gcode": { "default_value": ";Profil Homepage: https://github.com/NilsRo/Cura_Anycubic_MegaS_Profile\n\n;Slicer Information - (Support for OctoPrint Slicer Estimator)\n;Slicer info:material_guid;{material_guid}\n;Slicer info:material_id;{material_id}\n;Slicer info:material_brand;{material_brand}\n;Slicer info:material_name;{material_name}\n;Slicer info:filament_cost;{filament_cost}\n;Slicer info:material_bed_temperature;{material_bed_temperature}\n;Slicer info:material_bed_temperature_layer_0;{material_bed_temperature_layer_0}\n;Slicer info:material_print_temperature;{material_print_temperature}\n;Slicer info:material_print_temperature_layer_0;{material_print_temperature_layer_0}\n;Slicer info:material_flow;{material_flow}\n;Slicer info:layer_height;{layer_height}\n;Slicer info:machine_nozzle_size;{machine_nozzle_size}\n;Slicer info:wall_thickness;{wall_thickness}\n;Slicer info:speed_print;{speed_print}\n;Slicer info:speed_topbottom;{speed_topbottom}\n;Slicer info:travel_speed;{travel_speed}\n;Slicer info:support;{support}\n;Slicer info:retraction_speed;{retraction_speed}\n;Slicer info:retraction_amount;{retraction_amount}\n;Slicer info:layer_height;{layer_height}\n;Slicer info:infill_pattern;{infill_pattern}\n;Slicer info:infill_sparse_density;{infill_sparse_density}\n;Slicer info:cool_fan_enabled;{cool_fan_enabled}\n;Slicer info:cool_fan_speed;{cool_fan_speed}\n;Slicer info:sliced_at;{day} {date} {time}\nG21 ; metric values \nG90 ; absolute positioning \nM82 ; set extruder to absolute mode \nM900 K0 ; disable lin. adv. if not set in GCODE\nM107 ; start with the fan off \nM140 S{material_bed_temperature_layer_0} ; Start heating the bed \nG4 S60 ; wait 1 minute \nM104 S{material_print_temperature_layer_0} ; start heating the hot end \nM190 S{material_bed_temperature_layer_0} ; wait for bed \nM109 S{material_print_temperature_layer_0} ; wait for hotend \nM300 S1000 P500 ; BEEP heating done \nG28 X0 Y10 Z0 ; move X/Y to min endstops \nM420 S1 ; Enable leveling \nM420 Z2.0 ; Set leveling fading height to 2 mm \nG0 Z0.15 ; lift nozzle a bit \nG92 E0 ; zero the extruded length \nG1 X50 E20 F500 ; Extrude 20mm of filament in a 5cm line. \nG92 E0 ; zero the extruded length again \nG1 E-2 F500 ; Retract a little \nG1 X50 F500 ; wipe away from the filament line\nG1 X100 F9000 ; Quickly wipe away from the filament line" }, + "machine_width": { "default_value": 210 }, + "material_bed_temperature": { "maximum_value_warning": 110 }, + "material_bed_temperature_layer_0": { "maximum_value_warning": 110 }, + "material_diameter": { "default_value": 1.75 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_print_temperature": { "maximum_value_warning": 260 }, + "material_print_temperature_layer_0": + { + "maximum_value_warning": 260, + "value": "material_print_temperature + 5" + }, + "meshfix_maximum_deviation": { "value": 0.05 }, + "minimum_interface_area": { "value": 10 }, + "minimum_support_area": { "value": 2 }, + "optimize_wall_printing_order": { "value": "True" }, + "retraction_amount": { "value": 6 }, + "retraction_combing": { "value": "'off'" }, + "retraction_combing_max_distance": { "value": 30 }, + "retraction_hop": { "value": 0.075 }, + "retraction_hop_enabled": { "value": true }, + "retraction_hop_only_when_collides": { "value": true }, + "retraction_min_travel": { "value": 1.5 }, + "retraction_prime_speed": { "maximum_value_warning": 60 }, + "retraction_retract_speed": { "maximum_value_warning": 60 }, + "retraction_speed": + { + "maximum_value_warning": 60, + "value": 30 + }, + "skirt_brim_speed": { "value": "speed_layer_0" }, "skirt_gap": { "value": 5.0 }, "skirt_line_count": { "value": 2 }, - - "meshfix_maximum_deviation": { "value": 0.05 }, + "speed_layer_0": { "value": "speed_topbottom if speed_topbottom < 20 else 20" }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_print": { "value": 50.0 }, + "speed_roofing": { "value": "speed_topbottom" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_support_interface": { "value": "speed_topbottom" }, + "speed_travel": + { + "maximum_value": 200.0, + "maximum_value_warning": 150.0, + "value": 100.0 + }, + "speed_travel_layer_0": { "value": "speed_travel" }, + "speed_wall_x": { "value": "speed_wall" }, + "speed_z_hop": { "value": 8 }, "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_top_distance": { "value": "extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance') + (layer_height if support_structure == 'tree' else 0)"}, - "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_structure": { "value": "'tree'" }, - "support_type": { "value": "'buildplate' if support_structure == 'tree' else 'everywhere'" }, - "support_interface_height": { "value": "layer_height * 4" }, + "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, "support_interface_density": { "value": 33.333 }, + "support_interface_enable": { "value": true }, + "support_interface_height": { "value": "layer_height * 4" }, "support_interface_pattern": { "value": "'grid'" }, "support_interface_skip_height": { "value": 0.2 }, - "minimum_support_area": { "value": 2 }, - "minimum_interface_area": { "value": 10 } + "support_pattern": { "value": "'zigzag'" }, + "support_structure": { "value": "'tree'" }, + "support_top_distance": { "value": "extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance') + (layer_height if support_structure == 'tree' else 0)" }, + "support_type": { "value": "'buildplate' if support_structure == 'tree' else 'everywhere'" }, + "support_use_towers": { "value": false }, + "support_wall_count": { "value": 1 }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height * 2" }, + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * math.floor(1.2 / layer_height)" }, + "travel_avoid_other_parts": { "value": true }, + "travel_avoid_supports": { "value": true }, + "travel_retract_before_outer_wall": { "value": true }, + "wall_thickness": { "value": "line_width * 3 if line_width < 0.6 else line_width * 2" } } -} +} \ No newline at end of file diff --git a/resources/definitions/anycubic_i3_mega_x.def.json b/resources/definitions/anycubic_i3_mega_x.def.json index 52ce84bd33..d7c4e107d2 100644 --- a/resources/definitions/anycubic_i3_mega_x.def.json +++ b/resources/definitions/anycubic_i3_mega_x.def.json @@ -4,33 +4,36 @@ "inherits": "anycubic_i3_mega_s", "metadata": { - "quality_definition": "anycubic_i3_mega_s", - "platform": "anycubic_i3_mega_x_platform.stl" + "platform": "anycubic_i3_mega_x_platform.stl", + "quality_definition": "anycubic_i3_mega_s" }, "overrides": { - "machine_name": { "default_value": "Anycubic i3 Mega X" }, - "machine_width": { "default_value": 300 }, - "machine_height": { "default_value": 305 }, + "acceleration_print": { "value": 400 }, + "acceleration_travel": { "value": 400 }, + "machine_acceleration": { "value": 3000 }, "machine_depth": { "default_value": 300 }, - + "machine_height": { "default_value": 305 }, + "machine_max_acceleration_e": { "value": 10000 }, "machine_max_acceleration_x": { "value": 400 }, "machine_max_acceleration_y": { "value": 400 }, "machine_max_acceleration_z": { "value": 60 }, - "machine_max_acceleration_e": { "value": 10000 }, - "machine_acceleration": { "value": 3000 }, - "machine_max_feedrate_x": { "default_value": 120 }, "machine_max_feedrate_y": { "default_value": 120 }, "machine_max_feedrate_z": { "default_value": 20 }, - - "speed_travel": { "value": 100.0, "maximum_value": 120.0 }, - - "acceleration_print": { "value": 400 }, - "acceleration_travel": { "value": 400 }, - - "retraction_speed": { "value": 30, "maximum_value_warning": 60 }, + "machine_name": { "default_value": "Anycubic i3 Mega X" }, + "machine_width": { "default_value": 300 }, + "retraction_prime_speed": { "maximum_value_warning": 60 }, "retraction_retract_speed": { "maximum_value_warning": 60 }, - "retraction_prime_speed": { "maximum_value_warning": 60 } + "retraction_speed": + { + "maximum_value_warning": 60, + "value": 30 + }, + "speed_travel": + { + "maximum_value": 120.0, + "value": 100.0 + } } } \ No newline at end of file diff --git a/resources/definitions/anycubic_kobra.def.json b/resources/definitions/anycubic_kobra.def.json index cb80d0e248..695740d5da 100644 --- a/resources/definitions/anycubic_kobra.def.json +++ b/resources/definitions/anycubic_kobra.def.json @@ -8,47 +8,22 @@ "author": "Jason Chen", "manufacturer": "Anycubic", "file_formats": "text/x-gcode", - "has_materials": true, - "preferred_material": "generic_pla", + "firmware_file": "MarlinChiron.hex", "has_machine_quality": true, - "quality_definition": "anycubic_kobra", + "has_materials": true, + "machine_extruder_trains": { "0": "anycubic_kobra_extruder_0" }, + "preferred_material": "generic_pla", "preferred_quality_type": "pla", - "machine_extruder_trains": - { - "0": "anycubic_kobra_extruder_0" - }, - "firmware_file": "MarlinChiron.hex" + "quality_definition": "anycubic_kobra" }, - "overrides": { - "machine_name": - { - "default_value": "Anycubic Kobra" - }, - "machine_heated_bed": - { - "default_value": true - }, - "machine_width": - { - "default_value": 222 - }, - "machine_height": - { - "default_value": 252 - }, - "machine_depth": - { - "default_value": 222 - }, - "machine_gcode_flavor": - { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": - { - "default_value": "G28 ;Home\nG1 Z15.0 F1200 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" - } + "machine_depth": { "default_value": 222 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 252 }, + "machine_name": { "default_value": "Anycubic Kobra" }, + "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F1200 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" }, + "machine_width": { "default_value": 222 } } -} +} \ No newline at end of file diff --git a/resources/definitions/anycubic_kobra_max.def.json b/resources/definitions/anycubic_kobra_max.def.json index 034fc3db2b..d1c344ebca 100644 --- a/resources/definitions/anycubic_kobra_max.def.json +++ b/resources/definitions/anycubic_kobra_max.def.json @@ -8,47 +8,22 @@ "author": "Jason Chen", "manufacturer": "Anycubic", "file_formats": "text/x-gcode", - "has_materials": true, - "preferred_material": "generic_pla", + "firmware_file": "MarlinChiron.hex", "has_machine_quality": true, - "quality_definition": "anycubic_kobra_max", + "has_materials": true, + "machine_extruder_trains": { "0": "anycubic_kobra_max_extruder_0" }, + "preferred_material": "generic_pla", "preferred_quality_type": "pla", - "machine_extruder_trains": - { - "0": "anycubic_kobra_max_extruder_0" - }, - "firmware_file": "MarlinChiron.hex" + "quality_definition": "anycubic_kobra_max" }, - "overrides": { - "machine_name": - { - "default_value": "Anycubic Kobra Max" - }, - "machine_heated_bed": - { - "default_value": true - }, - "machine_width": - { - "default_value": 402 - }, - "machine_height": - { - "default_value": 452 - }, - "machine_depth": - { - "default_value": 402 - }, - "machine_gcode_flavor": - { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": - { - "default_value": "G28 ;Home\nG1 Z15.0 F1200 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" - } + "machine_depth": { "default_value": 402 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 452 }, + "machine_name": { "default_value": "Anycubic Kobra Max" }, + "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F1200 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" }, + "machine_width": { "default_value": 402 } } -} +} \ No newline at end of file diff --git a/resources/definitions/anycubic_kossel.def.json b/resources/definitions/anycubic_kossel.def.json index 33eb6ccaa1..28d6ac141d 100644 --- a/resources/definitions/anycubic_kossel.def.json +++ b/resources/definitions/anycubic_kossel.def.json @@ -1,65 +1,76 @@ { - "name": "Anycubic Kossel", "version": 2, + "name": "Anycubic Kossel", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": false, "author": "Allester Fox", "manufacturer": "Anycubic", "file_formats": "text/x-gcode", - "preferred_variant_name": "0.4mm Nozzle", - "preferred_quality_type": "standard", - "preferred_material": "generic_pla", "platform": "kossel_platform.3mf", - "machine_extruder_trains": { - "0": "anycubic_kossel_extruder_0" - } + "machine_extruder_trains": { "0": "anycubic_kossel_extruder_0" }, + "preferred_material": "generic_pla", + "preferred_quality_type": "standard", + "preferred_variant_name": "0.4mm Nozzle" }, - "overrides": { - "machine_heated_bed": { - "default_value": true - }, - "machine_width": { - "default_value": 180 - }, - "machine_height": { - "default_value": 300 - }, - "machine_depth": { - "default_value": 180 - }, - "machine_center_is_zero": { - "default_value": true - }, - "machine_nozzle_heat_up_speed": { - "default_value": 2 - }, - "machine_nozzle_cool_down_speed": { - "default_value": 2 - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM107 ;start with the fan off\nG28 ;move to endstops\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\n;Put printing message on LCD screen\nM117 Printing..." - }, - "machine_end_gcode": { - "default_value": "M400 ;Free buffer\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 F{speed_travel} Z+1 E-5 ;move Z up a bit and retract filament even more\nG90 ;absolute positioning\nM104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off\nM107 ;fan off\nM84 ;steppers off\nG28 ;move to endstop\nM84 ;steppers off" - }, - "machine_shape": { - "default_value": "elliptic" - }, - "machine_disallowed_areas": { + "overrides": + { + "machine_center_is_zero": { "default_value": true }, + "machine_depth": { "default_value": 180 }, + "machine_disallowed_areas": + { "default_value": [ - [[-50, -85], [-85, -85], [-90, -90]], - [[-85, -85], [-85, -50], [-90, -90]], - [[50, -85], [85, -85], [90, -90]], - [[85, -85], [85, -50], [90, -90]], - [[-50, 85], [-85, 85], [-90, 90]], - [[-85, 85], [-85, 50], [-90, 90]], - [[50, 85], [85, 85], [90, 90]], - [[85, 85], [85, 50], [90, 90]] + [ + [-50, -85], + [-85, -85], + [-90, -90] + ], + [ + [-85, -85], + [-85, -50], + [-90, -90] + ], + [ + [50, -85], + [85, -85], + [90, -90] + ], + [ + [85, -85], + [85, -50], + [90, -90] + ], + [ + [-50, 85], + [-85, 85], + [-90, 90] + ], + [ + [-85, 85], + [-85, 50], + [-90, 90] + ], + [ + [50, 85], + [85, 85], + [90, 90] + ], + [ + [85, 85], + [85, 50], + [90, 90] + ] ] - } + }, + "machine_end_gcode": { "default_value": "M400 ;Free buffer\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 F{speed_travel} Z+1 E-5 ;move Z up a bit and retract filament even more\nG90 ;absolute positioning\nM104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off\nM107 ;fan off\nM84 ;steppers off\nG28 ;move to endstop\nM84 ;steppers off" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 300 }, + "machine_nozzle_cool_down_speed": { "default_value": 2 }, + "machine_nozzle_heat_up_speed": { "default_value": 2 }, + "machine_shape": { "default_value": "elliptic" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM107 ;start with the fan off\nG28 ;move to endstops\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\n;Put printing message on LCD screen\nM117 Printing..." }, + "machine_width": { "default_value": 180 } } -} +} \ No newline at end of file diff --git a/resources/definitions/anycubic_kossel_linear_plus.def.json b/resources/definitions/anycubic_kossel_linear_plus.def.json index 9683cf61cf..8f8080d58f 100644 --- a/resources/definitions/anycubic_kossel_linear_plus.def.json +++ b/resources/definitions/anycubic_kossel_linear_plus.def.json @@ -1,36 +1,67 @@ { - "name": "Anycubic Kossel Linear Plus", "version": 2, + "name": "Anycubic Kossel Linear Plus", "inherits": "anycubic_kossel", - "metadata": { + "metadata": + { "visible": true, "platform": "kossel_pro_build_platform.3mf", - "platform_offset": [0, -0.25, 0], - "machine_extruder_trains": { - "0": "anycubic_kossel_extruder_0" - } + "machine_extruder_trains": { "0": "anycubic_kossel_extruder_0" }, + "platform_offset": [ + 0, + -0.25, + 0 + ] }, - "overrides": { - "machine_name": { - "default_value": "Anycubic Kossel Linear Plus" - }, - "machine_width": { - "default_value": 240 - }, - "machine_depth": { - "default_value": 240 - }, - "machine_disallowed_areas": { + "overrides": + { + "machine_depth": { "default_value": 240 }, + "machine_disallowed_areas": + { "default_value": [ - [[-50, -115], [-115, -115], [-90, -90]], - [[-115, -115], [-115, -50], [-90, -90]], - [[50, -115], [115, -115], [90, -90]], - [[115, -115], [115, -50], [90, -90]], - [[-50, 115], [-115, 115], [-90, 90]], - [[-115, 115], [-115, 50], [-90, 90]], - [[50, 115], [115, 115], [90, 90]], - [[115, 115], [115, 50], [90, 90]] + [ + [-50, -115], + [-115, -115], + [-90, -90] + ], + [ + [-115, -115], + [-115, -50], + [-90, -90] + ], + [ + [50, -115], + [115, -115], + [90, -90] + ], + [ + [115, -115], + [115, -50], + [90, -90] + ], + [ + [-50, 115], + [-115, 115], + [-90, 90] + ], + [ + [-115, 115], + [-115, 50], + [-90, 90] + ], + [ + [50, 115], + [115, 115], + [90, 90] + ], + [ + [115, 115], + [115, 50], + [90, 90] + ] ] - } + }, + "machine_name": { "default_value": "Anycubic Kossel Linear Plus" }, + "machine_width": { "default_value": 240 } } -} +} \ No newline at end of file diff --git a/resources/definitions/anycubic_kossel_pulley.def.json b/resources/definitions/anycubic_kossel_pulley.def.json index fd9e1ee4ef..d9d32d965f 100644 --- a/resources/definitions/anycubic_kossel_pulley.def.json +++ b/resources/definitions/anycubic_kossel_pulley.def.json @@ -1,16 +1,14 @@ { - "name": "Anycubic Kossel Pulley", "version": 2, + "name": "Anycubic Kossel Pulley", "inherits": "anycubic_kossel", - "metadata": { + "metadata": + { "visible": true, - "machine_extruder_trains": { - "0": "anycubic_kossel_extruder_0" - } + "machine_extruder_trains": { "0": "anycubic_kossel_extruder_0" } }, - "overrides": { - "machine_name": { - "default_value": "Anycubic Kossel Pulley" - } + "overrides": + { + "machine_name": { "default_value": "Anycubic Kossel Pulley" } } -} +} \ No newline at end of file diff --git a/resources/definitions/anycubic_mega_zero.def.json b/resources/definitions/anycubic_mega_zero.def.json index 30bf702aa4..177f659652 100644 --- a/resources/definitions/anycubic_mega_zero.def.json +++ b/resources/definitions/anycubic_mega_zero.def.json @@ -9,107 +9,65 @@ "manufacturer": "Anycubic", "file_formats": "text/x-gcode", "platform": "anycubic_mega_zero_platform.stl", - "has_materials": true, "has_machine_quality": true, - "preferred_quality_type": "normal", + "has_materials": true, + "machine_extruder_trains": { "0": "anycubic_mega_zero_extruder_0" }, "preferred_material": "generic_pla", - "machine_extruder_trains": - { - "0": "anycubic_mega_zero_extruder_0" - } + "preferred_quality_type": "normal" }, - "overrides": { - "machine_name": - { - "default_value": "Anycubic Mega Zero" - }, - "machine_heated_bed": - { - "default_value": false - }, - "machine_width": - { - "default_value": 220 - }, - "machine_depth": - { - "default_value": 220 - }, - "machine_height": - { - "default_value": 250 - }, - "machine_center_is_zero": - { - "default_value": false - }, - "gantry_height": - { - "value": 25 - }, - "machine_gcode_flavor": - { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": - { - "default_value": ";Sliced at: {day} {date} {time}\n;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {infill_sparse_density}\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nM117 Start heating ...\nM104 S{material_print_temperature_layer_0}\nM117 Homing X/Y ...\nG28 X0 Y0 ;move X/Y to min endstops\nM117 Homing Z ...\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nM117 Heating ...\nM109 S{material_print_temperature_layer_0}\nM117 Start cleaning ...\nG92 E0 ;zero the extruded length\nG1 F200 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nM117 Intro line ...\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z{layer_height} F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z{layer_height} F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z{layer_height} 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 E-1 F500 ; Retract filiment by 1 mm\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F{speed_travel} ; Move over to prevent blob squish\nG1 F{speed_travel}\nG92 E0 ; Reset Extruder\nM117 Printing...\n" - }, - "machine_end_gcode": - { - "default_value": "M117 Cooling down...\nM104 S0 ; turn off extruder\nM84 ; disable motors\nM107 ; Fan off\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;move X to min endstops, so the head is out of the way\nG90 ;Absolute positioning\nG1 Y200 F3000 ;Present print\nM84 ;steppers off\nM300 P300 S4000\nM117 Finished.\n" - }, - "machine_max_feedrate_x": { "value": 500 }, - "machine_max_feedrate_y": { "value": 500 }, - "machine_max_feedrate_z": { "value": 5 }, - "machine_max_feedrate_e": { "value": 30 }, - - "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 }, + "acceleration_enabled": { "value": false }, "acceleration_print": { "value": 500 }, "acceleration_travel": { "value": 500 }, - "acceleration_enabled": { "value": false }, - - "machine_max_jerk_xy": { "value": 10 }, - "machine_max_jerk_z": { "value": 0.3 }, - "machine_max_jerk_e": { "value": 15 }, + "adhesion_type": { "value": "'skirt'" }, + "cool_fan_full_at_height": { "value": "layer_height_0" }, + "gantry_height": { "value": 25 }, + "jerk_enabled": { "value": false }, "jerk_print": { "value": 10 }, "jerk_travel": { "value": "jerk_print" }, "jerk_travel_layer_0": { "value": "jerk_travel" }, - "jerk_enabled": { "value": false }, - - "speed_print": { "value": 50.0 }, - "speed_z_hop": { "value": "machine_max_feedrate_z" }, - - "optimize_wall_printing_order": { "value": "True" }, - "material_initial_print_temperature": { "value": "material_print_temperature" }, + "machine_acceleration": { "value": 500 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 220 }, + "machine_end_gcode": { "default_value": "M117 Cooling down...\nM104 S0 ; turn off extruder\nM84 ; disable motors\nM107 ; Fan off\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;move X to min endstops, so the head is out of the way\nG90 ;Absolute positioning\nG1 Y200 F3000 ;Present print\nM84 ;steppers off\nM300 P300 S4000\nM117 Finished.\n" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 250 }, + "machine_max_acceleration_e": { "value": 5000 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 100 }, + "machine_max_feedrate_e": { "value": 30 }, + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 5 }, + "machine_max_jerk_e": { "value": 15 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.3 }, + "machine_name": { "default_value": "Anycubic Mega Zero" }, + "machine_start_gcode": { "default_value": ";Sliced at: {day} {date} {time}\n;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {infill_sparse_density}\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nM117 Start heating ...\nM104 S{material_print_temperature_layer_0}\nM117 Homing X/Y ...\nG28 X0 Y0 ;move X/Y to min endstops\nM117 Homing Z ...\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nM117 Heating ...\nM109 S{material_print_temperature_layer_0}\nM117 Start cleaning ...\nG92 E0 ;zero the extruded length\nG1 F200 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nM117 Intro line ...\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z{layer_height} F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z{layer_height} F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z{layer_height} 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 E-1 F500 ; Retract filiment by 1 mm\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F{speed_travel} ; Move over to prevent blob squish\nG1 F{speed_travel}\nG92 E0 ; Reset Extruder\nM117 Printing...\n" }, + "machine_width": { "default_value": 220 }, "material_final_print_temperature": { "value": "material_print_temperature" }, - - "retraction_hop_enabled": { "value": "True" }, - "retraction_hop": { "value": 0.2 }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "optimize_wall_printing_order": { "value": "True" }, + "retraction_amount": { "value": 7 }, "retraction_combing": { "value": "'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_speed": { "value": 30 }, - "retraction_amount": { "value": 7 }, "retraction_count_max": { "value": 100 }, "retraction_extrusion_window": { "value": 10 }, + "retraction_hop": { "value": 0.2 }, + "retraction_hop_enabled": { "value": "True" }, "retraction_min_travel": { "value": 1.5 }, - - "cool_fan_full_at_height": { "value": "layer_height_0" }, - "adhesion_type": { "value": "'skirt'" }, - "skirt_line_count": {"default_value": 3}, + "retraction_speed": { "value": 30 }, + "skirt_line_count": { "default_value": 3 }, + "speed_print": { "value": 50.0 }, + "speed_z_hop": { "value": "machine_max_feedrate_z" }, "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.1 else layer_height*2" } + "support_z_distance": { "value": "layer_height if layer_height > 0.1 else layer_height*2" }, + "travel_avoid_other_parts": { "value": true }, + "travel_avoid_supports": { "value": true }, + "travel_retract_before_outer_wall": { "value": true } } -} +} \ No newline at end of file diff --git a/resources/definitions/anycubic_vyper.def.json b/resources/definitions/anycubic_vyper.def.json index 7fe4877214..5547b53806 100644 --- a/resources/definitions/anycubic_vyper.def.json +++ b/resources/definitions/anycubic_vyper.def.json @@ -1,47 +1,27 @@ { - "version": 2, - "name": "Anycubic Vyper", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "ThatGuyZim", - "manufacturer": "Anycubic", - "file_formats": "text/x-gcode", - "platform": "anycubic_vyper_platform.stl", - "machine_extruder_trains": { - "0": "anycubic_vyper_extruder_0" - } - }, - "overrides": { - "machine_name": { - "default_value": "Anycubic Vyper" - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_width": { - "default_value": 250 - }, - "machine_height": { - "default_value": 265 - }, - "machine_depth": { - "default_value": 255 - }, - "machine_center_is_zero": { - "default_value": false - }, - "gantry_height": { - "value": "0" - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nM300 S1318 P266\nG28 Z0 ;move Z to min endstops\nG0 Z0.2\nG92 E0 ;zero the extruded length\nG1 X40 E25 F400 ; Extrude 25mm of filament in a 4cm line. Reduce speed (F) if you have a nozzle smaller than 0.4mm!\nG92 E0 ;zero the extruded length again\nG1 E-1 F500 ; Retract a little\nG1 X80 F4000 ; Quickly wipe away from the filament line\nM117 ; Printing…\nG5" - }, - "machine_end_gcode": { - "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 S1318 P266" - } - } + "version": 2, + "name": "Anycubic Vyper", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "ThatGuyZim", + "manufacturer": "Anycubic", + "file_formats": "text/x-gcode", + "platform": "anycubic_vyper_platform.stl", + "machine_extruder_trains": { "0": "anycubic_vyper_extruder_0" } + }, + "overrides": + { + "gantry_height": { "value": "0" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 255 }, + "machine_end_gcode": { "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 S1318 P266" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 265 }, + "machine_name": { "default_value": "Anycubic Vyper" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nM300 S1318 P266\nG28 Z0 ;move Z to min endstops\nG0 Z0.2\nG92 E0 ;zero the extruded length\nG1 X40 E25 F400 ; Extrude 25mm of filament in a 4cm line. Reduce speed (F) if you have a nozzle smaller than 0.4mm!\nG92 E0 ;zero the extruded length again\nG1 E-1 F500 ; Retract a little\nG1 X80 F4000 ; Quickly wipe away from the filament line\nM117 ; Printing\u2026\nG5" }, + "machine_width": { "default_value": 250 } + } } \ No newline at end of file diff --git a/resources/definitions/arjun300.def.json b/resources/definitions/arjun300.def.json index 94c1889fd3..564d2b7278 100644 --- a/resources/definitions/arjun300.def.json +++ b/resources/definitions/arjun300.def.json @@ -2,51 +2,59 @@ "version": 2, "name": "Arjun 300", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Venkat Kamesh", "manufacturer": "Sri Vignan Technologies", - "weight": 3, "file_formats": "text/x-gcode", "platform": "arjun300_platform.stl", - "platform_offset": [-155, -6, 190], "has_material": true, "has_variants": true, - "preferred_variant_name": "0.4 mm Nozzle", "machine_extruder_trains": { "0": "arjun_extruder_0", "1": "arjun_extruder_1" - } + }, + "platform_offset": [ + -155, + -6, + 190 + ], + "preferred_variant_name": "0.4 mm Nozzle", + "weight": 3 }, - - "overrides": { - "machine_name": { "default_value": "Arjun 300" }, - "machine_width": { "default_value": 317 }, - "machine_height": { "default_value": 290 }, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "ironing_enabled": { "default_value": true }, + "line_width": { "value": "machine_nozzle_size" }, + "machine_acceleration": { "default_value": 2000 }, + "machine_center_is_zero": { "default_value": false }, "machine_depth": { "default_value": 310 }, - "machine_center_is_zero": {"default_value": false}, + "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0 T1\nM104 S0 T0\nM140 S0\nM117\nG28 X0 Y0\nT0\nM84" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "Marlin" }, "machine_heated_bed": { "default_value": true }, - "machine_nozzle_size": {"default_value": 0.4}, - "machine_show_variants": {"default_value": true}, - "machine_acceleration": {"default_value": 2000}, + "machine_height": { "default_value": 290 }, + "machine_max_feedrate_e": { "value": 150 }, "machine_max_feedrate_x": { "value": 300 }, "machine_max_feedrate_y": { "value": 300 }, "machine_max_feedrate_z": { "value": 15 }, - "machine_max_feedrate_e": { "value": 150 }, - "machine_use_extruder_offset_to_offset_coords": {"default_value": false}, - "line_width": {"value": "machine_nozzle_size"}, - "speed_travel": {"maximum_value": "300", "value": "200"}, + "machine_name": { "default_value": "Arjun 300" }, + "machine_nozzle_size": { "default_value": 0.4 }, + "machine_show_variants": { "default_value": true }, + "machine_start_gcode": { "default_value": "M605 S0\nG21\nG90\nM82\nM107\nT1\nG28\nG1 Z0.3 F150\nT1\nG92 E0\nG1 E45 F210\nG92 E0\nT0\nG92 E0\nG1 E45 F210\nG92 E0\nM117\n" }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": false }, + "machine_width": { "default_value": 317 }, + "material_diameter": { "default_value": 1.75 }, "optimize_wall_printing_order": { "value": "True" }, - "material_diameter": { "default_value": 1.75}, - "retraction_amount": {"default_value": 6.5}, - "retraction_speed": { "default_value": 30}, - - "adhesion_type": { "default_value": "skirt" }, - "machine_gcode_flavor": { "default_value": "Marlin"}, - "ironing_enabled":{"default_value": true}, - "machine_start_gcode": { "default_value": "M605 S0\nG21\nG90\nM82\nM107\nT1\nG28\nG1 Z0.3 F150\nT1\nG92 E0\nG1 E45 F210\nG92 E0\nT0\nG92 E0\nG1 E45 F210\nG92 E0\nM117\n"}, - "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0 T1\nM104 S0 T0\nM140 S0\nM117\nG28 X0 Y0\nT0\nM84"}, - "machine_extruder_count": { "default_value": 2 } + "retraction_amount": { "default_value": 6.5 }, + "retraction_speed": { "default_value": 30 }, + "speed_travel": + { + "maximum_value": "300", + "value": "200" + } } -} +} \ No newline at end of file diff --git a/resources/definitions/arjun_duplication.def.json b/resources/definitions/arjun_duplication.def.json index d5a4b2ee72..c261a453cd 100644 --- a/resources/definitions/arjun_duplication.def.json +++ b/resources/definitions/arjun_duplication.def.json @@ -2,48 +2,49 @@ "version": 2, "name": "Arjun 300 Duplication", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Venkat Kamesh", "manufacturer": "Sri Vignan Technologies", - "weight": 3, "file_formats": "text/x-gcode", "has_material": true, "has_variants": true, + "machine_extruder_trains": { "0": "arjun_dm_extruder" }, "preferred_variant_name": "0.4 mm Nozzle", - "machine_extruder_trains": - { - "0": "arjun_dm_extruder" - } + "weight": 3 }, - - "overrides": { - "machine_name": { "default_value": "Arjun 300 Duplication" }, - "machine_width": { "default_value": 158.5 }, - "machine_height": { "default_value": 290 }, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "ironing_enabled": { "default_value": true }, + "line_width": { "value": "machine_nozzle_size" }, + "machine_acceleration": { "default_value": 2000 }, + "machine_center_is_zero": { "default_value": false }, "machine_depth": { "default_value": 310 }, - "machine_center_is_zero": {"default_value": false}, + "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_gcode_flavor": { "default_value": "Marlin" }, "machine_heated_bed": { "default_value": true }, - "machine_nozzle_size": {"default_value": 0.4}, - "machine_show_variants": {"default_value": true}, - "machine_acceleration": {"default_value": 2000}, + "machine_height": { "default_value": 290 }, + "machine_max_feedrate_e": { "value": 150 }, "machine_max_feedrate_x": { "value": 300 }, "machine_max_feedrate_y": { "value": 300 }, "machine_max_feedrate_z": { "value": 15 }, - "machine_max_feedrate_e": { "value": 150 }, - "machine_use_extruder_offset_to_offset_coords": {"default_value": false}, - "line_width": {"value": "machine_nozzle_size"}, - "speed_travel": {"maximum_value": "300", "value": "200"}, + "machine_name": { "default_value": "Arjun 300 Duplication" }, + "machine_nozzle_size": { "default_value": 0.4 }, + "machine_show_variants": { "default_value": true }, + "machine_start_gcode": { "default_value": "M605 S2 R0 X155\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 Z0\nG1 Z15 F150\nG28 Y0\nG1 Y20 F6000\nG28 X0\nG1 X80 F9000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X145 F9000\nM117\n" }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": false }, + "machine_width": { "default_value": 158.5 }, + "material_diameter": { "default_value": 1.75 }, "optimize_wall_printing_order": { "value": "True" }, - "material_diameter": { "default_value": 1.75}, - "retraction_amount": {"default_value": 6.5}, - "retraction_speed": { "default_value": 30}, - - "adhesion_type": { "default_value": "skirt" }, - "machine_gcode_flavor": { "default_value": "Marlin"}, - "ironing_enabled":{"default_value": true}, - "machine_start_gcode": {"default_value": "M605 S2 R0 X155\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 Z0\nG1 Z15 F150\nG28 Y0\nG1 Y20 F6000\nG28 X0\nG1 X80 F9000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X145 F9000\nM117\n"}, - "machine_end_gcode": {"default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84"}, - "machine_extruder_count": { "default_value": 1 } + "retraction_amount": { "default_value": 6.5 }, + "retraction_speed": { "default_value": 30 }, + "speed_travel": + { + "maximum_value": "300", + "value": "200" + } } -} +} \ No newline at end of file diff --git a/resources/definitions/arjun_mirrored.def.json b/resources/definitions/arjun_mirrored.def.json index a4c0f3d3d1..586fe5f994 100644 --- a/resources/definitions/arjun_mirrored.def.json +++ b/resources/definitions/arjun_mirrored.def.json @@ -2,48 +2,49 @@ "version": 2, "name": "Arjun 300 Mirror", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Venkat Kamesh", "manufacturer": "Sri Vignan Technologies", - "weight": 3, "file_formats": "text/x-gcode", "has_material": true, "has_variants": true, + "machine_extruder_trains": { "0": "arjun_mm_extruder" }, "preferred_variant_name": "0.4 mm Nozzle", - "machine_extruder_trains": - { - "0": "arjun_mm_extruder" - } + "weight": 3 }, - - "overrides": { - "machine_name": { "default_value": "Arjun 300 Mirror" }, - "machine_width": { "default_value": 158.5 }, - "machine_height": { "default_value": 290 }, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "ironing_enabled": { "default_value": true }, + "line_width": { "value": "machine_nozzle_size" }, + "machine_acceleration": { "default_value": 2000 }, + "machine_center_is_zero": { "default_value": false }, "machine_depth": { "default_value": 310 }, - "machine_center_is_zero": {"default_value": false}, + "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_gcode_flavor": { "default_value": "Marlin" }, "machine_heated_bed": { "default_value": true }, - "machine_nozzle_size": {"default_value": 0.4}, - "machine_show_variants": {"default_value": true}, - "machine_acceleration": {"default_value": 2000}, + "machine_height": { "default_value": 290 }, + "machine_max_feedrate_e": { "value": 150 }, "machine_max_feedrate_x": { "value": 300 }, "machine_max_feedrate_y": { "value": 300 }, "machine_max_feedrate_z": { "value": 15 }, - "machine_max_feedrate_e": { "value": 150 }, - "machine_use_extruder_offset_to_offset_coords": {"default_value": false}, - "line_width": {"value": "machine_nozzle_size"}, - "speed_travel": {"maximum_value": "300", "value": "200"}, + "machine_name": { "default_value": "Arjun 300 Mirror" }, + "machine_nozzle_size": { "default_value": 0.4 }, + "machine_show_variants": { "default_value": true }, + "machine_start_gcode": { "default_value": "M605 S2 R0 X155\nM605 S3 X155\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 Z0\nG1 Z15 F150\nG28 Y0\nG1 Y20 F6000\nG28 X0\nG1 X80 F9000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X145 F9000\nM117\n" }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": false }, + "machine_width": { "default_value": 158.5 }, + "material_diameter": { "default_value": 1.75 }, "optimize_wall_printing_order": { "value": "True" }, - "material_diameter": { "default_value": 1.75}, - "retraction_amount": {"default_value": 6.5}, - "retraction_speed": { "default_value": 30}, - - "adhesion_type": { "default_value": "skirt" }, - "machine_gcode_flavor": { "default_value": "Marlin"}, - "ironing_enabled":{"default_value": true}, - "machine_start_gcode": {"default_value": "M605 S2 R0 X155\nM605 S3 X155\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 Z0\nG1 Z15 F150\nG28 Y0\nG1 Y20 F6000\nG28 X0\nG1 X80 F9000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X145 F9000\nM117\n"}, - "machine_end_gcode": {"default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84"}, - "machine_extruder_count": { "default_value": 1 } + "retraction_amount": { "default_value": 6.5 }, + "retraction_speed": { "default_value": 30 }, + "speed_travel": + { + "maximum_value": "300", + "value": "200" + } } -} +} \ No newline at end of file diff --git a/resources/definitions/arjunpro300.def.json b/resources/definitions/arjunpro300.def.json index 7f7160f777..6ef916d9d2 100644 --- a/resources/definitions/arjunpro300.def.json +++ b/resources/definitions/arjunpro300.def.json @@ -2,51 +2,59 @@ "version": 2, "name": "Arjun Pro 300", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Venkat Kamesh", "manufacturer": "Sri Vignan Technologies", - "weight": 3, "file_formats": "text/x-gcode", "platform": "arjunpro300_platform.STL", - "platform_offset": [-155, -6, 190], "has_material": true, "has_variants": true, - "preferred_variant_name": "0.4 mm Nozzle", "machine_extruder_trains": { "0": "arjunpro_extruder_0", "1": "arjunpro_extruder_1" - } + }, + "platform_offset": [ + -155, + -6, + 190 + ], + "preferred_variant_name": "0.4 mm Nozzle", + "weight": 3 }, - - "overrides": { - "machine_name": { "default_value": "Arjun Pro 300" }, - "machine_width": { "default_value": 300 }, - "machine_height": { "default_value": 293 }, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "ironing_enabled": { "default_value": true }, + "line_width": { "value": "machine_nozzle_size" }, + "machine_acceleration": { "default_value": 2000 }, + "machine_center_is_zero": { "default_value": false }, "machine_depth": { "default_value": 300 }, - "machine_center_is_zero": {"default_value": false}, + "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0 T1\nM104 S0 T0\nM140 S0\nM117\nG28 X0 Y0\nT0\nM84" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "Marlin" }, "machine_heated_bed": { "default_value": true }, - "machine_nozzle_size": {"default_value": 0.4}, - "machine_show_variants": {"default_value": true}, - "machine_acceleration": {"default_value": 2000}, + "machine_height": { "default_value": 293 }, + "machine_max_feedrate_e": { "value": 150 }, "machine_max_feedrate_x": { "value": 300 }, "machine_max_feedrate_y": { "value": 300 }, "machine_max_feedrate_z": { "value": 15 }, - "machine_max_feedrate_e": { "value": 150 }, - "machine_use_extruder_offset_to_offset_coords": {"default_value": false}, - "line_width": {"value": "machine_nozzle_size"}, - "speed_travel": {"maximum_value": "300", "value": "200"}, + "machine_name": { "default_value": "Arjun Pro 300" }, + "machine_nozzle_size": { "default_value": 0.4 }, + "machine_show_variants": { "default_value": true }, + "machine_start_gcode": { "default_value": "M605 S0\nG21\nG90\nM82\nM107\nT1\nG28 \nG29 \nG1 X0 Y5 F2000\nT1\nG92 E0\nG1 E45 F210\nG92 E0\nT0\nG92 E0\nG1 E45 F210\nG92 E0\nM117\n" }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": false }, + "machine_width": { "default_value": 300 }, + "material_diameter": { "default_value": 1.75 }, "optimize_wall_printing_order": { "value": "True" }, - "material_diameter": { "default_value": 1.75}, - "retraction_amount": {"default_value": 6.5}, - "retraction_speed": { "default_value": 30}, - - "adhesion_type": { "default_value": "skirt" }, - "machine_gcode_flavor": { "default_value": "Marlin"}, - "ironing_enabled":{"default_value": true}, - "machine_start_gcode": { "default_value": "M605 S0\nG21\nG90\nM82\nM107\nT1\nG28 \nG29 \nG1 X0 Y5 F2000\nT1\nG92 E0\nG1 E45 F210\nG92 E0\nT0\nG92 E0\nG1 E45 F210\nG92 E0\nM117\n"}, - "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0 T1\nM104 S0 T0\nM140 S0\nM117\nG28 X0 Y0\nT0\nM84"}, - "machine_extruder_count": { "default_value": 2 } + "retraction_amount": { "default_value": 6.5 }, + "retraction_speed": { "default_value": 30 }, + "speed_travel": + { + "maximum_value": "300", + "value": "200" + } } -} +} \ No newline at end of file diff --git a/resources/definitions/arjunpro_duplication.def.json b/resources/definitions/arjunpro_duplication.def.json index 9aebd197a7..73572c70de 100644 --- a/resources/definitions/arjunpro_duplication.def.json +++ b/resources/definitions/arjunpro_duplication.def.json @@ -2,48 +2,49 @@ "version": 2, "name": "Arjun Pro 300 Duplication", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Venkat Kamesh", "manufacturer": "Sri Vignan Technologies", - "weight": 3, "file_formats": "text/x-gcode", "has_material": true, "has_variants": true, + "machine_extruder_trains": { "0": "arjunpro_dm_extruder" }, "preferred_variant_name": "0.4 mm Nozzle", - "machine_extruder_trains": - { - "0": "arjunpro_dm_extruder" - } + "weight": 3 }, - - "overrides": { - "machine_name": { "default_value": "Arjunpro 300 Duplication" }, - "machine_width": { "default_value": 120 }, - "machine_height": { "default_value": 293 }, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "ironing_enabled": { "default_value": true }, + "line_width": { "value": "machine_nozzle_size" }, + "machine_acceleration": { "default_value": 2000 }, + "machine_center_is_zero": { "default_value": false }, "machine_depth": { "default_value": 300 }, - "machine_center_is_zero": {"default_value": false}, + "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_gcode_flavor": { "default_value": "Marlin" }, "machine_heated_bed": { "default_value": true }, - "machine_nozzle_size": {"default_value": 0.4}, - "machine_show_variants": {"default_value": true}, - "machine_acceleration": {"default_value": 2000}, + "machine_height": { "default_value": 293 }, + "machine_max_feedrate_e": { "value": 150 }, "machine_max_feedrate_x": { "value": 300 }, "machine_max_feedrate_y": { "value": 300 }, "machine_max_feedrate_z": { "value": 15 }, - "machine_max_feedrate_e": { "value": 150 }, - "machine_use_extruder_offset_to_offset_coords": {"default_value": false}, - "line_width": {"value": "machine_nozzle_size"}, - "speed_travel": {"maximum_value": "300", "value": "200"}, + "machine_name": { "default_value": "Arjunpro 300 Duplication" }, + "machine_nozzle_size": { "default_value": 0.4 }, + "machine_show_variants": { "default_value": true }, + "machine_start_gcode": { "default_value": "M605 S2 R0 X125\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 \nG29 \nG1 Z15 F150\nG28 Y5\nG1 Y20 F6000\nG28 X0\nG1 X80 F6000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X125 F6000\nM117\n" }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": false }, + "machine_width": { "default_value": 120 }, + "material_diameter": { "default_value": 1.75 }, "optimize_wall_printing_order": { "value": "True" }, - "material_diameter": { "default_value": 1.75}, - "retraction_amount": {"default_value": 6.5}, - "retraction_speed": { "default_value": 30}, - - "adhesion_type": { "default_value": "skirt" }, - "machine_gcode_flavor": { "default_value": "Marlin"}, - "ironing_enabled":{"default_value": true}, - "machine_start_gcode": {"default_value": "M605 S2 R0 X125\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 \nG29 \nG1 Z15 F150\nG28 Y5\nG1 Y20 F6000\nG28 X0\nG1 X80 F6000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X125 F6000\nM117\n"}, - "machine_end_gcode": {"default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84"}, - "machine_extruder_count": { "default_value": 1 } + "retraction_amount": { "default_value": 6.5 }, + "retraction_speed": { "default_value": 30 }, + "speed_travel": + { + "maximum_value": "300", + "value": "200" + } } -} +} \ No newline at end of file diff --git a/resources/definitions/arjunpro_mirrored.def.json b/resources/definitions/arjunpro_mirrored.def.json index 5502708186..7d37ccc6c2 100644 --- a/resources/definitions/arjunpro_mirrored.def.json +++ b/resources/definitions/arjunpro_mirrored.def.json @@ -2,48 +2,49 @@ "version": 2, "name": "Arjun Pro 300 Mirror", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Venkat Kamesh", "manufacturer": "Sri Vignan Technologies", - "weight": 3, "file_formats": "text/x-gcode", "has_material": true, "has_variants": true, + "machine_extruder_trains": { "0": "arjunpro_mm_extruder" }, "preferred_variant_name": "0.4 mm Nozzle", - "machine_extruder_trains": - { - "0": "arjunpro_mm_extruder" - } + "weight": 3 }, - - "overrides": { - "machine_name": { "default_value": "Arjunpro 300 Mirror" }, - "machine_width": { "default_value": 120 }, - "machine_height": { "default_value": 293 }, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "ironing_enabled": { "default_value": true }, + "line_width": { "value": "machine_nozzle_size" }, + "machine_acceleration": { "default_value": 2000 }, + "machine_center_is_zero": { "default_value": false }, "machine_depth": { "default_value": 300 }, - "machine_center_is_zero": {"default_value": false}, + "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_gcode_flavor": { "default_value": "Marlin" }, "machine_heated_bed": { "default_value": true }, - "machine_nozzle_size": {"default_value": 0.4}, - "machine_show_variants": {"default_value": true}, - "machine_acceleration": {"default_value": 2000}, + "machine_height": { "default_value": 293 }, + "machine_max_feedrate_e": { "value": 150 }, "machine_max_feedrate_x": { "value": 300 }, "machine_max_feedrate_y": { "value": 300 }, "machine_max_feedrate_z": { "value": 15 }, - "machine_max_feedrate_e": { "value": 150 }, - "machine_use_extruder_offset_to_offset_coords": {"default_value": false}, - "line_width": {"value": "machine_nozzle_size"}, - "speed_travel": {"maximum_value": "300", "value": "200"}, + "machine_name": { "default_value": "Arjunpro 300 Mirror" }, + "machine_nozzle_size": { "default_value": 0.4 }, + "machine_show_variants": { "default_value": true }, + "machine_start_gcode": { "default_value": "M605 S2 R0 X125\nM605 S3 X125\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 \nG29 \nG1 Z15 F150\nG28 Y5\nG1 Y20 F6000\nG28 X0\nG1 X80 F6000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X125 F6000\nM117\n" }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": false }, + "machine_width": { "default_value": 120 }, + "material_diameter": { "default_value": 1.75 }, "optimize_wall_printing_order": { "value": "True" }, - "material_diameter": { "default_value": 1.75}, - "retraction_amount": {"default_value": 6.5}, - "retraction_speed": { "default_value": 30}, - - "adhesion_type": { "default_value": "skirt" }, - "machine_gcode_flavor": { "default_value": "Marlin"}, - "ironing_enabled":{"default_value": true}, - "machine_start_gcode": {"default_value": "M605 S2 R0 X125\nM605 S3 X125\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature}\nM105\nM109 S{material_print_temperature}\nG28 \nG29 \nG1 Z15 F150\nG28 Y5\nG1 Y20 F6000\nG28 X0\nG1 X80 F6000\nT0\nG92 E0\nG1 E35 F250\nG1 E45 F120\nG92 E0\nG1 X100 Z0 F5000\nG1 X125 F6000\nM117\n"}, - "machine_end_gcode": {"default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM107 P1\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM84"}, - "machine_extruder_count": { "default_value": 1 } + "retraction_amount": { "default_value": 6.5 }, + "retraction_speed": { "default_value": 30 }, + "speed_travel": + { + "maximum_value": "300", + "value": "200" + } } -} +} \ No newline at end of file diff --git a/resources/definitions/artillery_base.def.json b/resources/definitions/artillery_base.def.json index 171ac4a524..31169c5dd4 100644 --- a/resources/definitions/artillery_base.def.json +++ b/resources/definitions/artillery_base.def.json @@ -1,26 +1,13 @@ { - "name": "Artillery Base Printer", "version": 2, + "name": "Artillery Base Printer", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": false, "author": "3D-Nexus.com, cataclism, Wondro", "manufacturer": "Artillery", "file_formats": "text/x-gcode", - "first_start_actions": ["MachineSettingsAction"], - - "machine_extruder_trains": { - "0": "artillery_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", "exclude_materials": [ "Vertex_Delta_ABS", "Vertex_Delta_PET", @@ -67,137 +54,120 @@ "verbatim_bvoh_175", "zyyx_pro_flex", "zyyx_pro_pla" - ] + ], + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { "0": "artillery_base_extruder_0" }, + "preferred_material": "generic_pla", + "preferred_quality_type": "standard", + "preferred_variant_name": "0.4mm Nozzle", + "variants_name": "Nozzle Size" }, - "overrides": { - "machine_name": { "default_value": "Artillery 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_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_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 }, - + "overrides": + { + "acceleration_enabled": { "value": false }, "acceleration_print": { "value": 500 }, + "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, "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" }, - + "adaptive_layer_height_variation": { "value": 0.04 }, + "adaptive_layer_height_variation_step": { "value": 0.04 }, + "adhesion_type": { "value": "'none' if support_enable else 'skirt'" }, + "brim_replaces_support": { "value": false }, + "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, + "cool_min_layer_time": { "value": 10 }, + "fill_outline_gaps": { "value": false }, + "infill_before_walls": { "value": false }, + "infill_overlap": { "value": 30.0 }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, + "infill_wipe_dist": { "value": 0.0 }, + "jerk_enabled": { "value": false }, "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_wall_x": { "value": "speed_wall" }, - "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" }, - "speed_z_hop": { "value": 5 }, - "line_width": { "value": "machine_nozzle_size * 1.1" }, - - "optimize_wall_printing_order": { "value": true }, - - "material_initial_print_temperature": { "value": "material_print_temperature" }, + "machine_acceleration": { "value": 500 }, + "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_heated_bed": { "default_value": true }, + "machine_max_acceleration_e": { "value": 5000 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 100 }, + "machine_max_feedrate_e": { "value": 50 }, + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_jerk_e": { "value": 5 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.4 }, + "machine_name": { "default_value": "Artillery 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" }, + "material_diameter": { "default_value": 1.75 }, "material_final_print_temperature": { "value": "material_print_temperature" }, - - "z_seam_type": { "value": "'back'" }, - "z_seam_corner": { "value": "'z_seam_corner_none'" }, - - "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": + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "meshfix_maximum_resolution": { "value": "0.25" }, + "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" }, + "minimum_interface_area": { "value": 10 }, + "minimum_support_area": { "value": 2 }, + "optimize_wall_printing_order": { "value": true }, + "retraction_amount": { "value": 2 }, + "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'infill'" }, + "retraction_combing_max_distance": { "value": 30 }, + "retraction_count_max": { "value": 100 }, + "retraction_extrusion_window": { "value": 10 }, + "retraction_hop": { "value": 0.2 }, + "retraction_hop_enabled": { "value": "support_enable" }, + "retraction_min_travel": { "value": 1.5 }, + "retraction_prime_speed": { - "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", - "maximum_value": 200 + "maximum_value": 200, + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')" }, "retraction_retract_speed": { - "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", - "maximum_value": 200 + "maximum_value": 200, + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')" }, - "retraction_prime_speed": + "retraction_speed": { - "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", - "maximum_value": 200 + "maximum_value": 200, + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')" }, - - "retraction_hop_enabled": { "value": "support_enable" }, - "retraction_hop": { "value": 0.2 }, - "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'infill'" }, - "retraction_combing_max_distance": { "value": 30 }, - "travel_avoid_other_parts": { "value": true }, - "travel_avoid_supports": { "value": true }, - "travel_retract_before_outer_wall": { "value": true }, - - "retraction_amount": { "value": 2 }, - - "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_min_layer_time": { "value": 10 }, - - "adhesion_type": { "value": "'none' if support_enable else 'skirt'" }, - "brim_replaces_support": { "value": false }, + "skin_overlap": { "value": 10.0 }, "skirt_gap": { "value": 10.0 }, "skirt_line_count": { "value": 4 }, - - "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" }, - + "speed_layer_0": { "value": 20.0 }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_print": { "value": 60.0 }, + "speed_support": { "value": "speed_wall_0" }, + "speed_support_interface": { "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_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, + "speed_wall_x": { "value": "speed_wall" }, + "speed_z_hop": { "value": 5 }, "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width / 2.0 / layer_height)))" }, - + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 4 }, "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_enable": { "value": true }, + "support_interface_height": { "value": "layer_height * 4" }, + "support_interface_pattern": { "value": "'grid'" }, + "support_interface_skip_height": { "value": 0.2 }, "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_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": 2 }, - "minimum_interface_area": { "value": 10 }, - "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, - "wall_thickness": {"value": "line_width * 2" } + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height * 2" }, + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, + "travel_avoid_other_parts": { "value": true }, + "travel_avoid_supports": { "value": true }, + "travel_retract_before_outer_wall": { "value": true }, + "wall_0_wipe_dist": { "value": 0.0 }, + "wall_thickness": { "value": "line_width * 2" }, + "z_seam_corner": { "value": "'z_seam_corner_none'" }, + "z_seam_type": { "value": "'back'" } } -} - +} \ No newline at end of file diff --git a/resources/definitions/artillery_genius.def.json b/resources/definitions/artillery_genius.def.json index 55b7bad99f..3ccab5bfa1 100644 --- a/resources/definitions/artillery_genius.def.json +++ b/resources/definitions/artillery_genius.def.json @@ -1,19 +1,24 @@ { - "name": "Artillery Genius", "version": 2, + "name": "Artillery Genius", "inherits": "artillery_base", - "overrides": { - "machine_name": { "default_value": "Artillery Genius" }, - "machine_width": { "default_value": 220 }, + "metadata": + { + "visible": true, + "platform": "artillery_genius.stl", + "platform_offset": [ + 0, + -72, + -20 + ], + "quality_definition": "artillery_base" + }, + "overrides": + { + "gantry_height": { "value": 25 }, "machine_depth": { "default_value": 220 }, "machine_height": { "default_value": 250 }, - "gantry_height": { "value": 25 } - - }, - "metadata": { - "quality_definition": "artillery_base", - "visible": true, - "platform": "artillery_genius.stl", - "platform_offset": [ -0, -72, -20] + "machine_name": { "default_value": "Artillery Genius" }, + "machine_width": { "default_value": 220 } } -} +} \ No newline at end of file diff --git a/resources/definitions/artillery_sidewinder_x1.def.json b/resources/definitions/artillery_sidewinder_x1.def.json index 8ae24837d6..9403d8adea 100644 --- a/resources/definitions/artillery_sidewinder_x1.def.json +++ b/resources/definitions/artillery_sidewinder_x1.def.json @@ -1,19 +1,24 @@ { - "name": "Artillery Sidewinder X1", "version": 2, + "name": "Artillery Sidewinder X1", "inherits": "artillery_base", - "overrides": { - "machine_name": { "default_value": "Artillery Sidewinder X1" }, - "machine_width": { "default_value": 300 }, + "metadata": + { + "visible": true, + "platform": "artillery_swx1.stl", + "platform_offset": [ + -200, + -100, + 250 + ], + "quality_definition": "artillery_base" + }, + "overrides": + { + "gantry_height": { "value": 25 }, "machine_depth": { "default_value": 300 }, "machine_height": { "default_value": 400 }, - "gantry_height": { "value": 25 } - - }, - "metadata": { - "quality_definition": "artillery_base", - "visible": true, - "platform": "artillery_swx1.stl", - "platform_offset": [ -200, -100, 250] + "machine_name": { "default_value": "Artillery Sidewinder X1" }, + "machine_width": { "default_value": 300 } } -} +} \ No newline at end of file diff --git a/resources/definitions/atmat_asterion.def.json b/resources/definitions/atmat_asterion.def.json index 402dc51c8c..71ad97398c 100644 --- a/resources/definitions/atmat_asterion.def.json +++ b/resources/definitions/atmat_asterion.def.json @@ -1,6 +1,6 @@ { - "name": "Asterion", "version": 2, + "name": "Asterion", "inherits": "atmat_signal_pro_base", "metadata": { @@ -10,10 +10,9 @@ }, "overrides": { - "machine_name": { "default_value": "Asterion" }, - "machine_width": { "default_value": 500 }, - "machine_depth": { "default_value": 500 }, - "machine_height": { "default_value": 600 } - + "machine_depth": { "default_value": 500 }, + "machine_height": { "default_value": 600 }, + "machine_name": { "default_value": "Asterion" }, + "machine_width": { "default_value": 500 } } -} +} \ No newline at end of file diff --git a/resources/definitions/atmat_asterion_ht.def.json b/resources/definitions/atmat_asterion_ht.def.json index 19c8d1f781..8231bf4153 100644 --- a/resources/definitions/atmat_asterion_ht.def.json +++ b/resources/definitions/atmat_asterion_ht.def.json @@ -1,6 +1,6 @@ { - "name": "Asterion HT", "version": 2, + "name": "Asterion HT", "inherits": "atmat_signal_pro_base", "metadata": { @@ -10,11 +10,10 @@ }, "overrides": { - "machine_name": { "default_value": "Asterion HT" }, - "machine_width": { "default_value": 500 }, - "machine_depth": { "default_value": 500 }, - "machine_height": { "default_value": 600 }, - "material_print_temperature": { "maximum_value_warning": 500 } - + "machine_depth": { "default_value": 500 }, + "machine_height": { "default_value": 600 }, + "machine_name": { "default_value": "Asterion HT" }, + "machine_width": { "default_value": 500 }, + "material_print_temperature": { "maximum_value_warning": 500 } } -} +} \ No newline at end of file diff --git a/resources/definitions/atmat_galaxy_500.def.json b/resources/definitions/atmat_galaxy_500.def.json index f0ed3be841..dd04c8869a 100644 --- a/resources/definitions/atmat_galaxy_500.def.json +++ b/resources/definitions/atmat_galaxy_500.def.json @@ -1,6 +1,6 @@ { - "name": "Galaxy 500", "version": 2, + "name": "Galaxy 500", "inherits": "atmat_signal_pro_base", "metadata": { @@ -9,28 +9,28 @@ }, "overrides": { - "machine_name": { "default_value": "Galaxy 500" }, - "machine_width": { "default_value": 400 }, - "machine_depth": { "default_value": 400 }, - "machine_height": { "default_value": 500 }, - "acceleration_layer_0": { "value": "250" }, - "acceleration_prime_tower": { "value": "750" }, - "acceleration_print": { "value": "750" }, - "acceleration_travel": { "value": "750" }, - "acceleration_support": { "value": "750" }, - "acceleration_support_interface": { "value": "750" }, - "acceleration_topbottom": { "value": "750" }, - "acceleration_wall": { "value": "750" }, - "acceleration_wall_0": { "value": "500" }, - "jerk_layer_0": { "value": "5" }, - "jerk_prime_tower": { "value": "jerk_print" }, - "jerk_print": { "value": "7.5" }, - "jerk_support": { "value": "jerk_print" }, - "jerk_support_interface": { "value": "jerk_print" }, - "jerk_topbottom": { "value": "jerk_print" }, - "jerk_wall": { "value": "jerk_print" }, - "jerk_wall_0": { "value": "jerk_print" }, - "jerk_travel": { "value": "jerk_layer_0" }, - "jerk_travel_layer_0": { "value": "jerk_layer_0" } + "acceleration_layer_0": { "value": "250" }, + "acceleration_prime_tower": { "value": "750" }, + "acceleration_print": { "value": "750" }, + "acceleration_support": { "value": "750" }, + "acceleration_support_interface": { "value": "750" }, + "acceleration_topbottom": { "value": "750" }, + "acceleration_travel": { "value": "750" }, + "acceleration_wall": { "value": "750" }, + "acceleration_wall_0": { "value": "500" }, + "jerk_layer_0": { "value": "5" }, + "jerk_prime_tower": { "value": "jerk_print" }, + "jerk_print": { "value": "7.5" }, + "jerk_support": { "value": "jerk_print" }, + "jerk_support_interface": { "value": "jerk_print" }, + "jerk_topbottom": { "value": "jerk_print" }, + "jerk_travel": { "value": "jerk_layer_0" }, + "jerk_travel_layer_0": { "value": "jerk_layer_0" }, + "jerk_wall": { "value": "jerk_print" }, + "jerk_wall_0": { "value": "jerk_print" }, + "machine_depth": { "default_value": 400 }, + "machine_height": { "default_value": 500 }, + "machine_name": { "default_value": "Galaxy 500" }, + "machine_width": { "default_value": 400 } } -} +} \ No newline at end of file diff --git a/resources/definitions/atmat_galaxy_600.def.json b/resources/definitions/atmat_galaxy_600.def.json index c5586eb514..980d04e216 100644 --- a/resources/definitions/atmat_galaxy_600.def.json +++ b/resources/definitions/atmat_galaxy_600.def.json @@ -1,6 +1,6 @@ { - "name": "Galaxy 600", "version": 2, + "name": "Galaxy 600", "inherits": "atmat_signal_pro_base", "metadata": { @@ -9,28 +9,28 @@ }, "overrides": { - "machine_name": { "default_value": "Galaxy 600" }, - "machine_width": { "default_value": 500 }, - "machine_depth": { "default_value": 500 }, - "machine_height": { "default_value": 600 }, - "acceleration_layer_0": { "value": "250" }, - "acceleration_prime_tower": { "value": "750" }, - "acceleration_print": { "value": "750" }, - "acceleration_travel": { "value": "750" }, - "acceleration_support": { "value": "750" }, - "acceleration_support_interface": { "value": "750" }, - "acceleration_topbottom": { "value": "750" }, - "acceleration_wall": { "value": "750" }, - "acceleration_wall_0": { "value": "500" }, - "jerk_layer_0": { "value": "5" }, - "jerk_prime_tower": { "value": "jerk_print" }, - "jerk_print": { "value": "7.5" }, - "jerk_support": { "value": "jerk_print" }, - "jerk_support_interface": { "value": "jerk_print" }, - "jerk_topbottom": { "value": "jerk_print" }, - "jerk_wall": { "value": "jerk_print" }, - "jerk_wall_0": { "value": "jerk_print" }, - "jerk_travel": { "value": "jerk_layer_0" }, - "jerk_travel_layer_0": { "value": "jerk_layer_0" } + "acceleration_layer_0": { "value": "250" }, + "acceleration_prime_tower": { "value": "750" }, + "acceleration_print": { "value": "750" }, + "acceleration_support": { "value": "750" }, + "acceleration_support_interface": { "value": "750" }, + "acceleration_topbottom": { "value": "750" }, + "acceleration_travel": { "value": "750" }, + "acceleration_wall": { "value": "750" }, + "acceleration_wall_0": { "value": "500" }, + "jerk_layer_0": { "value": "5" }, + "jerk_prime_tower": { "value": "jerk_print" }, + "jerk_print": { "value": "7.5" }, + "jerk_support": { "value": "jerk_print" }, + "jerk_support_interface": { "value": "jerk_print" }, + "jerk_topbottom": { "value": "jerk_print" }, + "jerk_travel": { "value": "jerk_layer_0" }, + "jerk_travel_layer_0": { "value": "jerk_layer_0" }, + "jerk_wall": { "value": "jerk_print" }, + "jerk_wall_0": { "value": "jerk_print" }, + "machine_depth": { "default_value": 500 }, + "machine_height": { "default_value": 600 }, + "machine_name": { "default_value": "Galaxy 600" }, + "machine_width": { "default_value": 500 } } -} +} \ No newline at end of file diff --git a/resources/definitions/atmat_signal_pro_300_v1.def.json b/resources/definitions/atmat_signal_pro_300_v1.def.json index 27e65b92c2..6cba3191d2 100644 --- a/resources/definitions/atmat_signal_pro_300_v1.def.json +++ b/resources/definitions/atmat_signal_pro_300_v1.def.json @@ -1,6 +1,6 @@ { - "name": "Signal Pro 300 v1", "version": 2, + "name": "Signal Pro 300 v1", "inherits": "atmat_signal_pro_base", "metadata": { @@ -9,28 +9,28 @@ }, "overrides": { - "machine_name": { "default_value": "Signal Pro 300 v1" }, - "machine_width": { "default_value": 300 }, - "machine_depth": { "default_value": 300 }, - "machine_height": { "default_value": 300 }, - "acceleration_layer_0": { "value": "250" }, - "acceleration_prime_tower": { "value": "750" }, - "acceleration_print": { "value": "750" }, - "acceleration_travel": { "value": "750" }, - "acceleration_support": { "value": "750" }, - "acceleration_support_interface": { "value": "750" }, - "acceleration_topbottom": { "value": "750" }, - "acceleration_wall": { "value": "750" }, - "acceleration_wall_0": { "value": "500" }, - "jerk_layer_0": { "value": "5" }, - "jerk_prime_tower": { "value": "jerk_print" }, - "jerk_print": { "value": "7.5" }, - "jerk_support": { "value": "jerk_print" }, - "jerk_support_interface": { "value": "jerk_print" }, - "jerk_topbottom": { "value": "jerk_print" }, - "jerk_wall": { "value": "jerk_print" }, - "jerk_wall_0": { "value": "jerk_print" }, - "jerk_travel": { "value": "jerk_layer_0" }, - "jerk_travel_layer_0": { "value": "jerk_layer_0" } + "acceleration_layer_0": { "value": "250" }, + "acceleration_prime_tower": { "value": "750" }, + "acceleration_print": { "value": "750" }, + "acceleration_support": { "value": "750" }, + "acceleration_support_interface": { "value": "750" }, + "acceleration_topbottom": { "value": "750" }, + "acceleration_travel": { "value": "750" }, + "acceleration_wall": { "value": "750" }, + "acceleration_wall_0": { "value": "500" }, + "jerk_layer_0": { "value": "5" }, + "jerk_prime_tower": { "value": "jerk_print" }, + "jerk_print": { "value": "7.5" }, + "jerk_support": { "value": "jerk_print" }, + "jerk_support_interface": { "value": "jerk_print" }, + "jerk_topbottom": { "value": "jerk_print" }, + "jerk_travel": { "value": "jerk_layer_0" }, + "jerk_travel_layer_0": { "value": "jerk_layer_0" }, + "jerk_wall": { "value": "jerk_print" }, + "jerk_wall_0": { "value": "jerk_print" }, + "machine_depth": { "default_value": 300 }, + "machine_height": { "default_value": 300 }, + "machine_name": { "default_value": "Signal Pro 300 v1" }, + "machine_width": { "default_value": 300 } } -} +} \ No newline at end of file diff --git a/resources/definitions/atmat_signal_pro_300_v2.def.json b/resources/definitions/atmat_signal_pro_300_v2.def.json index 39e10ce549..1fc6d565f3 100644 --- a/resources/definitions/atmat_signal_pro_300_v2.def.json +++ b/resources/definitions/atmat_signal_pro_300_v2.def.json @@ -1,6 +1,6 @@ { - "name": "Signal Pro 300 v2", "version": 2, + "name": "Signal Pro 300 v2", "inherits": "atmat_signal_pro_base", "metadata": { @@ -10,9 +10,9 @@ }, "overrides": { - "machine_name": { "default_value": "Signal Pro 300 v2" }, - "machine_width": { "default_value": 300 }, - "machine_depth": { "default_value": 300 }, - "machine_height": { "default_value": 300 } + "machine_depth": { "default_value": 300 }, + "machine_height": { "default_value": 300 }, + "machine_name": { "default_value": "Signal Pro 300 v2" }, + "machine_width": { "default_value": 300 } } -} +} \ No newline at end of file diff --git a/resources/definitions/atmat_signal_pro_400_v1.def.json b/resources/definitions/atmat_signal_pro_400_v1.def.json index ef0d25c0af..7c4b86a2a0 100644 --- a/resources/definitions/atmat_signal_pro_400_v1.def.json +++ b/resources/definitions/atmat_signal_pro_400_v1.def.json @@ -1,6 +1,6 @@ { - "name": "Signal Pro 400 v1", "version": 2, + "name": "Signal Pro 400 v1", "inherits": "atmat_signal_pro_base", "metadata": { @@ -9,28 +9,28 @@ }, "overrides": { - "machine_name": { "default_value": "Signal Pro 400 v1" }, - "machine_width": { "default_value": 300 }, - "machine_depth": { "default_value": 300 }, - "machine_height": { "default_value": 400 }, - "acceleration_layer_0": { "value": "250" }, - "acceleration_prime_tower": { "value": "750" }, - "acceleration_print": { "value": "750" }, - "acceleration_travel": { "value": "750" }, - "acceleration_support": { "value": "750" }, - "acceleration_support_interface": { "value": "750" }, - "acceleration_topbottom": { "value": "750" }, - "acceleration_wall": { "value": "750" }, - "acceleration_wall_0": { "value": "500" }, - "jerk_layer_0": { "value": "5" }, - "jerk_prime_tower": { "value": "jerk_print" }, - "jerk_print": { "value": "7.5" }, - "jerk_support": { "value": "jerk_print" }, - "jerk_support_interface": { "value": "jerk_print" }, - "jerk_topbottom": { "value": "jerk_print" }, - "jerk_wall": { "value": "jerk_print" }, - "jerk_wall_0": { "value": "jerk_print" }, - "jerk_travel": { "value": "jerk_layer_0" }, - "jerk_travel_layer_0": { "value": "jerk_layer_0" } + "acceleration_layer_0": { "value": "250" }, + "acceleration_prime_tower": { "value": "750" }, + "acceleration_print": { "value": "750" }, + "acceleration_support": { "value": "750" }, + "acceleration_support_interface": { "value": "750" }, + "acceleration_topbottom": { "value": "750" }, + "acceleration_travel": { "value": "750" }, + "acceleration_wall": { "value": "750" }, + "acceleration_wall_0": { "value": "500" }, + "jerk_layer_0": { "value": "5" }, + "jerk_prime_tower": { "value": "jerk_print" }, + "jerk_print": { "value": "7.5" }, + "jerk_support": { "value": "jerk_print" }, + "jerk_support_interface": { "value": "jerk_print" }, + "jerk_topbottom": { "value": "jerk_print" }, + "jerk_travel": { "value": "jerk_layer_0" }, + "jerk_travel_layer_0": { "value": "jerk_layer_0" }, + "jerk_wall": { "value": "jerk_print" }, + "jerk_wall_0": { "value": "jerk_print" }, + "machine_depth": { "default_value": 300 }, + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "Signal Pro 400 v1" }, + "machine_width": { "default_value": 300 } } -} +} \ No newline at end of file diff --git a/resources/definitions/atmat_signal_pro_400_v2.def.json b/resources/definitions/atmat_signal_pro_400_v2.def.json index a147cbe2d6..5703068582 100644 --- a/resources/definitions/atmat_signal_pro_400_v2.def.json +++ b/resources/definitions/atmat_signal_pro_400_v2.def.json @@ -1,6 +1,6 @@ { - "name": "Signal Pro 400 v2", "version": 2, + "name": "Signal Pro 400 v2", "inherits": "atmat_signal_pro_base", "metadata": { @@ -10,9 +10,9 @@ }, "overrides": { - "machine_name": { "default_value": "Signal Pro 400 v2" }, - "machine_width": { "default_value": 300 }, - "machine_depth": { "default_value": 300 }, - "machine_height": { "default_value": 400 } + "machine_depth": { "default_value": 300 }, + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "Signal Pro 400 v2" }, + "machine_width": { "default_value": 300 } } -} +} \ No newline at end of file diff --git a/resources/definitions/atmat_signal_pro_500_v1.def.json b/resources/definitions/atmat_signal_pro_500_v1.def.json index 60b5fee1bc..dd838eab1e 100644 --- a/resources/definitions/atmat_signal_pro_500_v1.def.json +++ b/resources/definitions/atmat_signal_pro_500_v1.def.json @@ -1,6 +1,6 @@ { - "name": "Signal Pro 500 v1", "version": 2, + "name": "Signal Pro 500 v1", "inherits": "atmat_signal_pro_base", "metadata": { @@ -9,28 +9,28 @@ }, "overrides": { - "machine_name": { "default_value": "Signal Pro 500 v1" }, - "machine_width": { "default_value": 300 }, - "machine_depth": { "default_value": 300 }, - "machine_height": { "default_value": 500 }, - "acceleration_layer_0": { "value": "250" }, - "acceleration_prime_tower": { "value": "750" }, - "acceleration_print": { "value": "750" }, - "acceleration_travel": { "value": "750" }, - "acceleration_support": { "value": "750" }, - "acceleration_support_interface": { "value": "750" }, - "acceleration_topbottom": { "value": "750" }, - "acceleration_wall": { "value": "750" }, - "acceleration_wall_0": { "value": "500" }, - "jerk_layer_0": { "value": "5" }, - "jerk_prime_tower": { "value": "jerk_print" }, - "jerk_print": { "value": "7.5" }, - "jerk_support": { "value": "jerk_print" }, - "jerk_support_interface": { "value": "jerk_print" }, - "jerk_topbottom": { "value": "jerk_print" }, - "jerk_wall": { "value": "jerk_print" }, - "jerk_wall_0": { "value": "jerk_print" }, - "jerk_travel": { "value": "jerk_layer_0" }, - "jerk_travel_layer_0": { "value": "jerk_layer_0" } + "acceleration_layer_0": { "value": "250" }, + "acceleration_prime_tower": { "value": "750" }, + "acceleration_print": { "value": "750" }, + "acceleration_support": { "value": "750" }, + "acceleration_support_interface": { "value": "750" }, + "acceleration_topbottom": { "value": "750" }, + "acceleration_travel": { "value": "750" }, + "acceleration_wall": { "value": "750" }, + "acceleration_wall_0": { "value": "500" }, + "jerk_layer_0": { "value": "5" }, + "jerk_prime_tower": { "value": "jerk_print" }, + "jerk_print": { "value": "7.5" }, + "jerk_support": { "value": "jerk_print" }, + "jerk_support_interface": { "value": "jerk_print" }, + "jerk_topbottom": { "value": "jerk_print" }, + "jerk_travel": { "value": "jerk_layer_0" }, + "jerk_travel_layer_0": { "value": "jerk_layer_0" }, + "jerk_wall": { "value": "jerk_print" }, + "jerk_wall_0": { "value": "jerk_print" }, + "machine_depth": { "default_value": 300 }, + "machine_height": { "default_value": 500 }, + "machine_name": { "default_value": "Signal Pro 500 v1" }, + "machine_width": { "default_value": 300 } } -} +} \ No newline at end of file diff --git a/resources/definitions/atmat_signal_pro_500_v2.def.json b/resources/definitions/atmat_signal_pro_500_v2.def.json index 0ffe012155..e415667f49 100644 --- a/resources/definitions/atmat_signal_pro_500_v2.def.json +++ b/resources/definitions/atmat_signal_pro_500_v2.def.json @@ -1,6 +1,6 @@ { - "name": "Signal Pro 500 v2", "version": 2, + "name": "Signal Pro 500 v2", "inherits": "atmat_signal_pro_base", "metadata": { @@ -10,9 +10,9 @@ }, "overrides": { - "machine_name": { "default_value": "Signal Pro 500 v2" }, - "machine_width": { "default_value": 300 }, - "machine_depth": { "default_value": 300 }, - "machine_height": { "default_value": 500 } + "machine_depth": { "default_value": 300 }, + "machine_height": { "default_value": 500 }, + "machine_name": { "default_value": "Signal Pro 500 v2" }, + "machine_width": { "default_value": 300 } } -} +} \ No newline at end of file diff --git a/resources/definitions/atmat_signal_pro_base.def.json b/resources/definitions/atmat_signal_pro_base.def.json index d92ea5c468..7b622a558a 100644 --- a/resources/definitions/atmat_signal_pro_base.def.json +++ b/resources/definitions/atmat_signal_pro_base.def.json @@ -1,27 +1,13 @@ { - "name": "Signal Pro Base", "version": 2, + "name": "Signal Pro Base", "inherits": "fdmprinter", - "metadata": + "metadata": { "visible": false, "author": "ATMAT", "manufacturer": "ATMAT sp. z o.o.", "file_formats": "text/x-gcode", - "preferred_quality_type": "fast", - "has_machine_quality": true, - "has_materials": true, - "has_variants": true, - "variants_name": "Nozzle", - "preferred_variant_name": "V6 0.40mm", - "machine_extruder_trains": - { - "0": "atmat_signal_pro_extruder_left", - "1": "atmat_signal_pro_extruder_right" - }, - "preferred_material": "generic_pla_175", - "supports_usb_connection": false, - "supports_network_connection": false, "exclude_materials": [ "chromatik_pla", "dsm_arnitel2045_175", @@ -90,124 +76,162 @@ "Vertex_Delta_TPU", "zyyx_pro_flex", "zyyx_pro_pla" - - ] + ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": + { + "0": "atmat_signal_pro_extruder_left", + "1": "atmat_signal_pro_extruder_right" + }, + "preferred_material": "generic_pla_175", + "preferred_quality_type": "fast", + "preferred_variant_name": "V6 0.40mm", + "supports_network_connection": false, + "supports_usb_connection": false, + "variants_name": "Nozzle" }, "overrides": { - "machine_name": { "default_value": "Signal Pro" }, - "machine_width": { "default_value": 300 }, - "machine_depth": { "default_value": 300 }, - "machine_height": { "default_value": 300 }, - "gantry_height": { "value": 30 }, - "machine_extruder_count": { "default_value": 2 }, - "machine_heated_bed": { "default_value": true }, - "machine_heated_build_volume": { "default_value": true }, - "build_volume_temperature": { "maximum_value_warning": 45 }, - "material_print_temperature": { "maximum_value_warning": 295 }, - "material_bed_temperature": { "maximum_value_warning": 140 }, - "machine_max_acceleration_x": { "default_value": 1500 }, - "machine_max_acceleration_y": { "default_value": 1500 }, - "machine_max_acceleration_z": { "default_value": 250 }, - "machine_acceleration": { "default_value": 1500 }, - "machine_max_jerk_xy": { "default_value": 15 }, - "machine_max_jerk_z": { "default_value": 1 }, - "machine_max_jerk_e": { "default_value": 15 }, - "machine_head_with_fans_polygon": { "default_value": [ [-35, 65], [-35, -50], [35, -50], [35, 65] ] }, - "machine_max_feedrate_z": { "default_value": 10 }, - "machine_max_feedrate_e": { "default_value": 120 }, - "machine_gcode_flavor": { "default_value": "Marlin" }, - "machine_start_gcode": { "default_value": "G21 ; set units to millimeters\nG90 ; use absolute positioning\nM82 ; absolute extrusion mode\nG28 ; home all without mesh bed level\nM420 S1\nG92 E0.0 ; reset extruder distance position\nG1 Z0.25\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E21.5 F1000.0 ; intro line\nG92 E0.0 ; reset extruder distance position" }, - "machine_end_gcode": { "default_value": "M104 T0 S0 ;extruder heater off\nM104 T1 S0 ;extruder heater off\nM140 S0 ;heated bed heater off\nG91\nG1 Z1 F420 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+1 E-1 F300 ;move Z up a bit and retract filament even more\nG90 ;absolute positioning\nG1 X0 Y300 F6000 ;move the head out of the way\nM84 ;steppers off" }, - "adhesion_type": { "default_value": "skirt" }, - "skirt_brim_minimal_length": { "value": "550" }, - "retraction_amount": { "value": "1" }, - "retraction_speed": { "value": "50", "maximum_value_warning": "130" }, - "retraction_retract_speed": { "value": "retraction_speed", "maximum_value_warning": "130" }, - "retraction_prime_speed": { "value": "math.ceil(retraction_speed * 0.4)", "maximum_value_warning": "130" }, - "retraction_hop_enabled": { "value": "True" }, - "retraction_hop": { "value": "0.5" }, - "retraction_combing": { "value": "'noskin'" }, - "retraction_combing_max_distance": { "value": "10" }, - "travel_avoid_other_parts": { "value": "True" }, - "travel_avoid_supports": { "value": "True" }, - "speed_travel": { "maximum_value": "150", "value": "150", "maximum_value_warning": "151" }, - "speed_travel_layer_0": { "value": "math.ceil(speed_travel * 0.4)" }, - "speed_layer_0": { "value": "math.ceil(speed_print * 0.25)" }, - "speed_wall": { "value": "math.ceil(speed_print * 0.50)" }, - "speed_wall_0": { "value": "math.ceil(speed_print * 0.50)" }, - "speed_wall_x": { "value": "math.ceil(speed_print * 0.75)" }, - "speed_topbottom": { "value": "math.ceil(speed_print * 0.45)" }, - "speed_roofing": { "value": "math.ceil(speed_print * 0.45)" }, - "speed_slowdown_layers": { "value": "2" }, - "roofing_layer_count": { "value": "1" }, - "optimize_wall_printing_order": { "value": "True" }, - "infill_enable_travel_optimization": { "value": "True" }, - "minimum_polygon_circumference": { "value": "0.2" }, - "wall_overhang_angle": { "value": "75" }, - "wall_overhang_speed_factor": { "value": "50" }, - "bridge_settings_enabled": { "value": "True" }, - "bridge_wall_coast": { "value": "10" }, - "bridge_fan_speed": { "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": { "value": "True" }, - "cool_min_layer_time_fan_speed_max": { "value": "20" }, - "cool_min_layer_time": { "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": { "value": "True" }, - "meshfix_maximum_resolution": { "value": "0.01" }, - "meshfix_maximum_deviation": { "value": "layer_height / 2" }, - "infill_before_walls": { "value": "False" }, - "zig_zaggify_infill": { "value": "True" }, - "min_infill_area": { "value": "5.0" }, - "acceleration_enabled": { "value": "True" }, - "acceleration_layer_0": { "value": "250" }, - "acceleration_prime_tower": { "value": "1000" }, - "acceleration_print": { "value": "1000" }, - "acceleration_travel": { "value": "1000" }, - "acceleration_support": { "value": "1000" }, - "acceleration_support_interface": { "value": "750" }, - "acceleration_topbottom": { "value": "750" }, - "acceleration_wall": { "value": "750" }, - "acceleration_wall_0": { "value": "500" }, - "jerk_enabled": { "value": "True" }, - "jerk_layer_0": { "value": "5" }, - "jerk_prime_tower": { "value": "jerk_print" }, - "jerk_print": { "value": "10" }, - "jerk_support": { "value": "jerk_print" }, - "jerk_support_interface": { "value": "jerk_print" }, - "jerk_topbottom": { "value": "jerk_print" }, - "jerk_wall": { "value": "jerk_print" }, - "jerk_wall_0": { "value": "jerk_print" }, - "jerk_travel": { "value": "jerk_layer_0" }, - "jerk_travel_layer_0": { "value": "jerk_layer_0" }, - "prime_tower_position_x": { "value": "270" }, - "prime_tower_position_y": { "value": "270" }, - "extruder_prime_pos_abs": { "value": "True" }, - "switch_extruder_prime_speed": { "value": "15" }, - "switch_extruder_retraction_amount": { "value": "2" }, - "support_xy_distance": { "value": "wall_line_width_0 * 2.5" }, - "support_xy_distance_overhang": { "value": "wall_line_width_0" }, - "support_angle": { "value": "60" }, - "support_bottom_distance": { "value": "support_z_distance / 2" }, - "support_pattern": { "default_value": "zigzag" }, - "support_top_distance": { "value": "support_z_distance" }, - "support_use_towers": { "value": "True" }, - "support_z_distance": { "value": "layer_height" }, - "support_interface_enable": { "value": "True" }, - "support_interface_height": { "value": "1" }, - "support_interface_skip_height": { "value": "layer_height" }, - "support_bottom_enable": { "value": "False" }, - "support_join_distance": { "value": "1" }, - "support_offset": { "value": "1.5" }, - "support_infill_rate": { "value": "20" }, - "support_brim_enable": { "value": "True" }, - "prime_tower_enable": { "value": "True" } + "acceleration_enabled": { "value": "True" }, + "acceleration_layer_0": { "value": "250" }, + "acceleration_prime_tower": { "value": "1000" }, + "acceleration_print": { "value": "1000" }, + "acceleration_support": { "value": "1000" }, + "acceleration_support_interface": { "value": "750" }, + "acceleration_topbottom": { "value": "750" }, + "acceleration_travel": { "value": "1000" }, + "acceleration_wall": { "value": "750" }, + "acceleration_wall_0": { "value": "500" }, + "adhesion_type": { "default_value": "skirt" }, + "alternate_extra_perimeter": { "value": "True" }, + "bridge_fan_speed": { "value": "100" }, + "bridge_fan_speed_2": { "resolve": "max(cool_fan_speed, 50)" }, + "bridge_fan_speed_3": { "resolve": "max(cool_fan_speed, 20)" }, + "bridge_settings_enabled": { "value": "True" }, + "bridge_wall_coast": { "value": "10" }, + "build_volume_temperature": { "maximum_value_warning": 45 }, + "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" }, + "cool_fan_speed_min": { "value": "cool_fan_speed" }, + "cool_min_layer_time": { "value": "15" }, + "cool_min_layer_time_fan_speed_max": { "value": "20" }, + "extruder_prime_pos_abs": { "value": "True" }, + "fill_outline_gaps": { "value": "True" }, + "gantry_height": { "value": 30 }, + "infill_before_walls": { "value": "False" }, + "infill_enable_travel_optimization": { "value": "True" }, + "jerk_enabled": { "value": "True" }, + "jerk_layer_0": { "value": "5" }, + "jerk_prime_tower": { "value": "jerk_print" }, + "jerk_print": { "value": "10" }, + "jerk_support": { "value": "jerk_print" }, + "jerk_support_interface": { "value": "jerk_print" }, + "jerk_topbottom": { "value": "jerk_print" }, + "jerk_travel": { "value": "jerk_layer_0" }, + "jerk_travel_layer_0": { "value": "jerk_layer_0" }, + "jerk_wall": { "value": "jerk_print" }, + "jerk_wall_0": { "value": "jerk_print" }, + "layer_height_0": { "resolve": "max(0.2, min(extruderValues('layer_height')))" }, + "line_width": { "value": "machine_nozzle_size * 1.125" }, + "machine_acceleration": { "default_value": 1500 }, + "machine_depth": { "default_value": 300 }, + "machine_end_gcode": { "default_value": "M104 T0 S0 ;extruder heater off\nM104 T1 S0 ;extruder heater off\nM140 S0 ;heated bed heater off\nG91\nG1 Z1 F420 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+1 E-1 F300 ;move Z up a bit and retract filament even more\nG90 ;absolute positioning\nG1 X0 Y300 F6000 ;move the head out of the way\nM84 ;steppers off" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "Marlin" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-35, 65], + [-35, -50], + [35, -50], + [35, 65] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_heated_build_volume": { "default_value": true }, + "machine_height": { "default_value": 300 }, + "machine_max_acceleration_x": { "default_value": 1500 }, + "machine_max_acceleration_y": { "default_value": 1500 }, + "machine_max_acceleration_z": { "default_value": 250 }, + "machine_max_feedrate_e": { "default_value": 120 }, + "machine_max_feedrate_z": { "default_value": 10 }, + "machine_max_jerk_e": { "default_value": 15 }, + "machine_max_jerk_xy": { "default_value": 15 }, + "machine_max_jerk_z": { "default_value": 1 }, + "machine_name": { "default_value": "Signal Pro" }, + "machine_start_gcode": { "default_value": "G21 ; set units to millimeters\nG90 ; use absolute positioning\nM82 ; absolute extrusion mode\nG28 ; home all without mesh bed level\nM420 S1\nG92 E0.0 ; reset extruder distance position\nG1 Z0.25\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E21.5 F1000.0 ; intro line\nG92 E0.0 ; reset extruder distance position" }, + "machine_width": { "default_value": 300 }, + "material_bed_temperature": { "maximum_value_warning": 140 }, + "material_print_temperature": { "maximum_value_warning": 295 }, + "meshfix_maximum_deviation": { "value": "layer_height / 2" }, + "meshfix_maximum_resolution": { "value": "0.01" }, + "min_infill_area": { "value": "5.0" }, + "minimum_polygon_circumference": { "value": "0.2" }, + "optimize_wall_printing_order": { "value": "True" }, + "prime_tower_enable": { "value": "True" }, + "prime_tower_position_x": { "value": "270" }, + "prime_tower_position_y": { "value": "270" }, + "retraction_amount": { "value": "1" }, + "retraction_combing": { "value": "'noskin'" }, + "retraction_combing_max_distance": { "value": "10" }, + "retraction_hop": { "value": "0.5" }, + "retraction_hop_enabled": { "value": "True" }, + "retraction_prime_speed": + { + "maximum_value_warning": "130", + "value": "math.ceil(retraction_speed * 0.4)" + }, + "retraction_retract_speed": + { + "maximum_value_warning": "130", + "value": "retraction_speed" + }, + "retraction_speed": + { + "maximum_value_warning": "130", + "value": "50" + }, + "roofing_layer_count": { "value": "1" }, + "skirt_brim_minimal_length": { "value": "550" }, + "speed_layer_0": { "value": "math.ceil(speed_print * 0.25)" }, + "speed_roofing": { "value": "math.ceil(speed_print * 0.45)" }, + "speed_slowdown_layers": { "value": "2" }, + "speed_topbottom": { "value": "math.ceil(speed_print * 0.45)" }, + "speed_travel": + { + "maximum_value": "150", + "maximum_value_warning": "151", + "value": "150" + }, + "speed_travel_layer_0": { "value": "math.ceil(speed_travel * 0.4)" }, + "speed_wall": { "value": "math.ceil(speed_print * 0.50)" }, + "speed_wall_0": { "value": "math.ceil(speed_print * 0.50)" }, + "speed_wall_x": { "value": "math.ceil(speed_print * 0.75)" }, + "support_angle": { "value": "60" }, + "support_bottom_distance": { "value": "support_z_distance / 2" }, + "support_bottom_enable": { "value": "False" }, + "support_brim_enable": { "value": "True" }, + "support_infill_rate": { "value": "20" }, + "support_interface_enable": { "value": "True" }, + "support_interface_height": { "value": "1" }, + "support_interface_skip_height": { "value": "layer_height" }, + "support_join_distance": { "value": "1" }, + "support_offset": { "value": "1.5" }, + "support_pattern": { "default_value": "zigzag" }, + "support_top_distance": { "value": "support_z_distance" }, + "support_use_towers": { "value": "True" }, + "support_xy_distance": { "value": "wall_line_width_0 * 2.5" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + "support_z_distance": { "value": "layer_height" }, + "switch_extruder_prime_speed": { "value": "15" }, + "switch_extruder_retraction_amount": { "value": "2" }, + "travel_avoid_other_parts": { "value": "True" }, + "travel_avoid_supports": { "value": "True" }, + "wall_line_width": { "value": "machine_nozzle_size" }, + "wall_overhang_angle": { "value": "75" }, + "wall_overhang_speed_factor": { "value": "50" }, + "zig_zaggify_infill": { "value": "True" } } } \ No newline at end of file diff --git a/resources/definitions/atmat_signal_xl.def.json b/resources/definitions/atmat_signal_xl.def.json index 855ac89bb5..d89f57b6fe 100644 --- a/resources/definitions/atmat_signal_xl.def.json +++ b/resources/definitions/atmat_signal_xl.def.json @@ -1,6 +1,6 @@ { - "name": "Signal XL", "version": 2, + "name": "Signal XL", "inherits": "atmat_signal_pro_base", "metadata": { @@ -9,32 +9,31 @@ }, "overrides": { - "machine_name": { "default_value": "Signal XL" }, - "machine_width": { "default_value": 310 }, - "machine_depth": { "default_value": 320 }, - "machine_height": { "default_value": 260 }, - "acceleration_layer_0": { "value": "250" }, - "acceleration_prime_tower": { "value": "750" }, - "acceleration_print": { "value": "750" }, - "acceleration_travel": { "value": "750" }, - "acceleration_support": { "value": "750" }, - "acceleration_support_interface": { "value": "750" }, - "acceleration_topbottom": { "value": "750" }, - "acceleration_wall": { "value": "750" }, - "acceleration_wall_0": { "value": "500" }, - "jerk_layer_0": { "value": "5" }, - "jerk_prime_tower": { "value": "jerk_print" }, - "jerk_print": { "value": "7.5" }, - "jerk_support": { "value": "jerk_print" }, - "jerk_support_interface": { "value": "jerk_print" }, - "jerk_topbottom": { "value": "jerk_print" }, - "jerk_wall": { "value": "jerk_print" }, - "jerk_wall_0": { "value": "jerk_print" }, - "jerk_travel": { "value": "jerk_layer_0" }, - "jerk_travel_layer_0": { "value": "jerk_layer_0" }, - "machine_extruder_count": { "default_value": 1 }, - "machine_heated_build_volume": { "default_value": false }, - "machine_gcode_flavor": { "default_value": "Repetier" } - + "acceleration_layer_0": { "value": "250" }, + "acceleration_prime_tower": { "value": "750" }, + "acceleration_print": { "value": "750" }, + "acceleration_support": { "value": "750" }, + "acceleration_support_interface": { "value": "750" }, + "acceleration_topbottom": { "value": "750" }, + "acceleration_travel": { "value": "750" }, + "acceleration_wall": { "value": "750" }, + "acceleration_wall_0": { "value": "500" }, + "jerk_layer_0": { "value": "5" }, + "jerk_prime_tower": { "value": "jerk_print" }, + "jerk_print": { "value": "7.5" }, + "jerk_support": { "value": "jerk_print" }, + "jerk_support_interface": { "value": "jerk_print" }, + "jerk_topbottom": { "value": "jerk_print" }, + "jerk_travel": { "value": "jerk_layer_0" }, + "jerk_travel_layer_0": { "value": "jerk_layer_0" }, + "jerk_wall": { "value": "jerk_print" }, + "jerk_wall_0": { "value": "jerk_print" }, + "machine_depth": { "default_value": 320 }, + "machine_extruder_count": { "default_value": 1 }, + "machine_gcode_flavor": { "default_value": "Repetier" }, + "machine_heated_build_volume": { "default_value": false }, + "machine_height": { "default_value": 260 }, + "machine_name": { "default_value": "Signal XL" }, + "machine_width": { "default_value": 310 } } -} +} \ No newline at end of file diff --git a/resources/definitions/atmat_signal_xxl.def.json b/resources/definitions/atmat_signal_xxl.def.json index 25e2f4c102..fe8e6ab439 100644 --- a/resources/definitions/atmat_signal_xxl.def.json +++ b/resources/definitions/atmat_signal_xxl.def.json @@ -1,6 +1,6 @@ { - "name": "Signal XXL", "version": 2, + "name": "Signal XXL", "inherits": "atmat_signal_pro_base", "metadata": { @@ -9,32 +9,31 @@ }, "overrides": { - "machine_name": { "default_value": "Signal XXL" }, - "machine_width": { "default_value": 310 }, - "machine_depth": { "default_value": 320 }, - "machine_height": { "default_value": 385 }, - "acceleration_layer_0": { "value": "250" }, - "acceleration_prime_tower": { "value": "750" }, - "acceleration_print": { "value": "750" }, - "acceleration_travel": { "value": "750" }, - "acceleration_support": { "value": "750" }, - "acceleration_support_interface": { "value": "750" }, - "acceleration_topbottom": { "value": "750" }, - "acceleration_wall": { "value": "750" }, - "acceleration_wall_0": { "value": "500" }, - "jerk_layer_0": { "value": "5" }, - "jerk_prime_tower": { "value": "jerk_print" }, - "jerk_print": { "value": "7.5" }, - "jerk_support": { "value": "jerk_print" }, - "jerk_support_interface": { "value": "jerk_print" }, - "jerk_topbottom": { "value": "jerk_print" }, - "jerk_wall": { "value": "jerk_print" }, - "jerk_wall_0": { "value": "jerk_print" }, - "jerk_travel": { "value": "jerk_layer_0" }, - "jerk_travel_layer_0": { "value": "jerk_layer_0" }, - "machine_extruder_count": { "default_value": 1 }, - "machine_heated_build_volume": { "default_value": false }, - "machine_gcode_flavor": { "default_value": "Repetier" } - + "acceleration_layer_0": { "value": "250" }, + "acceleration_prime_tower": { "value": "750" }, + "acceleration_print": { "value": "750" }, + "acceleration_support": { "value": "750" }, + "acceleration_support_interface": { "value": "750" }, + "acceleration_topbottom": { "value": "750" }, + "acceleration_travel": { "value": "750" }, + "acceleration_wall": { "value": "750" }, + "acceleration_wall_0": { "value": "500" }, + "jerk_layer_0": { "value": "5" }, + "jerk_prime_tower": { "value": "jerk_print" }, + "jerk_print": { "value": "7.5" }, + "jerk_support": { "value": "jerk_print" }, + "jerk_support_interface": { "value": "jerk_print" }, + "jerk_topbottom": { "value": "jerk_print" }, + "jerk_travel": { "value": "jerk_layer_0" }, + "jerk_travel_layer_0": { "value": "jerk_layer_0" }, + "jerk_wall": { "value": "jerk_print" }, + "jerk_wall_0": { "value": "jerk_print" }, + "machine_depth": { "default_value": 320 }, + "machine_extruder_count": { "default_value": 1 }, + "machine_gcode_flavor": { "default_value": "Repetier" }, + "machine_heated_build_volume": { "default_value": false }, + "machine_height": { "default_value": 385 }, + "machine_name": { "default_value": "Signal XXL" }, + "machine_width": { "default_value": 310 } } -} +} \ No newline at end of file diff --git a/resources/definitions/atmat_signal_xxxl.def.json b/resources/definitions/atmat_signal_xxxl.def.json index 502ce272f0..f1a5262c09 100644 --- a/resources/definitions/atmat_signal_xxxl.def.json +++ b/resources/definitions/atmat_signal_xxxl.def.json @@ -1,6 +1,6 @@ { - "name": "Signal XXXL", "version": 2, + "name": "Signal XXXL", "inherits": "atmat_signal_pro_base", "metadata": { @@ -9,32 +9,31 @@ }, "overrides": { - "machine_name": { "default_value": "Signal XXXL" }, - "machine_width": { "default_value": 310 }, - "machine_depth": { "default_value": 320 }, - "machine_height": { "default_value": 500 }, - "acceleration_layer_0": { "value": "250" }, - "acceleration_prime_tower": { "value": "750" }, - "acceleration_print": { "value": "750" }, - "acceleration_travel": { "value": "750" }, - "acceleration_support": { "value": "750" }, - "acceleration_support_interface": { "value": "750" }, - "acceleration_topbottom": { "value": "750" }, - "acceleration_wall": { "value": "750" }, - "acceleration_wall_0": { "value": "500" }, - "jerk_layer_0": { "value": "5" }, - "jerk_prime_tower": { "value": "jerk_print" }, - "jerk_print": { "value": "7.5" }, - "jerk_support": { "value": "jerk_print" }, - "jerk_support_interface": { "value": "jerk_print" }, - "jerk_topbottom": { "value": "jerk_print" }, - "jerk_wall": { "value": "jerk_print" }, - "jerk_wall_0": { "value": "jerk_print" }, - "jerk_travel": { "value": "jerk_layer_0" }, - "jerk_travel_layer_0": { "value": "jerk_layer_0" }, - "machine_extruder_count": { "default_value": 1 }, - "machine_heated_build_volume": { "default_value": false }, - "machine_gcode_flavor": { "default_value": "Repetier" } - + "acceleration_layer_0": { "value": "250" }, + "acceleration_prime_tower": { "value": "750" }, + "acceleration_print": { "value": "750" }, + "acceleration_support": { "value": "750" }, + "acceleration_support_interface": { "value": "750" }, + "acceleration_topbottom": { "value": "750" }, + "acceleration_travel": { "value": "750" }, + "acceleration_wall": { "value": "750" }, + "acceleration_wall_0": { "value": "500" }, + "jerk_layer_0": { "value": "5" }, + "jerk_prime_tower": { "value": "jerk_print" }, + "jerk_print": { "value": "7.5" }, + "jerk_support": { "value": "jerk_print" }, + "jerk_support_interface": { "value": "jerk_print" }, + "jerk_topbottom": { "value": "jerk_print" }, + "jerk_travel": { "value": "jerk_layer_0" }, + "jerk_travel_layer_0": { "value": "jerk_layer_0" }, + "jerk_wall": { "value": "jerk_print" }, + "jerk_wall_0": { "value": "jerk_print" }, + "machine_depth": { "default_value": 320 }, + "machine_extruder_count": { "default_value": 1 }, + "machine_gcode_flavor": { "default_value": "Repetier" }, + "machine_heated_build_volume": { "default_value": false }, + "machine_height": { "default_value": 500 }, + "machine_name": { "default_value": "Signal XXXL" }, + "machine_width": { "default_value": 310 } } -} +} \ No newline at end of file diff --git a/resources/definitions/atom2.def.json b/resources/definitions/atom2.def.json index 9ad42c0f36..58930215f3 100644 --- a/resources/definitions/atom2.def.json +++ b/resources/definitions/atom2.def.json @@ -1,35 +1,37 @@ { - "name": "Atom 2", - "version": 2, - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Victor (Yu Chieh) Lin", - "manufacturer": "Layer One", - "file_formats": "text/x-gcode", - "platform_offset": [0,0,0], - "machine_extruder_trains": { "0": "atom2_extruder_0" + "version": 2, + "name": "Atom 2", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Victor (Yu Chieh) Lin", + "manufacturer": "Layer One", + "file_formats": "text/x-gcode", + "machine_extruder_trains": { "0": "atom2_extruder_0" }, + "platform_offset": [ + 0, + 0, + 0 + ] + }, + "overrides": + { + "brim_width": { "default_value": 4 }, + "default_material_print_temperature": { "default_value": 210 }, + "infill_sparse_density": { "default_value": 10 }, + "layer_height": { "default_value": 0.2 }, + "machine_center_is_zero": { "default_value": true }, + "machine_depth": { "default_value": 210 }, + "machine_end_gcode": { "default_value": "G28\nG91\nG1 E-6 F300\nM104 S0\nG1 E-1000 F5000\nM84\nG90" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 320 }, + "machine_name": { "default_value": "Atom 2" }, + "machine_shape": { "default_value": "elliptic" }, + "machine_start_gcode": { "default_value": "G21\nG90 \nM107\nG28\nG1 Y-110 Z15\nG0 Z{layer_height_0}\nG92 E0\nG1 F200 Y-100 E6\nG92 E0" }, + "machine_width": { "default_value": 210 }, + "optimize_wall_printing_order": { "value": "True" }, + "speed_print": { "default_value": 32 } } - }, - - "overrides": { - "machine_name": { "default_value": "Atom 2" }, - "machine_shape": { "default_value": "elliptic" }, - "machine_width": { "default_value": 210 }, - "machine_depth": { "default_value": 210 }, - "machine_height": { "default_value": 320 }, - "machine_extruder_count": { "default_value": 1 }, - "machine_heated_bed": { "default_value": false }, - "machine_center_is_zero": { "default_value": true }, - - "machine_start_gcode": { "default_value": "G21\nG90 \nM107\nG28\nG1 Y-110 Z15\nG0 Z{layer_height_0}\nG92 E0\nG1 F200 Y-100 E6\nG92 E0" }, - "machine_end_gcode": { "default_value": "G28\nG91\nG1 E-6 F300\nM104 S0\nG1 E-1000 F5000\nM84\nG90" }, - - "layer_height": { "default_value": 0.2 }, - "default_material_print_temperature": { "default_value": 210 }, - "speed_print": { "default_value": 32 }, - "optimize_wall_printing_order": { "value": "True" }, - "infill_sparse_density": { "default_value": 10 }, - "brim_width": { "default_value": 4 } - } -} +} \ No newline at end of file diff --git a/resources/definitions/atom3.def.json b/resources/definitions/atom3.def.json index 62d6c23577..aff4dfd3fb 100644 --- a/resources/definitions/atom3.def.json +++ b/resources/definitions/atom3.def.json @@ -7,134 +7,116 @@ "visible": true, "author": "Daniel Kurth", "manufacturer": "Layer One", - "platform_offset": [0, 0, 0], + "platform": "Atom 3 bed.3mf", "has_machine_quality": false, "has_materials": true, - "preferred_material": "layer_one_dark_gray_pla", "has_variants": true, - "preferred_variant_name": "PTFE hotend + 0.4mm brass nozzle", + "machine_extruder_trains": { "0": "atom3_extruder_0" }, + "platform_offset": [ + 0, + 0, + 0 + ], + "preferred_material": "layer_one_dark_gray_pla", "preferred_quality_type": "normal", - "variants_name": "Tool:", - "platform": "Atom 3 bed.3mf", - "machine_extruder_trains": - { - "0": "atom3_extruder_0" - } + "preferred_variant_name": "PTFE hotend + 0.4mm brass nozzle", + "variants_name": "Tool:" }, - - "overrides": { - "machine_name": { "default_value": "Atom 3" }, - "machine_show_variants": { "default_value": true}, - "machine_shape": { "default_value": "elliptic" }, - "machine_width": { "default_value": 270}, - "machine_depth": { "default_value": 270}, - "machine_height": { "default_value": 340}, - "machine_center_is_zero": { "default_value": true}, - "machine_nozzle_head_distance": { "default_value": 6}, - "machine_head_with_fans_polygon": + "adhesion_type": { "default_value": "skirt" }, + "cool_lift_head": { "default_value": false }, + "cool_min_layer_time": { "default_value": 5 }, + "cool_min_speed": { "default_value": 10 }, + "default_material_bed_temperature": { - "default_value":[ - [-23.82, 51.25], - [23.82, 51.25], - [56.292 , -5.00], - [32.476, -46.250], - [-32.476, -46.25], - [-56.292, -5.00] - ] + "default_value": 60, + "maximum_value": "120", + "maximum_value_warning": "115", + "minimum_value": "0", + "minimum_value_warning": "build_volume_temperature" }, - "machine_gcode_flavor": { "RepRap (Marlin/Sprinter)": "Marlin" }, - "machine_heated_bed": { "default_value": true }, - "material_diameter": { "default_value": 1.75}, - "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": - { - "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 }, + "default_material_print_temperature": { "default_value": 200 }, + "infill_before_walls": { "value": false }, + "infill_sparse_density": { "default_value": 17 }, + "initial_layer_line_width_factor": { "default_value": 100 }, + "layer_height": { "default_value": 0.2 }, "layer_height_0": { "default_value": 0.2, "value": "layer_height" }, - "line_width": { "value": "machine_nozzle_size"}, - - "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_initial_print_temperature": { "value": "material_print_temperature_layer_0"}, - "material_final_print_temperature": { "value": "material_print_temperature"}, - "default_material_bed_temperature": + "line_width": { "value": "machine_nozzle_size" }, + "machine_center_is_zero": { "default_value": true }, + "machine_depth": { "default_value": 270 }, + "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" }, + "machine_gcode_flavor": { "RepRap (Marlin/Sprinter)": "Marlin" }, + "machine_head_with_fans_polygon": { - "default_value": 60, - "minimum_value": "0", - "minimum_value_warning": "build_volume_temperature", - "maximum_value_warning": "115", - "maximum_value": "120" + "default_value": [ + [-23.82, 51.25], + [23.82, 51.25], + [56.292, -5.0], + [32.476, -46.25], + [-32.476, -46.25], + [-56.292, -5.0] + ] }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 340 }, + "machine_name": { "default_value": "Atom 3" }, + "machine_nozzle_head_distance": { "default_value": 6 }, + "machine_shape": { "default_value": "elliptic" }, + "machine_show_variants": { "default_value": true }, + "machine_start_gcode": { "default_value": ";MACHINE START CODE\nG21 ;metric values\nG90 ;absolute positioning\nG28 ;home\nG1 Z5 F9000\n;MACHINE START CODE" }, + "machine_width": { "default_value": 270 }, "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", + "maximum_value": "120", + "maximum_value_warning": "115", "minimum_value": "0", "minimum_value_warning": "build_volume_temperature", - "maximum_value_warning": "115", - "maximum_value": "120" + "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" }, - - "speed_print": { "default_value": 40}, - "speed_wall": { "value": "speed_print * 0.75"}, - "speed_wall_0": { "value": "speed_print * 0.5"}, - "speed_wall_x": { "value": "speed_print * 0.75"}, - "speed_layer_0": { "value": "20"}, - "speed_slowdown_layers": { "default_value": 1}, - + "material_diameter": { "default_value": 1.75 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_initial_print_temperature": { "value": "material_print_temperature_layer_0" }, "retraction_amount": { "default_value": 7, "maximum_value_warning": 9 }, + "retraction_hop": { "default_value": 0.5 }, + "retraction_hop_enabled": { "default_value": true }, "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": { "default_value": 750, - "value": "60 / (layer_height_0 * line_width)", + "maximum_value_warning": "4000", "minimum_value": "0", "minimum_value_warning": "25", - "maximum_value_warning": "4000" + "value": "60 / (layer_height_0 * line_width)" }, "skirt_gap": { "default_value": 1, "value": "3 * wall_line_width_0" - } + }, + "speed_layer_0": { "value": "20" }, + "speed_print": { "default_value": 40 }, + "speed_slowdown_layers": { "default_value": 1 }, + "speed_wall": { "value": "speed_print * 0.75" }, + "speed_wall_0": { "value": "speed_print * 0.5" }, + "speed_wall_x": { "value": "speed_print * 0.75" }, + "support_angle": { "default_value": 60 }, + "support_type": { "default_value": "everywhere" }, + "support_xy_distance_overhang": { "value": "machine_nozzle_size" }, + "support_z_distance": { "value": "layer_height" }, + "top_bottom_thickness": { "default_value": 1.0 }, + "zig_zaggify_infill": { "value": true } } } \ No newline at end of file diff --git a/resources/definitions/atom3_lite.def.json b/resources/definitions/atom3_lite.def.json index 69808e7ad3..d71834dbbe 100644 --- a/resources/definitions/atom3_lite.def.json +++ b/resources/definitions/atom3_lite.def.json @@ -2,61 +2,47 @@ "version": 2, "name": "Atom 3 Lite", "inherits": "atom3", - "metadata": { + "metadata": + { "author": "Daniel Kurth", "manufacturer": "Layer One", - "platform_offset": [0, 0, 0], - "preferred_variant_name": "PTFE hotend + 0.4mm brass nozzle", - "platform": "Atom 3 lite bed.3mf" + "platform": "Atom 3 lite bed.3mf", + "platform_offset": [ + 0, + 0, + 0 + ], + "preferred_variant_name": "PTFE hotend + 0.4mm brass nozzle" }, - - - - - "overrides": { + "overrides": + { + "cool_lift_head": { "default_value": false }, + "cool_min_layer_time": { "default_value": 15 }, + "cool_min_speed": { "default_value": 5 }, "machine_head_with_fans_polygon": { - "default_value": - [ + "default_value": [ [-23.82, 41.25], [23.82, 41.25], [38.105, 16.5], - [57.631 , 16.5], - - [57.631 , -16.5], + [57.631, 16.5], + [57.631, -16.5], [38.105, -16.5], [23.82, -41.25], [-23.82, -41.25], - [-38.105, -16.5], - [-57.631 , -16.5], - [-57.631 , 16.5], + [-57.631, -16.5], + [-57.631, 16.5], [-38.105, 16.5], [-23.82, 41.25] ] }, - - - - "retraction_amount": { "default_value": 7 }, - "retraction_speed": { + "retraction_speed": + { "default_value": 70, "maximum_value_warning": "90" }, - - - - - "cool_min_layer_time": { "default_value": 15}, - "cool_min_speed": { "default_value": 5}, - "cool_lift_head": { "default_value": false}, - - - - - "support_angle": { "default_value": 45} + "support_angle": { "default_value": 45 } } -} - - \ No newline at end of file +} \ No newline at end of file diff --git a/resources/definitions/atomstack_cambrian_base.def.json b/resources/definitions/atomstack_cambrian_base.def.json index 1939f930e4..9a7813ed14 100644 --- a/resources/definitions/atomstack_cambrian_base.def.json +++ b/resources/definitions/atomstack_cambrian_base.def.json @@ -1,29 +1,21 @@ -{ - "version": 2, - "name": "AtomStack Cambrian Base Printer", - "inherits": "fdmprinter", - "metadata": { - "visible": false, - "author": "AtomStack", - "manufacturer": "AtomStack", - "file_formats": "text/x-gcode", - "has_materials": true, - "machine_extruder_trains": { - "0": "atomstack_cambrianmaxe175_extruder_0" - } - }, - "overrides": { - "machine_heated_bed": { - "default_value": true - }, - "machine_extruder_count": { - "default_value": 1 - }, - "machine_start_gcode": { - "default_value": "; AtomStack Cambrian Start G-code\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\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.9 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.9 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG1 E29 ;Retract the filament\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" - }, - "machine_end_gcode": { - "default_value": "; AtomStack Cambrian End G-code\nG91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute position\n\nG1 X0 Y210 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off nozzle\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z" - } - } -} +{ + "version": 2, + "name": "AtomStack Cambrian Base Printer", + "inherits": "fdmprinter", + "metadata": + { + "visible": false, + "author": "AtomStack", + "manufacturer": "AtomStack", + "file_formats": "text/x-gcode", + "has_materials": true, + "machine_extruder_trains": { "0": "atomstack_cambrianmaxe175_extruder_0" } + }, + "overrides": + { + "machine_end_gcode": { "default_value": "; AtomStack Cambrian End G-code\nG91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute position\n\nG1 X0 Y210 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off nozzle\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_heated_bed": { "default_value": true }, + "machine_start_gcode": { "default_value": "; AtomStack Cambrian Start G-code\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\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.9 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.9 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG1 E29 ;Retract the filament\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" } + } +} \ No newline at end of file diff --git a/resources/definitions/atomstack_cambrianmaxe175.def.json b/resources/definitions/atomstack_cambrianmaxe175.def.json index 572b692118..4133973361 100644 --- a/resources/definitions/atomstack_cambrianmaxe175.def.json +++ b/resources/definitions/atomstack_cambrianmaxe175.def.json @@ -2,28 +2,20 @@ "version": 2, "name": "Cambrian Max E175", "inherits": "atomstack_cambrian_base", - "metadata": { + "metadata": + { "visible": true, "author": "AtomStack", "manufacturer": "AtomStack", "file_formats": "text/x-gcode", "has_materials": true, - "machine_extruder_trains": { - "0": "atomstack_cambrianmaxe175_extruder_0" - } + "machine_extruder_trains": { "0": "atomstack_cambrianmaxe175_extruder_0" } }, - "overrides": { - "machine_name": { - "default_value": "Cambrian MAX E175" - }, - "machine_width": { - "default_value": 320 - }, - "machine_height": { - "default_value": 380 - }, - "machine_depth": { - "default_value": 330 - } + "overrides": + { + "machine_depth": { "default_value": 330 }, + "machine_height": { "default_value": 380 }, + "machine_name": { "default_value": "Cambrian MAX E175" }, + "machine_width": { "default_value": 320 } } -} +} \ No newline at end of file diff --git a/resources/definitions/atomstack_cambrianmaxe285.def.json b/resources/definitions/atomstack_cambrianmaxe285.def.json index 064ee1ec83..a1cacac9ca 100644 --- a/resources/definitions/atomstack_cambrianmaxe285.def.json +++ b/resources/definitions/atomstack_cambrianmaxe285.def.json @@ -2,28 +2,20 @@ "version": 2, "name": "Cambrian Max E285", "inherits": "atomstack_cambrian_base", - "metadata": { + "metadata": + { "visible": true, "author": "AtomStack", "manufacturer": "AtomStack", "file_formats": "text/x-gcode", "has_materials": true, - "machine_extruder_trains": { - "0": "atomstack_cambrianmaxe285_extruder_0" - } + "machine_extruder_trains": { "0": "atomstack_cambrianmaxe285_extruder_0" } }, - "overrides": { - "machine_name": { - "default_value": "Cambrian MAX E285" - }, - "machine_width": { - "default_value": 320 - }, - "machine_height": { - "default_value": 380 - }, - "machine_depth": { - "default_value": 330 - } + "overrides": + { + "machine_depth": { "default_value": 330 }, + "machine_height": { "default_value": 380 }, + "machine_name": { "default_value": "Cambrian MAX E285" }, + "machine_width": { "default_value": 320 } } -} +} \ No newline at end of file diff --git a/resources/definitions/atomstack_cambrianproe175.def.json b/resources/definitions/atomstack_cambrianproe175.def.json index cc56d5545a..b4fd6af9d2 100644 --- a/resources/definitions/atomstack_cambrianproe175.def.json +++ b/resources/definitions/atomstack_cambrianproe175.def.json @@ -2,28 +2,20 @@ "version": 2, "name": "Cambrian Pro E175", "inherits": "atomstack_cambrian_base", - "metadata": { + "metadata": + { "visible": true, "author": "AtomStack", "manufacturer": "AtomStack", "file_formats": "text/x-gcode", "has_materials": true, - "machine_extruder_trains": { - "0": "atomstack_cambrianproe175_extruder_0" - } + "machine_extruder_trains": { "0": "atomstack_cambrianproe175_extruder_0" } }, - "overrides": { - "machine_name": { - "default_value": "Cambrian Pro E175" - }, - "machine_width": { - "default_value": 235 - }, - "machine_height": { - "default_value": 250 - }, - "machine_depth": { - "default_value": 235 - } + "overrides": + { + "machine_depth": { "default_value": 235 }, + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "Cambrian Pro E175" }, + "machine_width": { "default_value": 235 } } -} +} \ No newline at end of file diff --git a/resources/definitions/atomstack_cambrianproe285.def.json b/resources/definitions/atomstack_cambrianproe285.def.json index 37f51dcc97..58ca16d47a 100644 --- a/resources/definitions/atomstack_cambrianproe285.def.json +++ b/resources/definitions/atomstack_cambrianproe285.def.json @@ -2,28 +2,20 @@ "version": 2, "name": "Cambrian Pro E285", "inherits": "atomstack_cambrian_base", - "metadata": { + "metadata": + { "visible": true, "author": "AtomStack", "manufacturer": "AtomStack", "file_formats": "text/x-gcode", "has_materials": true, - "machine_extruder_trains": { - "0": "atomstack_cambrianproe285_extruder_0" - } + "machine_extruder_trains": { "0": "atomstack_cambrianproe285_extruder_0" } }, - "overrides": { - "machine_name": { - "default_value": "Cambrian Pro E285" - }, - "machine_width": { - "default_value": 235 - }, - "machine_height": { - "default_value": 250 - }, - "machine_depth": { - "default_value": 235 - } + "overrides": + { + "machine_depth": { "default_value": 235 }, + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "Cambrian Pro E285" }, + "machine_width": { "default_value": 235 } } -} +} \ No newline at end of file diff --git a/resources/definitions/beamup_l.def.json b/resources/definitions/beamup_l.def.json index 7de0481b7a..2ec6e803c0 100644 --- a/resources/definitions/beamup_l.def.json +++ b/resources/definitions/beamup_l.def.json @@ -2,57 +2,35 @@ "version": 2, "name": "BeamUp L", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "BeamUp", "manufacturer": "BeamUp", "file_formats": "text/x-gcode", "platform": "beamup_l.3mf", - "platform_offset": [0, -2.5, -2.5], "has_machine_quality": true, "has_materials": true, - "machine_extruder_trains": - { - "0": "beamup_l_extruder_0" - } + "machine_extruder_trains": { "0": "beamup_l_extruder_0" }, + "platform_offset": [ + 0, + -2.5, + -2.5 + ] }, - - "overrides": { - "machine_name": { - "default_value": "BeamUp L" - }, - "machine_width": { - "default_value": 320 - }, - "machine_depth": { - "default_value": 320 - }, - "machine_height": { - "default_value": 300 - }, - "machine_heated_bed": { - "default_value": false - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_nozzle_heat_up_speed": { - "default_value": 2 - }, - "machine_nozzle_cool_down_speed": { - "default_value": 2 - }, - "gantry_height": { - "value": "0" - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G28 ; home\nG29 ; level\nM80 ; led\nG1 Z15.0 F6000\nT0\nG92 E0.0000\nG1 E-1.4500 F1800\nG1 X50 Y0 Z0.300 F6000\nM300 S3000 P300\nG1 E1.0000 F1800\nG92 E0.0000\nG1 X250 Y0 E15 F662" - }, - "machine_end_gcode": { - "default_value": "G28 ; home\nM104 S0 ; turn off\n M140 S0 ; turn off\nM84 ; disable motors\nM107 ; fan off" - } + "overrides": + { + "gantry_height": { "value": "0" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 320 }, + "machine_end_gcode": { "default_value": "G28 ; home\nM104 S0 ; turn off\n M140 S0 ; turn off\nM84 ; disable motors\nM107 ; fan off" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 300 }, + "machine_name": { "default_value": "BeamUp L" }, + "machine_nozzle_cool_down_speed": { "default_value": 2 }, + "machine_nozzle_heat_up_speed": { "default_value": 2 }, + "machine_start_gcode": { "default_value": "G28 ; home\nG29 ; level\nM80 ; led\nG1 Z15.0 F6000\nT0\nG92 E0.0000\nG1 E-1.4500 F1800\nG1 X50 Y0 Z0.300 F6000\nM300 S3000 P300\nG1 E1.0000 F1800\nG92 E0.0000\nG1 X250 Y0 E15 F662" }, + "machine_width": { "default_value": 320 } } -} +} \ No newline at end of file diff --git a/resources/definitions/beamup_s.def.json b/resources/definitions/beamup_s.def.json index 148656f819..b27411e772 100644 --- a/resources/definitions/beamup_s.def.json +++ b/resources/definitions/beamup_s.def.json @@ -2,57 +2,35 @@ "version": 2, "name": "BeamUp S", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "BeamUp", "manufacturer": "BeamUp", "file_formats": "text/x-gcode", "platform": "beamup_s.3mf", - "platform_offset": [0, -5, -10], "has_machine_quality": true, "has_materials": true, - "machine_extruder_trains": - { - "0": "beamup_s_extruder_0" - } + "machine_extruder_trains": { "0": "beamup_s_extruder_0" }, + "platform_offset": [ + 0, + -5, + -10 + ] }, - - "overrides": { - "machine_name": { - "default_value": "BeamUp S" - }, - "machine_width": { - "default_value": 200 - }, - "machine_depth": { - "default_value": 180 - }, - "machine_height": { - "default_value": 130 - }, - "machine_heated_bed": { - "default_value": false - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_nozzle_heat_up_speed": { - "default_value": 2 - }, - "machine_nozzle_cool_down_speed": { - "default_value": 2 - }, - "gantry_height": { - "value": "0" - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G28 ; home\nG29 ; level\nM80 ; led\nG1 Z15.0 F6000\nT0\nG92 E0.0000\nG1 E-1.4500 F1800\nG1 X5 Y0 Z0.300 F6000\nM300 S3000 P300\nG1 E1.0000 F1800\nG92 E0.0000\nG1 X180 Y0 E15 F662" - }, - "machine_end_gcode": { - "default_value": "G28 ; home\nM104 S0 ; turn off\n M140 S0 ; turn off\nM84 ; disable motors\nM107 ; fan off" - } + "overrides": + { + "gantry_height": { "value": "0" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 180 }, + "machine_end_gcode": { "default_value": "G28 ; home\nM104 S0 ; turn off\n M140 S0 ; turn off\nM84 ; disable motors\nM107 ; fan off" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 130 }, + "machine_name": { "default_value": "BeamUp S" }, + "machine_nozzle_cool_down_speed": { "default_value": 2 }, + "machine_nozzle_heat_up_speed": { "default_value": 2 }, + "machine_start_gcode": { "default_value": "G28 ; home\nG29 ; level\nM80 ; led\nG1 Z15.0 F6000\nT0\nG92 E0.0000\nG1 E-1.4500 F1800\nG1 X5 Y0 Z0.300 F6000\nM300 S3000 P300\nG1 E1.0000 F1800\nG92 E0.0000\nG1 X180 Y0 E15 F662" }, + "machine_width": { "default_value": 200 } } -} +} \ No newline at end of file diff --git a/resources/definitions/bfb.def.json b/resources/definitions/bfb.def.json index caee91291a..8aa2c1e6b3 100644 --- a/resources/definitions/bfb.def.json +++ b/resources/definitions/bfb.def.json @@ -1,32 +1,34 @@ { - "name": "BFB", "version": 2, + "name": "BFB", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "manufacturer": "BFB", "file_formats": "text/x-gcode", - "platform_offset": [ 0, 0, 0], - "machine_extruder_trains": - { - "0": "bfb_extruder_0" - } + "machine_extruder_trains": { "0": "bfb_extruder_0" }, + "platform_offset": [ + 0, + 0, + 0 + ] }, - - "overrides": { - "speed_print": { "default_value": 40 }, - "machine_extruder_count": { "default_value": 1 }, - "prime_tower_size": { "default_value": 7.745966692414834 }, - "machine_name": { "default_value": "BFB_Test" }, - "machine_heated_bed": { "default_value": false }, - "machine_width": { "default_value": 275 }, - "machine_gcode_flavor": { "default_value": "BFB" }, - "machine_depth": { "default_value": 265 }, - "machine_center_is_zero": { "default_value": true }, - "machine_height": { "default_value": 240 }, - "layer_height": { "default_value": 0.25 }, - "retraction_amount": { "default_value": 0.05 }, + "overrides": + { "infill_sparse_density": { "default_value": 10 }, - "layer_height_0": { "default_value": 0.5 } + "layer_height": { "default_value": 0.25 }, + "layer_height_0": { "default_value": 0.5 }, + "machine_center_is_zero": { "default_value": true }, + "machine_depth": { "default_value": 265 }, + "machine_extruder_count": { "default_value": 1 }, + "machine_gcode_flavor": { "default_value": "BFB" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 240 }, + "machine_name": { "default_value": "BFB_Test" }, + "machine_width": { "default_value": 275 }, + "prime_tower_size": { "default_value": 7.745966692414834 }, + "retraction_amount": { "default_value": 0.05 }, + "speed_print": { "default_value": 40 } } -} +} \ No newline at end of file diff --git a/resources/definitions/bibo2_dual.def.json b/resources/definitions/bibo2_dual.def.json index dad08603aa..344fdbf3b9 100644 --- a/resources/definitions/bibo2_dual.def.json +++ b/resources/definitions/bibo2_dual.def.json @@ -1,93 +1,48 @@ -{ - "version": 2, - "name": "Bibo 2 dual", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "unknown", - "manufacturer": "BIBO", - "file_formats": "text/x-gcode", - "has_materials": true, - "machine_extruder_trains": { - "0": "bibo2_dual_extruder_0", - "1": "bibo2_dual_extruder_1" - }, - "first_start_actions": [ - "MachineSettingsAction" - ] - }, - "overrides": { - "machine_name": { - "default_value": "BIBO2 dual" - }, - "machine_width": { - "default_value": 214 - }, - "machine_height": { - "default_value": 160 - }, - "machine_depth": { - "default_value": 186 - }, - "machine_center_is_zero": { - "default_value": true - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_nozzle_heat_up_speed": { - "default_value": 2 - }, - "machine_nozzle_cool_down_speed": { - "default_value": 2 - }, - "machine_head_with_fans_polygon": { - "default_value": [ - [ - -68.18, - 64.63 - ], - [ - -68.18, - -47.38 - ], - [ - 35.18, - 64.63 - ], - [ - 35.18, - -47.38 - ] - ] - }, - "gantry_height": { - "value": "12" - }, - "machine_use_extruder_offset_to_offset_coords": { - "default_value": true - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "M104 T0 165\nM104 T1 165\nM109 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\nG21 ;metric values\nG90 ;absolute positioning\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z2.0 F400 ;move the platform down 2mm\nT0\nG92 E0\nG28\nG1 Y0 F1200 E0\nG92 E0\nT{initial_extruder_nr}\nM117 BIBO Printing..." - }, - "machine_end_gcode": { - "default_value": ";End GCode\nM104 T0 S0 ;extruder heater off\nM104 T1 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91\nG1 Z1 F100 ;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-2 X-20 Y-20 F300 ;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" - }, - "speed_print": { - "default_value": 40 - }, - "machine_extruder_count": { - "default_value": 2 - }, - "prime_tower_position_x": { - "value": "50" - }, - "prime_tower_position_y": { - "value": "50" - } - } -} - +{ + "version": 2, + "name": "Bibo 2 dual", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "unknown", + "manufacturer": "BIBO", + "file_formats": "text/x-gcode", + "first_start_actions": [ "MachineSettingsAction" ], + "has_materials": true, + "machine_extruder_trains": + { + "0": "bibo2_dual_extruder_0", + "1": "bibo2_dual_extruder_1" + } + }, + "overrides": + { + "gantry_height": { "value": "12" }, + "machine_center_is_zero": { "default_value": true }, + "machine_depth": { "default_value": 186 }, + "machine_end_gcode": { "default_value": ";End GCode\nM104 T0 S0 ;extruder heater off\nM104 T1 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91\nG1 Z1 F100 ;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-2 X-20 Y-20 F300 ;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_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-68.18, 64.63], + [-68.18, -47.38], + [35.18, 64.63], + [35.18, -47.38] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 160 }, + "machine_name": { "default_value": "BIBO2 dual" }, + "machine_nozzle_cool_down_speed": { "default_value": 2 }, + "machine_nozzle_heat_up_speed": { "default_value": 2 }, + "machine_start_gcode": { "default_value": "M104 T0 165\nM104 T1 165\nM109 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\nG21 ;metric values\nG90 ;absolute positioning\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z2.0 F400 ;move the platform down 2mm\nT0\nG92 E0\nG28\nG1 Y0 F1200 E0\nG92 E0\nT{initial_extruder_nr}\nM117 BIBO Printing..." }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, + "machine_width": { "default_value": 214 }, + "prime_tower_position_x": { "value": "50" }, + "prime_tower_position_y": { "value": "50" }, + "speed_print": { "default_value": 40 } + } +} \ No newline at end of file diff --git a/resources/definitions/biqu_b1.def.json b/resources/definitions/biqu_b1.def.json index d60e229152..351383764c 100755 --- a/resources/definitions/biqu_b1.def.json +++ b/resources/definitions/biqu_b1.def.json @@ -1,44 +1,45 @@ { - "name": "Biqu B1", "version": 2, + "name": "Biqu B1", "inherits": "biqu_base", - "metadata": { - "quality_definition": "biqu_base", + "metadata": + { "visible": true, - "has_machine_materials": true, "platform": "BIQU_SSS.stl", + "has_machine_materials": true, "platform_offset": [ 0, -7.4, 5 - ] + ], + "quality_definition": "biqu_base" }, - "overrides": { + "overrides": + { "coasting_enable": { "value": true }, - "retraction_amount": { "value": 7 }, - "retraction_speed": { "value": 70 }, - "support_enable": { "value": true }, - "support_structure": { "value": "'normal'" }, - "support_type": { "value": "'buildplate'" }, - "support_angle": { "value": 45 }, - "support_infill_rate": { "value": 15 }, + "gantry_height": { "value": 27.5 }, "infill_overlap_mm": { "value": 0.06 }, - "speed_print": { "value": 60 }, - "machine_name": { "default_value": "BIQU B1" }, - "machine_width": { "value": 235 }, "machine_depth": { "value": 235 }, - "machine_height": { "value": 270 }, - "machine_head_with_fans_polygon": { "default_value": [ + "machine_head_with_fans_polygon": + { + "default_value": [ [-33, 35], [-33, -23], [33, -23], [33, 35] ] }, - "machine_start_gcode": { - "default_value": " ; BIQU B1 Start G-code\nM117 Getting the bed up to temp!\nM140 S{material_bed_temperature_layer_0} ; Set Heat Bed temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Heat Bed temperature\nM117 Getting the extruder up to temp!\nM104 S{material_print_temperature_layer_0} ; Set Extruder temperature\nG92 E0 ; Reset Extruder\nM117 Homing axes\nG28 ; Home all axes\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X4.1 Y20 Z0.3 F5000.0 ; Move to start position\nM117 Purging\nG1 X4.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X4.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X4.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nM117 Lets make\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" - }, - - "gantry_height": { "value": 27.5 } + "machine_height": { "value": 270 }, + "machine_name": { "default_value": "BIQU B1" }, + "machine_start_gcode": { "default_value": " ; BIQU B1 Start G-code\nM117 Getting the bed up to temp!\nM140 S{material_bed_temperature_layer_0} ; Set Heat Bed temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Heat Bed temperature\nM117 Getting the extruder up to temp!\nM104 S{material_print_temperature_layer_0} ; Set Extruder temperature\nG92 E0 ; Reset Extruder\nM117 Homing axes\nG28 ; Home all axes\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X4.1 Y20 Z0.3 F5000.0 ; Move to start position\nM117 Purging\nG1 X4.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X4.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X4.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nM117 Lets make\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" }, + "machine_width": { "value": 235 }, + "retraction_amount": { "value": 7 }, + "retraction_speed": { "value": 70 }, + "speed_print": { "value": 60 }, + "support_angle": { "value": 45 }, + "support_enable": { "value": true }, + "support_infill_rate": { "value": 15 }, + "support_structure": { "value": "'normal'" }, + "support_type": { "value": "'buildplate'" } } -} +} \ No newline at end of file diff --git a/resources/definitions/biqu_b1_abl.def.json b/resources/definitions/biqu_b1_abl.def.json index 11876ae80b..536d93cac9 100755 --- a/resources/definitions/biqu_b1_abl.def.json +++ b/resources/definitions/biqu_b1_abl.def.json @@ -1,44 +1,45 @@ { - "name": "Biqu B1 ABL", "version": 2, + "name": "Biqu B1 ABL", "inherits": "biqu_base", - "metadata": { - "quality_definition": "biqu_base", + "metadata": + { "visible": true, - "has_machine_materials": true, "platform": "BIQU_SSS.stl", + "has_machine_materials": true, "platform_offset": [ 0, -7.4, 5 - ] + ], + "quality_definition": "biqu_base" }, - "overrides": { + "overrides": + { "coasting_enable": { "value": true }, - "retraction_amount": { "value": 7 }, - "retraction_speed": { "value": 70 }, - "support_enable": { "value": true }, - "support_structure": { "value": "'normal'" }, - "support_type": { "value": "'buildplate'" }, - "support_angle": { "value": 45 }, - "support_infill_rate": { "value": 15 }, + "gantry_height": { "value": 27.5 }, "infill_overlap_mm": { "value": 0.06 }, - "speed_print": { "value": 60 }, - "machine_name": { "default_value": "BIQU B1 ABL" }, - "machine_width": { "value": 235 }, "machine_depth": { "value": 235 }, - "machine_height": { "value": 270 }, - "machine_head_with_fans_polygon": { "default_value": [ + "machine_head_with_fans_polygon": + { + "default_value": [ [-33, 35], [-33, -23], [33, -23], [33, 35] ] }, - "machine_start_gcode": { - "default_value": "; BIQU B1 Start G-code\nM117 Getting the bed up to temp!\nM140 S{material_bed_temperature_layer_0} ; Set Heat Bed temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Heat Bed temperature\nM117 Pre-heating the extruder\nM104 S160 ; Set Extruder temperature\nM117 Homing axes\nG28 ; Home all axes\nM117 ABL Probing\nG29\nM117 Getting the extruder up to temp\nM104 S{material_print_temperature_layer_0} ; Set Extruder temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X4.1 Y20 Z0.3 F5000.0 ; Move to start position\nM117 Purging\nG1 X4.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X4.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X4.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nM117 Lets make\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" - }, - - "gantry_height": { "value": 27.5 } + "machine_height": { "value": 270 }, + "machine_name": { "default_value": "BIQU B1 ABL" }, + "machine_start_gcode": { "default_value": "; BIQU B1 Start G-code\nM117 Getting the bed up to temp!\nM140 S{material_bed_temperature_layer_0} ; Set Heat Bed temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Heat Bed temperature\nM117 Pre-heating the extruder\nM104 S160 ; Set Extruder temperature\nM117 Homing axes\nG28 ; Home all axes\nM117 ABL Probing\nG29\nM117 Getting the extruder up to temp\nM104 S{material_print_temperature_layer_0} ; Set Extruder temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X4.1 Y20 Z0.3 F5000.0 ; Move to start position\nM117 Purging\nG1 X4.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X4.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X4.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nM117 Lets make\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" }, + "machine_width": { "value": 235 }, + "retraction_amount": { "value": 7 }, + "retraction_speed": { "value": 70 }, + "speed_print": { "value": 60 }, + "support_angle": { "value": 45 }, + "support_enable": { "value": true }, + "support_infill_rate": { "value": 15 }, + "support_structure": { "value": "'normal'" }, + "support_type": { "value": "'buildplate'" } } -} +} \ No newline at end of file diff --git a/resources/definitions/biqu_base.def.json b/resources/definitions/biqu_base.def.json index 44a582e545..86da2b1e13 100755 --- a/resources/definitions/biqu_base.def.json +++ b/resources/definitions/biqu_base.def.json @@ -1,154 +1,128 @@ { - "name": "Biqu Base Printer", "version": 2, + "name": "Biqu Base Printer", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": false, "author": "Luke Harrison", "manufacturer": "Biqu", "file_formats": "text/x-gcode", - "first_start_actions": ["MachineSettingsAction"], - - "machine_extruder_trains": { - "0": "biqu_base_extruder_0" - }, - + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true, - "variants_name": "Nozzle Diameter", - - "preferred_variant_name": "0.4mm Nozzle", + "machine_extruder_trains": { "0": "biqu_base_extruder_0" }, + "preferred_material": "generic_pla_175", "preferred_quality_type": "standard", - "preferred_material": "generic_pla_175" + "preferred_variant_name": "0.4mm Nozzle", + "variants_name": "Nozzle Diameter" }, - "overrides": { - "machine_name": { "default_value": "BIQU 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": " ;BIQU Default End Gcode\nG91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract a bit more and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z by 10mm\nG90 ;Return to absolute positioning\n\nG1 X0 Y{machine_depth} ;TaDaaaa\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": 75 }, - - "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 }, - + "overrides": + { + "acceleration_enabled": { "value": false }, "acceleration_print": { "value": 500 }, + "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, "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" }, - + "adaptive_layer_height_variation": { "value": 0.04 }, + "adaptive_layer_height_variation_step": { "value": 0.04 }, + "adhesion_type": { "value": "'skirt'" }, + "brim_replaces_support": { "value": false }, + "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, + "cool_min_layer_time": { "value": 10 }, + "fill_outline_gaps": { "value": false }, + "infill_before_walls": { "value": false }, + "infill_line_width": { "value": "line_width * 1.2" }, + "infill_overlap": { "value": 30.0 }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, + "infill_wipe_dist": { "value": 0.0 }, + "jerk_enabled": { "value": false }, "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": 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_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" }, - - - "optimize_wall_printing_order": { "value": "True" }, - - "material_initial_print_temperature": { "value": "material_print_temperature" }, + "machine_acceleration": { "value": 500 }, + "machine_end_gcode": { "default_value": " ;BIQU Default End Gcode\nG91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract a bit more and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z by 10mm\nG90 ;Return to absolute positioning\n\nG1 X0 Y{machine_depth} ;TaDaaaa\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_heated_bed": { "default_value": true }, + "machine_max_acceleration_e": { "value": 5000 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 100 }, + "machine_max_feedrate_e": { "value": 75 }, + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_jerk_e": { "value": 5 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.4 }, + "machine_name": { "default_value": "BIQU 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" }, + "material_diameter": { "default_value": 1.75 }, "material_final_print_temperature": { "value": "material_print_temperature" }, - - "z_seam_type": { "value": "'sharpest_corner'" }, - "z_seam_corner": { "value": "'z_seam_corner_inner'" }, - - "infill_line_width": { "value": "line_width * 1.2" }, - "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_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", - "maximum_value": 200 - }, - "retraction_retract_speed": { - "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", - "maximum_value": 200 - }, - "retraction_prime_speed": { - "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", - "maximum_value": 200 - }, - - "retraction_hop": { "value": 0.2 }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "meshfix_maximum_resolution": { "value": "0.25" }, + "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" }, + "minimum_interface_area": { "value": 10 }, + "minimum_support_area": { "value": 2 }, + "optimize_wall_printing_order": { "value": "True" }, "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, "retraction_combing_max_distance": { "value": 30 }, + "retraction_count_max": { "value": 100 }, + "retraction_extrusion_window": { "value": 10 }, + "retraction_hop": { "value": 0.2 }, + "retraction_min_travel": { "value": 1.5 }, + "retraction_prime_speed": + { + "maximum_value": 200, + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')" + }, + "retraction_retract_speed": + { + "maximum_value": 200, + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')" + }, + "retraction_speed": + { + "maximum_value": 200, + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')" + }, + "skin_overlap": { "value": 10.0 }, + "skirt_brim_speed": { "value": "speed_layer_0" }, + "skirt_gap": { "value": 10.0 }, + "skirt_line_count": { "value": 3 }, + "speed_layer_0": { "value": 20.0 }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_print": { "value": 50.0 }, + "speed_roofing": { "value": "speed_topbottom" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_support_interface": { "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_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, + "speed_wall_x": { "value": "speed_wall" }, + "speed_z_hop": { "value": 5 }, + "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width / 2.0 / layer_height)))" }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 4 }, + "support_infill_rate": { "value": "0 if support_structure == 'tree' else 20" }, + "support_interface_density": { "value": 75 }, + "support_interface_enable": { "value": true }, + "support_interface_height": { "value": "layer_height * 4" }, + "support_interface_pattern": { "value": "'grid'" }, + "support_interface_skip_height": { "value": 0.2 }, + "support_pattern": { "value": "'zigzag'" }, + "support_use_towers": { "value": false }, + "support_wall_count": { "value": 1 }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height * 2" }, + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, "travel_avoid_other_parts": { "value": true }, "travel_avoid_supports": { "value": true }, "travel_retract_before_outer_wall": { "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_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_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": 75 }, - "support_interface_pattern": { "value": "'grid'" }, - "support_interface_skip_height": { "value": 0.2 }, - "minimum_support_area": { "value": 2 }, - "minimum_interface_area": { "value": 10 }, - "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, - "wall_thickness": {"value": "line_width * 2" } + "wall_0_wipe_dist": { "value": 0.0 }, + "wall_thickness": { "value": "line_width * 2" }, + "z_seam_corner": { "value": "'z_seam_corner_inner'" }, + "z_seam_type": { "value": "'sharpest_corner'" } } -} +} \ No newline at end of file diff --git a/resources/definitions/biqu_bx_abl.def.json b/resources/definitions/biqu_bx_abl.def.json index 4877e669b6..827987bc43 100755 --- a/resources/definitions/biqu_bx_abl.def.json +++ b/resources/definitions/biqu_bx_abl.def.json @@ -1,50 +1,51 @@ { - "name": "Biqu BX", "version": 2, + "name": "Biqu BX", "inherits": "biqu_base", - "metadata": { - "quality_definition": "biqu_base", + "metadata": + { "visible": true, - "has_machine_materials": true, "platform": "BIQU_BX_PLATE.stl", + "has_machine_materials": true, "platform_offset": [ 7, -7.4, -3 - ] + ], + "quality_definition": "biqu_base" }, - "overrides": { + "overrides": + { "coasting_enable": { "value": false }, - "retraction_amount": { "value": 1 }, - "retraction_speed": { "value": 40 }, - "retraction_extrusion_window": { "value": 1 }, - "retract_at_layer_change": { "value": true }, - "support_enable": { "value": false }, - "support_structure": { "value": "'normal'" }, - "support_type": { "value": "'buildplate'" }, - "support_angle": { "value": 45 }, - "support_infill_rate": { "value": 15 }, - "infill_overlap": { "value": 15.0 }, - "skin_overlap": { "value": 20.0 }, "fill_outline_gaps": { "value": true }, - "roofing_layer_count": { "value": 2 }, - "xy_offset_layer_0": { "value": -0.1 }, - "speed_print": { "value": 50 }, - "machine_name": { "default_value": "Biqu BX" }, - "machine_width": { "value": 250 }, + "gantry_height": { "value": 27.5 }, + "infill_overlap": { "value": 15.0 }, "machine_depth": { "value": 250 }, - "machine_height": { "value": 250 }, - "machine_head_with_fans_polygon": { "default_value": [ + "machine_head_with_fans_polygon": + { + "default_value": [ [-33, 35], [-33, -23], [33, -23], [33, 35] ] }, - "machine_start_gcode": { - "default_value": "; BIQU BX Start G-code\r\n; For information on how to tune this profile and get the\r\n; most out of your BX visit: https:\/\/github.com\/looxonline\/Marlin\r\n; For the official github site visit: https:\/\/github.com\/bigtreetech\/BIQU-BX\r\n\r\nM117 Initial homing sequence. ; Home so that the probe is positioned to heat\r\nG28\r\n\r\nM117 Probe heating position\r\nG0 X65 Y5 Z1 ; Move the probe to the heating position.\r\n\r\nM117 Getting the heaters up to temp!\r\nM104 S140 ; Set Extruder temperature, no wait\r\nM140 S60 ; Set Heat Bed temperature\r\nM190 S60 ; Wait for Heat Bed temperature\r\n\r\nM117 Waiting for probe to warm! ; Wait another 90s for the probe to absorb heat.\r\nG4 S90 \r\n\r\nM117 Post warming re-home\r\nG28 ; Home all axes again after warming\r\n\r\nM117 Z-Dance of my people\r\nG34\r\n\r\nM117 ABL Probing\r\nG29\r\n\r\nM900 K0 L0 T0 ;Edit the K and L values if you have calibrated a k factor for your filament\r\nM900 T0 S0\r\n\r\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\r\nG1 X4.1 Y10 Z0.3 F5000.0 ; Move to start position\r\n\r\nM117 Getting the extruder up to temp\r\nM140 S{material_bed_temperature_layer_0} ; Set Heat Bed temperature\r\nM104 S{material_print_temperature_layer_0} ; Set Extruder temperature\r\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\r\nM190 S{material_bed_temperature_layer_0} ; Wait for Heat Bed temperature\r\n\r\nG92 E0 ; Reset Extruder\r\nM117 Purging\r\nG1 X4.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\r\nG1 X4.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\r\nG1 X4.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\r\nG92 E0 ; Reset Extruder\r\nM117 Lets make\r\nG1 X8 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" - }, - - "gantry_height": { "value": 27.5 } + "machine_height": { "value": 250 }, + "machine_name": { "default_value": "Biqu BX" }, + "machine_start_gcode": { "default_value": "; BIQU BX Start G-code\r\n; For information on how to tune this profile and get the\r\n; most out of your BX visit: https://github.com/looxonline/Marlin\r\n; For the official github site visit: https://github.com/bigtreetech/BIQU-BX\r\n\r\nM117 Initial homing sequence. ; Home so that the probe is positioned to heat\r\nG28\r\n\r\nM117 Probe heating position\r\nG0 X65 Y5 Z1 ; Move the probe to the heating position.\r\n\r\nM117 Getting the heaters up to temp!\r\nM104 S140 ; Set Extruder temperature, no wait\r\nM140 S60 ; Set Heat Bed temperature\r\nM190 S60 ; Wait for Heat Bed temperature\r\n\r\nM117 Waiting for probe to warm! ; Wait another 90s for the probe to absorb heat.\r\nG4 S90 \r\n\r\nM117 Post warming re-home\r\nG28 ; Home all axes again after warming\r\n\r\nM117 Z-Dance of my people\r\nG34\r\n\r\nM117 ABL Probing\r\nG29\r\n\r\nM900 K0 L0 T0 ;Edit the K and L values if you have calibrated a k factor for your filament\r\nM900 T0 S0\r\n\r\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\r\nG1 X4.1 Y10 Z0.3 F5000.0 ; Move to start position\r\n\r\nM117 Getting the extruder up to temp\r\nM140 S{material_bed_temperature_layer_0} ; Set Heat Bed temperature\r\nM104 S{material_print_temperature_layer_0} ; Set Extruder temperature\r\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\r\nM190 S{material_bed_temperature_layer_0} ; Wait for Heat Bed temperature\r\n\r\nG92 E0 ; Reset Extruder\r\nM117 Purging\r\nG1 X4.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\r\nG1 X4.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\r\nG1 X4.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\r\nG92 E0 ; Reset Extruder\r\nM117 Lets make\r\nG1 X8 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" }, + "machine_width": { "value": 250 }, + "retract_at_layer_change": { "value": true }, + "retraction_amount": { "value": 1 }, + "retraction_extrusion_window": { "value": 1 }, + "retraction_speed": { "value": 40 }, + "roofing_layer_count": { "value": 2 }, + "skin_overlap": { "value": 20.0 }, + "speed_print": { "value": 50 }, + "support_angle": { "value": 45 }, + "support_enable": { "value": false }, + "support_infill_rate": { "value": 15 }, + "support_structure": { "value": "'normal'" }, + "support_type": { "value": "'buildplate'" }, + "xy_offset_layer_0": { "value": -0.1 } } -} +} \ No newline at end of file diff --git a/resources/definitions/blocks_base.def.json b/resources/definitions/blocks_base.def.json new file mode 100644 index 0000000000..de69a3f799 --- /dev/null +++ b/resources/definitions/blocks_base.def.json @@ -0,0 +1,117 @@ +{ + "version": 2, + "name": "Blocks Base Printer", + "inherits": "fdmprinter", + "metadata": + { + "visible": false, + "author": "Blocks Dev Team", + "manufacturer": "Blocks", + "file_formats": "text/x-gcode", + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "preferred_material": "generic_pla", + "preferred_quality_type": "normal", + "preferred_variant_name": "0.4mm Nozzle", + "variants_name": "Nozzle Size" + }, + "overrides": + { + "acceleration_print": { "value": 500 }, + "acceleration_travel": { "value": 500 }, + "acceleration_travel_layer_0": { "value": "acceleration_travel" }, + "adaptive_layer_height_variation": { "value": 0.04 }, + "adaptive_layer_height_variation_step": { "value": 0.04 }, + "adhesion_type": { "value": "'skirt'" }, + "alternate_extra_perimeter": { "default_value": true }, + "bottom_layers": { "value": "math.ceil(round(bottom_thickness / resolveOrValue('layer_height'), 4))" }, + "brim_replaces_support": { "value": false }, + "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, + "cool_min_layer_time": { "value": 10 }, + "infill_before_walls": { "value": false }, + "infill_enable_travel_optimization": { "default_value": true }, + "infill_overlap": { "value": 30.0 }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, + "infill_wipe_dist": { "value": 0.0 }, + "jerk_print": { "value": 8 }, + "jerk_travel": { "value": "jerk_print" }, + "jerk_travel_layer_0": { "value": "jerk_travel" }, + "machine_acceleration": { "value": 500 }, + "machine_heated_bed": { "default_value": true }, + "machine_max_acceleration_e": { "value": 5000 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_feedrate_e": { "value": 50 }, + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_jerk_xy": { "value": 10 }, + "material_diameter": { "default_value": 1.75 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "meshfix_maximum_resolution": { "value": "0.01" }, + "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" }, + "minimum_interface_area": { "value": 10 }, + "minimum_polygon_circumference": { "default_value": 0.2 }, + "minimum_support_area": { "value": 2 }, + "optimize_wall_printing_order": { "value": "True" }, + "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, + "retraction_combing_max_distance": { "value": 30 }, + "retraction_count_max": { "value": 100 }, + "retraction_hop": { "value": 0.2 }, + "retraction_hop_enabled": { "value": "False" }, + "retraction_prime_speed": + { + "maximum_value": 200, + "value": 20 + }, + "retraction_retract_speed": + { + "maximum_value_warning": 130, + "value": 200 + }, + "retraction_speed": + { + "maximum_value": 200, + "value": 40 + }, + "roofing_layer_count": { "value": 1 }, + "skin_monotonic": { "value": true }, + "skin_overlap": { "value": 10.0 }, + "skirt_gap": { "value": 10.0 }, + "skirt_line_count": { "value": 3 }, + "speed_layer_0": { "value": 20.0 }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_support_interface": { "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_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, + "speed_z_hop": { "value": 5 }, + "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 4 }, + "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_enable": { "value": true }, + "support_interface_height": { "value": "layer_height * 4" }, + "support_interface_pattern": { "value": "'grid'" }, + "support_interface_skip_height": { "value": 0.2 }, + "support_pattern": { "value": "'zigzag'" }, + "support_use_towers": { "value": false }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height * 2" }, + "top_layers": { "value": "math.ceil(round(top_thickness / resolveOrValue('layer_height'), 4))" }, + "travel_avoid_supports": { "value": true }, + "travel_retract_before_outer_wall": { "value": true }, + "wall_0_wipe_dist": { "value": 0.0 }, + "wall_overhang_angle": { "default_value": 75 }, + "wall_overhang_speed_factor": { "default_value": 50 }, + "wall_thickness": { "value": "line_width * 2" }, + "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, + "z_seam_type": { "value": "'back'" } + } +} \ No newline at end of file diff --git a/resources/definitions/blocks_mkii.def.json b/resources/definitions/blocks_mkii.def.json new file mode 100644 index 0000000000..631ed35d37 --- /dev/null +++ b/resources/definitions/blocks_mkii.def.json @@ -0,0 +1,22 @@ +{ + "version": 2, + "name": "Blocks One MKII", + "inherits": "blocks_base", + "metadata": + { + "visible": true, + "platform": "blocks_mk2_platform.stl", + "machine_extruder_trains": { "0": "blocks_mkii_extruder_0" }, + "quality_definition": "blocks_base" + }, + "overrides": + { + "machine_depth": { "default_value": 210 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F6000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\n" }, + "machine_height": { "default_value": 210 }, + "machine_name": { "default_value": "Blocks One MKII" }, + "machine_start_gcode": { "default_value": "G21\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG29\nG1 X-14 Y0 F6000\nG1 Z0.1\nG92 E0 ;zero the extruded length\nG1 F2000 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Z0.2 F6000\nG1 F6000\nM117 Printing...\n" }, + "machine_width": { "default_value": 200 }, + "retraction_retract_speed": { "value": 50 } + } +} \ No newline at end of file diff --git a/resources/definitions/blocks_one.def.json b/resources/definitions/blocks_one.def.json new file mode 100644 index 0000000000..e107fde313 --- /dev/null +++ b/resources/definitions/blocks_one.def.json @@ -0,0 +1,22 @@ +{ + "version": 2, + "name": "Blocks One", + "inherits": "blocks_base", + "metadata": + { + "visible": true, + "platform": "blocks_mk2_platform.stl", + "machine_extruder_trains": { "0": "blocks_one_extruder_0" }, + "quality_definition": "blocks_base" + }, + "overrides": + { + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F6000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\n" }, + "machine_height": { "default_value": 200 }, + "machine_name": { "default_value": "Blocks One" }, + "machine_start_gcode": { "default_value": "G21\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15 F6000\nG92 E0\nG1 F200 E3\nG92 E0\nG1 F6000\nM117 Printing...\n" }, + "machine_width": { "default_value": 200 }, + "retraction_retract_speed": { "value": 50 } + } +} \ No newline at end of file diff --git a/resources/definitions/blocks_pros100.def.json b/resources/definitions/blocks_pros100.def.json new file mode 100644 index 0000000000..4ad1886d5a --- /dev/null +++ b/resources/definitions/blocks_pros100.def.json @@ -0,0 +1,23 @@ +{ + "version": 2, + "name": "Blocks Pro S100", + "inherits": "blocks_base", + "metadata": + { + "visible": true, + "platform": "blocks_pros100_platform.stl", + "machine_extruder_trains": { "0": "blocks_pros100_extruder_0" }, + "preferred_variant_name": "0.8mm Nozzle", + "quality_definition": "blocks_base" + }, + "overrides": + { + "machine_depth": { "default_value": 1000 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F6000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\n" }, + "machine_height": { "default_value": 1000 }, + "machine_name": { "default_value": "Blocks Pro S100" }, + "machine_start_gcode": { "default_value": "G21\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG29\nG1 X-14 Y0 F6000\nG1 Z0.1\nG92 E0 ;zero the extruded length\nG1 F2000 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Z0.2 F6000\nG1 F6000\nM117 Printing...\n" }, + "machine_width": { "default_value": 1000 }, + "retraction_retract_speed": { "value": 50 } + } +} \ No newline at end of file diff --git a/resources/definitions/blocks_pros30.def.json b/resources/definitions/blocks_pros30.def.json new file mode 100644 index 0000000000..8d30b8db24 --- /dev/null +++ b/resources/definitions/blocks_pros30.def.json @@ -0,0 +1,22 @@ +{ + "version": 2, + "name": "Blocks Pro S30", + "inherits": "blocks_base", + "metadata": + { + "visible": true, + "platform": "blocks_pros30_platform.stl", + "machine_extruder_trains": { "0": "blocks_pros30_extruder_0" }, + "quality_definition": "blocks_base" + }, + "overrides": + { + "machine_depth": { "default_value": 310 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F6000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\n" }, + "machine_height": { "default_value": 290 }, + "machine_name": { "default_value": "Blocks Pro S30" }, + "machine_start_gcode": { "default_value": "G21\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG29\nG1 X-14 Y0 F6000\nG1 Z0.1\nG92 E0 ;zero the extruded length\nG1 F2000 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Z0.2 F6000\nG1 F6000\nM117 Printing...\n" }, + "machine_width": { "default_value": 310 }, + "retraction_retract_speed": { "value": 40 } + } +} \ No newline at end of file diff --git a/resources/definitions/blocks_r21.def.json b/resources/definitions/blocks_r21.def.json new file mode 100644 index 0000000000..51582bec14 --- /dev/null +++ b/resources/definitions/blocks_r21.def.json @@ -0,0 +1,30 @@ +{ + "version": 2, + "name": "Blocks R21", + "inherits": "blocks_base", + "metadata": + { + "visible": true, + "platform": "blocks_r21_platform.stl", + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { "0": "blocks_r21_extruder_0" }, + "preferred_material": "generic_pla", + "preferred_quality_type": "normal", + "preferred_variant_name": "ST - 0.4mm", + "quality_definition": "blocks_base", + "variants_name": "Print Core" + }, + "overrides": + { + "machine_depth": { "default_value": 210 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F6000 ;move Z up a bit and retract filament even more\nG28 X0;move X/Y to min endstops, so the head is out of the way\nG1 Y210 F5000.0\nG1 Z+70\nM84 ;steppers off\nG90 ;absolute positioning\n" }, + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "Blocks R21" }, + "machine_start_gcode": { "default_value": "G21\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG29\nM117 ; Purge extruder\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 Z1.0 F3000\nG1 X0.1 Y15 F3000.0\nG1 Z0.1 F3000.0\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nM117 Printing...\n" }, + "machine_width": { "default_value": 300 }, + "retraction_retract_speed": { "value": 50 } + } +} \ No newline at end of file diff --git a/resources/definitions/blocks_rd50.def.json b/resources/definitions/blocks_rd50.def.json new file mode 100644 index 0000000000..897ec299fe --- /dev/null +++ b/resources/definitions/blocks_rd50.def.json @@ -0,0 +1,35 @@ +{ + "version": 2, + "name": "Blocks RD50", + "inherits": "blocks_base", + "metadata": + { + "visible": true, + "platform": "blocks_rd50_platform.stl", + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": + { + "0": "blocks_rd50_extruder_0", + "1": "blocks_rd50_extruder_1" + }, + "preferred_material": "generic_pla", + "preferred_quality_type": "normal", + "preferred_variant_name": "ST - 0.4mm", + "quality_definition": "blocks_base", + "variants_name": "Print Core" + }, + "overrides": + { + "machine_depth": { "default_value": 500 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F6000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\n" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_height": { "default_value": 500 }, + "machine_name": { "default_value": "Blocks RD50" }, + "machine_start_gcode": { "default_value": "G21\nG90 ;absolute positioning\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\n;PREHEAT\nM140 S{material_bed_temperature_layer_0} ; Set Heat Bed temperature\nM104 S{material_print_temperature_layer_0} ; Set Extruder temperature\nG1 X-60 Y0 F6000\nG92 E0 ;zero the extruded length\nM190 S{material_bed_temperature_layer_0} ; Wait for Heat Bed temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\nG1 F600 E20 ;extrude 10mm of feed stock\nG1 F200 E80 ;extrude 10mm of feed stock\nG12\nG92 E0 ;zero the extruded length again\nG29\nG1 Z0.2 F6000\nG1 F6000\n" }, + "machine_width": { "default_value": 500 }, + "retraction_retract_speed": { "value": 50 } + } +} \ No newline at end of file diff --git a/resources/definitions/blocks_rd50duplicate.def.json b/resources/definitions/blocks_rd50duplicate.def.json new file mode 100644 index 0000000000..47af8572e9 --- /dev/null +++ b/resources/definitions/blocks_rd50duplicate.def.json @@ -0,0 +1,35 @@ +{ + "version": 2, + "name": "Blocks RD50 - Duplication Mode", + "inherits": "blocks_base", + "metadata": + { + "visible": true, + "platform": "blocks_rd50_platform.stl", + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": + { + "0": "blocks_rd50_extruder_0", + "1": "blocks_rd50_extruder_1" + }, + "preferred_material": "generic_pla", + "preferred_quality_type": "normal", + "preferred_variant_name": "ST - 0.4mm", + "quality_definition": "blocks_base", + "variants_name": "Print Core" + }, + "overrides": + { + "machine_depth": { "default_value": 500 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+1 E-1 X-20 Y-20 F6000 ;move Z up a bit and retract filament even more\nM605 S1 ; AUTO-PARK MODE\nG28 X Y ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\n" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_height": { "default_value": 500 }, + "machine_name": { "default_value": "Blocks RD50 - Duplication Mode" }, + "machine_start_gcode": { "default_value": ";INITIALIZE DUPLICATION MODE\nM605 S1 ; AUTO-PARK MODE\nT0 ; Set tool 0\nG28 ; Home all axes\nG28 X\nM605 S2 ; Set duplication mode\n; PREHEAT\nM140 S{material_bed_temperature_layer_0} ; Set Heat Bed temperature\nM104 S{material_print_temperature_layer_0} ; Set Extruder temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Heat Bed temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\n;SET DUPLICATION MODE\nM605 S2 X622 ; Set duplication mode and nozzle offset\nG28 X\nG1 X-60 F3000\nM605 S3 X622 ; Set mirror mode and nozzle offset\nM82\nG92 E0 ; Reset Extruder\nG1 F400\nG1 E40 F400 ; Prime\nG12 ; Clean Nozzle\nM605 S2 X250\nG28 X\nG92 E0 ; Reset Extruder\nG1 X0 F3000\n" }, + "machine_width": { "default_value": 500 }, + "retraction_retract_speed": { "value": 50 } + } +} \ No newline at end of file diff --git a/resources/definitions/blocks_rd50mirror.def.json b/resources/definitions/blocks_rd50mirror.def.json new file mode 100644 index 0000000000..ad077119ad --- /dev/null +++ b/resources/definitions/blocks_rd50mirror.def.json @@ -0,0 +1,35 @@ +{ + "version": 2, + "name": "Blocks RD50 - Mirror Mode", + "inherits": "blocks_base", + "metadata": + { + "visible": true, + "platform": "blocks_rd50_platform.stl", + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": + { + "0": "blocks_rd50_extruder_0", + "1": "blocks_rd50_extruder_1" + }, + "preferred_material": "generic_pla", + "preferred_quality_type": "normal", + "preferred_variant_name": "ST - 0.4mm", + "quality_definition": "blocks_base", + "variants_name": "Print Core" + }, + "overrides": + { + "machine_depth": { "default_value": 500 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+1 E-1 X-20 Y-20 F6000 ;move Z up a bit and retract filament even more\nM605 S1 ; AUTO-PARK MODE\nG28 X Y ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\n" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_height": { "default_value": 500 }, + "machine_name": { "default_value": "Blocks RD50 - Mirror Mode" }, + "machine_start_gcode": { "default_value": ";INITIALIZE MIRROR MODE\nM605 S1 ; AUTO-PARK MODE\nT0 ; Set tool 0\nG28 ; Home all axes\nG28 X ; Home x axes\nM605 S2 ; Set duplication mode\n; PREHEAT\nM140 S{material_bed_temperature_layer_0} ; Set Heat Bed temperature\nM104 S{material_print_temperature_layer_0} ; Set Extruder temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Heat Bed temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Extruder temperature\n;SET MIRROR MODE\nM605 S2 X622 ; Set duplication mode and nozzle offset\nG28 X\nG1 X-60 F3000\nM605 S3 X622 ; Set mirror mode and nozzle offset\nM82\nG92 E0 ; Reset Extruder\nG1 F200\nG1 E30 F200 ; Prime\nG12 ; Clean Nozzle\nG1 X125 F3000\nG92 E0 ; Reset Extruder\n" }, + "machine_width": { "default_value": 500 }, + "retraction_retract_speed": { "value": 50 } + } +} \ No newline at end of file diff --git a/resources/definitions/blocks_zero.def.json b/resources/definitions/blocks_zero.def.json new file mode 100644 index 0000000000..d0ed827e5e --- /dev/null +++ b/resources/definitions/blocks_zero.def.json @@ -0,0 +1,23 @@ +{ + "version": 2, + "name": "Blocks Zero", + "inherits": "blocks_base", + "metadata": + { + "visible": true, + "platform": "blocks_zero_platform.stl", + "machine_extruder_trains": { "0": "blocks_zero_extruder_0" }, + "quality_definition": "blocks_base" + }, + "overrides": + { + "machine_depth": { "default_value": 140 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F6000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\n" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 120 }, + "machine_name": { "default_value": "Blocks Zero" }, + "machine_start_gcode": { "default_value": "G21\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 X-14 Y0 F6000\nG1 Z0.1\nG92 E0 ;zero the extruded length\nG1 F2000 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Z0.2 F6000\nG1 F6000\nM117 Printing...\n" }, + "machine_width": { "default_value": 120 }, + "retraction_retract_speed": { "value": 50 } + } +} \ No newline at end of file diff --git a/resources/definitions/blv_mgn_cube_300.def.json b/resources/definitions/blv_mgn_cube_300.def.json index 48fb7cd149..024668068c 100644 --- a/resources/definitions/blv_mgn_cube_300.def.json +++ b/resources/definitions/blv_mgn_cube_300.def.json @@ -1,33 +1,23 @@ -{ - "name": "BLV MGN Cube 300", - "version": 2, - "inherits": "blv_mgn_cube_base", - "metadata": { - "visible": true, - "author": "wolfgangmauer", - "manufacturer": "BLV", - "file_formats": "text/x-gcode", - "first_start_actions": [ - "MachineSettingsAction" - ], - "machine_extruder_trains": { - "0": "blv_mgn_cube_extruder_0" - }, - "quality_definition": "blv_mgn_cube_base", - "platform": "blv_mgn_cube_300_platform.3mf" - }, - "overrides": { - "machine_name": { - "default_value": "BLV mgn Cube 300" - }, - "machine_height": { - "default_value": 465 - }, - "machine_width": { - "default_value": 300 - }, - "machine_depth": { - "default_value": 300 - } - } -} +{ + "version": 2, + "name": "BLV MGN Cube 300", + "inherits": "blv_mgn_cube_base", + "metadata": + { + "visible": true, + "author": "wolfgangmauer", + "manufacturer": "BLV", + "file_formats": "text/x-gcode", + "platform": "blv_mgn_cube_300_platform.3mf", + "first_start_actions": [ "MachineSettingsAction" ], + "machine_extruder_trains": { "0": "blv_mgn_cube_extruder_0" }, + "quality_definition": "blv_mgn_cube_base" + }, + "overrides": + { + "machine_depth": { "default_value": 300 }, + "machine_height": { "default_value": 465 }, + "machine_name": { "default_value": "BLV mgn Cube 300" }, + "machine_width": { "default_value": 300 } + } +} \ No newline at end of file diff --git a/resources/definitions/blv_mgn_cube_350.def.json b/resources/definitions/blv_mgn_cube_350.def.json index c5e5e28723..74f7b7f065 100644 --- a/resources/definitions/blv_mgn_cube_350.def.json +++ b/resources/definitions/blv_mgn_cube_350.def.json @@ -1,33 +1,23 @@ -{ - "name": "BLV MGN Cube 350", - "version": 2, - "inherits": "blv_mgn_cube_base", - "metadata": { - "visible": true, - "author": "wolfgangmauer", - "manufacturer": "BLV", - "file_formats": "text/x-gcode", - "first_start_actions": [ - "MachineSettingsAction" - ], - "machine_extruder_trains": { - "0": "blv_mgn_cube_extruder_0" - }, - "quality_definition": "blv_mgn_cube_base", - "platform": "blv_mgn_cube_350_platform.3mf" - }, - "overrides": { - "machine_name": { - "default_value": "BLV mgn Cube350" - }, - "machine_height": { - "default_value": 465 - }, - "machine_width": { - "default_value": 350 - }, - "machine_depth": { - "default_value": 350 - } - } -} +{ + "version": 2, + "name": "BLV MGN Cube 350", + "inherits": "blv_mgn_cube_base", + "metadata": + { + "visible": true, + "author": "wolfgangmauer", + "manufacturer": "BLV", + "file_formats": "text/x-gcode", + "platform": "blv_mgn_cube_350_platform.3mf", + "first_start_actions": [ "MachineSettingsAction" ], + "machine_extruder_trains": { "0": "blv_mgn_cube_extruder_0" }, + "quality_definition": "blv_mgn_cube_base" + }, + "overrides": + { + "machine_depth": { "default_value": 350 }, + "machine_height": { "default_value": 465 }, + "machine_name": { "default_value": "BLV mgn Cube350" }, + "machine_width": { "default_value": 350 } + } +} \ No newline at end of file diff --git a/resources/definitions/blv_mgn_cube_base.def.json b/resources/definitions/blv_mgn_cube_base.def.json index 84c585e016..960a98ec0e 100644 --- a/resources/definitions/blv_mgn_cube_base.def.json +++ b/resources/definitions/blv_mgn_cube_base.def.json @@ -1,210 +1,105 @@ -{ - "name": "BLV MGN Cube Base", - "version": 2, - "inherits": "anet3d", - "metadata": { - "visible": false, - "author": "wolfgangmauer", - "manufacturer": "BLV", - "file_formats": "text/x-gcode", - "first_start_actions": [ - "MachineSettingsAction" - ], - "preferred_quality_type": "normal", - "machine_extruder_trains": { - "0": "blv_mgn_cube_extruder_0" - }, - "preferred_material": "generic_pla", - "has_variants": false, - "has_materials": true, - "preferred_variant_name": "0.4mm Nozzle", - "has_machine_quality": false - }, - "overrides": { - "machine_name": { - "default_value": "BLV mgn Cube" - }, - "initial_layer_line_width_factor": { - "default_value": 130.0 - }, - "speed_slowdown_layers": { - "default_value": 1 - }, - "optimize_wall_printing_order": { - "value": true - }, - "infill_enable_travel_optimization": { - "default_value": true - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_gcode_flavor": { - "default_value": "RepRap (RepRap)" - }, - "fill_outline_gaps": { - "value": true - }, - "retraction_speed": { - "default_value": 85, - "maximum_value_warning": 130 - }, - "retraction_amount": { - "default_value": 5.5 - }, - "retraction_hop_enabled": { - "value": true - }, - "retraction_hop": { - "value": 0.4 - }, - "retraction_combing": { - "value": "'infill'" - }, - "retraction_combing_max_distance": { - "value": 10 - }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG92 E0 ;zero the extruded length\nM104 S170 T0; start preheat hotend_0\nM140 S{material_bed_temperature_layer_0} ; start preheating the bed\nM190 S{material_bed_temperature_layer_0} ; heat to Cura Bed setting\nG28\nG12 P1 S2 T3\nG34\nG29\nG1 X0 Y0 Z1 F9000\nM109 S{material_print_temperature_layer_0} T0\nG1 X100 Y0 Z{layer_height_0} E30 F500 ;intro line\nG92 E0 ;zero the extruded length again\nM117 Printing...\n" - }, - "machine_end_gcode": { - "default_value": "G91 ;relative positioning\nG1 Z5 F500; move nozzle relative to position\nG90 ;absolute positioning\nG1 X0 Y{machine_depth}\nG12 P1 T3\nM104 S0\nM140 S0\nG92 E0\nM84\nM109 S50\nM81\n" - }, - "top_bottom_pattern": { - "value": "'zigzag'" - }, - "speed_layer_0": { - "value": "math.ceil(speed_print * 0.25)" - }, - "adhesion_type": { - "value": "'none'" - }, - "speed_travel": { - "value": 120, - "maximum_value_warning": 251, - "maximum_value": 300 - }, - "infill_pattern": { - "value": "'tetrahedral'" - }, - "bridge_settings_enabled": { - "default_value": true - }, - "layer_height_0": { - "resolve": "max(0.2, min(extruderValues('layer_height')))" - }, - "line_width": { - "value": "machine_nozzle_size" - }, - "wall_line_width": { - "value": "machine_nozzle_size" - }, - "infill_before_walls": { - "value": true - }, - "zig_zaggify_infill": { - "value": true - }, - "acceleration_enabled": { - "value": false - }, - "jerk_enabled": { - "value": false - }, - "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)" - }, - "cool_min_layer_time_fan_speed_max": { - "default_value": 20 - }, - "cool_min_layer_time": { - "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 - }, - "wall_line_count": { - "value": 3 - }, - "bottom_layers": { - "value": 3 - }, - "top_layers": { - "value": 3 - }, - "travel_retract_before_outer_wall": { - "value": false - }, - "z_seam_type": { - "value": "'shortest'" - }, - "brim_width": { - "default_value": 5 - }, - "infill_randomize_start_location": { - "default_value": true - }, - "skin_overlap": { - "value": 10.0 - }, - "speed_travel_layer_0": { - "value": "math.ceil(speed_travel * 0.4)" - }, - "speed_print": { - "value": 100, - "maximum_value_warning": 151, - "maximum_value": 250 - }, - "retraction_count_max": { - "value": 20 - }, - "speed_wall": { - "value": "math.ceil(speed_print * 0.33)" - }, - "speed_wall_0": { - "value": "math.ceil(speed_print * 0.33)" - }, - "speed_wall_x": { - "value": "math.ceil(speed_print * 0.66)" - }, - "speed_topbottom": { - "value": "math.ceil(speed_print * 0.33)" - }, - "speed_roofing": { - "value": "math.ceil(speed_print * 0.33)" - }, - "retraction_retract_speed": { - "maximum_value_warning": 130 - }, - "retraction_prime_speed": { - "value": "math.ceil(retraction_speed * 0.4)", - "maximum_value_warning": 130 - }, - "retraction_extrusion_window": { - "value": "retraction_amount" - }, - "infill_overlap": { - "value": "10 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0", - "maximum_value_warning": 100, - "minimum_value_warning": -50 - } - } -} +{ + "version": 2, + "name": "BLV MGN Cube Base", + "inherits": "anet3d", + "metadata": + { + "visible": false, + "author": "wolfgangmauer", + "manufacturer": "BLV", + "file_formats": "text/x-gcode", + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": false, + "has_materials": true, + "has_variants": false, + "machine_extruder_trains": { "0": "blv_mgn_cube_extruder_0" }, + "preferred_material": "generic_pla", + "preferred_quality_type": "normal", + "preferred_variant_name": "0.4mm Nozzle" + }, + "overrides": + { + "acceleration_enabled": { "value": false }, + "adhesion_type": { "value": "'none'" }, + "bottom_layers": { "value": 3 }, + "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)" }, + "bridge_settings_enabled": { "default_value": true }, + "bridge_wall_coast": { "default_value": 10 }, + "brim_width": { "default_value": 5 }, + "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 }, + "cool_fan_speed_min": { "value": "cool_fan_speed" }, + "cool_min_layer_time": { "value": 15 }, + "cool_min_layer_time_fan_speed_max": { "default_value": 20 }, + "fill_outline_gaps": { "value": true }, + "infill_before_walls": { "value": true }, + "infill_enable_travel_optimization": { "default_value": true }, + "infill_overlap": + { + "maximum_value_warning": 100, + "minimum_value_warning": -50, + "value": "10 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0" + }, + "infill_pattern": { "value": "'tetrahedral'" }, + "infill_randomize_start_location": { "default_value": true }, + "initial_layer_line_width_factor": { "default_value": 130.0 }, + "jerk_enabled": { "value": false }, + "layer_height_0": { "resolve": "max(0.2, min(extruderValues('layer_height')))" }, + "line_width": { "value": "machine_nozzle_size" }, + "machine_center_is_zero": { "default_value": false }, + "machine_end_gcode": { "default_value": "G91 ;relative positioning\nG1 Z5 F500; move nozzle relative to position\nG90 ;absolute positioning\nG1 X0 Y{machine_depth}\nG12 P1 T3\nM104 S0\nM140 S0\nG92 E0\nM84\nM109 S50\nM81\n" }, + "machine_gcode_flavor": { "default_value": "RepRap (RepRap)" }, + "machine_heated_bed": { "default_value": true }, + "machine_name": { "default_value": "BLV mgn Cube" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG92 E0 ;zero the extruded length\nM104 S170 T0; start preheat hotend_0\nM140 S{material_bed_temperature_layer_0} ; start preheating the bed\nM190 S{material_bed_temperature_layer_0} ; heat to Cura Bed setting\nG28\nG12 P1 S2 T3\nG34\nG29\nG1 X0 Y0 Z1 F9000\nM109 S{material_print_temperature_layer_0} T0\nG1 X100 Y0 Z{layer_height_0} E30 F500 ;intro line\nG92 E0 ;zero the extruded length again\nM117 Printing...\n" }, + "optimize_wall_printing_order": { "value": true }, + "retraction_amount": { "default_value": 5.5 }, + "retraction_combing": { "value": "'infill'" }, + "retraction_combing_max_distance": { "value": 10 }, + "retraction_count_max": { "value": 20 }, + "retraction_extrusion_window": { "value": "retraction_amount" }, + "retraction_hop": { "value": 0.4 }, + "retraction_hop_enabled": { "value": true }, + "retraction_prime_speed": + { + "maximum_value_warning": 130, + "value": "math.ceil(retraction_speed * 0.4)" + }, + "retraction_retract_speed": { "maximum_value_warning": 130 }, + "retraction_speed": + { + "default_value": 85, + "maximum_value_warning": 130 + }, + "skin_overlap": { "value": 10.0 }, + "speed_layer_0": { "value": "math.ceil(speed_print * 0.25)" }, + "speed_print": + { + "maximum_value": 250, + "maximum_value_warning": 151, + "value": 100 + }, + "speed_roofing": { "value": "math.ceil(speed_print * 0.33)" }, + "speed_slowdown_layers": { "default_value": 1 }, + "speed_topbottom": { "value": "math.ceil(speed_print * 0.33)" }, + "speed_travel": + { + "maximum_value": 300, + "maximum_value_warning": 251, + "value": 120 + }, + "speed_travel_layer_0": { "value": "math.ceil(speed_travel * 0.4)" }, + "speed_wall": { "value": "math.ceil(speed_print * 0.33)" }, + "speed_wall_0": { "value": "math.ceil(speed_print * 0.33)" }, + "speed_wall_x": { "value": "math.ceil(speed_print * 0.66)" }, + "top_bottom_pattern": { "value": "'zigzag'" }, + "top_layers": { "value": 3 }, + "travel_retract_before_outer_wall": { "value": false }, + "wall_line_count": { "value": 3 }, + "wall_line_width": { "value": "machine_nozzle_size" }, + "z_seam_type": { "value": "'shortest'" }, + "zig_zaggify_infill": { "value": true } + } +} \ No newline at end of file diff --git a/resources/definitions/bq_hephestos.def.json b/resources/definitions/bq_hephestos.def.json index a5107547a0..c6fed43104 100644 --- a/resources/definitions/bq_hephestos.def.json +++ b/resources/definitions/bq_hephestos.def.json @@ -1,64 +1,38 @@ { - "name": "BQ Prusa i3 Hephestos", "version": 2, + "name": "BQ Prusa i3 Hephestos", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "BQ", "manufacturer": "BQ", "file_formats": "text/x-gcode", "platform": "bq_hephestos_platform.3mf", - "platform_offset": [ 0, -82, 0], - "machine_extruder_trains": - { - "0": "bq_hephestos_extruder_0" - }, - "firmware_file": "MarlinHephestos2.hex" + "firmware_file": "MarlinHephestos2.hex", + "machine_extruder_trains": { "0": "bq_hephestos_extruder_0" }, + "platform_offset": [ + 0, + -82, + 0 + ] }, - - "overrides": { + "overrides": + { + "layer_height": { "default_value": 0.2 }, + "layer_height_0": { "default_value": 0.2 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 210 }, + "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0 ;set extruder temperature to zero (turned off)\nG91 ;set to relative positioning\nG1 E-20 F300 ;retract the filament a bit to release some of the pressure\nG1 Z10 ;move extruder up 10 mm\nG90 ;set to absolute positioning\nG1 X0 Y180 F1200 ;expose the platform\nM84 ;turn off steppers\n; -- end of END GCODE --" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 180 }, "machine_name": { "default_value": "BQ Prusa i3 Hephestos" }, - "machine_start_gcode": { - "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 X0 Y0 ;move to the X/Y origin (Home)\nG28 Z0 ;move to the Z origin (Home)\nG1 Z15.0 F1200 ;move Z to position 15.0 mm\nG92 E0 ;zero the extruded length\nG1 E20 F200 ;extrude 20mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F7200 ;set feedrate to 120 mm/s\n; -- end of START GCODE --" - }, - "machine_end_gcode": { - "default_value": "; -- END GCODE --\nM104 S0 ;set extruder temperature to zero (turned off)\nG91 ;set to relative positioning\nG1 E-20 F300 ;retract the filament a bit to release some of the pressure\nG1 Z10 ;move extruder up 10 mm\nG90 ;set to absolute positioning\nG1 X0 Y180 F1200 ;expose the platform\nM84 ;turn off steppers\n; -- end of END GCODE --" - }, - "machine_width": { - "default_value": 215 - }, - "machine_depth": { - "default_value": 210 - }, - "machine_height": { - "default_value": 180 - }, - "machine_heated_bed": { - "default_value": false - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "layer_height": { - "default_value": 0.2 - }, - "layer_height_0": { - "default_value": 0.2 - }, - "wall_thickness": { - "value": "1" - }, - "top_bottom_thickness": { - "default_value": 1 - }, - "speed_print": { - "default_value": 40 - }, - "support_enable": { - "default_value": true - } + "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 X0 Y0 ;move to the X/Y origin (Home)\nG28 Z0 ;move to the Z origin (Home)\nG1 Z15.0 F1200 ;move Z to position 15.0 mm\nG92 E0 ;zero the extruded length\nG1 E20 F200 ;extrude 20mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F7200 ;set feedrate to 120 mm/s\n; -- end of START GCODE --" }, + "machine_width": { "default_value": 215 }, + "speed_print": { "default_value": 40 }, + "support_enable": { "default_value": true }, + "top_bottom_thickness": { "default_value": 1 }, + "wall_thickness": { "value": "1" } } } \ No newline at end of file diff --git a/resources/definitions/bq_hephestos_2.def.json b/resources/definitions/bq_hephestos_2.def.json index 43e58386c7..09bca4621f 100644 --- a/resources/definitions/bq_hephestos_2.def.json +++ b/resources/definitions/bq_hephestos_2.def.json @@ -2,36 +2,38 @@ "version": 2, "name": "BQ Hephestos 2", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "BQ", "manufacturer": "BQ", - "platform": "bq_hephestos_2_platform.3mf", - "platform_offset": [6, 1320, 0 ], "file_formats": "text/x-gcode", - "machine_extruder_trains": - { - "0": "bq_hephestos_2_extruder_0" - } + "platform": "bq_hephestos_2_platform.3mf", + "machine_extruder_trains": { "0": "bq_hephestos_2_extruder_0" }, + "platform_offset": [ + 6, + 1320, + 0 + ] }, - - "overrides": { - "machine_name": { "default_value": "BQ Hephestos 2" }, - "machine_start_gcode": { "default_value": "; -- START GCODE --\nM104 S{material_print_temperature}\nG28 ; Zero-ing position\nG29 ; Auto bed-leveling\nG0 X4 Y297 Z15 F4000 ; Fast move to BQ's start position\nG90 ; Set to Absolute Positioning\nG92 E0 ; Reset extruder 0\nG1 F1800 ; Set default feedrate\nM109 S{material_print_temperature} ; Makes sure the temperature is correct before printing\n; -- end of START GCODE --" }, - "machine_end_gcode": { "default_value": "; -- END GCODE --\nM801 ; Marlin G-CODE to fire end print procedure\n; -- end of END GCODE --" }, - "machine_width": { "default_value": 210 }, - "machine_depth": { "default_value": 297 }, - "machine_height": { "default_value": 220 }, - "machine_heated_bed": { "default_value": false }, - "machine_center_is_zero": { "default_value": false }, + "overrides": + { + "infill_sparse_density": { "default_value": 20 }, "layer_height": { "default_value": 0.2 }, "layer_height_0": { "default_value": 0.2 }, - "wall_thickness": { "value": "1.2" }, - "top_bottom_thickness": { "default_value": 1.2 }, - "infill_sparse_density": { "default_value": 20 }, - "speed_print": { "default_value": 60 }, - "skirt_line_count": { "default_value": 4 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 297 }, + "machine_end_gcode": { "default_value": "; -- END GCODE --\nM801 ; Marlin G-CODE to fire end print procedure\n; -- end of END GCODE --" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 220 }, + "machine_name": { "default_value": "BQ Hephestos 2" }, + "machine_start_gcode": { "default_value": "; -- START GCODE --\nM104 S{material_print_temperature}\nG28 ; Zero-ing position\nG29 ; Auto bed-leveling\nG0 X4 Y297 Z15 F4000 ; Fast move to BQ's start position\nG90 ; Set to Absolute Positioning\nG92 E0 ; Reset extruder 0\nG1 F1800 ; Set default feedrate\nM109 S{material_print_temperature} ; Makes sure the temperature is correct before printing\n; -- end of START GCODE --" }, + "machine_width": { "default_value": 210 }, "skirt_brim_minimal_length": { "default_value": 30 }, - "skirt_gap": { "default_value": 6 } + "skirt_gap": { "default_value": 6 }, + "skirt_line_count": { "default_value": 4 }, + "speed_print": { "default_value": 60 }, + "top_bottom_thickness": { "default_value": 1.2 }, + "wall_thickness": { "value": "1.2" } } -} +} \ No newline at end of file diff --git a/resources/definitions/bq_hephestos_xl.def.json b/resources/definitions/bq_hephestos_xl.def.json index a0cd403a74..3c0aa88eab 100644 --- a/resources/definitions/bq_hephestos_xl.def.json +++ b/resources/definitions/bq_hephestos_xl.def.json @@ -2,62 +2,36 @@ "version": 2, "name": "BQ Prusa i3 Hephestos XL", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, - "manufacturer": "BQ", "author": "BQ", + "manufacturer": "BQ", "file_formats": "text/x-gcode", "platform": "bq_hephestos_platform.3mf", - "platform_offset": [ 0, -82, 0], - "machine_extruder_trains": - { - "0": "bq_hephestos_xl_extruder_0" - } + "machine_extruder_trains": { "0": "bq_hephestos_xl_extruder_0" }, + "platform_offset": [ + 0, + -82, + 0 + ] }, - - "overrides": { + "overrides": + { + "layer_height": { "default_value": 0.2 }, + "layer_height_0": { "default_value": 0.2 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 300 }, + "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0 ;set extruder temperature to zero (turned off)\nG91 ;set to relative positioning\nG1 E-20 F300 ;retract the filament a bit to release some of the pressure\nG1 Z10 ;move extruder up 10 mm\nG90 ;set to absolute positioning\nG1 X0 Y180 F1200 ;expose the platform\nM84 ;turn off steppers\n; -- end of END GCODE --" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 180 }, "machine_name": { "default_value": "BQ Prusa i3 Hephestos XL" }, - "machine_start_gcode": { - "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 X0 Y0 ;move to the X/Y origin (Home)\nG28 Z0 ;move to the Z origin (Home)\nG1 Z15.0 F1200 ;move Z to position 15.0 mm\nG92 E0 ;zero the extruded length\nG1 E20 F200 ;extrude 20mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F7200 ;set feedrate to 120 mm/s\n; -- end of START GCODE --" - }, - "machine_end_gcode": { - "default_value": "; -- END GCODE --\nM104 S0 ;set extruder temperature to zero (turned off)\nG91 ;set to relative positioning\nG1 E-20 F300 ;retract the filament a bit to release some of the pressure\nG1 Z10 ;move extruder up 10 mm\nG90 ;set to absolute positioning\nG1 X0 Y180 F1200 ;expose the platform\nM84 ;turn off steppers\n; -- end of END GCODE --" - }, - "machine_width": { - "default_value": 200 - }, - "machine_depth": { - "default_value": 300 - }, - "machine_height": { - "default_value": 180 - }, - "machine_heated_bed": { - "default_value": false - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "layer_height": { - "default_value": 0.2 - }, - "layer_height_0": { - "default_value": 0.2 - }, - "wall_thickness": { - "value": "1" - }, - "top_bottom_thickness": { - "default_value": 1 - }, - "speed_print": { - "default_value": 40 - }, - "support_enable": { - "default_value": true - } + "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 X0 Y0 ;move to the X/Y origin (Home)\nG28 Z0 ;move to the Z origin (Home)\nG1 Z15.0 F1200 ;move Z to position 15.0 mm\nG92 E0 ;zero the extruded length\nG1 E20 F200 ;extrude 20mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F7200 ;set feedrate to 120 mm/s\n; -- end of START GCODE --" }, + "machine_width": { "default_value": 200 }, + "speed_print": { "default_value": 40 }, + "support_enable": { "default_value": true }, + "top_bottom_thickness": { "default_value": 1 }, + "wall_thickness": { "value": "1" } } } \ No newline at end of file diff --git a/resources/definitions/bq_witbox.def.json b/resources/definitions/bq_witbox.def.json index eb135a7945..28b1328b00 100644 --- a/resources/definitions/bq_witbox.def.json +++ b/resources/definitions/bq_witbox.def.json @@ -2,64 +2,37 @@ "version": 2, "name": "BQ Witbox", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "BQ", "manufacturer": "BQ", "file_formats": "text/x-gcode", "platform": "bq_witbox_platform.3mf", - "platform_offset": [ 0, -145, -38], - "machine_extruder_trains": - { - "0": "bq_witbox_extruder_0" - }, - "firmware_file": "MarlinWitbox.hex" + "firmware_file": "MarlinWitbox.hex", + "machine_extruder_trains": { "0": "bq_witbox_extruder_0" }, + "platform_offset": [ + 0, + -145, + -38 + ] }, - - "overrides": { + "overrides": + { + "layer_height": { "default_value": 0.2 }, + "layer_height_0": { "default_value": 0.2 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 210 }, + "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0 ;set extruder temperature to zero (turned off)\nG91 ;set to relative positioning\nG1 E-20 F300 ;retract the filament a bit to release some of the pressure\nG90 ;set to absolute positioning\nG1 Z200 ;move the platform to the bottom\nG28 X0 Y0 ;move to the X/Y origin (Home)\nM84 ;turn off steppers\n; -- end of END GCODE --" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 200 }, "machine_name": { "default_value": "BQ Witbox" }, - "machine_start_gcode": { - "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 X0 Y0 ;move to the X/Y origin (Home)\nG28 Z0 ;move to the Z origin (Home)\nG1 Z15.0 F1200 ;move Z to position 15.0 mm\nG92 E0 ;zero the extruded length\nG1 E20 F200 ;extrude 20mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F7200 ;set feedrate to 120 mm/s\n; -- end of START GCODE --" - }, - "machine_end_gcode": { - "default_value": "; -- END GCODE --\nM104 S0 ;set extruder temperature to zero (turned off)\nG91 ;set to relative positioning\nG1 E-20 F300 ;retract the filament a bit to release some of the pressure\nG90 ;set to absolute positioning\nG1 Z200 ;move the platform to the bottom\nG28 X0 Y0 ;move to the X/Y origin (Home)\nM84 ;turn off steppers\n; -- end of END GCODE --" - }, - "machine_width": { - "default_value": 297 - }, - "machine_depth": { - "default_value": 210 - }, - "machine_height": { - "default_value": 200 - }, - "machine_heated_bed": { - "default_value": false - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "layer_height": { - "default_value": 0.2 - }, - "layer_height_0": { - "default_value": 0.2 - }, - "wall_thickness": { - "value": "1" - }, - "top_bottom_thickness": { - "default_value": 1 - }, - "speed_print": { - "default_value": 40 - }, - "support_enable": { - "default_value": true - } - + "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 X0 Y0 ;move to the X/Y origin (Home)\nG28 Z0 ;move to the Z origin (Home)\nG1 Z15.0 F1200 ;move Z to position 15.0 mm\nG92 E0 ;zero the extruded length\nG1 E20 F200 ;extrude 20mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F7200 ;set feedrate to 120 mm/s\n; -- end of START GCODE --" }, + "machine_width": { "default_value": 297 }, + "speed_print": { "default_value": 40 }, + "support_enable": { "default_value": true }, + "top_bottom_thickness": { "default_value": 1 }, + "wall_thickness": { "value": "1" } } } \ No newline at end of file diff --git a/resources/definitions/bq_witbox_2.def.json b/resources/definitions/bq_witbox_2.def.json index 216fec55c2..e5184fbfef 100644 --- a/resources/definitions/bq_witbox_2.def.json +++ b/resources/definitions/bq_witbox_2.def.json @@ -2,74 +2,40 @@ "version": 2, "name": "BQ Witbox 2", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "BQ", "manufacturer": "BQ", "file_formats": "text/x-gcode", "platform": "bq_witbox_platform.3mf", - "platform_offset": [0, -145, -38], - "machine_extruder_trains": - { - "0": "bq_witbox_2_extruder_0" - } + "machine_extruder_trains": { "0": "bq_witbox_2_extruder_0" }, + "platform_offset": [ + 0, + -145, + -38 + ] }, - - "overrides": { + "overrides": + { + "infill_sparse_density": { "default_value": 20 }, + "layer_height": { "default_value": 0.2 }, + "layer_height_0": { "default_value": 0.2 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 210 }, + "machine_end_gcode": { "default_value": "; -- END GCODE --\nM801 ; Custom GCODE to fire end print procedure\n; -- end of END GCODE --" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 200 }, "machine_name": { "default_value": "BQ Witbox 2" }, - "machine_start_gcode": { - "default_value": "; -- START GCODE --\nM800 ; Custom GCODE to fire start print procedure\n; -- end of START GCODE --" - }, - "machine_end_gcode": { - "default_value": "; -- END GCODE --\nM801 ; Custom GCODE to fire end print procedure\n; -- end of END GCODE --" - }, - "machine_width": { - "default_value": 297 - }, - "machine_depth": { - "default_value": 210 - }, - "machine_height": { - "default_value": 200 - }, - "machine_heated_bed": { - "default_value": false - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "layer_height": { - "default_value": 0.2 - }, - "layer_height_0": { - "default_value": 0.2 - }, - "wall_thickness": { - "value": "1.2" - }, - "top_bottom_thickness": { - "default_value": 1.2 - }, - "infill_sparse_density": { - "default_value": 20 - }, - "speed_print": { - "default_value": 60 - }, - "skirt_line_count": { - "default_value": 4 - }, - "skirt_brim_minimal_length": { - "default_value": 30 - }, - "skirt_gap": { - "default_value": 6 - }, - "support_enable": { - "default_value": false - } + "machine_start_gcode": { "default_value": "; -- START GCODE --\nM800 ; Custom GCODE to fire start print procedure\n; -- end of START GCODE --" }, + "machine_width": { "default_value": 297 }, + "skirt_brim_minimal_length": { "default_value": 30 }, + "skirt_gap": { "default_value": 6 }, + "skirt_line_count": { "default_value": 4 }, + "speed_print": { "default_value": 60 }, + "support_enable": { "default_value": false }, + "top_bottom_thickness": { "default_value": 1.2 }, + "wall_thickness": { "value": "1.2" } } } \ No newline at end of file diff --git a/resources/definitions/builder_premium_large.def.json b/resources/definitions/builder_premium_large.def.json index 9a8c8dc6f1..1ba55471d3 100644 --- a/resources/definitions/builder_premium_large.def.json +++ b/resources/definitions/builder_premium_large.def.json @@ -2,58 +2,30 @@ "version": 2, "name": "Builder Premium Large", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Builder SZ", "manufacturer": "Builder", - "quality_definition": "builder_premium_small", "file_formats": "text/x-gcode", "platform": "builder_premium_platform.3mf", - "platform_offset": [-126, -36, 117], "has_machine_quality": true, - "preferred_quality_type": "normal", "machine_extruder_trains": { "0": "builder_premium_large_rear", "1": "builder_premium_large_front" - } + }, + "platform_offset": [ + -126, + -36, + 117 + ], + "preferred_quality_type": "normal", + "quality_definition": "builder_premium_small" }, - - "overrides": { - "machine_name": { "default_value": "Builder Premium Large" }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 215 }, - "machine_height": { "default_value": 600 }, - "machine_depth": { "default_value": 205 }, - - "infill_pattern": {"value": "'triangles'" }, - "infill_before_walls": {"value": false }, - - "default_material_print_temperature": { "value": "215" }, - "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" }, - "material_standby_temperature": { "value": "material_print_temperature" }, - - "switch_extruder_retraction_speeds": {"default_value": 15 }, - "switch_extruder_retraction_amount": {"value": 1 }, + "overrides": + { "acceleration_enabled": { "value": true }, - "speed_travel": { "value": "100" }, - "speed_layer_0": { "value": "20" }, - "speed_prime_tower": { "value": "speed_topbottom" }, - "speed_print": { "value": "40" }, - "speed_support": { "value": "speed_wall_0" }, - "speed_support_interface": { "value": "speed_topbottom" }, - "speed_topbottom": { "value": "math.ceil(speed_print * 20 / 35)" }, - "speed_wall": { "value": "math.ceil(speed_print * 30 / 40)" }, - "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 25)" }, - "speed_wall_x": { "value": "speed_wall" }, - - "prime_tower_position_x": { "value": "175" }, - "prime_tower_position_y": { "value": "178" }, - "prime_tower_wipe_enabled": { "default_value": false }, - "prime_tower_min_volume": { "default_value": 50 }, - - "prime_blob_enable": { "enabled": true }, - "acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, "acceleration_print": { "value": "3000" }, @@ -63,10 +35,13 @@ "acceleration_travel": { "value": "acceleration_print" }, "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 3000)" }, "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 1000)" }, - + "adhesion_type": { "default_value": "skirt" }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, "cool_min_layer_time": { "default_value": 10 }, - + "default_material_print_temperature": { "value": "215" }, + "gantry_height": { "value": "55" }, + "infill_before_walls": { "value": false }, + "infill_pattern": { "value": "'triangles'" }, "jerk_enabled": { "value": "True" }, "jerk_layer_0": { "value": "jerk_topbottom" }, "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" }, @@ -76,31 +51,55 @@ "jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" }, "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" }, "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" }, - - "wall_thickness": { "value": "1.2" }, - - "retraction_amount": { "default_value": 3 }, - "retraction_speed": { "default_value": 15 }, - "travel_retract_before_outer_wall": { "default_value": true }, - "skin_overlap": { "value": "15" }, - "adhesion_type": { "default_value": "skirt" }, - "machine_nozzle_heat_up_speed": { "default_value": 2 }, - "machine_nozzle_cool_down_speed": { "default_value": 2 }, - "machine_head_with_fans_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] }, - "gantry_height": { "value": "55" }, + "machine_acceleration": { "default_value": 1000 }, + "machine_depth": { "default_value": 205 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\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_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-75, -18], + [-75, 35], + [18, 35], + [18, -18] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 600 }, + "machine_max_acceleration_z": { "default_value": 500 }, "machine_max_feedrate_x": { "default_value": 300 }, "machine_max_feedrate_y": { "default_value": 300 }, "machine_max_feedrate_z": { "default_value": 40 }, - "machine_max_acceleration_z": { "default_value": 500 }, - "machine_acceleration": { "default_value": 1000 }, "machine_max_jerk_xy": { "default_value": 10 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E15 ;extrude 15mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\nT0 ;Start with Rear Extruder\n;Put printing message on LCD screen\nM117 Printing..." - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\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_extruder_count": { "default_value": 2 } + "machine_name": { "default_value": "Builder Premium Large" }, + "machine_nozzle_cool_down_speed": { "default_value": 2 }, + "machine_nozzle_heat_up_speed": { "default_value": 2 }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E15 ;extrude 15mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\nT0 ;Start with Rear Extruder\n;Put printing message on LCD screen\nM117 Printing..." }, + "machine_width": { "default_value": 215 }, + "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" }, + "material_standby_temperature": { "value": "material_print_temperature" }, + "prime_blob_enable": { "enabled": true }, + "prime_tower_min_volume": { "default_value": 50 }, + "prime_tower_position_x": { "value": "175" }, + "prime_tower_position_y": { "value": "178" }, + "prime_tower_wipe_enabled": { "default_value": false }, + "retraction_amount": { "default_value": 3 }, + "retraction_speed": { "default_value": 15 }, + "skin_overlap": { "value": "15" }, + "speed_layer_0": { "value": "20" }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_print": { "value": "40" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_support_interface": { "value": "speed_topbottom" }, + "speed_topbottom": { "value": "math.ceil(speed_print * 20 / 35)" }, + "speed_travel": { "value": "100" }, + "speed_wall": { "value": "math.ceil(speed_print * 30 / 40)" }, + "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 25)" }, + "speed_wall_x": { "value": "speed_wall" }, + "switch_extruder_retraction_amount": { "value": 1 }, + "switch_extruder_retraction_speeds": { "default_value": 15 }, + "travel_retract_before_outer_wall": { "default_value": true }, + "wall_thickness": { "value": "1.2" } } -} +} \ No newline at end of file diff --git a/resources/definitions/builder_premium_medium.def.json b/resources/definitions/builder_premium_medium.def.json index fcc87ae125..b8a3d8578d 100644 --- a/resources/definitions/builder_premium_medium.def.json +++ b/resources/definitions/builder_premium_medium.def.json @@ -2,58 +2,30 @@ "version": 2, "name": "Builder Premium Medium", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Builder SZ", "manufacturer": "Builder", - "quality_definition": "builder_premium_small", "file_formats": "text/x-gcode", "platform": "builder_premium_platform.3mf", - "platform_offset": [-126, -36, 117], "has_machine_quality": true, - "preferred_quality_type": "normal", "machine_extruder_trains": { "0": "builder_premium_medium_rear", "1": "builder_premium_medium_front" - } + }, + "platform_offset": [ + -126, + -36, + 117 + ], + "preferred_quality_type": "normal", + "quality_definition": "builder_premium_small" }, - - "overrides": { - "machine_name": { "default_value": "Builder Premium Medium" }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 215 }, - "machine_height": { "default_value": 400 }, - "machine_depth": { "default_value": 205 }, - - "infill_pattern": {"value": "'triangles'" }, - "infill_before_walls": {"value": false }, + "overrides": + { "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" }, - - "switch_extruder_retraction_speeds": {"default_value": 15 }, - "switch_extruder_retraction_amount": {"value": 1 }, - - "speed_travel": { "value": "100" }, - "speed_layer_0": { "value": "20" }, - "speed_prime_tower": { "value": "speed_topbottom" }, - "speed_print": { "value": "40" }, - "speed_support": { "value": "speed_wall_0" }, - "speed_support_interface": { "value": "speed_topbottom" }, - "speed_topbottom": { "value": "math.ceil(speed_print * 20 / 35)" }, - "speed_wall": { "value": "math.ceil(speed_print * 30 / 40)" }, - "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 25)" }, - "speed_wall_x": { "value": "speed_wall" }, - - "prime_tower_position_x": { "value": "175" }, - "prime_tower_position_y": { "value": "178" }, - "prime_tower_wipe_enabled": { "default_value": false }, - "prime_tower_min_volume": { "default_value": 50 }, - - "prime_blob_enable": { "enabled": true }, - "acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, "acceleration_print": { "value": "3000" }, @@ -63,10 +35,13 @@ "acceleration_travel": { "value": "acceleration_print" }, "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 3000)" }, "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 1000)" }, - + "adhesion_type": { "default_value": "skirt" }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, "cool_min_layer_time": { "default_value": 10 }, - + "default_material_print_temperature": { "value": "215" }, + "gantry_height": { "value": "55" }, + "infill_before_walls": { "value": false }, + "infill_pattern": { "value": "'triangles'" }, "jerk_enabled": { "value": "True" }, "jerk_layer_0": { "value": "jerk_topbottom" }, "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" }, @@ -76,31 +51,55 @@ "jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" }, "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" }, "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" }, - - "wall_thickness": { "value": "1.2" }, - - "retraction_amount": { "default_value": 3 }, - "retraction_speed": { "default_value": 15 }, - "travel_retract_before_outer_wall": { "default_value": true }, - "skin_overlap": { "value": "15" }, - "adhesion_type": { "default_value": "skirt" }, - "machine_nozzle_heat_up_speed": { "default_value": 2 }, - "machine_nozzle_cool_down_speed": { "default_value": 2 }, - "machine_head_with_fans_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] }, - "gantry_height": { "value": "55" }, + "machine_acceleration": { "default_value": 1000 }, + "machine_depth": { "default_value": 205 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\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_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-75, -18], + [-75, 35], + [18, 35], + [18, -18] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 400 }, + "machine_max_acceleration_z": { "default_value": 500 }, "machine_max_feedrate_x": { "default_value": 300 }, "machine_max_feedrate_y": { "default_value": 300 }, "machine_max_feedrate_z": { "default_value": 40 }, - "machine_max_acceleration_z": { "default_value": 500 }, - "machine_acceleration": { "default_value": 1000 }, "machine_max_jerk_xy": { "default_value": 10 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E15 ;extrude 15mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\nT0 ;Start with Rear Extruder\n;Put printing message on LCD screen\nM117 Printing..." - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\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_extruder_count": { "default_value": 2 } + "machine_name": { "default_value": "Builder Premium Medium" }, + "machine_nozzle_cool_down_speed": { "default_value": 2 }, + "machine_nozzle_heat_up_speed": { "default_value": 2 }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E15 ;extrude 15mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\nT0 ;Start with Rear Extruder\n;Put printing message on LCD screen\nM117 Printing..." }, + "machine_width": { "default_value": 215 }, + "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" }, + "material_standby_temperature": { "value": "material_print_temperature" }, + "prime_blob_enable": { "enabled": true }, + "prime_tower_min_volume": { "default_value": 50 }, + "prime_tower_position_x": { "value": "175" }, + "prime_tower_position_y": { "value": "178" }, + "prime_tower_wipe_enabled": { "default_value": false }, + "retraction_amount": { "default_value": 3 }, + "retraction_speed": { "default_value": 15 }, + "skin_overlap": { "value": "15" }, + "speed_layer_0": { "value": "20" }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_print": { "value": "40" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_support_interface": { "value": "speed_topbottom" }, + "speed_topbottom": { "value": "math.ceil(speed_print * 20 / 35)" }, + "speed_travel": { "value": "100" }, + "speed_wall": { "value": "math.ceil(speed_print * 30 / 40)" }, + "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 25)" }, + "speed_wall_x": { "value": "speed_wall" }, + "switch_extruder_retraction_amount": { "value": 1 }, + "switch_extruder_retraction_speeds": { "default_value": 15 }, + "travel_retract_before_outer_wall": { "default_value": true }, + "wall_thickness": { "value": "1.2" } } -} +} \ No newline at end of file diff --git a/resources/definitions/builder_premium_small.def.json b/resources/definitions/builder_premium_small.def.json index 03f4600f4c..ab773a45d2 100644 --- a/resources/definitions/builder_premium_small.def.json +++ b/resources/definitions/builder_premium_small.def.json @@ -2,57 +2,29 @@ "version": 2, "name": "Builder Premium Small", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Builder SZ", "manufacturer": "Builder", "file_formats": "text/x-gcode", "platform": "builder_premium_platform.3mf", - "platform_offset": [-126, -36, 117], "has_machine_quality": true, - "preferred_quality_type": "normal", "machine_extruder_trains": { "0": "builder_premium_small_rear", "1": "builder_premium_small_front" - } + }, + "platform_offset": [ + -126, + -36, + 117 + ], + "preferred_quality_type": "normal" }, - - "overrides": { - "machine_name": { "default_value": "Builder Premium Small" }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 215 }, - "machine_height": { "default_value": 200 }, - "machine_depth": { "default_value": 205 }, - - "infill_pattern": {"value": "'triangles'" }, - "infill_before_walls": {"value": false }, - - "default_material_print_temperature": { "value": "215" }, - "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" }, - "material_standby_temperature": { "value": "material_print_temperature" }, - - "switch_extruder_retraction_speeds": {"default_value": 15 }, - "switch_extruder_retraction_amount": {"value": 1 }, + "overrides": + { "acceleration_enabled": { "value": true }, - "speed_travel": { "value": "100" }, - "speed_layer_0": { "value": "20" }, - "speed_prime_tower": { "value": "speed_topbottom" }, - "speed_print": { "value": "40" }, - "speed_support": { "value": "speed_wall_0" }, - "speed_support_interface": { "value": "speed_topbottom" }, - "speed_topbottom": { "value": "math.ceil(speed_print * 20 / 35)" }, - "speed_wall": { "value": "math.ceil(speed_print * 30 / 40)" }, - "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 25)" }, - "speed_wall_x": { "value": "speed_wall" }, - - "prime_tower_position_x": { "value": "175" }, - "prime_tower_position_y": { "value": "178" }, - "prime_tower_wipe_enabled": { "default_value": false }, - "prime_tower_min_volume": { "default_value": 50 }, - - "prime_blob_enable": { "enabled": true }, - "acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, "acceleration_print": { "value": "3000" }, @@ -62,10 +34,13 @@ "acceleration_travel": { "value": "acceleration_print" }, "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 3000)" }, "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 1000)" }, - + "adhesion_type": { "default_value": "skirt" }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, "cool_min_layer_time": { "default_value": 10 }, - + "default_material_print_temperature": { "value": "215" }, + "gantry_height": { "value": "55" }, + "infill_before_walls": { "value": false }, + "infill_pattern": { "value": "'triangles'" }, "jerk_enabled": { "value": "True" }, "jerk_layer_0": { "value": "jerk_topbottom" }, "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" }, @@ -75,31 +50,55 @@ "jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" }, "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" }, "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" }, - - "wall_thickness": { "value": "1.2" }, - - "retraction_amount": { "default_value": 3 }, - "retraction_speed": { "default_value": 15 }, - "travel_retract_before_outer_wall": { "default_value": true }, - "skin_overlap": { "value": "15" }, - "adhesion_type": { "default_value": "skirt" }, - "machine_nozzle_heat_up_speed": { "default_value": 2 }, - "machine_nozzle_cool_down_speed": { "default_value": 2 }, - "machine_head_with_fans_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] }, - "gantry_height": { "value": "55" }, + "machine_acceleration": { "default_value": 1000 }, + "machine_depth": { "default_value": 205 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\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_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-75, -18], + [-75, 35], + [18, 35], + [18, -18] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 200 }, + "machine_max_acceleration_z": { "default_value": 500 }, "machine_max_feedrate_x": { "default_value": 300 }, "machine_max_feedrate_y": { "default_value": 300 }, "machine_max_feedrate_z": { "default_value": 40 }, - "machine_max_acceleration_z": { "default_value": 500 }, - "machine_acceleration": { "default_value": 1000 }, "machine_max_jerk_xy": { "default_value": 10 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E15 ;extrude 15mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\nT0 ;Start with Rear Extruder\n;Put printing message on LCD screen\nM117 Printing..." - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\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_extruder_count": { "default_value": 2 } + "machine_name": { "default_value": "Builder Premium Small" }, + "machine_nozzle_cool_down_speed": { "default_value": 2 }, + "machine_nozzle_heat_up_speed": { "default_value": 2 }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E15 ;extrude 15mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\nT0 ;Start with Rear Extruder\n;Put printing message on LCD screen\nM117 Printing..." }, + "machine_width": { "default_value": 215 }, + "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" }, + "material_standby_temperature": { "value": "material_print_temperature" }, + "prime_blob_enable": { "enabled": true }, + "prime_tower_min_volume": { "default_value": 50 }, + "prime_tower_position_x": { "value": "175" }, + "prime_tower_position_y": { "value": "178" }, + "prime_tower_wipe_enabled": { "default_value": false }, + "retraction_amount": { "default_value": 3 }, + "retraction_speed": { "default_value": 15 }, + "skin_overlap": { "value": "15" }, + "speed_layer_0": { "value": "20" }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_print": { "value": "40" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_support_interface": { "value": "speed_topbottom" }, + "speed_topbottom": { "value": "math.ceil(speed_print * 20 / 35)" }, + "speed_travel": { "value": "100" }, + "speed_wall": { "value": "math.ceil(speed_print * 30 / 40)" }, + "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 25)" }, + "speed_wall_x": { "value": "speed_wall" }, + "switch_extruder_retraction_amount": { "value": 1 }, + "switch_extruder_retraction_speeds": { "default_value": 15 }, + "travel_retract_before_outer_wall": { "default_value": true }, + "wall_thickness": { "value": "1.2" } } -} +} \ No newline at end of file diff --git a/resources/definitions/cartesio.def.json b/resources/definitions/cartesio.def.json index 996e03ef0a..db725f91ed 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -1,22 +1,18 @@ { - "name": "Cartesio", "version": 2, + "name": "Cartesio", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Scheepers", "manufacturer": "MaukCC", "file_formats": "text/x-gcode", - + "platform": "cartesio_platform.3mf", + "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, "has_materials": true, "has_variants": true, - - "variants_name": "Tool", - "preferred_variant_name": "0.8mm thermoplastic extruder", - "preferred_material": "generic_pla", - "preferred_quality_type": "normal", - "machine_extruder_trains": { "0": "cartesio_extruder_0", @@ -24,45 +20,55 @@ "2": "cartesio_extruder_2", "3": "cartesio_extruder_3" }, - "platform": "cartesio_platform.3mf", - "platform_offset": [ -220, -5, 150], - "first_start_actions": ["MachineSettingsAction"], - "supported_actions": ["MachineSettingsAction"] + "platform_offset": [ + -220, + -5, + 150 + ], + "preferred_material": "generic_pla", + "preferred_quality_type": "normal", + "preferred_variant_name": "0.8mm thermoplastic extruder", + "supported_actions": [ "MachineSettingsAction" ], + "variants_name": "Tool" }, - - "overrides": { - "machine_extruder_count": { "default_value": 2 }, - "machine_heated_bed": { "default_value": true }, - "machine_center_is_zero": { "default_value": false }, + "overrides": + { "gantry_height": { "value": "35" }, - "machine_height": { "default_value": 400 }, - "machine_depth": { "default_value": 270 }, - "machine_width": { "default_value": 430 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "material_print_temp_wait": { "default_value": false }, - "material_bed_temp_wait": { "default_value": false }, - "prime_tower_min_volume": { "value": "0.7" }, - "prime_tower_size": { "value": 24.0 }, - "prime_tower_position_x": { "value": "125" }, - "prime_tower_position_y": { "value": "70" }, - "prime_blob_enable": { "default_value": false }, - "machine_max_feedrate_z": { "default_value": 20 }, - "machine_disallowed_areas": { "default_value": [ - [[215, 135], [-215, 135], [-215, 75], [215, 75]] - ]}, - "machine_start_gcode": { - "default_value": "\nM92 E159 ;2288 for V5 extruder\n\nM140 S{material_bed_temperature_layer_0}\nM104 T1 S120\nM104 T2 S120\nM104 T3 S120\n\nG21\nG90\nM42 S255 P13 ;chamber lights\nM42 S255 P12 ;fume extraction\nM204 S300 ;default acceleration\nM205 X10 ;default jerk\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\nG1 Z10 F600\nG1 X70 Y20 F9000;go to wipe point\n\nM190 S{material_bed_temperature_layer_0}\n\nM117 Heating for 50 sec.\nG4 S20\nM117 Heating for 30 sec.\nG4 S20\nM117 Heating for 10 sec.\nM300 S1200 P1000\nG4 S9\n\nM117 purging nozzle....\nT0\nG92 E0;set E\nG1 E10 F100\nG92 E0\nG1 E-1 F600\n\nM117 wiping nozzle....\nG1 X1 Y24 F3000\nG1 X70 F9000\nG1 Z10 F900\n\nM104 T1 S21\nM104 T2 S21\nM104 T3 S21\n\nM117 Printing .....\n" - }, - "machine_end_gcode": { - "default_value": "; -- END GCODE --\nM117 cooling down....\nM106 S255\nM140 S5\nM104 T0 S5\nM104 T1 S5\nM104 T2 S5\nM104 T3 S5\n\nG91\nG1 Z1 F900\nG90\n\nG1 X20.0 Y260.0 F6000\nG4 S7\nM84\nG4 S90\nM107\nM42 P12 S0\nM42 P13 S0\nM84\nT0\nM117 Finished.\n; -- end of GCODE --" - }, "layer_height": { "maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" }, "layer_height_0": { "maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" }, - "retraction_extra_prime_amount": { "minimum_value_warning": "-2.0" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 270 }, + "machine_disallowed_areas": + { + "default_value": [ + [ + [215, 135], + [-215, 135], + [-215, 75], + [215, 75] + ] + ] + }, + "machine_end_gcode": { "default_value": "; -- END GCODE --\nM117 cooling down....\nM106 S255\nM140 S5\nM104 T0 S5\nM104 T1 S5\nM104 T2 S5\nM104 T3 S5\n\nG91\nG1 Z1 F900\nG90\n\nG1 X20.0 Y260.0 F6000\nG4 S7\nM84\nG4 S90\nM107\nM42 P12 S0\nM42 P13 S0\nM84\nT0\nM117 Finished.\n; -- end of GCODE --" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 400 }, + "machine_max_feedrate_z": { "default_value": 20 }, + "machine_min_cool_heat_time_window": { "default_value": 5 }, + "machine_nozzle_cool_down_speed": { "default_value": 20 }, + "machine_nozzle_heat_up_speed": { "default_value": 20 }, + "machine_start_gcode": { "default_value": "\nM92 E159 ;2288 for V5 extruder\n\nM140 S{material_bed_temperature_layer_0}\nM104 T1 S120\nM104 T2 S120\nM104 T3 S120\n\nG21\nG90\nM42 S255 P13 ;chamber lights\nM42 S255 P12 ;fume extraction\nM204 S300 ;default acceleration\nM205 X10 ;default jerk\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\nG1 Z10 F600\nG1 X70 Y20 F9000;go to wipe point\n\nM190 S{material_bed_temperature_layer_0}\n\nM117 Heating for 50 sec.\nG4 S20\nM117 Heating for 30 sec.\nG4 S20\nM117 Heating for 10 sec.\nM300 S1200 P1000\nG4 S9\n\nM117 purging nozzle....\nT0\nG92 E0;set E\nG1 E10 F100\nG92 E0\nG1 E-1 F600\n\nM117 wiping nozzle....\nG1 X1 Y24 F3000\nG1 X70 F9000\nG1 Z10 F900\n\nM104 T1 S21\nM104 T2 S21\nM104 T3 S21\n\nM117 Printing .....\n" }, + "machine_width": { "default_value": 430 }, + "material_bed_temp_wait": { "default_value": false }, + "material_initial_print_temperature": { "maximum_value_warning": "material_print_temperature + 15" }, + "material_print_temp_wait": { "default_value": false }, "optimize_wall_printing_order": { "default_value": true }, - "material_initial_print_temperature": {"maximum_value_warning": "material_print_temperature + 15" }, - "machine_nozzle_heat_up_speed": {"default_value": 20}, - "machine_nozzle_cool_down_speed": {"default_value": 20}, - "machine_min_cool_heat_time_window": {"default_value": 5} + "prime_blob_enable": { "default_value": false }, + "prime_tower_min_volume": { "value": "0.7" }, + "prime_tower_position_x": { "value": "125" }, + "prime_tower_position_y": { "value": "70" }, + "prime_tower_size": { "value": 24.0 }, + "retraction_extra_prime_amount": { "minimum_value_warning": "-2.0" } } -} +} \ No newline at end of file diff --git a/resources/definitions/cocoon_create.def.json b/resources/definitions/cocoon_create.def.json index a3b47361c7..f1aa3caf50 100644 --- a/resources/definitions/cocoon_create.def.json +++ b/resources/definitions/cocoon_create.def.json @@ -1,79 +1,43 @@ { - "name": "Cocoon Create", "version": 2, + "name": "Cocoon Create", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Thushan Fernando", "manufacturer": "Cocoon Create", "file_formats": "text/x-gcode", - "preferred_quality_type": "fine", - "has_materials": true, "platform": "wanhao_200_200_platform.obj", - "platform_texture": "Cocoon-backplate.png", - "machine_extruder_trains": { - "0": "cocoon_create_extruder_0" - }, + "has_materials": true, + "machine_extruder_trains": { "0": "cocoon_create_extruder_0" }, "platform_offset": [ - 0, - -28, - 0 - ] + 0, + -28, + 0 + ], + "platform_texture": "Cocoon-backplate.png", + "preferred_quality_type": "fine" }, - "overrides": { - "machine_name": { - "default_value": "Cocoon Create" - }, - "machine_width": { - "default_value": 200 - }, - "machine_height": { - "default_value": 180 - }, - "machine_depth": { - "default_value": 200 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\n G90 ;absolute positioning\n M82 ;set extruder to absolute mode\n M107 ;start with the fan off\n G28 X0 Y0 ;move X/Y to min endstops\n G28 Z0 ;move Z to min endstops\n G1 Z15.0 F{speed_travel} ;move the platform down 15mm\n G92 E0 ;zero the extruded length\n G1 F200 E3 ;extrude 3mm of feed stock\n G92 E0 ;zero the extruded length again\n G1 F{speed_travel} \n ;Put printing message on LCD screen\n M117 Printing..." - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning" - }, - "material_diameter": { - "default_value": 1.75 - }, - "layer_height": { - "default_value": 0.10 - }, - "layer_height_0": { - "default_value": 0.2 - }, - "wall_thickness": { - "value": "0.8" - }, - "top_bottom_thickness": { - "default_value": 0.6 - }, - "speed_print": { - "default_value": 50 - }, - "support_enable": { - "default_value": true - }, - "retraction_enable": { - "default_value": true - }, - "retraction_amount": { - "default_value": 4.5 - }, - "retraction_speed": { - "default_value": 25 - } + "overrides": + { + "layer_height": { "default_value": 0.1 }, + "layer_height_0": { "default_value": 0.2 }, + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 180 }, + "machine_name": { "default_value": "Cocoon Create" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\n G90 ;absolute positioning\n M82 ;set extruder to absolute mode\n M107 ;start with the fan off\n G28 X0 Y0 ;move X/Y to min endstops\n G28 Z0 ;move Z to min endstops\n G1 Z15.0 F{speed_travel} ;move the platform down 15mm\n G92 E0 ;zero the extruded length\n G1 F200 E3 ;extrude 3mm of feed stock\n G92 E0 ;zero the extruded length again\n G1 F{speed_travel} \n ;Put printing message on LCD screen\n M117 Printing..." }, + "machine_width": { "default_value": 200 }, + "material_diameter": { "default_value": 1.75 }, + "retraction_amount": { "default_value": 4.5 }, + "retraction_enable": { "default_value": true }, + "retraction_speed": { "default_value": 25 }, + "speed_print": { "default_value": 50 }, + "support_enable": { "default_value": true }, + "top_bottom_thickness": { "default_value": 0.6 }, + "wall_thickness": { "value": "0.8" } } } \ No newline at end of file diff --git a/resources/definitions/cocoon_create_modelmaker.def.json b/resources/definitions/cocoon_create_modelmaker.def.json index 51c5b5e7cb..2c618fee77 100644 --- a/resources/definitions/cocoon_create_modelmaker.def.json +++ b/resources/definitions/cocoon_create_modelmaker.def.json @@ -1,78 +1,37 @@ { - "name": "Cocoon Create ModelMaker", "version": 2, + "name": "Cocoon Create ModelMaker", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Samuel Pinches", "manufacturer": "Cocoon Create", "file_formats": "text/x-gcode", - "preferred_quality_type": "fine", - "machine_extruder_trains": - { - "0": "cocoon_create_modelmaker_extruder_0" - } + "machine_extruder_trains": { "0": "cocoon_create_modelmaker_extruder_0" }, + "preferred_quality_type": "fine" }, - "overrides": { - "machine_name": { - "default_value": "Cocoon Create ModelMaker" - }, - "machine_start_gcode": { - "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 ;home all axis\nG92 E0 ;zero the extruded length\nG1 Z1 F1000 ;move up slightly\nG1 X60.0 Z0 E9.0 F1000.0;intro line\nG1 X100.0 E21.5 F1000.0 ;continue line\nG92 E0 ;zero the extruded length again\n; -- end of START GCODE --" - }, - "machine_end_gcode": { - "default_value": "; -- END GCODE --\nM104 S0 ;turn off nozzle heater\nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament slightly\nG90 ;set to absolute positioning\nG28 X0 Y0 ;move to the XY-axis origin (Home)\nM84 ;turn off stepper motors\n; -- end of END GCODE --" - }, - "machine_width": { - "default_value": 120 - }, - "machine_height": { - "default_value": 100 - }, - "machine_depth": { - "default_value": 135 - }, - "machine_heated_bed": { - "default_value": false - }, - "machine_center_is_zero": { - "default_value": false - }, - "gantry_height": { - "value": "10" - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "material_diameter": { - "default_value": 1.75 - }, - "layer_height": { - "default_value": 0.10 - }, - "layer_height_0": { - "default_value": 0.2 - }, - "wall_thickness": { - "value": "1.2" - }, - "top_bottom_thickness": { - "default_value": 0.6 - }, - "speed_print": { - "default_value": 40 - }, - "support_enable": { - "default_value": true - }, - "retraction_enable": { - "default_value": true - }, - "retraction_amount": { - "default_value": 7 - }, - "retraction_speed": { - "default_value": 40 - } + "overrides": + { + "gantry_height": { "value": "10" }, + "layer_height": { "default_value": 0.1 }, + "layer_height_0": { "default_value": 0.2 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 135 }, + "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0 ;turn off nozzle heater\nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament slightly\nG90 ;set to absolute positioning\nG28 X0 Y0 ;move to the XY-axis origin (Home)\nM84 ;turn off stepper motors\n; -- end of END GCODE --" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 100 }, + "machine_name": { "default_value": "Cocoon Create ModelMaker" }, + "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 ;home all axis\nG92 E0 ;zero the extruded length\nG1 Z1 F1000 ;move up slightly\nG1 X60.0 Z0 E9.0 F1000.0;intro line\nG1 X100.0 E21.5 F1000.0 ;continue line\nG92 E0 ;zero the extruded length again\n; -- end of START GCODE --" }, + "machine_width": { "default_value": 120 }, + "material_diameter": { "default_value": 1.75 }, + "retraction_amount": { "default_value": 7 }, + "retraction_enable": { "default_value": true }, + "retraction_speed": { "default_value": 40 }, + "speed_print": { "default_value": 40 }, + "support_enable": { "default_value": true }, + "top_bottom_thickness": { "default_value": 0.6 }, + "wall_thickness": { "value": "1.2" } } -} +} \ No newline at end of file diff --git a/resources/definitions/cocoon_create_touch.def.json b/resources/definitions/cocoon_create_touch.def.json index da5905c047..8cbb4fc8a5 100644 --- a/resources/definitions/cocoon_create_touch.def.json +++ b/resources/definitions/cocoon_create_touch.def.json @@ -1,79 +1,43 @@ { - "name": "Cocoon Create Touch", "version": 2, + "name": "Cocoon Create Touch", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Thushan Fernando", "manufacturer": "Cocoon Create", "file_formats": "text/x-gcode", - "preferred_quality_type": "fine", - "has_materials": true, "platform": "wanhao_200_200_platform.obj", - "platform_texture": "Cocoon-backplate.png", - "machine_extruder_trains": { - "0": "cocoon_create_touch_extruder_0" - }, + "has_materials": true, + "machine_extruder_trains": { "0": "cocoon_create_touch_extruder_0" }, "platform_offset": [ - 0, - -28, - 0 - ] + 0, + -28, + 0 + ], + "platform_texture": "Cocoon-backplate.png", + "preferred_quality_type": "fine" }, - "overrides": { - "machine_name": { - "default_value": "Cocoon Create Touch" - }, - "machine_width": { - "default_value": 200 - }, - "machine_height": { - "default_value": 180 - }, - "machine_depth": { - "default_value": 200 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\n G90 ;absolute positioning\n M82 ;set extruder to absolute mode\n M107 ;start with the fan off\n G28 X0 Y0 ;move X/Y to min endstops\n G28 Z0 ;move Z to min endstops\n G1 Z15.0 F{speed_travel} ;move the platform down 15mm\n G92 E0 ;zero the extruded length\n G1 F200 E3 ;extrude 3mm of feed stock\n G92 E0 ;zero the extruded length again\n G1 F{speed_travel} \n ;Put printing message on LCD screen\n M117 Printing..." - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning" - }, - "material_diameter": { - "default_value": 1.75 - }, - "layer_height": { - "default_value": 0.10 - }, - "layer_height_0": { - "default_value": 0.2 - }, - "wall_thickness": { - "value": "0.8" - }, - "top_bottom_thickness": { - "default_value": 0.6 - }, - "speed_print": { - "default_value": 50 - }, - "support_enable": { - "default_value": true - }, - "retraction_enable": { - "default_value": true - }, - "retraction_amount": { - "default_value": 4.5 - }, - "retraction_speed": { - "default_value": 25 - } + "overrides": + { + "layer_height": { "default_value": 0.1 }, + "layer_height_0": { "default_value": 0.2 }, + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 180 }, + "machine_name": { "default_value": "Cocoon Create Touch" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\n G90 ;absolute positioning\n M82 ;set extruder to absolute mode\n M107 ;start with the fan off\n G28 X0 Y0 ;move X/Y to min endstops\n G28 Z0 ;move Z to min endstops\n G1 Z15.0 F{speed_travel} ;move the platform down 15mm\n G92 E0 ;zero the extruded length\n G1 F200 E3 ;extrude 3mm of feed stock\n G92 E0 ;zero the extruded length again\n G1 F{speed_travel} \n ;Put printing message on LCD screen\n M117 Printing..." }, + "machine_width": { "default_value": 200 }, + "material_diameter": { "default_value": 1.75 }, + "retraction_amount": { "default_value": 4.5 }, + "retraction_enable": { "default_value": true }, + "retraction_speed": { "default_value": 25 }, + "speed_print": { "default_value": 50 }, + "support_enable": { "default_value": true }, + "top_bottom_thickness": { "default_value": 0.6 }, + "wall_thickness": { "value": "0.8" } } } \ No newline at end of file diff --git a/resources/definitions/crazy3dprint_base.def.json b/resources/definitions/crazy3dprint_base.def.json index afdf887f7f..410d84cb6d 100644 --- a/resources/definitions/crazy3dprint_base.def.json +++ b/resources/definitions/crazy3dprint_base.def.json @@ -2,43 +2,39 @@ "version": 2, "name": "Crazy3DPrint CZ-300", "inherits": "fdmprinter", - "metadata": { + "machine_end_gcode": { "default_value": ";end gcode\nM104 S0 T0\nM140 S0 T0\nG162 Z F1800\nG28 X Y\nM652\nM132 X Y Z A B\nG91\nM18" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_start_gcode": { "default_value": ";Start Gcode\nG90 ;absolute positioning\nM118 X25.00 Y25.00 Z20.00 T0\nM140 S{material_bed_temperature_layer_0} T0 ;Heat bed up to first layer temperature\nM104 S{material_print_temperature_layer_0} T0 ;Set nozzle temperature to first layer temperature\nM107 ;start with the fan off\nG90\nG28\nM132 X Y Z A B\nG1 Z50.000 F420\nG161 X Y F3300\nM7 T0\nM6 T0\nM651\nM907 X100 Y100 Z40 A100 B20 ;Digital potentiometer value\nM108 T0\n;Purge line\nG1 X-110.00 Y-60.00 F4800\nG1 Z{layer_height_0} F420\nG1 X-110.00 Y60.00 E17,4 F1200\n;Purge line end" }, + "metadata": + { "visible": false, "author": "XYZprinting Software", "manufacturer": "Crazy3DPrint", "file_formats": "text/x-gcode", - "first_start_actions": ["MachineSettingsAction"], - "machine_extruder_trains": - { - "0": "crazy3dprint_cz300_extruder_0" - }, + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true, - "preferred_variant_name": "0.4mm Nozzle", - "preferred_quality_type": "normal", + "machine_extruder_trains": { "0": "crazy3dprint_cz300_extruder_0" }, "preferred_material": "generic_pla", + "preferred_quality_type": "normal", + "preferred_variant_name": "0.4mm Nozzle", "variants_name": "Nozzle Size" }, - "overrides": { - "machine_heated_bed": {"default_value": true}, - "machine_max_feedrate_x": { "value": 500 }, - "machine_max_feedrate_y": { "value": 500 }, - "machine_max_feedrate_z": { "value": 10 }, - "machine_max_feedrate_e": { "value": 50 }, + "overrides": + { + "machine_acceleration": { "value": 500 }, + "machine_heated_bed": { "default_value": true }, + "machine_max_acceleration_e": { "value": 5000 }, "machine_max_acceleration_x": { "value": 1500 }, "machine_max_acceleration_y": { "value": 1500 }, "machine_max_acceleration_z": { "value": 500 }, - "machine_max_acceleration_e": { "value": 5000 }, - "machine_acceleration": { "value": 500 }, + "machine_max_feedrate_e": { "value": 50 }, + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_jerk_e": { "value": 5 }, "machine_max_jerk_xy": { "value": 10 }, - "machine_max_jerk_z": { "value": 0.4 }, - "machine_max_jerk_e": { "value": 5 } - }, - - - "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"}, - "machine_start_gcode": {"default_value": ";Start Gcode\nG90 ;absolute positioning\nM118 X25.00 Y25.00 Z20.00 T0\nM140 S{material_bed_temperature_layer_0} T0 ;Heat bed up to first layer temperature\nM104 S{material_print_temperature_layer_0} T0 ;Set nozzle temperature to first layer temperature\nM107 ;start with the fan off\nG90\nG28\nM132 X Y Z A B\nG1 Z50.000 F420\nG161 X Y F3300\nM7 T0\nM6 T0\nM651\nM907 X100 Y100 Z40 A100 B20 ;Digital potentiometer value\nM108 T0\n;Purge line\nG1 X-110.00 Y-60.00 F4800\nG1 Z{layer_height_0} F420\nG1 X-110.00 Y60.00 E17,4 F1200\n;Purge line end"}, - "machine_end_gcode": {"default_value": ";end gcode\nM104 S0 T0\nM140 S0 T0\nG162 Z F1800\nG28 X Y\nM652\nM132 X Y Z A B\nG91\nM18" - } + "machine_max_jerk_z": { "value": 0.4 } } +} \ No newline at end of file diff --git a/resources/definitions/crazy3dprint_cz_300.def.json b/resources/definitions/crazy3dprint_cz_300.def.json index 2748b39b53..938459410e 100644 --- a/resources/definitions/crazy3dprint_cz_300.def.json +++ b/resources/definitions/crazy3dprint_cz_300.def.json @@ -2,63 +2,61 @@ "version": 2, "name": "Crazy3DPrint CZ-300", "inherits": "crazy3dprint_base", - "metadata": { + "metadata": + { "visible": true, "author": "XYZprinting Software", "manufacturer": "Crazy3DPrint", "file_formats": "text/x-gcode", - "supports_usb_connection": true, "preferred_quality_type": "normal", - "quality_definition": "crazy3dprint_base" + "quality_definition": "crazy3dprint_base", + "supports_usb_connection": true }, - - "overrides": { - "machine_name": { "default_value": "CZ-300" }, - "machine_shape": { "default_value": "rectangular"}, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 300.00 }, - "machine_depth": { "default_value": 300.00 }, - "machine_height": { "default_value":300.00 }, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "brim_line_count": { "value": 5 }, + "cool_fan_enabled": { "default_value": true }, + "cool_fan_speed_0": { "value": 100 }, + "default_material_bed_temperature": { "value": 70 }, + "default_material_print_temperature": { "default_value": 210 }, + "fill_outline_gaps": { "default_value": true }, + "infill_line_distance": { "value": 2.6667 }, + "infill_overlap": { "value": 8.0 }, + "infill_pattern": { "value": "'lines'" }, + "infill_sparse_density": { "default_value": 15 }, + "initial_layer_line_width_factor": { "default_value": 140 }, + "inset_direction": { "value": "'outside_in'" }, + "layer_height": { "default_value": 0.2 }, "machine_center_is_zero": { "default_value": false }, - "machine_head_with_fans_polygon": { + "machine_depth": { "default_value": 300.0 }, + "machine_end_gcode": { "default_value": "M104 S0 ; turn off temperature\nM105 S0; \nG28 X0 ; home X axis\nM84 ; disable motors\n" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { "default_value": [ - [ -20, -10 ], - [ -20, 10 ], - [ 10, 10 ], - [ 10, -10 ] + [-20, -10], + [-20, 10], + [10, 10], + [10, -10] ] }, - "layer_height": { "default_value": 0.2 }, - "infill_sparse_density": { "default_value": 15 }, - "infill_line_distance": { "value": 2.6667 }, - "infill_pattern": { "value": "'lines'" }, - "infill_overlap": { "value": 8.0 }, - "min_infill_area": { "default_value": 2.0 }, - "retract_at_layer_change": { "default_value": true }, - "default_material_print_temperature": { "default_value": 210 }, - "material_final_print_temperature": { "value": 210 }, - "default_material_bed_temperature": { "value": 70 }, - "material_bed_temperature_layer_0": { "value": 70 }, - "material_flow_layer_0": {"value": 140}, - "retraction_amount": { "default_value": 10 }, - "retraction_speed": { "default_value": 50 }, - "speed_print": { "default_value": 40 }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 300.0 }, + "machine_name": { "default_value": "CZ-300" }, + "machine_shape": { "default_value": "rectangular" }, + "machine_start_gcode": { "default_value": "G28 ; home all axes\nG1 Z15 F5000 ; lift nozzle\nG92 E0\nG1 F200 E3\n" }, + "machine_width": { "default_value": 300.0 }, + "material_bed_temperature_layer_0": { "value": 70 }, + "material_final_print_temperature": { "value": 210 }, + "material_flow_layer_0": { "value": 140 }, + "min_infill_area": { "default_value": 2.0 }, + "retract_at_layer_change": { "default_value": true }, + "retraction_amount": { "default_value": 10 }, + "retraction_speed": { "default_value": 50 }, + "skirt_line_count": { "default_value": 5 }, + "speed_print": { "default_value": 40 }, "speed_travel": { "value": 60 }, - "cool_fan_enabled": { "default_value": true }, - "cool_fan_speed_0": { "value": 100 }, - "adhesion_type": { "default_value" : "skirt" }, - "brim_line_count": { "value" : 5 }, - "skirt_line_count": { "default_value" : 5 }, - "initial_layer_line_width_factor": { "default_value" : 140 }, - "top_bottom_pattern": { "default_value" : "concentric" }, - "fill_outline_gaps": { "default_value": true }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "inset_direction": {"value": "'outside_in'" }, - "machine_start_gcode": { - "default_value": "G28 ; home all axes\nG1 Z15 F5000 ; lift nozzle\nG92 E0\nG1 F200 E3\n" - }, - "machine_end_gcode": { - "default_value": "M104 S0 ; turn off temperature\nM105 S0; \nG28 X0 ; home X axis\nM84 ; disable motors\n" - } + "top_bottom_pattern": { "default_value": "concentric" } } -} +} \ No newline at end of file diff --git a/resources/definitions/creality_base.def.json b/resources/definitions/creality_base.def.json index a947369de7..be6792eafd 100644 --- a/resources/definitions/creality_base.def.json +++ b/resources/definitions/creality_base.def.json @@ -1,26 +1,13 @@ { - "name": "Creality Base Printer", "version": 2, + "name": "Creality Base Printer", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": false, "author": "trouch.com", "manufacturer": "Creality3D", "file_formats": "text/x-gcode", - "first_start_actions": ["MachineSettingsAction"], - - "machine_extruder_trains": { - "0": "creality_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", "exclude_materials": [ "Vertex_Delta_ABS", "Vertex_Delta_PET", @@ -71,135 +58,121 @@ "verbatim_bvoh_175", "zyyx_pro_flex", "zyyx_pro_pla" - ] + ], + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { "0": "creality_base_extruder_0" }, + "preferred_material": "generic_pla", + "preferred_quality_type": "standard", + "preferred_variant_name": "0.4mm Nozzle", + "variants_name": "Nozzle Size" }, "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" }, - - "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_enabled": { "value": false }, "acceleration_print": { "value": 500 }, + "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, "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" }, - + "adaptive_layer_height_variation": { "value": 0.04 }, + "adaptive_layer_height_variation_step": { "value": 0.04 }, + "adhesion_type": { "value": "'skirt'" }, + "brim_replaces_support": { "value": false }, + "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, + "cool_min_layer_time": { "value": 10 }, + "fill_outline_gaps": { "value": false }, + "infill_before_walls": { "value": false }, + "infill_overlap": { "value": 30.0 }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, + "infill_wipe_dist": { "value": 0.0 }, + "jerk_enabled": { "value": false }, "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": 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_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 }, - - "optimize_wall_printing_order": { "value": "True" }, - - "material_initial_print_temperature": { "value": "material_print_temperature" }, + "machine_acceleration": { "value": 500 }, + "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_heated_bed": { "default_value": true }, + "machine_max_acceleration_e": { "value": 5000 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 100 }, + "machine_max_feedrate_e": { "value": 50 }, + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_jerk_e": { "value": 5 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.4 }, + "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" }, + "material_diameter": { "default_value": 1.75 }, "material_final_print_temperature": { "value": "material_print_temperature" }, - - "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": + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "meshfix_maximum_resolution": { "value": "0.25" }, + "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" }, + "minimum_interface_area": { "value": 10 }, + "minimum_support_area": { "value": 2 }, + "optimize_wall_printing_order": { "value": "True" }, + "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, + "retraction_combing_max_distance": { "value": 30 }, + "retraction_count_max": { "value": 100 }, + "retraction_extrusion_window": { "value": 10 }, + "retraction_hop": { "value": 0.2 }, + "retraction_min_travel": { "value": 1.5 }, + "retraction_prime_speed": { - "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", - "maximum_value": 200 + "maximum_value": 200, + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')" }, "retraction_retract_speed": { - "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", - "maximum_value": 200 + "maximum_value": 200, + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')" }, - "retraction_prime_speed": + "retraction_speed": { - "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", - "maximum_value": 200 + "maximum_value": 200, + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')" }, - "retraction_hop": { "value": 0.2 }, - "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, - "retraction_combing_max_distance": { "value": 30 }, + "skin_overlap": { "value": 10.0 }, + "skirt_gap": { "value": 10.0 }, + "skirt_line_count": { "value": 3 }, + "speed_layer_0": { "value": 20.0 }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_print": { "value": 50.0 }, + "speed_roofing": { "value": "speed_topbottom" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_support_interface": { "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_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, + "speed_wall_x": { "value": "speed_wall" }, + "speed_z_hop": { "value": 5 }, + "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width / 2.0 /layer_height)))" }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 4 }, + "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_enable": { "value": true }, + "support_interface_height": { "value": "layer_height * 4" }, + "support_interface_pattern": { "value": "'grid'" }, + "support_interface_skip_height": { "value": 0.2 }, + "support_pattern": { "value": "'zigzag'" }, + "support_top_distance": { "value": "extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance') + (layer_height if support_structure == 'tree' else 0)" }, + "support_use_towers": { "value": false }, + "support_wall_count": { "value": 1 }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height * 2" }, + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, "travel_avoid_other_parts": { "value": true }, "travel_avoid_supports": { "value": true }, "travel_retract_before_outer_wall": { "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_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_top_distance": { "value": "extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance') + (layer_height if support_structure == 'tree' else 0)"}, - "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": 2 }, - "minimum_interface_area": { "value": 10 }, - "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, - "wall_thickness": {"value": "line_width * 2" } - + "wall_0_wipe_dist": { "value": 0.0 }, + "wall_thickness": { "value": "line_width * 2" }, + "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, + "z_seam_type": { "value": "'back'" } } -} +} \ No newline at end of file diff --git a/resources/definitions/creality_cr-x.def.json b/resources/definitions/creality_cr-x.def.json index fd6cb9eda5..419ffc5914 100644 --- a/resources/definitions/creality_cr-x.def.json +++ b/resources/definitions/creality_cr-x.def.json @@ -2,45 +2,47 @@ "version": 2, "name": "Creality CR-X", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "SRC", "manufacturer": "Creality3D", "file_formats": "text/x-gcode", "platform": "cr-x.3mf", - "has_variants": false, "has_machine_quality": false, - "preferred_quality_type": "draft", - "machine_extruder_trains": { + "has_variants": false, + "machine_extruder_trains": + { "0": "cr-x_extruder_0", "1": "cr-x_extruder_1" - } + }, + "preferred_quality_type": "draft" }, - - "overrides": { - "machine_name": { "default_value": "Creality CR-X" }, - "machine_extruder_count": { "default_value": 2 }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 300 }, - "machine_depth": { "default_value": 300 }, - "machine_height": { "default_value": 400 }, - "machine_center_is_zero": { "default_value": false }, - "retraction_amount": { "default_value": 3 }, - "retraction_speed": { "default_value": 70}, + "overrides": + { "adhesion_type": { "default_value": "skirt" }, "gantry_height": { "value": "30" }, - "speed_print": { "default_value": 60 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 300 }, + "machine_end_gcode": { "default_value": "M104 S0 ;hotend off\nM140 S0 ;bed off\nG92 E0\nG1 F2000 E-100 ;retract filament 100mm\nG92 E0\nG1 F3000 X0 Y270 ;move bed for easy part removal\nM84 ;disable steppers" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 400 }, + "machine_max_acceleration_e": { "default_value": 5000 }, "machine_max_acceleration_x": { "default_value": 500 }, "machine_max_acceleration_y": { "default_value": 500 }, "machine_max_acceleration_z": { "default_value": 100 }, - "machine_max_acceleration_e": { "default_value": 5000 }, + "machine_max_jerk_e": { "default_value": 5.0 }, "machine_max_jerk_xy": { "default_value": 5.0 }, "machine_max_jerk_z": { "default_value": 0.4 }, - "machine_max_jerk_e": { "default_value": 5.0 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_name": { "default_value": "Creality CR-X" }, "machine_start_gcode": { "default_value": "G21 ;metric values\nG28 ;home all\nG90 ;absolute positioning\nM107 ;start with the fan off\nG1 F2400 Z15.0 ;raise the nozzle 15mm\nM109 S{material_print_temperature} ;Set Extruder Temperature and Wait\nM190 S{material_bed_temperature}; Wait for bed temperature to reach target temp\nT0 ;Switch to Extruder 1\nG1 F3000 X5 Y10 Z0.2 ;move to prime start position\nG92 E0 ;reset extrusion distance\nG1 F600 X160 E15 ;prime nozzle in a line\nG1 F5000 X180 ;quick wipe\nG92 E0 ;reset extrusion distance" }, - "machine_end_gcode": { "default_value": "M104 S0 ;hotend off\nM140 S0 ;bed off\nG92 E0\nG1 F2000 E-100 ;retract filament 100mm\nG92 E0\nG1 F3000 X0 Y270 ;move bed for easy part removal\nM84 ;disable steppers" }, - "wall_thickness": { "value": "1" }, - "top_bottom_thickness": { "default_value": 1 } + "machine_width": { "default_value": 300 }, + "retraction_amount": { "default_value": 3 }, + "retraction_speed": { "default_value": 70 }, + "speed_print": { "default_value": 60 }, + "top_bottom_thickness": { "default_value": 1 }, + "wall_thickness": { "value": "1" } } -} +} \ No newline at end of file diff --git a/resources/definitions/creality_cr10.def.json b/resources/definitions/creality_cr10.def.json index 85e0f0a435..e2fd766833 100644 --- a/resources/definitions/creality_cr10.def.json +++ b/resources/definitions/creality_cr10.def.json @@ -1,25 +1,27 @@ { - "name": "Creality CR-10", "version": 2, + "name": "Creality CR-10", "inherits": "creality_base", - "overrides": { - "machine_name": { "default_value": "Creality CR-10" }, - "machine_width": { "default_value": 300 }, + "metadata": + { + "visible": true, + "quality_definition": "creality_base" + }, + "overrides": + { + "gantry_height": { "value": 25 }, "machine_depth": { "default_value": 300 }, - "machine_height": { "default_value": 400 }, - "machine_head_with_fans_polygon": { "default_value": [ + "machine_head_with_fans_polygon": + { + "default_value": [ [-26, 34], [-26, -32], [32, -32], [32, 34] ] }, - - "gantry_height": { "value": 25 } - - }, - "metadata": { - "quality_definition": "creality_base", - "visible": true + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "Creality CR-10" }, + "machine_width": { "default_value": 300 } } } \ No newline at end of file diff --git a/resources/definitions/creality_cr100.def.json b/resources/definitions/creality_cr100.def.json index ed528a00b6..f226bcea28 100644 --- a/resources/definitions/creality_cr100.def.json +++ b/resources/definitions/creality_cr100.def.json @@ -1,25 +1,27 @@ { - "name": "Creality CR-100", "version": 2, + "name": "Creality CR-100", "inherits": "creality_base", - "overrides": { - "machine_name": { "default_value": "Creality CR-100" }, - "machine_width": { "default_value": 100 }, + "metadata": + { + "visible": true, + "quality_definition": "creality_base" + }, + "overrides": + { + "gantry_height": { "value": 25 }, "machine_depth": { "default_value": 100 }, - "machine_height": { "default_value": 80 }, - "machine_head_with_fans_polygon": { "default_value": [ + "machine_head_with_fans_polygon": + { + "default_value": [ [-26, 34], [-26, -32], [32, -32], [32, 34] ] }, - - "gantry_height": { "value": 25 } - - }, - "metadata": { - "quality_definition": "creality_base", - "visible": true + "machine_height": { "default_value": 80 }, + "machine_name": { "default_value": "Creality CR-100" }, + "machine_width": { "default_value": 100 } } } \ No newline at end of file diff --git a/resources/definitions/creality_cr10max.def.json b/resources/definitions/creality_cr10max.def.json index 021647c2be..1498245262 100644 --- a/resources/definitions/creality_cr10max.def.json +++ b/resources/definitions/creality_cr10max.def.json @@ -1,26 +1,28 @@ { - "name": "Creality CR-10 Max", "version": 2, + "name": "Creality CR-10 Max", "inherits": "creality_base", - "overrides": { - "machine_name": { "default_value": "Creality CR-10 Max" }, - "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\nG29 ;Auto bed Level\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_width": { "default_value": 450 }, + "metadata": + { + "visible": true, + "quality_definition": "creality_base" + }, + "overrides": + { + "gantry_height": { "value": 30 }, "machine_depth": { "default_value": 450 }, - "machine_height": { "default_value": 470 }, - "machine_head_with_fans_polygon": { "default_value": [ + "machine_head_with_fans_polygon": + { + "default_value": [ [-44, 34], [-44, -34], [38, -34], [38, 34] ] }, - - "gantry_height": { "value": 30 } - - }, - "metadata": { - "quality_definition": "creality_base", - "visible": true + "machine_height": { "default_value": 470 }, + "machine_name": { "default_value": "Creality CR-10 Max" }, + "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\nG29 ;Auto bed Level\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_width": { "default_value": 450 } } -} +} \ No newline at end of file diff --git a/resources/definitions/creality_cr10mini.def.json b/resources/definitions/creality_cr10mini.def.json index 621be5f0f3..70a42537a6 100644 --- a/resources/definitions/creality_cr10mini.def.json +++ b/resources/definitions/creality_cr10mini.def.json @@ -1,25 +1,27 @@ { - "name": "Creality CR-10 Mini", "version": 2, + "name": "Creality CR-10 Mini", "inherits": "creality_base", - "overrides": { - "machine_name": { "default_value": "Creality CR-10 Mini" }, - "machine_width": { "default_value": 300 }, + "metadata": + { + "visible": true, + "quality_definition": "creality_base" + }, + "overrides": + { + "gantry_height": { "value": 25 }, "machine_depth": { "default_value": 220 }, - "machine_height": { "default_value": 300 }, - "machine_head_with_fans_polygon": { "default_value": [ + "machine_head_with_fans_polygon": + { + "default_value": [ [-26, 34], [-26, -32], [32, -32], [32, 34] ] }, - - "gantry_height": { "value": 25 } - - }, - "metadata": { - "quality_definition": "creality_base", - "visible": true + "machine_height": { "default_value": 300 }, + "machine_name": { "default_value": "Creality CR-10 Mini" }, + "machine_width": { "default_value": 300 } } } \ No newline at end of file diff --git a/resources/definitions/creality_cr10s.def.json b/resources/definitions/creality_cr10s.def.json index 9884b95cb4..679c9f3b65 100644 --- a/resources/definitions/creality_cr10s.def.json +++ b/resources/definitions/creality_cr10s.def.json @@ -1,11 +1,10 @@ { - "name": "Creality CR-10S", "version": 2, + "name": "Creality CR-10S", "inherits": "creality_cr10", - "overrides": { + "metadata": { "quality_definition": "creality_base" }, + "overrides": + { "machine_name": { "default_value": "Creality CR-10S" } - }, - "metadata": { - "quality_definition": "creality_base" } } \ No newline at end of file diff --git a/resources/definitions/creality_cr10s4.def.json b/resources/definitions/creality_cr10s4.def.json index ccecd41a1d..79d4fb5bca 100644 --- a/resources/definitions/creality_cr10s4.def.json +++ b/resources/definitions/creality_cr10s4.def.json @@ -1,25 +1,27 @@ { - "name": "Creality CR-10S4", "version": 2, + "name": "Creality CR-10S4", "inherits": "creality_base", - "overrides": { - "machine_name": { "default_value": "Creality CR-10S4" }, - "machine_width": { "default_value": 400 }, + "metadata": + { + "visible": true, + "quality_definition": "creality_base" + }, + "overrides": + { + "gantry_height": { "value": 25 }, "machine_depth": { "default_value": 400 }, - "machine_height": { "default_value": 400 }, - "machine_head_with_fans_polygon": { "default_value": [ + "machine_head_with_fans_polygon": + { + "default_value": [ [-26, 34], [-26, -32], [32, -32], [32, 34] ] }, - - "gantry_height": { "value": 25 } - - }, - "metadata": { - "quality_definition": "creality_base", - "visible": true + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "Creality CR-10S4" }, + "machine_width": { "default_value": 400 } } } \ No newline at end of file diff --git a/resources/definitions/creality_cr10s5.def.json b/resources/definitions/creality_cr10s5.def.json index 105e1d0458..0c89d753b7 100644 --- a/resources/definitions/creality_cr10s5.def.json +++ b/resources/definitions/creality_cr10s5.def.json @@ -1,25 +1,27 @@ { - "name": "Creality CR-10S5", "version": 2, + "name": "Creality CR-10S5", "inherits": "creality_base", - "overrides": { - "machine_name": { "default_value": "Creality CR-10S5" }, - "machine_width": { "default_value": 500 }, + "metadata": + { + "visible": true, + "quality_definition": "creality_base" + }, + "overrides": + { + "gantry_height": { "value": 25 }, "machine_depth": { "default_value": 500 }, - "machine_height": { "default_value": 500 }, - "machine_head_with_fans_polygon": { "default_value": [ + "machine_head_with_fans_polygon": + { + "default_value": [ [-26, 34], [-26, -32], [32, -32], [32, 34] ] }, - - "gantry_height": { "value": 25 } - - }, - "metadata": { - "quality_definition": "creality_base", - "visible": true + "machine_height": { "default_value": 500 }, + "machine_name": { "default_value": "Creality CR-10S5" }, + "machine_width": { "default_value": 500 } } } \ No newline at end of file diff --git a/resources/definitions/creality_cr10spro.def.json b/resources/definitions/creality_cr10spro.def.json index 62ee8eb777..afe3fb232f 100644 --- a/resources/definitions/creality_cr10spro.def.json +++ b/resources/definitions/creality_cr10spro.def.json @@ -1,24 +1,30 @@ { - "name": "Creality CR-10S Pro", "version": 2, + "name": "Creality CR-10S Pro", "inherits": "creality_cr10", - "overrides": { - "machine_name": { "default_value": "Creality CR-10S Pro" }, - "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\nG29 ;Auto bed Level\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_head_with_fans_polygon": { "default_value": [ + "metadata": + { + "platform": "creality_cr10spro.3mf", + "platform_offset": [ + -150, + 0, + 150 + ], + "quality_definition": "creality_base" + }, + "overrides": + { + "gantry_height": { "value": 30 }, + "machine_head_with_fans_polygon": + { + "default_value": [ [-44, 34], [-44, -34], [38, -34], [38, 34] ] }, - - "gantry_height": { "value": 30 } - - }, - "metadata": { - "quality_definition": "creality_base", - "platform": "creality_cr10spro.3mf", - "platform_offset": [ -150, 0, 150] + "machine_name": { "default_value": "Creality CR-10S Pro" }, + "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\nG29 ;Auto bed Level\nM420 S1 ;Save and use mesh\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" } } -} +} \ No newline at end of file diff --git a/resources/definitions/creality_cr20.def.json b/resources/definitions/creality_cr20.def.json index b18c2709e6..ccb8148f93 100644 --- a/resources/definitions/creality_cr20.def.json +++ b/resources/definitions/creality_cr20.def.json @@ -1,25 +1,27 @@ { - "name": "Creality CR-20", "version": 2, + "name": "Creality CR-20", "inherits": "creality_base", - "overrides": { - "machine_name": { "default_value": "Creality CR-20" }, - "machine_width": { "default_value": 220 }, + "metadata": + { + "visible": true, + "quality_definition": "creality_base" + }, + "overrides": + { + "gantry_height": { "value": 25 }, "machine_depth": { "default_value": 220 }, - "machine_height": { "default_value": 250 }, - "machine_head_with_fans_polygon": { "default_value": [ + "machine_head_with_fans_polygon": + { + "default_value": [ [-26, 34], [-26, -32], [32, -32], [32, 34] ] }, - - "gantry_height": { "value": 25 } - - }, - "metadata": { - "quality_definition": "creality_base", - "visible": true + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "Creality CR-20" }, + "machine_width": { "default_value": 220 } } } \ No newline at end of file diff --git a/resources/definitions/creality_cr20pro.def.json b/resources/definitions/creality_cr20pro.def.json index 4e676bcb74..401bfdcdf7 100644 --- a/resources/definitions/creality_cr20pro.def.json +++ b/resources/definitions/creality_cr20pro.def.json @@ -1,13 +1,11 @@ { - "name": "Creality CR-20 Pro", "version": 2, + "name": "Creality CR-20 Pro", "inherits": "creality_cr20", - "overrides": { + "metadata": { "quality_definition": "creality_base" }, + "overrides": + { "machine_name": { "default_value": "Creality CR-20 Pro" }, - "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\nM420 S1 Z2 ;Enable ABL using saved Mesh and Fade Height\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"} - - }, - "metadata": { - "quality_definition": "creality_base" + "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\nM420 S1 Z2 ;Enable ABL using saved Mesh and Fade Height\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" } } } \ No newline at end of file diff --git a/resources/definitions/creality_cr6se.def.json b/resources/definitions/creality_cr6se.def.json index 420173fe61..b6fbe36baa 100644 --- a/resources/definitions/creality_cr6se.def.json +++ b/resources/definitions/creality_cr6se.def.json @@ -1,26 +1,27 @@ { - "name": "Creality CR-6 SE", "version": 2, + "name": "Creality CR-6 SE", "inherits": "creality_base", - "metadata": { - "quality_definition": "creality_base", - "visible": true + "metadata": + { + "visible": true, + "quality_definition": "creality_base" }, - "overrides": { - "machine_name": { "default_value": "Creality CR-6 SE" }, - "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": 25 } + "overrides": + { + "gantry_height": { "value": 25 }, + "machine_depth": { "default_value": 235 }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-26, 34], + [-26, -32], + [32, -32], + [32, 34] + ] + }, + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "Creality CR-6 SE" }, + "machine_width": { "default_value": 235 } } - } - +} \ No newline at end of file diff --git a/resources/definitions/creality_ender2.def.json b/resources/definitions/creality_ender2.def.json index 2a5e14c828..477bf43612 100644 --- a/resources/definitions/creality_ender2.def.json +++ b/resources/definitions/creality_ender2.def.json @@ -1,26 +1,28 @@ { - "name": "Creality Ender-2", "version": 2, + "name": "Creality Ender-2", "inherits": "creality_base", - "overrides": { - "machine_name": { "default_value": "Creality Ender-2" }, - "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 Y100.0 Z0.28 F1500.0 E8 ;Draw the first line\nG1 X10.4 Y100.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E15 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n"}, - "machine_width": { "default_value": 150 }, + "metadata": + { + "visible": true, + "quality_definition": "creality_base" + }, + "overrides": + { + "gantry_height": { "value": 25 }, "machine_depth": { "default_value": 150 }, - "machine_height": { "default_value": 200 }, - "machine_head_with_fans_polygon": { "default_value": [ + "machine_head_with_fans_polygon": + { + "default_value": [ [-26, 34], [-26, -32], [32, -32], [32, 34] ] }, - - "gantry_height": { "value": 25 } - - }, - "metadata": { - "quality_definition": "creality_base", - "visible": true + "machine_height": { "default_value": 200 }, + "machine_name": { "default_value": "Creality Ender-2" }, + "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 Y100.0 Z0.28 F1500.0 E8 ;Draw the first line\nG1 X10.4 Y100.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E15 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n" }, + "machine_width": { "default_value": 150 } } } \ No newline at end of file diff --git a/resources/definitions/creality_ender3.def.json b/resources/definitions/creality_ender3.def.json index 6b13efcb1e..4de14c74a0 100644 --- a/resources/definitions/creality_ender3.def.json +++ b/resources/definitions/creality_ender3.def.json @@ -1,33 +1,46 @@ { - "name": "Creality Ender-3 / Ender-3 v2", "version": 2, + "name": "Creality Ender-3 / Ender-3 v2", "inherits": "creality_base", - "metadata": { - "quality_definition": "creality_base", + "metadata": + { "visible": true, - "platform": "creality_ender3.3mf" + "platform": "creality_ender3.3mf", + "quality_definition": "creality_base" }, - "overrides": { - "machine_name": { "default_value": "Creality Ender-3" }, - "machine_width": { "default_value": 235 }, + "overrides": + { + "gantry_height": { "value": 25 }, "machine_depth": { "default_value": 235 }, - "machine_height": { "default_value": 250 }, - "machine_disallowed_areas": { + "machine_disallowed_areas": + { + "default_value": [ + [ + [-117.5, 117.5], + [-117.5, 108], + [117.5, 108], + [117.5, 117.5] + ], + [ + [-117.5, -108], + [-117.5, -117.5], + [117.5, -117.5], + [117.5, -108] + ] + ] + }, + "machine_head_with_fans_polygon": + { "default_value": [ - [[-117.5, 117.5], [-117.5, 108], [117.5, 108], [117.5, 117.5]], - [[-117.5, -108], [-117.5, -117.5], [117.5, -117.5], [117.5, -108]] - ]}, - "machine_head_with_fans_polygon": { "default_value": [ [-26, 34], [-26, -32], [32, -32], [32, 34] ] }, - "machine_start_gcode": { - "default_value": "; Ender 3 Custom Start G-code\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" - }, - - "gantry_height": { "value": 25 } + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "Creality Ender-3" }, + "machine_start_gcode": { "default_value": "; Ender 3 Custom Start G-code\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" }, + "machine_width": { "default_value": 235 } } -} +} \ No newline at end of file diff --git a/resources/definitions/creality_ender3max.def.json b/resources/definitions/creality_ender3max.def.json index 0902f00f29..6d0fc38646 100644 --- a/resources/definitions/creality_ender3max.def.json +++ b/resources/definitions/creality_ender3max.def.json @@ -1,41 +1,38 @@ { - "name": "Creality Ender-3 Max", "version": 2, + "name": "Creality Ender-3 Max", "inherits": "creality_base", - "metadata": { - "author": "Radlab Ecuador", - "quality_definition": "creality_base", + "metadata": + { "visible": true, - "platform": "creality_ender3max.stl" + "author": "Radlab Ecuador", + "platform": "creality_ender3max.stl", + "quality_definition": "creality_base" }, - "overrides": { - "machine_name": { "default_value": "Creality Ender-3 Max" }, - "machine_width": { "default_value": 300 }, + "overrides": + { + "acceleration_travel": { "value": 1000 }, + "gantry_height": { "value": 35 }, "machine_depth": { "default_value": 300 }, - "machine_height": { "default_value": 340 }, - "machine_head_with_fans_polygon": { "default_value": [ + "machine_head_with_fans_polygon": + { + "default_value": [ [-42.5, 30], [-42.5, -40], [42.5, -40], [42.5, 30] ] }, - "machine_start_gcode": { - "default_value": "; Ender 3 Max Custom Start G-code\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" - }, - - "machine_max_feedrate_z": { "value": 5 }, - "machine_max_feedrate_e": { "value": 25 }, - + "machine_height": { "default_value": 340 }, + "machine_max_acceleration_e": { "value": 1000 }, "machine_max_acceleration_x": { "value": 500 }, "machine_max_acceleration_y": { "value": 500 }, "machine_max_acceleration_z": { "value": 100 }, - "machine_max_acceleration_e": { "value": 1000 }, - - "acceleration_travel": { "value": 1000 }, - + "machine_max_feedrate_e": { "value": 25 }, + "machine_max_feedrate_z": { "value": 5 }, "machine_max_jerk_z": { "value": 0.3 }, - - "gantry_height": { "value": 35 } + "machine_name": { "default_value": "Creality Ender-3 Max" }, + "machine_start_gcode": { "default_value": "; Ender 3 Max Custom Start G-code\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" }, + "machine_width": { "default_value": 300 } } -} +} \ No newline at end of file diff --git a/resources/definitions/creality_ender3pro.def.json b/resources/definitions/creality_ender3pro.def.json index f8aa6d433a..de0d4ed0bf 100644 --- a/resources/definitions/creality_ender3pro.def.json +++ b/resources/definitions/creality_ender3pro.def.json @@ -1,28 +1,29 @@ { - "name": "Creality Ender-3 Pro", "version": 2, + "name": "Creality Ender-3 Pro", "inherits": "creality_base", - "metadata": { - "quality_definition": "creality_base", + "metadata": + { "visible": true, - "platform": "creality_ender3.3mf" + "platform": "creality_ender3.3mf", + "quality_definition": "creality_base" }, - "overrides": { - "machine_name": { "default_value": "Creality Ender-3 Pro" }, - "machine_width": { "default_value": 220 }, + "overrides": + { + "gantry_height": { "value": 25 }, "machine_depth": { "default_value": 220 }, - "machine_height": { "default_value": 250 }, - "machine_head_with_fans_polygon": { "default_value": [ + "machine_head_with_fans_polygon": + { + "default_value": [ [-26, 34], [-26, -32], [32, -32], [32, 34] ] }, - "machine_start_gcode": { - "default_value": "; Ender 3 Custom Start G-code\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM104 S{material_standby_temperature} ; Start heating up the nozzle most of the way\nM190 S{material_bed_temperature_layer_0} ; Start heating the bed, wait until target temperature reached\nM109 S{material_print_temperature_layer_0} ; Finish heating the nozzle\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" - }, - - "gantry_height": { "value": 25 } + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "Creality Ender-3 Pro" }, + "machine_start_gcode": { "default_value": "; Ender 3 Custom Start G-code\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM104 S{material_standby_temperature} ; Start heating up the nozzle most of the way\nM190 S{material_bed_temperature_layer_0} ; Start heating the bed, wait until target temperature reached\nM109 S{material_print_temperature_layer_0} ; Finish heating the nozzle\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" }, + "machine_width": { "default_value": 220 } } -} +} \ No newline at end of file diff --git a/resources/definitions/creality_ender3s1.def.json b/resources/definitions/creality_ender3s1.def.json index a9a052e973..a37d9c4561 100644 --- a/resources/definitions/creality_ender3s1.def.json +++ b/resources/definitions/creality_ender3s1.def.json @@ -1,38 +1,36 @@ { - "name": "Creality Ender-3 S1", "version": 2, + "name": "Creality Ender-3 S1", "inherits": "creality_base", - "metadata": { - "quality_definition": "creality_base", - "visible": true + "metadata": + { + "visible": true, + "quality_definition": "creality_base" }, - "overrides": { - "machine_name": { "default_value": "Creality Ender-3 S1" }, - "machine_width": { "default_value": 220 }, + "overrides": + { + "acceleration_enabled": { "value": true }, + "acceleration_travel": { "value": 2000 }, + "gantry_height": { "value": 25 }, "machine_depth": { "default_value": 220 }, - "machine_height": { "default_value": 270 }, - "machine_head_with_fans_polygon": { "default_value": [ + "machine_head_with_fans_polygon": + { + "default_value": [ [-26, 34], [-26, -32], [32, -32], [32, 34] ] }, - - "gantry_height": { "value": 25 }, - - "speed_print": {"value": 50}, - "speed_layer_0": {"value": 25}, - "speed_travel": { "value": 150 }, - "retraction_amount": {"value": 0.8}, - "retraction_speed": { "default_value": 40}, - - "acceleration_enabled": {"value": true}, - "acceleration_travel": {"value": 2000}, - "retraction_extrusion_window": {"value": 1.5}, - - "machine_start_gcode": { - "default_value": "; Ender 3 S1 Start G-code\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nG1 Z10.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0 Y0\n\nM104 S{material_print_temperature_layer_0}\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0}\n\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish\n" - } + "machine_height": { "default_value": 270 }, + "machine_name": { "default_value": "Creality Ender-3 S1" }, + "machine_start_gcode": { "default_value": "; Ender 3 S1 Start G-code\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nG1 Z10.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0 Y0\n\nM104 S{material_print_temperature_layer_0}\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0}\n\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish\n" }, + "machine_width": { "default_value": 220 }, + "retraction_amount": { "value": 0.8 }, + "retraction_extrusion_window": { "value": 1.5 }, + "retraction_speed": { "default_value": 40 }, + "speed_layer_0": { "value": 25 }, + "speed_print": { "value": 50 }, + "speed_travel": { "value": 150 } } -} +} \ No newline at end of file diff --git a/resources/definitions/creality_ender3s1plus.def.json b/resources/definitions/creality_ender3s1plus.def.json new file mode 100644 index 0000000000..e2edeb7e5b --- /dev/null +++ b/resources/definitions/creality_ender3s1plus.def.json @@ -0,0 +1,32 @@ +{ + "version": 2, + "name": "Creality Ender-3 S1 Plus", + "inherits": "creality_base", + "metadata": + { + "visible": true, + "quality_definition": "creality_base" + }, + "overrides": + { + "gantry_height": { "value": 25 }, + "machine_depth": { "default_value": 300 }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-26, 34], + [-26, -32], + [32, -32], + [32, 34] + ] + }, + "machine_height": { "default_value": 300 }, + "machine_name": { "default_value": "Creality Ender-3 S1 Plus" }, + "machine_start_gcode": { "default_value": "; Ender 3 S1 Plus Start G-code\nG28 ;Home\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_width": { "default_value": 300 }, + "retraction_amount": { "value": 0.8 }, + "retraction_speed": { "default_value": 40 }, + "speed_layer_0": { "value": 25 }, + "speed_travel": { "value": "120.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" } + } +} \ No newline at end of file diff --git a/resources/definitions/creality_ender3s1pro.def.json b/resources/definitions/creality_ender3s1pro.def.json new file mode 100644 index 0000000000..5e616edfb0 --- /dev/null +++ b/resources/definitions/creality_ender3s1pro.def.json @@ -0,0 +1,31 @@ +{ + "version": 2, + "name": "Creality Ender-3 S1 Pro", + "inherits": "creality_base", + "metadata": + { + "visible": true, + "quality_definition": "creality_base" + }, + "overrides": + { + "gantry_height": { "value": 25 }, + "machine_depth": { "default_value": 220 }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-26, 34], + [-26, -32], + [32, -32], + [32, 34] + ] + }, + "machine_height": { "default_value": 270 }, + "machine_name": { "default_value": "Creality Ender-3 S1 Pro" }, + "machine_start_gcode": { "default_value": "; Ender 3 S1 Pro Start G-code\nG28 ;Home\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_width": { "default_value": 220 }, + "retraction_amount": { "value": 0.8 }, + "retraction_speed": { "default_value": 40 }, + "speed_travel": { "value": "120.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" } + } +} \ No newline at end of file diff --git a/resources/definitions/creality_ender4.def.json b/resources/definitions/creality_ender4.def.json index 6fd02d879f..3da1131292 100644 --- a/resources/definitions/creality_ender4.def.json +++ b/resources/definitions/creality_ender4.def.json @@ -1,27 +1,28 @@ { - "name": "Creality Ender-4", "version": 2, + "name": "Creality Ender-4", "inherits": "creality_base", - "overrides": { - "machine_name": { "default_value": "Creality Ender-4" }, - "machine_width": { "default_value": 220 }, + "metadata": + { + "visible": true, + "quality_definition": "creality_base" + }, + "overrides": + { + "gantry_height": { "value": 25 }, "machine_depth": { "default_value": 220 }, - "machine_height": { "default_value": 300 }, - "machine_head_with_fans_polygon": { "default_value": [ + "machine_head_with_fans_polygon": + { + "default_value": [ [-26, 34], [-26, -32], [32, -32], [32, 34] ] }, - - "gantry_height": { "value": 25 }, - + "machine_height": { "default_value": 300 }, + "machine_name": { "default_value": "Creality Ender-4" }, + "machine_width": { "default_value": 220 }, "speed_print": { "value": 80.0 } - - }, - "metadata": { - "quality_definition": "creality_base", - "visible": true } -} +} \ No newline at end of file diff --git a/resources/definitions/creality_ender5.def.json b/resources/definitions/creality_ender5.def.json index 2f913fdd4e..36e1753086 100644 --- a/resources/definitions/creality_ender5.def.json +++ b/resources/definitions/creality_ender5.def.json @@ -1,28 +1,29 @@ { - "name": "Creality Ender-5", "version": 2, + "name": "Creality Ender-5", "inherits": "creality_base", - "overrides": { - "machine_name": { "default_value": "Creality Ender-5" }, - "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positioning\n\nG28 X0 Y0 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }, - "machine_width": { "default_value": 220 }, + "metadata": + { + "visible": true, + "quality_definition": "creality_base" + }, + "overrides": + { + "gantry_height": { "value": 25 }, "machine_depth": { "default_value": 220 }, - "machine_height": { "default_value": 300 }, - "machine_head_with_fans_polygon": { "default_value": [ + "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positioning\n\nG28 X0 Y0 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }, + "machine_head_with_fans_polygon": + { + "default_value": [ [-26, 34], [-26, -32], [32, -32], [32, 34] ] }, - - "gantry_height": { "value": 25 }, - + "machine_height": { "default_value": 300 }, + "machine_name": { "default_value": "Creality Ender-5" }, + "machine_width": { "default_value": 220 }, "speed_print": { "value": 80.0 } - - }, - "metadata": { - "quality_definition": "creality_base", - "visible": true } -} +} \ No newline at end of file diff --git a/resources/definitions/creality_ender5plus.def.json b/resources/definitions/creality_ender5plus.def.json index 44469284f2..b7b11343e5 100644 --- a/resources/definitions/creality_ender5plus.def.json +++ b/resources/definitions/creality_ender5plus.def.json @@ -1,29 +1,30 @@ { - "name": "Creality Ender-5 Plus", "version": 2, + "name": "Creality Ender-5 Plus", "inherits": "creality_base", - "overrides": { - "machine_name": { "default_value": "Creality Ender-5 Plus" }, - "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\nM420 S1 Z2 ;Enable ABL using saved Mesh and Fade Height\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 X{machine_width} 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_width": { "default_value": 350 }, + "metadata": + { + "visible": true, + "quality_definition": "creality_base" + }, + "overrides": + { + "gantry_height": { "value": 25 }, "machine_depth": { "default_value": 350 }, - "machine_height": { "default_value": 400 }, - "machine_head_with_fans_polygon": { "default_value": [ + "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 X{machine_width} 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_head_with_fans_polygon": + { + "default_value": [ [-26, 34], [-26, -32], [32, -32], [32, 34] ] }, - - "gantry_height": { "value": 25 }, - + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "Creality Ender-5 Plus" }, + "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\nM420 S1 Z2 ;Enable ABL using saved Mesh and Fade Height\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_width": { "default_value": 350 }, "speed_print": { "value": 80.0 } - - }, - "metadata": { - "quality_definition": "creality_base", - "visible": true } } \ No newline at end of file diff --git a/resources/definitions/creality_ender6.def.json b/resources/definitions/creality_ender6.def.json index 599d3beb86..7001589aaf 100644 --- a/resources/definitions/creality_ender6.def.json +++ b/resources/definitions/creality_ender6.def.json @@ -1,29 +1,30 @@ -{ - "name": "Creality Ender-6", - "version": 2, - "inherits": "creality_base", - "overrides": { - "machine_name": { "default_value": "Creality Ender-6" }, - "machine_start_gcode": { "default_value": "\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\nG28 X Y ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }, - "machine_width": { "default_value": 260 }, - "machine_depth": { "default_value": 260 }, - "machine_height": { "default_value": 400 }, - "machine_head_with_fans_polygon": { "default_value": [ - [-26, 34], - [-26, -32], - [32, -32], - [32, 34] - ] - }, - - "gantry_height": { "value": 25 }, - - "speed_print": { "value": 80.0 } - - }, - "metadata": { - "quality_definition": "creality_base", - "visible": true - } -} +{ + "version": 2, + "name": "Creality Ender-6", + "inherits": "creality_base", + "metadata": + { + "visible": true, + "quality_definition": "creality_base" + }, + "overrides": + { + "gantry_height": { "value": 25 }, + "machine_depth": { "default_value": 260 }, + "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positioning\n\nG28 X Y ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-26, 34], + [-26, -32], + [32, -32], + [32, 34] + ] + }, + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "Creality Ender-6" }, + "machine_start_gcode": { "default_value": "\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_width": { "default_value": 260 }, + "speed_print": { "value": 80.0 } + } +} \ No newline at end of file diff --git a/resources/definitions/creality_sermoond1.def.json b/resources/definitions/creality_sermoond1.def.json index c09019c6f4..138be79478 100644 --- a/resources/definitions/creality_sermoond1.def.json +++ b/resources/definitions/creality_sermoond1.def.json @@ -1,25 +1,27 @@ -{ - "name": "Creality Sermoon D1", - "version": 2, - "inherits": "creality_base", - "overrides": { - "machine_name": { "default_value": "Creality Sermoon D1" }, - "machine_width": { "default_value": 280 }, - "machine_depth": { "default_value": 260 }, - "machine_height": { "default_value": 310 }, - "machine_head_with_fans_polygon": { "default_value": [ - [-26, 34], - [-26, -32], - [32, -32], - [32, 34] - ] - }, - - "gantry_height": { "value": 25 } - - }, - "metadata": { - "quality_definition": "creality_base", - "visible": true - } -} +{ + "version": 2, + "name": "Creality Sermoon D1", + "inherits": "creality_base", + "metadata": + { + "visible": true, + "quality_definition": "creality_base" + }, + "overrides": + { + "gantry_height": { "value": 25 }, + "machine_depth": { "default_value": 260 }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-26, 34], + [-26, -32], + [32, -32], + [32, 34] + ] + }, + "machine_height": { "default_value": 310 }, + "machine_name": { "default_value": "Creality Sermoon D1" }, + "machine_width": { "default_value": 280 } + } +} \ No newline at end of file diff --git a/resources/definitions/creasee_cs20.def.json b/resources/definitions/creasee_cs20.def.json index ab30f3dd1c..fe0b9a311e 100644 --- a/resources/definitions/creasee_cs20.def.json +++ b/resources/definitions/creasee_cs20.def.json @@ -2,31 +2,19 @@ "version": 2, "name": "Creasee CS20", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "manufacturer": "Creasee", - "machine_extruder_trains": - { - "0": "creasee_extruder_0" - } + "machine_extruder_trains": { "0": "creasee_extruder_0" } }, - - "overrides": { + "overrides": + { + "machine_depth": { "default_value": 220 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" }, + "machine_height": { "default_value": 250 }, "machine_name": { "default_value": "Creasee CS20" }, - "machine_width": { - "default_value": 220 - }, - "machine_depth": { - "default_value": 220 - }, - "machine_height": { - "default_value": 250 - }, - "machine_start_gcode": { - "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" - }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" - } + "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" }, + "machine_width": { "default_value": 220 } } -} +} \ No newline at end of file diff --git a/resources/definitions/creasee_cs30.def.json b/resources/definitions/creasee_cs30.def.json index 7d6a5090bb..d1d61800b8 100644 --- a/resources/definitions/creasee_cs30.def.json +++ b/resources/definitions/creasee_cs30.def.json @@ -2,31 +2,19 @@ "version": 2, "name": "Creasee CS30", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "manufacturer": "Creasee", - "machine_extruder_trains": - { - "0": "creasee_extruder_1" - } + "machine_extruder_trains": { "0": "creasee_extruder_1" } }, - - "overrides": { + "overrides": + { + "machine_depth": { "default_value": 300 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" }, + "machine_height": { "default_value": 400 }, "machine_name": { "default_value": "Creasee CS30" }, - "machine_width": { - "default_value": 300 - }, - "machine_depth": { - "default_value": 300 - }, - "machine_height": { - "default_value": 400 - }, - "machine_start_gcode": { - "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" - }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" - } + "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" }, + "machine_width": { "default_value": 300 } } -} +} \ No newline at end of file diff --git a/resources/definitions/creasee_cs50spro.def.json b/resources/definitions/creasee_cs50spro.def.json index a2be3d0a52..3810177637 100644 --- a/resources/definitions/creasee_cs50spro.def.json +++ b/resources/definitions/creasee_cs50spro.def.json @@ -2,31 +2,19 @@ "version": 2, "name": "Creasee CS50s Pro", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "manufacturer": "Creasee", - "machine_extruder_trains": - { - "0": "creasee_cs50spro_extruder" - } + "machine_extruder_trains": { "0": "creasee_cs50spro_extruder" } }, - - "overrides": { + "overrides": + { + "machine_depth": { "default_value": 500 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" }, + "machine_height": { "default_value": 600 }, "machine_name": { "default_value": "Creasee CS50s Pro" }, - "machine_width": { - "default_value": 500 - }, - "machine_depth": { - "default_value": 500 - }, - "machine_height": { - "default_value": 600 - }, - "machine_start_gcode": { - "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" - }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" - } + "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" }, + "machine_width": { "default_value": 500 } } -} +} \ No newline at end of file diff --git a/resources/definitions/creasee_phoenix.def.json b/resources/definitions/creasee_phoenix.def.json index 05e134b6b8..e97c580ec7 100644 --- a/resources/definitions/creasee_phoenix.def.json +++ b/resources/definitions/creasee_phoenix.def.json @@ -2,31 +2,19 @@ "version": 2, "name": "Creasee Phoenix", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "manufacturer": "Creasee", - "machine_extruder_trains": - { - "0": "creasee_phoenix_extruder" - } + "machine_extruder_trains": { "0": "creasee_phoenix_extruder" } }, - - "overrides": { + "overrides": + { + "machine_depth": { "default_value": 350 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" }, + "machine_height": { "default_value": 350 }, "machine_name": { "default_value": "Creasee Phoenix" }, - "machine_width": { - "default_value": 350 - }, - "machine_depth": { - "default_value": 350 - }, - "machine_height": { - "default_value": 350 - }, - "machine_start_gcode": { - "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" - }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" - } + "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" }, + "machine_width": { "default_value": 350 } } -} +} \ No newline at end of file diff --git a/resources/definitions/creasee_skywalker.def.json b/resources/definitions/creasee_skywalker.def.json index 3120e6b116..32706c4a8c 100644 --- a/resources/definitions/creasee_skywalker.def.json +++ b/resources/definitions/creasee_skywalker.def.json @@ -2,31 +2,19 @@ "version": 2, "name": "Creasee Skywalker", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "manufacturer": "Creasee", - "machine_extruder_trains": - { - "0": "creasee_skywalker_extruder" - } + "machine_extruder_trains": { "0": "creasee_skywalker_extruder" } }, - - "overrides": { + "overrides": + { + "machine_depth": { "default_value": 300 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" }, + "machine_height": { "default_value": 400 }, "machine_name": { "default_value": "Creasee Skywalker" }, - "machine_width": { - "default_value": 300 - }, - "machine_depth": { - "default_value": 300 - }, - "machine_height": { - "default_value": 400 - }, - "machine_start_gcode": { - "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" - }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84" - } + "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" }, + "machine_width": { "default_value": 300 } } -} +} \ No newline at end of file diff --git a/resources/definitions/creatable_d3.def.json b/resources/definitions/creatable_d3.def.json index a95fe44ff1..1c26c2ab86 100644 --- a/resources/definitions/creatable_d3.def.json +++ b/resources/definitions/creatable_d3.def.json @@ -2,41 +2,35 @@ "version": 2, "name": "Creatable D3", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Creatable Labs", "manufacturer": "Ateam Ventures Co. Ltd.", "file_formats": "text/x-gcode", "platform": "rostock_platform.3mf", - "machine_extruder_trains": - { - "0": "creatable_d3_extruder_0" - } + "machine_extruder_trains": { "0": "creatable_d3_extruder_0" } }, - - "overrides": { - "machine_name": { "default_value": "Creatable D3" }, - "machine_center_is_zero": { "default_value": true }, - "machine_gcode_flavor": { "default_value": "RepRap (RepRap)" }, - "machine_width": { "default_value": 250 }, - "machine_height": { "default_value": 200 }, - "machine_depth": { "default_value": 250 }, - "machine_heated_bed": { "default_value": true }, - "machine_shape": { "default_value": "elliptic" }, - "machine_max_feedrate_z": { "default_value": 300 }, - "gantry_height": {"value": "43"}, + "overrides": + { + "gantry_height": { "value": "43" }, "layer_height": { "default_value": 0.1 }, + "machine_center_is_zero": { "default_value": true }, + "machine_depth": { "default_value": 250 }, + "machine_end_gcode": { "default_value": "M400\nG28\nM104 S0\nM140 S0\nM107\nG92 E0\nG1 E-32 F300\nM84\nG90" }, + "machine_gcode_flavor": { "default_value": "RepRap (RepRap)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 200 }, + "machine_max_feedrate_z": { "default_value": 300 }, + "machine_name": { "default_value": "Creatable D3" }, + "machine_shape": { "default_value": "elliptic" }, + "machine_start_gcode": { "default_value": "G21\nG90\nM82\nM106 S255\nG28\nG92 E0\nG1 Z100 F5000\nM190 S50\nM109 S200\nG1 X-135\nG1 Z0.3\nG92 E-32\nG1 E0 F1000\nG1 E50 F200\nG1 F1000\nG1 X-125\nG92 E0" }, + "machine_width": { "default_value": 250 }, "relative_extrusion": { "value": "False" }, + "retraction_amount": { "default_value": 4.5 }, "retraction_combing": { "value": "'off'" }, "retraction_hop_enabled": { "default_value": true }, "retraction_hop_only_when_collides": { "default_value": false }, - "retraction_speed": { "default_value": 100 }, - "retraction_amount": { "default_value": 4.5 }, - "machine_start_gcode": { - "default_value": "G21\nG90\nM82\nM106 S255\nG28\nG92 E0\nG1 Z100 F5000\nM190 S50\nM109 S200\nG1 X-135\nG1 Z0.3\nG92 E-32\nG1 E0 F1000\nG1 E50 F200\nG1 F1000\nG1 X-125\nG92 E0" - }, - "machine_end_gcode": { - "default_value": "M400\nG28\nM104 S0\nM140 S0\nM107\nG92 E0\nG1 E-32 F300\nM84\nG90" - } + "retraction_speed": { "default_value": 100 } } -} +} \ No newline at end of file diff --git a/resources/definitions/cremaker_common.def.json b/resources/definitions/cremaker_common.def.json index acabcac92a..a34f06728c 100644 --- a/resources/definitions/cremaker_common.def.json +++ b/resources/definitions/cremaker_common.def.json @@ -1,58 +1,57 @@ { - "version": 2, - "name": "cremaker common", - "inherits": "fdmprinter", - "metadata": { - "visible": false, - "author": "Joyplace", - "manufacturer": "JOYPLACE CO., LTD.", - "file_formats": "text/x-gcode", - "icon": "icon_ultimaker2", - "has_materials": true, - "machine_extruder_trains": { - "0": "cremaker_extruder_0" + "version": 2, + "name": "cremaker common", + "inherits": "fdmprinter", + "metadata": + { + "visible": false, + "author": "Joyplace", + "manufacturer": "JOYPLACE CO., LTD.", + "file_formats": "text/x-gcode", + "has_materials": true, + "icon": "icon_ultimaker2", + "machine_extruder_trains": { "0": "cremaker_extruder_0" } + }, + "overrides": + { + "acceleration_enabled": { "value": true }, + "acceleration_infill": { "value": 1250 }, + "acceleration_layer_0": { "value": 1000 }, + "acceleration_print": { "value": 1250 }, + "acceleration_print_layer_0": { "value": 1000 }, + "acceleration_travel": { "value": 1250 }, + "acceleration_travel_layer_0": { "value": 1000 }, + "acceleration_wall": { "value": 800 }, + "acceleration_wall_0": { "value": 800 }, + "acceleration_wall_x": { "value": 800 }, + "adhesion_type": { "value": "'skirt'" }, + "gantry_height": { "value": 28 }, + "hole_xy_offset": { "value": 0.15 }, + "layer_height": { "value": 0.2 }, + "layer_height_0": { "value": 0.3 }, + "machine_acceleration": { "value": 1250 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_max_acceleration_z": { "value": 10 }, + "machine_max_feedrate_e": { "value": 120 }, + "machine_max_feedrate_z": { "value": 12 }, + "machine_max_jerk_e": { "value": 5.0 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.3 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "material_print_temperature_layer_0": { "value": "default_material_bed_temperature + 15" }, + "optimize_wall_printing_order": { "value": true }, + "relative_extrusion": { "value": true }, + "retraction_amount": { "value": 1.2 }, + "retraction_combing": { "value": "'infill'" }, + "retraction_hop": { "value": 0.3 }, + "retraction_hop_enabled": { "value": true }, + "retraction_hop_only_when_collides": { "value": true }, + "retraction_speed": { "value": 40 }, + "speed_layer_0": { "value": 25 }, + "speed_travel": { "value": 100 }, + "xy_offset": { "value": 0.1 }, + "xy_offset_layer_0": { "value": -0.1 } } - }, - - "overrides": { - "machine_heated_bed": { "default_value": true }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "layer_height": { "value": 0.2 }, - "layer_height_0": { "value": 0.3 }, - "optimize_wall_printing_order": { "value": true }, - "xy_offset": { "value": 0.1 }, - "xy_offset_layer_0": { "value": -0.1 }, - "hole_xy_offset": { "value": 0.15 }, - "material_print_temperature_layer_0": { "value": "default_material_bed_temperature + 15" }, - "speed_travel": { "value": 100 }, - "speed_layer_0": { "value": 25 }, - "acceleration_enabled": { "value": true }, - "acceleration_print": { "value": 1250 }, - "acceleration_infill": { "value": 1250 }, - "acceleration_wall": { "value": 800 }, - "acceleration_wall_0": { "value": 800 }, - "acceleration_wall_x": { "value": 800 }, - "acceleration_travel": { "value": 1250 }, - "acceleration_layer_0": { "value": 1000 }, - "acceleration_print_layer_0": { "value": 1000 }, - "acceleration_travel_layer_0": { "value": 1000 }, - "retraction_amount": { "value": 1.2 }, - "retraction_speed": { "value": 40 }, - "retraction_combing": { "value": "'infill'" }, - "retraction_hop_enabled": { "value": true }, - "retraction_hop_only_when_collides": { "value": true }, - "retraction_hop": { "value": 0.3 }, - "adhesion_type": { "value": "'skirt'" }, - "relative_extrusion": { "value": true }, - "gantry_height": { "value": 28 }, - "machine_max_feedrate_z": { "value": 12 }, - "machine_max_feedrate_e": { "value": 120 }, - "machine_max_acceleration_z": { "value": 10 }, - "machine_acceleration": { "value": 1250 }, - "machine_max_jerk_xy": { "value": 10 }, - "machine_max_jerk_z": { "value": 0.3 }, - "machine_max_jerk_e": { "value": 5.0 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" } - } -} +} \ No newline at end of file diff --git a/resources/definitions/cremaker_m_v1.def.json b/resources/definitions/cremaker_m_v1.def.json index d4cd65a6da..70c277ba45 100644 --- a/resources/definitions/cremaker_m_v1.def.json +++ b/resources/definitions/cremaker_m_v1.def.json @@ -1,40 +1,38 @@ { - "version": 2, - "name": "Cremaker M V1", - "inherits": "cremaker_common", - "metadata": { - "visible": true, - "platform": "cremaker_platform_200.obj" - }, - - "overrides": { - "machine_name": { "default_value": "Cremaker M V1" }, - "machine_width": { "default_value": 200 }, - "machine_depth": { "default_value": 200 }, - "machine_height": { "default_value": 260 }, - "initial_layer_line_width_factor": { "default_value": 110.0 }, - "machine_head_with_fans_polygon": { - "default_value": [ - [ -35, 48 ], - [ 54, 48 ], - [ 54, -67 ], - [ -35, -67 ] - ] + "version": 2, + "name": "Cremaker M V1", + "inherits": "cremaker_common", + "metadata": + { + "visible": true, + "platform": "cremaker_platform_200.obj" }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "G28\nG1 Z5.0 F6000\nG1 X2 Y5 F3000\nG1 Z0.3\nG92 E0\nG1 Y100 E10 F600\nG92 E0" - }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28 X0 Y180\nM84" - }, - "jerk_enabled": { "value": true }, - "jerk_print": { "value": 8 }, - "jerk_infill": { "value": 8 }, - "jerk_wall": { "value": 8 }, - "jerk_wall_0": { "value": 8 }, - "jerk_wall_x": { "value": 8 }, - "jerk_travel": { "value": 10 }, - "jerk_layer_0": { "value": 8 } - } -} + "overrides": + { + "initial_layer_line_width_factor": { "default_value": 110.0 }, + "jerk_enabled": { "value": true }, + "jerk_infill": { "value": 8 }, + "jerk_layer_0": { "value": 8 }, + "jerk_print": { "value": 8 }, + "jerk_travel": { "value": 10 }, + "jerk_wall": { "value": 8 }, + "jerk_wall_0": { "value": 8 }, + "jerk_wall_x": { "value": 8 }, + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28 X0 Y180\nM84" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-35, 48], + [54, 48], + [54, -67], + [-35, -67] + ] + }, + "machine_height": { "default_value": 260 }, + "machine_name": { "default_value": "Cremaker M V1" }, + "machine_start_gcode": { "default_value": "G28\nG1 Z5.0 F6000\nG1 X2 Y5 F3000\nG1 Z0.3\nG92 E0\nG1 Y100 E10 F600\nG92 E0" }, + "machine_width": { "default_value": 200 } + } +} \ No newline at end of file diff --git a/resources/definitions/cremaker_m_v2.def.json b/resources/definitions/cremaker_m_v2.def.json index 2d760b2aaa..c441095b60 100644 --- a/resources/definitions/cremaker_m_v2.def.json +++ b/resources/definitions/cremaker_m_v2.def.json @@ -1,35 +1,32 @@ { - "version": 2, - "name": "Cremaker M V2", - "inherits": "cremaker_common", - "metadata": { - "visible": true, - "platform": "cremaker_platform_220.obj" - }, - - "overrides": { - "machine_name": { "default_value": "Cremaker M V2" }, - "machine_width": { "default_value": 220 }, - "machine_depth": { "default_value": 220 }, - "machine_height": { "default_value": 260 }, - "initial_layer_line_width_factor": { "default_value": 100.0 }, - "machine_head_with_fans_polygon": { - "default_value": [ - [ -35, 48 ], - [ 54, 48 ], - [ 54, -67 ], - [ -35, -67 ] - ] + "version": 2, + "name": "Cremaker M V2", + "inherits": "cremaker_common", + "metadata": + { + "visible": true, + "platform": "cremaker_platform_220.obj" }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "G28\nG29\nG1 Z5.0 F6000\nG1 X2 Y5 Z0.3 F3000\nG92 E0\nG1 Y100 E10 F1500\nG0 X2.3 F3000\nG1 Y20 E8.5 F1500\nG92 E0\nG1 F2400 E-2" - }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28 X0 Y200\nM84" - }, - - "cool_fan_speed": { "value": 50 }, - "jerk_enabled": { "value": false } - } -} + "overrides": + { + "cool_fan_speed": { "value": 50 }, + "initial_layer_line_width_factor": { "default_value": 100.0 }, + "jerk_enabled": { "value": false }, + "machine_depth": { "default_value": 220 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28 X0 Y200\nM84" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-35, 48], + [54, 48], + [54, -67], + [-35, -67] + ] + }, + "machine_height": { "default_value": 260 }, + "machine_name": { "default_value": "Cremaker M V2" }, + "machine_start_gcode": { "default_value": "G28\nG29\nG1 Z5.0 F6000\nG1 X2 Y5 Z0.3 F3000\nG92 E0\nG1 Y100 E10 F1500\nG0 X2.3 F3000\nG1 Y20 E8.5 F1500\nG92 E0\nG1 F2400 E-2" }, + "machine_width": { "default_value": 220 } + } +} \ No newline at end of file diff --git a/resources/definitions/cremaker_s_v1.def.json b/resources/definitions/cremaker_s_v1.def.json index 101d82fac8..d8f3ea4f1a 100644 --- a/resources/definitions/cremaker_s_v1.def.json +++ b/resources/definitions/cremaker_s_v1.def.json @@ -1,32 +1,30 @@ { - "version": 2, - "name": "Cremaker S V1", - "inherits": "cremaker_common", - "metadata": { - "visible": true, - "platform": "cremaker_platform_200.obj" - }, - - "overrides": { - "machine_name": { "default_value": "Cremaker S V1" }, - "machine_width": { "default_value": 200 }, - "machine_depth": { "default_value": 200 }, - "machine_height": { "default_value": 160 }, - "initial_layer_line_width_factor": { "default_value": 110.0 }, - "machine_head_with_fans_polygon": { - "default_value": [ - [ -39, 45 ], - [ 23, 45 ], - [ 23, -33 ], - [ -39, -33 ] - ] + "version": 2, + "name": "Cremaker S V1", + "inherits": "cremaker_common", + "metadata": + { + "visible": true, + "platform": "cremaker_platform_200.obj" }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "G28\nG1 Z5.0 F6000\nG1 X2 Y5 F3000\nG1 Z0.3\nG92 E0\nG1 Y100 E10 F600\nG92 E0" - }, - "machine_end_gcode": { - "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off heatbed\nG92 E1\nG1 E-1 F300\nG28 X0 Y180\nM84" + "overrides": + { + "initial_layer_line_width_factor": { "default_value": 110.0 }, + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off heatbed\nG92 E1\nG1 E-1 F300\nG28 X0 Y180\nM84" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-39, 45], + [23, 45], + [23, -33], + [-39, -33] + ] + }, + "machine_height": { "default_value": 160 }, + "machine_name": { "default_value": "Cremaker S V1" }, + "machine_start_gcode": { "default_value": "G28\nG1 Z5.0 F6000\nG1 X2 Y5 F3000\nG1 Z0.3\nG92 E0\nG1 Y100 E10 F600\nG92 E0" }, + "machine_width": { "default_value": 200 } } - } -} +} \ No newline at end of file diff --git a/resources/definitions/cubicon_3dp_110f.def.json b/resources/definitions/cubicon_3dp_110f.def.json index eecfdd5911..4d8255a706 100644 --- a/resources/definitions/cubicon_3dp_110f.def.json +++ b/resources/definitions/cubicon_3dp_110f.def.json @@ -2,39 +2,27 @@ "version": 2, "name": "Cubicon Single", "inherits": "cubicon_common", - "metadata": { + "metadata": + { + "visible": true, "author": "Cubicon R&D Center", "manufacturer": "Cubicon", - "visible": true, "file_formats": "text/x-gcode", - "supports_usb_connection": false, - "machine_extruder_trains": { - "0": "cubicon_3dp_110f_extruder_0" - }, + "machine_extruder_trains": { "0": "cubicon_3dp_110f_extruder_0" }, "platform_offset": [ 0, -32.05, -20 - ] + ], + "supports_usb_connection": false }, - "overrides": { - "machine_name": { - "default_value": "Cubicon Single" - }, - "machine_start_gcode": { - "default_value": "M911 3DP-110F\nM201 X400 Y400\nM202 X400 Y400\nG28 ; Home\nG1 Z15.0 F6000 ;move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" - }, - "machine_width": { - "default_value": 240 - }, - "machine_depth": { - "default_value": 190 - }, - "machine_height": { - "default_value": 200 - }, - "material_bed_temp_wait": { - "default_value": true - } + "overrides": + { + "machine_depth": { "default_value": 190 }, + "machine_height": { "default_value": 200 }, + "machine_name": { "default_value": "Cubicon Single" }, + "machine_start_gcode": { "default_value": "M911 3DP-110F\nM201 X400 Y400\nM202 X400 Y400\nG28 ; Home\nG1 Z15.0 F6000 ;move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" }, + "machine_width": { "default_value": 240 }, + "material_bed_temp_wait": { "default_value": true } } } \ No newline at end of file diff --git a/resources/definitions/cubicon_3dp_210f.def.json b/resources/definitions/cubicon_3dp_210f.def.json index 5d8ff78487..553d20daf2 100644 --- a/resources/definitions/cubicon_3dp_210f.def.json +++ b/resources/definitions/cubicon_3dp_210f.def.json @@ -2,39 +2,27 @@ "version": 2, "name": "Cubicon Style", "inherits": "cubicon_common", - "metadata": { + "metadata": + { + "visible": true, "author": "Cubicon R&D Center", "manufacturer": "Cubicon", - "visible": true, "file_formats": "text/x-gcode", - "supports_usb_connection": false, - "machine_extruder_trains": { - "0": "cubicon_3dp_210f_extruder_0" - }, + "machine_extruder_trains": { "0": "cubicon_3dp_210f_extruder_0" }, "platform_offset": [ 0, -18.8, 0 - ] + ], + "supports_usb_connection": false }, - "overrides": { - "machine_name": { - "default_value": "Cubicon Style" - }, - "machine_start_gcode": { - "default_value": "M911 3DP-210F\nM201 X400 Y400\nM202 X400 Y400\nG28 ; Home\nG1 Z15.0 F6000 ;move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" - }, - "machine_width": { - "default_value": 150 - }, - "machine_depth": { - "default_value": 150 - }, - "machine_height": { - "default_value": 150 - }, - "material_bed_temp_wait":{ - "default_value": false - } + "overrides": + { + "machine_depth": { "default_value": 150 }, + "machine_height": { "default_value": 150 }, + "machine_name": { "default_value": "Cubicon Style" }, + "machine_start_gcode": { "default_value": "M911 3DP-210F\nM201 X400 Y400\nM202 X400 Y400\nG28 ; Home\nG1 Z15.0 F6000 ;move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" }, + "machine_width": { "default_value": 150 }, + "material_bed_temp_wait": { "default_value": false } } } \ No newline at end of file diff --git a/resources/definitions/cubicon_3dp_310f.def.json b/resources/definitions/cubicon_3dp_310f.def.json index 1dc78f0ebf..d354c3956c 100644 --- a/resources/definitions/cubicon_3dp_310f.def.json +++ b/resources/definitions/cubicon_3dp_310f.def.json @@ -2,39 +2,27 @@ "version": 2, "name": "Cubicon Single Plus", "inherits": "cubicon_common", - "metadata": { + "metadata": + { + "visible": true, "author": "Cubicon R&D Center", "manufacturer": "Cubicon", - "visible": true, "file_formats": "text/x-gcode", - "supports_usb_connection": false, - "machine_extruder_trains": { - "0": "cubicon_3dp_310f_extruder_0" - }, + "machine_extruder_trains": { "0": "cubicon_3dp_310f_extruder_0" }, "platform_offset": [ 0, -32.05, -20 - ] + ], + "supports_usb_connection": false }, - "overrides": { - "machine_name": { - "default_value": "Cubicon Single Plus" - }, - "machine_start_gcode": { - "default_value": "M911 3DP-310F\nM201 X400 Y400\nM202 X400 Y400\nG28 ; Home\nG1 Z15.0 F6000 ;move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" - }, - "machine_width": { - "default_value": 240 - }, - "machine_depth": { - "default_value": 190 - }, - "machine_height": { - "default_value": 200 - }, - "material_bed_temp_wait": { - "default_value": true - } + "overrides": + { + "machine_depth": { "default_value": 190 }, + "machine_height": { "default_value": 200 }, + "machine_name": { "default_value": "Cubicon Single Plus" }, + "machine_start_gcode": { "default_value": "M911 3DP-310F\nM201 X400 Y400\nM202 X400 Y400\nG28 ; Home\nG1 Z15.0 F6000 ;move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" }, + "machine_width": { "default_value": 240 }, + "material_bed_temp_wait": { "default_value": true } } } \ No newline at end of file diff --git a/resources/definitions/cubicon_common.def.json b/resources/definitions/cubicon_common.def.json index f700df7ae6..9fcff9dcec 100644 --- a/resources/definitions/cubicon_common.def.json +++ b/resources/definitions/cubicon_common.def.json @@ -2,51 +2,35 @@ "version": 2, "name": "Cubicon Common", "inherits": "fdmprinter", - "metadata": { + "metadata": + { + "visible": false, "author": "Cubicon R&D Center", - "manufacturer": "Cubicon", - "visible": false + "manufacturer": "Cubicon" }, - "overrides": { - "machine_start_gcode": { - "default_value": "M201 X400 Y400\nM202 X400 Y400\nG28 ; Home\nG1 Z15.0 F6000 ;move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" - }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\nM904\nM117 Print completed! \nM84" - }, - "machine_gcode_flavor": { - "default_value": "Repetier" - }, - "machine_heated_bed": { - "default_value": true - }, - "layer_height": { - "default_value": 0.2 - }, - "layer_height_0": { - "default_value": 0.2 - }, - "adhesion_type": { - "default_value": "raft" - }, - "top_bottom_pattern": { "default_value": "lines" }, - "infill_sparse_density": { "default_value": 20 }, + "overrides": + { + "adhesion_type": { "default_value": "raft" }, + "bottom_thickness": { "value": "top_bottom_thickness * 0.6" }, + "coasting_volume": { "default_value": 0.032 }, + "cool_min_layer_time": { "default_value": 15 }, + "cool_min_layer_time_fan_speed_max": { "default_value": 15 }, "infill_before_walls": { "default_value": false }, - "top_bottom_thickness": { - "default_value": 1.0 - }, - "bottom_thickness": { - "value": "top_bottom_thickness * 0.6" - }, + "infill_sparse_density": { "default_value": 20 }, + "layer_height": { "default_value": 0.2 }, + "layer_height_0": { "default_value": 0.2 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nM904\nM117 Print completed! \nM84" }, + "machine_gcode_flavor": { "default_value": "Repetier" }, + "machine_heated_bed": { "default_value": true }, + "machine_start_gcode": { "default_value": "M201 X400 Y400\nM202 X400 Y400\nG28 ; Home\nG1 Z15.0 F6000 ;move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" }, "material_flow_layer_0": { "default_value": 100 }, "max_skin_angle_for_expansion": { "default_value": 90 }, - "skin_angles": { "default_value": "[135,45]" }, - "coasting_volume": { "default_value": 0.032 }, - "wall_thickness": { "value": "1.2" }, - "cool_min_layer_time_fan_speed_max": { "default_value": 15 }, - "cool_min_layer_time": { "default_value": 15 }, + "retraction_amount": { "default_value": 1.5 }, + "skin_angles": { "default_value": "[135, 45]" }, "support_interface_pattern": { "default_value": "zigzag" }, "support_pattern": { "default_value": "zigzag" }, - "retraction_amount": { "default_value": 1.5 } + "top_bottom_pattern": { "default_value": "lines" }, + "top_bottom_thickness": { "default_value": 1.0 }, + "wall_thickness": { "value": "1.2" } } } \ No newline at end of file diff --git a/resources/definitions/cubicon_dual_pro_a30.def.json b/resources/definitions/cubicon_dual_pro_a30.def.json index 6431c917a5..cec0d04b49 100644 --- a/resources/definitions/cubicon_dual_pro_a30.def.json +++ b/resources/definitions/cubicon_dual_pro_a30.def.json @@ -2,13 +2,14 @@ "version": 2, "name": "Cubicon Dual Pro-A30", "inherits": "cubicon_common", - "metadata": { + "metadata": + { + "visible": true, "author": "Cubicon R&D Center", "manufacturer": "Cubicon", - "visible": true, "file_formats": "text/x-gcode", - "supports_usb_connection": false, - "machine_extruder_trains": { + "machine_extruder_trains": + { "0": "cubicon_dual_pro_a30_extruder_0", "1": "cubicon_dual_pro_a30_extruder_1" }, @@ -16,29 +17,17 @@ 0, 0, 0 - ] + ], + "supports_usb_connection": false }, - "overrides": { - "machine_name": { - "default_value": "Cubicon Dual Pro-A30" - }, - "machine_start_gcode": { - "default_value": "M911 Dual Pro-A30C\nM201 X400 Y400\nM202 X400 Y400\nG28 ; Home\nG1 Z15.0 F6000 ;move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" - }, - "machine_width": { - "default_value": 300 - }, - "machine_depth": { - "default_value": 300 - }, - "machine_height": { - "default_value": 300 - }, - "material_bed_temp_wait":{ - "default_value": false - }, - "machine_extruder_count": { - "default_value": 2 - } + "overrides": + { + "machine_depth": { "default_value": 300 }, + "machine_extruder_count": { "default_value": 2 }, + "machine_height": { "default_value": 300 }, + "machine_name": { "default_value": "Cubicon Dual Pro-A30" }, + "machine_start_gcode": { "default_value": "M911 Dual Pro-A30C\nM201 X400 Y400\nM202 X400 Y400\nG28 ; Home\nG1 Z15.0 F6000 ;move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" }, + "machine_width": { "default_value": 300 }, + "material_bed_temp_wait": { "default_value": false } } -} +} \ No newline at end of file diff --git a/resources/definitions/cubicon_style_neo_a22.def.json b/resources/definitions/cubicon_style_neo_a22.def.json index 01763524a4..ef24120ff2 100644 --- a/resources/definitions/cubicon_style_neo_a22.def.json +++ b/resources/definitions/cubicon_style_neo_a22.def.json @@ -2,39 +2,27 @@ "version": 2, "name": "Cubicon Style Neo-A22", "inherits": "cubicon_common", - "metadata": { + "metadata": + { + "visible": true, "author": "Cubicon R&D Center", "manufacturer": "Cubicon", - "visible": true, "file_formats": "text/x-gcode", - "supports_usb_connection": false, - "machine_extruder_trains": { - "0": "cubicon_style_neo_a22_extruder_0" - }, + "machine_extruder_trains": { "0": "cubicon_style_neo_a22_extruder_0" }, "platform_offset": [ 0, 0, 0 - ] + ], + "supports_usb_connection": false }, - "overrides": { - "machine_name": { - "default_value": "Cubicon Style Neo-A22" - }, - "machine_start_gcode": { - "default_value": "M911 Style Neo-A22\nM201 X400 Y400\nM202 X400 Y400\nG28 ; Home\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" - }, - "machine_width": { - "default_value": 220 - }, - "machine_depth": { - "default_value": 220 - }, - "machine_height": { - "default_value": 220 - }, - "material_bed_temp_wait":{ - "default_value": false - } + "overrides": + { + "machine_depth": { "default_value": 220 }, + "machine_height": { "default_value": 220 }, + "machine_name": { "default_value": "Cubicon Style Neo-A22" }, + "machine_start_gcode": { "default_value": "M911 Style Neo-A22\nM201 X400 Y400\nM202 X400 Y400\nG28 ; Home\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" }, + "machine_width": { "default_value": 220 }, + "material_bed_temp_wait": { "default_value": false } } -} +} \ No newline at end of file diff --git a/resources/definitions/cubicon_style_neo_a31.def.json b/resources/definitions/cubicon_style_neo_a31.def.json index d41b6fc17e..4ca2c99624 100644 --- a/resources/definitions/cubicon_style_neo_a31.def.json +++ b/resources/definitions/cubicon_style_neo_a31.def.json @@ -2,39 +2,27 @@ "version": 2, "name": "Cubicon Style Neo-A31", "inherits": "cubicon_common", - "metadata": { + "metadata": + { + "visible": true, "author": "Cubicon R&D Center", "manufacturer": "Cubicon", - "visible": true, "file_formats": "text/x-gcode", - "supports_usb_connection": false, - "machine_extruder_trains": { - "0": "cubicon_style_neo_a31_extruder_0" - }, + "machine_extruder_trains": { "0": "cubicon_style_neo_a31_extruder_0" }, "platform_offset": [ 0, 0, 0 - ] + ], + "supports_usb_connection": false }, - "overrides": { - "machine_name": { - "default_value": "Cubicon Style Neo-A31" - }, - "machine_start_gcode": { - "default_value": "M911 Style Neo-A31\nM201 X400 Y400\nM202 X400 Y400\nG28 ; Home\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" - }, - "machine_width": { - "default_value": 310 - }, - "machine_depth": { - "default_value": 310 - }, - "machine_height": { - "default_value": 310 - }, - "material_bed_temp_wait":{ - "default_value": false - } + "overrides": + { + "machine_depth": { "default_value": 310 }, + "machine_height": { "default_value": 310 }, + "machine_name": { "default_value": "Cubicon Style Neo-A31" }, + "machine_start_gcode": { "default_value": "M911 Style Neo-A31\nM201 X400 Y400\nM202 X400 Y400\nG28 ; Home\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" }, + "machine_width": { "default_value": 310 }, + "material_bed_temp_wait": { "default_value": false } } -} +} \ No newline at end of file diff --git a/resources/definitions/cubicon_style_plus_a15.def.json b/resources/definitions/cubicon_style_plus_a15.def.json index b7e3dfd123..7e0ddf36d2 100644 --- a/resources/definitions/cubicon_style_plus_a15.def.json +++ b/resources/definitions/cubicon_style_plus_a15.def.json @@ -2,39 +2,27 @@ "version": 2, "name": "Cubicon Style Plus-A15", "inherits": "cubicon_common", - "metadata": { + "metadata": + { + "visible": true, "author": "Cubicon R&D Center", "manufacturer": "Cubicon", - "visible": true, "file_formats": "text/x-gcode", - "supports_usb_connection": false, - "machine_extruder_trains": { - "0": "cubicon_style_plus_a15_extruder_0" - }, + "machine_extruder_trains": { "0": "cubicon_style_plus_a15_extruder_0" }, "platform_offset": [ 0, 0, 0 - ] + ], + "supports_usb_connection": false }, - "overrides": { - "machine_name": { - "default_value": "Cubicon Style Plus-A15" - }, - "machine_start_gcode": { - "default_value": "M911 Style Plus-A15\nM201 X400 Y400\nM202 X400 Y400\nG28 ; Home\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" - }, - "machine_width": { - "default_value": 150 - }, - "machine_depth": { - "default_value": 150 - }, - "machine_height": { - "default_value": 150 - }, - "material_bed_temp_wait":{ - "default_value": false - } + "overrides": + { + "machine_depth": { "default_value": 150 }, + "machine_height": { "default_value": 150 }, + "machine_name": { "default_value": "Cubicon Style Plus-A15" }, + "machine_start_gcode": { "default_value": "M911 Style Plus-A15\nM201 X400 Y400\nM202 X400 Y400\nG28 ; Home\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" }, + "machine_width": { "default_value": 150 }, + "material_bed_temp_wait": { "default_value": false } } -} +} \ No newline at end of file diff --git a/resources/definitions/custom.def.json b/resources/definitions/custom.def.json index 88cc3c8821..e8f2d7f3ac 100644 --- a/resources/definitions/custom.def.json +++ b/resources/definitions/custom.def.json @@ -2,11 +2,13 @@ "version": 2, "name": "Custom FFF printer", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Ultimaker", "manufacturer": "Custom", "file_formats": "text/x-gcode", + "first_start_actions": [ "MachineSettingsAction" ], "has_materials": true, "machine_extruder_trains": { @@ -18,7 +20,6 @@ "5": "custom_extruder_6", "6": "custom_extruder_7", "7": "custom_extruder_8" - }, - "first_start_actions": ["MachineSettingsAction"] + } } -} +} \ No newline at end of file diff --git a/resources/definitions/dagoma_disco.def.json b/resources/definitions/dagoma_disco.def.json index 89773d9c0e..59c1045fa3 100644 --- a/resources/definitions/dagoma_disco.def.json +++ b/resources/definitions/dagoma_disco.def.json @@ -1,26 +1,24 @@ { - "name": "Dagoma Disco", "version": 2, + "name": "Dagoma Disco", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": false, "author": "Dagoma", "manufacturer": "Dagoma" }, - "overrides": { - "machine_width": { - "default_value": 205 - }, - "machine_height": { - "default_value": 205 - }, - "machine_depth": { - "default_value": 205 - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_head_with_fans_polygon": { + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "default_material_print_temperature": { "default_value": 205 }, + "gantry_height": { "value": "10" }, + "layer_height_0": { "default_value": 0.26 }, + "machine_acceleration": { "value": 3000 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 205 }, + "machine_head_with_fans_polygon": + { "default_value": [ [-17, -70], [-17, 40], @@ -28,52 +26,29 @@ [17, -70] ] }, - "gantry_height": { - "value": "10" - }, - "default_material_print_temperature": { - "default_value": 205 - }, - "material_standby_temperature": { - "default_value": 90 - }, - "speed_print": { - "default_value": 60 - }, - "retraction_amount": { - "default_value": 3.5 - }, - "retraction_speed": { - "default_value": 50 - }, - "adhesion_type": { - "default_value": "skirt" - }, - "skirt_line_count": { - "default_value": 2 - }, - "layer_height_0": { - "default_value": 0.26 - }, - "top_bottom_thickness": { - "default_value": 1 - }, - "machine_max_feedrate_x": { "default_value": 500 }, - "machine_max_feedrate_y": { "default_value": 500 }, - "machine_max_feedrate_z": { "default_value": 4 }, - "machine_max_feedrate_e": { "default_value": 170 }, + "machine_height": { "default_value": 205 }, + "machine_max_acceleration_e": { "value": 10000 }, "machine_max_acceleration_x": { "value": 3000 }, "machine_max_acceleration_y": { "value": 1000 }, "machine_max_acceleration_z": { "value": 20 }, - "machine_max_acceleration_e": { "value": 10000 }, - "machine_acceleration": { "value": 3000 }, + "machine_max_feedrate_e": { "default_value": 170 }, + "machine_max_feedrate_x": { "default_value": 500 }, + "machine_max_feedrate_y": { "default_value": 500 }, + "machine_max_feedrate_z": { "default_value": 4 }, + "machine_max_jerk_e": { "value": 5 }, "machine_max_jerk_xy": { "value": 20 }, "machine_max_jerk_z": { "value": 0.4 }, - "machine_max_jerk_e": { "value": 5 }, + "machine_steps_per_mm_e": { "default_value": 98 }, "machine_steps_per_mm_x": { "default_value": 80 }, "machine_steps_per_mm_y": { "default_value": 80 }, "machine_steps_per_mm_z": { "default_value": 2560 }, - "machine_steps_per_mm_e": { "default_value": 98 }, - "speed_z_hop": {"default_value": 4} + "machine_width": { "default_value": 205 }, + "material_standby_temperature": { "default_value": 90 }, + "retraction_amount": { "default_value": 3.5 }, + "retraction_speed": { "default_value": 50 }, + "skirt_line_count": { "default_value": 2 }, + "speed_print": { "default_value": 60 }, + "speed_z_hop": { "default_value": 4 }, + "top_bottom_thickness": { "default_value": 1 } } -} +} \ No newline at end of file diff --git a/resources/definitions/dagoma_discoeasy200.def.json b/resources/definitions/dagoma_discoeasy200.def.json index 16ce5585e4..53736dac28 100644 --- a/resources/definitions/dagoma_discoeasy200.def.json +++ b/resources/definitions/dagoma_discoeasy200.def.json @@ -1,34 +1,29 @@ { - "name": "Dagoma DiscoEasy200", "version": 2, + "name": "Dagoma DiscoEasy200", "inherits": "dagoma_disco", - "metadata": { + "metadata": + { "visible": true, "author": "Dagoma", "manufacturer": "Dagoma", "file_formats": "text/x-gcode", "platform": "dagoma_discoeasy200.3mf", - "platform_offset": [0, -57, -39], "has_machine_quality": true, "has_materials": true, - "preferred_material": "chromatik_pla", - "machine_extruder_trains": - { - "0": "dagoma_discoeasy200_extruder" - } + "machine_extruder_trains": { "0": "dagoma_discoeasy200_extruder" }, + "platform_offset": [ + 0, + -57, + -39 + ], + "preferred_material": "chromatik_pla" }, - "overrides": { - "machine_name": { - "default_value": "Dagoma DiscoEasy200" - }, - "machine_extruder_count": { - "default_value": 1 - }, - "machine_start_gcode": { - "default_value": ";Begin Start Gcode for Dagoma DiscoEasy 200\n;Sliced: {date} {time}\n;Initial extruder: {initial_extruder_nr}\n\nG90 ;Absolute positioning\nM106 S255 ;Fan on full\nG28 X Y ;Home stop X Y\nG1 X100 ;Centre back during cooldown in case of oozing\nM109 R{material_standby_temperature} ;Cooldown in case too hot\nG28 ;Centre\nG29 ;Auto-level\nM104 S{material_print_temperature_layer_0} ;Pre-heat\nM107 ;Fan off\nG0 X100 Y5 Z0.5 ;Front centre for degunk\nM109 S{material_print_temperature_layer_0} ;Wait for initial temp\nM83 ;E Relative\nG1 E10 F200 ;Degunk\nG1 E-3 F5000 ;Retract\nG0 Z3 ;Withdraw\nM82 ;E absolute\nG92 E0 ;E reset\nG1 F6000 ;Set feedrate\n\n;Finish Start Gcode for Dagoma DiscoEasy 200\n" - }, - "machine_end_gcode": { - "default_value": ";Begin End Gcode for Dagoma DiscoEasy 200\n\nM106 S255 ;Fan on full\nM104 S0 ;Cool hotend\nM140 S0 ;Cool heated bed\nG91 ;Relative positioning\nG1 E-3 F5000 ;Retract filament to stop oozing\nG0 Z+3 ;Withdraw\nG90 ;Absolute positioning\nG28 X Y ;Home\nM109 R{material_standby_temperature} ;Wait until head has cooled to standby temp\nM107 ;Fan off\nM18 ;Stepper motors off\n\n;Finish End Gcode for Dagoma DiscoEasy 200\n" - } + "overrides": + { + "machine_end_gcode": { "default_value": ";Begin End Gcode for Dagoma DiscoEasy 200\n\nM106 S255 ;Fan on full\nM104 S0 ;Cool hotend\nM140 S0 ;Cool heated bed\nG91 ;Relative positioning\nG1 E-3 F5000 ;Retract filament to stop oozing\nG0 Z+3 ;Withdraw\nG90 ;Absolute positioning\nG28 X Y ;Home\nM109 R{material_standby_temperature} ;Wait until head has cooled to standby temp\nM107 ;Fan off\nM18 ;Stepper motors off\n\n;Finish End Gcode for Dagoma DiscoEasy 200\n" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_name": { "default_value": "Dagoma DiscoEasy200" }, + "machine_start_gcode": { "default_value": ";Begin Start Gcode for Dagoma DiscoEasy 200\n;Sliced: {date} {time}\n;Initial extruder: {initial_extruder_nr}\n\nG90 ;Absolute positioning\nM106 S255 ;Fan on full\nG28 X Y ;Home stop X Y\nG1 X100 ;Centre back during cooldown in case of oozing\nM109 R{material_standby_temperature} ;Cooldown in case too hot\nG28 ;Centre\nG29 ;Auto-level\nM104 S{material_print_temperature_layer_0} ;Pre-heat\nM107 ;Fan off\nG0 X100 Y5 Z0.5 ;Front centre for degunk\nM109 S{material_print_temperature_layer_0} ;Wait for initial temp\nM83 ;E Relative\nG1 E10 F200 ;Degunk\nG1 E-3 F5000 ;Retract\nG0 Z3 ;Withdraw\nM82 ;E absolute\nG92 E0 ;E reset\nG1 F6000 ;Set feedrate\n\n;Finish Start Gcode for Dagoma DiscoEasy 200\n" } } -} +} \ No newline at end of file diff --git a/resources/definitions/dagoma_discoeasy200_bicolor.def.json b/resources/definitions/dagoma_discoeasy200_bicolor.def.json index 4786c03fc2..f91ddfb58d 100644 --- a/resources/definitions/dagoma_discoeasy200_bicolor.def.json +++ b/resources/definitions/dagoma_discoeasy200_bicolor.def.json @@ -1,38 +1,34 @@ { - "name": "Dagoma DiscoEasy200 Bicolor", "version": 2, + "name": "Dagoma DiscoEasy200 Bicolor", "inherits": "dagoma_disco", - "metadata": { + "metadata": + { "visible": true, "author": "Dagoma", "manufacturer": "Dagoma", "file_formats": "text/x-gcode", "platform": "dagoma_discoeasy200_bicolor.3mf", - "platform_offset": [0, -57.3, -11], "has_machine_quality": true, "has_materials": true, - "preferred_material": "chromatik_pla", "machine_extruder_trains": { "0": "dagoma_discoeasy200_extruder_0", "1": "dagoma_discoeasy200_extruder_1" - } + }, + "platform_offset": [ + 0, + -57.3, + -11 + ], + "preferred_material": "chromatik_pla" }, - "overrides": { - "machine_name": { - "default_value": "Dagoma DiscoEasy200 Bicolor" - }, - "machine_extruder_count": { - "default_value": 2 - }, - "machine_extruders_share_heater": { - "default_value": true - }, - "machine_start_gcode": { - "default_value": ";Begin Start Gcode for Dagoma DiscoEasy 200 Bicolor\n;Sliced: {date} {time}\n;Initial extruder: {initial_extruder_nr}\n\nG90 ;Absolute positioning\nM106 S255 ;Fan on full\nG28 X Y ;Home stop X Y\nG1 X100 ;Centre back during cooldown in case of oozing\nM109 R{material_standby_temperature} ;Cooldown in case too hot\nG28 ;Centre\nG29 ;Auto-level\nM104 S{material_print_temperature_layer_0} ;Pre-heat\nM107 ;Fan off\nG0 X100 Y5 Z0.5 ;Front centre for degunk\nM109 S{material_print_temperature_layer_0} ;Wait for initial temp\n;M83 ;E Relative\n;G1 E60 F3000 ;Reverse multi-extruder retract\n;G1 E10 F200 ;Degunk\n;G1 E-3 F5000 ;Retract\nG0 Z3 ;Withdraw\n;M82 ;E absolute\n;G92 E0 ;E reset\n;G1 F6000 ;Set feedrate\n\n;Finish Start Gcode for Dagoma DiscoEasy 200 Bicolor\n" - }, - "machine_end_gcode": { - "default_value": ";Begin End Gcode for Dagoma DiscoEasy 200 Bicolor\n\nM106 S255 ;Fan on full\nM104 S0 ;Cool hotend\nM140 S0 ;Cool heated bed\nG91 ;Relative positioning\nG1 E-3 F5000 ;Retract filament to stop oozing\nG1 E-60 F5000 ;Retract filament multi-extruder\nG0 Z+3 ;Withdraw\nG90 ; Absolute positioning\nG28 X Y ;Home\nM109 R{material_standby_temperature} ;Wait until head has cooled to standby temp\nM107 ;Fan off\nM18 ;Stepper motors off\n\n;Finish End Gcode for Dagoma DiscoEasy 200 Bicolor\n" - } + "overrides": + { + "machine_end_gcode": { "default_value": ";Begin End Gcode for Dagoma DiscoEasy 200 Bicolor\n\nM106 S255 ;Fan on full\nM104 S0 ;Cool hotend\nM140 S0 ;Cool heated bed\nG91 ;Relative positioning\nG1 E-3 F5000 ;Retract filament to stop oozing\nG1 E-60 F5000 ;Retract filament multi-extruder\nG0 Z+3 ;Withdraw\nG90 ; Absolute positioning\nG28 X Y ;Home\nM109 R{material_standby_temperature} ;Wait until head has cooled to standby temp\nM107 ;Fan off\nM18 ;Stepper motors off\n\n;Finish End Gcode for Dagoma DiscoEasy 200 Bicolor\n" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_extruders_share_heater": { "default_value": true }, + "machine_name": { "default_value": "Dagoma DiscoEasy200 Bicolor" }, + "machine_start_gcode": { "default_value": ";Begin Start Gcode for Dagoma DiscoEasy 200 Bicolor\n;Sliced: {date} {time}\n;Initial extruder: {initial_extruder_nr}\n\nG90 ;Absolute positioning\nM106 S255 ;Fan on full\nG28 X Y ;Home stop X Y\nG1 X100 ;Centre back during cooldown in case of oozing\nM109 R{material_standby_temperature} ;Cooldown in case too hot\nG28 ;Centre\nG29 ;Auto-level\nM104 S{material_print_temperature_layer_0} ;Pre-heat\nM107 ;Fan off\nG0 X100 Y5 Z0.5 ;Front centre for degunk\nM109 S{material_print_temperature_layer_0} ;Wait for initial temp\n;M83 ;E Relative\n;G1 E60 F3000 ;Reverse multi-extruder retract\n;G1 E10 F200 ;Degunk\n;G1 E-3 F5000 ;Retract\nG0 Z3 ;Withdraw\n;M82 ;E absolute\n;G92 E0 ;E reset\n;G1 F6000 ;Set feedrate\n\n;Finish Start Gcode for Dagoma DiscoEasy 200 Bicolor\n" } } -} +} \ No newline at end of file diff --git a/resources/definitions/dagoma_discoultimate.def.json b/resources/definitions/dagoma_discoultimate.def.json index ec41318e86..31e6fe96e4 100644 --- a/resources/definitions/dagoma_discoultimate.def.json +++ b/resources/definitions/dagoma_discoultimate.def.json @@ -1,34 +1,29 @@ { - "name": "Dagoma DiscoUltimate", "version": 2, + "name": "Dagoma DiscoUltimate", "inherits": "dagoma_disco", - "metadata": { + "metadata": + { "visible": true, "author": "Dagoma", "manufacturer": "Dagoma", "file_formats": "text/x-gcode", "platform": "dagoma_discoultimate.3mf", - "platform_offset": [0, -58.5, -39.5], "has_machine_quality": true, "has_materials": true, - "preferred_material": "chromatik_pla", - "machine_extruder_trains": - { - "0": "dagoma_discoultimate_extruder" - } + "machine_extruder_trains": { "0": "dagoma_discoultimate_extruder" }, + "platform_offset": [ + 0, + -58.5, + -39.5 + ], + "preferred_material": "chromatik_pla" }, - "overrides": { - "machine_name": { - "default_value": "Dagoma DiscoUltimate" - }, - "machine_extruder_count": { - "default_value": 1 - }, - "machine_start_gcode": { - "default_value": ";Begin Start Gcode for Dagoma DiscoUltimate\n;Sliced: {date} {time}\n;Initial extruder: {initial_extruder_nr}\n\nG90 ;Absolute positioning\nM106 S255 ;Fan on full\nG28 X Y ;Home stop X Y\nG1 X100 ;Centre back during cooldown in case of oozing\nM109 R{material_standby_temperature} ;Cooldown in case too hot\nG28 ;Centre\nG29 ;Auto-level\nM104 S{material_print_temperature_layer_0} ;Pre-heat\nM107 ;Fan off\nG0 X100 Y5 Z0.5 ;Front centre for degunk\nM109 S{material_print_temperature_layer_0} ;Wait for initial temp\nM83 ;E Relative\nG1 E10 F200 ;Degunk\nG1 E-3 F5000 ;Retract\nG0 Z3 ;Withdraw\nM82 ;E absolute\nG92 E0 ;E reset\nG1 F6000 ;Set feedrate\n\n;Finish Start Gcode for Dagoma DiscoUltimate\n" - }, - "machine_end_gcode": { - "default_value": ";Begin End Gcode for Dagoma DiscoUltimate\n\nM106 S255 ;Fan on full\nM104 S0 ;Cool hotend\nM140 S0 ;Cool heated bed\nG91 ;Relative positioning\nG1 E-3 F5000 ;Retract filament to stop oozing\nG0 Z+3 ;Withdraw\nG90 ;Absolute positioning\nG28 X Y ;Home\nM109 R{material_standby_temperature} ;Wait until head has cooled to standby temp\nM107 ;Fan off\nM18 ;Stepper motors off\n\n;Finish End Gcode for Dagoma DiscoUltimate\n" - } + "overrides": + { + "machine_end_gcode": { "default_value": ";Begin End Gcode for Dagoma DiscoUltimate\n\nM106 S255 ;Fan on full\nM104 S0 ;Cool hotend\nM140 S0 ;Cool heated bed\nG91 ;Relative positioning\nG1 E-3 F5000 ;Retract filament to stop oozing\nG0 Z+3 ;Withdraw\nG90 ;Absolute positioning\nG28 X Y ;Home\nM109 R{material_standby_temperature} ;Wait until head has cooled to standby temp\nM107 ;Fan off\nM18 ;Stepper motors off\n\n;Finish End Gcode for Dagoma DiscoUltimate\n" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_name": { "default_value": "Dagoma DiscoUltimate" }, + "machine_start_gcode": { "default_value": ";Begin Start Gcode for Dagoma DiscoUltimate\n;Sliced: {date} {time}\n;Initial extruder: {initial_extruder_nr}\n\nG90 ;Absolute positioning\nM106 S255 ;Fan on full\nG28 X Y ;Home stop X Y\nG1 X100 ;Centre back during cooldown in case of oozing\nM109 R{material_standby_temperature} ;Cooldown in case too hot\nG28 ;Centre\nG29 ;Auto-level\nM104 S{material_print_temperature_layer_0} ;Pre-heat\nM107 ;Fan off\nG0 X100 Y5 Z0.5 ;Front centre for degunk\nM109 S{material_print_temperature_layer_0} ;Wait for initial temp\nM83 ;E Relative\nG1 E10 F200 ;Degunk\nG1 E-3 F5000 ;Retract\nG0 Z3 ;Withdraw\nM82 ;E absolute\nG92 E0 ;E reset\nG1 F6000 ;Set feedrate\n\n;Finish Start Gcode for Dagoma DiscoUltimate\n" } } -} +} \ No newline at end of file diff --git a/resources/definitions/dagoma_discoultimate_bicolor.def.json b/resources/definitions/dagoma_discoultimate_bicolor.def.json index 3b5215c944..21582fb7df 100644 --- a/resources/definitions/dagoma_discoultimate_bicolor.def.json +++ b/resources/definitions/dagoma_discoultimate_bicolor.def.json @@ -1,38 +1,34 @@ { - "name": "Dagoma DiscoUltimate Bicolor", "version": 2, + "name": "Dagoma DiscoUltimate Bicolor", "inherits": "dagoma_disco", - "metadata": { + "metadata": + { "visible": true, "author": "Dagoma", "manufacturer": "Dagoma", "file_formats": "text/x-gcode", "platform": "dagoma_discoultimate_bicolor.3mf", - "platform_offset": [0, -58.5, -11], "has_machine_quality": true, "has_materials": true, - "preferred_material": "chromatik_pla", "machine_extruder_trains": { "0": "dagoma_discoultimate_extruder_0", "1": "dagoma_discoultimate_extruder_1" - } + }, + "platform_offset": [ + 0, + -58.5, + -11 + ], + "preferred_material": "chromatik_pla" }, - "overrides": { - "machine_name": { - "default_value": "Dagoma DiscoUltimate Bicolor" - }, - "machine_extruder_count": { - "default_value": 2 - }, - "machine_extruders_share_heater": { - "default_value": true - }, - "machine_start_gcode": { - "default_value": ";Begin Start Gcode for Dagoma DiscoUltimate Bicolor\n;Sliced: {date} {time}\n;Initial extruder: {initial_extruder_nr}\n\nG90 ;Absolute positioning\nM106 S255 ;Fan on full\nG28 X Y ;Home stop X Y\nG1 X100 ;Centre back during cooldown in case of oozing\nM109 R{material_standby_temperature} ;Cooldown in case too hot\nG28 ;Centre\nG29 ;Auto-level\nM104 S{material_print_temperature_layer_0} ;Pre-heat\nM107 ;Fan off\nG0 X100 Y5 Z0.5 ;Front centre for degunk\nM109 S{material_print_temperature_layer_0} ;Wait for initial temp\n;M83 ;E Relative\n;G1 E60 F3000 ;Reverse multi-extruder retract\n;G1 E10 F200 ;Degunk\n;G1 E-3 F5000 ;Retract\nG0 Z3 ;Withdraw\n;M82 ;E absolute\n;G92 E0 ;E reset\n;G1 F6000 ;Set feedrate\n\n;Finish Start Gcode for Dagoma DiscoUltimate Bicolor\n" - }, - "machine_end_gcode": { - "default_value": ";Begin End Gcode for Dagoma DiscoUltimate Bicolor\n\nM106 S255 ;Fan on full\nM104 S0 ;Cool hotend\nM140 S0 ;Cool heated bed\nG91 ;Relative positioning\nG1 E-3 F5000 ;Retract filament to stop oozing\nG1 E-60 F5000 ;Retract filament multi-extruder\nG0 Z+3 ;Withdraw\nG90 ; Absolute positioning\nG28 X Y ;Home\nM109 R{material_standby_temperature} ;Wait until head has cooled to standby temp\nM107 ;Fan off\nM18 ;Stepper motors off\n\n;Finish End Gcode for Dagoma DiscoUltimate Bicolor\n" - } + "overrides": + { + "machine_end_gcode": { "default_value": ";Begin End Gcode for Dagoma DiscoUltimate Bicolor\n\nM106 S255 ;Fan on full\nM104 S0 ;Cool hotend\nM140 S0 ;Cool heated bed\nG91 ;Relative positioning\nG1 E-3 F5000 ;Retract filament to stop oozing\nG1 E-60 F5000 ;Retract filament multi-extruder\nG0 Z+3 ;Withdraw\nG90 ; Absolute positioning\nG28 X Y ;Home\nM109 R{material_standby_temperature} ;Wait until head has cooled to standby temp\nM107 ;Fan off\nM18 ;Stepper motors off\n\n;Finish End Gcode for Dagoma DiscoUltimate Bicolor\n" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_extruders_share_heater": { "default_value": true }, + "machine_name": { "default_value": "Dagoma DiscoUltimate Bicolor" }, + "machine_start_gcode": { "default_value": ";Begin Start Gcode for Dagoma DiscoUltimate Bicolor\n;Sliced: {date} {time}\n;Initial extruder: {initial_extruder_nr}\n\nG90 ;Absolute positioning\nM106 S255 ;Fan on full\nG28 X Y ;Home stop X Y\nG1 X100 ;Centre back during cooldown in case of oozing\nM109 R{material_standby_temperature} ;Cooldown in case too hot\nG28 ;Centre\nG29 ;Auto-level\nM104 S{material_print_temperature_layer_0} ;Pre-heat\nM107 ;Fan off\nG0 X100 Y5 Z0.5 ;Front centre for degunk\nM109 S{material_print_temperature_layer_0} ;Wait for initial temp\n;M83 ;E Relative\n;G1 E60 F3000 ;Reverse multi-extruder retract\n;G1 E10 F200 ;Degunk\n;G1 E-3 F5000 ;Retract\nG0 Z3 ;Withdraw\n;M82 ;E absolute\n;G92 E0 ;E reset\n;G1 F6000 ;Set feedrate\n\n;Finish Start Gcode for Dagoma DiscoUltimate Bicolor\n" } } -} +} \ No newline at end of file diff --git a/resources/definitions/dagoma_magis.def.json b/resources/definitions/dagoma_magis.def.json index e3c9c3e693..3b65d56d75 100644 --- a/resources/definitions/dagoma_magis.def.json +++ b/resources/definitions/dagoma_magis.def.json @@ -1,25 +1,26 @@ { - "name": "Dagoma Magis", "version": 2, + "name": "Dagoma Magis", "inherits": "dagoma_delta", - "metadata": { + "metadata": + { "visible": true, "author": "Dagoma", "manufacturer": "Dagoma", "file_formats": "text/x-gcode", "platform": "dagoma_magis.3mf", - "platform_offset": [0, -28, -35], "has_machine_quality": true, "has_materials": true, - "preferred_material": "chromatik_pla", - "machine_extruder_trains": - { - "0": "dagoma_magis_extruder" - } + "machine_extruder_trains": { "0": "dagoma_magis_extruder" }, + "platform_offset": [ + 0, + -28, + -35 + ], + "preferred_material": "chromatik_pla" }, - "overrides": { - "machine_name": { - "default_value": "Dagoma Magis" - } + "overrides": + { + "machine_name": { "default_value": "Dagoma Magis" } } -} +} \ No newline at end of file diff --git a/resources/definitions/dagoma_neva.def.json b/resources/definitions/dagoma_neva.def.json index 24d3f8ab8d..f7b91f36dc 100644 --- a/resources/definitions/dagoma_neva.def.json +++ b/resources/definitions/dagoma_neva.def.json @@ -1,25 +1,26 @@ { - "name": "Dagoma Neva", "version": 2, + "name": "Dagoma Neva", "inherits": "dagoma_delta", - "metadata": { + "metadata": + { "visible": true, "author": "Dagoma", "manufacturer": "Dagoma", "file_formats": "text/x-gcode", "platform": "dagoma_neva.3mf", - "platform_offset": [0, -28, -35], "has_machine_quality": true, "has_materials": true, - "preferred_material": "chromatik_pla", - "machine_extruder_trains": - { - "0": "dagoma_neva_extruder" - } + "machine_extruder_trains": { "0": "dagoma_neva_extruder" }, + "platform_offset": [ + 0, + -28, + -35 + ], + "preferred_material": "chromatik_pla" }, - "overrides": { - "machine_name": { - "default_value": "Dagoma Neva" - } + "overrides": + { + "machine_name": { "default_value": "Dagoma Neva" } } -} +} \ No newline at end of file diff --git a/resources/definitions/dagoma_sigma.def.json b/resources/definitions/dagoma_sigma.def.json index 1af2019891..223004c54b 100644 --- a/resources/definitions/dagoma_sigma.def.json +++ b/resources/definitions/dagoma_sigma.def.json @@ -8,7 +8,7 @@ "author": "Dagoma", "manufacturer": "Dagoma", "file_formats": "text/x-gcode", - "platform": "dagoma_sigma.obj", + "platform": "dagoma_sigma.stl", "has_machine_quality": true, "has_materials": true, "has_variants": true, diff --git a/resources/definitions/delta_go.def.json b/resources/definitions/delta_go.def.json index 04f0580898..8e213e616e 100644 --- a/resources/definitions/delta_go.def.json +++ b/resources/definitions/delta_go.def.json @@ -1,38 +1,41 @@ { - "name": "Delta Go", "version": 2, + "name": "Delta Go", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Deltaprintr", "manufacturer": "Deltaprintr", "file_formats": "text/x-gcode", - "platform_offset": [0, 0, 0], - "machine_extruder_trains": - { - "0": "delta_go_extruder_0" - } + "machine_extruder_trains": { "0": "delta_go_extruder_0" }, + "platform_offset": [ + 0, + 0, + 0 + ] }, - "overrides": { - "machine_name": { "default_value": "Delta Go" }, + "overrides": + { + "brim_width": { "value": "5" }, "default_material_print_temperature": { "default_value": 210 }, - "prime_tower_size": { "default_value": 8.66 }, - "infill_sparse_density": { "default_value": 10 }, - "layer_height": { "default_value": 0.15 }, - "speed_print": { "default_value": 30 }, - "machine_heated_bed": { "default_value": false }, - "machine_center_is_zero": { "default_value": true }, - "machine_height": { "default_value": 154 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_depth": { "default_value": 115 }, - "machine_width": { "default_value": 115 }, - "raft_airgap": { "default_value": 0.15 }, - "retraction_hop_enabled": { "value": "True" }, - "retraction_amount": { "default_value": 4.1 }, - "retraction_speed": { "default_value": 500 }, - "retraction_hop": { "value": "0.2" }, - "retraction_hop_only_when_collides": { "value": "True" }, - "brim_width": { "value": "5" }, - "machine_shape": { "default_value": "elliptic"} + "infill_sparse_density": { "default_value": 10 }, + "layer_height": { "default_value": 0.15 }, + "machine_center_is_zero": { "default_value": true }, + "machine_depth": { "default_value": 115 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 154 }, + "machine_name": { "default_value": "Delta Go" }, + "machine_shape": { "default_value": "elliptic" }, + "machine_width": { "default_value": 115 }, + "prime_tower_size": { "default_value": 8.66 }, + "raft_airgap": { "default_value": 0.15 }, + "retraction_amount": { "default_value": 4.1 }, + "retraction_hop": { "value": "0.2" }, + "retraction_hop_enabled": { "value": "True" }, + "retraction_hop_only_when_collides": { "value": "True" }, + "retraction_speed": { "default_value": 500 }, + "speed_print": { "default_value": 30 } } -} +} \ No newline at end of file diff --git a/resources/definitions/deltabot.def.json b/resources/definitions/deltabot.def.json index 6dbdfb418f..0dccf81d39 100644 --- a/resources/definitions/deltabot.def.json +++ b/resources/definitions/deltabot.def.json @@ -1,32 +1,34 @@ { - "name": "DeltaBot", "version": 2, + "name": "DeltaBot", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": false, "author": "Ultimaker", "manufacturer": "Custom", "file_formats": "text/x-gcode", - "platform_offset": [ 0, 0, 0], - "machine_extruder_trains": - { - "0": "deltabot_extruder_0" - } + "machine_extruder_trains": { "0": "deltabot_extruder_0" }, + "platform_offset": [ + 0, + 0, + 0 + ] }, - - "overrides": { - "prime_tower_size": { "default_value": 8.660254037844387 }, + "overrides": + { "infill_sparse_density": { "default_value": 10 }, "layer_height": { "default_value": 0.2 }, - "speed_print": { "default_value": 30 }, - "machine_extruder_count": { "default_value": 1 }, - "machine_heated_bed": { "default_value": true }, "machine_center_is_zero": { "default_value": true }, - "machine_height": { "default_value": 150 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_depth": { "default_value": 150 }, - "machine_width": { "default_value": 150 }, + "machine_extruder_count": { "default_value": 1 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 150 }, "machine_name": { "default_value": "DeltaBot style" }, - "machine_shape": { "default_value": "elliptic"} + "machine_shape": { "default_value": "elliptic" }, + "machine_width": { "default_value": 150 }, + "prime_tower_size": { "default_value": 8.660254037844387 }, + "speed_print": { "default_value": 30 } } -} +} \ No newline at end of file diff --git a/resources/definitions/deltacomb_base.def.json b/resources/definitions/deltacomb_base.def.json index a977dee663..9d48683c0d 100644 --- a/resources/definitions/deltacomb_base.def.json +++ b/resources/definitions/deltacomb_base.def.json @@ -1,100 +1,91 @@ { - "version": 2, - "name": "Deltacomb Base Printer", - "inherits": "fdmprinter", - - "metadata": { - "author": "Gabriele Rossetti", - "visible": false, - "manufacturer": "Deltacomb 3D Printers", - "file_formats": "text/x-gcode", - "has_machine_quality": true, - "has_materials": true, - "has_variants": true, - "variants_name": "Head", - - "preferred_quality_type": "D020", - "preferred_material": "generic_pla", - - "machine_extruder_trains": { + "version": 2, + "name": "Deltacomb Base Printer", + "inherits": "fdmprinter", + "metadata": + { + "visible": false, + "author": "Gabriele Rossetti", + "manufacturer": "Deltacomb 3D Printers", + "file_formats": "text/x-gcode", + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": + { "0": "deltacomb_base_extruder_0", "1": "deltacomb_base_extruder_1", "2": "deltacomb_base_extruder_2", "3": "deltacomb_base_extruder_3" - } + }, + "preferred_material": "generic_pla", + "preferred_quality_type": "D020", + "variants_name": "Head" }, - - "overrides": { - "machine_extruder_count": { "default_value": 1, "maximum_value": "4" }, - "machine_heated_bed": { "default_value": true }, - "machine_center_is_zero": { "default_value": true }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { "default_value": ";---------------------------------------\n;Deltacomb start script\n;---------------------------------------\nG21 ;metric values\nG90 ;absolute positioning\nM107 ;start with the fan off\nG28 ;Home all axes (max endstops)\nM420 S1; Bed Level Enable\nG92 E0 ;zero the extruded length\nG1 Z15.0 F9000 ;move to the platform down 15mm\nG1 F9000\n\n;Put printing message on LCD screen\nM117 In stampa...\nM140 S{print_bed_temperature} ;set the target bed temperature\n;---------------------------------------"}, - "machine_end_gcode": { "default_value": ";---------------------------------------\n;Deltacomb end script\n;---------------------------------------\nG91 ;relative positioning\nG1 F15000 X8.0 E-4.5 ;Wipe filament+material retraction\nG1 F15000 E4.0 Z1 ;Retraction compensation\nG28 ;Home all axes (max endstops)\nM84 ;steppers off\n" }, - "machine_shape": { "default_value": "elliptic" }, - - "machine_max_feedrate_z" : { "default_value": 300 }, - - "speed_print" : { "default_value": 80 }, - "speed_topbottom": { "value": "speed_print * 0.90" }, - "speed_wall_0": { "value": "35 if speed_print > 35 else speed_print" }, - "speed_layer_0": { "value": "speed_print * 0.55" }, - - "speed_travel": { "value": "170" }, - "speed_travel_layer_0": { "value": "speed_travel * 0.70" }, - "speed_z_hop": { "value": "speed_travel" }, - - "acceleration_enabled": { "value": "True" }, - "acceleration_travel" : { "value": "9000" }, - "acceleration_print": { "value": "4000" }, - "acceleration_wall": { "value": "acceleration_print * 0.5" }, - "acceleration_wall_0": { "value": "acceleration_wall * 0.5" }, - "acceleration_topbottom": { "value": "acceleration_wall_0" }, - "acceleration_layer_0": { "value": "acceleration_wall_0" }, - "acceleration_prime_tower": { "value": "acceleration_wall" }, - "acceleration_support": { "value": "acceleration_wall" }, - "acceleration_support_interface": { "value": "acceleration_wall_0" }, - - "jerk_enabled": { "value": "True" }, - "jerk_print": { "value": "25" }, - "jerk_infill": { "value": "10" }, - "jerk_travel": { "value": "10" }, - - "retraction_hop_enabled": { "default_value": true }, - "retraction_hop": { "default_value": 1.0 }, - "retraction_amount" : { "default_value": 3.5 }, - "retraction_speed" : { "default_value": 40 }, - "retraction_combing" : { "value": "'noskin'" }, - "travel_avoid_distance": { "value": "1" }, - "travel_avoid_supports": { "value": "True" }, + "overrides": + { + "acceleration_enabled": { "value": "True" }, + "acceleration_layer_0": { "value": "acceleration_wall_0" }, + "acceleration_prime_tower": { "value": "acceleration_wall" }, + "acceleration_print": { "value": "4000" }, + "acceleration_support": { "value": "acceleration_wall" }, + "acceleration_support_interface": { "value": "acceleration_wall_0" }, + "acceleration_topbottom": { "value": "acceleration_wall_0" }, + "acceleration_travel": { "value": "9000" }, + "acceleration_wall": { "value": "acceleration_print * 0.5" }, + "acceleration_wall_0": { "value": "acceleration_wall * 0.5" }, + "brim_width": { "value": "3" }, + "infill_before_walls": { "default_value": false }, + "infill_pattern": { "value": "'cubic'" }, + "infill_sparse_density": { "default_value": 30 }, + "jerk_enabled": { "value": "True" }, + "jerk_infill": { "value": "10" }, + "jerk_print": { "value": "25" }, + "jerk_travel": { "value": "10" }, + "machine_center_is_zero": { "default_value": true }, + "machine_end_gcode": { "default_value": ";---------------------------------------\n;Deltacomb end script\n;---------------------------------------\nG91 ;relative positioning\nG1 F15000 X8.0 E-4.5 ;Wipe filament+material retraction\nG1 F15000 E4.0 Z1 ;Retraction compensation\nG28 ;Home all axes (max endstops)\nM84 ;steppers off\n" }, + "machine_extruder_count": + { + "default_value": 1, + "maximum_value": "4" + }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_max_feedrate_z": { "default_value": 300 }, + "machine_shape": { "default_value": "elliptic" }, + "machine_start_gcode": { "default_value": ";---------------------------------------\n;Deltacomb start script\n;---------------------------------------\nG21 ;metric values\nG90 ;absolute positioning\nM107 ;start with the fan off\nG28 ;Home all axes (max endstops)\nM420 S1; Bed Level Enable\nG92 E0 ;zero the extruded length\nG1 Z15.0 F9000 ;move to the platform down 15mm\nG1 F9000\n\n;Put printing message on LCD screen\nM117 In stampa...\nM140 S{print_bed_temperature} ;set the target bed temperature\n;---------------------------------------" }, + "prime_tower_brim_enable": { "value": false }, + "prime_tower_position_x": { "value": "prime_tower_size / 2" }, + "prime_tower_position_y": { "value": "machine_depth / 2 - prime_tower_size - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' or (prime_tower_brim_enable and adhesion_type != 'raft') else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0) - 1" }, + "prime_tower_size": { "value": "math.sqrt(extruders_enabled_count * prime_tower_min_volume / layer_height / math.pi) * 2" }, + "retraction_amount": { "default_value": 3.5 }, + "retraction_combing": { "value": "'noskin'" }, + "retraction_hop": { "default_value": 1.0 }, + "retraction_hop_enabled": { "default_value": true }, "retraction_hop_only_when_collides": { "value": "1" }, - - "switch_extruder_retraction_amount": { "value": 10}, + "retraction_speed": { "default_value": 40 }, + "roofing_layer_count": { "value": "1" }, + "roofing_line_width": { "value": "line_width * 0.75" }, + "skirt_brim_minimal_length": { "default_value": 150 }, + "skirt_brim_speed": { "value": "speed_layer_0" }, + "skirt_line_count": { "default_value": 3 }, + "speed_layer_0": { "value": "speed_print * 0.55" }, + "speed_print": { "default_value": 80 }, + "speed_topbottom": { "value": "speed_print * 0.90" }, + "speed_travel": { "value": "170" }, + "speed_travel_layer_0": { "value": "speed_travel * 0.70" }, + "speed_wall_0": { "value": "35 if speed_print > 35 else speed_print" }, + "speed_z_hop": { "value": "speed_travel" }, + "support_bottom_distance": { "value": "layer_height" }, + "support_bottom_enable": { "value": false }, + "support_use_towers": { "default_value": false }, + "support_wall_count": { "value": "1" }, + "support_z_distance": { "value": "layer_height" }, + "switch_extruder_retraction_amount": { "value": 10 }, "switch_extruder_retraction_speeds": { "default_value": 70 }, - - "top_bottom_thickness": { "default_value": 0.8 }, - "roofing_layer_count": { "value": "1" }, - "roofing_line_width": { "value": "line_width * 0.75" }, - "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, - - "infill_sparse_density": { "default_value": 30 }, - "infill_pattern": { "value": "'cubic'" }, - "infill_before_walls": { "default_value": false }, - - "support_z_distance": { "value": "layer_height" }, - "support_bottom_distance": { "value": "layer_height" }, - "support_use_towers": { "default_value": false }, - "support_bottom_enable": { "value": false }, - "support_wall_count": { "value": "1" }, - - "skirt_brim_speed": { "value": "speed_layer_0" }, - "skirt_line_count": { "default_value": 3 }, - "skirt_brim_minimal_length": { "default_value": 150 }, - "brim_width": { "value": "3" }, - - "prime_tower_size": { "value": "math.sqrt(extruders_enabled_count * prime_tower_min_volume / layer_height / math.pi) * 2"}, - "prime_tower_brim_enable": { "value": false }, - "prime_tower_position_x": { "value": "prime_tower_size / 2" }, - "prime_tower_position_y": { "value": "machine_depth / 2 - prime_tower_size - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' or (prime_tower_brim_enable and adhesion_type != 'raft') else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0) - 1" } + "top_bottom_thickness": { "default_value": 0.8 }, + "travel_avoid_distance": { "value": "1" }, + "travel_avoid_supports": { "value": "True" }, + "z_seam_corner": { "value": "'z_seam_corner_weighted'" } } -} +} \ No newline at end of file diff --git a/resources/definitions/deltacomb_dc20.def.json b/resources/definitions/deltacomb_dc20.def.json index 5bb3e220d2..8b689457c8 100644 --- a/resources/definitions/deltacomb_dc20.def.json +++ b/resources/definitions/deltacomb_dc20.def.json @@ -1,20 +1,24 @@ { - "version": 2, - "name": "Deltacomb DC-20", - "inherits": "deltacomb_base", - - "metadata": { - "visible": true, - "platform": "deltacomb_dc20.stl", - "quality_definition": "deltacomb_base", - "preferred_variant_name": "FBE 0.40mm" + "version": 2, + "name": "Deltacomb DC-20", + "inherits": "deltacomb_base", + "metadata": + { + "visible": true, + "platform": "deltacomb_dc20.stl", + "preferred_variant_name": "FBE 0.40mm", + "quality_definition": "deltacomb_base" }, - - "overrides": { - "machine_name": { "default_value": "Deltacomb DC-20" }, - "machine_width": { "default_value": 190 }, - "machine_depth": { "default_value": 190 }, - "machine_height": { "default_value": 250 }, - "machine_extruder_count": { "default_value": 1, "maximum_value": "4" } + "overrides": + { + "machine_depth": { "default_value": 190 }, + "machine_extruder_count": + { + "default_value": 1, + "maximum_value": "4" + }, + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "Deltacomb DC-20" }, + "machine_width": { "default_value": 190 } } -} +} \ No newline at end of file diff --git a/resources/definitions/deltacomb_dc20dual.def.json b/resources/definitions/deltacomb_dc20dual.def.json index 77b228fdc0..f90e40d5b4 100644 --- a/resources/definitions/deltacomb_dc20dual.def.json +++ b/resources/definitions/deltacomb_dc20dual.def.json @@ -1,38 +1,106 @@ { - "version": 2, - "name": "Deltacomb DC-20 Dual", - "inherits": "deltacomb_base", - - "metadata": { - "visible": true, - "platform": "deltacomb_dc20.stl", - "quality_definition": "deltacomb_base", - "preferred_variant_name": "DBE 0.40mm", - "machine_extruder_trains": { + "version": 2, + "name": "Deltacomb DC-20 Dual", + "inherits": "deltacomb_base", + "metadata": + { + "visible": true, + "platform": "deltacomb_dc20.stl", + "machine_extruder_trains": + { "0": "deltacomb_dc20dual_extruder_0", "1": "deltacomb_dc20dual_extruder_1" - } + }, + "preferred_variant_name": "DBE 0.40mm", + "quality_definition": "deltacomb_base" }, - - "overrides": { - "machine_name": { "default_value": "Deltacomb DC-20 DUAL" }, - "machine_extruder_count": { "default_value": 2, "maximum_value": "2" }, - "machine_width": { "default_value": 190 }, - "machine_depth": { "default_value": 190 }, - "machine_height": { "default_value": 250 }, - "machine_disallowed_areas":{ "default_value": [ - [[ 53, 78], [ 63, 78], [ 73, 70], [ 62, 70]], - [[ 62, 70], [ 73, 70], [ 81, 61], [ 70, 61]], - [[ 70, 61], [ 81, 61], [ 88, 51], [ 76, 51]], - [[ 76, 51], [ 88, 51], [ 93, 40], [ 81, 40]], - [[ 81, 40], [ 93, 40], [ 97, 29], [ 85, 29]], - [[ 85, 29], [ 97, 29], [ 101, 17], [ 88, 17]], - [[-37, 78], [-47, 78], [-57, 70], [-46, 70]], - [[-46, 70], [-57, 70], [-69, 61], [-54, 61]], - [[-54, 61], [-69, 61], [-72, 51], [-60, 51]], - [[-60, 51], [-72, 51], [-77, 40], [-65, 40]], - [[-65, 40], [-77, 40], [-81, 29], [-69, 29]], - [[-69, 29], [-81, 29], [-85, 17], [-72, 17]] - ]} + "overrides": + { + "machine_depth": { "default_value": 190 }, + "machine_disallowed_areas": + { + "default_value": [ + [ + [53, 78], + [63, 78], + [73, 70], + [62, 70] + ], + [ + [62, 70], + [73, 70], + [81, 61], + [70, 61] + ], + [ + [70, 61], + [81, 61], + [88, 51], + [76, 51] + ], + [ + [76, 51], + [88, 51], + [93, 40], + [81, 40] + ], + [ + [81, 40], + [93, 40], + [97, 29], + [85, 29] + ], + [ + [85, 29], + [97, 29], + [101, 17], + [88, 17] + ], + [ + [-37, 78], + [-47, 78], + [-57, 70], + [-46, 70] + ], + [ + [-46, 70], + [-57, 70], + [-69, 61], + [-54, 61] + ], + [ + [-54, 61], + [-69, 61], + [-72, 51], + [-60, 51] + ], + [ + [-60, 51], + [-72, 51], + [-77, 40], + [-65, 40] + ], + [ + [-65, 40], + [-77, 40], + [-81, 29], + [-69, 29] + ], + [ + [-69, 29], + [-81, 29], + [-85, 17], + [-72, 17] + ] + ] + }, + "machine_extruder_count": + { + "default_value": 2, + "maximum_value": "2" + }, + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "Deltacomb DC-20 DUAL" }, + "machine_width": { "default_value": 190 } } -} +} \ No newline at end of file diff --git a/resources/definitions/deltacomb_dc20flux.def.json b/resources/definitions/deltacomb_dc20flux.def.json index f907649312..f81909dae5 100644 --- a/resources/definitions/deltacomb_dc20flux.def.json +++ b/resources/definitions/deltacomb_dc20flux.def.json @@ -1,33 +1,38 @@ { - "version": 2, - "name": "Deltacomb DC-20 Flux", - "inherits": "deltacomb_base", - - "metadata": { - "visible": true, - "platform": "deltacomb_dc20.stl", - "quality_definition": "deltacomb_base", - "preferred_variant_name": "FBE 0.40mm", - "machine_extruder_trains": { + "version": 2, + "name": "Deltacomb DC-20 Flux", + "inherits": "deltacomb_base", + "metadata": + { + "visible": true, + "platform": "deltacomb_dc20.stl", + "machine_extruder_trains": + { "0": "deltacomb_dc20flux_extruder_0", "1": "deltacomb_dc20flux_extruder_1", "2": "deltacomb_dc20flux_extruder_2", "3": "deltacomb_dc20flux_extruder_3" - } + }, + "preferred_variant_name": "FBE 0.40mm", + "quality_definition": "deltacomb_base" }, - - "overrides": { - "machine_name": { "default_value": "Deltacomb DC-20 FLUX" }, - "machine_width": { "default_value": 190 }, - "machine_depth": { "default_value": 190 }, - "machine_height": { "default_value": 250 }, - "machine_extruder_count": { "default_value": 2, "maximum_value": "4" }, - "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": true }, + "overrides": + { + "machine_depth": { "default_value": 190 }, + "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" }, + "machine_extruder_count": + { + "default_value": 2, + "maximum_value": "4" + }, + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "Deltacomb DC-20 FLUX" }, + "machine_width": { "default_value": 190 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, - "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_standby_temperature": { "value": "material_print_temperature" } + "material_standby_temperature": { "value": "material_print_temperature" }, + "prime_tower_enable": { "value": true }, + "prime_tower_min_volume": { "value": "50" }, + "switch_extruder_retraction_amount": { "value": "0" } } -} +} \ No newline at end of file diff --git a/resources/definitions/deltacomb_dc21.def.json b/resources/definitions/deltacomb_dc21.def.json index 32efb2170a..01fbb39f28 100644 --- a/resources/definitions/deltacomb_dc21.def.json +++ b/resources/definitions/deltacomb_dc21.def.json @@ -1,20 +1,24 @@ { - "version": 2, - "name": "Deltacomb DC-21", - "inherits": "deltacomb_base", - - "metadata": { - "visible": true, - "platform": "deltacomb_dc20.stl", - "quality_definition": "deltacomb_base", - "preferred_variant_name": "FBE 0.40mm" + "version": 2, + "name": "Deltacomb DC-21", + "inherits": "deltacomb_base", + "metadata": + { + "visible": true, + "platform": "deltacomb_dc20.stl", + "preferred_variant_name": "FBE 0.40mm", + "quality_definition": "deltacomb_base" }, - - "overrides": { - "machine_name": { "default_value": "Deltacomb DC-21" }, - "machine_width": { "default_value": 190 }, - "machine_depth": { "default_value": 190 }, - "machine_height": { "default_value": 400 }, - "machine_extruder_count": { "default_value": 1, "maximum_value": "4" } + "overrides": + { + "machine_depth": { "default_value": 190 }, + "machine_extruder_count": + { + "default_value": 1, + "maximum_value": "4" + }, + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "Deltacomb DC-21" }, + "machine_width": { "default_value": 190 } } -} +} \ No newline at end of file diff --git a/resources/definitions/deltacomb_dc21dual.def.json b/resources/definitions/deltacomb_dc21dual.def.json index 97cc057944..de5b33a42e 100644 --- a/resources/definitions/deltacomb_dc21dual.def.json +++ b/resources/definitions/deltacomb_dc21dual.def.json @@ -1,24 +1,29 @@ { - "version": 2, - "name": "Deltacomb DC-21 Dual", - "inherits": "deltacomb_base", - - "metadata": { - "visible": true, - "platform": "deltacomb_dc20.stl", - "quality_definition": "deltacomb_base", - "preferred_variant_name": "DBE 0.40mm", - "machine_extruder_trains": { + "version": 2, + "name": "Deltacomb DC-21 Dual", + "inherits": "deltacomb_base", + "metadata": + { + "visible": true, + "platform": "deltacomb_dc20.stl", + "machine_extruder_trains": + { "0": "deltacomb_dc20dual_extruder_0", "1": "deltacomb_dc20dual_extruder_1" - } + }, + "preferred_variant_name": "DBE 0.40mm", + "quality_definition": "deltacomb_base" }, - - "overrides": { - "machine_name": { "default_value": "Deltacomb DC-20 DUAL" }, - "machine_extruder_count": { "default_value": 2, "maximum_value": "2" }, - "machine_width": { "default_value": 190 }, - "machine_depth": { "default_value": 190 }, - "machine_height": { "default_value": 400 } + "overrides": + { + "machine_depth": { "default_value": 190 }, + "machine_extruder_count": + { + "default_value": 2, + "maximum_value": "2" + }, + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "Deltacomb DC-20 DUAL" }, + "machine_width": { "default_value": 190 } } -} +} \ No newline at end of file diff --git a/resources/definitions/deltacomb_dc21flux.def.json b/resources/definitions/deltacomb_dc21flux.def.json index 42e1851ab0..dbcdf3ad37 100644 --- a/resources/definitions/deltacomb_dc21flux.def.json +++ b/resources/definitions/deltacomb_dc21flux.def.json @@ -1,33 +1,38 @@ { - "version": 2, - "name": "Deltacomb DC-21 Flux", - "inherits": "deltacomb_base", - - "metadata": { - "visible": true, - "platform": "deltacomb_dc20.stl", - "quality_definition": "deltacomb_base", - "preferred_variant_name": "FBE 0.40mm", - "machine_extruder_trains": { + "version": 2, + "name": "Deltacomb DC-21 Flux", + "inherits": "deltacomb_base", + "metadata": + { + "visible": true, + "platform": "deltacomb_dc20.stl", + "machine_extruder_trains": + { "0": "deltacomb_dc20flux_extruder_0", "1": "deltacomb_dc20flux_extruder_1", "2": "deltacomb_dc20flux_extruder_2", "3": "deltacomb_dc20flux_extruder_3" - } + }, + "preferred_variant_name": "FBE 0.40mm", + "quality_definition": "deltacomb_base" }, - - "overrides": { - "machine_name": { "default_value": "Deltacomb DC-21 FLUX" }, - "machine_width": { "default_value": 190 }, - "machine_depth": { "default_value": 190 }, - "machine_height": { "default_value": 400 }, - "machine_extruder_count": { "default_value": 2, "maximum_value": "4" }, - "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": true }, + "overrides": + { + "machine_depth": { "default_value": 190 }, + "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" }, + "machine_extruder_count": + { + "default_value": 2, + "maximum_value": "4" + }, + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "Deltacomb DC-21 FLUX" }, + "machine_width": { "default_value": 190 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, - "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_standby_temperature": { "value": "material_print_temperature" } + "material_standby_temperature": { "value": "material_print_temperature" }, + "prime_tower_enable": { "value": true }, + "prime_tower_min_volume": { "value": "50" }, + "switch_extruder_retraction_amount": { "value": "0" } } } \ No newline at end of file diff --git a/resources/definitions/deltacomb_dc30.def.json b/resources/definitions/deltacomb_dc30.def.json index 485fb5cc45..f817b0b468 100644 --- a/resources/definitions/deltacomb_dc30.def.json +++ b/resources/definitions/deltacomb_dc30.def.json @@ -1,20 +1,24 @@ { - "version": 2, - "name": "Deltacomb DC-30", - "inherits": "deltacomb_base", - - "metadata": { - "visible": true, - "platform": "deltacomb_dc30.stl", - "quality_definition": "deltacomb_base", - "preferred_variant_name": "FBE 0.40mm" + "version": 2, + "name": "Deltacomb DC-30", + "inherits": "deltacomb_base", + "metadata": + { + "visible": true, + "platform": "deltacomb_dc30.stl", + "preferred_variant_name": "FBE 0.40mm", + "quality_definition": "deltacomb_base" }, - - "overrides": { - "machine_name": { "default_value": "Deltacomb DC-30" }, - "machine_width": { "default_value": 290 }, - "machine_depth": { "default_value": 290 }, - "machine_height": { "default_value": 300 }, - "machine_extruder_count": { "default_value": 1, "maximum_value": "4" } + "overrides": + { + "machine_depth": { "default_value": 290 }, + "machine_extruder_count": + { + "default_value": 1, + "maximum_value": "4" + }, + "machine_height": { "default_value": 300 }, + "machine_name": { "default_value": "Deltacomb DC-30" }, + "machine_width": { "default_value": 290 } } -} +} \ No newline at end of file diff --git a/resources/definitions/deltacomb_dc30dual.def.json b/resources/definitions/deltacomb_dc30dual.def.json index 97ad1bd102..5736a39def 100644 --- a/resources/definitions/deltacomb_dc30dual.def.json +++ b/resources/definitions/deltacomb_dc30dual.def.json @@ -1,24 +1,29 @@ { - "version": 2, - "name": "Deltacomb DC-30 Dual", - "inherits": "deltacomb_base", - - "metadata": { - "visible": true, - "platform": "deltacomb_dc30.stl", - "quality_definition": "deltacomb_base", - "preferred_variant_name": "DBE 0.40mm", - "machine_extruder_trains": { + "version": 2, + "name": "Deltacomb DC-30 Dual", + "inherits": "deltacomb_base", + "metadata": + { + "visible": true, + "platform": "deltacomb_dc30.stl", + "machine_extruder_trains": + { "0": "deltacomb_dc30dual_extruder_0", "1": "deltacomb_dc30dual_extruder_1" - } + }, + "preferred_variant_name": "DBE 0.40mm", + "quality_definition": "deltacomb_base" }, - - "overrides": { - "machine_name": { "default_value": "Deltacomb DC-30 DUAL" }, - "machine_width": { "default_value": 290 }, - "machine_depth": { "default_value": 290 }, - "machine_height": { "default_value": 300 }, - "machine_extruder_count": { "default_value": 2, "maximum_value": "2" } + "overrides": + { + "machine_depth": { "default_value": 290 }, + "machine_extruder_count": + { + "default_value": 2, + "maximum_value": "2" + }, + "machine_height": { "default_value": 300 }, + "machine_name": { "default_value": "Deltacomb DC-30 DUAL" }, + "machine_width": { "default_value": 290 } } -} +} \ No newline at end of file diff --git a/resources/definitions/deltacomb_dc30flux.def.json b/resources/definitions/deltacomb_dc30flux.def.json index 6bf095701c..4a42ae4d63 100644 --- a/resources/definitions/deltacomb_dc30flux.def.json +++ b/resources/definitions/deltacomb_dc30flux.def.json @@ -1,33 +1,38 @@ { - "version": 2, - "name": "Deltacomb DC-30 Flux", - "inherits": "deltacomb_base", - - "metadata": { - "visible": true, - "platform": "deltacomb_dc30.stl", - "quality_definition": "deltacomb_base", - "preferred_variant_name": "FBE 0.40mm", - "machine_extruder_trains": { + "version": 2, + "name": "Deltacomb DC-30 Flux", + "inherits": "deltacomb_base", + "metadata": + { + "visible": true, + "platform": "deltacomb_dc30.stl", + "machine_extruder_trains": + { "0": "deltacomb_dc30flux_extruder_0", "1": "deltacomb_dc30flux_extruder_1", "2": "deltacomb_dc30flux_extruder_2", "3": "deltacomb_dc30flux_extruder_3" - } + }, + "preferred_variant_name": "FBE 0.40mm", + "quality_definition": "deltacomb_base" }, - - "overrides": { - "machine_name": { "default_value": "Deltacomb DC-30 FLUX" }, - "machine_width": { "default_value": 290 }, - "machine_depth": { "default_value": 290 }, - "machine_height": { "default_value": 300 }, - "machine_extruder_count": { "default_value": 2, "maximum_value": "4" }, - "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" }, + "overrides": + { + "machine_depth": { "default_value": 290 }, + "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" }, + "machine_extruder_count": + { + "default_value": 2, + "maximum_value": "4" + }, + "machine_height": { "default_value": 300 }, + "machine_name": { "default_value": "Deltacomb DC-30 FLUX" }, + "machine_width": { "default_value": 290 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, - "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_standby_temperature": { "value": "material_print_temperature" } + "material_standby_temperature": { "value": "material_print_temperature" }, + "prime_tower_enable": { "value": "1" }, + "prime_tower_min_volume": { "value": "50" }, + "switch_extruder_retraction_amount": { "value": "0" } } -} +} \ No newline at end of file diff --git a/resources/definitions/diy220.def.json b/resources/definitions/diy220.def.json index 5c3b26be02..324aee4936 100644 --- a/resources/definitions/diy220.def.json +++ b/resources/definitions/diy220.def.json @@ -2,77 +2,43 @@ "version": 2, "name": "Diytech 220", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Venkatkamesh", "manufacturer": "Sri Vignan Technologies", - "weight": 3, "file_formats": "text/x-gcode", "platform": "diy220_platform.obj", - - "platform_texture": "svtbacktext.png", - "platform_offset": [0, 0, 0], "has_materials": true, "has_variants": true, + "machine_extruder_trains": { "0": "diy220_extruder_0" }, + "platform_offset": [ + 0, + 0, + 0 + ], + "platform_texture": "svtbacktext.png", "preferred_variant_name": "0.4 mm Nozzle", - "machine_extruder_trains": - { - "0": "diy220_extruder_0" - } + "weight": 3 }, - "overrides": { + "overrides": + { + "gantry_height": { "value": "48" }, + "machine_acceleration": { "default_value": 3000 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 220 }, + "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0 T0\nM140 S0\nM117\nG28 X0 Y0\nM84" }, + "machine_gcode_flavor": { "default_value": "Marlin" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 305 }, + "machine_max_feedrate_x": { "default_value": 300 }, + "machine_max_feedrate_y": { "default_value": 300 }, + "machine_max_feedrate_z": { "default_value": 40 }, "machine_name": { "default_value": "Diytech 220" }, - "machine_start_gcode": { - "default_value": "G21\nG90\nM82\nM107\nG28\nG1 Z15 F200\nT0\nG92 E0\nG1 E16 F250\nG92 E0\n" - }, - "machine_end_gcode": { - "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0 T0\nM140 S0\nM117\nG28 X0 Y0\nM84" - }, - - - "machine_width": { - "default_value": 220 - }, - "machine_depth": { - "default_value": 220 - }, - "machine_height": { - "default_value": 305 - }, - "machine_heated_bed": { - "default_value": true - }, - - "machine_center_is_zero": { - "default_value": false - }, - "gantry_height": { - "value": "48" - }, - "machine_use_extruder_offset_to_offset_coords": { - "default_value": true - }, - "machine_gcode_flavor": { - "default_value": "Marlin" - }, - - "machine_nozzle_tip_outer_diameter": { - "default_value": 1 - }, - "machine_nozzle_head_distance": { - "default_value": 3 - }, - "machine_max_feedrate_x": { - "default_value": 300 - }, - "machine_max_feedrate_y": { - "default_value": 300 - }, - "machine_max_feedrate_z": { - "default_value": 40 - }, - "machine_acceleration": { - "default_value": 3000 - } + "machine_nozzle_head_distance": { "default_value": 3 }, + "machine_nozzle_tip_outer_diameter": { "default_value": 1 }, + "machine_start_gcode": { "default_value": "G21\nG90\nM82\nM107\nG28\nG1 Z15 F200\nT0\nG92 E0\nG1 E16 F250\nG92 E0\n" }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, + "machine_width": { "default_value": 220 } } -} +} \ No newline at end of file diff --git a/resources/definitions/dxu.def.json b/resources/definitions/dxu.def.json index e810506fea..8513dd5f8e 100644 --- a/resources/definitions/dxu.def.json +++ b/resources/definitions/dxu.def.json @@ -2,176 +2,160 @@ "version": 2, "name": "DXU", "inherits": "ultimaker2_plus", - "metadata": { + "metadata": + { "visible": true, "author": "TheUltimakerCommunity", "manufacturer": "DXU", - "has_variants": true, - "has_materials": true, - "has_machine_materials": false, - "has_machine_quality": false, - "has_variant_materials": false, - "weight": 0, "file_formats": "text/x-gcode", "platform": "ultimaker2_platform.obj", - "platform_texture": "dxu_backplate.png", - "platform_offset": [1.5, 0, 0], + "has_machine_materials": false, + "has_machine_quality": false, + "has_materials": true, + "has_variant_materials": false, + "has_variants": true, "machine_extruder_trains": { "0": "dxu_extruder1", "1": "dxu_extruder2" }, - "supported_actions": ["MachineSettingsAction", "UpgradeFirmware"] + "platform_offset": [ + 1.5, + 0, + 0 + ], + "platform_texture": "dxu_backplate.png", + "supported_actions": [ + "MachineSettingsAction", + "UpgradeFirmware" + ], + "weight": 0 }, - "overrides": { - "machine_name": { - "default_value": "dxu" - }, - "machine_width": { - "default_value": 238 - }, - "machine_depth": { - "default_value": 223 - }, - "machine_height": { - "default_value": 203 - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "material_diameter": { - "default_value": 1.75 - }, - "machine_nozzle_heat_up_speed": { - "default_value": 3.5 - }, - "machine_nozzle_cool_down_speed": { - "default_value": 1.5 - }, - "machine_min_cool_heat_time_window": - { - "default_value": 15.0 - }, - "machine_show_variants": { - "default_value": true - }, - "machine_nozzle_head_distance": { - "default_value": 5 - }, - "machine_nozzle_expansion_angle": { - "default_value": 45 - }, - "machine_heat_zone_length": { - "default_value": 20 - }, - "machine_heated_bed": { - "default_value": true - }, - "speed_wall_x": { - "value": "speed_wall" - }, - "layer_height_0": { - "value": "round(machine_nozzle_size / 1.5, 2)" - }, - "line_width": { - "value": "round(machine_nozzle_size * 0.875, 2)" - }, - "speed_support": { - "value": "speed_wall_0" - }, - "machine_max_feedrate_x": { - "default_value": 300 - }, - "machine_max_feedrate_y": { - "default_value": 300 - }, - "machine_max_feedrate_z": { - "default_value": 40 - }, - "machine_max_feedrate_e": { - "default_value": 45 - }, - "machine_acceleration": { - "default_value": 3000 - }, - "retraction_amount": { - "default_value": 6.5 - }, - "retraction_speed": { - "default_value": 25 - }, - "switch_extruder_retraction_amount": { - "value": "retraction_amount", - "enabled": false - }, - "switch_extruder_retraction_speeds": { - "value": "retraction_speed", - "enabled": false - }, - "switch_extruder_retraction_speed": { - "value": "retraction_retract_speed", - "enabled": false - }, - "switch_extruder_prime_speed": { - "value": "retraction_prime_speed", - "enabled": false - }, - "machine_head_with_fans_polygon": - { - "default_value": [ - [ -44, 14 ], - [ -44, -34 ], - [ 64, 14 ], - [ 64, -34 ] - ] - }, - "machine_use_extruder_offset_to_offset_coords": { - "default_value": false - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode" : { - "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \";material_bed_temperature={material_bed_temperature} material_print_temperature={material_print_temperature} material_print_temperature_layer_0={material_print_temperature_layer_0}\\nM190 S{material_bed_temperature_layer_0}\\nG21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nM200 D0 T{initial_extruder_nr} ;reset filament diameter\\nG28 ;home all\\nT{initial_extruder_nr} ;switch to the first nozzle used for print\\nM104 T{initial_extruder_nr} S{material_standby_temperature, initial_extruder_nr}\\nG0 X25 Y20 F7200\\nG0 Z20 F2400\\nM109 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\\nG0 X210 Y20 F7200\\nG92 E-7.0\\nG1 E0 F45 ;purge nozzle\\nG1 E-6.5 F1500\\nG1 E0 F1500\\nM400 ;finish all moves\\nT{initial_extruder_nr}\\n;end of startup sequence\\n\"" - }, - "machine_end_gcode" : { - "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \"G90 ;absolute positioning\\nM104 S0 T0 ;extruder heater off\\nM104 S0 T1\\nM140 S0 ;turn off bed\\nT0 ; move to the first head\\nM107 ;fan off\"" - }, - "machine_extruder_count": { - "default_value": 2 - }, + "overrides": + { "extruder_prime_pos_abs": { "default_value": false }, - "extruder_prime_pos_x": { "default_value": 0.0, "enabled": false }, - "extruder_prime_pos_y": { "default_value": 0.0, "enabled": false }, - "extruder_prime_pos_z": { "default_value": 0.0, "enabled": false }, - "layer_start_x": { + "extruder_prime_pos_x": + { + "default_value": 0.0, + "enabled": false + }, + "extruder_prime_pos_y": + { + "default_value": 0.0, + "enabled": false + }, + "extruder_prime_pos_z": + { + "default_value": 0.0, + "enabled": false + }, + "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, + "layer_start_x": + { "default_value": 180.0, "enabled": false }, - "layer_start_y": { + "layer_start_y": + { "default_value": 160.0, "enabled": false }, - "prime_tower_position_x": { - "value": "180" - }, - "prime_tower_position_y": { - "value": "160" - }, - "material_adhesion_tendency": { - "enabled": true - }, - "machine_disallowed_areas": { + "line_width": { "value": "round(machine_nozzle_size * 0.875, 2)" }, + "machine_acceleration": { "default_value": 3000 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 223 }, + "machine_disallowed_areas": + { "default_value": [ - [[-120, 112.5], [ -101, 112.5], [ -101, 106.5], [-120, 106.5]], - [[ 120, 112.5], [ 120, 106.5], [ 86, 106.5], [ 86, 112.5]], - [[-120, -112.5], [-120, -106.5], [ -101, -106.5], [ -101, -112.5]], - [[ 120, -112.5], [ 86, -112.5], [ 86, -106.5], [ 120, -106.5]], - [[ 120, -112.5], [ 120, -72.5], [ 93, -72.5], [ 93, -112.5]] + [ + [-120, 112.5], + [-101, 112.5], + [-101, 106.5], + [-120, 106.5] + ], + [ + [120, 112.5], + [120, 106.5], + [86, 106.5], + [86, 112.5] + ], + [ + [-120, -112.5], + [-120, -106.5], + [-101, -106.5], + [-101, -112.5] + ], + [ + [120, -112.5], + [86, -112.5], + [86, -106.5], + [120, -106.5] + ], + [ + [120, -112.5], + [120, -72.5], + [93, -72.5], + [93, -112.5] + ] ] + }, + "machine_end_gcode": { "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \"G90 ;absolute positioning\\nM104 S0 T0 ;extruder heater off\\nM104 S0 T1\\nM140 S0 ;turn off bed\\nT0 ; move to the first head\\nM107 ;fan off\"" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-44, 14], + [-44, -34], + [64, 14], + [64, -34] + ] + }, + "machine_heat_zone_length": { "default_value": 20 }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 203 }, + "machine_max_feedrate_e": { "default_value": 45 }, + "machine_max_feedrate_x": { "default_value": 300 }, + "machine_max_feedrate_y": { "default_value": 300 }, + "machine_max_feedrate_z": { "default_value": 40 }, + "machine_min_cool_heat_time_window": { "default_value": 15.0 }, + "machine_name": { "default_value": "dxu" }, + "machine_nozzle_cool_down_speed": { "default_value": 1.5 }, + "machine_nozzle_expansion_angle": { "default_value": 45 }, + "machine_nozzle_head_distance": { "default_value": 5 }, + "machine_nozzle_heat_up_speed": { "default_value": 3.5 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "machine_show_variants": { "default_value": true }, + "machine_start_gcode": { "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \";material_bed_temperature={material_bed_temperature} material_print_temperature={material_print_temperature} material_print_temperature_layer_0={material_print_temperature_layer_0}\\nM190 S{material_bed_temperature_layer_0}\\nG21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nM200 D0 T{initial_extruder_nr} ;reset filament diameter\\nG28 ;home all\\nT{initial_extruder_nr} ;switch to the first nozzle used for print\\nM104 T{initial_extruder_nr} S{material_standby_temperature, initial_extruder_nr}\\nG0 X25 Y20 F7200\\nG0 Z20 F2400\\nM109 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\\nG0 X210 Y20 F7200\\nG92 E-7.0\\nG1 E0 F45 ;purge nozzle\\nG1 E-6.5 F1500\\nG1 E0 F1500\\nM400 ;finish all moves\\nT{initial_extruder_nr}\\n;end of startup sequence\\n\"" }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": false }, + "machine_width": { "default_value": 238 }, + "material_adhesion_tendency": { "enabled": true }, + "material_diameter": { "default_value": 1.75 }, + "prime_tower_position_x": { "value": "180" }, + "prime_tower_position_y": { "value": "160" }, + "retraction_amount": { "default_value": 6.5 }, + "retraction_speed": { "default_value": 25 }, + "speed_support": { "value": "speed_wall_0" }, + "speed_wall_x": { "value": "speed_wall" }, + "switch_extruder_prime_speed": + { + "enabled": false, + "value": "retraction_prime_speed" + }, + "switch_extruder_retraction_amount": + { + "enabled": false, + "value": "retraction_amount" + }, + "switch_extruder_retraction_speed": + { + "enabled": false, + "value": "retraction_retract_speed" + }, + "switch_extruder_retraction_speeds": + { + "enabled": false, + "value": "retraction_speed" } } -} +} \ No newline at end of file diff --git a/resources/definitions/dxu_dual.def.json b/resources/definitions/dxu_dual.def.json index ebd126c142..6d30af005f 100644 --- a/resources/definitions/dxu_dual.def.json +++ b/resources/definitions/dxu_dual.def.json @@ -2,15 +2,10 @@ "version": 2, "name": "DXU Dual", "inherits": "dxu", - "overrides": { - "machine_start_gcode" : { - "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \";material_bed_temperature={material_bed_temperature} material_print_temperature={material_print_temperature} material_print_temperature_layer_0={material_print_temperature_layer_0}\\nM190 S{material_bed_temperature_layer_0}\\nM104 T0 S{material_standby_temperature, 0}\\nM104 T0 S{material_print_temperature_layer_0, 0}\\nG21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nM200 D0 T0 ;reset filament diameter\\nM200 D0 T1\\nG28 ;home all\\nT1 ; move to the nozzle 2\\nG0 Z20 F2400 ;move the platform to 30mm\\nM109 T1 S{material_print_temperature_layer_0, 1}\\nG0 X210 Y20 F7200\\nG92 E0\\nG92 E-7.0 ;prime distance\\nG1 E0 F45 ;purge nozzle\\nG1 E-6.5 F1500 ; retract\\nT0 ; move to the nozzle 1\\nM104 T1 S{material_standby_temperature, 1}\\nG0 Z20 F2400\\nM109 T0 S{material_print_temperature_layer_0, 0}\\nG0 X210 Y20 F7200\\nG92 E0\\nG92 E-7.0\\nG1 E0 F45 ;purge nozzle\\nG1 E-6.5 F1500\\nM104 T0 S{material_standby_temperature, 0}\\nT{initial_extruder_nr} ;switch to the first nozzle used for print\\nM109 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\\nM400 ;finish all moves\\nG1 E0 F1500\\nG92 E0\\n;end of startup sequence\\n\"" - }, - "machine_end_gcode" : { - "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \"G90 ;absolute positioning\\nM104 S0 T0 ;extruder heater off\\nM104 S0 T1\\nM140 S0 ;turn off bed\\nT0 ; move to the first head\\nM107 ;fan off\"" - }, - "prime_tower_enable": { - "default_value": true - } + "overrides": + { + "machine_end_gcode": { "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \"G90 ;absolute positioning\\nM104 S0 T0 ;extruder heater off\\nM104 S0 T1\\nM140 S0 ;turn off bed\\nT0 ; move to the first head\\nM107 ;fan off\"" }, + "machine_start_gcode": { "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \";material_bed_temperature={material_bed_temperature} material_print_temperature={material_print_temperature} material_print_temperature_layer_0={material_print_temperature_layer_0}\\nM190 S{material_bed_temperature_layer_0}\\nM104 T0 S{material_standby_temperature, 0}\\nM104 T0 S{material_print_temperature_layer_0, 0}\\nG21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nM200 D0 T0 ;reset filament diameter\\nM200 D0 T1\\nG28 ;home all\\nT1 ; move to the nozzle 2\\nG0 Z20 F2400 ;move the platform to 30mm\\nM109 T1 S{material_print_temperature_layer_0, 1}\\nG0 X210 Y20 F7200\\nG92 E0\\nG92 E-7.0 ;prime distance\\nG1 E0 F45 ;purge nozzle\\nG1 E-6.5 F1500 ; retract\\nT0 ; move to the nozzle 1\\nM104 T1 S{material_standby_temperature, 1}\\nG0 Z20 F2400\\nM109 T0 S{material_print_temperature_layer_0, 0}\\nG0 X210 Y20 F7200\\nG92 E0\\nG92 E-7.0\\nG1 E0 F45 ;purge nozzle\\nG1 E-6.5 F1500\\nM104 T0 S{material_standby_temperature, 0}\\nT{initial_extruder_nr} ;switch to the first nozzle used for print\\nM109 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\\nM400 ;finish all moves\\nG1 E0 F1500\\nG92 E0\\n;end of startup sequence\\n\"" }, + "prime_tower_enable": { "default_value": true } } -} +} \ No newline at end of file diff --git a/resources/definitions/dxu_umo.def.json b/resources/definitions/dxu_umo.def.json index 715b1ada90..dc936724a1 100644 --- a/resources/definitions/dxu_umo.def.json +++ b/resources/definitions/dxu_umo.def.json @@ -2,26 +2,25 @@ "version": 2, "name": "UMO+ DXU", "inherits": "dxu", - "overrides": { - "machine_disallowed_areas": { + "overrides": + { + "machine_depth": { "default_value": 205 }, + "machine_disallowed_areas": + { "default_value": [ - [[100, -102.5], [ 110, -102.5], [ 110, -62.5], [100, -62.5]] + [ + [100, -102.5], + [110, -102.5], + [110, -62.5], + [100, -62.5] + ] ] }, - "machine_width": { "default_value": 220 }, - "machine_depth": { "default_value": 205 }, + "machine_end_gcode": { "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \";end code from UM3\\nG91 ;Relative movement\\nG0 F15000 X8.0 Y8.0 Z3.5 E-4.5 ;Wiping+material retraction ;increase bed lower 0.5>5.0 and add Y movement\\nG0 F10000 Z1.5 E4.5 ;Compensation for the retraction\\nG90 ;Disable relative movement\\n\\nG90 ;absolute positioning\\nM104 S0 T0 ;extruder heater off\\nM104 S0 T1\\nM140 S0 ;turn off bed\\nT0 ; move to the first head\\nM107 ;fan off\\nM355 S0 ;turn off case light\"" }, "machine_height": { "default_value": 200 }, - "machine_nozzle_heat_up_speed": { - "default_value": 1.95 - }, - "machine_nozzle_cool_down_speed": { - "default_value": 0.8 - }, - "machine_start_gcode" : { - "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \"; Script based on an original created by tjjfvi (https://github.com/tjjfvi)\\n; An up-to-date version of the tjjfvi's original script can be found\\n; here: https://csi.t6.fyi/\\n; Note - This script will only work in Cura V4.2 and above!\\n; --- Global Settings\\n; layer_height = {layer_height}\\n; smooth_spiralized_contours = {smooth_spiralized_contours}\\n; magic_mesh_surface_mode = {magic_mesh_surface_mode}\\n; machine_extruder_count = {machine_extruder_count}\\n; --- Single Extruder Settings\\n; speed_z_hop = {speed_z_hop}\\n; retraction_amount = {retraction_amount}\\n; retraction_hop = {retraction_hop}\\n; retraction_hop_enabled = {retraction_hop_enabled}\\n; retraction_enable = {retraction_enable}\\n; retraction_speed = {retraction_speed}\\n; retraction_retract_speed = {retraction_retract_speed}\\n; retraction_prime_speed = {retraction_prime_speed}\\n; speed_travel = {speed_travel}\\n\\nM355 S1 P25;turn on case light\\n\\n;material_bed_temperature={material_bed_temperature} material_print_temperature={material_print_temperature} material_print_temperature_layer_0={material_print_temperature_layer_0}\\nM190 S{material_bed_temperature_layer_0}\\nG21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nM200 D0 T{initial_extruder_nr} ;reset filament diameter\\nG28 ;home all\\nT{initial_extruder_nr} ;switch to the first nozzle used for print\\nM104 T{initial_extruder_nr} S{material_standby_temperature, initial_extruder_nr}\\nG0 X25 Y20 F7200 ;change Y20 to Y0 ansonl\\nG0 Z20 F2400\\nM109 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\\nG0 X210 Y0 F7200\\nG92 E-12.0 ; increase purge 6.5 to 12\\nG1 E0 F200 ;purge nozzle ;change F45 to F200 like ultimaker code ansonl\\nG1 E-6.5 F1500\\nG1 E0 F1500\\nG1 Y50 F9000 ;add quick movement to Y50 like ultimaker code ansonl\\nM400 ;finish all moves\\nT{initial_extruder_nr}\\n;end of startup sequence\\n\\nM355 S1 P50;turn on case light\"" - }, - "machine_end_gcode" : { - "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \";end code from UM3\\nG91 ;Relative movement\\nG0 F15000 X8.0 Y8.0 Z3.5 E-4.5 ;Wiping+material retraction ;increase bed lower 0.5>5.0 and add Y movement\\nG0 F10000 Z1.5 E4.5 ;Compensation for the retraction\\nG90 ;Disable relative movement\\n\\nG90 ;absolute positioning\\nM104 S0 T0 ;extruder heater off\\nM104 S0 T1\\nM140 S0 ;turn off bed\\nT0 ; move to the first head\\nM107 ;fan off\\nM355 S0 ;turn off case light\"" - } + "machine_nozzle_cool_down_speed": { "default_value": 0.8 }, + "machine_nozzle_heat_up_speed": { "default_value": 1.95 }, + "machine_start_gcode": { "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \"; Script based on an original created by tjjfvi (https://github.com/tjjfvi)\\n; An up-to-date version of the tjjfvi's original script can be found\\n; here: https://csi.t6.fyi/\\n; Note - This script will only work in Cura V4.2 and above!\\n; --- Global Settings\\n; layer_height = {layer_height}\\n; smooth_spiralized_contours = {smooth_spiralized_contours}\\n; magic_mesh_surface_mode = {magic_mesh_surface_mode}\\n; machine_extruder_count = {machine_extruder_count}\\n; --- Single Extruder Settings\\n; speed_z_hop = {speed_z_hop}\\n; retraction_amount = {retraction_amount}\\n; retraction_hop = {retraction_hop}\\n; retraction_hop_enabled = {retraction_hop_enabled}\\n; retraction_enable = {retraction_enable}\\n; retraction_speed = {retraction_speed}\\n; retraction_retract_speed = {retraction_retract_speed}\\n; retraction_prime_speed = {retraction_prime_speed}\\n; speed_travel = {speed_travel}\\n\\nM355 S1 P25;turn on case light\\n\\n;material_bed_temperature={material_bed_temperature} material_print_temperature={material_print_temperature} material_print_temperature_layer_0={material_print_temperature_layer_0}\\nM190 S{material_bed_temperature_layer_0}\\nG21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nM200 D0 T{initial_extruder_nr} ;reset filament diameter\\nG28 ;home all\\nT{initial_extruder_nr} ;switch to the first nozzle used for print\\nM104 T{initial_extruder_nr} S{material_standby_temperature, initial_extruder_nr}\\nG0 X25 Y20 F7200 ;change Y20 to Y0 ansonl\\nG0 Z20 F2400\\nM109 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\\nG0 X210 Y0 F7200\\nG92 E-12.0 ; increase purge 6.5 to 12\\nG1 E0 F200 ;purge nozzle ;change F45 to F200 like ultimaker code ansonl\\nG1 E-6.5 F1500\\nG1 E0 F1500\\nG1 Y50 F9000 ;add quick movement to Y50 like ultimaker code ansonl\\nM400 ;finish all moves\\nT{initial_extruder_nr}\\n;end of startup sequence\\n\\nM355 S1 P50;turn on case light\"" }, + "machine_width": { "default_value": 220 } } -} +} \ No newline at end of file diff --git a/resources/definitions/dxu_umo_dual.def.json b/resources/definitions/dxu_umo_dual.def.json index 1744bf1d52..f641b928cd 100644 --- a/resources/definitions/dxu_umo_dual.def.json +++ b/resources/definitions/dxu_umo_dual.def.json @@ -2,32 +2,27 @@ "version": 2, "name": "UMO+ DXU Dual", "inherits": "dxu_dual", - "overrides": { - "machine_disallowed_areas": { + "overrides": + { + "machine_depth": { "default_value": 205 }, + "machine_disallowed_areas": + { "default_value": [ - [[100, -102.5], [ 110, -102.5], [ 110, -62.5], [100, -62.5]] + [ + [100, -102.5], + [110, -102.5], + [110, -62.5], + [100, -62.5] + ] ] }, - "machine_width": { "default_value": 220 }, - "machine_depth": { "default_value": 205 }, + "machine_end_gcode": { "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \";end code from UM3\\nG91 ;Relative movement\\nG0 F15000 X8.0 Y8.0 Z3.5 E-4.5 ;Wiping+material retraction ;increase bed lower 0.5>5.0 and add Y movement\\nG0 F10000 Z1.5 E4.5 ;Compensation for the retraction\\nG90 ;Disable relative movement\\n\\nG90 ;absolute positioning\\nM104 S0 T0 ;extruder heater off\\nM104 S0 T1\\nM140 S0 ;turn off bed\\nT0 ; move to the first head\\nM107 ;fan off\\nM355 S0 ;turn off case light\"" }, "machine_height": { "default_value": 200 }, - "machine_nozzle_heat_up_speed": { - "default_value": 1.95 - }, - "machine_nozzle_cool_down_speed": { - "default_value": 0.8 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "material_diameter": { - "default_value": 1.75 - }, - "machine_start_gcode" : { - "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \"; Script based on an original created by tjjfvi (https://github.com/tjjfvi)\\n; An up-to-date version of the tjjfvi's original script can be found\\n; here: https://csi.t6.fyi/\\n; Note - This script will only work in Cura V4.2 and above!\\n; --- Global Settings\\n; layer_height = {layer_height}\\n; smooth_spiralized_contours = {smooth_spiralized_contours}\\n; magic_mesh_surface_mode = {magic_mesh_surface_mode}\\n; machine_extruder_count = {machine_extruder_count}\\n; --- Single Extruder Settings\\n; speed_z_hop = {speed_z_hop}\\n; retraction_amount = {retraction_amount}\\n; retraction_hop = {retraction_hop}\\n; retraction_hop_enabled = {retraction_hop_enabled}\\n; retraction_enable = {retraction_enable}\\n; retraction_speed = {retraction_speed}\\n; retraction_retract_speed = {retraction_retract_speed}\\n; retraction_prime_speed = {retraction_prime_speed}\\n; speed_travel = {speed_travel}\\n; --- Multi-Extruder Settings\\n; speed_z_hop_0 = {speed_z_hop, 0}\\n; speed_z_hop_1 = {speed_z_hop, 1}\\n; retraction_amount_0 = {retraction_amount, 0}\\n; retraction_amount_1 = {retraction_amount, 1}\\n; retraction_hop_0 = {retraction_hop, 0}\\n; retraction_hop_1 = {retraction_hop, 1}\\n; retraction_hop_enabled_0 = {retraction_hop_enabled, 0}\\n; retraction_hop_enabled_1 = {retraction_hop_enabled, 1}\\n; retraction_prime_speed_0 = {retraction_prime_speed, 0}\\n; retraction_prime_speed_1 = {retraction_prime_speed, 1}\\n; retraction_retract_speed_0 = {retraction_retract_speed, 0}\\n; retraction_retract_speed_1 = {retraction_retract_speed, 1}\\n; retraction_speed_0 = {retraction_speed, 0}\\n; retraction_speed_1 = {retraction_speed, 1}\\n; retraction_enable_0 = {retraction_enable, 0}\\n; retraction_enable_1 = {retraction_enable, 1}\\n; speed_travel_0 = {speed_travel, 0}\\n; speed_travel_1 = {speed_travel, 1}\\n\\nM355 S1 P25;turn on case light\\n\\n;material_bed_temperature={material_bed_temperature} material_print_temperature={material_print_temperature} material_print_temperature_layer_0={material_print_temperature_layer_0}\\nM190 S{material_bed_temperature_layer_0}\\nM104 T0 S{material_standby_temperature, 0}\\nM104 T0 S{material_print_temperature_layer_0, 0}\\nG21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nM200 D0 T0 ;reset filament diameter\\nM200 D0 T1\\nG28 ;home all\\nT1 ; move to the nozzle 2\\nG0 Z20 F2400 ;move the platform to 30mm\\nM109 T1 S{material_print_temperature_layer_0, 1}\\nG0 X210 Y0 F7200 ;change Y20 to Y0 ansonl\\nG92 E0\\nG92 E-12.0 ;prime distance ;increase purge 6.5 to 12\\nG1 E0 F200 ;purge nozzle ;change F45 to F200 like ultimaker code ansonl\\nG1 E-6.5 F1500 ; retract\\nT0 ; move to the nozzle 1\\nM104 T1 S{material_standby_temperature, 1}\\nG0 Z20 F2400\\nM109 T0 S{material_print_temperature_layer_0, 0}\\nG0 X210 Y0 F7200 ;change Y20 to Y0 ansonl\\nG92 E0\\nG92 E-12.0\\nG1 E0 F200 ;purge nozzle\\nG1 E-6.5 F1500\\nM104 T0 S{material_standby_temperature, 0}\\nT{initial_extruder_nr} ;switch to the first nozzle used for print\\nM109 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\\nM400 ;finish all moves\\nG1 E0 F1500\\nG92 E0\\nG1 Y100 F9000 ;add quick movement to Y50 like ultimaker code ansonl\\n;end of startup sequence\\n\\nM355 S1 P50;turn on case light\"" - }, - "machine_end_gcode" : { - "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \";end code from UM3\\nG91 ;Relative movement\\nG0 F15000 X8.0 Y8.0 Z3.5 E-4.5 ;Wiping+material retraction ;increase bed lower 0.5>5.0 and add Y movement\\nG0 F10000 Z1.5 E4.5 ;Compensation for the retraction\\nG90 ;Disable relative movement\\n\\nG90 ;absolute positioning\\nM104 S0 T0 ;extruder heater off\\nM104 S0 T1\\nM140 S0 ;turn off bed\\nT0 ; move to the first head\\nM107 ;fan off\\nM355 S0 ;turn off case light\"" - } + "machine_nozzle_cool_down_speed": { "default_value": 0.8 }, + "machine_nozzle_heat_up_speed": { "default_value": 1.95 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "machine_start_gcode": { "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \"; Script based on an original created by tjjfvi (https://github.com/tjjfvi)\\n; An up-to-date version of the tjjfvi's original script can be found\\n; here: https://csi.t6.fyi/\\n; Note - This script will only work in Cura V4.2 and above!\\n; --- Global Settings\\n; layer_height = {layer_height}\\n; smooth_spiralized_contours = {smooth_spiralized_contours}\\n; magic_mesh_surface_mode = {magic_mesh_surface_mode}\\n; machine_extruder_count = {machine_extruder_count}\\n; --- Single Extruder Settings\\n; speed_z_hop = {speed_z_hop}\\n; retraction_amount = {retraction_amount}\\n; retraction_hop = {retraction_hop}\\n; retraction_hop_enabled = {retraction_hop_enabled}\\n; retraction_enable = {retraction_enable}\\n; retraction_speed = {retraction_speed}\\n; retraction_retract_speed = {retraction_retract_speed}\\n; retraction_prime_speed = {retraction_prime_speed}\\n; speed_travel = {speed_travel}\\n; --- Multi-Extruder Settings\\n; speed_z_hop_0 = {speed_z_hop, 0}\\n; speed_z_hop_1 = {speed_z_hop, 1}\\n; retraction_amount_0 = {retraction_amount, 0}\\n; retraction_amount_1 = {retraction_amount, 1}\\n; retraction_hop_0 = {retraction_hop, 0}\\n; retraction_hop_1 = {retraction_hop, 1}\\n; retraction_hop_enabled_0 = {retraction_hop_enabled, 0}\\n; retraction_hop_enabled_1 = {retraction_hop_enabled, 1}\\n; retraction_prime_speed_0 = {retraction_prime_speed, 0}\\n; retraction_prime_speed_1 = {retraction_prime_speed, 1}\\n; retraction_retract_speed_0 = {retraction_retract_speed, 0}\\n; retraction_retract_speed_1 = {retraction_retract_speed, 1}\\n; retraction_speed_0 = {retraction_speed, 0}\\n; retraction_speed_1 = {retraction_speed, 1}\\n; retraction_enable_0 = {retraction_enable, 0}\\n; retraction_enable_1 = {retraction_enable, 1}\\n; speed_travel_0 = {speed_travel, 0}\\n; speed_travel_1 = {speed_travel, 1}\\n\\nM355 S1 P25;turn on case light\\n\\n;material_bed_temperature={material_bed_temperature} material_print_temperature={material_print_temperature} material_print_temperature_layer_0={material_print_temperature_layer_0}\\nM190 S{material_bed_temperature_layer_0}\\nM104 T0 S{material_standby_temperature, 0}\\nM104 T0 S{material_print_temperature_layer_0, 0}\\nG21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nM200 D0 T0 ;reset filament diameter\\nM200 D0 T1\\nG28 ;home all\\nT1 ; move to the nozzle 2\\nG0 Z20 F2400 ;move the platform to 30mm\\nM109 T1 S{material_print_temperature_layer_0, 1}\\nG0 X210 Y0 F7200 ;change Y20 to Y0 ansonl\\nG92 E0\\nG92 E-12.0 ;prime distance ;increase purge 6.5 to 12\\nG1 E0 F200 ;purge nozzle ;change F45 to F200 like ultimaker code ansonl\\nG1 E-6.5 F1500 ; retract\\nT0 ; move to the nozzle 1\\nM104 T1 S{material_standby_temperature, 1}\\nG0 Z20 F2400\\nM109 T0 S{material_print_temperature_layer_0, 0}\\nG0 X210 Y0 F7200 ;change Y20 to Y0 ansonl\\nG92 E0\\nG92 E-12.0\\nG1 E0 F200 ;purge nozzle\\nG1 E-6.5 F1500\\nM104 T0 S{material_standby_temperature, 0}\\nT{initial_extruder_nr} ;switch to the first nozzle used for print\\nM109 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\\nM400 ;finish all moves\\nG1 E0 F1500\\nG92 E0\\nG1 Y100 F9000 ;add quick movement to Y50 like ultimaker code ansonl\\n;end of startup sequence\\n\\nM355 S1 P50;turn on case light\"" }, + "machine_width": { "default_value": 220 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/definitions/easyarts_ares.def.json b/resources/definitions/easyarts_ares.def.json index 8751f2c3e1..cac0ffcb39 100644 --- a/resources/definitions/easyarts_ares.def.json +++ b/resources/definitions/easyarts_ares.def.json @@ -1,59 +1,30 @@ { - "name": "EasyArts Ares", "version": 2, + "name": "EasyArts Ares", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "nliaudat", "manufacturer": "EasyArts", "file_formats": "text/x-gcode", - "machine_extruder_trains": - { - "0": "easyarts_ares_extruder_0" - } + "machine_extruder_trains": { "0": "easyarts_ares_extruder_0" } }, - "overrides": { - "machine_start_gcode": { - "default_value": "; -- START GCODE --\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 \nG29 Z0.12 ;Auto-bedleveling with Z offset \nG92 E0 ;zero the extruded length \nG1 F2000 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\nM117 Printing...\n; -- end of START GCODE --" - }, - "machine_end_gcode": { - "default_value": "; -- START GCODE --\nG28 ; Home all axes\nM104 S0 ;extruder heater off\n;M140 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\n;M84 ;steppers off\nG90 ;absolute positioning\n; -- end of START GCODE --" - }, - "machine_width": { - "default_value": 180 - }, - "machine_depth": { - "default_value": 180 - }, - "machine_height": { - "default_value": 200 - }, - "machine_heated_bed": { - "default_value": false - }, - "machine_center_is_zero": { - "default_value": true - }, - "machine_gcode_flavor": { - "default_value": "RepRap" - }, - "layer_height": { - "default_value": 0.2 - }, - "layer_height_0": { - "default_value": 0.2 - }, - "wall_thickness": { - "value": "1" - }, - "top_bottom_thickness": { - "default_value": 1 - }, - "speed_print": { - "default_value": 75 - }, - "support_enable": { - "default_value": true - } + "overrides": + { + "layer_height": { "default_value": 0.2 }, + "layer_height_0": { "default_value": 0.2 }, + "machine_center_is_zero": { "default_value": true }, + "machine_depth": { "default_value": 180 }, + "machine_end_gcode": { "default_value": "; -- START GCODE --\nG28 ; Home all axes\nM104 S0 ;extruder heater off\n;M140 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\n;M84 ;steppers off\nG90 ;absolute positioning\n; -- end of START GCODE --" }, + "machine_gcode_flavor": { "default_value": "RepRap" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 200 }, + "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 \nG29 Z0.12 ;Auto-bedleveling with Z offset \nG92 E0 ;zero the extruded length \nG1 F2000 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\nM117 Printing...\n; -- end of START GCODE --" }, + "machine_width": { "default_value": 180 }, + "speed_print": { "default_value": 75 }, + "support_enable": { "default_value": true }, + "top_bottom_thickness": { "default_value": 1 }, + "wall_thickness": { "value": "1" } } -} +} \ No newline at end of file diff --git a/resources/definitions/eazao_zero.def.json b/resources/definitions/eazao_zero.def.json index 63286a1333..4441984dd6 100644 --- a/resources/definitions/eazao_zero.def.json +++ b/resources/definitions/eazao_zero.def.json @@ -2,125 +2,80 @@ "version": 2, "name": "Eazao Zero", "inherits": "fdmprinter", - "metadata": - { + "metadata": + { "visible": true, "author": "Eazao", "manufacturer": "Eazao", "file_formats": "text/x-gcode", - "has_materials": true, "has_machine_quality": false, - "preferred_quality_type": "normal", + "has_materials": true, + "machine_extruder_trains": { "0": "eazao_zero_extruder_0" }, "preferred_material": "generic_pla", - - "machine_extruder_trains": - { - "0": "eazao_zero_extruder_0" - } - }, - "overrides": + "preferred_quality_type": "normal" + }, + "overrides": { - "machine_name": - { - "default_value": "EAZAO Zero" - }, - "machine_heated_bed": - { - "default_value": false - }, - "machine_width": - { - "default_value": 150 - }, - "machine_depth": - { - "default_value": 150 - }, - "machine_height": - { - "default_value": 240 - }, - "machine_center_is_zero": - { - "default_value": false - }, - "machine_gcode_flavor": - { - "default_value": "Marlin (Marlin/Sprinter)" - }, - "machine_start_gcode": - { - "default_value": "G21 \nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home \nG1 Z15.0 F1500 ;move the platform down 15mm\nG92 E0 \nG1 F300 E10\nG92 E0\nM302\nM163 S0 P0.9; Set Mix Factor\nM163 S1 P0.1; Set Mix Factor\nM164 S0\n" - }, - "machine_end_gcode": - { - "default_value": "G92 E10\nG1 E-10 F300\nG28 X0 Y0 ;move X Y to min endstops\nM82\nM84 ;steppers off\n" - }, - "machine_max_feedrate_x": { "value": 100 }, - "machine_max_feedrate_y": { "value": 100 }, - "machine_max_feedrate_z": { "value": 5 }, - "machine_max_feedrate_e": { "value": 25 }, - - "machine_max_acceleration_x": { "value": 500 }, - "machine_max_acceleration_y": { "value": 500 }, - "machine_max_acceleration_z": { "value": 50 }, - "machine_max_acceleration_e": { "value": 500 }, - "machine_acceleration": { "value": 300 }, + "acceleration_enabled": { "value": false }, "acceleration_print": { "value": 300 }, "acceleration_travel": { "value": 300 }, - "acceleration_enabled": { "value": false }, - - "machine_max_jerk_xy": { "value": 10 }, - "machine_max_jerk_z": { "value": 0.3 }, - "machine_max_jerk_e": { "value": 5 }, + "adhesion_type": { "default_value": "none" }, + "bottom_layers": { "value": 2 }, + "cool_fan_enabled": { "value": false }, + "infill_sparse_density": { "value": 0 }, + "initial_bottom_layers": { "value": 2 }, + "jerk_enabled": { "value": false }, "jerk_print": { "value": 10 }, "jerk_travel": { "value": "jerk_print" }, "jerk_travel_layer_0": { "value": "jerk_travel" }, - "jerk_enabled": { "value": false }, - - "layer_height": {"value":1.0}, - "layer_height_0": {"value":1.0}, - "line_width": {"value":3.0}, - - "wall_thickness": {"value":3.0}, - "optimize_wall_printing_order": { "value": "True" }, - - "top_bottom_thickness": {"value":0}, - "bottom_layers":{"value":2}, - "initial_bottom_layers":{"value":2}, - - "infill_sparse_density": {"value":0}, - + "layer_height": { "value": 1.0 }, + "layer_height_0": { "value": 1.0 }, + "line_width": { "value": 3.0 }, + "machine_acceleration": { "value": 300 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 150 }, + "machine_end_gcode": { "default_value": "G92 E10\nG1 E-10 F300\nG28 X0 Y0 ;move X Y to min endstops\nM82\nM84 ;steppers off\n" }, + "machine_gcode_flavor": { "default_value": "Marlin (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 240 }, + "machine_max_acceleration_e": { "value": 500 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 50 }, + "machine_max_feedrate_e": { "value": 25 }, + "machine_max_feedrate_x": { "value": 100 }, + "machine_max_feedrate_y": { "value": 100 }, + "machine_max_feedrate_z": { "value": 5 }, + "machine_max_jerk_e": { "value": 5 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.3 }, + "machine_name": { "default_value": "EAZAO Zero" }, + "machine_start_gcode": { "default_value": "G21 \nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home \nG1 Z15.0 F1500 ;move the platform down 15mm\nG92 E0 \nG1 F300 E10\nG92 E0\nM302\nM163 S0 P0.9; Set Mix Factor\nM163 S1 P0.1; Set Mix Factor\nM164 S0\n" }, + "machine_width": { "default_value": 150 }, + "material_final_print_temperature": { "value": "0" }, + "material_initial_print_temperature": { "value": "0" }, "material_print_temperature": { "value": "0" }, "material_print_temperature_layer_0": { "value": "0" }, - "material_initial_print_temperature": { "value": "0" }, - "material_final_print_temperature": { "value": "0" }, - + "optimize_wall_printing_order": { "value": "True" }, + "retraction_amount": { "value": 7 }, + "retraction_combing": { "value": "'noskin'" }, + "retraction_combing_max_distance": { "value": 0 }, + "retraction_count_max": { "value": 100 }, + "retraction_enable": { "value": false }, + "retraction_extrusion_window": { "value": 10 }, + "retraction_hop": { "value": 0.2 }, + "retraction_hop_enabled": { "value": false }, + "retraction_speed": { "value": 25 }, "speed_print": { "value": 20.0 }, + "speed_travel": { "value": 20.0 }, "speed_wall": { "value": 20.0 }, "speed_wall_0": { "value": 20.0 }, "speed_wall_x": { "value": 20.0 }, - "speed_travel": { "value": 20.0 }, "speed_z_hop": { "value": "machine_max_feedrate_z" }, - - "retraction_hop_enabled": { "value": false }, - "retraction_hop": { "value": 0.2 }, - "retraction_combing": { "value": "'noskin'" }, - "retraction_combing_max_distance": { "value": 0 }, - + "top_bottom_thickness": { "value": 0 }, "travel_avoid_other_parts": { "value": true }, "travel_avoid_supports": { "value": false }, "travel_retract_before_outer_wall": { "value": false }, - - "retraction_enable": { "value": false }, - "retraction_speed": { "value": 25 }, - "retraction_amount": { "value": 7 }, - "retraction_count_max": { "value": 100 }, - "retraction_extrusion_window": { "value": 10 }, - - "cool_fan_enabled": { "value": false }, - - "adhesion_type": { "default_value": "none" } - + "wall_thickness": { "value": 3.0 } } -} +} \ No newline at end of file diff --git a/resources/definitions/elegoo_neptune_2.def.json b/resources/definitions/elegoo_neptune_2.def.json index 8e564289f5..8554137dcd 100644 --- a/resources/definitions/elegoo_neptune_2.def.json +++ b/resources/definitions/elegoo_neptune_2.def.json @@ -1,45 +1,62 @@ { - "name": "Neptune 2", "version": 2, + "name": "Neptune 2", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Toylerrr", "manufacturer": "Elegoo", - "platform": "elegoo_neptune_2.stl", - "platform_offset": [0,0,0], - "has_machine_quality": true, - "preferred_quality_type": "normal", "file_formats": "text/x-gcode", - "machine_extruder_trains": - { - "0": "elegoo_neptune2_extruder_0" - } + "platform": "elegoo_neptune_2.stl", + "has_machine_quality": true, + "machine_extruder_trains": { "0": "elegoo_neptune2_extruder_0" }, + "platform_offset": [ + 0, + 0, + 0 + ], + "preferred_quality_type": "normal" }, - - "overrides": { - "machine_name": {"default_value": "ELEGOO Neptune 2"}, - "machine_width": {"default_value": 235}, - "machine_height": {"default_value": 260}, - "machine_depth": {"default_value": 235}, - "machine_heated_bed": {"default_value": true}, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "brim_width": { "default_value": 5 }, + "gantry_height": { "value": 30 }, + "machine_depth": { "default_value": 235 }, + "machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F1600 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "value": [ + [-30, 35], + [-30, -10], + [25, 35], + [25, -10] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 260 }, + "machine_name": { "default_value": "ELEGOO Neptune 2" }, + "machine_start_gcode": { "default_value": ";simage\n;gimage\nG28 ;home\nG92 E0 ;Reset Extruder\nG1 Z4.0 F3000 ;Move Z Axis up\nG92 E0 ;Reset Extruder\nG1 X1.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X1.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X1.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X1.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up" }, + "machine_width": { "default_value": 235 }, "material_diameter": { "default_value": 1.75 }, - "machine_head_with_fans_polygon": {"value": [[-30, 35], [-30, -10], [25, 35], [25, -10]]}, - "gantry_height": {"value": 30}, - "speed_print": { "value": 60.0 } , - "z_seam_type":{"default_value": "back"}, - "z_seam_corner":{"default_value": "z_seam_corner_weighted"}, - "material_standby_temperature":{"default_value": 200,"settable_per_extruder": false}, - "retraction_enable":{"default_value": true}, - "retraction_amount":{"default_value": 5}, - "retraction_speed":{"default_value": 70}, - "adhesion_type":{"default_value": "skirt"}, - "raft_margin":{"default_value": 5}, - "raft_airgap":{"default_value": 0.25}, - "brim_width":{"default_value": 5}, - "skin_angles":{"default_value": [45, 135]}, - "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"}, - "machine_start_gcode": {"default_value": ";simage\n;gimage\nG28 ;home\nG92 E0 ;Reset Extruder\nG1 Z4.0 F3000 ;Move Z Axis up\nG92 E0 ;Reset Extruder\nG1 X1.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X1.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X1.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X1.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up"}, - "machine_end_gcode": {"default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F1600 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z"} + "material_standby_temperature": + { + "default_value": 200, + "settable_per_extruder": false + }, + "raft_airgap": { "default_value": 0.25 }, + "raft_margin": { "default_value": 5 }, + "retraction_amount": { "default_value": 5 }, + "retraction_enable": { "default_value": true }, + "retraction_speed": { "default_value": 70 }, + "skin_angles": + { + "default_value": [45, 135] + }, + "speed_print": { "value": 60.0 }, + "z_seam_corner": { "default_value": "z_seam_corner_weighted" }, + "z_seam_type": { "default_value": "back" } } -} +} \ No newline at end of file diff --git a/resources/definitions/elegoo_neptune_2D.def.json b/resources/definitions/elegoo_neptune_2D.def.json index 78e87d6f40..c9aa5a0184 100644 --- a/resources/definitions/elegoo_neptune_2D.def.json +++ b/resources/definitions/elegoo_neptune_2D.def.json @@ -1,54 +1,74 @@ { - "name": "Neptune 2D", "version": 2, + "name": "Neptune 2D", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Toylerrr", "manufacturer": "Elegoo", - "platform": "elegoo_neptune_2.stl", - "platform_offset": [0,0,0], - "has_machine_quality": true, - "preferred_quality_type": "normal", "file_formats": "text/x-gcode", + "platform": "elegoo_neptune_2.stl", + "has_machine_quality": true, "machine_extruder_trains": { "0": "elegoo_neptune2D_extruder_0", "1": "elegoo_neptune2D_extruder_1" - } + }, + "platform_offset": [ + 0, + 0, + 0 + ], + "preferred_quality_type": "normal" }, - - "overrides": { - "machine_name": {"default_value": "ELEGOO Neptune 2D"}, - "machine_extruder_count": {"default_value": 2}, - "machine_width": {"default_value": 235}, - "machine_height": {"default_value": 260}, - "machine_depth": {"default_value": 235}, - "machine_heated_bed": {"default_value": true}, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "brim_width": { "default_value": 5 }, + "gantry_height": { "value": 30 }, + "machine_always_write_active_tool": { "default_value": true }, + "machine_depth": { "default_value": 235 }, + "machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-80 Z0.2 F1600 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_extruders_share_heater": { "default_value": true }, + "machine_extruders_share_nozzle": { "default_value": true }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "value": [ + [-30, 35], + [-30, -10], + [25, 35], + [25, -10] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 260 }, + "machine_name": { "default_value": "ELEGOO Neptune 2D" }, + "machine_start_gcode": { "default_value": ";simage\n;gimage\nG28 ;home\n;G29 ;Run ABL\n;M420 S1 ;Enable ABL mesh\nG92 E0 ;Reset Extruder\nG1 Z4.0 F3000 ;Move Z Axis up\nG92 E0 ;Reset Extruder\nG1 X2.0 Y20 Z0.28 F5000.0 ;Move to start position\nG1 E90 F1200 ;Load filament\nG92 E0 ;Reset Extruder\nG1 X2.0 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X2.3 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X2.3 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up" }, + "machine_width": { "default_value": 235 }, "material_diameter": { "default_value": 1.75 }, - "machine_head_with_fans_polygon": {"value": [[-30, 35], [-30, -10], [25, 35], [25, -10]]}, - "gantry_height": {"value": 30}, - "machine_extruders_share_heater": {"default_value": true}, - "machine_extruders_share_nozzle": {"default_value": true}, - "machine_always_write_active_tool": {"default_value": true}, - "prime_blob_enable": {"default_value": false}, - "prime_tower_enable": {"default_value": true}, - "prime_tower_size": {"default_value": 30}, - "prime_tower_min_volume": {"default_value": 90}, + "material_standby_temperature": + { + "default_value": 200, + "settable_per_extruder": false + }, + "prime_blob_enable": { "default_value": false }, + "prime_tower_enable": { "default_value": true }, + "prime_tower_min_volume": { "default_value": 90 }, + "prime_tower_size": { "default_value": 30 }, + "raft_airgap": { "default_value": 0.25 }, + "raft_margin": { "default_value": 5 }, + "retraction_amount": { "default_value": 5 }, + "retraction_enable": { "default_value": true }, + "retraction_speed": { "default_value": 70 }, + "skin_angles": + { + "default_value": [45, 135] + }, "speed_print": { "value": 60.0 }, - "z_seam_type":{"default_value": "back"}, - "z_seam_corner":{"default_value": "z_seam_corner_weighted"}, - "material_standby_temperature":{"default_value": 200,"settable_per_extruder": false}, - "retraction_enable":{"default_value": true}, - "retraction_amount":{"default_value": 5}, - "retraction_speed":{"default_value": 70}, - "adhesion_type":{"default_value": "skirt"}, - "raft_margin":{"default_value": 5}, - "raft_airgap":{"default_value": 0.25}, - "brim_width":{"default_value": 5}, - "skin_angles":{"default_value": [45, 135]}, - "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"}, - "machine_start_gcode": {"default_value": ";simage\n;gimage\nG28 ;home\n;G29 ;Run ABL\n;M420 S1 ;Enable ABL mesh\nG92 E0 ;Reset Extruder\nG1 Z4.0 F3000 ;Move Z Axis up\nG92 E0 ;Reset Extruder\nG1 X2.0 Y20 Z0.28 F5000.0 ;Move to start position\nG1 E90 F1200 ;Load filament\nG92 E0 ;Reset Extruder\nG1 X2.0 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X2.3 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X2.3 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up"}, - "machine_end_gcode": {"default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-80 Z0.2 F1600 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z"} + "z_seam_corner": { "default_value": "z_seam_corner_weighted" }, + "z_seam_type": { "default_value": "back" } } -} +} \ No newline at end of file diff --git a/resources/definitions/eryone_er20.def.json b/resources/definitions/eryone_er20.def.json index f9fe209151..3d071bbdc5 100644 --- a/resources/definitions/eryone_er20.def.json +++ b/resources/definitions/eryone_er20.def.json @@ -2,43 +2,47 @@ "version": 2, "name": "Eryone ER20", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Eryone3d", "manufacturer": "Eryone", "file_formats": "text/x-gcode", "platform": "eryone_er20_plateform.stl", "has_machine_quality": true, - "preferred_quality_type": "high", - "machine_extruder_trains": - { - "0": "eryone_er20_extruder_0" - } + "machine_extruder_trains": { "0": "eryone_er20_extruder_0" }, + "preferred_quality_type": "high" }, - - "overrides": { - "machine_name": { - "default_value": "Eryone ER20" + "overrides": + { + "acceleration_enabled": { "value": true }, + "acceleration_travel": { "value": 1800 }, + "adhesion_type": { "value": "'brim'" }, + "bottom_layers": { "value": "4" }, + "bottom_thickness": { "value": "layer_height * 4" }, + "brim_width": { "value": 5 }, + "cool_fan_full_at_height": { "value": 0.5 }, + "cool_fan_speed": { "value": 100 }, + "cool_fan_speed_0": { "value": 100 }, + "default_material_bed_temperature": { "value": 60 }, + "default_material_print_temperature": { "value": 205 }, + "gantry_height": { "value": "0" }, + "infill_before_walls": { "value": false }, + "infill_overlap": + { + "maximum_value_warning": 100, + "minimum_value_warning": -50, + "value": "25 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0" }, - "machine_heated_bed": { - "default_value": true - }, - "machine_width": { - "default_value": 250 - }, - "machine_height": { - "default_value": 200 - }, - "machine_depth": { - "default_value": 220 - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_head_with_fans_polygon": { + "infill_pattern": { "value": "'grid'" }, + "infill_sparse_density": { "value": 20 }, + "initial_layer_line_width_factor": { "value": 105 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 220 }, + "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" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { "default_value": [ [-10, -10], [-10, 10], @@ -46,193 +50,61 @@ [10, -10] ] }, - "gantry_height":{ "value": "0" }, - "machine_start_gcode": { - "default_value": "G21 ;Metric values\nG90 ;Absolute positioning\nM82 ;Set extruder to absolute mode\nM107 ;Start with the fan off\nG28 ;Homing the hotend\nG29 ;Auto bed leveling detecting\nG92 E0 ;Reset the extruded length\nG1 F200 E3 ;Extrude 3mm of filament\nG92 E0 ;Reset the extruded length again\nG1 Y-3 F1200 ;Move y axis to prime\nG1 X150 F6000 ;Move x axis to prime\nG1 Z0.2 F720 ;Move z axis to prime\nG1 X80.0 E8.0 F900 ;Prime line\nG1 X20.0 E10.0 F700 ;Prime line\nG92 E0 ;Reset the extruded length\nG5 ;Enable resume from power failure\nM117 Printing...\n" + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 200 }, + "machine_name": { "default_value": "Eryone ER20" }, + "machine_start_gcode": { "default_value": "G21 ;Metric values\nG90 ;Absolute positioning\nM82 ;Set extruder to absolute mode\nM107 ;Start with the fan off\nG28 ;Homing the hotend\nG29 ;Auto bed leveling detecting\nG92 E0 ;Reset the extruded length\nG1 F200 E3 ;Extrude 3mm of filament\nG92 E0 ;Reset the extruded length again\nG1 Y-3 F1200 ;Move y axis to prime\nG1 X150 F6000 ;Move x axis to prime\nG1 Z0.2 F720 ;Move z axis to prime\nG1 X80.0 E8.0 F900 ;Prime line\nG1 X20.0 E10.0 F700 ;Prime line\nG92 E0 ;Reset the extruded length\nG5 ;Enable resume from power failure\nM117 Printing...\n" }, + "machine_width": { "default_value": 250 }, + "material_bed_temperature_layer_0": { "value": 65 }, + "material_final_print_temperature": { "value": 205 }, + "material_initial_print_temperature": { "value": 205 }, + "material_print_temperature_layer_0": { "value": 215 }, + "optimize_wall_printing_order": { "default_value": true }, + "retract_at_layer_change": { "value": true }, + "retraction_amount": { "default_value": 4 }, + "retraction_combing": { "value": "'noskin'" }, + "retraction_hop": { "value": 0.075 }, + "retraction_hop_enabled": { "value": false }, + "retraction_hop_only_when_collides": { "value": true }, + "retraction_min_travel": { "value": 1.5 }, + "retraction_prime_speed": + { + "maximum_value_warning": 130, + "value": "math.ceil(retraction_speed * 0.4)" }, - "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" - }, - "default_material_print_temperature": { - "value": 205 - }, - "material_print_temperature_layer_0": { - "value": 215 - }, - "material_initial_print_temperature": { - "value": 205 - }, - "material_final_print_temperature": { - "value": 205 - }, - "acceleration_enabled": { - "value": true - }, - "acceleration_travel": { - "value": 1800 - }, - "adhesion_type": { - "value": "'brim'" - }, - "brim_width": { - "value": 5 - }, - "cool_fan_full_at_height": { - "value": 0.5 - }, - "cool_fan_speed": { - "value": 100 - }, - "cool_fan_speed_0": { - "value": 100 - }, - "infill_overlap": { - "value": "25 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0", - "maximum_value_warning": 100, - "minimum_value_warning": -50 - }, - "infill_pattern": { - "value": "'grid'" - }, - "infill_sparse_density": { - "value": 20 - }, - "initial_layer_line_width_factor": { - "value": 105 - }, - "infill_before_walls": { - "value": false - }, - "default_material_bed_temperature": { - "value": 60 - }, - "material_bed_temperature_layer_0": { - "value": 65 - }, - "optimize_wall_printing_order": { - "default_value": true - }, - "retract_at_layer_change": { - "value": true - }, - "retraction_amount": { - "default_value": 4 - }, - "retraction_hop": { - "value": 0.075 - }, - "retraction_hop_enabled": { - "value": false - }, - "retraction_hop_only_when_collides": { - "value": true - }, - "retraction_min_travel": { - "value": 1.5 - }, - "retraction_speed": { + "retraction_retract_speed": { "maximum_value_warning": 130 }, + "retraction_speed": + { "default_value": 85, "maximum_value_warning": 100 }, - "retraction_retract_speed": { - "maximum_value_warning": 130 - }, - "retraction_prime_speed": { - "value": "math.ceil(retraction_speed * 0.4)", - "maximum_value_warning": 130 - }, - "retraction_combing": { - "value": "'noskin'" - }, - "skin_overlap": { - "value": 10 - }, - "skirt_brim_speed": { - "value": 40 - }, - "skirt_gap": { - "value": 5 - }, - "skirt_line_count": { - "value": 3 - }, - "speed_topbottom": { - "value": "math.ceil(speed_print * 20 / 50)" - }, - "speed_travel": { - "value": "150" - }, - "speed_layer_0": { - "value": "20" - }, - "speed_wall": { - "value": "speed_print" - }, - "speed_wall_0": { - "value": "math.ceil(speed_print * 30 / 50)" - }, - "speed_wall_x": { - "value": "speed_print" - }, - "support_angle": { - "value": 50 - }, - "support_enable": { - "default_value": false - }, - "support_interface_enable": { - "value": true - }, - "support_pattern": { - "value": "'triangles'" - }, - "support_roof_enable": { - "value": true - }, - "support_type": { - "value": "'everywhere'" - }, - "support_use_towers": { - "value": false - }, - "support_z_distance": { - "value": 0.3 - }, - "support_xy_distance": { - "value": 0.7 - }, - "support_xy_distance_overhang": { - "value": 0.2 - }, - "smooth_spiralized_contours": { - "value": false - }, - "travel_retract_before_outer_wall": { - "value": true - }, - "wall_line_count": { - "value": 3 - }, - "wall_thickness": { - "value": "1.2" - }, - "bottom_layers": { - "value": "4" - }, - "bottom_thickness":{ - "value": "layer_height * 4" - }, - "top_thickness":{ - "value": "layer_height * 5" - }, - "top_layers": { - "value": "5" - }, - "z_seam_type": { - "value": "'shortest'" - }, - "z_seam_corner": { - "value": "'z_seam_corner_inner'" - } + "skin_overlap": { "value": 10 }, + "skirt_brim_speed": { "value": 40 }, + "skirt_gap": { "value": 5 }, + "skirt_line_count": { "value": 3 }, + "smooth_spiralized_contours": { "value": false }, + "speed_layer_0": { "value": "20" }, + "speed_topbottom": { "value": "math.ceil(speed_print * 20 / 50)" }, + "speed_travel": { "value": "150" }, + "speed_wall": { "value": "speed_print" }, + "speed_wall_0": { "value": "math.ceil(speed_print * 30 / 50)" }, + "speed_wall_x": { "value": "speed_print" }, + "support_angle": { "value": 50 }, + "support_enable": { "default_value": false }, + "support_interface_enable": { "value": true }, + "support_pattern": { "value": "'triangles'" }, + "support_roof_enable": { "value": true }, + "support_type": { "value": "'everywhere'" }, + "support_use_towers": { "value": false }, + "support_xy_distance": { "value": 0.7 }, + "support_xy_distance_overhang": { "value": 0.2 }, + "support_z_distance": { "value": 0.3 }, + "top_layers": { "value": "5" }, + "top_thickness": { "value": "layer_height * 5" }, + "travel_retract_before_outer_wall": { "value": true }, + "wall_line_count": { "value": 3 }, + "wall_thickness": { "value": "1.2" }, + "z_seam_corner": { "value": "'z_seam_corner_inner'" }, + "z_seam_type": { "value": "'shortest'" } } -} +} \ No newline at end of file diff --git a/resources/definitions/eryone_thinker.def.json b/resources/definitions/eryone_thinker.def.json index 648de5cd03..555e0d548f 100644 --- a/resources/definitions/eryone_thinker.def.json +++ b/resources/definitions/eryone_thinker.def.json @@ -9,52 +9,46 @@ "manufacturer": "Eryone", "file_formats": "text/x-gcode", "platform": "eryone_thinker_platform.obj", - "platform_texture": "eryone_thinker_plate.png", - "platform_offset": [0, -120, 0], - "has_materials": true, - "preferred_material": "eryone_pla", + "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, - "preferred_quality_type": "normal", - "machine_extruder_trains": - { - "0": "eryone_thinker_extruder_0" - }, - "first_start_actions": ["MachineSettingsAction"] + "has_materials": true, + "machine_extruder_trains": { "0": "eryone_thinker_extruder_0" }, + "platform_offset": [ + 0, + -120, + 0 + ], + "platform_texture": "eryone_thinker_plate.png", + "preferred_material": "eryone_pla", + "preferred_quality_type": "normal" }, - "overrides": { - "machine_name": { - "default_value": "Eryone Thinker Series" - }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z10.0 F600 ;move the platform down 10mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Y-3 F1200 ;move to prime\nG1 X10 F1200 ;\nG1 Z0.1 F600 ;get ready to prime\nG1 X120 E15 F1200 ;prime nozzle \nG1 X120 F3600 ;quick wipe\nG92 E0 ;zero the extruded length\nM413 S1 ;enable resume from power failure\nM117 Printing..." - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;turn off extruder\nM140 S0 ;turn off bed\nM107 ;turn off all fans\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;move Z up a bit and retract filament even more\nG90 ;absolute positioning\nG1 X0 Y250 F4800 ; position for easy part removal\nM84 ;steppers off" - }, - "material_diameter": { - "default_value": 1.75 - }, - "machine_width": { - "default_value": 300 - }, - "machine_depth": { - "default_value": 300 - }, - "machine_height": { - "default_value": 400 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_head_with_fans_polygon": { + "acceleration_enabled": { "value": true }, + "acceleration_print": { "value": 750 }, + "acceleration_travel": { "value": 1500 }, + "adhesion_type": { "value": "'skirt'" }, + "bottom_layers": { "value": 4 }, + "bottom_thickness": { "value": "layer_height * bottom_layers" }, + "brim_width": { "value": 5 }, + "gantry_height": { "value": 30 }, + "infill_before_walls": { "value": false }, + "infill_overlap": { "value": "25 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0" }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 25 else 'grid'" }, + "infill_sparse_density": { "value": 20 }, + "initial_layer_line_width_factor": { "value": 120 }, + "inset_direction": { "default_value": "inside_out" }, + "jerk_enabled": { "value": true }, + "jerk_print": { "value": 10 }, + "jerk_travel": { "value": 15 }, + "layer_height": { "value": 0.2 }, + "layer_height_0": { "resolve": "max(0.1, layer_height)" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 300 }, + "machine_end_gcode": { "default_value": "M104 S0 ;turn off extruder\nM140 S0 ;turn off bed\nM107 ;turn off all fans\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;move Z up a bit and retract filament even more\nG90 ;absolute positioning\nG1 X0 Y250 F4800 ; position for easy part removal\nM84 ;steppers off" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { "default_value": [ [-20, 30], [-20, -20], @@ -62,193 +56,73 @@ [20, 30] ] }, - "gantry_height": { - "value": 30 - }, - "layer_height": { - "value": 0.2 - }, - "layer_height_0": { - "resolve": "max(0.1, layer_height)" - }, - "initial_layer_line_width_factor": { - "value": 120 - }, - "wall_line_count": { - "value": 3 - }, - "wall_thickness": { - "value": "line_width * wall_line_count" - }, - "optimize_wall_printing_order": { - "default_value": true - }, - "z_seam_type": { - "value": "'shortest'" - }, - "z_seam_corner": { - "value": "'z_seam_corner_inner'" - }, - "roofing_layer_count": { - "value": 1 - }, - "top_layers": { - "value": 6 - }, - "top_thickness":{ - "value": "layer_height * top_layers" - }, - "bottom_layers": { - "value": 4 - }, - "bottom_thickness":{ - "value": "layer_height * bottom_layers" - }, - "skin_overlap": { - "value": 10 - }, - "infill_sparse_density": { - "value": 20 - }, - "infill_pattern": { - "value": "'lines' if infill_sparse_density > 25 else 'grid'" - }, - "infill_overlap": { - "value": "25 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0" - }, - "infill_before_walls": { - "value": false - }, - "inset_direction": { - "default_value": "inside_out" - }, - "material_print_temperature": { - "value": "default_material_print_temperature", - "maximum_value_warning": 250 - }, - "material_print_temperature_layer_0": { - "value": "material_print_temperature + 5", - "maximum_value_warning": 250 - }, - "material_initial_print_temperature": { - "value": "material_print_temperature", - "maximum_value_warning": 250 - }, - "material_final_print_temperature": { + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "Eryone Thinker Series" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z10.0 F600 ;move the platform down 10mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Y-3 F1200 ;move to prime\nG1 X10 F1200 ;\nG1 Z0.1 F600 ;get ready to prime\nG1 X120 E15 F1200 ;prime nozzle \nG1 X120 F3600 ;quick wipe\nG92 E0 ;zero the extruded length\nM413 S1 ;enable resume from power failure\nM117 Printing..." }, + "machine_width": { "default_value": 300 }, + "material_bed_temperature": { "maximum_value_warning": 100 }, + "material_bed_temperature_layer_0": { "value": "material_bed_temperature" }, + "material_diameter": { "default_value": 1.75 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_initial_print_temperature": + { + "maximum_value_warning": 250, "value": "material_print_temperature" }, - "material_bed_temperature": { - "maximum_value_warning": 100 + "material_print_temperature": + { + "maximum_value_warning": 250, + "value": "default_material_print_temperature" }, - "material_bed_temperature_layer_0": { - "value": "material_bed_temperature" + "material_print_temperature_layer_0": + { + "maximum_value_warning": 250, + "value": "material_print_temperature + 5" }, - "speed_wall": { - "value": "speed_print" + "optimize_wall_printing_order": { "default_value": true }, + "retract_at_layer_change": { "value": true }, + "retraction_amount": { "default_value": 4.5 }, + "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, + "retraction_hop": { "value": 0.1 }, + "retraction_hop_enabled": { "value": false }, + "retraction_hop_only_when_collides": { "value": true }, + "retraction_min_travel": { "value": "max(line_width * 2, 1.5)" }, + "retraction_prime_speed": + { + "maximum_value_warning": 130, + "value": "math.ceil(retraction_speed * 0.4)" }, - "speed_wall_0": { - "value": "math.ceil(speed_print * 30 / 50)" - }, - "speed_wall_x": { - "value": "speed_print" - }, - "speed_topbottom": { - "value": "math.ceil(speed_print * 20 / 50)" - }, - "speed_travel": { - "value": "speed_print if magic_spiralize else 120" - }, - "speed_layer_0": { - "value": "math.ceil(speed_print * 30 / 50)" - }, - "skirt_brim_speed": { - "value": "math.ceil(speed_print * 40 / 60)" - }, - "speed_z_hop": { - "value": "math.ceil(speed_print * 30 / 60)" - }, - "acceleration_enabled": { - "value": true - }, - "acceleration_print": { - "value": 750 - }, - "acceleration_travel": { - "value": 1500 - }, - "jerk_enabled": { - "value": true - }, - "jerk_print": { - "value": 10 - }, - "jerk_travel": { - "value": 15 - }, - "retract_at_layer_change": { - "value": true - }, - "retraction_amount": { - "default_value": 4.5 - }, - "retraction_speed": { + "retraction_retract_speed": { "maximum_value_warning": 130 }, + "retraction_speed": + { "default_value": 85, "maximum_value_warning": 100 }, - "retraction_retract_speed": { - "maximum_value_warning": 130 - }, - "retraction_prime_speed": { - "value": "math.ceil(retraction_speed * 0.4)", - "maximum_value_warning": 130 - }, - "retraction_min_travel": { - "value": "max(line_width * 2, 1.5)" - }, - "retraction_combing": { - "value": "'off' if retraction_hop_enabled else 'noskin'" - }, - "travel_retract_before_outer_wall": { - "value": true - }, - "retraction_hop_enabled": { - "value": false - }, - "retraction_hop_only_when_collides": { - "value": true - }, - "retraction_hop": { - "value": 0.1 - }, - "support_pattern": { - "value": "'triangles'" - }, - "support_z_distance": { - "value": 0.3 - }, - "support_interface_enable": { - "value": true - }, - "support_roof_enable": { - "value": true - }, - "support_use_towers": { - "value": false - }, - "adhesion_type": { - "value": "'skirt'" - }, - "skirt_line_count": { - "value": 3 - }, - "skirt_gap": { - "value": 5 - }, - "brim_width": { - "value": 5 - }, - "smooth_spiralized_contours": { - "value": false - } + "roofing_layer_count": { "value": 1 }, + "skin_overlap": { "value": 10 }, + "skirt_brim_speed": { "value": "math.ceil(speed_print * 40 / 60)" }, + "skirt_gap": { "value": 5 }, + "skirt_line_count": { "value": 3 }, + "smooth_spiralized_contours": { "value": false }, + "speed_layer_0": { "value": "math.ceil(speed_print * 30 / 50)" }, + "speed_topbottom": { "value": "math.ceil(speed_print * 20 / 50)" }, + "speed_travel": { "value": "speed_print if magic_spiralize else 120" }, + "speed_wall": { "value": "speed_print" }, + "speed_wall_0": { "value": "math.ceil(speed_print * 30 / 50)" }, + "speed_wall_x": { "value": "speed_print" }, + "speed_z_hop": { "value": "math.ceil(speed_print * 30 / 60)" }, + "support_interface_enable": { "value": true }, + "support_pattern": { "value": "'triangles'" }, + "support_roof_enable": { "value": true }, + "support_use_towers": { "value": false }, + "support_z_distance": { "value": 0.3 }, + "top_layers": { "value": 6 }, + "top_thickness": { "value": "layer_height * top_layers" }, + "travel_retract_before_outer_wall": { "value": true }, + "wall_line_count": { "value": 3 }, + "wall_thickness": { "value": "line_width * wall_line_count" }, + "z_seam_corner": { "value": "'z_seam_corner_inner'" }, + "z_seam_type": { "value": "'shortest'" } } } \ No newline at end of file diff --git a/resources/definitions/eryone_thinker_direct.def.json b/resources/definitions/eryone_thinker_direct.def.json index c27645235b..c7637f525b 100644 --- a/resources/definitions/eryone_thinker_direct.def.json +++ b/resources/definitions/eryone_thinker_direct.def.json @@ -1,18 +1,19 @@ { - "name": "Eryone Thinker DirectDrive", "version": 2, + "name": "Eryone Thinker DirectDrive", "inherits": "eryone_thinker", - "overrides": { - "machine_name": { "default_value": "Eryone Thinker DirectDrive" } - }, - "metadata": { + "metadata": + { "quality_definition": "eryone_thinker", - "speed_print": { - "maximum_value_warning": 130 - }, - "retraction_speed": { + "retraction_speed": + { "default_value": 35, "maximum_value_warning": 40 - } + }, + "speed_print": { "maximum_value_warning": 130 } + }, + "overrides": + { + "machine_name": { "default_value": "Eryone Thinker DirectDrive" } } } \ No newline at end of file diff --git a/resources/definitions/erzay3d.def.json b/resources/definitions/erzay3d.def.json index dc1ad9a509..28884a894a 100644 --- a/resources/definitions/erzay3d.def.json +++ b/resources/definitions/erzay3d.def.json @@ -1,78 +1,66 @@ { - "name": "Erzay3D", "version": 2, + "name": "Erzay3D", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Alexander Kirsanov", "manufacturer": "Robokinetika", "file_formats": "text/x-gcode", - "machine_extruder_trains": - { - "0": "erzay3d_extruder_0" - } + "machine_extruder_trains": { "0": "erzay3d_extruder_0" } }, - - "overrides": { - "machine_start_gcode" : { "default_value": "G28\nG1 Z15.0 F6000\nG92 E0" }, - "machine_shape": { "default_value": "elliptic"}, - "machine_name": { "default_value": "Erzay3D" }, - "machine_depth": { "default_value": 210 }, - "machine_width": { "default_value": 210 }, - "machine_height": { "default_value": 230 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_center_is_zero": { "default_value": true }, - "machine_extruder_count": { "default_value": 1 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_heated_bed": { "default_value": true }, - "material_bed_temp_wait": { "default_value": true }, - "material_print_temp_wait": { "default_value": true }, - "material_print_temp_prepend": { "default_value": true }, - "machine_buildplate_type": { "default_value": "glass" }, - "machine_nozzle_head_distance": { "default_value": 2.5 }, - "machine_heat_zone_length": { "default_value": 12.5 }, - "machine_max_feedrate_x": { "default_value": 200 }, - "machine_max_feedrate_y": { "default_value": 200 }, - "machine_max_feedrate_z": { "default_value": 200 }, - "machine_max_feedrate_e": { "default_value": 50 }, - "machine_max_acceleration_x": { "default_value": 3000 }, - "machine_max_acceleration_y": { "default_value": 3000 }, - "machine_max_acceleration_z": { "default_value": 3000 }, - "machine_max_acceleration_e": { "default_value": 3000 }, - "machine_acceleration": { "default_value": 1000 }, - "machine_max_jerk_xy": { "default_value": 10 }, - "machine_max_jerk_z": { "default_value": 10 }, - "machine_max_jerk_e": { "default_value": 10 }, - "machine_steps_per_mm_x": { "default_value": 1600 }, - "machine_steps_per_mm_y": { "default_value": 1600 }, - "machine_steps_per_mm_z": { "default_value": 1600 }, - "machine_steps_per_mm_e": { "default_value": 174 }, - "machine_feeder_wheel_diameter": { "default_value": 12 }, - - "layer_height": { "default_value": 0.2 }, - "layer_height_0": { "default_value": 0.2 }, - - "ironing_pattern": { "default_value": "concentric" }, - "ironing_flow": { "default_value": 7.0 }, - - "infill_sparse_density": { "default_value": 20 }, - - "default_material_print_temperature": { "default_value": 220 }, - "retraction_amount": { "default_value": 6.5 }, - - "speed_print": { "default_value": 40 }, - - "acceleration_print": { "default_value": 1000 }, - - "jerk_print": { "default_value": 10 }, - - "support_angle": { "default_value": 65 }, - "support_brim_enable": { "value": true }, - - "adhesion_type": { "default_value": "skirt" }, - "brim_outside_only": { "default_value": false }, - - "meshfix_maximum_resolution": { "default_value": 0.25 } + "overrides": + { + "acceleration_print": { "default_value": 1000 }, + "adhesion_type": { "default_value": "skirt" }, + "brim_outside_only": { "default_value": false }, + "default_material_print_temperature": { "default_value": 220 }, + "infill_sparse_density": { "default_value": 20 }, + "ironing_flow": { "default_value": 7.0 }, + "ironing_pattern": { "default_value": "concentric" }, + "jerk_print": { "default_value": 10 }, + "layer_height": { "default_value": 0.2 }, + "layer_height_0": { "default_value": 0.2 }, + "machine_acceleration": { "default_value": 1000 }, + "machine_buildplate_type": { "default_value": "glass" }, + "machine_center_is_zero": { "default_value": true }, + "machine_depth": { "default_value": 210 }, + "machine_extruder_count": { "default_value": 1 }, + "machine_feeder_wheel_diameter": { "default_value": 12 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heat_zone_length": { "default_value": 12.5 }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 230 }, + "machine_max_acceleration_e": { "default_value": 3000 }, + "machine_max_acceleration_x": { "default_value": 3000 }, + "machine_max_acceleration_y": { "default_value": 3000 }, + "machine_max_acceleration_z": { "default_value": 3000 }, + "machine_max_feedrate_e": { "default_value": 50 }, + "machine_max_feedrate_x": { "default_value": 200 }, + "machine_max_feedrate_y": { "default_value": 200 }, + "machine_max_feedrate_z": { "default_value": 200 }, + "machine_max_jerk_e": { "default_value": 10 }, + "machine_max_jerk_xy": { "default_value": 10 }, + "machine_max_jerk_z": { "default_value": 10 }, + "machine_name": { "default_value": "Erzay3D" }, + "machine_nozzle_head_distance": { "default_value": 2.5 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "machine_shape": { "default_value": "elliptic" }, + "machine_start_gcode": { "default_value": "G28\nG1 Z15.0 F6000\nG92 E0" }, + "machine_steps_per_mm_e": { "default_value": 174 }, + "machine_steps_per_mm_x": { "default_value": 1600 }, + "machine_steps_per_mm_y": { "default_value": 1600 }, + "machine_steps_per_mm_z": { "default_value": 1600 }, + "machine_width": { "default_value": 210 }, + "material_bed_temp_wait": { "default_value": true }, + "material_diameter": { "default_value": 1.75 }, + "material_print_temp_prepend": { "default_value": true }, + "material_print_temp_wait": { "default_value": true }, + "meshfix_maximum_resolution": { "default_value": 0.25 }, + "retraction_amount": { "default_value": 6.5 }, + "speed_print": { "default_value": 40 }, + "support_angle": { "default_value": 65 }, + "support_brim_enable": { "value": true } } -} +} \ No newline at end of file diff --git a/resources/definitions/fabtotum.def.json b/resources/definitions/fabtotum.def.json index 1f2565803f..2be0437e33 100644 --- a/resources/definitions/fabtotum.def.json +++ b/resources/definitions/fabtotum.def.json @@ -2,7 +2,8 @@ "version": 2, "name": "Fabtotum Personal Fabricator", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Fabtotum", "manufacturer": "Fabtotum", @@ -10,60 +11,66 @@ "platform": "fabtotum_platform.3mf", "has_machine_quality": true, "has_variants": true, - "variants_name": "Head", - "preferred_variant_name": "Lite 0.4 mm", + "machine_extruder_trains": { "0": "fabtotum_extruder_0" }, "preferred_material": "fabtotum_pla", + "preferred_variant_name": "Lite 0.4 mm", "supports_usb_connection": false, - "machine_extruder_trains": - { - "0": "fabtotum_extruder_0" - } + "variants_name": "Head" }, - "overrides": { - "machine_name": { "default_value": "FABtotum Personal Fabricator" }, - "machine_start_gcode": { - "default_value": ";Layer height: {layer_height}\n;Walls: {wall_thickness}\n;Fill: {infill_sparse_density}\n;Top\\Bottom Thickness: {top_bottom_thickness}\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG4 S1 ;1 millisecond pause to buffer the bep bep \nM300 S2 ;FAB bep bep (start the print, go check the oozing and skirt lines adesion) \nG4 S1 ;1 second pause to reach the printer (run fast)\nG92 E0 ;zero the extruded length \nG1 F200 E35 ;slowly extrude 35mm of filament to clean the nozzle and build up extrusion pressure \nG92 E0 ;zero the extruded length again \n;print" - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-3 X+5 Y+5 F5000 ;move Z up a bit and retract filament even more\n;end of the print\nM84 ;steppers off\nG90 ;absolute positioning\nM300 S2 ;FAB bep bep (end print)" - }, + "overrides": + { "gantry_height": { "value": "55" }, - "machine_width": { "default_value": 214 }, - "machine_height": { "default_value": 241.5 }, - "machine_depth": { "default_value": 234 }, + "infill_sparse_density": { "default_value": 24 }, + "machine_acceleration": { "default_value": 4000 }, "machine_center_is_zero": { "default_value": false }, - "machine_heated_bed": { "default_value": true }, - "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [-75, -18], [18, 35], [18, -18]] }, + "machine_depth": { "default_value": 234 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-3 X+5 Y+5 F5000 ;move Z up a bit and retract filament even more\n;end of the print\nM84 ;steppers off\nG90 ;absolute positioning\nM300 S2 ;FAB bep bep (end print)" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_max_feedrate_x": { "default_value": 250 }, - "machine_max_feedrate_y": { "default_value": 250 }, - "machine_max_feedrate_z": { "default_value": 15 }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-75, 35], + [-75, -18], + [18, 35], + [18, -18] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 241.5 }, + "machine_max_acceleration_e": { "default_value": 100 }, "machine_max_acceleration_x": { "default_value": 10000 }, "machine_max_acceleration_y": { "default_value": 10000 }, "machine_max_acceleration_z": { "default_value": 50 }, - "machine_max_acceleration_e": { "default_value": 100 }, - "machine_acceleration": { "default_value": 4000 }, + "machine_max_feedrate_x": { "default_value": 250 }, + "machine_max_feedrate_y": { "default_value": 250 }, + "machine_max_feedrate_z": { "default_value": 15 }, + "machine_max_jerk_e": { "default_value": 1.0 }, "machine_max_jerk_xy": { "default_value": 25.0 }, "machine_max_jerk_z": { "default_value": 0.4 }, - "machine_max_jerk_e": { "default_value": 1.0 }, - "retraction_hop_enabled": { "default_value": false }, + "machine_name": { "default_value": "FABtotum Personal Fabricator" }, + "machine_start_gcode": { "default_value": ";Layer height: {layer_height}\n;Walls: {wall_thickness}\n;Fill: {infill_sparse_density}\n;Top\\Bottom Thickness: {top_bottom_thickness}\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG4 S1 ;1 millisecond pause to buffer the bep bep \nM300 S2 ;FAB bep bep (start the print, go check the oozing and skirt lines adesion) \nG4 S1 ;1 second pause to reach the printer (run fast)\nG92 E0 ;zero the extruded length \nG1 F200 E35 ;slowly extrude 35mm of filament to clean the nozzle and build up extrusion pressure \nG92 E0 ;zero the extruded length again \n;print" }, + "machine_width": { "default_value": 214 }, "material_final_print_temperature": { "value": "material_print_temperature - 5" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, - "travel_avoid_distance": { "value": 1 }, - "speed_travel": { "value": 200 }, + "retraction_hop_enabled": { "default_value": false }, + "skirt_brim_minimal_length": { "default_value": 150 }, + "skirt_brim_speed": { "value": "speed_layer_0" }, + "skirt_line_count": { "default_value": 3 }, "speed_infill": { "value": "round(speed_print * 1.05, 0)" }, + "speed_layer_0": { "value": "min(round(speed_print * 0.75, 0), 45.0)" }, "speed_topbottom": { "value": "round(speed_print * 0.95, 0)" }, + "speed_travel": { "value": 200 }, + "speed_travel_layer_0": { "value": "round(speed_travel * 0.7, 0)" }, "speed_wall": { "value": "speed_print" }, "speed_wall_0": { "value": "round(speed_print * 0.9, 0)" }, "speed_wall_x": { "value": "speed_wall" }, - "speed_layer_0": { "value": "min(round(speed_print * 0.75, 0), 45.0)" }, - "speed_travel_layer_0": { "value": "round(speed_travel * 0.7, 0)" }, - "skirt_brim_speed": { "value": "speed_layer_0" }, - "skirt_line_count": { "default_value": 3 }, - "skirt_brim_minimal_length": { "default_value": 150 }, - "infill_sparse_density": { "default_value": 24 }, + "support_interface_enable": { "default_value": true }, + "support_z_distance": + { + "default_value": 0.2, + "value": "min(2 * layer_height, machine_nozzle_size * 0.75)" + }, "top_bottom_thickness": { "default_value": 0.6 }, - "support_z_distance": { "default_value": 0.2, "value": "min(2 * layer_height, machine_nozzle_size * 0.75)" }, - "support_interface_enable": { "default_value": true } + "travel_avoid_distance": { "value": 1 } } -} +} \ No newline at end of file diff --git a/resources/definitions/fabxpro.def.json b/resources/definitions/fabxpro.def.json index 03858988e7..7aaa9d658b 100644 --- a/resources/definitions/fabxpro.def.json +++ b/resources/definitions/fabxpro.def.json @@ -2,57 +2,37 @@ "version": 2, "name": "FabX Pro", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "FabX", "manufacturer": "FabX", "file_formats": "text/x-gcode", "platform": "fabxpro_platform.3mf", - "has_materials": true, "has_machine_quality": true, - "machine_extruder_trains": - { - "0": "fabxpro_extruder_0" - } + "has_materials": true, + "machine_extruder_trains": { "0": "fabxpro_extruder_0" } }, - - "overrides": { - "machine_name": { "default_value": "FabX Pro" }, - "machine_width": { - "default_value": 170 - }, - "machine_height": { - "default_value": 170 - }, - "machine_depth": { - "default_value": 170 - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_heated_bed": { - "default_value": true - }, + "overrides": + { + "gantry_height": { "value": "55" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 170 }, + "machine_end_gcode": { "value": "'M104 S0 ;extruder heater off' + ('\\nM140 S0 ;heated bed heater off' if machine_heated_bed else '') + '\\nG91 ;relative positioning\\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\\nM84 ;steppers off\\nG90 ;absolute positioning'" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_head_with_fans_polygon": { "default_value": [ - [ -75, 35 ], - [ -75, -18 ], - [ 18, 35 ], - [ 18, -18 ] + [-75, 35], + [-75, -18], + [18, 35], + [18, -18] ] }, - "gantry_height": { - "value": "55" - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." - }, - "machine_end_gcode": { - "value": "'M104 S0 ;extruder heater off' + ('\\nM140 S0 ;heated bed heater off' if machine_heated_bed else '') + '\\nG91 ;relative positioning\\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\\nM84 ;steppers off\\nG90 ;absolute positioning'" - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 170 }, + "machine_name": { "default_value": "FabX Pro" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, + "machine_width": { "default_value": 170 } } -} +} \ No newline at end of file diff --git a/resources/definitions/farm2.def.json b/resources/definitions/farm2.def.json index 382e1841d0..7b63286d04 100644 --- a/resources/definitions/farm2.def.json +++ b/resources/definitions/farm2.def.json @@ -2,56 +2,38 @@ "version": 2, "name": "Farm 2", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Farm3D", "manufacturer": "Farm3D LLC", "file_formats": "text/x-gcode", "platform": "farm2_platform.obj", - "platform_texture": "farm2plate.png", - "platform_offset": [-7, 0, -4], - "has_variants": true, - "preferred_variant_name": "PrintHead 0.4 mm", - "variants_name": "PrintHead type", - "has_materials": true, - "preferred_material": "generic_pla", "has_machine_quality": false, - "machine_extruder_trains": - { - "0": "farm2_extruder_1" - - } - + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { "0": "farm2_extruder_1" }, + "platform_offset": [ + -7, + 0, + -4 + ], + "platform_texture": "farm2plate.png", + "preferred_material": "generic_pla", + "preferred_variant_name": "PrintHead 0.4 mm", + "variants_name": "PrintHead type" }, - "overrides": { + "overrides": + { + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 199 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28\nM84\nM81" }, + "machine_gcode_flavor": { "default_value": "RepRap (RepRap)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 197 }, "machine_name": { "default_value": "Farm 2" }, - "machine_start_gcode" : { - "default_value": "G28 ;Home\nG1 Y0 Z3.0 F4000 ;Move the platform\nG92 E0\nG1 F1000 Z0.2\nG1 X190 F1000 E50 Z0.2\nG92 E0" - }, - "machine_end_gcode" : { - "default_value": "M104 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28\nM84\nM81" - }, - "machine_width": { - "default_value": 203 - }, - "machine_depth": { - "default_value": 199 - }, - "machine_height": { - "default_value": 197 - }, - "machine_heated_bed": { - "default_value": true - }, - "material_diameter": { - "default_value": 1.75 - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_gcode_flavor": { - "default_value": "RepRap (RepRap)" - } - + "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Y0 Z3.0 F4000 ;Move the platform\nG92 E0\nG1 F1000 Z0.2\nG1 X190 F1000 E50 Z0.2\nG92 E0" }, + "machine_width": { "default_value": 203 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/definitions/farm2_ce.def.json b/resources/definitions/farm2_ce.def.json index bb7f14d84a..6dd0e2758b 100644 --- a/resources/definitions/farm2_ce.def.json +++ b/resources/definitions/farm2_ce.def.json @@ -2,56 +2,38 @@ "version": 2, "name": "Farm 2CE", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Farm3D", "manufacturer": "Farm3D LLC", "file_formats": "text/x-gcode", "platform": "farm2_platform.obj", - "platform_texture": "farm2ceplate.png", - "platform_offset": [-7, 0, -4], - "has_variants": true, - "preferred_variant_name": "PrintHead 0.4 mm", - "variants_name": "PrintHead type", - "has_materials": true, - "preferred_material": "generic_pla", "has_machine_quality": false, - "machine_extruder_trains": - { - "0": "farm2_ce_extruder_1" - - } - + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { "0": "farm2_ce_extruder_1" }, + "platform_offset": [ + -7, + 0, + -4 + ], + "platform_texture": "farm2ceplate.png", + "preferred_material": "generic_pla", + "preferred_variant_name": "PrintHead 0.4 mm", + "variants_name": "PrintHead type" }, - "overrides": { + "overrides": + { + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 199 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28\nM84" }, + "machine_gcode_flavor": { "default_value": "RepRap (RepRap)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 213 }, "machine_name": { "default_value": "Farm 2CE" }, - "machine_start_gcode" : { - "default_value": "G28\nG29 S0\nG92 E0\nG1 X0 Y0 F4000 Z0.1\nG1 Y0 X190 F1000 E50 Z0.3\nG1 Z0" - }, - "machine_end_gcode" : { - "default_value": "M104 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28\nM84" - }, - "machine_width": { - "default_value": 209 - }, - "machine_depth": { - "default_value": 199 - }, - "machine_height": { - "default_value": 213 - }, - "machine_heated_bed": { - "default_value": true - }, - "material_diameter": { - "default_value": 1.75 - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_gcode_flavor": { - "default_value": "RepRap (RepRap)" - } - + "machine_start_gcode": { "default_value": "G28\nG29 S0\nG92 E0\nG1 X0 Y0 F4000 Z0.1\nG1 Y0 X190 F1000 E50 Z0.3\nG1 Z0" }, + "machine_width": { "default_value": 209 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/definitions/fdmextruder.def.json b/resources/definitions/fdmextruder.def.json index a1917fc9b9..0825a968bc 100644 --- a/resources/definitions/fdmextruder.def.json +++ b/resources/definitions/fdmextruder.def.json @@ -1,257 +1,257 @@ { - "name": "Extruder", "version": 2, + "name": "Extruder", "metadata": { - "type": "extruder", + "visible": false, "author": "Ultimaker", "manufacturer": "Unknown", + "position": "0", "setting_version": 20, - "visible": false, - "position": "0" + "type": "extruder" }, "settings": { "machine_settings": { - "label": "Machine", - "type": "category", - "description": "Machine specific settings", "children": { "extruder_nr": { - "label": "Extruder", - "description": "The extruder train used for printing. This is used in multi-extrusion.", - "type": "extruder", "default_value": "0", + "description": "The extruder train used for printing. This is used in multi-extrusion.", + "label": "Extruder", + "settable_globally": false, + "settable_per_extruder": true, "settable_per_mesh": true, - "settable_per_extruder": true, "settable_per_meshgroup": false, - "settable_globally": false - }, - "machine_nozzle_id": - { - "label": "Nozzle ID", - "description": "The nozzle ID for an extruder train, such as \"AA 0.4\" and \"BB 0.8\".", - "type": "str", - "default_value": "unknown", - "settable_per_mesh": false, - "settable_per_extruder": true - }, - "machine_nozzle_size": - { - "label": "Nozzle Diameter", - "description": "The inner diameter of the nozzle. Change this setting when using a non-standard nozzle size.", - "unit": "mm", - "type": "float", - "default_value": 0.4, - "minimum_value": "0.001", - "maximum_value_warning": "10", - "settable_per_mesh": false, - "settable_per_extruder": true - }, - "machine_nozzle_offset_x": - { - "label": "Nozzle X Offset", - "description": "The x-coordinate of the offset of the nozzle.", - "type": "float", - "unit": "mm", - "default_value": 0, - "settable_per_mesh": false, - "settable_per_extruder": true, - "settable_per_meshgroup": false, - "settable_globally": false - }, - "machine_nozzle_offset_y": - { - "label": "Nozzle Y Offset", - "description": "The y-coordinate of the offset of the nozzle.", - "type": "float", - "unit": "mm", - "default_value": 0, - "settable_per_mesh": false, - "settable_per_extruder": true, - "settable_per_meshgroup": false, - "settable_globally": false - }, - "machine_extruder_start_code": - { - "label": "Extruder Start G-Code", - "description": "Start g-code to execute when switching to this extruder.", - "type": "str", - "default_value": "", - "settable_per_mesh": false, - "settable_per_extruder": true, - "settable_per_meshgroup": false, - "settable_globally": false - }, - "machine_extruder_start_pos_abs": - { - "label": "Extruder Start Position Absolute", - "description": "Make the extruder starting position absolute rather than relative to the last-known location of the head.", - "type": "bool", - "default_value": false, - "settable_per_mesh": false, - "settable_per_extruder": true, - "settable_per_meshgroup": false, - "settable_globally": false - }, - "machine_extruder_start_pos_x": - { - "label": "Extruder Start Position X", - "description": "The x-coordinate of the starting position when turning the extruder on.", - "type": "float", - "unit": "mm", - "default_value": 0, - "settable_per_mesh": false, - "settable_per_extruder": true, - "settable_per_meshgroup": false, - "settable_globally": false - }, - "machine_extruder_start_pos_y": - { - "label": "Extruder Start Position Y", - "description": "The y-coordinate of the starting position when turning the extruder on.", - "type": "float", - "unit": "mm", - "default_value": 0, - "settable_per_mesh": false, - "settable_per_extruder": true, - "settable_per_meshgroup": false, - "settable_globally": false - }, - "machine_extruder_end_code": - { - "label": "Extruder End G-Code", - "description": "End g-code to execute when switching away from this extruder.", - "type": "str", - "default_value": "", - "settable_per_mesh": false, - "settable_per_extruder": true, - "settable_per_meshgroup": false, - "settable_globally": false - }, - "machine_extruder_end_pos_abs": - { - "label": "Extruder End Position Absolute", - "description": "Make the extruder ending position absolute rather than relative to the last-known location of the head.", - "type": "bool", - "default_value": false, - "settable_per_mesh": false, - "settable_per_extruder": true, - "settable_per_meshgroup": false, - "settable_globally": false - }, - "machine_extruder_end_pos_x": - { - "label": "Extruder End Position X", - "description": "The x-coordinate of the ending position when turning the extruder off.", - "type": "float", - "unit": "mm", - "default_value": 0, - "settable_per_mesh": false, - "settable_per_extruder": true, - "settable_per_meshgroup": false, - "settable_globally": false - }, - "machine_extruder_end_pos_y": - { - "label": "Extruder End Position Y", - "description": "The y-coordinate of the ending position when turning the extruder off.", - "type": "float", - "unit": "mm", - "default_value": 0, - "settable_per_mesh": false, - "settable_per_extruder": true, - "settable_per_meshgroup": false, - "settable_globally": false + "type": "extruder" }, "extruder_prime_pos_z": { - "label": "Extruder Prime Z Position", + "default_value": 0, "description": "The Z coordinate of the position where the nozzle primes at the start of printing.", - "type": "float", - "unit": "mm", - "default_value": 0, - "minimum_value_warning": "0", + "label": "Extruder Prime Z Position", "maximum_value": "machine_height", + "minimum_value_warning": "0", + "settable_per_extruder": true, "settable_per_mesh": false, - "settable_per_extruder": true + "type": "float", + "unit": "mm" }, - "machine_extruder_cooling_fan_number": + "machine_extruder_cooling_fan_number": { - "label": "Extruder Print Cooling Fan", + "default_value": 0, "description": "The number of the print cooling fan associated with this extruder. Only change this from the default value of 0 when you have a different print cooling fan for each extruder.", - "type": "int", - "default_value": 0, + "label": "Extruder Print Cooling Fan", "minimum_value": "0", - "settable_per_mesh": false, + "settable_globally": false, "settable_per_extruder": true, + "settable_per_mesh": false, "settable_per_meshgroup": false, - "settable_globally": false - } - } - }, - "platform_adhesion": - { - "label": "Build Plate Adhesion", - "type": "category", - "icon": "Adhesion", - "description": "Adhesion", - "children": - { - "extruder_prime_pos_x": - { - "label": "Extruder Prime X Position", - "description": "The X coordinate of the position where the nozzle primes at the start of printing.", - "type": "float", - "unit": "mm", - "default_value": 0, - "minimum_value_warning": "machine_nozzle_offset_x", - "maximum_value": "machine_width", - "settable_per_mesh": false, - "settable_per_extruder": true, - "enabled": false + "type": "int" }, - "extruder_prime_pos_y": + "machine_extruder_end_code": { - "label": "Extruder Prime Y Position", - "description": "The Y coordinate of the position where the nozzle primes at the start of printing.", - "type": "float", - "unit": "mm", - "default_value": 0, - "minimum_value_warning": "machine_nozzle_offset_y", - "maximum_value_warning": "machine_depth", - "settable_per_mesh": false, + "default_value": "", + "description": "End g-code to execute when switching away from this extruder.", + "label": "Extruder End G-Code", + "settable_globally": false, "settable_per_extruder": true, - "enabled": false + "settable_per_mesh": false, + "settable_per_meshgroup": false, + "type": "str" + }, + "machine_extruder_end_pos_abs": + { + "default_value": false, + "description": "Make the extruder ending position absolute rather than relative to the last-known location of the head.", + "label": "Extruder End Position Absolute", + "settable_globally": false, + "settable_per_extruder": true, + "settable_per_mesh": false, + "settable_per_meshgroup": false, + "type": "bool" + }, + "machine_extruder_end_pos_x": + { + "default_value": 0, + "description": "The x-coordinate of the ending position when turning the extruder off.", + "label": "Extruder End Position X", + "settable_globally": false, + "settable_per_extruder": true, + "settable_per_mesh": false, + "settable_per_meshgroup": false, + "type": "float", + "unit": "mm" + }, + "machine_extruder_end_pos_y": + { + "default_value": 0, + "description": "The y-coordinate of the ending position when turning the extruder off.", + "label": "Extruder End Position Y", + "settable_globally": false, + "settable_per_extruder": true, + "settable_per_mesh": false, + "settable_per_meshgroup": false, + "type": "float", + "unit": "mm" + }, + "machine_extruder_start_code": + { + "default_value": "", + "description": "Start g-code to execute when switching to this extruder.", + "label": "Extruder Start G-Code", + "settable_globally": false, + "settable_per_extruder": true, + "settable_per_mesh": false, + "settable_per_meshgroup": false, + "type": "str" + }, + "machine_extruder_start_pos_abs": + { + "default_value": false, + "description": "Make the extruder starting position absolute rather than relative to the last-known location of the head.", + "label": "Extruder Start Position Absolute", + "settable_globally": false, + "settable_per_extruder": true, + "settable_per_mesh": false, + "settable_per_meshgroup": false, + "type": "bool" + }, + "machine_extruder_start_pos_x": + { + "default_value": 0, + "description": "The x-coordinate of the starting position when turning the extruder on.", + "label": "Extruder Start Position X", + "settable_globally": false, + "settable_per_extruder": true, + "settable_per_mesh": false, + "settable_per_meshgroup": false, + "type": "float", + "unit": "mm" + }, + "machine_extruder_start_pos_y": + { + "default_value": 0, + "description": "The y-coordinate of the starting position when turning the extruder on.", + "label": "Extruder Start Position Y", + "settable_globally": false, + "settable_per_extruder": true, + "settable_per_mesh": false, + "settable_per_meshgroup": false, + "type": "float", + "unit": "mm" + }, + "machine_nozzle_id": + { + "default_value": "unknown", + "description": "The nozzle ID for an extruder train, such as \"AA 0.4\" and \"BB 0.8\".", + "label": "Nozzle ID", + "settable_per_extruder": true, + "settable_per_mesh": false, + "type": "str" + }, + "machine_nozzle_offset_x": + { + "default_value": 0, + "description": "The x-coordinate of the offset of the nozzle.", + "label": "Nozzle X Offset", + "settable_globally": false, + "settable_per_extruder": true, + "settable_per_mesh": false, + "settable_per_meshgroup": false, + "type": "float", + "unit": "mm" + }, + "machine_nozzle_offset_y": + { + "default_value": 0, + "description": "The y-coordinate of the offset of the nozzle.", + "label": "Nozzle Y Offset", + "settable_globally": false, + "settable_per_extruder": true, + "settable_per_mesh": false, + "settable_per_meshgroup": false, + "type": "float", + "unit": "mm" + }, + "machine_nozzle_size": + { + "default_value": 0.4, + "description": "The inner diameter of the nozzle. Change this setting when using a non-standard nozzle size.", + "label": "Nozzle Diameter", + "maximum_value_warning": "10", + "minimum_value": "0.001", + "settable_per_extruder": true, + "settable_per_mesh": false, + "type": "float", + "unit": "mm" } - } + }, + "description": "Machine specific settings", + "label": "Machine", + "type": "category" }, "material": { - "label": "Material", - "icon": "Spool", - "description": "Material", - "type": "category", "children": { "material_diameter": { - "label": "Diameter", - "description": "Adjusts the diameter of the filament used. Match this value with the diameter of the used filament.", - "unit": "mm", - "type": "float", "default_value": 2.85, + "description": "Adjusts the diameter of the filament used. Match this value with the diameter of the used filament.", + "enabled": "machine_gcode_flavor != \"UltiGCode\"", + "label": "Diameter", + "maximum_value_warning": "3.5", "minimum_value": "0.0001", "minimum_value_warning": "0.4", - "maximum_value_warning": "3.5", - "enabled": "machine_gcode_flavor != \"UltiGCode\"", + "settable_per_extruder": true, "settable_per_mesh": false, - "settable_per_extruder": true + "type": "float", + "unit": "mm" } - } + }, + "description": "Material", + "icon": "Spool", + "label": "Material", + "type": "category" + }, + "platform_adhesion": + { + "children": + { + "extruder_prime_pos_x": + { + "default_value": 0, + "description": "The X coordinate of the position where the nozzle primes at the start of printing.", + "enabled": false, + "label": "Extruder Prime X Position", + "maximum_value": "machine_width", + "minimum_value_warning": "machine_nozzle_offset_x", + "settable_per_extruder": true, + "settable_per_mesh": false, + "type": "float", + "unit": "mm" + }, + "extruder_prime_pos_y": + { + "default_value": 0, + "description": "The Y coordinate of the position where the nozzle primes at the start of printing.", + "enabled": false, + "label": "Extruder Prime Y Position", + "maximum_value_warning": "machine_depth", + "minimum_value_warning": "machine_nozzle_offset_y", + "settable_per_extruder": true, + "settable_per_mesh": false, + "type": "float", + "unit": "mm" + } + }, + "description": "Adhesion", + "icon": "Adhesion", + "label": "Build Plate Adhesion", + "type": "category" } } -} +} \ No newline at end of file diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 7f0edb21ba..96c7de0ea1 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4418,6 +4418,18 @@ "default_value": false, "settable_per_mesh": false, "settable_per_extruder": true + }, + "cool_min_temperature": + { + "label": "Small Layer Printing Temperature", + "description": "When reducing print speeds because of the minimum layer time, the printing temperature is gradually reduced to this temperature.", + "unit": "\u00b0C", + "type": "float", + "value": "material_print_temperature", + "minimum_value": "material_final_print_temperature", + "maximum_value": "material_print_temperature", + "settable_per_mesh": false, + "settable_per_extruder": true } } }, @@ -5675,6 +5687,7 @@ "unit": "mm", "type": "float", "default_value": 3, + "minimum_value": "0", "minimum_value_warning": "max(extruderValues('machine_nozzle_size'))", "maximum_value_warning": "10", "enabled": "resolveOrValue('adhesion_type') == 'skirt'", @@ -5735,7 +5748,7 @@ "unit": "mm", "type": "float", "default_value": 0, - "minimum_value": "0", + "minimum_value": "-skirt_brim_line_width / 2", "maximum_value_warning": "skirt_brim_line_width", "enabled": "resolveOrValue('adhesion_type') == 'brim'", "limit_to_extruder": "skirt_brim_extruder_nr", diff --git a/resources/definitions/felixpro2dual.def.json b/resources/definitions/felixpro2dual.def.json index 7c883b2f76..fd621f6073 100644 --- a/resources/definitions/felixpro2dual.def.json +++ b/resources/definitions/felixpro2dual.def.json @@ -2,70 +2,68 @@ "version": 2, "name": "Felix Pro 2 Dual", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "pnks", "manufacturer": "Felix", + "file_formats": "text/x-gcode", "platform": "FelixPro2_platform.obj", - "platform_offset": [-135, -0.5, 130], + "has_materials": true, + "has_variants": true, "machine_extruder_trains": { "0": "felixpro2_dual_extruder_0", "1": "felixpro2_dual_extruder_1" }, - "file_formats": "text/x-gcode", - "has_variants": true, - "has_materials": true, + "platform_offset": [ + -135, + -0.5, + 130 + ], "preferred_variant_name": "0.35 mm", "variants_name": "Nozzle diameter" }, - "overrides": { - "machine_name": { "default_value": "FelixPro2Dual" }, - + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "gantry_height": { "value": "0" }, + "infill_sparse_density": { "default_value": 20 }, "layer_height": { "default_value": 0.15 }, "layer_height_0": { "default_value": 0.2 }, - - "infill_sparse_density": { "default_value": 20 }, - "wall_thickness": { "value": "1" }, - "top_bottom_thickness": { "default_value": 1 }, - - "machine_width": { "default_value": 240 }, + "machine_center_is_zero": { "default_value": false }, "machine_depth": { "default_value": 225 }, - "machine_height": { "default_value": 245 }, - + "machine_end_gcode": { "default_value": "; Endcode FELIXprinters Pro series\r\n; =================================\t; Move extruder to park position\r\nG91 \t\t\t\t\t; Make coordinates relative\r\nG1 Z2 F5000 \t\t\t\t; Move z 2mm up\r\nG90 \t\t\t\t\t; Use absolute coordinates again\t\t\r\nG1 X220 Y243 F7800 \t\t\t; Move bed and printhead to ergonomic position\r\n\r\n; =================================\t; Turn off heaters\r\nT0\t\t\t\t\t; Select left extruder\r\nM104 T0 S0\t\t\t\t; Turn off heater and continue\t\t\t\t\r\nG92 E0\t\t\t\t\t; Reset extruder position\r\nG1 E-8\t\t\t\t\t; Retract filament 8mm\r\nG1 E-5\t\t\t\t\t; Push back filament 3mm\r\nG92 E0\t\t\t\t\t; Reset extruder position\r\n\r\nT1\t\t\t\t\t; Select right extruder\r\nM104 T1 S0\t\t\t\t; Turn off heater and continu\r\nG92 E0\t\t\t\t\t; Reset extruder position\r\nG1 E-8\t\t\t\t\t; Retract filament 8mm\r\nG1 E-5\t\t\t\t\t; Push back filament 3mm\r\nG92 E0\t\t\t\t\t; Reset extruder position\r\nT0\t\t\t\t\t; Select left extruder\r\nM140 S0\t\t\t\t\t; Turn off bed heater\r\n\r\n; =================================\t; Turn the rest off\r\nM107 \t\t\t\t; Turn off fan\r\nM84\t\t\t\t\t; Disable steppers\r\nM117 Print Complete" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "Repetier" }, "machine_head_with_fans_polygon": { "default_value": [ - [ -60, 50 ], - [ -60, -50 ], - [ 70, 50 ], - [ 70, -50 ] + [-60, 50], + [-60, -50], + [70, 50], + [70, -50] ] }, - "gantry_height": { "value": "0" }, - "machine_extruder_count": { "default_value": 2 }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 245 }, + "machine_name": { "default_value": "FelixPro2Dual" }, + "machine_start_gcode": { "default_value": "G90 ;absolute positioning\r\nM82 ;set extruder to absolute mode\r\nM107 ;start with the fan off\r\nG28 X0 Y0 ;move X/Y to min endstops\r\nG28 Z0 ;move Z to min endstops\r\nG1 Z15.0 F9000 ;move the platform down 15mm\r\n\r\nT0 ;Switch to the 1st extruder\r\nG92 E0 ;zero the extruded length\r\nG1 F200 E6 ;extrude 6 mm of feed stock\r\nG92 E0 ;zero the extruded length again\r\n;G1 F9000\r\nM117 FPro2 printing...\r\n" }, + "machine_width": { "default_value": 240 }, + "material_flow": { "default_value": 100 }, + "material_flow_layer_0": + { + "default_value": 110, + "value": "material_flow * 1.1" + }, "prime_tower_position_x": { "value": "250" }, "prime_tower_position_y": { "value": "200" }, - - "machine_heated_bed": { "default_value": true }, - "machine_gcode_flavor": { "default_value": "Repetier" }, - "machine_center_is_zero": { "default_value": false }, - - "speed_print": { "default_value": 80 }, - "retraction_amount": { "default_value": 1 }, - "retraction_speed": { "default_value": 50}, - "material_flow": { "default_value": 100 }, - "material_flow_layer_0": { "default_value" : 110, "value": "material_flow * 1.1" }, - "adhesion_type": { "default_value": "skirt" }, + "retraction_speed": { "default_value": 50 }, "skirt_brim_minimal_length": { "default_value": 130 }, "skirt_line_count": { "default_value": 3 }, - - "machine_start_gcode": { - "default_value": "G90 ;absolute positioning\r\nM82 ;set extruder to absolute mode\r\nM107 ;start with the fan off\r\nG28 X0 Y0 ;move X\/Y to min endstops\r\nG28 Z0 ;move Z to min endstops\r\nG1 Z15.0 F9000 ;move the platform down 15mm\r\n\r\nT0 ;Switch to the 1st extruder\r\nG92 E0 ;zero the extruded length\r\nG1 F200 E6 ;extrude 6 mm of feed stock\r\nG92 E0 ;zero the extruded length again\r\n;G1 F9000\r\nM117 FPro2 printing...\r\n" - }, - "machine_end_gcode": { - "default_value": "; Endcode FELIXprinters Pro series\r\n; =================================\t; Move extruder to park position\r\nG91 \t\t\t\t\t; Make coordinates relative\r\nG1 Z2 F5000 \t\t\t\t; Move z 2mm up\r\nG90 \t\t\t\t\t; Use absolute coordinates again\t\t\r\nG1 X220 Y243 F7800 \t\t\t; Move bed and printhead to ergonomic position\r\n\r\n; =================================\t; Turn off heaters\r\nT0\t\t\t\t\t; Select left extruder\r\nM104 T0 S0\t\t\t\t; Turn off heater and continue\t\t\t\t\r\nG92 E0\t\t\t\t\t; Reset extruder position\r\nG1 E-8\t\t\t\t\t; Retract filament 8mm\r\nG1 E-5\t\t\t\t\t; Push back filament 3mm\r\nG92 E0\t\t\t\t\t; Reset extruder position\r\n\r\nT1\t\t\t\t\t; Select right extruder\r\nM104 T1 S0\t\t\t\t; Turn off heater and continu\r\nG92 E0\t\t\t\t\t; Reset extruder position\r\nG1 E-8\t\t\t\t\t; Retract filament 8mm\r\nG1 E-5\t\t\t\t\t; Push back filament 3mm\r\nG92 E0\t\t\t\t\t; Reset extruder position\r\nT0\t\t\t\t\t; Select left extruder\r\nM140 S0\t\t\t\t\t; Turn off bed heater\r\n\r\n; =================================\t; Turn the rest off\r\nM107 \t\t\t\t; Turn off fan\r\nM84\t\t\t\t\t; Disable steppers\r\nM117 Print Complete" - } + "speed_print": { "default_value": 80 }, + "top_bottom_thickness": { "default_value": 1 }, + "wall_thickness": { "value": "1" } } -} +} \ No newline at end of file diff --git a/resources/definitions/felixtec4dual.def.json b/resources/definitions/felixtec4dual.def.json index ce0122251e..0e11069e6e 100644 --- a/resources/definitions/felixtec4dual.def.json +++ b/resources/definitions/felixtec4dual.def.json @@ -2,55 +2,50 @@ "version": 2, "name": "Felix Tec 4 Dual", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "kerog777@gmail.com", "manufacturer": "Felix", + "file_formats": "text/x-gcode", "platform": "FelixTec4_platform.3mf", - "platform_offset": [-128,0, 102], + "has_materials": true, + "has_variants": true, "machine_extruder_trains": { "0": "felixtec4_dual_extruder_0", "1": "felixtec4_dual_extruder_1" }, - "file_formats": "text/x-gcode", - "has_variants": true, - "has_materials": true, + "platform_offset": [ + -128, + 0, + 102 + ], "preferred_variant_name": "0.35 mm", "variants_name": "Nozzle Diam" }, - "overrides": { - "machine_name": { "default_value": "FelixTec4Dual" }, - + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "infill_pattern": { "value": "'tetrahedral'" }, + "infill_sparse_density": { "default_value": 20 }, "layer_height": { "default_value": 0.2 }, "layer_height_0": { "default_value": 0.3 }, - "infill_sparse_density": { "default_value": 20 }, - "wall_thickness": { "value": "1" }, - "top_bottom_thickness": { "default_value": 1 }, - - "infill_pattern": { "value": "'tetrahedral'" }, - - "machine_width": { "default_value": 255 }, - "machine_depth": { "default_value": 205 }, - "machine_height": { "default_value": 225 }, - - "machine_heated_bed": { "default_value": true }, - "machine_gcode_flavor": { "default_value": "Repetier" }, "machine_center_is_zero": { "default_value": false }, - - "speed_print": { "default_value": 60 }, - - "retraction_amount": { "default_value": 1 }, - "retraction_speed": { "default_value": 50}, + "machine_depth": { "default_value": 205 }, + "machine_end_gcode": { "default_value": "; FELIXprinters End Code Tec Series v1.0\n; Modified by kerog777@gmail.com\n; ================================= \n; Move extruder to park position\nG91 ; Make coordinates relative\nG1 Z2 F1000 ; Move z 2mm up\nG90 ; Use absolute coordinates again\nG1 X0 Y0 F15240 ; Move bed and printhead to ergonomic position\n\n; ================================= ; Turn off heaters\nM140 S0 ; Turn off bed heater\nT0 ; Select left extruder\nM104 T0 S0 ; Turn off heater and continue\nG92 E0 ; Reset extruder position\nG1 E-6 ; Retract filament 8mm\nG92 E0 ; Reset extruder position\nT1 ; Select right extruder\nM104 T1 S0 ; Turn off heater and continue\nG92 E0 ; Reset extruder position\nG1 E-6 ; Retract filament 8mm\nG92 E0 ; Reset extruder position\nT0 ; Select left extruder\n\n; ================================= ; Turn the rest off\nM107 ; Turn off fan\nM84 ; Disable steppers\nM117 Finished Printing!" }, + "machine_gcode_flavor": { "default_value": "Repetier" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 225 }, + "machine_name": { "default_value": "FelixTec4Dual" }, + "machine_start_gcode": { "default_value": "; FELIXprinters | www.FELIXprinters.com | Zeemanlaan 15 3401 MV IJsselstein The Netherlands\n; FELIX Tec 4 | Start Code Dual Extruders v1.0\n; Modified by kerog777@gmail.com\n;================================ \n;Initializing\nM80 ; Turn on the power supply\nM107 ; Turn off fans\nM117 Heating up\nM190 S{material_bed_temperature} ; Heatup Bed\nM104 T0 S120\nM104 T1 S120\nG28 ; Home all\nM109 T0 S{material_print_temperature_layer_0} ; Heatup hot-end\nM117 Purging\nT0 ; Select extruder 1\nG92 E0 ; Reset extruder\nG1 X10.0 Y1.1 Z5.0 F15240 ; Move to start-line position\nG1 Z0.3 F15240 ; Move z up\nG1 X127.0 Y1.1 Z0.3 F1500.0 E15 ; Purge 1st line\nG92 E0 ; Reset extruder\n\n;================================ ; Initializing done\nM117 FELIXprinting" }, + "machine_width": { "default_value": 255 }, "material_flow": { "default_value": 95 }, - "adhesion_type": { "default_value": "skirt" }, - "skirt_brim_minimal_length": { "default_value": 130}, - - "machine_start_gcode": { - "default_value": "; FELIXprinters | www.FELIXprinters.com | Zeemanlaan 15 3401 MV IJsselstein The Netherlands\n; FELIX Tec 4 | Start Code Dual Extruders v1.0\n; Modified by kerog777@gmail.com\n;================================ \n;Initializing\nM80 ; Turn on the power supply\nM107 ; Turn off fans\nM117 Heating up\nM190 S{material_bed_temperature} ; Heatup Bed\nM104 T0 S120\nM104 T1 S120\nG28 ; Home all\nM109 T0 S{material_print_temperature_layer_0} ; Heatup hot-end\nM117 Purging\nT0 ; Select extruder 1\nG92 E0 ; Reset extruder\nG1 X10.0 Y1.1 Z5.0 F15240 ; Move to start-line position\nG1 Z0.3 F15240 ; Move z up\nG1 X127.0 Y1.1 Z0.3 F1500.0 E15 ; Purge 1st line\nG92 E0 ; Reset extruder\n\n;================================ ; Initializing done\nM117 FELIXprinting" - }, - "machine_end_gcode": { - "default_value": "; FELIXprinters End Code Tec Series v1.0\n; Modified by kerog777@gmail.com\n; ================================= \n; Move extruder to park position\nG91 ; Make coordinates relative\nG1 Z2 F1000 ; Move z 2mm up\nG90 ; Use absolute coordinates again\nG1 X0 Y0 F15240 ; Move bed and printhead to ergonomic position\n\n; ================================= ; Turn off heaters\nM140 S0 ; Turn off bed heater\nT0 ; Select left extruder\nM104 T0 S0 ; Turn off heater and continue\nG92 E0 ; Reset extruder position\nG1 E-6 ; Retract filament 8mm\nG92 E0 ; Reset extruder position\nT1 ; Select right extruder\nM104 T1 S0 ; Turn off heater and continue\nG92 E0 ; Reset extruder position\nG1 E-6 ; Retract filament 8mm\nG92 E0 ; Reset extruder position\nT0 ; Select left extruder\n\n; ================================= ; Turn the rest off\nM107 ; Turn off fan\nM84 ; Disable steppers\nM117 Finished Printing!" - } + "retraction_amount": { "default_value": 1 }, + "retraction_speed": { "default_value": 50 }, + "skirt_brim_minimal_length": { "default_value": 130 }, + "speed_print": { "default_value": 60 }, + "top_bottom_thickness": { "default_value": 1 }, + "wall_thickness": { "value": "1" } } -} +} \ No newline at end of file diff --git a/resources/definitions/flashforge_base.def.json b/resources/definitions/flashforge_base.def.json index c41b03419f..0e7e2e01d5 100644 --- a/resources/definitions/flashforge_base.def.json +++ b/resources/definitions/flashforge_base.def.json @@ -2,43 +2,39 @@ "version": 2, "name": "Dreamer NX", "inherits": "fdmprinter", - "metadata": { + "machine_end_gcode": { "default_value": ";end gcode\nM104 S0 T0\nM140 S0 T0\nG162 Z F1800\nG28 X Y\nM652\nM132 X Y Z A B\nG91\nM18" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_start_gcode": { "default_value": ";Start Gcode\nG90 ;absolute positioning\nM118 X25.00 Y25.00 Z20.00 T0\nM140 S{material_bed_temperature_layer_0} T0 ;Heat bed up to first layer temperature\nM104 S{material_print_temperature_layer_0} T0 ;Set nozzle temperature to first layer temperature\nM107 ;start with the fan off\nG90\nG28\nM132 X Y Z A B\nG1 Z50.000 F420\nG161 X Y F3300\nM7 T0\nM6 T0\nM651\nM907 X100 Y100 Z40 A100 B20 ;Digital potentiometer value\nM108 T0\n;Purge line\nG1 X-110.00 Y-60.00 F4800\nG1 Z{layer_height_0} F420\nG1 X-110.00 Y60.00 E17,4 F1200\n;Purge line end" }, + "metadata": + { "visible": false, "author": "Egon", "manufacturer": "Flashforge", "file_formats": "text/x-gcode", - "first_start_actions": ["MachineSettingsAction"], - "machine_extruder_trains": - { - "0": "flashforge_dreamernx_extruder_0" - }, + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true, - "preferred_variant_name": "0.4mm Nozzle", - "preferred_quality_type": "normal", + "machine_extruder_trains": { "0": "flashforge_dreamernx_extruder_0" }, "preferred_material": "generic_pla", + "preferred_quality_type": "normal", + "preferred_variant_name": "0.4mm Nozzle", "variants_name": "Nozzle Size" }, - "overrides": { - "machine_heated_bed": {"default_value": true}, - "machine_max_feedrate_x": { "value": 500 }, - "machine_max_feedrate_y": { "value": 500 }, - "machine_max_feedrate_z": { "value": 10 }, - "machine_max_feedrate_e": { "value": 50 }, + "overrides": + { + "machine_acceleration": { "value": 500 }, + "machine_heated_bed": { "default_value": true }, + "machine_max_acceleration_e": { "value": 5000 }, "machine_max_acceleration_x": { "value": 1500 }, "machine_max_acceleration_y": { "value": 1500 }, "machine_max_acceleration_z": { "value": 500 }, - "machine_max_acceleration_e": { "value": 5000 }, - "machine_acceleration": { "value": 500 }, + "machine_max_feedrate_e": { "value": 50 }, + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_jerk_e": { "value": 5 }, "machine_max_jerk_xy": { "value": 10 }, - "machine_max_jerk_z": { "value": 0.4 }, - "machine_max_jerk_e": { "value": 5 } - }, - - - "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"}, - "machine_start_gcode": {"default_value": ";Start Gcode\nG90 ;absolute positioning\nM118 X25.00 Y25.00 Z20.00 T0\nM140 S{material_bed_temperature_layer_0} T0 ;Heat bed up to first layer temperature\nM104 S{material_print_temperature_layer_0} T0 ;Set nozzle temperature to first layer temperature\nM107 ;start with the fan off\nG90\nG28\nM132 X Y Z A B\nG1 Z50.000 F420\nG161 X Y F3300\nM7 T0\nM6 T0\nM651\nM907 X100 Y100 Z40 A100 B20 ;Digital potentiometer value\nM108 T0\n;Purge line\nG1 X-110.00 Y-60.00 F4800\nG1 Z{layer_height_0} F420\nG1 X-110.00 Y60.00 E17,4 F1200\n;Purge line end"}, - "machine_end_gcode": {"default_value": ";end gcode\nM104 S0 T0\nM140 S0 T0\nG162 Z F1800\nG28 X Y\nM652\nM132 X Y Z A B\nG91\nM18" - } + "machine_max_jerk_z": { "value": 0.4 } } +} \ No newline at end of file diff --git a/resources/definitions/flashforge_dreamer_nx.def.json b/resources/definitions/flashforge_dreamer_nx.def.json index 04eae33272..425c601133 100644 --- a/resources/definitions/flashforge_dreamer_nx.def.json +++ b/resources/definitions/flashforge_dreamer_nx.def.json @@ -2,32 +2,41 @@ "version": 2, "name": "Dreamer NX", "inherits": "flashforge_base", - "metadata": { + "metadata": + { "visible": true, "author": "Egon", "manufacturer": "Flashforge", "file_formats": "text/x-gcode", "platform": "FlashForge_DreamerNX.obj", - "platform_offset": [0, 0, 0], + "platform_offset": [ + 0, + 0, + 0 + ], "quality_definition": "flashforge_base" }, - - "overrides": { - "machine_name": { "default_value": "Dreamer NX" }, - "retraction_amount": { "default_value": 1.3 }, - "retraction_speed": { "default_value": 40 }, - "machine_width": {"default_value": 230}, - "machine_height": {"default_value": 140}, - "machine_depth": {"default_value": 150}, - "machine_center_is_zero": {"default_value": true}, - "machine_head_with_fans_polygon":{"default_value": [[ -15, -25 ],[ -15, 35 ],[ 40, 35 ],[ 40, -25 ]] + "overrides": + { + "gantry_height": { "value": "30" }, + "machine_center_is_zero": { "default_value": true }, + "machine_depth": { "default_value": 150 }, + "machine_end_gcode": { "default_value": ";end gcode\nM104 S0 T0\nM140 S0 T0\nG162 Z F1800\nG28 X Y\nM652\nM132 X Y Z A B\nG91\nM18" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-15, -25], + [-15, 35], + [40, 35], + [40, -25] + ] }, - "gantry_height": {"value": "30"}, - - - "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"}, - "machine_start_gcode": {"default_value": ";Start Gcode\nG90 ;absolute positioning\nM118 X25.00 Y25.00 Z20.00 T0\nM140 S{material_bed_temperature_layer_0} T0 ;Heat bed up to first layer temperature\nM104 S{material_print_temperature_layer_0} T0 ;Set nozzle temperature to first layer temperature\nM107 ;start with the fan off\nG90\nG28\nM132 X Y Z A B\nG1 Z50.000 F420\nG161 X Y F3300\nM7 T0\nM6 T0\nM651\nM907 X100 Y100 Z40 A100 B20 ;Digital potentiometer value\nM108 T0\n;Purge line\nG1 X-110.00 Y-60.00 F4800\nG1 Z{layer_height_0} F420\nG1 X-110.00 Y60.00 E17,4 F1200\n;Purge line end"}, - "machine_end_gcode": {"default_value": ";end gcode\nM104 S0 T0\nM140 S0 T0\nG162 Z F1800\nG28 X Y\nM652\nM132 X Y Z A B\nG91\nM18" - } + "machine_height": { "default_value": 140 }, + "machine_name": { "default_value": "Dreamer NX" }, + "machine_start_gcode": { "default_value": ";Start Gcode\nG90 ;absolute positioning\nM118 X25.00 Y25.00 Z20.00 T0\nM140 S{material_bed_temperature_layer_0} T0 ;Heat bed up to first layer temperature\nM104 S{material_print_temperature_layer_0} T0 ;Set nozzle temperature to first layer temperature\nM107 ;start with the fan off\nG90\nG28\nM132 X Y Z A B\nG1 Z50.000 F420\nG161 X Y F3300\nM7 T0\nM6 T0\nM651\nM907 X100 Y100 Z40 A100 B20 ;Digital potentiometer value\nM108 T0\n;Purge line\nG1 X-110.00 Y-60.00 F4800\nG1 Z{layer_height_0} F420\nG1 X-110.00 Y60.00 E17,4 F1200\n;Purge line end" }, + "machine_width": { "default_value": 230 }, + "retraction_amount": { "default_value": 1.3 }, + "retraction_speed": { "default_value": 40 } } -} +} \ No newline at end of file diff --git a/resources/definitions/flsun_q5.def.json b/resources/definitions/flsun_q5.def.json index db52b54eb6..93f6abddfa 100644 --- a/resources/definitions/flsun_q5.def.json +++ b/resources/definitions/flsun_q5.def.json @@ -2,45 +2,25 @@ "version": 2, "name": "Flsun Q5", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, - "manufacturer": "Flsun", "author": "Daniel Kreuzhofer", + "manufacturer": "Flsun", "file_formats": "text/x-gcode", - "machine_extruder_trains": { - "0": "flsun_q5_extruder" - } + "machine_extruder_trains": { "0": "flsun_q5_extruder" } }, - "overrides": { - "machine_extruder_count": { - "default_value": 1 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_width": { - "default_value": 200 - }, - "machine_height": { - "default_value": 200 - }, - "machine_depth": { - "default_value": 200 - }, - "machine_center_is_zero": { - "default_value": true - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": ";FLAVOR:Marlin\r\nM82 ;absolute extrusion mode\r\nG21\r\nG90\r\nM82\r\nM107 T0\r\nG28\r\nG92 E0\r\nG0 E3 F200\r\nG92 E0 ; reset extrusion distance\r\nM106 S255 ; Enable cooling fan full speed\r\nG1 X-98 Y0 Z0.4 F3000 ; move to arc start\r\nG3 X0 Y-98 I98 Z0.4 E40 F400 ; lay arc stripe 90deg\r\nG92 E0 ; reset extrusion distance\r\nG4 P500 ; wait for 0.5 sec\r\nG0 Z10 E-1 ; Lift 15mm and retract 1mm filament\r\nG4 P2000 ; wait for 5 sec\r\nG0 Z15\r\nM107 ; Disable cooling fan\r\nG1 X0 Y-85 Z4 E0 F3000 ; get off the bed" - }, - "machine_end_gcode": { - "default_value": "M104 S0\r\nM140 S0\r\nG92 E1\r\nG1 E-1 F300\r\nG28 X0 Y0\r\nM84\r\nM82 ;absolute extrusion mode\r\nM104 S0" - }, - "machine_shape": { - "default_value": "elliptic" - } + "overrides": + { + "machine_center_is_zero": { "default_value": true }, + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "M104 S0\r\nM140 S0\r\nG92 E1\r\nG1 E-1 F300\r\nG28 X0 Y0\r\nM84\r\nM82 ;absolute extrusion mode\r\nM104 S0" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 200 }, + "machine_shape": { "default_value": "elliptic" }, + "machine_start_gcode": { "default_value": ";FLAVOR:Marlin\r\nM82 ;absolute extrusion mode\r\nG21\r\nG90\r\nM82\r\nM107 T0\r\nG28\r\nG92 E0\r\nG0 E3 F200\r\nG92 E0 ; reset extrusion distance\r\nM106 S255 ; Enable cooling fan full speed\r\nG1 X-98 Y0 Z0.4 F3000 ; move to arc start\r\nG3 X0 Y-98 I98 Z0.4 E40 F400 ; lay arc stripe 90deg\r\nG92 E0 ; reset extrusion distance\r\nG4 P500 ; wait for 0.5 sec\r\nG0 Z10 E-1 ; Lift 15mm and retract 1mm filament\r\nG4 P2000 ; wait for 5 sec\r\nG0 Z15\r\nM107 ; Disable cooling fan\r\nG1 X0 Y-85 Z4 E0 F3000 ; get off the bed" }, + "machine_width": { "default_value": 200 } } -} +} \ No newline at end of file diff --git a/resources/definitions/flsun_qq.def.json b/resources/definitions/flsun_qq.def.json index 6c32fea5e3..712bb872aa 100644 --- a/resources/definitions/flsun_qq.def.json +++ b/resources/definitions/flsun_qq.def.json @@ -2,45 +2,25 @@ "version": 2, "name": "Flsun QQ", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, - "manufacturer": "Flsun", "author": "Daniel Green", + "manufacturer": "Flsun", "file_formats": "text/x-gcode", - "machine_extruder_trains": { - "0": "flsun_qq_extruder" - } + "machine_extruder_trains": { "0": "flsun_qq_extruder" } }, - "overrides": { - "machine_extruder_count": { - "default_value": 1 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_width": { - "default_value": 260 - }, - "machine_height": { - "default_value": 285 - }, - "machine_depth": { - "default_value": 260 - }, - "machine_center_is_zero": { - "default_value": true - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G28 ;Home\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" - }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" - }, - "machine_shape": { - "default_value": "elliptic" - } + "overrides": + { + "machine_center_is_zero": { "default_value": true }, + "machine_depth": { "default_value": 260 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 285 }, + "machine_shape": { "default_value": "elliptic" }, + "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" }, + "machine_width": { "default_value": 260 } } -} +} \ No newline at end of file diff --git a/resources/definitions/flsun_qq_s.def.json b/resources/definitions/flsun_qq_s.def.json index 024531a28d..2e2cb54a82 100644 --- a/resources/definitions/flsun_qq_s.def.json +++ b/resources/definitions/flsun_qq_s.def.json @@ -2,56 +2,27 @@ "version": 2, "name": "Flsun QQ-S", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Cataldo URSO & Eddy Emck ", "manufacturer": "Flsun", - "platform": "flsun_qq_s.3mf", "file_formats": "text/x-gcode", + "platform": "flsun_qq_s.3mf", "has_materials": true, - "preferred_quality_type": "draft", - "machine_extruder_trains": { - "0": "flsun_qq_s_extruder_0" - } + "machine_extruder_trains": { "0": "flsun_qq_s_extruder_0" }, + "preferred_quality_type": "draft" }, - "overrides": { - "machine_center_is_zero": { - "default_value": true - }, - "machine_shape": { - "default_value": "elliptic" - }, - "machine_width": { - "default_value": 260 - }, - "machine_depth": { - "default_value": 260 - }, - "machine_height": { - "default_value": 370 - }, - "z_seam_type": { - "default_value": "back" - }, - "gantry_height": { - "value": "0" - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "material_diameter": { - "default_value": 1.75 - }, - "machine_start_gcode": { - "default_value": "G21\nG90\nM82\nM107 T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\nG0 E3 F200\nG92 E0\n" - }, - "machine_end_gcode": { - "default_value": "M107 T0\nM104 S0\nM104 S0 T1\nM140 S0\nG92 E0\nG91\nG1 E-1 F300 \nG1 Z+0.5 E-5 X-20 Y-20 F9000\nG28 X0 Y0\nM84 ;steppers off\nG90 ;absolute positioning\n" - }, - "infill_sparse_density": { - "default_value": 10 - }, - "machine_head_with_fans_polygon": { + "overrides": + { + "gantry_height": { "value": "0" }, + "infill_sparse_density": { "default_value": 10 }, + "machine_center_is_zero": { "default_value": true }, + "machine_depth": { "default_value": 260 }, + "machine_end_gcode": { "default_value": "M107 T0\nM104 S0\nM104 S0 T1\nM140 S0\nG92 E0\nG91\nG1 E-1 F300 \nG1 Z+0.5 E-5 X-20 Y-20 F9000\nG28 X0 Y0\nM84 ;steppers off\nG90 ;absolute positioning\n" }, + "machine_gcode_flavor": { "default_value": "Repetier" }, + "machine_head_with_fans_polygon": + { "default_value": [ [0, 0], [0, 0], @@ -59,14 +30,14 @@ [0, 0] ] }, - "retraction_enable": { - "default_value": true - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_gcode_flavor": { - "default_value": "Repetier" - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 370 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "machine_shape": { "default_value": "elliptic" }, + "machine_start_gcode": { "default_value": "G21\nG90\nM82\nM107 T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\nG0 E3 F200\nG92 E0\n" }, + "machine_width": { "default_value": 260 }, + "material_diameter": { "default_value": 1.75 }, + "retraction_enable": { "default_value": true }, + "z_seam_type": { "default_value": "back" } } -} +} \ No newline at end of file diff --git a/resources/definitions/flsun_sr.def.json b/resources/definitions/flsun_sr.def.json index 37487412ab..a926816617 100644 --- a/resources/definitions/flsun_sr.def.json +++ b/resources/definitions/flsun_sr.def.json @@ -2,43 +2,34 @@ "version": 2, "name": "Flsun Super Racer", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Thushan Fernando, Guislain Cyril", "manufacturer": "Flsun", - "platform": "flsun_sr.stl", - "platform_offset": [0,-81,-43.5], "file_formats": "text/x-gcode", - "has_materials": true, + "platform": "flsun_sr.stl", "has_machine_quality": true, - "preferred_quality_type": "normal", - "machine_extruder_trains": { - "0": "flsun_sr_extruder_0" - } + "has_materials": true, + "machine_extruder_trains": { "0": "flsun_sr_extruder_0" }, + "platform_offset": [ + 0, + -81, + -43.5 + ], + "preferred_quality_type": "normal" }, - "overrides": { - "machine_extruder_count": { - "default_value": 1 - }, - "retraction_enable": { - "default_value": true - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_width": { - "default_value": 264 - }, - "machine_depth": { - "default_value": 264 - }, - "machine_height": { - "default_value": 320 - }, - "machine_center_is_zero": { - "default_value": true - }, - "machine_head_with_fans_polygon": { + "overrides": + { + "gantry_height": { "value": "0" }, + "infill_sparse_density": { "default_value": 15 }, + "machine_center_is_zero": { "default_value": true }, + "machine_depth": { "default_value": 264 }, + "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" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_gcode_flavor": { "default_value": "Marlin" }, + "machine_head_with_fans_polygon": + { "default_value": [ [0, 0], [0, 0], @@ -46,32 +37,14 @@ [0, 0] ] }, - "z_seam_type": { - "value": "'back'" - }, - "gantry_height": { - "value": "0" - }, - "machine_shape": { - "default_value": "elliptic" - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "material_diameter": { - "default_value": 1.75 - }, - "infill_sparse_density": { - "default_value": 15 - }, - "machine_start_gcode": { - "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" - }, - "machine_gcode_flavor": { - "default_value": "Marlin" - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 320 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "machine_shape": { "default_value": "elliptic" }, + "machine_start_gcode": { "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_width": { "default_value": 264 }, + "material_diameter": { "default_value": 1.75 }, + "retraction_enable": { "default_value": true }, + "z_seam_type": { "value": "'back'" } } -} +} \ No newline at end of file diff --git a/resources/definitions/flyingbear_base.def.json b/resources/definitions/flyingbear_base.def.json index 68c709a630..b59c6abf90 100644 --- a/resources/definitions/flyingbear_base.def.json +++ b/resources/definitions/flyingbear_base.def.json @@ -1,26 +1,13 @@ { - "name": "Flying Bear Base Printer", "version": 2, + "name": "Flying Bear Base Printer", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": false, "author": "oducceu", "manufacturer": "Flying Bear", "file_formats": "text/x-gcode", - "first_start_actions": ["MachineSettingsAction"], - - "machine_extruder_trains": { "0": "flyingbear_base_extruder_0" }, - - "has_materials": true, - "preferred_material": "generic_pla", - - "has_variants": true, - "variants_name": "Nozzle Size", - "preferred_variant_name": "0.4mm Nozzle", - - "has_machine_quality": true, - "preferred_quality_type": "normal", - "exclude_materials": [ "3D-Fuel_PLA_PRO_Black", "3D-Fuel_PLA_SnapSupport", @@ -99,104 +86,99 @@ "Vertex_Delta_TPU", "zyyx_pro_flex", "zyyx_pro_pla" - ] + ], + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { "0": "flyingbear_base_extruder_0" }, + "preferred_material": "generic_pla", + "preferred_quality_type": "normal", + "preferred_variant_name": "0.4mm Nozzle", + "variants_name": "Nozzle Size" }, - "overrides": { - "machine_name": { "default_value": "Flying Bear Base Printer" }, - - "machine_start_gcode": { "default_value": "M220 S100 ;reset feedrate\nM221 S100 ;reset flowrate\nG90 ;use absolute coordinates\nM82 ;absolute extrusion mode\nG28 ;home\nG1 Z2 F1500 ;raise z\nG92 E0 ;reset extruder\n\nG1 X75 Y5 F5000 ;start position\nG1 Z0.28 F1500 ;lower z\nG1 E4 F500 ;prime the filament\nG1 X180 E10 F500 ;1st line\nG1 Y5.4 F5000\nG1 X75 E20 F500 ;2nd line\nG1 Z2 F1500 ;raise z\nG92 E0 ;reset extruder" }, - - "machine_end_gcode": { "default_value": "G91 ;use relative coordinates\nG1 E-4 F1500 ;retract the filament\nG1 X5 Y5 Z0.2 F5000 ;wipe\nG1 Z5 F1500 ;raise z\nG90 ;use absolute coordinates\nG1 X10 Y{machine_depth} F5000 ;park print head\n\nM107 ;turn off fan\nM104 S0 ;turn off hotend\nM140 S0 ;turn off heatbed\nM84 ;disable motors" }, - - "machine_heated_bed": { "default_value": true }, - "machine_shape": { "default_value": "rectangular" }, - "machine_buildplate_type": { "value": "glass" }, - "machine_center_is_zero": { "default_value": false }, - - "material_diameter": { "default_value": 1.75 }, - - "layer_height_0": { "value": 0.2 }, - "skin_line_width": { "value": "machine_nozzle_size" }, - "infill_line_width": { "value": "line_width + 0.1" }, - "skirt_brim_line_width": { "value": "line_width + 0.1" }, - "support_interface_line_width": { "value": "line_width - 0.1" }, - - "wall_thickness": { "value": "line_width * 3" }, - "wall_0_wipe_dist": { "value": 0.0 }, - "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3 if layer_height > 0.15 else 0.8" }, - "optimize_wall_printing_order": { "value": true }, + "overrides": + { + "adaptive_layer_height_variation": { "value": 0.04 }, + "adaptive_layer_height_variation_step": { "value": 0.04 }, + "adhesion_type": { "value": "'skirt'" }, + "brim_gap": { "value": "line_width / 2 if line_width < 0.4 else 0.2" }, + "brim_replaces_support": { "value": false }, + "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, + "cool_min_layer_time": { "value": 10 }, "fill_outline_gaps": { "value": false }, - "z_seam_type": { "value": "'sharpest_corner'" }, - "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_overlap": { "value": 30 }, - "skin_overlap": { "value": 10 }, - "infill_wipe_dist": { "value": 0.0 }, "infill_before_walls": { "value": false }, "infill_enable_travel_optimization": { "value": true }, - - "material_initial_print_temperature": { "value": "material_print_temperature" }, + "infill_line_width": { "value": "line_width + 0.1" }, + "infill_overlap": { "value": 30 }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, + "infill_sparse_density": { "value": 20 }, + "infill_wipe_dist": { "value": 0.0 }, + "layer_height_0": { "value": 0.2 }, + "machine_buildplate_type": { "value": "glass" }, + "machine_center_is_zero": { "default_value": false }, + "machine_end_gcode": { "default_value": "G91 ;use relative coordinates\nG1 E-4 F1500 ;retract the filament\nG1 X5 Y5 Z0.2 F5000 ;wipe\nG1 Z5 F1500 ;raise z\nG90 ;use absolute coordinates\nG1 X10 Y{machine_depth} F5000 ;park print head\n\nM107 ;turn off fan\nM104 S0 ;turn off hotend\nM140 S0 ;turn off heatbed\nM84 ;disable motors" }, + "machine_heated_bed": { "default_value": true }, + "machine_name": { "default_value": "Flying Bear Base Printer" }, + "machine_shape": { "default_value": "rectangular" }, + "machine_start_gcode": { "default_value": "M220 S100 ;reset feedrate\nM221 S100 ;reset flowrate\nG90 ;use absolute coordinates\nM82 ;absolute extrusion mode\nG28 ;home\nG1 Z2 F1500 ;raise z\nG92 E0 ;reset extruder\n\nG1 X75 Y5 F5000 ;start position\nG1 Z0.28 F1500 ;lower z\nG1 E4 F500 ;prime the filament\nG1 X180 E10 F500 ;1st line\nG1 Y5.4 F5000\nG1 X75 E20 F500 ;2nd line\nG1 Z2 F1500 ;raise z\nG92 E0 ;reset extruder" }, + "material_diameter": { "default_value": 1.75 }, "material_final_print_temperature": { "value": "material_print_temperature" }, - "retraction_min_travel": { "value": 1.5 }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "meshfix_maximum_resolution": { "value": 0.25 }, + "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" }, + "minimum_interface_area": { "value": 10 }, + "minimum_support_area": { "value": 5 }, + "optimize_wall_printing_order": { "value": true }, + "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, + "retraction_combing_max_distance": { "value": 30 }, "retraction_count_max": { "value": 100 }, "retraction_extrusion_window": { "value": 10 }, - - "speed_print": { "value": 60 } , + "retraction_hop": { "value": 0.2 }, + "retraction_hop_enabled": { "value": false }, + "retraction_min_travel": { "value": 1.5 }, + "skin_line_width": { "value": "machine_nozzle_size" }, + "skin_overlap": { "value": 10 }, + "skirt_brim_line_width": { "value": "line_width + 0.1" }, + "skirt_brim_minimal_length": { "value": 50 }, + "skirt_brim_speed": { "value": "speed_layer_0" }, + "skirt_gap": { "value": 10 }, + "skirt_line_count": { "value": 3 }, "speed_infill": { "value": "speed_print * 1.5" }, - "speed_wall_x": { "value": "speed_print" }, + "speed_layer_0": { "value": "speed_print / 2" }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_print": { "value": 60 }, "speed_roofing": { "value": "speed_topbottom" }, "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_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_wall_x": { "value": "speed_print" }, "speed_z_hop": { "value": 5 }, - - "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, - "travel_retract_before_outer_wall": { "value": true }, - "retraction_combing_max_distance": { "value": 30 }, - "travel_avoid_other_parts": { "value": true }, - "travel_avoid_supports": { "value": true }, - "retraction_hop_enabled": { "value": false }, - "retraction_hop": { "value": 0.2 }, - - "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, - "cool_min_layer_time": { "value": 10 }, - "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_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, - "support_xy_distance": { "value": "wall_line_width_0 * 2" }, - "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, - "support_xy_distance_overhang": { "value": "wall_line_width_0" }, - "minimum_support_area": { "value": 5 }, - "minimum_interface_area": { "value": 10 }, - "support_interface_enable": { "value": true }, - "support_interface_height": { "value": "layer_height * 4" }, - "support_interface_skip_height": { "value": 0.2 }, - "support_interface_density": { "value": 33 }, - "support_interface_pattern": { "value": "'grid'" }, - "support_wall_count": { "value": 1 }, "support_brim_enable": { "value": true }, "support_brim_width": { "value": 4 }, + "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, + "support_interface_density": { "value": 33 }, + "support_interface_enable": { "value": true }, + "support_interface_height": { "value": "layer_height * 4" }, + "support_interface_line_width": { "value": "line_width - 0.1" }, + "support_interface_pattern": { "value": "'grid'" }, + "support_interface_skip_height": { "value": 0.2 }, + "support_pattern": { "value": "'zigzag'" }, "support_use_towers": { "value": false }, - - "adhesion_type": { "value": "'skirt'" }, - "skirt_line_count": { "value": 3 }, - "skirt_gap": { "value": 10 }, - "skirt_brim_minimal_length": { "value": 50 }, - "brim_replaces_support": { "value": false }, - "brim_gap": { "value": "line_width / 2 if line_width < 0.4 else 0.2" }, - - "meshfix_maximum_resolution": { "value": 0.25 }, - "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" }, - - "adaptive_layer_height_variation": { "value": 0.04 }, - "adaptive_layer_height_variation_step": { "value": 0.04 } - } -} + "support_wall_count": { "value": 1 }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3 if layer_height > 0.15 else 0.8" }, + "travel_avoid_other_parts": { "value": true }, + "travel_avoid_supports": { "value": true }, + "travel_retract_before_outer_wall": { "value": true }, + "wall_0_wipe_dist": { "value": 0.0 }, + "wall_thickness": { "value": "line_width * 3" }, + "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, + "z_seam_type": { "value": "'sharpest_corner'" } + } +} \ No newline at end of file diff --git a/resources/definitions/flyingbear_ghost_4s.def.json b/resources/definitions/flyingbear_ghost_4s.def.json index 08bd3a2d97..fe5b82a49f 100644 --- a/resources/definitions/flyingbear_ghost_4s.def.json +++ b/resources/definitions/flyingbear_ghost_4s.def.json @@ -1,54 +1,45 @@ { - "name": "Flying Bear Ghost 4S", - "version": 2, - "inherits": "flyingbear_base", - "metadata": { - "visible": true, - "author": "oducceu", - - "platform": "flyingbear_platform.obj", - "platform_texture": "flyingbear_platform.png", - - "quality_definition": "flyingbear_base" - - }, - - "overrides": { - "machine_name": { "default_value": "Flying Bear Ghost 4S" }, - "machine_width": { "default_value": 255 }, - "machine_depth": { "default_value": 210 }, - "machine_height": { "default_value": 200 }, - - "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_steps_per_mm_e": { "default_value": 400 }, - - "machine_max_feedrate_x": { "value": 200 }, - "machine_max_feedrate_y": { "value": 200 }, - "machine_max_feedrate_z": { "value": 20 }, - "machine_max_feedrate_e": { "value": 70 }, - - "acceleration_enabled": { "value": false }, - "jerk_enabled": { "value": false }, - - "machine_max_acceleration_x": { "value": 1000 }, - "machine_max_acceleration_y": { "value": 1000 }, - "machine_max_acceleration_z": { "value": 100 }, - "machine_max_acceleration_e": { "value": 1000 }, - "machine_acceleration": { "value": 1000 }, - - "machine_max_jerk_xy": { "value": 20 }, - "machine_max_jerk_z": { "value": 0.4 }, - "machine_max_jerk_e": { "value": 5.0 }, - - "acceleration_print": { "value": 1000 }, - "acceleration_travel": { "value": 1000 }, - "acceleration_travel_layer_0": { "value": "acceleration_travel" }, - "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, - - "jerk_print": { "value": 20 }, - "jerk_travel": { "value": "jerk_print" }, - "jerk_travel_layer_0": { "value": "jerk_travel" } - } + "version": 2, + "name": "Flying Bear Ghost 4S", + "inherits": "flyingbear_base", + "metadata": + { + "visible": true, + "author": "oducceu", + "platform": "flyingbear_platform.obj", + "platform_texture": "flyingbear_platform.png", + "quality_definition": "flyingbear_base" + }, + "overrides": + { + "acceleration_enabled": { "value": false }, + "acceleration_print": { "value": 1000 }, + "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, + "acceleration_travel": { "value": 1000 }, + "acceleration_travel_layer_0": { "value": "acceleration_travel" }, + "jerk_enabled": { "value": false }, + "jerk_print": { "value": 20 }, + "jerk_travel": { "value": "jerk_print" }, + "jerk_travel_layer_0": { "value": "jerk_travel" }, + "machine_acceleration": { "value": 1000 }, + "machine_depth": { "default_value": 210 }, + "machine_height": { "default_value": 200 }, + "machine_max_acceleration_e": { "value": 1000 }, + "machine_max_acceleration_x": { "value": 1000 }, + "machine_max_acceleration_y": { "value": 1000 }, + "machine_max_acceleration_z": { "value": 100 }, + "machine_max_feedrate_e": { "value": 70 }, + "machine_max_feedrate_x": { "value": 200 }, + "machine_max_feedrate_y": { "value": 200 }, + "machine_max_feedrate_z": { "value": 20 }, + "machine_max_jerk_e": { "value": 5.0 }, + "machine_max_jerk_xy": { "value": 20 }, + "machine_max_jerk_z": { "value": 0.4 }, + "machine_name": { "default_value": "Flying Bear Ghost 4S" }, + "machine_steps_per_mm_e": { "default_value": 400 }, + "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_width": { "default_value": 255 } + } } \ No newline at end of file diff --git a/resources/definitions/flyingbear_ghost_5.def.json b/resources/definitions/flyingbear_ghost_5.def.json index cd799f8591..26108d9eeb 100644 --- a/resources/definitions/flyingbear_ghost_5.def.json +++ b/resources/definitions/flyingbear_ghost_5.def.json @@ -1,54 +1,45 @@ { - "name": "Flying Bear Ghost 5", - "version": 2, - "inherits": "flyingbear_base", - "metadata": { - "visible": true, - "author": "oducceu", - - "platform": "flyingbear_platform.obj", - "platform_texture": "flyingbear_platform.png", - - "quality_definition": "flyingbear_base" - - }, - - "overrides": { - "machine_name": { "default_value": "Flying Bear Ghost 5" }, - "machine_width": { "default_value": 255 }, - "machine_depth": { "default_value": 210 }, - "machine_height": { "default_value": 200 }, - - "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_steps_per_mm_e": { "default_value": 410 }, - - "machine_max_feedrate_x": { "value": 300 }, - "machine_max_feedrate_y": { "value": 300 }, - "machine_max_feedrate_z": { "value": 20 }, - "machine_max_feedrate_e": { "value": 70 }, - - "acceleration_enabled": { "value": false }, - "jerk_enabled": { "value": false }, - - "machine_max_acceleration_x": { "value": 1000 }, - "machine_max_acceleration_y": { "value": 1000 }, - "machine_max_acceleration_z": { "value": 200 }, - "machine_max_acceleration_e": { "value": 80000 }, - "machine_acceleration": { "value": 1000 }, - - "machine_max_jerk_xy": { "value": 20 }, - "machine_max_jerk_z": { "value": 0.4 }, - "machine_max_jerk_e": { "value": 5.0 }, - - "acceleration_print": { "value": 1000 }, - "acceleration_travel": { "value": 3000 }, - "acceleration_travel_layer_0": { "value": "acceleration_travel" }, - "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, - - "jerk_print": { "value": 20 }, - "jerk_travel": { "value": "jerk_print" }, - "jerk_travel_layer_0": { "value": "jerk_travel" } - } + "version": 2, + "name": "Flying Bear Ghost 5", + "inherits": "flyingbear_base", + "metadata": + { + "visible": true, + "author": "oducceu", + "platform": "flyingbear_platform.obj", + "platform_texture": "flyingbear_platform.png", + "quality_definition": "flyingbear_base" + }, + "overrides": + { + "acceleration_enabled": { "value": false }, + "acceleration_print": { "value": 1000 }, + "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, + "acceleration_travel": { "value": 3000 }, + "acceleration_travel_layer_0": { "value": "acceleration_travel" }, + "jerk_enabled": { "value": false }, + "jerk_print": { "value": 20 }, + "jerk_travel": { "value": "jerk_print" }, + "jerk_travel_layer_0": { "value": "jerk_travel" }, + "machine_acceleration": { "value": 1000 }, + "machine_depth": { "default_value": 210 }, + "machine_height": { "default_value": 200 }, + "machine_max_acceleration_e": { "value": 80000 }, + "machine_max_acceleration_x": { "value": 1000 }, + "machine_max_acceleration_y": { "value": 1000 }, + "machine_max_acceleration_z": { "value": 200 }, + "machine_max_feedrate_e": { "value": 70 }, + "machine_max_feedrate_x": { "value": 300 }, + "machine_max_feedrate_y": { "value": 300 }, + "machine_max_feedrate_z": { "value": 20 }, + "machine_max_jerk_e": { "value": 5.0 }, + "machine_max_jerk_xy": { "value": 20 }, + "machine_max_jerk_z": { "value": 0.4 }, + "machine_name": { "default_value": "Flying Bear Ghost 5" }, + "machine_steps_per_mm_e": { "default_value": 410 }, + "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_width": { "default_value": 255 } + } } \ No newline at end of file diff --git a/resources/definitions/folgertech_FT-5.def.json b/resources/definitions/folgertech_FT-5.def.json index 092d032842..79a2b2192f 100644 --- a/resources/definitions/folgertech_FT-5.def.json +++ b/resources/definitions/folgertech_FT-5.def.json @@ -1,30 +1,24 @@ { - "version": 2, + "version": 2, "name": "Folger Tech FT-5", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Jaime van Kessel & Paul Bussiere", "manufacturer": "Folger Tech", "file_formats": "text/x-gcode", "platform": "FT-5_build_plate.3mf", - "machine_extruder_trains": - { - "0": "folgertech_FT-5_extruder_0" - } + "machine_extruder_trains": { "0": "folgertech_FT-5_extruder_0" } }, - "overrides": { - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 300 }, - "machine_height": { "default_value": 400 }, - "machine_depth": { "default_value": 300 }, + "overrides": + { "gantry_height": { "value": "55" }, - - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\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_depth": { "default_value": 300 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\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_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 400 }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, + "machine_width": { "default_value": 300 } } -} +} \ No newline at end of file diff --git a/resources/definitions/fusedform_300.def.json b/resources/definitions/fusedform_300.def.json index d4199abd5c..f6654279e6 100644 --- a/resources/definitions/fusedform_300.def.json +++ b/resources/definitions/fusedform_300.def.json @@ -2,29 +2,29 @@ "version": 2, "name": "FF300", "inherits": "fusedform_base", - - "metadata": { - "quality_definition": "fusedform_base", - "visible": true + "metadata": + { + "visible": true, + "quality_definition": "fusedform_base" }, - - "overrides": { - "machine_name": { "default_value": "FF300" }, - "machine_width": { "default_value": 360 }, + "overrides": + { + "acceleration_travel": { "value": 1000 }, + "machine_acceleration": { "default_value": 1000 }, "machine_depth": { "default_value": 300 }, + "machine_extruder_count": { "value": 1 }, "machine_height": { "default_value": 320 }, - "machine_extruder_count": { "value": 1 }, + "machine_max_acceleration_x": { "value": 1200 }, + "machine_max_acceleration_y": { "value": 1200 }, + "machine_max_acceleration_z": { "default_value": 100 }, + "machine_max_feedrate_e": { "default_value": 100 }, "machine_max_feedrate_x": { "default_value": 100 }, "machine_max_feedrate_y": { "default_value": 100 }, - "machine_max_feedrate_z": { "default_value": 3 }, - "machine_max_feedrate_e": { "default_value": 100 }, - "machine_max_acceleration_x": {"value":1200}, - "machine_max_acceleration_y": {"value":1200}, - "machine_max_acceleration_z": { "default_value": 100 }, - "machine_acceleration": { "default_value": 1000 }, + "machine_max_feedrate_z": { "default_value": 3 }, + "machine_max_jerk_e": { "default_value": 5 }, "machine_max_jerk_xy": { "default_value": 8 }, "machine_max_jerk_z": { "default_value": 0.3 }, - "machine_max_jerk_e": { "default_value": 5 }, - "acceleration_travel": {"value":1000} + "machine_name": { "default_value": "FF300" }, + "machine_width": { "default_value": 360 } } -} +} \ No newline at end of file diff --git a/resources/definitions/fusedform_300_doppia.def.json b/resources/definitions/fusedform_300_doppia.def.json index 6b13bc02ea..b9fca582fb 100644 --- a/resources/definitions/fusedform_300_doppia.def.json +++ b/resources/definitions/fusedform_300_doppia.def.json @@ -2,29 +2,29 @@ "version": 2, "name": "FF300 Doppia", "inherits": "fusedform_doppia_base", - "metadata": { + "metadata": + { "visible": true, "quality_definition": "fusedform_base" }, - - "overrides": { - "machine_extruder_count": { "value": 2 }, - "machine_name": { "default_value": "FF300 Doppia" }, - "machine_width": { "default_value": 360 }, - "machine_depth": { "default_value": 300 }, - "machine_height": { "default_value": 320 }, - "machine_max_feedrate_x": { "default_value": 100 }, - "machine_max_feedrate_y": { "default_value": 100 }, - "machine_max_feedrate_z": { "default_value": 3 }, - "machine_max_feedrate_e": { "default_value": 100 }, - "machine_max_acceleration_x": {"value":900}, - "machine_max_acceleration_y": {"value":900}, - "machine_max_acceleration_z": { "default_value": 100 }, + "overrides": + { + "acceleration_travel": { "value": 900 }, "machine_acceleration": { "default_value": 900 }, + "machine_depth": { "default_value": 300 }, + "machine_extruder_count": { "value": 2 }, + "machine_height": { "default_value": 320 }, + "machine_max_acceleration_x": { "value": 900 }, + "machine_max_acceleration_y": { "value": 900 }, + "machine_max_acceleration_z": { "default_value": 100 }, + "machine_max_feedrate_e": { "default_value": 100 }, + "machine_max_feedrate_x": { "default_value": 100 }, + "machine_max_feedrate_y": { "default_value": 100 }, + "machine_max_feedrate_z": { "default_value": 3 }, + "machine_max_jerk_e": { "default_value": 5 }, "machine_max_jerk_xy": { "default_value": 8 }, "machine_max_jerk_z": { "default_value": 0.3 }, - "machine_max_jerk_e": { "default_value": 5 }, - "acceleration_travel": {"value":900} - + "machine_name": { "default_value": "FF300 Doppia" }, + "machine_width": { "default_value": 360 } } -} +} \ No newline at end of file diff --git a/resources/definitions/fusedform_600.def.json b/resources/definitions/fusedform_600.def.json index 04ee166859..a9342410e1 100644 --- a/resources/definitions/fusedform_600.def.json +++ b/resources/definitions/fusedform_600.def.json @@ -2,29 +2,29 @@ "version": 2, "name": "FF600", "inherits": "fusedform_base", - - "metadata": { - "quality_definition": "fusedform_base", - "visible": true + "metadata": + { + "visible": true, + "quality_definition": "fusedform_base" }, - - "overrides": { - "machine_name": { "default_value": "FF600" }, - "machine_width": { "default_value": 500 }, + "overrides": + { + "acceleration_travel": { "value": 800 }, + "machine_acceleration": { "default_value": 1000 }, "machine_depth": { "default_value": 500 }, + "machine_extruder_count": { "value": 1 }, "machine_height": { "default_value": 600 }, - "machine_extruder_count": { "value": 1 }, + "machine_max_acceleration_x": { "value": 1200 }, + "machine_max_acceleration_y": { "value": 1200 }, + "machine_max_acceleration_z": { "default_value": 100 }, + "machine_max_feedrate_e": { "default_value": 100 }, "machine_max_feedrate_x": { "default_value": 100 }, "machine_max_feedrate_y": { "default_value": 100 }, - "machine_max_feedrate_z": { "default_value": 3 }, - "machine_max_feedrate_e": { "default_value": 100 }, - "machine_max_acceleration_x": {"value":1200}, - "machine_max_acceleration_y": {"value":1200}, - "machine_max_acceleration_z": { "default_value": 100 }, - "machine_acceleration": { "default_value": 1000 }, + "machine_max_feedrate_z": { "default_value": 3 }, + "machine_max_jerk_e": { "default_value": 5 }, "machine_max_jerk_xy": { "default_value": 8 }, "machine_max_jerk_z": { "default_value": 0.3 }, - "machine_max_jerk_e": { "default_value": 5 }, - "acceleration_travel": {"value":800} + "machine_name": { "default_value": "FF600" }, + "machine_width": { "default_value": 500 } } -} +} \ No newline at end of file diff --git a/resources/definitions/fusedform_600_doppia.def.json b/resources/definitions/fusedform_600_doppia.def.json index b6c8ce279f..651cd6dbe5 100644 --- a/resources/definitions/fusedform_600_doppia.def.json +++ b/resources/definitions/fusedform_600_doppia.def.json @@ -2,29 +2,29 @@ "version": 2, "name": "FF600 Doppia", "inherits": "fusedform_doppia_base", - "metadata": { + "metadata": + { "visible": true, "quality_definition": "fusedform_base" }, - - "overrides": { - "machine_extruder_count": { "value": 2 }, - "machine_name": { "default_value": "FF600 Doppia" }, - "machine_width": { "default_value": 500 }, + "overrides": + { + "acceleration_travel": { "value": 900 }, + "machine_acceleration": { "default_value": 900 }, "machine_depth": { "default_value": 500 }, + "machine_extruder_count": { "value": 2 }, "machine_height": { "default_value": 600 }, + "machine_max_acceleration_x": { "value": 900 }, + "machine_max_acceleration_y": { "value": 900 }, + "machine_max_acceleration_z": { "default_value": 100 }, + "machine_max_feedrate_e": { "default_value": 100 }, "machine_max_feedrate_x": { "default_value": 100 }, "machine_max_feedrate_y": { "default_value": 100 }, - "machine_max_feedrate_z": { "default_value": 3 }, - "machine_max_feedrate_e": { "default_value": 100 }, - "machine_max_acceleration_x": {"value":900}, - "machine_max_acceleration_y": {"value":900}, - "machine_max_acceleration_z": { "default_value": 100 }, - "machine_acceleration": { "default_value": 900 }, + "machine_max_feedrate_z": { "default_value": 3 }, + "machine_max_jerk_e": { "default_value": 5 }, "machine_max_jerk_xy": { "default_value": 8 }, "machine_max_jerk_z": { "default_value": 0.3 }, - "machine_max_jerk_e": { "default_value": 5 }, - "acceleration_travel": {"value":900} - + "machine_name": { "default_value": "FF600 Doppia" }, + "machine_width": { "default_value": 500 } } -} +} \ No newline at end of file diff --git a/resources/definitions/fusedform_600plus.def.json b/resources/definitions/fusedform_600plus.def.json index 221ac3eead..86c106718d 100644 --- a/resources/definitions/fusedform_600plus.def.json +++ b/resources/definitions/fusedform_600plus.def.json @@ -2,30 +2,29 @@ "version": 2, "name": "FF600plus", "inherits": "fusedform_base", - - "metadata": { - "quality_definition": "fusedform_base", - "visible": true + "metadata": + { + "visible": true, + "quality_definition": "fusedform_base" }, - - "overrides": { - "machine_name": { "default_value": "FF600plus" }, - "machine_width": { "default_value": 600 }, + "overrides": + { + "acceleration_travel": { "value": 800 }, + "machine_acceleration": { "default_value": 1000 }, "machine_depth": { "default_value": 600 }, + "machine_extruder_count": { "value": 1 }, "machine_height": { "default_value": 600 }, - "machine_extruder_count": { "value": 1 }, + "machine_max_acceleration_x": { "value": 1200 }, + "machine_max_acceleration_y": { "value": 1200 }, + "machine_max_acceleration_z": { "default_value": 100 }, + "machine_max_feedrate_e": { "default_value": 100 }, "machine_max_feedrate_x": { "default_value": 100 }, "machine_max_feedrate_y": { "default_value": 100 }, - "machine_max_feedrate_z": { "default_value": 3 }, - "machine_max_feedrate_e": { "default_value": 100 }, - "machine_max_acceleration_x": {"value":1200}, - "machine_max_acceleration_y": {"value":1200}, - "machine_max_acceleration_z": { "default_value": 100 }, - "machine_acceleration": { "default_value": 1000 }, + "machine_max_feedrate_z": { "default_value": 3 }, + "machine_max_jerk_e": { "default_value": 5 }, "machine_max_jerk_xy": { "default_value": 8 }, "machine_max_jerk_z": { "default_value": 0.3 }, - "machine_max_jerk_e": { "default_value": 5 }, - "acceleration_travel": {"value":800} + "machine_name": { "default_value": "FF600plus" }, + "machine_width": { "default_value": 600 } } - -} +} \ No newline at end of file diff --git a/resources/definitions/fusedform_600plus_doppia.def.json b/resources/definitions/fusedform_600plus_doppia.def.json index de3889c1a8..818f7511d8 100644 --- a/resources/definitions/fusedform_600plus_doppia.def.json +++ b/resources/definitions/fusedform_600plus_doppia.def.json @@ -2,32 +2,29 @@ "version": 2, "name": "FF600plus Doppia", "inherits": "fusedform_doppia_base", - "metadata": { + "metadata": + { "visible": true, "quality_definition": "fusedform_base" }, - - "overrides": { - "machine_extruder_count": { "value": 2 }, - "machine_name": { "default_value": "FF600plus Doppia" }, - "machine_width": { "default_value": 600 }, + "overrides": + { + "acceleration_travel": { "value": 900 }, + "machine_acceleration": { "default_value": 900 }, "machine_depth": { "default_value": 600 }, + "machine_extruder_count": { "value": 2 }, "machine_height": { "default_value": 600 }, + "machine_max_acceleration_x": { "value": 900 }, + "machine_max_acceleration_y": { "value": 900 }, + "machine_max_acceleration_z": { "default_value": 100 }, + "machine_max_feedrate_e": { "default_value": 100 }, "machine_max_feedrate_x": { "default_value": 100 }, "machine_max_feedrate_y": { "default_value": 100 }, - "machine_max_feedrate_z": { "default_value": 3 }, - "machine_max_feedrate_e": { "default_value": 100 }, - "machine_max_acceleration_x": {"value":900}, - "machine_max_acceleration_y": {"value":900}, - "machine_max_acceleration_z": { "default_value": 100 }, - "machine_acceleration": { "default_value": 900 }, + "machine_max_feedrate_z": { "default_value": 3 }, + "machine_max_jerk_e": { "default_value": 5 }, "machine_max_jerk_xy": { "default_value": 8 }, "machine_max_jerk_z": { "default_value": 0.3 }, - "machine_max_jerk_e": { "default_value": 5 }, - "acceleration_travel": {"value":900} - - - - + "machine_name": { "default_value": "FF600plus Doppia" }, + "machine_width": { "default_value": 600 } } -} +} \ No newline at end of file diff --git a/resources/definitions/fusedform_base.def.json b/resources/definitions/fusedform_base.def.json index 1777b93913..d58e82b818 100644 --- a/resources/definitions/fusedform_base.def.json +++ b/resources/definitions/fusedform_base.def.json @@ -2,81 +2,79 @@ "version": 2, "name": "fusedform_base", "inherits": "fdmprinter", - "metadata": { + "metadata": + { + "visible": false, "author": "Juan Blanco", "manufacturer": "Fused Form", - "visible": false, - "machine_extruder_trains":{"0": "fusedform_base_extruder_0"}, - "preferred_material": "generic_pla", "exclude_materials": [ "structur3d_dap100silicone" ], - "has_machine_quality": true, - "has_materials": true, + "has_machine_quality": true, + "has_materials": true, + "machine_extruder_trains": { "0": "fusedform_base_extruder_0" }, + "preferred_material": "generic_pla", "preferred_quality_type": "normal" }, - - "overrides": { - "machine_heated_bed": { "default_value": true }, - "machine_center_is_zero": {"default_value": false}, - "machine_head_with_fans_polygon":{"default_value": [ - [ -20, 20 ], - [ -20, -20 ], - [ 18, 20 ], - [ 18, -18 ] + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "cool_fan_enabled": { "default_value": true }, + "cool_fan_full_at_height": { "value": 0.4 }, + "cool_fan_full_layer": { "value": 2 }, + "cool_min_speed": { "value": 30 }, + "gantry_height": { "value": "70" }, + "infill_overlap": { "value": 0 }, + "infill_sparse_density": { "value": 15 }, + "layer_height": { "default_value": 0.15 }, + "layer_height_0": { "default_value": 0.2 }, + "machine_center_is_zero": { "default_value": false }, + "machine_end_gcode": { "value": "'M104 S0 ;extruder heater off' + ('\\nM140 S0 ;heated bed heater off' if machine_heated_bed else '') + '\\nG91 ;relative positioning\\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\\nM84 ;steppers off\\nG90 ;absolute positioning\\nM107 ; Fans off'" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-20, 20], + [-20, -20], + [18, 20], + [18, -18] ] }, - "gantry_height": {"value": "70"}, - - "machine_use_extruder_offset_to_offset_coords": {"default_value": true}, - "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"}, - "machine_start_gcode": {"default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\n;Put printing message on LCD screen\nM117 Printing..."}, - "machine_end_gcode": {"value": "'M104 S0 ;extruder heater off' + ('\\nM140 S0 ;heated bed heater off' if machine_heated_bed else '') + '\\nG91 ;relative positioning\\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\\nM84 ;steppers off\\nG90 ;absolute positioning\\nM107 ; Fans off'"}, - - "layer_height": { "default_value": 0.15 }, - "layer_height_0": { "default_value": 0.2 }, - - "wall_line_count":{ "value": 3 }, - "wall_thickness": { "value": 1.2 }, - "top_bottom_thickness": {"value": 1.5}, - "optimize_wall_printing_order": {"value": true}, - - "infill_sparse_density": {"value":15}, - "infill_overlap": {"value": 0}, - - "speed_print": { "value": 45 }, - "speed_infill": { "value": 45 }, - "speed_travel": { "value": 75 }, - "speed_topbottom": {"value": 40 }, - "speed_wall": { "value": 35 }, - "speed_wall_x": { "value": 40 }, - - "retraction_enable": {"default_value":true}, - "retraction_amount": { "default_value": 4 }, - "retraction_speed": { "default_value": 70}, - "retraction_min_travel": {"value":5 }, - "retraction_count_max": {"default_value":10 }, - "retraction_extrusion_window": {"value":4 }, - "retraction_hop": {"default_value":0.2}, - "retraction_hop_enabled": {"value":true}, - "speed_z_hop": {"value":2.5 }, - - "cool_fan_enabled": {"default_value":true}, - "cool_fan_full_at_height": {"value":0.4}, - "cool_fan_full_layer": {"value":2}, - "cool_min_speed": {"value":30}, - - "support_enable": {"value":true}, - "support_angle": {"default_value": 50}, - "support_brim_enable": {"value":true}, - "support_infill_angles": {"value":[-45]}, - "support_interface_density": {"value": 70}, - "support_interface_enable": {"value": true }, - "support_interface_height": {"value": 0.5}, - "support_interface_pattern": {"default_value":"lines"}, - "support_pattern": {"default_value":"lines"}, - "support_xy_distance": {"value": 0.5}, - "support_z_distance": {"value": 0.3 }, - - - "adhesion_type": {"default_value":"skirt"} + "machine_heated_bed": { "default_value": true }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\n;Put printing message on LCD screen\nM117 Printing..." }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, + "optimize_wall_printing_order": { "value": true }, + "retraction_amount": { "default_value": 4 }, + "retraction_count_max": { "default_value": 10 }, + "retraction_enable": { "default_value": true }, + "retraction_extrusion_window": { "value": 4 }, + "retraction_hop": { "default_value": 0.2 }, + "retraction_hop_enabled": { "value": true }, + "retraction_min_travel": { "value": 5 }, + "retraction_speed": { "default_value": 70 }, + "speed_infill": { "value": 45 }, + "speed_print": { "value": 45 }, + "speed_topbottom": { "value": 40 }, + "speed_travel": { "value": 75 }, + "speed_wall": { "value": 35 }, + "speed_wall_x": { "value": 40 }, + "speed_z_hop": { "value": 2.5 }, + "support_angle": { "default_value": 50 }, + "support_brim_enable": { "value": true }, + "support_enable": { "value": true }, + "support_infill_angles": + { + "value": [ + -45 + ] + }, + "support_interface_density": { "value": 70 }, + "support_interface_enable": { "value": true }, + "support_interface_height": { "value": 0.5 }, + "support_interface_pattern": { "default_value": "lines" }, + "support_pattern": { "default_value": "lines" }, + "support_xy_distance": { "value": 0.5 }, + "support_z_distance": { "value": 0.3 }, + "top_bottom_thickness": { "value": 1.5 }, + "wall_line_count": { "value": 3 }, + "wall_thickness": { "value": 1.2 } } -} +} \ No newline at end of file diff --git a/resources/definitions/fusedform_doppia_base.def.json b/resources/definitions/fusedform_doppia_base.def.json index add20dfc77..f333829270 100644 --- a/resources/definitions/fusedform_doppia_base.def.json +++ b/resources/definitions/fusedform_doppia_base.def.json @@ -2,83 +2,85 @@ "version": 2, "name": "fusedform_doppia_base", "inherits": "fusedform_base", - "metadata": { + "metadata": + { + "visible": false, "author": "Juan Blanco", "manufacturer": "Fused Form", - "visible": false, - "machine_extruder_trains":{"0": "fusedform_doppia_base_extruder_0","1": "fusedform_doppia_base_extruder_1"}, - "preferred_material": "generic_pla", "exclude_materials": [ "structur3d_dap100silicone" ], - "has_machine_quality": true, - "has_materials": true, + "has_machine_quality": true, + "has_materials": true, + "machine_extruder_trains": + { + "0": "fusedform_doppia_base_extruder_0", + "1": "fusedform_doppia_base_extruder_1" + }, + "preferred_material": "generic_pla", "preferred_quality_type": "normal" }, - - "overrides": { - "machine_heated_bed": { "default_value": true }, - "machine_center_is_zero": {"default_value": false}, - "machine_head_with_fans_polygon":{"default_value": [ - [ -20, 20 ], - [ -20, -20 ], - [ 18, 20 ], - [ 18, -18 ] + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "cool_fan_enabled": { "default_value": true }, + "cool_fan_full_at_height": { "value": 0.4 }, + "cool_fan_full_layer": { "value": 2 }, + "cool_min_speed": { "value": 30 }, + "gantry_height": { "value": "70" }, + "infill_overlap": { "value": 0 }, + "infill_sparse_density": { "value": 15 }, + "layer_height": { "default_value": 0.15 }, + "layer_height_0": { "default_value": 0.2 }, + "machine_center_is_zero": { "default_value": false }, + "machine_end_gcode": { "value": "'M104 S0 ;extruder heater off' + ('\\nM140 S0 ;heated bed heater off' if machine_heated_bed else '') + '\\nG91 ;relative positioning\\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\\nM84 ;steppers off\\nG90 ;absolute positioning\\nM107 ; Fans off'" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-20, 20], + [-20, -20], + [18, 20], + [18, -18] ] }, - "gantry_height": {"value": "70"}, - - "machine_use_extruder_offset_to_offset_coords": {"default_value": true}, - "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"}, - "machine_start_gcode": {"default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\n;Put printing message on LCD screen\nM117 Printing..."}, - "machine_end_gcode": {"value": "'M104 S0 ;extruder heater off' + ('\\nM140 S0 ;heated bed heater off' if machine_heated_bed else '') + '\\nG91 ;relative positioning\\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\\nM84 ;steppers off\\nG90 ;absolute positioning\\nM107 ; Fans off'"}, - - "layer_height": { "default_value": 0.15 }, - "layer_height_0": { "default_value": 0.2 }, - - "wall_line_count":{ "value": 3 }, - "wall_thickness": { "value": 1.2 }, - "top_bottom_thickness": {"value": 1.5}, - "optimize_wall_printing_order": {"value": true}, - - "infill_sparse_density": {"value":15}, - "infill_overlap": {"value": 0}, - - "speed_print": { "value": 45 }, - "speed_infill": { "value": 45 }, - "speed_travel": { "value": 75 }, - "speed_topbottom": {"value": 40 }, - "speed_wall": { "value": 35 }, - "speed_wall_x": { "value": 40 }, - - "retraction_enable": {"default_value":true}, - "retraction_amount": { "default_value": 4 }, - "retraction_speed": { "default_value": 70}, - "retraction_min_travel": {"value":5 }, - "retraction_count_max": {"default_value":10 }, - "retraction_extrusion_window": {"value":4 }, - "retraction_hop": {"default_value":0.2}, - "retraction_hop_enabled": {"value":true}, - "speed_z_hop": {"value":2.5 }, - - "cool_fan_enabled": {"default_value":true}, - "cool_fan_full_at_height": {"value":0.4}, - "cool_fan_full_layer": {"value":2}, - "cool_min_speed": {"value":30}, - - "support_enable": {"value":true}, - "support_angle": {"default_value": 50}, - "support_brim_enable": {"value":true}, - "support_infill_angles": {"value":[-45]}, - "support_interface_density": {"value": 70}, - "support_interface_enable": {"value": true }, - "support_interface_height": {"value": 0.5}, - "support_interface_pattern": {"default_value":"lines"}, - "support_pattern": {"default_value":"lines"}, - "support_xy_distance": {"value": 0.5}, - "support_z_distance": {"value": 0.3 }, - - "adhesion_type": {"default_value":"skirt"}, - - "switch_extruder_retraction_amount": { "value": 6 }, - "switch_extruder_retraction_speeds": { "value": 60 } + "machine_heated_bed": { "default_value": true }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\n;Put printing message on LCD screen\nM117 Printing..." }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, + "optimize_wall_printing_order": { "value": true }, + "retraction_amount": { "default_value": 4 }, + "retraction_count_max": { "default_value": 10 }, + "retraction_enable": { "default_value": true }, + "retraction_extrusion_window": { "value": 4 }, + "retraction_hop": { "default_value": 0.2 }, + "retraction_hop_enabled": { "value": true }, + "retraction_min_travel": { "value": 5 }, + "retraction_speed": { "default_value": 70 }, + "speed_infill": { "value": 45 }, + "speed_print": { "value": 45 }, + "speed_topbottom": { "value": 40 }, + "speed_travel": { "value": 75 }, + "speed_wall": { "value": 35 }, + "speed_wall_x": { "value": 40 }, + "speed_z_hop": { "value": 2.5 }, + "support_angle": { "default_value": 50 }, + "support_brim_enable": { "value": true }, + "support_enable": { "value": true }, + "support_infill_angles": + { + "value": [ + -45 + ] + }, + "support_interface_density": { "value": 70 }, + "support_interface_enable": { "value": true }, + "support_interface_height": { "value": 0.5 }, + "support_interface_pattern": { "default_value": "lines" }, + "support_pattern": { "default_value": "lines" }, + "support_xy_distance": { "value": 0.5 }, + "support_z_distance": { "value": 0.3 }, + "switch_extruder_retraction_amount": { "value": 6 }, + "switch_extruder_retraction_speeds": { "value": 60 }, + "top_bottom_thickness": { "value": 1.5 }, + "wall_line_count": { "value": 3 }, + "wall_thickness": { "value": 1.2 } } -} +} \ No newline at end of file diff --git a/resources/definitions/fusedform_mini.def.json b/resources/definitions/fusedform_mini.def.json index d87f75716d..36e257172b 100644 --- a/resources/definitions/fusedform_mini.def.json +++ b/resources/definitions/fusedform_mini.def.json @@ -1,30 +1,30 @@ { "version": 2, - "name":"FFmini", + "name": "FFmini", "inherits": "fusedform_base", - - "metadata": { - "quality_definition": "fusedform_base", - "visible": true + "metadata": + { + "visible": true, + "quality_definition": "fusedform_base" }, - - "overrides": { - "machine_name": { "default_value": "FFmini" }, - "machine_width": { "default_value": 200 }, + "overrides": + { + "acceleration_travel": { "value": 1000 }, + "machine_acceleration": { "default_value": 1000 }, "machine_depth": { "default_value": 200 }, + "machine_extruder_count": { "value": 1 }, "machine_height": { "default_value": 240 }, - "machine_extruder_count": { "value": 1 }, + "machine_max_acceleration_x": { "value": 1200 }, + "machine_max_acceleration_y": { "value": 1200 }, + "machine_max_acceleration_z": { "default_value": 100 }, + "machine_max_feedrate_e": { "default_value": 100 }, "machine_max_feedrate_x": { "default_value": 100 }, "machine_max_feedrate_y": { "default_value": 100 }, - "machine_max_feedrate_z": { "default_value": 3 }, - "machine_max_feedrate_e": { "default_value": 100 }, - "machine_max_acceleration_x": {"value":1200}, - "machine_max_acceleration_y": {"value":1200}, - "machine_max_acceleration_z": { "default_value": 100 }, - "machine_acceleration": { "default_value": 1000 }, + "machine_max_feedrate_z": { "default_value": 3 }, + "machine_max_jerk_e": { "default_value": 5 }, "machine_max_jerk_xy": { "default_value": 14 }, "machine_max_jerk_z": { "default_value": 0.3 }, - "machine_max_jerk_e": { "default_value": 5 }, - "acceleration_travel": {"value":1000} + "machine_name": { "default_value": "FFmini" }, + "machine_width": { "default_value": 200 } } -} +} \ No newline at end of file diff --git a/resources/definitions/fusedform_std.def.json b/resources/definitions/fusedform_std.def.json index 77cf20fdc5..586b20bd28 100644 --- a/resources/definitions/fusedform_std.def.json +++ b/resources/definitions/fusedform_std.def.json @@ -2,29 +2,29 @@ "version": 2, "name": "FFSTD", "inherits": "fusedform_base", - - "metadata": { - "quality_definition": "fusedform_base", - "visible": true + "metadata": + { + "visible": true, + "quality_definition": "fusedform_base" }, - - "overrides": { - "machine_name": { "default_value": "FFSTD" }, - "machine_width": { "default_value": 240 }, + "overrides": + { + "acceleration_travel": { "value": 1200 }, + "machine_acceleration": { "default_value": 900 }, "machine_depth": { "default_value": 200 }, + "machine_extruder_count": { "value": 1 }, "machine_height": { "default_value": 320 }, - "machine_extruder_count": { "value": 1 }, + "machine_max_acceleration_x": { "value": 1200 }, + "machine_max_acceleration_y": { "value": 1200 }, + "machine_max_acceleration_z": { "default_value": 100 }, + "machine_max_feedrate_e": { "default_value": 100 }, "machine_max_feedrate_x": { "default_value": 100 }, "machine_max_feedrate_y": { "default_value": 100 }, - "machine_max_feedrate_z": { "default_value": 3 }, - "machine_max_feedrate_e": { "default_value": 100 }, - "machine_max_acceleration_x": {"value":1200}, - "machine_max_acceleration_y": {"value":1200}, - "machine_max_acceleration_z": { "default_value": 100 }, - "machine_acceleration": { "default_value": 900 }, + "machine_max_feedrate_z": { "default_value": 3 }, + "machine_max_jerk_e": { "default_value": 5 }, "machine_max_jerk_xy": { "default_value": 10 }, "machine_max_jerk_z": { "default_value": 0.3 }, - "machine_max_jerk_e": { "default_value": 5 }, - "acceleration_travel": {"value":1200} + "machine_name": { "default_value": "FFSTD" }, + "machine_width": { "default_value": 240 } } -} +} \ No newline at end of file diff --git a/resources/definitions/fusedform_std_doppia.def.json b/resources/definitions/fusedform_std_doppia.def.json index 022aaad511..ac268088a0 100644 --- a/resources/definitions/fusedform_std_doppia.def.json +++ b/resources/definitions/fusedform_std_doppia.def.json @@ -2,29 +2,29 @@ "version": 2, "name": "FFSTD Doppia", "inherits": "fusedform_doppia_base", - "metadata": { + "metadata": + { "visible": true, "quality_definition": "fusedform_base" }, - - "overrides": { - "machine_extruder_count": { "value": 2 }, - "machine_name": { "default_value": "FFSTD Doppia" }, - "machine_width": { "default_value": 220 }, + "overrides": + { + "acceleration_travel": { "value": 1200 }, + "machine_acceleration": { "default_value": 900 }, "machine_depth": { "default_value": 200 }, + "machine_extruder_count": { "value": 2 }, "machine_height": { "default_value": 320 }, + "machine_max_acceleration_x": { "value": 1200 }, + "machine_max_acceleration_y": { "value": 1200 }, + "machine_max_acceleration_z": { "default_value": 100 }, + "machine_max_feedrate_e": { "default_value": 100 }, "machine_max_feedrate_x": { "default_value": 100 }, "machine_max_feedrate_y": { "default_value": 100 }, - "machine_max_feedrate_z": { "default_value": 3 }, - "machine_max_feedrate_e": { "default_value": 100 }, - "machine_max_acceleration_x": {"value":1200}, - "machine_max_acceleration_y": {"value":1200}, - "machine_max_acceleration_z": { "default_value": 100 }, - "machine_acceleration": { "default_value": 900 }, + "machine_max_feedrate_z": { "default_value": 3 }, + "machine_max_jerk_e": { "default_value": 5 }, "machine_max_jerk_xy": { "default_value": 10 }, "machine_max_jerk_z": { "default_value": 0.3 }, - "machine_max_jerk_e": { "default_value": 5 }, - "acceleration_travel": {"value":1200} - + "machine_name": { "default_value": "FFSTD Doppia" }, + "machine_width": { "default_value": 220 } } -} +} \ No newline at end of file diff --git a/resources/definitions/geeetech_A10.def.json b/resources/definitions/geeetech_A10.def.json deleted file mode 100644 index 6b17223d7b..0000000000 --- a/resources/definitions/geeetech_A10.def.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "version": 2, - "name": "Geeetech A10", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Amit L", - "manufacturer": "Geeetech", - "file_formats": "text/x-gcode", - "has_materials": true, - "machine_extruder_trains": - { - "0": "geeetech_A10_1" - } - - }, - - "overrides": { - "machine_name": { "default_value": "Geeetech A10" }, - "machine_width": { - "default_value": 220 - }, - "machine_height": { - "default_value": 260 - }, - "machine_depth": { - "default_value": 220 - }, - "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/geeetech_A10M.def.json b/resources/definitions/geeetech_A10M.def.json index c8f0d16712..d47756011e 100644 --- a/resources/definitions/geeetech_A10M.def.json +++ b/resources/definitions/geeetech_A10M.def.json @@ -1,58 +1,37 @@ -{ - "version": 2, - "name": "Geeetech A10M", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Amit L", - "manufacturer": "Geeetech", - "file_formats": "text/x-gcode", - "has_materials": true, - "machine_extruder_trains": - { - "0": "geeetech_A10M_1", - "1": "geeetech_A10M_2" - } - - }, - - "overrides": { - "machine_name": { "default_value": "Geeetech A10M" }, - "machine_width": { - "default_value": 220 - }, - "machine_height": { - "default_value": 260 - }, - "machine_depth": { - "default_value": 220 - }, "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_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": ";GeeeTech A10M start script\nG28 ;home\nG90 ;absolute positioning\nG1 X0 Y0 Z15 E0 F300 ;go to wait position\nM140 S{material_bed_temperature_layer_0} ;set bed temp\nM109 S{material_print_temperature_layer_0} ;set extruder temp and wait\nG1 Z0.8 F200 ;set extruder height\nG1 X220 Y0 E80 F1000 ;purge line\n;end of start script" - }, - "machine_end_gcode": { - "default_value": "G91\nG1 E-1\nG0 X0 Y200\nM104 S0\nG90\nG92 E0\nM140 S0\nM84\nM104 S0\nM140 S0\nM84" - }, - "machine_extruder_count": { - "default_value": 2 - } - - } -} +{ + "version": 2, + "name": "Geeetech A10M", + "inherits": "Geeetech_Base_Dual_Extruder", + "metadata": + { + "visible": true, + "machine_extruder_trains": + { + "0": "Geeetech_Dual_Extruder_0", + "1": "Geeetech_Dual_Extruder_1" + }, + "preferred_material": "Geeetech_PLA_Cyan" + }, + "overrides": + { + "brim_width": { "value": 10 }, + "gantry_height": { "value": 28 }, + "machine_depth": { "default_value": 220 }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-31, 31], + [34, 31], + [34, -40], + [-31, -40] + ] + }, + "machine_height": { "default_value": 260 }, + "machine_name": { "default_value": "Geeetech A10M" }, + "machine_start_gcode": { "default_value": ";Geeetech A10M Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_width": { "default_value": 220 }, + "prime_tower_position_x": { "value": 190 }, + "prime_tower_position_y": { "value": 160 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_A10Pro.def.json b/resources/definitions/geeetech_A10Pro.def.json new file mode 100644 index 0000000000..c383d30814 --- /dev/null +++ b/resources/definitions/geeetech_A10Pro.def.json @@ -0,0 +1,29 @@ +{ + "version": 2, + "name": "Geeetech A10Pro", + "inherits": "Geeetech_Base_Single_Extruder", + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" } + }, + "overrides": + { + "gantry_height": { "value": 28 }, + "machine_depth": { "default_value": 220 }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-31, 31], + [34, 31], + [34, -40], + [-31, -40] + ] + }, + "machine_height": { "default_value": 260 }, + "machine_name": { "default_value": "Geeetech A10Pro" }, + "machine_start_gcode": { "default_value": ";Geeetech A10Pro Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_width": { "default_value": 220 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_A10T.def.json b/resources/definitions/geeetech_A10T.def.json index 0f1a0b76ab..df2444fe50 100644 --- a/resources/definitions/geeetech_A10T.def.json +++ b/resources/definitions/geeetech_A10T.def.json @@ -1,60 +1,38 @@ -{ - "version": 2, - "name": "Geeetech A10T", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Amit L", - "manufacturer": "Geeetech", - "file_formats": "text/x-gcode", - "has_materials": true, - "machine_extruder_trains": - { - "0": "geeetech_A10T_1", - "1": "geeetech_A10T_2", - "2": "geeetech_A10T_3" - } - - }, - - "overrides": { - "machine_name": { "default_value": "Geeetech A10T" }, - "machine_width": { - "default_value": 220 - }, - "machine_height": { - "default_value": 220 - }, - "machine_depth": { - "default_value": 260 - }, - "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_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "G28 \nG1 Z15 F300\nM107\nG90\nM82\nM104 S215\nM140 S55\nG92 E0\nM109 S215\nM107\nM163 S0 P0.33\nM163 S1 P0.33\nM163 S2 P0.33\nM164 S4\nG0 X10 Y20 F6000\nG1 Z0.8\nG1 F300 X180 E40\nG1 F1200 Z2\nG92 E0\nG28" - }, - "machine_end_gcode": { - "default_value": "G91\nG1 E-1\nG0 X0 Y200\nM104 S0\nG90\nG92 E0\nM140 S0\nM84\nM104 S0\nM140 S0\nM84" - }, - "machine_extruder_count": { - "default_value": 3 - } - - } -} +{ + "version": 2, + "name": "Geeetech A10T", + "inherits": "Geeetech_Base_Multi_Extruder", + "metadata": + { + "visible": true, + "machine_extruder_trains": + { + "0": "Geeetech_Multi_Extruder_0", + "1": "Geeetech_Multi_Extruder_1", + "2": "Geeetech_Multi_Extruder_2" + }, + "preferred_material": "Geeetech_PLA_Magenta" + }, + "overrides": + { + "brim_width": { "value": 10 }, + "gantry_height": { "value": 28 }, + "machine_depth": { "default_value": 220 }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-31, 31], + [34, 31], + [34, -40], + [-31, -40] + ] + }, + "machine_height": { "default_value": 260 }, + "machine_name": { "default_value": "Geeetech A10T" }, + "machine_start_gcode": { "default_value": ";Geeetech A10T Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_width": { "default_value": 220 }, + "prime_tower_position_x": { "value": 190 }, + "prime_tower_position_y": { "value": 160 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_A20.def.json b/resources/definitions/geeetech_A20.def.json index d96452176f..68a41ad8b8 100644 --- a/resources/definitions/geeetech_A20.def.json +++ b/resources/definitions/geeetech_A20.def.json @@ -1,57 +1,29 @@ -{ - "version": 2, - "name": "Geeetech A20", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Amit L", - "manufacturer": "Geeetech", - "file_formats": "text/x-gcode", - "has_materials": true, - "machine_extruder_trains": - { - "0": "geeetech_A20_1" - } - - }, - - "overrides": { - "machine_name": { "default_value": "Geeetech A20" }, - "machine_width": { - "default_value": 250 - }, - "machine_height": { - "default_value": 250 - }, - "machine_depth": { - "default_value": 250 - }, "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_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "G28 \nG1 Z15 F300\nM107\nG90\nM82\nM104 S215\nM140 S55\nG92 E0\nM109 S215\nM107\nG0 X10 Y20 F6000\nG1 Z0.8\nG1 F300 X200 E40\nG1 F1200 Z2\nG92 E0\nG28" - }, - "machine_end_gcode": { - "default_value": "G91\nG1 E-1\nG0 X0 Y200\nM104 S0\nG90\nG92 E0\nM140 S0\nM84\nM104 S0\nM140 S0\nM84" - }, - "machine_extruder_count": { - "default_value": 1 - } - - } -} +{ + "version": 2, + "name": "Geeetech A20", + "inherits": "Geeetech_Base_Single_Extruder", + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" } + }, + "overrides": + { + "gantry_height": { "value": 35 }, + "machine_depth": { "default_value": 250 }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-31, 31], + [34, 31], + [34, -40], + [-31, -40] + ] + }, + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "Geeetech A20" }, + "machine_start_gcode": { "default_value": ";Geeetech A20 Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_width": { "default_value": 250 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_A20M.def.json b/resources/definitions/geeetech_A20M.def.json index d06cf9565f..5b7cf30dfe 100644 --- a/resources/definitions/geeetech_A20M.def.json +++ b/resources/definitions/geeetech_A20M.def.json @@ -1,58 +1,37 @@ -{ - "version": 2, - "name": "Geeetech A20M", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Amit L", - "manufacturer": "Geeetech", - "file_formats": "text/x-gcode", - "has_materials": true, - "machine_extruder_trains": - { - "0": "geeetech_A20M_1", - "1": "geeetech_A20M_2" - } - - }, - - "overrides": { - "machine_name": { "default_value": "Geeetech A20M" }, - "machine_width": { - "default_value": 250 - }, - "machine_height": { - "default_value": 250 - }, - "machine_depth": { - "default_value": 250 - }, "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_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": ";GeeeTech A20M start script\nG28 ;home\nG90 ;absolute positioning\nG1 X0 Y0 Z15 E0 F300 ;go to wait position\nM140 S{material_bed_temperature_layer_0} ;set bed temp\nM109 S{material_print_temperature_layer_0} ;set extruder temp and wait\nG1 Z0.8 F200 ;set extruder height\nG1 X220 Y0 E80 F1000 ;purge line\n;end of start script" - }, - "machine_end_gcode": { - "default_value": "G91\nG1 E-1\nG0 X0 Y200\nM104 S0\nG90\nG92 E0\nM140 S0\nM84\nM104 S0\nM140 S0\nM84" - }, - "machine_extruder_count": { - "default_value": 2 - } - - } -} +{ + "version": 2, + "name": "Geeetech A20M", + "inherits": "Geeetech_Base_Dual_Extruder", + "metadata": + { + "visible": true, + "machine_extruder_trains": + { + "0": "Geeetech_Dual_Extruder_0", + "1": "Geeetech_Dual_Extruder_1" + }, + "preferred_material": "Geeetech_PLA_Yellow" + }, + "overrides": + { + "brim_width": { "value": 10 }, + "gantry_height": { "value": 35 }, + "machine_depth": { "default_value": 250 }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-31, 31], + [34, 31], + [34, -40], + [-31, -40] + ] + }, + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "Geeetech A20M" }, + "machine_start_gcode": { "default_value": ";Geeetech A20M Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_width": { "default_value": 250 }, + "prime_tower_position_x": { "value": 220 }, + "prime_tower_position_y": { "value": 190 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_A20T.def.json b/resources/definitions/geeetech_A20T.def.json index 72ed97978c..5191bac751 100644 --- a/resources/definitions/geeetech_A20T.def.json +++ b/resources/definitions/geeetech_A20T.def.json @@ -1,59 +1,38 @@ -{ - "version": 2, - "name": "Geeetech A20T", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Amit L", - "manufacturer": "Geeetech", - "file_formats": "text/x-gcode", - "has_materials": true, - "machine_extruder_trains": - { - "0": "geeetech_A20T_1", - "1": "geeetech_A20T_2", - "2": "geeetech_A20T_3" - } - - }, - - "overrides": { - "machine_name": { "default_value": "Geeetech A20T" }, - "machine_width": { - "default_value": 250 - }, - "machine_height": { - "default_value": 250 - }, - "machine_depth": { - "default_value": 250 - }, "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_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "G28 \nG1 Z15 F300\nM107\nG90\nM82\nM104 S215\nM140 S55\nG92 E0\nM109 S215\nM107\nM163 S0 P0.33\nM163 S1 P0.33\nM163 S2 P0.33\nM164 S4\nG0 X10 Y20 F6000\nG1 Z0.8\nG1 F300 X200 E40\nG1 F1200 Z2\nG92 E0\nG28" - }, - "machine_end_gcode": { - "default_value": "G91\nG1 E-1\nG0 X0 Y200\nM104 S0\nG90\nG92 E0\nM140 S0\nM84\nM104 S0\nM140 S0\nM84" - }, - "machine_extruder_count": { - "default_value": 3 - } - - } -} +{ + "version": 2, + "name": "Geeetech A20T", + "inherits": "Geeetech_Base_Multi_Extruder", + "metadata": + { + "visible": true, + "machine_extruder_trains": + { + "0": "Geeetech_Multi_Extruder_0", + "1": "Geeetech_Multi_Extruder_1", + "2": "Geeetech_Multi_Extruder_2" + }, + "preferred_material": "Geeetech_PLA_Red" + }, + "overrides": + { + "brim_width": { "value": 10 }, + "gantry_height": { "value": 35 }, + "machine_depth": { "default_value": 250 }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-31, 31], + [34, 31], + [34, -40], + [-31, -40] + ] + }, + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "Geeetech A20T" }, + "machine_start_gcode": { "default_value": ";Geeetech A20T Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_width": { "default_value": 250 }, + "prime_tower_position_x": { "value": 220 }, + "prime_tower_position_y": { "value": 190 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_A30M.def.json b/resources/definitions/geeetech_A30M.def.json new file mode 100644 index 0000000000..8b6e6a703b --- /dev/null +++ b/resources/definitions/geeetech_A30M.def.json @@ -0,0 +1,37 @@ +{ + "version": 2, + "name": "Geeetech A30M", + "inherits": "Geeetech_Base_Dual_Extruder", + "metadata": + { + "visible": true, + "machine_extruder_trains": + { + "0": "Geeetech_Dual_Extruder_0", + "1": "Geeetech_Dual_Extruder_1" + }, + "preferred_material": "Geeetech_PLA_Green" + }, + "overrides": + { + "brim_width": { "value": 10 }, + "gantry_height": { "value": 35 }, + "machine_depth": { "default_value": 320 }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-75, 35], + [18, 35], + [18, -18], + [-75, -18] + ] + }, + "machine_height": { "default_value": 420 }, + "machine_name": { "default_value": "Geeetech A30M" }, + "machine_start_gcode": { "default_value": ";Geeetech A30M Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_width": { "default_value": 320 }, + "prime_tower_position_x": { "value": 290 }, + "prime_tower_position_y": { "value": 260 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_A30Pro.def.json b/resources/definitions/geeetech_A30Pro.def.json new file mode 100644 index 0000000000..38b2510933 --- /dev/null +++ b/resources/definitions/geeetech_A30Pro.def.json @@ -0,0 +1,29 @@ +{ + "version": 2, + "name": "Geeetech A30Pro", + "inherits": "Geeetech_Base_Single_Extruder", + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" } + }, + "overrides": + { + "gantry_height": { "value": 35 }, + "machine_depth": { "default_value": 320 }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-75, 35], + [18, 35], + [18, -18], + [-75, -18] + ] + }, + "machine_height": { "default_value": 420 }, + "machine_name": { "default_value": "Geeetech A30Pro" }, + "machine_start_gcode": { "default_value": ";Geeetech A30Pro Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_width": { "default_value": 320 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_A30T.def.json b/resources/definitions/geeetech_A30T.def.json new file mode 100644 index 0000000000..610ee35fa4 --- /dev/null +++ b/resources/definitions/geeetech_A30T.def.json @@ -0,0 +1,38 @@ +{ + "version": 2, + "name": "Geeetech A30T", + "inherits": "Geeetech_Base_Multi_Extruder", + "metadata": + { + "visible": true, + "machine_extruder_trains": + { + "0": "Geeetech_Multi_Extruder_0", + "1": "Geeetech_Multi_Extruder_1", + "2": "Geeetech_Multi_Extruder_2" + }, + "preferred_material": "Geeetech_PLA_Blue" + }, + "overrides": + { + "brim_width": { "value": 10 }, + "gantry_height": { "value": 35 }, + "machine_depth": { "default_value": 320 }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-75, 35], + [18, 35], + [18, -18], + [-75, -18] + ] + }, + "machine_height": { "default_value": 420 }, + "machine_name": { "default_value": "Geeetech A30T" }, + "machine_start_gcode": { "default_value": ";Geeetech A30T Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_width": { "default_value": 320 }, + "prime_tower_position_x": { "value": 290 }, + "prime_tower_position_y": { "value": 260 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_E180.def.json b/resources/definitions/geeetech_E180.def.json new file mode 100644 index 0000000000..481f4db77a --- /dev/null +++ b/resources/definitions/geeetech_E180.def.json @@ -0,0 +1,30 @@ +{ + "version": 2, + "name": "Geeetech E180", + "inherits": "Geeetech_Base_Single_Extruder", + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" } + }, + "overrides": + { + "gantry_height": { "value": 28 }, + "machine_depth": { "default_value": 130 }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-31, 31], + [34, 31], + [34, -40], + [-31, -40] + ] + }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 126 }, + "machine_name": { "default_value": "Geeetech E180" }, + "machine_start_gcode": { "default_value": ";Geeetech E180 Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y120.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y120.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y10 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_width": { "default_value": 125 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_GiantArmD200.def.json b/resources/definitions/geeetech_GiantArmD200.def.json new file mode 100644 index 0000000000..d625e8ded6 --- /dev/null +++ b/resources/definitions/geeetech_GiantArmD200.def.json @@ -0,0 +1,30 @@ +{ + "version": 2, + "name": "Geeetech GiantArmD200", + "inherits": "Geeetech_Base_Single_Extruder", + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" } + }, + "overrides": + { + "gantry_height": { "value": 45 }, + "machine_depth": { "default_value": 180 }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-75, 35], + [18, 35], + [18, -18], + [-75, -18] + ] + }, + "machine_height": { "default_value": 180 }, + "machine_name": { "default_value": "Geeetech GiantArmD200" }, + "machine_start_gcode": { "default_value": ";Geeetech GiantArmD200 Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y160.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y160.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y10 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_width": { "default_value": 300 }, + "retraction_amount": { "value": 2 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_I3ProB.def.json b/resources/definitions/geeetech_I3ProB.def.json new file mode 100644 index 0000000000..c0420ebc84 --- /dev/null +++ b/resources/definitions/geeetech_I3ProB.def.json @@ -0,0 +1,30 @@ +{ + "version": 2, + "name": "Geeetech I3ProB", + "inherits": "Geeetech_Base_Single_Extruder", + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" } + }, + "overrides": + { + "gantry_height": { "value": 45 }, + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-75, 35], + [18, 35], + [18, -18], + [-75, -18] + ] + }, + "machine_height": { "default_value": 180 }, + "machine_name": { "default_value": "Geeetech I3ProB" }, + "machine_start_gcode": { "default_value": ";Geeetech I3ProB Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y180.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y180.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_width": { "default_value": 200 }, + "retraction_amount": { "value": 2 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_I3ProC.def.json b/resources/definitions/geeetech_I3ProC.def.json new file mode 100644 index 0000000000..f05185e5ba --- /dev/null +++ b/resources/definitions/geeetech_I3ProC.def.json @@ -0,0 +1,38 @@ +{ + "version": 2, + "name": "Geeetech I3ProC", + "inherits": "Geeetech_Base_Dual_Extruder", + "metadata": + { + "visible": true, + "machine_extruder_trains": + { + "0": "Geeetech_Dual_Extruder_0", + "1": "Geeetech_Dual_Extruder_1" + }, + "preferred_material": "Geeetech_PLA_Black" + }, + "overrides": + { + "brim_width": { "value": 10 }, + "gantry_height": { "value": 45 }, + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-75, 35], + [18, 35], + [18, -18], + [-75, -18] + ] + }, + "machine_height": { "default_value": 180 }, + "machine_name": { "default_value": "Geeetech I3ProC" }, + "machine_start_gcode": { "default_value": ";Geeetech I3ProC Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y180.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y180.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_width": { "default_value": 200 }, + "prime_tower_position_x": { "value": 170 }, + "prime_tower_position_y": { "value": 140 }, + "retraction_amount": { "value": 2 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_I3ProW.def.json b/resources/definitions/geeetech_I3ProW.def.json new file mode 100644 index 0000000000..db54625f2d --- /dev/null +++ b/resources/definitions/geeetech_I3ProW.def.json @@ -0,0 +1,30 @@ +{ + "version": 2, + "name": "Geeetech I3ProW", + "inherits": "Geeetech_Base_Single_Extruder", + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" } + }, + "overrides": + { + "gantry_height": { "value": 45 }, + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-75, 35], + [18, 35], + [18, -18], + [-75, -18] + ] + }, + "machine_height": { "default_value": 180 }, + "machine_name": { "default_value": "Geeetech I3ProW" }, + "machine_start_gcode": { "default_value": ";Geeetech I3ProW Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y180.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y180.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_width": { "default_value": 200 }, + "retraction_amount": { "value": 2 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_MeCreator.def.json b/resources/definitions/geeetech_MeCreator.def.json new file mode 100644 index 0000000000..3dece7354c --- /dev/null +++ b/resources/definitions/geeetech_MeCreator.def.json @@ -0,0 +1,30 @@ +{ + "version": 2, + "name": "Geeetech MeCreator", + "inherits": "Geeetech_Base_Single_Extruder", + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" } + }, + "overrides": + { + "gantry_height": { "value": 45 }, + "machine_depth": { "default_value": 150 }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-75, 35], + [18, 35], + [18, -18], + [-75, -18] + ] + }, + "machine_height": { "default_value": 125 }, + "machine_name": { "default_value": "Geeetech MeCreator" }, + "machine_start_gcode": { "default_value": ";Geeetech MeCreator Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y130.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y130.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y10 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_width": { "default_value": 150 }, + "retraction_amount": { "value": 2 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_MeCreator2.def.json b/resources/definitions/geeetech_MeCreator2.def.json new file mode 100644 index 0000000000..4e963892e7 --- /dev/null +++ b/resources/definitions/geeetech_MeCreator2.def.json @@ -0,0 +1,30 @@ +{ + "version": 2, + "name": "Geeetech MeCreator2", + "inherits": "Geeetech_Base_Single_Extruder", + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" } + }, + "overrides": + { + "gantry_height": { "value": 45 }, + "machine_depth": { "default_value": 160 }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-75, 35], + [18, 35], + [18, -18], + [-75, -18] + ] + }, + "machine_height": { "default_value": 160 }, + "machine_name": { "default_value": "Geeetech MeCreator2" }, + "machine_start_gcode": { "default_value": ";Geeetech MeCreator2 Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y140.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y140.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y10 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_width": { "default_value": 160 }, + "retraction_amount": { "value": 2 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_MeDucer.def.json b/resources/definitions/geeetech_MeDucer.def.json new file mode 100644 index 0000000000..ae7a6284d4 --- /dev/null +++ b/resources/definitions/geeetech_MeDucer.def.json @@ -0,0 +1,30 @@ +{ + "version": 2, + "name": "Geeetech MeDucer", + "inherits": "Geeetech_Base_Single_Extruder", + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" } + }, + "overrides": + { + "gantry_height": { "value": 45 }, + "machine_depth": { "default_value": 150 }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-75, 35], + [18, 35], + [18, -18], + [-75, -18] + ] + }, + "machine_height": { "default_value": 150 }, + "machine_name": { "default_value": "Geeetech MeDucer" }, + "machine_start_gcode": { "default_value": ";Geeetech MeDucer Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y130.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y130.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y10 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_width": { "default_value": 180 }, + "retraction_amount": { "value": 2 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_Mizar.def.json b/resources/definitions/geeetech_Mizar.def.json new file mode 100644 index 0000000000..41a97eabd0 --- /dev/null +++ b/resources/definitions/geeetech_Mizar.def.json @@ -0,0 +1,29 @@ +{ + "version": 2, + "name": "Geeetech Mizar", + "inherits": "Geeetech_Base_Single_Extruder", + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" } + }, + "overrides": + { + "gantry_height": { "value": 35 }, + "machine_depth": { "default_value": 220 }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-31, 31], + [34, 31], + [34, -40], + [-31, -40] + ] + }, + "machine_height": { "default_value": 260 }, + "machine_name": { "default_value": "Geeetech Mizar" }, + "machine_start_gcode": { "default_value": ";Official open-source firmware for Mizar: https://github.com/Geeetech3D/Mizar \n\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_width": { "default_value": 220 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_MizarM.def.json b/resources/definitions/geeetech_MizarM.def.json new file mode 100644 index 0000000000..d4182ebb62 --- /dev/null +++ b/resources/definitions/geeetech_MizarM.def.json @@ -0,0 +1,38 @@ +{ + "version": 2, + "name": "Geeetech MizarM", + "inherits": "Geeetech_Base_Dual_Extruder", + "metadata": + { + "visible": true, + "machine_extruder_trains": + { + "0": "Geeetech_Dual_Extruder_0", + "1": "Geeetech_Dual_Extruder_1" + }, + "preferred_material": "Geeetech_PLA_Magenta" + }, + "overrides": + { + "brim_width": { "value": 10 }, + "gantry_height": { "value": 35 }, + "machine_depth": { "default_value": 255 }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-31, 31], + [34, 31], + [34, -40], + [-31, -40] + ] + }, + "machine_height": { "default_value": 260 }, + "machine_name": { "default_value": "Geeetech MizarM" }, + "machine_start_gcode": { "default_value": ";Official open-source firmware for MizarM: https://github.com/Geeetech3D/Mizar-M \n\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_width": { "default_value": 255 }, + "material_standby_temperature": { "value": 200 }, + "prime_tower_position_x": { "value": 225 }, + "prime_tower_position_y": { "value": 195 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_MizarMax.def.json b/resources/definitions/geeetech_MizarMax.def.json new file mode 100644 index 0000000000..00d320ab18 --- /dev/null +++ b/resources/definitions/geeetech_MizarMax.def.json @@ -0,0 +1,29 @@ +{ + "version": 2, + "name": "Geeetech MizarMax", + "inherits": "Geeetech_Base_Single_Extruder", + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" } + }, + "overrides": + { + "gantry_height": { "value": 35 }, + "machine_depth": { "default_value": 320 }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-31, 31], + [34, 31], + [34, -40], + [-31, -40] + ] + }, + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "Geeetech MizarMax" }, + "machine_start_gcode": { "default_value": ";Official open-source firmware for MizarMax: https://github.com/Geeetech3D/Mizar-Max \n\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_width": { "default_value": 320 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_MizarPro.def.json b/resources/definitions/geeetech_MizarPro.def.json new file mode 100644 index 0000000000..f5dd497d16 --- /dev/null +++ b/resources/definitions/geeetech_MizarPro.def.json @@ -0,0 +1,29 @@ +{ + "version": 2, + "name": "Geeetech MizarPro", + "inherits": "Geeetech_Base_Single_Extruder", + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" } + }, + "overrides": + { + "gantry_height": { "value": 35 }, + "machine_depth": { "default_value": 220 }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-31, 31], + [34, 31], + [34, -40], + [-31, -40] + ] + }, + "machine_height": { "default_value": 260 }, + "machine_name": { "default_value": "Geeetech MizarPro" }, + "machine_start_gcode": { "default_value": ";Official open-source firmware for MizarPro: https://github.com/Geeetech3D/Mizar-Pro \n\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_width": { "default_value": 220 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_MizarS.def.json b/resources/definitions/geeetech_MizarS.def.json new file mode 100644 index 0000000000..73f4f60aa8 --- /dev/null +++ b/resources/definitions/geeetech_MizarS.def.json @@ -0,0 +1,29 @@ +{ + "version": 2, + "name": "Geeetech MizarS", + "inherits": "Geeetech_Base_Single_Extruder", + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" } + }, + "overrides": + { + "gantry_height": { "value": 35 }, + "machine_depth": { "default_value": 255 }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-31, 31], + [34, 31], + [34, -40], + [-31, -40] + ] + }, + "machine_height": { "default_value": 260 }, + "machine_name": { "default_value": "Geeetech MizarS" }, + "machine_start_gcode": { "default_value": ";Official open-source firmware for MizarS: https://github.com/Geeetech3D/Mizar-S \n\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_width": { "default_value": 255 } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_Mizar_S.def.json b/resources/definitions/geeetech_Mizar_S.def.json deleted file mode 100644 index 7cd7e42e68..0000000000 --- a/resources/definitions/geeetech_Mizar_S.def.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "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/geeetech_Thunder.def.json b/resources/definitions/geeetech_Thunder.def.json new file mode 100644 index 0000000000..cc3e4044f8 --- /dev/null +++ b/resources/definitions/geeetech_Thunder.def.json @@ -0,0 +1,132 @@ +{ + "version": 2, + "name": "Geeetech Thunder", + "inherits": "Geeetech_Base_Single_Extruder", + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" } + }, + "overrides": + { + "acceleration_print": { "value": 3500 }, + "acceleration_travel": { "value": 5000 }, + "cool_fan_full_at_height": + { + "label": "Regular Fan Speed at Height", + "value": "layer_height_0 + layer_height" + }, + "cool_fan_speed": + { + "maximum_value": "151", + "value": "151 if speed_infill>=200 else 100" + }, + "cool_fan_speed_max": + { + "maximum_value": "151", + "value": "cool_fan_speed" + }, + "cool_fan_speed_min": + { + "maximum_value": "151", + "value": "cool_fan_speed" + }, + "cool_min_layer_time": { "value": "1.3 if speed_infill>=200 else 2.5" }, + "fill_outline_gaps": + { + "label": "Print Thin Walls", + "value": false + }, + "gantry_height": { "value": 35 }, + "infill_before_walls": + { + "label": "Infill Before Walls", + "value": false + }, + "infill_overlap": + { + "label": "Infill Overlap Percentage", + "value": 10.0 + }, + "infill_sparse_density": + { + "label": "Infill Density", + "value": "15" + }, + "infill_wipe_dist": + { + "label": "Infill Wipe Distance", + "value": 0.0 + }, + "line_width": { "value": "1.2*machine_nozzle_size if speed_infill>=200 else machine_nozzle_size" }, + "machine_depth": { "default_value": 250 }, + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-20, 25], + [20, 25], + [20, -25], + [-20, -25] + ] + }, + "machine_height": { "default_value": 260 }, + "machine_max_acceleration_e": { "value": 3500 }, + "machine_max_acceleration_x": { "value": 5000 }, + "machine_max_acceleration_y": { "value": 4000 }, + "machine_max_acceleration_z": { "value": 50 }, + "machine_max_feedrate_e": { "value": 60 }, + "machine_max_feedrate_x": { "value": 300 }, + "machine_max_jerk_e": { "value": 8 }, + "machine_max_jerk_xy": { "value": 45 }, + "machine_max_jerk_z": { "value": 0.8 }, + "machine_name": { "default_value": "Geeetech Thunder" }, + "machine_start_gcode": { "default_value": ";Official viki homepage for Thunder:https://www.geeetech.com/wiki/index.php/Geeetech_Thunder_3D_printer \n\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, + "machine_width": { "default_value": 250 }, + "material_flow_layer_0": { "value": 95 }, + "material_print_temperature": + { + "maximum_value": "250", + "value": "200 if speed_infill <=150 else 205 if speed_infill <= 200 else 215 if speed_infill <= 260 else 220" + }, + "material_print_temperature_layer_0": + { + "maximum_value_warning": 300, + "value": "material_print_temperature" + }, + "retraction_speed": { "value": 35 }, + "skin_overlap": + { + "label": "Skin Overlap Percentage", + "value": 10.0 + }, + "small_hole_max_size": { "value": "8 if speed_infill>=200 else 0" }, + "speed_infill": { "maximum_value_warning": "300" }, + "speed_print": + { + "maximum_value_warning": "300", + "value": 250 + }, + "speed_roofing": { "maximum_value_warning": "300" }, + "speed_support": { "maximum_value_warning": "200" }, + "speed_support_bottom": { "maximum_value_warning": "200" }, + "speed_support_infill": { "maximum_value_warning": "200" }, + "speed_support_interface": { "maximum_value_warning": "200" }, + "speed_support_roof": { "maximum_value_warning": "200" }, + "speed_topbottom": { "maximum_value_warning": "300" }, + "speed_travel_layer_0": { "maximum_value_warning": "200" }, + "speed_wall": { "maximum_value_warning": "300" }, + "speed_wall_0": { "maximum_value_warning": "300" }, + "speed_wall_x": { "maximum_value_warning": "300" }, + "wall_0_wipe_dist": + { + "label": "Outer Wall Wipe Distance", + "value": 0.0 + }, + "zig_zaggify_infill": + { + "label": "Connect Infill Lines", + "value": true + } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_a30.def.json b/resources/definitions/geeetech_a30.def.json deleted file mode 100644 index d4f7df139f..0000000000 --- a/resources/definitions/geeetech_a30.def.json +++ /dev/null @@ -1,113 +0,0 @@ -{ - "version": 2, - "name": "Geeetech A30", - "inherits": "fdmprinter", - "metadata": { - "author": "William & Cataldo URSO", - "manufacturer": "Geeetech", - "file_formats": "text/x-gcode", - "visible": true, - "has_materials": true, - "preferred_quality_type": "draft", - "machine_extruder_trains": { - "0": "geeetech_a30_extruder_0" - } - }, - "overrides": { - "machine_name": { - "default_value": "Geeetech A30" - }, - "machine_start_gcode": { - "default_value": "G28 ;Home\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG1 Z15.0 F6000 ;Move the platform down 15mm\nG92 E0\nG1 F200 E3\nG92 E0" - }, - "machine_end_gcode": { - "default_value": "M104 S0;Cooling the heat end\nM140 S0;Cooling the heat bed\nG92 E1\nG1 E-1 F300\nG28 X0 Y0;Home X axis and Y axis\nM84" - }, - "machine_width": { - "default_value": 320 - }, - "machine_height": { - "default_value": 420 - }, - "machine_depth": { - "default_value": 320 - }, - "machine_heated_bed": { - "default_value": true - }, - "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.3 - }, - "retraction_amount": { - "default_value": 2 - }, - "retraction_speed": { - "default_value": 25 - }, - "adhesion_type": { - "default_value": "skirt" - }, - "machine_head_with_fans_polygon": { - "default_value": [ - [-75, 35], - [18, 35], - [18, -18], - [-75, -18] - ] - }, - "gantry_height": { - "value": "55" - }, - "machine_max_feedrate_x": { - "default_value": 300 - }, - "machine_max_feedrate_y": { - "default_value": 300 - }, - "machine_max_feedrate_z": { - "default_value": 7 - }, - "machine_max_feedrate_e": { - "default_value": 50 - }, - "machine_max_acceleration_x": { - "default_value": 2000 - }, - "machine_max_acceleration_y": { - "default_value": 2000 - }, - "machine_max_acceleration_z": { - "default_value": 100 - }, - "machine_max_acceleration_e": { - "default_value": 10000 - }, - "machine_acceleration": { - "default_value": 2000 - }, - "machine_max_jerk_xy": { - "default_value": 10 - }, - "machine_max_jerk_z": { - "default_value": 1 - }, - "machine_max_jerk_e": { - "default_value": 5 - }, - "machine_gcode_flavor": { - "default_value": "Repetier" - } - } -} diff --git a/resources/definitions/gmax15plus.def.json b/resources/definitions/gmax15plus.def.json index 6cbdce221a..c8abf2aab8 100644 --- a/resources/definitions/gmax15plus.def.json +++ b/resources/definitions/gmax15plus.def.json @@ -2,7 +2,8 @@ "version": 2, "name": "gMax 1.5 Plus", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "gcreate", "manufacturer": "gcreate", @@ -10,44 +11,40 @@ "platform": "gmax_1-5_xt-plus_s3d_full model_150707.3mf", "has_machine_quality": true, "has_variants": true, - "variants_name": "Hotend", - "preferred_variant_name": "0.5mm E3D (Default)", + "machine_extruder_trains": { "0": "gmax15plus_extruder_0" }, "preferred_quality_type": "gmax15plus_global_normal", - "machine_extruder_trains": { - "0": "gmax15plus_extruder_0" - } - - + "preferred_variant_name": "0.5mm E3D (Default)", + "variants_name": "Hotend" }, - - "overrides": { - "machine_extruder_count": { "default_value": 1 }, - "machine_name": { "default_value": "gMax 1.5 Plus" }, - "machine_heated_bed": { "default_value": false }, - "machine_width": { "default_value": 406 }, - "machine_depth": { "default_value": 406 }, - "machine_height": { "default_value": 533 }, - "machine_center_is_zero": { "default_value": false }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_size": { "default_value": 0.5 }, - "layer_height": { "default_value": 0.2 }, - "layer_height_0": { "default_value": 0.3 }, - "retraction_amount": { "default_value": 1 }, - "retraction_speed": { "default_value": 70}, + "overrides": + { "adhesion_type": { "default_value": "skirt" }, "gantry_height": { "value": "50" }, - "speed_print": { "default_value": 50 }, + "layer_height": { "default_value": 0.2 }, + "layer_height_0": { "default_value": 0.3 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 406 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\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_extruder_count": { "default_value": 1 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 533 }, + "machine_max_acceleration_e": { "default_value": 10000 }, "machine_max_acceleration_x": { "default_value": 600 }, "machine_max_acceleration_y": { "default_value": 600 }, "machine_max_acceleration_z": { "default_value": 30 }, - "machine_max_acceleration_e": { "default_value": 10000 }, + "machine_max_jerk_e": { "default_value": 5.0 }, "machine_max_jerk_xy": { "default_value": 8 }, "machine_max_jerk_z": { "default_value": 0.4 }, - "machine_max_jerk_e": { "default_value": 5.0 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_name": { "default_value": "gMax 1.5 Plus" }, + "machine_nozzle_size": { "default_value": 0.5 }, "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 ;Home X/Y/Z\nM104 S{material_print_temperature} ; Preheat\nM109 S{material_print_temperature} ; Preheat\nG91 ;relative positioning\nG90 ;absolute positioning\nG1 Z25.0 F9000 ;raise nozzle 25mm\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, - "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\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" }, - "wall_thickness": { "value": "1" }, - "top_bottom_thickness": { "default_value": 1 } + "machine_width": { "default_value": 406 }, + "material_diameter": { "default_value": 1.75 }, + "retraction_amount": { "default_value": 1 }, + "retraction_speed": { "default_value": 70 }, + "speed_print": { "default_value": 50 }, + "top_bottom_thickness": { "default_value": 1 }, + "wall_thickness": { "value": "1" } } -} +} \ No newline at end of file diff --git a/resources/definitions/gmax15plus_dual.def.json b/resources/definitions/gmax15plus_dual.def.json index ea84858760..47ce76fc98 100644 --- a/resources/definitions/gmax15plus_dual.def.json +++ b/resources/definitions/gmax15plus_dual.def.json @@ -2,50 +2,52 @@ "version": 2, "name": "gMax 1.5 Plus Dual Extruder", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "GTL_180109", "manufacturer": "gCreate", "file_formats": "text/x-gcode", "platform": "gmax_1-5_xt-plus_s3d_full model_150707.3mf", "has_variants": true, - "variants_name": "Hotend", - "preferred_variant_name": "0.5mm E3D (Default)", - "preferred_quality_type": "gmax15plus_global_dual_normal", - "machine_extruder_trains": { + "machine_extruder_trains": + { "0": "gmax15plus_dual_extruder_0", "1": "gmax15plus_dual_extruder_1" - } + }, + "preferred_quality_type": "gmax15plus_global_dual_normal", + "preferred_variant_name": "0.5mm E3D (Default)", + "variants_name": "Hotend" }, - - "overrides": { - "machine_name": { "default_value": "gMax 1.5 Plus Dual Extruder" }, - "machine_extruder_count": { "default_value": 2 }, - "machine_heated_bed": { "default_value": false }, - "machine_width": { "default_value": 406 }, - "machine_depth": { "default_value": 406 }, - "machine_height": { "default_value": 533 }, - "machine_center_is_zero": { "default_value": false }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_size": { "default_value": 0.5 }, - "layer_height": { "default_value": 0.2 }, - "layer_height_0": { "default_value": 0.3 }, - "retraction_amount": { "default_value": 1 }, - "retraction_speed": { "default_value": 70}, + "overrides": + { "adhesion_type": { "default_value": "skirt" }, "gantry_height": { "value": "50" }, - "speed_print": { "default_value": 50 }, + "layer_height": { "default_value": 0.2 }, + "layer_height_0": { "default_value": 0.3 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 406 }, + "machine_end_gcode": { "default_value": "M104 S0 T0;Left extruder off\nM104 S0 T1; Right extruder 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_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 533 }, + "machine_max_acceleration_e": { "default_value": 10000 }, "machine_max_acceleration_x": { "default_value": 600 }, "machine_max_acceleration_y": { "default_value": 600 }, "machine_max_acceleration_z": { "default_value": 30 }, - "machine_max_acceleration_e": { "default_value": 10000 }, + "machine_max_jerk_e": { "default_value": 5.0 }, "machine_max_jerk_xy": { "default_value": 8 }, "machine_max_jerk_z": { "default_value": 0.4 }, - "machine_max_jerk_e": { "default_value": 5.0 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_name": { "default_value": "gMax 1.5 Plus Dual Extruder" }, + "machine_nozzle_size": { "default_value": 0.5 }, "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 ;Home X/Y/Z\nM104 S{material_print_temperature} T0 ; Preheat Left Extruder\nM104 S{material_print_temperature} T1 ; Preheat Right Extruder\nM109 S{material_print_temperature} T0 ; Preheat Left Extruder\nM109 S{material_print_temperature} T1 ; Preheat Right Extruder\nG91 ;relative positioning\nG90 ;absolute positioning\nM218 T1 X34.3 Y0; Set 2nd extruder offset. This can be changed later if needed\nG1 Z25.0 F9000 ;raise nozzle 25mm\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, - "machine_end_gcode": { "default_value": "M104 S0 T0;Left extruder off\nM104 S0 T1; Right extruder 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" }, - "wall_thickness": { "value": "1" }, - "top_bottom_thickness": { "default_value": 1 } + "machine_width": { "default_value": 406 }, + "material_diameter": { "default_value": 1.75 }, + "retraction_amount": { "default_value": 1 }, + "retraction_speed": { "default_value": 70 }, + "speed_print": { "default_value": 50 }, + "top_bottom_thickness": { "default_value": 1 }, + "wall_thickness": { "value": "1" } } -} +} \ No newline at end of file diff --git a/resources/definitions/goofoo_base.def.json b/resources/definitions/goofoo_base.def.json index 13865bdb56..76e02cc636 100644 --- a/resources/definitions/goofoo_base.def.json +++ b/resources/definitions/goofoo_base.def.json @@ -1,132 +1,127 @@ { - "name": "Goofoo Base Printer", "version": 2, + "name": "Goofoo Base Printer", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": false, "author": "goofoo3d.com", "manufacturer": "GooFoo", "file_formats": "text/x-gcode", - "first_start_actions": ["MachineSettingsAction"], - - "machine_extruder_trains": { - "0": "goofoo_base_extruder" - }, - - "has_materials": true, - "preferred_material": "goofoo_pla", - - "has_variants": true, - "variants_name": "Nozzle Size", - "preferred_variant_name": "0.4mm Nozzle", - + "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, - "preferred_quality_type": "normal" - + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { "0": "goofoo_base_extruder" }, + "preferred_material": "goofoo_pla", + "preferred_quality_type": "normal", + "preferred_variant_name": "0.4mm Nozzle", + "variants_name": "Nozzle Size" }, - "overrides": { - - "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract the filament\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positioning\n\nG28 X0 Y0 ;Home X and Y\n\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" }, - - "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 }, - + "overrides": + { + "acceleration_enabled": { "value": false }, "acceleration_print": { "value": 500 }, + "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, "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" }, - + "cool_fan_full_at_height": { "value": "3 * layer_height" }, + "cool_min_layer_time": { "value": 10 }, + "fill_outline_gaps": { "value": false }, + "infill_before_walls": { "value": false }, + "infill_overlap": { "value": 30.0 }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, + "infill_wipe_dist": { "value": 0.0 }, + "jerk_enabled": { "value": false }, "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": 40.0 }, - "speed_wall": { "value": "speed_print" }, - "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_travel_layer_0": { "value": "60" }, - "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" }, - - - "optimize_wall_printing_order": { "value": "True" }, - - - "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" }, + "machine_acceleration": { "value": 500 }, + "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract the filament\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positioning\n\nG28 X0 Y0 ;Home X and Y\n\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" }, + "machine_heated_bed": { "default_value": true }, + "machine_max_acceleration_e": { "value": 5000 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 100 }, + "machine_max_feedrate_e": { "value": 50 }, + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_jerk_e": { "value": 5 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "material_final_print_temperature": + { + "maximum_value": "500", + "maximum_value_warning": "421", + "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_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", - "maximum_value": 200 + "material_initial_print_temperature": + { + "maximum_value": "500", + "maximum_value_warning": "421", + "value": "material_print_temperature" }, - "retraction_retract_speed": { - "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", - "maximum_value": 200 + "material_print_temperature": + { + "maximum_value": "500", + "maximum_value_warning": "421" }, - "retraction_prime_speed": { - "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", - "maximum_value": 200 + "material_print_temperature_layer_0": + { + "maximum_value": "500", + "maximum_value_warning": "421" }, - - "retraction_hop": { "value": 0.2 }, + "material_standby_temperature": + { + "maximum_value": "500", + "maximum_value_warning": "421" + }, + "optimize_wall_printing_order": { "value": "True" }, "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, "retraction_combing_max_distance": { "value": 30 }, + "retraction_count_max": { "value": 100 }, + "retraction_extrusion_window": { "value": 10 }, + "retraction_hop": { "value": 0.2 }, + "retraction_min_travel": { "value": 1.5 }, + "retraction_prime_speed": + { + "maximum_value": 200, + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')" + }, + "retraction_retract_speed": + { + "maximum_value": 200, + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')" + }, + "retraction_speed": + { + "maximum_value": 200, + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')" + }, + "skin_overlap": { "value": 10.0 }, + "skirt_brim_speed": { "value": "speed_layer_0" }, + "speed_layer_0": { "value": 20.0 }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_print": { "value": 40.0 }, + "speed_roofing": { "value": "speed_topbottom" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_support_interface": { "value": "speed_topbottom" }, + "speed_topbottom": { "value": "speed_print" }, + "speed_travel": { "value": "80" }, + "speed_travel_layer_0": { "value": "60" }, + "speed_wall": { "value": "speed_print" }, + "speed_wall_x": { "value": "speed_wall" }, + "speed_z_hop": { "value": 5 }, + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, "travel_avoid_other_parts": { "value": true }, "travel_avoid_supports": { "value": true }, "travel_retract_before_outer_wall": { "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_min_layer_time": { "value": 10 }, - - "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, - "wall_thickness": {"value": "line_width * 2" } - + "wall_0_wipe_dist": { "value": 0.0 }, + "wall_thickness": { "value": "line_width * 2" }, + "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, + "z_seam_type": { "value": "'back'" } } -} +} \ No newline at end of file diff --git a/resources/definitions/goofoo_cube.def.json b/resources/definitions/goofoo_cube.def.json index 55a606ff11..c00d92ef64 100644 --- a/resources/definitions/goofoo_cube.def.json +++ b/resources/definitions/goofoo_cube.def.json @@ -1,29 +1,29 @@ { - "name": "Goofoo Cube", "version": 2, + "name": "Goofoo Cube", "inherits": "goofoo_small", - "overrides": { - + "metadata": + { + "visible": true, + "author": "goofoo" + }, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "layer_height": { "default_value": 0.4 }, + "layer_height_0": { "default_value": 0.5 }, + "machine_depth": { "default_value": 80 }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 80 }, "machine_name": { "default_value": "Goofoo Cube" }, "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": "goofoo", - "visible": true + "retraction_prime_speed": { "value": 80 }, + "retraction_speed": { "default_value": 60 }, + "speed_layer_0": { "value": 10 }, + "speed_print": { "value": 10 }, + "speed_print_layer_0": { "value": 10 }, + "speed_travel": { "value": 10 }, + "speed_travel_layer_0": { "value": 10 } } } \ No newline at end of file diff --git a/resources/definitions/goofoo_e-one.def.json b/resources/definitions/goofoo_e-one.def.json index e2c89e0065..39d8a9c74a 100644 --- a/resources/definitions/goofoo_e-one.def.json +++ b/resources/definitions/goofoo_e-one.def.json @@ -1,14 +1,9 @@ { - "name": "Goofoo E-one", "version": 2, + "name": "Goofoo E-one", "inherits": "goofoo_open", - "overrides": { - "machine_name": { "default_value": "Goofoo E-one" }, - "machine_width": { "default_value": 300 }, - "machine_depth": { "default_value": 300 }, - "machine_height": { "default_value": 400 } - }, - "metadata": { + "metadata": + { "visible": true, "exclude_materials": [ "goofoo_bronze_pla", @@ -25,5 +20,12 @@ "goofoo_hips", "goofoo_pva" ] + }, + "overrides": + { + "machine_depth": { "default_value": 300 }, + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "Goofoo E-one" }, + "machine_width": { "default_value": 300 } } -} +} \ No newline at end of file diff --git a/resources/definitions/goofoo_far.def.json b/resources/definitions/goofoo_far.def.json index ca91655179..385b767c80 100644 --- a/resources/definitions/goofoo_far.def.json +++ b/resources/definitions/goofoo_far.def.json @@ -1,15 +1,16 @@ { - "name": "Goofoo Far", "version": 2, + "name": "Goofoo Far", "inherits": "goofoo_base", - "metadata": { - "quality_definition": "goofoo_far", + "metadata": + { "visible": false, "exclude_materials": [ "goofoo_bronze_pla", "goofoo_tpe_83a", "goofoo_tpu_87a", "goofoo_tpu_95a" - ] + ], + "quality_definition": "goofoo_far" } } \ No newline at end of file diff --git a/resources/definitions/goofoo_gemini.def.json b/resources/definitions/goofoo_gemini.def.json index 7ada5057de..04cbbaa360 100644 --- a/resources/definitions/goofoo_gemini.def.json +++ b/resources/definitions/goofoo_gemini.def.json @@ -1,22 +1,31 @@ { - "name": "Goofoo Gemini", "version": 2, + "name": "Goofoo Gemini", "inherits": "goofoo_far", - "overrides": { - "machine_name": { "default_value": "Goofoo Gemini" }, - "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": { + "metadata": + { + "visible": true, + "machine_extruder_trains": + { "0": "goofoo_gemini_1st", "1": "goofoo_gemini_2st" + } + }, + "overrides": + { + "machine_depth": { "default_value": 250 }, + "machine_extruder_count": { "default_value": 2 }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [0, 0], + [0, 0], + [0, 0], + [0, 0] + ] }, - "visible": true + "machine_height": { "default_value": 200 }, + "machine_name": { "default_value": "Goofoo Gemini" }, + "machine_width": { "default_value": 360 } } } \ No newline at end of file diff --git a/resources/definitions/goofoo_giant.def.json b/resources/definitions/goofoo_giant.def.json index 5a20902502..c4591e5983 100644 --- a/resources/definitions/goofoo_giant.def.json +++ b/resources/definitions/goofoo_giant.def.json @@ -1,15 +1,13 @@ { - "name": "Goofoo Giant", "version": 2, + "name": "Goofoo Giant", "inherits": "goofoo_near", - "overrides": { - "machine_name": { "default_value": "Goofoo Giant" }, - "machine_width": { "default_value": 600 }, + "metadata": { "visible": true }, + "overrides": + { "machine_depth": { "default_value": 600 }, - "machine_height": { "default_value": 1000 } - - }, - "metadata": { - "visible": true + "machine_height": { "default_value": 1000 }, + "machine_name": { "default_value": "Goofoo Giant" }, + "machine_width": { "default_value": 600 } } } \ No newline at end of file diff --git a/resources/definitions/goofoo_max.def.json b/resources/definitions/goofoo_max.def.json index 8a1ffad335..409641fae7 100644 --- a/resources/definitions/goofoo_max.def.json +++ b/resources/definitions/goofoo_max.def.json @@ -1,24 +1,23 @@ { - "name": "Goofoo Max", "version": 2, + "name": "Goofoo Max", "inherits": "goofoo_near", - "overrides": { - "machine_name": { "default_value": "Goofoo Max" }, - "machine_width": { "default_value": 600 }, + "metadata": { "visible": true }, + "overrides": + { + "gantry_height": { "value": 0 }, "machine_depth": { "default_value": 580 }, - "machine_height": { "default_value": 700 }, - "machine_head_with_fans_polygon": { "default_value": [ + "machine_head_with_fans_polygon": + { + "default_value": [ [0, 0], [0, 0], [0, 0], [0, 0] ] }, - - "gantry_height": { "value": 0 } - - }, - "metadata": { - "visible": true + "machine_height": { "default_value": 700 }, + "machine_name": { "default_value": "Goofoo Max" }, + "machine_width": { "default_value": 600 } } } \ No newline at end of file diff --git a/resources/definitions/goofoo_mido.def.json b/resources/definitions/goofoo_mido.def.json index a4f8c23bad..0df75c9e58 100644 --- a/resources/definitions/goofoo_mido.def.json +++ b/resources/definitions/goofoo_mido.def.json @@ -1,15 +1,13 @@ { - "name": "Goofoo Mido", "version": 2, + "name": "Goofoo Mido", "inherits": "goofoo_near", - "overrides": { - "machine_name": { "default_value": "Goofoo Mido" }, - "machine_width": { "default_value": 200 }, + "metadata": { "visible": true }, + "overrides": + { "machine_depth": { "default_value": 200 }, - "machine_height": { "default_value": 200 } - - }, - "metadata": { - "visible": true + "machine_height": { "default_value": 200 }, + "machine_name": { "default_value": "Goofoo Mido" }, + "machine_width": { "default_value": 200 } } } \ No newline at end of file diff --git a/resources/definitions/goofoo_miniplus.def.json b/resources/definitions/goofoo_miniplus.def.json index 87ea5509a7..2f5e7477de 100644 --- a/resources/definitions/goofoo_miniplus.def.json +++ b/resources/definitions/goofoo_miniplus.def.json @@ -1,15 +1,13 @@ { - "name": "Goofoo Mini+", "version": 2, + "name": "Goofoo Mini+", "inherits": "goofoo_near", - "overrides": { - "machine_name": { "default_value": "Goofoo Mini+" }, - "machine_width": { "default_value": 200 }, + "metadata": { "visible": true }, + "overrides": + { "machine_depth": { "default_value": 200 }, - "machine_height": { "default_value": 150 } - - }, - "metadata": { - "visible": true + "machine_height": { "default_value": 150 }, + "machine_name": { "default_value": "Goofoo Mini+" }, + "machine_width": { "default_value": 200 } } } \ No newline at end of file diff --git a/resources/definitions/goofoo_near.def.json b/resources/definitions/goofoo_near.def.json index 073e44a751..b3ed9cfde6 100644 --- a/resources/definitions/goofoo_near.def.json +++ b/resources/definitions/goofoo_near.def.json @@ -1,9 +1,10 @@ { - "name": "Goofoo Near", "version": 2, + "name": "Goofoo Near", "inherits": "goofoo_base", - "metadata": { - "quality_definition": "goofoo_near", - "visible": false + "metadata": + { + "visible": false, + "quality_definition": "goofoo_near" } } \ No newline at end of file diff --git a/resources/definitions/goofoo_nova.def.json b/resources/definitions/goofoo_nova.def.json index 882669f663..5c41d4dd74 100644 --- a/resources/definitions/goofoo_nova.def.json +++ b/resources/definitions/goofoo_nova.def.json @@ -1,16 +1,17 @@ { - "name": "Goofoo Nova", "version": 2, + "name": "Goofoo Nova", "inherits": "goofoo_near", - "overrides": { - "machine_name": { "default_value": "Goofoo Nova" }, - "machine_width": { "default_value": 280 }, - "machine_depth": { "default_value": 280 }, - "machine_height": { "default_value": 300 } - + "metadata": + { + "visible": true, + "author": "goofoo" }, - "metadata": { - "author": "goofoo", - "visible": true + "overrides": + { + "machine_depth": { "default_value": 280 }, + "machine_height": { "default_value": 300 }, + "machine_name": { "default_value": "Goofoo Nova" }, + "machine_width": { "default_value": 280 } } } \ No newline at end of file diff --git a/resources/definitions/goofoo_open.def.json b/resources/definitions/goofoo_open.def.json index 5349859809..5a1c707024 100644 --- a/resources/definitions/goofoo_open.def.json +++ b/resources/definitions/goofoo_open.def.json @@ -1,9 +1,9 @@ { - "name": "Goofoo Open", "version": 2, + "name": "Goofoo Open", "inherits": "goofoo_base", - "metadata": { - "quality_definition": "goofoo_open", + "metadata": + { "visible": false, "exclude_materials": [ "goofoo_bronze_pla", @@ -16,6 +16,7 @@ "goofoo_pa", "goofoo_asa", "goofoo_abs" - ] + ], + "quality_definition": "goofoo_open" } } \ No newline at end of file diff --git a/resources/definitions/goofoo_plus.def.json b/resources/definitions/goofoo_plus.def.json index cf95d5b174..bb46ca32a8 100644 --- a/resources/definitions/goofoo_plus.def.json +++ b/resources/definitions/goofoo_plus.def.json @@ -1,15 +1,13 @@ { - "name": "Goofoo Plus", "version": 2, + "name": "Goofoo Plus", "inherits": "goofoo_near", - "overrides": { - "machine_name": { "default_value": "Goofoo Plus" }, - "machine_width": { "default_value": 360 }, + "metadata": { "visible": true }, + "overrides": + { "machine_depth": { "default_value": 360 }, - "machine_height": { "default_value": 400 } - - }, - "metadata": { - "visible": true + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "Goofoo Plus" }, + "machine_width": { "default_value": 360 } } } \ No newline at end of file diff --git a/resources/definitions/goofoo_small.def.json b/resources/definitions/goofoo_small.def.json index 4c919e9398..edbcd4f667 100644 --- a/resources/definitions/goofoo_small.def.json +++ b/resources/definitions/goofoo_small.def.json @@ -1,9 +1,9 @@ { - "name": "Goofoo Small", "version": 2, + "name": "Goofoo Small", "inherits": "goofoo_base", - "metadata": { - "quality_definition": "goofoo_small", + "metadata": + { "visible": false, "exclude_materials": [ "goofoo_bronze_pla", @@ -18,6 +18,7 @@ "goofoo_abs", "goofoo_pva", "goofoo_hips" - ] + ], + "quality_definition": "goofoo_small" } } \ No newline at end of file diff --git a/resources/definitions/goofoo_t-one.def.json b/resources/definitions/goofoo_t-one.def.json index e67f1efa72..4117603a2b 100644 --- a/resources/definitions/goofoo_t-one.def.json +++ b/resources/definitions/goofoo_t-one.def.json @@ -1,21 +1,10 @@ { - "name": "Goofoo T-one", "version": 2, + "name": "Goofoo T-one", "inherits": "goofoo_far", - "overrides": { - "machine_name": { "default_value": "Goofoo T-one" }, - "machine_width": { "default_value": 200 }, - "machine_depth": { "default_value": 200 }, - "machine_height": { "default_value": 150 }, - "machine_extruder_count": { - "default_value": 2 - } - }, - "metadata": { - "machine_extruder_trains": { - "0": "goofoo_tone_1st", - "1": "goofoo_tone_2st" - }, + "metadata": + { + "visible": true, "exclude_materials": [ "goofoo_bronze_pla", "goofoo_peek", @@ -31,6 +20,18 @@ "goofoo_hips", "goofoo_pva" ], - "visible": true + "machine_extruder_trains": + { + "0": "goofoo_tone_1st", + "1": "goofoo_tone_2st" + } + }, + "overrides": + { + "machine_depth": { "default_value": 200 }, + "machine_extruder_count": { "default_value": 2 }, + "machine_height": { "default_value": 150 }, + "machine_name": { "default_value": "Goofoo T-one" }, + "machine_width": { "default_value": 200 } } } \ No newline at end of file diff --git a/resources/definitions/goofoo_tiny.def.json b/resources/definitions/goofoo_tiny.def.json index 0b15ab64d1..0845bad88c 100644 --- a/resources/definitions/goofoo_tiny.def.json +++ b/resources/definitions/goofoo_tiny.def.json @@ -1,16 +1,15 @@ { - "name": "Goofoo Tiny", "version": 2, + "name": "Goofoo Tiny", "inherits": "goofoo_small", - "overrides": { + "metadata": { "visible": true }, + "overrides": + { + "machine_depth": { "default_value": 100 }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 100 }, "machine_name": { "default_value": "Goofoo Tiny" }, "machine_width": { "default_value": 100 }, - "machine_depth": { "default_value": 100 }, - "machine_height": { "default_value": 100 }, - "machine_heated_bed": { "default_value": false }, "raft_margin": { "default_value": 5 } - }, - "metadata": { - "visible": true } } \ No newline at end of file diff --git a/resources/definitions/goofoo_tinyplus.def.json b/resources/definitions/goofoo_tinyplus.def.json index 82557cc260..cd2a3ab2ee 100644 --- a/resources/definitions/goofoo_tinyplus.def.json +++ b/resources/definitions/goofoo_tinyplus.def.json @@ -1,16 +1,15 @@ { - "name": "Goofoo Tiny+", "version": 2, + "name": "Goofoo Tiny+", "inherits": "goofoo_small", - "overrides": { + "metadata": { "visible": true }, + "overrides": + { + "machine_depth": { "default_value": 120 }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 180 }, "machine_name": { "default_value": "Goofoo Tiny+" }, "machine_width": { "default_value": 120 }, - "machine_depth": { "default_value": 120 }, - "machine_height": { "default_value": 180 }, - "raft_margin": { "default_value": 5 }, - "machine_heated_bed": { "default_value": false } - }, - "metadata": { - "visible": true + "raft_margin": { "default_value": 5 } } } \ No newline at end of file diff --git a/resources/definitions/grr_neo.def.json b/resources/definitions/grr_neo.def.json index 00390e7509..14446db88d 100644 --- a/resources/definitions/grr_neo.def.json +++ b/resources/definitions/grr_neo.def.json @@ -2,33 +2,24 @@ "version": 2, "name": "German RepRap Neo", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Simon Cor", "manufacturer": "German RepRap", "file_formats": "text/x-gcode", "platform": "grr_neo_platform.3mf", - "machine_extruder_trains": - { - "0": "grr_neo_extruder_0" - } + "machine_extruder_trains": { "0": "grr_neo_extruder_0" } }, - - "overrides": { - "machine_name": { "default_value": "German RepRap Neo" }, - "machine_width": { - "default_value": 150 - }, - "machine_height": { - "default_value": 150 - }, - "machine_depth": { - "default_value": 150 - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_head_with_fans_polygon": { + "overrides": + { + "gantry_height": { "value": "55" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 150 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\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_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { "default_value": [ [-75, -18], [-75, 35], @@ -36,17 +27,9 @@ [18, -18] ] }, - "gantry_height": { - "value": "55" - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG91 ;relative positioning\nG1 Y-10.0000 F9000 ;compensate firmware head move 1cm right after endstop\nG92 Y0 ;zero Y\nG90 ;absolute positioning\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\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_height": { "default_value": 150 }, + "machine_name": { "default_value": "German RepRap Neo" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG91 ;relative positioning\nG1 Y-10.0000 F9000 ;compensate firmware head move 1cm right after endstop\nG92 Y0 ;zero Y\nG90 ;absolute positioning\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, + "machine_width": { "default_value": 150 } } -} +} \ No newline at end of file diff --git a/resources/definitions/hardprint_hozo.def.json b/resources/definitions/hardprint_hozo.def.json index 41d290ae82..670279294d 100644 --- a/resources/definitions/hardprint_hozo.def.json +++ b/resources/definitions/hardprint_hozo.def.json @@ -2,35 +2,37 @@ "version": 2, "name": "HardPrint Hozo, Hozo", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "HardPrint", "manufacturer": "HardPrint", "file_formats": "text/x-gcode", "platform": "hardprint_hozo_platform.stl", - "machine_extruder_trains": - { - "0": "hardprint_hozo_extruder_0" - } + "machine_extruder_trains": { "0": "hardprint_hozo_extruder_0" } }, - - "overrides": { - "machine_name": { "default_value": "HardPrint Hozo, Hozo" }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 180 }, - "machine_height": { "default_value": 180 }, - "machine_depth": { "default_value": 180 }, - "machine_center_is_zero": { "default_value": false }, - "machine_head_with_fans_polygon": { "default_value": [[0,0],[0,0],[0,0],[0,0]] }, + "overrides": + { "gantry_height": { "value": 180 }, - "retraction_amount": { "default_value": 5.5 }, - "retraction_speed": { "default_value": 60 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 180 }, + "machine_end_gcode": { "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X178 Y180 F4200 ; park print head\nM84 ; disable motors" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "M221 S100 ; reset flow\nG90 ; use absolute positioning\nM82 ; absolute extrusion mode\nM104 S170 ; set extruder temp for bed leveling\nM140 S{material_bed_temperature_layer_0} ; set bed temp\nM109 R170 ; wait for extruder temp\nM190 S{material_bed_temperature_layer_0} ; wait for bed temp\nG28 ; home all\nG29 ; mesh bed leveling\nM104 S{material_print_temperature_layer_0} ; set extruder temp\nG92 E0.0\nG1 Y-2 X179 F2400\nG1 Z3 F720\nM109 S{material_print_temperature_layer_0} ; wait for extruder temp\nG92 E0.0\nG1 Y0 F1000\nG1 Z0.2 F720\nG1 Y160 E8 F900\nG1 Y20 E18 F900\nG92 E0.0" + "machine_head_with_fans_polygon": + { + "default_value": [ + [0, 0], + [0, 0], + [0, 0], + [0, 0] + ] }, - "machine_end_gcode": { - "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X178 Y180 F4200 ; park print head\nM84 ; disable motors" - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 180 }, + "machine_name": { "default_value": "HardPrint Hozo, Hozo" }, + "machine_start_gcode": { "default_value": "M221 S100 ; reset flow\nG90 ; use absolute positioning\nM82 ; absolute extrusion mode\nM104 S170 ; set extruder temp for bed leveling\nM140 S{material_bed_temperature_layer_0} ; set bed temp\nM109 R170 ; wait for extruder temp\nM190 S{material_bed_temperature_layer_0} ; wait for bed temp\nG28 ; home all\nG29 ; mesh bed leveling\nM104 S{material_print_temperature_layer_0} ; set extruder temp\nG92 E0.0\nG1 Y-2 X179 F2400\nG1 Z3 F720\nM109 S{material_print_temperature_layer_0} ; wait for extruder temp\nG92 E0.0\nG1 Y0 F1000\nG1 Z0.2 F720\nG1 Y160 E8 F900\nG1 Y20 E18 F900\nG92 E0.0" }, + "machine_width": { "default_value": 180 }, + "retraction_amount": { "default_value": 5.5 }, + "retraction_speed": { "default_value": 60 } } -} +} \ No newline at end of file diff --git a/resources/definitions/hardprint_hozo_ix.def.json b/resources/definitions/hardprint_hozo_ix.def.json index c9ee14bec5..e8ecc7de08 100644 --- a/resources/definitions/hardprint_hozo_ix.def.json +++ b/resources/definitions/hardprint_hozo_ix.def.json @@ -2,35 +2,37 @@ "version": 2, "name": "HardPrint Hozo iX", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "HardPrint", "manufacturer": "HardPrint", "file_formats": "text/x-gcode", "platform": "hardprint_hozo_ix_platform.stl", - "machine_extruder_trains": - { - "0": "hardprint_hozo_ix_extruder_0" - } + "machine_extruder_trains": { "0": "hardprint_hozo_ix_extruder_0" } }, - - "overrides": { - "machine_name": { "default_value": "HardPrint Hozo iX" }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 180 }, - "machine_height": { "default_value": 180 }, - "machine_depth": { "default_value": 180 }, - "machine_center_is_zero": { "default_value": false }, - "machine_head_with_fans_polygon": { "default_value": [[0,0],[0,0],[0,0],[0,0]] }, + "overrides": + { "gantry_height": { "value": 180 }, - "retraction_amount": { "default_value": 5 }, - "retraction_speed": { "default_value": 50 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 180 }, + "machine_end_gcode": { "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X178 Y180 F4200 ; park print head\nM18 ; disable motors" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "M221 S100 ; reset flow\nG90 ; use absolute positioning\nM82 ; absolute extrusion mode\nG28 ; home all\nM140 S{material_bed_temperature_layer_0} ; set bed temp\nM104 S{material_print_temperature_layer_0} ; set extruder temp\nG92 E0.0\nG1 Y-2 X0 F2400\nG1 Z3 F720\nM109 S{material_print_temperature_layer_0} ; wait for extruder temp\nG92 E0.0\nG1 X32 F1000\nG1 Z0.2 F720\nG1 X108 E8 F900\nG1 X148 E18 F900\nG92 E0.0" + "machine_head_with_fans_polygon": + { + "default_value": [ + [0, 0], + [0, 0], + [0, 0], + [0, 0] + ] }, - "machine_end_gcode": { - "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X178 Y180 F4200 ; park print head\nM18 ; disable motors" - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 180 }, + "machine_name": { "default_value": "HardPrint Hozo iX" }, + "machine_start_gcode": { "default_value": "M221 S100 ; reset flow\nG90 ; use absolute positioning\nM82 ; absolute extrusion mode\nG28 ; home all\nM140 S{material_bed_temperature_layer_0} ; set bed temp\nM104 S{material_print_temperature_layer_0} ; set extruder temp\nG92 E0.0\nG1 Y-2 X0 F2400\nG1 Z3 F720\nM109 S{material_print_temperature_layer_0} ; wait for extruder temp\nG92 E0.0\nG1 X32 F1000\nG1 Z0.2 F720\nG1 X108 E8 F900\nG1 X148 E18 F900\nG92 E0.0" }, + "machine_width": { "default_value": 180 }, + "retraction_amount": { "default_value": 5 }, + "retraction_speed": { "default_value": 50 } } -} +} \ No newline at end of file diff --git a/resources/definitions/hctech_hc300-m1&m1h.def.json b/resources/definitions/hctech_hc300-m1&m1h.def.json index 7a311975e6..1ceaf90b45 100644 --- a/resources/definitions/hctech_hc300-m1&m1h.def.json +++ b/resources/definitions/hctech_hc300-m1&m1h.def.json @@ -2,53 +2,52 @@ "version": 2, "name": "HCTECH_HC300-M1&M1H", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "HCTECH", "manufacturer": "HCTECH", "file_formats": "text/x-gcode", "platform": "hctech_hc300-m1&m1h.3mf", "has_machine_quality": false, - "machine_extruder_trains": { - "0": "hctech_hc300-m1&m1h_extruder_0" - } + "machine_extruder_trains": { "0": "hctech_hc300-m1&m1h_extruder_0" } }, - - "overrides": { - "machine_head_with_fans_polygon": { "default_value": [ - [-61, 86], - [-61, -31], - [21, -31], - [21, 86] - ] }, - "machine_name": { "default_value": "HCTECH HC300-M1&M1H" }, - "machine_extruder_count": { "default_value": 1 }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 300 }, - "machine_depth": { "default_value": 300 }, - "machine_height": { "default_value": 300 }, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "cool_fan_speed": { "value": 75 }, + "gantry_height": { "value": "55" }, + "infill_before_walls": { "value": false }, + "line_width": { "value": 0.38 }, "machine_center_is_zero": { "default_value": false }, - "retraction_amount": { + "machine_depth": { "default_value": 300 }, + "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" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-61, 86], + [-61, -31], + [21, -31], + [21, 86] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 300 }, + "machine_name": { "default_value": "HCTECH HC300-M1&M1H" }, + "machine_start_gcode": { "default_value": "G1 Z2 ;Raise Z\nG28 X Y ;Home XY\nG92 E0 ;Reset Extruder\nG1 E-1 F2400 ;Retract\nG92 E0 ;Reset Extruder\nG28 Z ;home Z\nG29 ; Measure the bed\nM500 ; Store to EEPROM\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.36 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.36 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.36 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.36 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder" }, + "machine_width": { "default_value": 300 }, + "material_diameter": { "default_value": 1.75 }, + "retraction_amount": + { "default_value": 0.3, "maximum_value_warning": 2.0 }, - "adhesion_type": { "default_value": "skirt" }, - "retraction_speed": { "default_value": 35}, - "travel_avoid_supports": { "value": true }, - "travel_retract_before_outer_wall": { "value": true }, - - "gantry_height": { "value": "55" }, - "speed_print": { "default_value": 60.0 } , - - "material_diameter": { "default_value": 1.75 }, - - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { "default_value": "G1 Z2 ;Raise Z\nG28 X Y ;Home XY\nG92 E0 ;Reset Extruder\nG1 E-1 F2400 ;Retract\nG92 E0 ;Reset Extruder\nG28 Z ;home Z\nG29 ; Measure the bed\nM500 ; Store to EEPROM\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.36 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.36 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.36 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.36 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder" }, - "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 }, - "line_width": { "value": 0.38 }, + "retraction_speed": { "default_value": 35 }, + "speed_print": { "default_value": 60.0 }, "travel_avoid_distance": { "value": 1 }, - "infill_before_walls": { "value": false } + "travel_avoid_supports": { "value": true }, + "travel_retract_before_outer_wall": { "value": true } } -} +} \ No newline at end of file diff --git a/resources/definitions/hctech_hc300-m2h.def.json b/resources/definitions/hctech_hc300-m2h.def.json index 651af04ec6..7d91cecc16 100644 --- a/resources/definitions/hctech_hc300-m2h.def.json +++ b/resources/definitions/hctech_hc300-m2h.def.json @@ -2,55 +2,56 @@ "version": 2, "name": "HCTECH_HC300-M2H", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "HCTECH", "manufacturer": "HCTECH", "file_formats": "text/x-gcode", "platform": "hctech_hc300-m2h.3mf", "has_machine_quality": false, - "machine_extruder_trains": { + "machine_extruder_trains": + { "0": "hctech_hc300-m2h_extruder_0", "1": "hctech_hc300-m2h_extruder_1" } }, - - "overrides": { - "machine_head_with_fans_polygon": { "default_value": [ - [-61, 86], - [-61, -37], - [85, -37], - [85, 86] - ] }, - "machine_name": { "default_value": "HCTECH HC300-M2H" }, - "machine_extruder_count": { "default_value": 2 }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 300 }, - "machine_depth": { "default_value": 300 }, - "machine_height": { "default_value": 300 }, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "cool_fan_speed": { "value": 75 }, + "gantry_height": { "value": "55" }, + "infill_before_walls": { "value": false }, + "line_width": { "value": 0.38 }, "machine_center_is_zero": { "default_value": false }, - "retraction_amount": { + "machine_depth": { "default_value": 300 }, + "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" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-61, 86], + [-61, -37], + [85, -37], + [85, 86] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 300 }, + "machine_name": { "default_value": "HCTECH HC300-M2H" }, + "machine_start_gcode": { "default_value": "G1 Z2 ;Raise Z\nG28 X Y ;Home XY\nT1 ;switch to right extruder\nG1 X5 Y319 F4000 ;Move to Start Position\nG92 E0 ;Reset Extruder\nG1 E20 F60 ;extrude\nM400 ;Wait move\nG92 E0 ;Reset Extruder\nG1 E-2 F2700 ;Retract\nG92 E0 ;Reset Extruder\nG1 X150 F5000 ;Clean Nozzle\nG1 X5 ;Clean Nozzle\nG1 X220 ;Repeat\nG1 X5 ;Back to start posotion\nT0 ;switch to left extruder\nG1 X5 Y319 F4000 ;Move to Start Position\nG92 E0 ;Reset Extruder\nG1 E20 F60 ;extrude\nM400 ;Wait move\nG92 E0 ;Reset Extruder\nG4 S15 ;Wait 15s\nG1 E-2 F2700; Retract\nG92 E0 ;Reset Extruder\nG1 X150 F5000 ;Clean Nozzle\nG1 X5 ;Clean nozzle\nG1 X220 ;Repeat\nG1 X5 ;Back to start position\nG28 Z ;home Z\nG29 ;Measure the bed\nM500 ;Store parameters\nG1 X0 Y300 F4000 ;Move to corner" }, + "machine_width": { "default_value": 300 }, + "material_diameter": { "default_value": 1.75 }, + "retraction_amount": + { "default_value": 0.3, "maximum_value_warning": 2.0 }, - "adhesion_type": { "default_value": "skirt" }, - "retraction_speed": { "default_value": 35}, - "travel_avoid_supports": { "value": true }, - "travel_retract_before_outer_wall": { "value": true }, - - "gantry_height": { "value": "55" }, - "speed_print": { "default_value": 60.0 } , - - "material_diameter": { "default_value": 1.75 }, - - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { "default_value": "G1 Z2 ;Raise Z\nG28 X Y ;Home XY\nT1 ;switch to right extruder\nG1 X5 Y319 F4000 ;Move to Start Position\nG92 E0 ;Reset Extruder\nG1 E20 F60 ;extrude\nM400 ;Wait move\nG92 E0 ;Reset Extruder\nG1 E-2 F2700 ;Retract\nG92 E0 ;Reset Extruder\nG1 X150 F5000 ;Clean Nozzle\nG1 X5 ;Clean Nozzle\nG1 X220 ;Repeat\nG1 X5 ;Back to start posotion\nT0 ;switch to left extruder\nG1 X5 Y319 F4000 ;Move to Start Position\nG92 E0 ;Reset Extruder\nG1 E20 F60 ;extrude\nM400 ;Wait move\nG92 E0 ;Reset Extruder\nG4 S15 ;Wait 15s\nG1 E-2 F2700; Retract\nG92 E0 ;Reset Extruder\nG1 X150 F5000 ;Clean Nozzle\nG1 X5 ;Clean nozzle\nG1 X220 ;Repeat\nG1 X5 ;Back to start position\nG28 Z ;home Z\nG29 ;Measure the bed\nM500 ;Store parameters\nG1 X0 Y300 F4000 ;Move to corner" }, - "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 }, - - "line_width": { "value": 0.38 }, + "retraction_speed": { "default_value": 35 }, + "speed_print": { "default_value": 60.0 }, "travel_avoid_distance": { "value": 1 }, - "infill_before_walls": { "value": false } + "travel_avoid_supports": { "value": true }, + "travel_retract_before_outer_wall": { "value": true } } -} +} \ No newline at end of file diff --git a/resources/definitions/hctech_hc300-m3.def.json b/resources/definitions/hctech_hc300-m3.def.json index 10fea4272b..27c776a4a7 100644 --- a/resources/definitions/hctech_hc300-m3.def.json +++ b/resources/definitions/hctech_hc300-m3.def.json @@ -2,55 +2,52 @@ "version": 2, "name": "HCTECH_HC300-M3", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "HCTECH", "manufacturer": "HCTECH", "file_formats": "text/x-gcode", "platform": "hctech_hc300-m3.3mf", "has_machine_quality": false, - "machine_extruder_trains": { - "0": "hctech_hc300-m3_extruder_0" - } + "machine_extruder_trains": { "0": "hctech_hc300-m3_extruder_0" } }, - - "overrides": { - "machine_head_with_fans_polygon": - { "default_value": [ - [-49, 36], - [-36, -29], - [36, -29], - [36, 49] - ] - }, - "machine_name": { "default_value": "HCTECH HC300-M3" }, - "machine_extruder_count": { "default_value": 1 }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 300 }, - "machine_depth": { "default_value": 300 }, - "machine_height": { "default_value": 300 }, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "cool_fan_speed": { "value": 75 }, + "gantry_height": { "value": "55" }, + "infill_before_walls": { "value": false }, + "line_width": { "value": 0.38 }, "machine_center_is_zero": { "default_value": false }, - "retraction_amount": { + "machine_depth": { "default_value": 300 }, + "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" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-49, 36], + [-36, -29], + [36, -29], + [36, 49] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 300 }, + "machine_name": { "default_value": "HCTECH HC300-M3" }, + "machine_start_gcode": { "default_value": "G28 X Y ;Home XY\nG92 E0 ;Reset Extruder\nG1 E-1 F2400 ;Retract\nG92 E0 ;Reset Extruder\nG28 Z ;home Z\nG29 ; Measure the bed\nM500 ; Store to EEPROM\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.36 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.36 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.36 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.36 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder" }, + "machine_width": { "default_value": 300 }, + "material_diameter": { "default_value": 1.75 }, + "retraction_amount": + { "default_value": 3, "maximum_value_warning": 8 }, - "adhesion_type": { "default_value": "skirt" }, - "retraction_speed": { "default_value": 35}, - "travel_avoid_supports": { "value": true }, - "travel_retract_before_outer_wall": { "value": true }, - - "gantry_height": { "value": "55" }, - "speed_print": { "default_value": 60.0 } , - - "material_diameter": { "default_value": 1.75 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { "default_value": "G28 X Y ;Home XY\nG92 E0 ;Reset Extruder\nG1 E-1 F2400 ;Retract\nG92 E0 ;Reset Extruder\nG28 Z ;home Z\nG29 ; Measure the bed\nM500 ; Store to EEPROM\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.36 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.36 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.36 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.36 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder" }, - "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 }, - - "line_width": { "value": 0.38 }, + "retraction_speed": { "default_value": 35 }, + "speed_print": { "default_value": 60.0 }, "travel_avoid_distance": { "value": 1 }, - "infill_before_walls": { "value": false } + "travel_avoid_supports": { "value": true }, + "travel_retract_before_outer_wall": { "value": true } } -} +} \ No newline at end of file diff --git a/resources/definitions/hellbot_adonis.def.json b/resources/definitions/hellbot_adonis.def.json index a73c66a611..8f797dc668 100644 --- a/resources/definitions/hellbot_adonis.def.json +++ b/resources/definitions/hellbot_adonis.def.json @@ -2,31 +2,27 @@ "version": 2, "name": "Hellbot Adonis", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "MUX team", "manufacturer": "Hellbot", "file_formats": "text/x-gcode", "platform": "hellbot_adonis.obj", - "platform_texture": "hellbot.png", - "platform_offset": [0, -1, 0], "has_materials": true, - "machine_extruder_trains": { - "0": "hellbot_adonis_extruder" - } + "machine_extruder_trains": { "0": "hellbot_adonis_extruder" }, + "platform_offset": [ + 0, + -1, + 0 + ], + "platform_texture": "hellbot.png" }, - "overrides": { - "machine_name": { - "default_value": "Hellbot Adonis" - }, - "machine_width": { - "default_value": 160 - }, - "machine_depth": { - "default_value": 160 - }, - "machine_height": { - "default_value": 160 - } + "overrides": + { + "machine_depth": { "default_value": 160 }, + "machine_height": { "default_value": 160 }, + "machine_name": { "default_value": "Hellbot Adonis" }, + "machine_width": { "default_value": 160 } } -} +} \ No newline at end of file diff --git a/resources/definitions/hellbot_hidra.def.json b/resources/definitions/hellbot_hidra.def.json index 90a196e1a9..810f308a19 100644 --- a/resources/definitions/hellbot_hidra.def.json +++ b/resources/definitions/hellbot_hidra.def.json @@ -2,58 +2,45 @@ "version": 2, "name": "Hellbot Hidra", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Hellbot Development Team", "manufacturer": "Hellbot", "file_formats": "text/x-gcode", "platform": "hellbot_hidra.obj", - "platform_offset": [0, 0, 5], - "platform_texture": "hellbot_hidra.png", "has_materials": true, "machine_extruder_trains": { "0": "hellbot_hidra_extruder_0", "1": "hellbot_hidra_extruder_1" - } - + }, + "platform_offset": [ + 0, + 0, + 5 + ], + "platform_texture": "hellbot_hidra.png" }, - - "overrides": { - "machine_name": { "default_value": "Hellbot Hidra" }, - "machine_width": { - "default_value": 220 - }, - "machine_depth": { - "default_value": 220 - }, - "machine_height": { - "default_value": 250 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_center_is_zero": { - "default_value": false - }, + "overrides": + { + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 220 }, + "machine_end_gcode": { "default_value": "M104 T0 S0;\nM104 T1 S0;\nM140 S0;\nG92 E1;\nG1 E-1 F300;\nG28 X0 Y0;\nM84;" }, + "machine_extruder_count": { "default_value": 2 }, "machine_head_with_fans_polygon": { "default_value": [ - [ -75, 35 ], - [ -75, -18 ], - [ 18, 35 ], - [ 18, -18 ] + [-75, 35], + [-75, -18], + [18, 35], + [18, -18] ] }, - "machine_extruder_count": { - "default_value": 2 - }, - "machine_start_gcode": { - "default_value": "G21;\nG90;\nM82;\nM107;\nG28;\nG1 Z15.0 F9000;" - }, - "machine_end_gcode": { - "default_value": "M104 T0 S0;\nM104 T1 S0;\nM140 S0;\nG92 E1;\nG1 E-1 F300;\nG28 X0 Y0;\nM84;" - } - + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "Hellbot Hidra" }, + "machine_start_gcode": { "default_value": "G21;\nG90;\nM82;\nM107;\nG28;\nG1 Z15.0 F9000;" }, + "machine_width": { "default_value": 220 } } -} +} \ No newline at end of file diff --git a/resources/definitions/hellbot_hidra_plus.def.json b/resources/definitions/hellbot_hidra_plus.def.json index f3c1013915..60654b9dec 100644 --- a/resources/definitions/hellbot_hidra_plus.def.json +++ b/resources/definitions/hellbot_hidra_plus.def.json @@ -2,57 +2,45 @@ "version": 2, "name": "Hellbot Hidra Plus", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Hellbot Development Team", "manufacturer": "Hellbot", "file_formats": "text/x-gcode", "platform": "hellbot_hidra_plus.obj", - "platform_offset": [0, 0, 5], - "platform_texture": "hellbot_hidra_plus.png", "has_materials": true, "machine_extruder_trains": { "0": "hellbot_hidra_plus_extruder_0", "1": "hellbot_hidra_plus_extruder_1" - } - + }, + "platform_offset": [ + 0, + 0, + 5 + ], + "platform_texture": "hellbot_hidra_plus.png" }, - - "overrides": { - "machine_name": { "default_value": "Hellbot Hidra Plus" }, - "machine_width": { - "default_value": 300 - }, - "machine_depth": { - "default_value": 300 - }, - "machine_height": { - "default_value": 350 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_center_is_zero": { - "default_value": false - }, + "overrides": + { + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 300 }, + "machine_end_gcode": { "default_value": "M104 T0 S0;\nM104 T1 S0;\nM140 S0;\nG92 E1;\nG1 E-1 F300;\nG28 X0 Y0;\nM84;" }, + "machine_extruder_count": { "default_value": 2 }, "machine_head_with_fans_polygon": { "default_value": [ - [ -75, 35 ], - [ -75, -18 ], - [ 18, 35 ], - [ 18, -18 ] + [-75, 35], + [-75, -18], + [18, 35], + [18, -18] ] }, - "machine_extruder_count": { - "default_value": 2 - }, - "machine_start_gcode": { - "default_value": "G21;\nG90;\nM82;\nM107;\nG28;\nG1 Z15.0 F9000;" - }, - "machine_end_gcode": { - "default_value": "M104 T0 S0;\nM104 T1 S0;\nM140 S0;\nG92 E1;\nG1 E-1 F300;\nG28 X0 Y0;\nM84;" - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 350 }, + "machine_name": { "default_value": "Hellbot Hidra Plus" }, + "machine_start_gcode": { "default_value": "G21;\nG90;\nM82;\nM107;\nG28;\nG1 Z15.0 F9000;" }, + "machine_width": { "default_value": 300 } } -} +} \ No newline at end of file diff --git a/resources/definitions/hellbot_magna_2_230.def.json b/resources/definitions/hellbot_magna_2_230.def.json index ef6dc0b3be..10be0b79fc 100644 --- a/resources/definitions/hellbot_magna_2_230.def.json +++ b/resources/definitions/hellbot_magna_2_230.def.json @@ -2,41 +2,25 @@ "version": 2, "name": "Hellbot Magna 2 230", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Hellbot Development Team", "manufacturer": "Hellbot", "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_2_230.obj", - "platform_texture": "Magna2_230.png", "has_materials": true, - "machine_extruder_trains": - { - "0": "hellbot_magna_2_230_extruder_0" - } - + "machine_extruder_trains": { "0": "hellbot_magna_2_230_extruder_0" }, + "platform_texture": "Magna2_230.png" }, - - "overrides": { + "overrides": + { + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 230 }, + "machine_extruder_count": { "default_value": 1 }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 250 }, "machine_name": { "default_value": "Hellbot Magna 2 230" }, - "machine_width": { - "default_value": 230 - }, - "machine_height": { - "default_value": 250 - }, - "machine_depth": { - "default_value": 230 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_extruder_count": { - "default_value": 1 - } - + "machine_width": { "default_value": 230 } } -} +} \ No newline at end of file diff --git a/resources/definitions/hellbot_magna_2_230_dual.def.json b/resources/definitions/hellbot_magna_2_230_dual.def.json index 7768f51ac0..31501cbea1 100644 --- a/resources/definitions/hellbot_magna_2_230_dual.def.json +++ b/resources/definitions/hellbot_magna_2_230_dual.def.json @@ -2,53 +2,33 @@ "version": 2, "name": "Hellbot Magna 2 230 dual", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Hellbot Development Team", "manufacturer": "Hellbot", "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_2_230.obj", - "platform_texture": "Magna2_230.png", "has_materials": true, "machine_extruder_trains": { "0": "hellbot_magna_2_230_dual_extruder_0", "1": "hellbot_magna_2_230_dual_extruder_1" - } - + }, + "platform_texture": "Magna2_230.png" }, - - "overrides": { + "overrides": + { + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 230 }, + "machine_end_gcode": { "default_value": "M104 T0 S0\nM104 T1 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_extruders_share_heater": { "default_value": true }, + "machine_extruders_share_nozzle": { "default_value": true }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 250 }, "machine_name": { "default_value": "Hellbot Magna 2 230 dual" }, - "machine_width": { - "default_value": 230 - }, - "machine_height": { - "default_value": 250 - }, - "machine_depth": { - "default_value": 230 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_extruder_count": { - "default_value": 2 - }, - "machine_extruders_share_heater": { - "default_value": true - }, - "machine_extruders_share_nozzle": { - "default_value": true - }, - "machine_start_gcode": { - "default_value": "M104 T0 S{material_print_temperature}\nM104 T1 S{material_print_temperature}\nM109 T0 S{material_print_temperature}\nM109 T1 S{material_print_temperature}\nG21\nG90 \nG28 X0 Y0 \nG28 Z0 \nG1 Z15.0 F300 \nT0 \nG92 E0 \nG1 F700 E-80 \nT1 \nG92 E0 \nG1 F1000 X1 Y1 Z0.3 \nG1 F600 X200 E60 \nG1 F1000 Y3 \nG1 F600 X1 E120 \nT1 \nG92 E0 \nG28 X0 Y0 \nG1 F700 E-80 \nT0 \nG92 E0" - }, - "machine_end_gcode": { - "default_value": "M104 T0 S0\nM104 T1 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" - } + "machine_start_gcode": { "default_value": "M104 T0 S{material_print_temperature}\nM104 T1 S{material_print_temperature}\nM109 T0 S{material_print_temperature}\nM109 T1 S{material_print_temperature}\nG21\nG90 \nG28 X0 Y0 \nG28 Z0 \nG1 Z15.0 F300 \nT0 \nG92 E0 \nG1 F700 E-80 \nT1 \nG92 E0 \nG1 F1000 X1 Y1 Z0.3 \nG1 F600 X200 E60 \nG1 F1000 Y3 \nG1 F600 X1 E120 \nT1 \nG92 E0 \nG28 X0 Y0 \nG1 F700 E-80 \nT0 \nG92 E0" }, + "machine_width": { "default_value": 230 } } -} +} \ No newline at end of file diff --git a/resources/definitions/hellbot_magna_2_300.def.json b/resources/definitions/hellbot_magna_2_300.def.json index d0cf2657b8..3fd09e49f3 100644 --- a/resources/definitions/hellbot_magna_2_300.def.json +++ b/resources/definitions/hellbot_magna_2_300.def.json @@ -2,40 +2,25 @@ "version": 2, "name": "Hellbot Magna 2 300", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Hellbot Development Team", "manufacturer": "Hellbot", "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_2_300.obj", - "platform_texture": "Magna2_300.png", "has_materials": true, - "machine_extruder_trains": - { - "0": "hellbot_magna_2_300_extruder_0" - } - + "machine_extruder_trains": { "0": "hellbot_magna_2_300_extruder_0" }, + "platform_texture": "Magna2_300.png" }, - - "overrides": { + "overrides": + { + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 300 }, + "machine_extruder_count": { "default_value": 1 }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 400 }, "machine_name": { "default_value": "Hellbot Magna 2 300" }, - "machine_width": { - "default_value": 300 - }, - "machine_height": { - "default_value": 400 - }, - "machine_depth": { - "default_value": 300 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_extruder_count": { - "default_value": 1 - } + "machine_width": { "default_value": 300 } } -} +} \ No newline at end of file diff --git a/resources/definitions/hellbot_magna_2_300_dual.def.json b/resources/definitions/hellbot_magna_2_300_dual.def.json index ed22bfa079..11d98cf150 100644 --- a/resources/definitions/hellbot_magna_2_300_dual.def.json +++ b/resources/definitions/hellbot_magna_2_300_dual.def.json @@ -2,53 +2,33 @@ "version": 2, "name": "Hellbot Magna 2 300 dual", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Hellbot Development Team", "manufacturer": "Hellbot", "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_2_300.obj", - "platform_texture": "Magna2_300.png", "has_materials": true, "machine_extruder_trains": { "0": "hellbot_magna_2_300_dual_extruder_0", "1": "hellbot_magna_2_300_dual_extruder_1" - } - + }, + "platform_texture": "Magna2_300.png" }, - - "overrides": { + "overrides": + { + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 300 }, + "machine_end_gcode": { "default_value": "M104 T0 S0\nM104 T1 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_extruders_share_heater": { "default_value": true }, + "machine_extruders_share_nozzle": { "default_value": true }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 400 }, "machine_name": { "default_value": "Hellbot Magna 2 300 Dual" }, - "machine_width": { - "default_value": 300 - }, - "machine_height": { - "default_value": 400 - }, - "machine_depth": { - "default_value": 300 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_extruder_count": { - "default_value": 2 - }, - "machine_extruders_share_heater": { - "default_value": true - }, - "machine_extruders_share_nozzle": { - "default_value": true - }, - "machine_start_gcode": { - "default_value": "M104 T0 S{material_print_temperature}\nM104 T1 S{material_print_temperature}\nM109 T0 S{material_print_temperature}\nM109 T1 S{material_print_temperature}\nG21\nG90 \nG28 X0 Y0 \nG28 Z0 \nG1 Z15.0 F300 \nT0 \nG92 E0 \nG1 F700 E-80 \nT1 \nG92 E0 \nG1 F1000 X1 Y1 Z0.3 \nG1 F600 X200 E60 \nG1 F1000 Y3 \nG1 F600 X1 E120 \nT1 \nG92 E0 \nG28 X0 Y0 \nG1 F700 E-80 \nT0 \nG92 E0" - }, - "machine_end_gcode": { - "default_value": "M104 T0 S0\nM104 T1 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" - } + "machine_start_gcode": { "default_value": "M104 T0 S{material_print_temperature}\nM104 T1 S{material_print_temperature}\nM109 T0 S{material_print_temperature}\nM109 T1 S{material_print_temperature}\nG21\nG90 \nG28 X0 Y0 \nG28 Z0 \nG1 Z15.0 F300 \nT0 \nG92 E0 \nG1 F700 E-80 \nT1 \nG92 E0 \nG1 F1000 X1 Y1 Z0.3 \nG1 F600 X200 E60 \nG1 F1000 Y3 \nG1 F600 X1 E120 \nT1 \nG92 E0 \nG28 X0 Y0 \nG1 F700 E-80 \nT0 \nG92 E0" }, + "machine_width": { "default_value": 300 } } -} +} \ No newline at end of file diff --git a/resources/definitions/hellbot_magna_2_400.def.json b/resources/definitions/hellbot_magna_2_400.def.json index b98c43805c..c27273c67b 100644 --- a/resources/definitions/hellbot_magna_2_400.def.json +++ b/resources/definitions/hellbot_magna_2_400.def.json @@ -2,41 +2,25 @@ "version": 2, "name": "Hellbot Magna 2 400", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Hellbot Development Team", "manufacturer": "Hellbot", "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_2_400.obj", - "platform_texture": "Magna2_400.png", "has_materials": true, - "machine_extruder_trains": - { - "0": "hellbot_magna_2_400_extruder_0" - } - + "machine_extruder_trains": { "0": "hellbot_magna_2_400_extruder_0" }, + "platform_texture": "Magna2_400.png" }, - - "overrides": { + "overrides": + { + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 400 }, + "machine_extruder_count": { "default_value": 1 }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 400 }, "machine_name": { "default_value": "Hellbot Magna 2 400" }, - "machine_width": { - "default_value": 400 - }, - "machine_height": { - "default_value": 400 - }, - "machine_depth": { - "default_value": 400 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_extruder_count": { - "default_value": 1 - } - + "machine_width": { "default_value": 400 } } -} +} \ No newline at end of file diff --git a/resources/definitions/hellbot_magna_2_400_dual.def.json b/resources/definitions/hellbot_magna_2_400_dual.def.json index 2dbdb1f6ca..560bd800b4 100644 --- a/resources/definitions/hellbot_magna_2_400_dual.def.json +++ b/resources/definitions/hellbot_magna_2_400_dual.def.json @@ -2,54 +2,33 @@ "version": 2, "name": "Hellbot Magna 2 400 dual", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Hellbot Development Team", "manufacturer": "Hellbot", "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_2_400.obj", - "platform_texture": "Magna2_400.png", "has_materials": true, "machine_extruder_trains": { "0": "hellbot_magna_2_400_dual_extruder_0", "1": "hellbot_magna_2_400_dual_extruder_1" - } - + }, + "platform_texture": "Magna2_400.png" }, - - "overrides": { + "overrides": + { + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 400 }, + "machine_end_gcode": { "default_value": "M104 T0 S0\nM104 T1 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_extruders_share_heater": { "default_value": true }, + "machine_extruders_share_nozzle": { "default_value": true }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 400 }, "machine_name": { "default_value": "Hellbot Magna 2 400 Dual" }, - "machine_width": { - "default_value": 400 - }, - "machine_height": { - "default_value": 400 - }, - "machine_depth": { - "default_value": 400 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_extruder_count": { - "default_value": 2 - }, - "machine_extruders_share_heater": { - "default_value": true - }, - "machine_extruders_share_nozzle": { - "default_value": true - }, - "machine_start_gcode": { - "default_value": "M104 T0 S{material_print_temperature}\nM104 T1 S{material_print_temperature}\nM109 T0 S{material_print_temperature}\nM109 T1 S{material_print_temperature}\nG21\nG90 \nG28 X0 Y0 \nG28 Z0 \nG1 Z15.0 F300 \nT0 \nG92 E0 \nG1 F700 E-80 \nT1 \nG92 E0 \nG1 F1000 X1 Y1 Z0.3 \nG1 F600 X200 E60 \nG1 F1000 Y3 \nG1 F600 X1 E120 \nT1 \nG92 E0 \nG28 X0 Y0 \nG1 F700 E-80 \nT0 \nG92 E0" - }, - "machine_end_gcode": { - "default_value": "M104 T0 S0\nM104 T1 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" - } - + "machine_start_gcode": { "default_value": "M104 T0 S{material_print_temperature}\nM104 T1 S{material_print_temperature}\nM109 T0 S{material_print_temperature}\nM109 T1 S{material_print_temperature}\nG21\nG90 \nG28 X0 Y0 \nG28 Z0 \nG1 Z15.0 F300 \nT0 \nG92 E0 \nG1 F700 E-80 \nT1 \nG92 E0 \nG1 F1000 X1 Y1 Z0.3 \nG1 F600 X200 E60 \nG1 F1000 Y3 \nG1 F600 X1 E120 \nT1 \nG92 E0 \nG28 X0 Y0 \nG1 F700 E-80 \nT0 \nG92 E0" }, + "machine_width": { "default_value": 400 } } -} +} \ No newline at end of file diff --git a/resources/definitions/hellbot_magna_2_500.def.json b/resources/definitions/hellbot_magna_2_500.def.json index e7c645b6f4..d718fd3635 100644 --- a/resources/definitions/hellbot_magna_2_500.def.json +++ b/resources/definitions/hellbot_magna_2_500.def.json @@ -2,41 +2,25 @@ "version": 2, "name": "Hellbot Magna 2 500", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Hellbot Development Team", "manufacturer": "Hellbot", "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_2_500.obj", - "platform_texture": "Magna2_500.png", "has_materials": true, - "machine_extruder_trains": - { - "0": "hellbot_magna_2_500_extruder_0" - } - + "machine_extruder_trains": { "0": "hellbot_magna_2_500_extruder_0" }, + "platform_texture": "Magna2_500.png" }, - - "overrides": { + "overrides": + { + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 500 }, + "machine_extruder_count": { "default_value": 1 }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 500 }, "machine_name": { "default_value": "Hellbot Magna 2 500" }, - "machine_width": { - "default_value": 500 - }, - "machine_height": { - "default_value": 500 - }, - "machine_depth": { - "default_value": 500 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_extruder_count": { - "default_value": 1 - } - + "machine_width": { "default_value": 500 } } -} +} \ No newline at end of file diff --git a/resources/definitions/hellbot_magna_2_500_dual.def.json b/resources/definitions/hellbot_magna_2_500_dual.def.json index ba7f18d702..cb5e8b94be 100644 --- a/resources/definitions/hellbot_magna_2_500_dual.def.json +++ b/resources/definitions/hellbot_magna_2_500_dual.def.json @@ -2,53 +2,33 @@ "version": 2, "name": "Hellbot Magna 2 500 dual", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Hellbot Development Team", "manufacturer": "Hellbot", "file_formats": "text/x-gcode", "platform": "Hellbot_Magna_2_500.obj", - "platform_texture": "Magna2_500.png", "has_materials": true, "machine_extruder_trains": { "0": "hellbot_magna_2_500_dual_extruder_0", "1": "hellbot_magna_2_500_dual_extruder_1" - } - + }, + "platform_texture": "Magna2_500.png" }, - - "overrides": { + "overrides": + { + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 500 }, + "machine_end_gcode": { "default_value": "M104 T0 S0\nM104 T1 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_extruders_share_heater": { "default_value": true }, + "machine_extruders_share_nozzle": { "default_value": true }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 500 }, "machine_name": { "default_value": "Hellbot Magna 2 500 Dual" }, - "machine_width": { - "default_value": 500 - }, - "machine_height": { - "default_value": 500 - }, - "machine_depth": { - "default_value": 500 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_extruder_count": { - "default_value": 2 - }, - "machine_extruders_share_heater": { - "default_value": true - }, - "machine_extruders_share_nozzle": { - "default_value": true - }, - "machine_start_gcode": { - "default_value": "M104 T0 S{material_print_temperature}\nM104 T1 S{material_print_temperature}\nM109 T0 S{material_print_temperature}\nM109 T1 S{material_print_temperature}\nG21\nG90 \nG28 X0 Y0 \nG28 Z0 \nG1 Z15.0 F300 \nT0 \nG92 E0 \nG1 F700 E-80 \nT1 \nG92 E0 \nG1 F1000 X1 Y1 Z0.3 \nG1 F600 X200 E60 \nG1 F1000 Y3 \nG1 F600 X1 E120 \nT1 \nG92 E0 \nG28 X0 Y0 \nG1 F700 E-80 \nT0 \nG92 E0" - }, - "machine_end_gcode": { - "default_value": "M104 T0 S0\nM104 T1 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" - } + "machine_start_gcode": { "default_value": "M104 T0 S{material_print_temperature}\nM104 T1 S{material_print_temperature}\nM109 T0 S{material_print_temperature}\nM109 T1 S{material_print_temperature}\nG21\nG90 \nG28 X0 Y0 \nG28 Z0 \nG1 Z15.0 F300 \nT0 \nG92 E0 \nG1 F700 E-80 \nT1 \nG92 E0 \nG1 F1000 X1 Y1 Z0.3 \nG1 F600 X200 E60 \nG1 F1000 Y3 \nG1 F600 X1 E120 \nT1 \nG92 E0 \nG28 X0 Y0 \nG1 F700 E-80 \nT0 \nG92 E0" }, + "machine_width": { "default_value": 500 } } -} +} \ No newline at end of file diff --git a/resources/definitions/hellbot_magna_I.def.json b/resources/definitions/hellbot_magna_I.def.json index 019f214387..263a182ebc 100644 --- a/resources/definitions/hellbot_magna_I.def.json +++ b/resources/definitions/hellbot_magna_I.def.json @@ -2,32 +2,28 @@ "version": 2, "name": "Hellbot Magna 1", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Hellbot Development Team", "manufacturer": "Hellbot", "file_formats": "text/x-gcode", "platform": "hellbot_magna.obj", - "platform_texture": "hellbot.png", - "platform_offset": [0, -1, 0], "has_materials": true, - "machine_extruder_trains": { - "0": "hellbot_magna_i_extruder" - } + "machine_extruder_trains": { "0": "hellbot_magna_i_extruder" }, + "platform_offset": [ + 0, + -1, + 0 + ], + "platform_texture": "hellbot.png" }, - "overrides": { - "machine_name": { - "default_value": "Hellbot Magna 1" - }, + "overrides": + { + "machine_depth": { "default_value": 220 }, "machine_heated_bed": { "default_value": true }, - "machine_width": { - "default_value": 220 - }, - "machine_depth": { - "default_value": 220 - }, - "machine_height": { - "default_value": 260 - } + "machine_height": { "default_value": 260 }, + "machine_name": { "default_value": "Hellbot Magna 1" }, + "machine_width": { "default_value": 220 } } -} +} \ No newline at end of file diff --git a/resources/definitions/hellbot_magna_SE.def.json b/resources/definitions/hellbot_magna_SE.def.json index 7420eaee63..0c010151e6 100644 --- a/resources/definitions/hellbot_magna_SE.def.json +++ b/resources/definitions/hellbot_magna_SE.def.json @@ -1,41 +1,26 @@ -{ - "version": 2, - "name": "Hellbot Magna SE", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Hellbot Development Team", - "manufacturer": "Hellbot", - "file_formats": "text/x-gcode", - "platform": "hellbot_magna_SE.obj", - "platform_texture": "hellbot_magna_SE.png", - "has_materials": true, - "machine_extruder_trains": - { - "0": "hellbot_magna_SE_extruder" - } - - }, - - "overrides": { - "machine_name": { "default_value": "Hellbot Magna SE" }, - "machine_width": { - "default_value": 230 - }, - "machine_depth": { - "default_value": 230 - }, - "machine_height": { - "default_value": 250 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_extruder_count": { - "default_value": 1 - } - } -} +{ + "version": 2, + "name": "Hellbot Magna SE", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Hellbot Development Team", + "manufacturer": "Hellbot", + "file_formats": "text/x-gcode", + "platform": "hellbot_magna_SE.obj", + "has_materials": true, + "machine_extruder_trains": { "0": "hellbot_magna_SE_extruder" }, + "platform_texture": "hellbot_magna_SE.png" + }, + "overrides": + { + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 230 }, + "machine_extruder_count": { "default_value": 1 }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "Hellbot Magna SE" }, + "machine_width": { "default_value": 230 } + } +} \ No newline at end of file diff --git a/resources/definitions/hellbot_magna_dual.def.json b/resources/definitions/hellbot_magna_dual.def.json index 6448ed3a44..e41fcb7cce 100644 --- a/resources/definitions/hellbot_magna_dual.def.json +++ b/resources/definitions/hellbot_magna_dual.def.json @@ -2,38 +2,33 @@ "version": 2, "name": "Hellbot Magna Dual", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Hellbot Development Team", "manufacturer": "Hellbot", "file_formats": "text/x-gcode", "platform": "hellbot_magna.obj", - "platform_texture": "hellbot.png", - "platform_offset": [0, -1, 0], "has_materials": true, - "machine_extruder_trains": { + "machine_extruder_trains": + { "0": "hellbot_magna_dual_extruder_1", "1": "hellbot_magna_dual_extruder_2" - } + }, + "platform_offset": [ + 0, + -1, + 0 + ], + "platform_texture": "hellbot.png" }, - "overrides": { - "machine_name": { - "default_value": "Hellbot Magna DUAL" - }, - "machine_width": { - "default_value": 220 - }, - "machine_depth": { - "default_value": 220 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_height": { - "default_value": 260 - }, - "machine_extruder_count": { - "default_value": 2 - } + "overrides": + { + "machine_depth": { "default_value": 220 }, + "machine_extruder_count": { "default_value": 2 }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 260 }, + "machine_name": { "default_value": "Hellbot Magna DUAL" }, + "machine_width": { "default_value": 220 } } -} +} \ No newline at end of file diff --git a/resources/definitions/helloBEEprusa.def.json b/resources/definitions/helloBEEprusa.def.json index ad1c9fd699..cbce8cdb62 100644 --- a/resources/definitions/helloBEEprusa.def.json +++ b/resources/definitions/helloBEEprusa.def.json @@ -2,40 +2,45 @@ "version": 2, "name": "Hello Bee Prusa", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Beeverycreative", "manufacturer": "Beeverycreative", - "platform": "BEEVERYCREATIVE-helloBEEprusa.3mf", - "platform_offset": [-226, -75, -196], "file_formats": "text/x-gcode", + "platform": "BEEVERYCREATIVE-helloBEEprusa.3mf", "machine_extruder_trains": { "0": "hBp_extruder_left", "1": "hBp_extruder_right" - } + }, + "platform_offset": [ + -226, + -75, + -196 + ] }, - - "overrides": { - "machine_extruder_count": { "default_value": 2 }, - "machine_name": { "default_value": "hello BEE prusa" }, - "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM107 ;set fan speed to zero (turned off)\nG28 X0 Y0 ;move to the X/Y origin (Home)\nG28 Z0 ;move to the Z origin (Home)\nG92 E0 ;zero the extruded length\nG1 F3600 ;set feedrate to 60 mm/sec\nM420 S1 \n; -- end of START GCODE --" }, - "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0 ;set extruder temperature to zero (turned off)\nM140 S0 ;set bed temperature to zero (turned off)\nG28 X0 Y0 ;move to the X/Y origin (Home)\nM84 ;turn off steppers\n; -- end of END GCODE --" }, - "machine_width": { "default_value": 185 }, - "machine_depth": { "default_value": 200 }, - "machine_height": { "default_value": 190 }, - "machine_heated_bed": { "default_value": true }, - "machine_center_is_zero": { "default_value": false }, + "overrides": + { + "infill_sparse_density": { "default_value": 20 }, "layer_height": { "default_value": 0.2 }, "layer_height_0": { "default_value": 0.2 }, - "wall_thickness": { "value": "1.2" }, - "top_bottom_thickness": { "default_value": 1.2 }, - "infill_sparse_density": { "default_value": 20 }, - "speed_print": { "default_value": 60 }, - "skirt_line_count": { "default_value": 4 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0 ;set extruder temperature to zero (turned off)\nM140 S0 ;set bed temperature to zero (turned off)\nG28 X0 Y0 ;move to the X/Y origin (Home)\nM84 ;turn off steppers\n; -- end of END GCODE --" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 190 }, + "machine_name": { "default_value": "hello BEE prusa" }, + "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM107 ;set fan speed to zero (turned off)\nG28 X0 Y0 ;move to the X/Y origin (Home)\nG28 Z0 ;move to the Z origin (Home)\nG92 E0 ;zero the extruded length\nG1 F3600 ;set feedrate to 60 mm/sec\nM420 S1 \n; -- end of START GCODE --" }, + "machine_width": { "default_value": 185 }, + "retraction_amount": { "default_value": 1.5 }, + "retraction_speed": { "default_value": 15.0 }, "skirt_brim_minimal_length": { "default_value": 30 }, "skirt_gap": { "default_value": 6 }, - "retraction_speed": { "default_value": 15.0}, - "retraction_amount": { "default_value": 1.5} + "skirt_line_count": { "default_value": 4 }, + "speed_print": { "default_value": 60 }, + "top_bottom_thickness": { "default_value": 1.2 }, + "wall_thickness": { "value": "1.2" } } } \ No newline at end of file diff --git a/resources/definitions/hms434.def.json b/resources/definitions/hms434.def.json index 9f9183c99e..633ad2007e 100644 --- a/resources/definitions/hms434.def.json +++ b/resources/definitions/hms434.def.json @@ -1,42 +1,93 @@ { - "name": "HMS434", "version": 2, + "name": "HMS434", "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Scheepers", + "metadata": + { + "visible": true, + "author": "Scheepers", "manufacturer": "Hybrid AM Systems", "file_formats": "text/x-gcode", - - "has_materials": true, + "platform": "hms_platform.obj", "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", "dsm_novamid1070_175", - "emotiontech_abs", "emotiontech_asax", "emotiontech_hips", "emotiontech_petg", "emotiontech_pla", "emotiontech_pva-m", "emotiontech_pva-oks", "emotiontech_pva-s", "emotiontech_tpu98a", "emotiontech_absx", "emotiontech_bvoh", - "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", - "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_cpe_175", "generic_hips_175", "generic_nylon_175", "generic_pc_175", "generic_petg_175", "generic_pva_175", "generic_tpu_175", - "imade3d_petg_175", "imade3d_pla_175", - "innofill_innoflex60_175", - "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", - "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", - "tizyx_abs", "tizyx_flex", "tizyx_petg", "tizyx_pla", "tizyx_pla_bois", "tizyx_pva", - "zyyx_pro_flex", "zyyx_pro_pla" - ], - - "has_variants": true, - "variants_name": "Tool", - "preferred_variant_name": "0.4mm TP extruder", - - "has_machine_quality": true, - "preferred_quality_type": "high", - + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "emotiontech_abs", + "emotiontech_asax", + "emotiontech_hips", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pva-m", + "emotiontech_pva-oks", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "emotiontech_absx", + "emotiontech_bvoh", + "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", + "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_cpe_175", + "generic_hips_175", + "generic_nylon_175", + "generic_pc_175", + "generic_petg_175", + "generic_pva_175", + "generic_tpu_175", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "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", + "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", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla", + "tizyx_pla_bois", + "tizyx_pva", + "zyyx_pro_flex", + "zyyx_pro_pla" + ], + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, "machine_extruder_trains": { "0": "hms434_tool_1", @@ -48,150 +99,148 @@ "6": "hms434_tool_7", "7": "hms434_tool_8" }, - "platform": "hms_platform.obj", - "platform_offset": [ 26, -13.2, 162.5], - "platform_texture": "hms434.png", - "first_start_actions": ["MachineSettingsAction"], - "supported_actions": ["MachineSettingsAction"] + "platform_offset": [ + 26, + -13.2, + 162.5 + ], + "platform_texture": "hms434.png", + "preferred_quality_type": "high", + "preferred_variant_name": "0.4mm TP extruder", + "supported_actions": [ "MachineSettingsAction" ], + "variants_name": "Tool" }, - - "overrides": { - "machine_extruder_count": {"default_value": 2 }, - "material_diameter": {"default_value": 1.75 }, - "machine_heated_bed": {"default_value": true }, - "machine_heated_build_volume":{"default_value": true }, - "machine_center_is_zero": {"default_value": false }, - "gantry_height": {"value": "35" }, - "machine_height": {"default_value": 400 }, - "machine_depth": {"default_value": 325 }, - "machine_width": {"default_value": 450 }, - "machine_gcode_flavor": {"default_value": "RepRap (RepRap)" }, - "material_print_temp_wait": {"default_value": false }, - "material_bed_temp_wait": {"default_value": false }, - "machine_max_feedrate_z": {"default_value": 10 }, - "machine_acceleration": {"default_value": 180 }, - "machine_start_gcode": {"default_value": "\n;Neither Hybrid AM Systems nor any of Hybrid AM Systems representatives has any liabilities or gives any warranties on this .gcode file, or on any or all objects made with this .gcode file.\n\nM114\n\nM140 S{material_bed_temperature_layer_0}\nM118 // action:chamber_fan_on\nM141 S{build_volume_temperature}\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\n\nG1 Z10 F900\nG1 X-25 Y20 F12000\n\nM190 S{material_bed_temperature_layer_0}\n\nM117 HMS434 Printing ..." }, - "machine_end_gcode": {"default_value": "" }, - - "retraction_extra_prime_amount": {"minimum_value_warning": "-2.0" }, - "optimize_wall_printing_order": {"default_value": true }, - "machine_nozzle_heat_up_speed": {"default_value": 12}, - "machine_nozzle_cool_down_speed": {"default_value": 20}, - "machine_min_cool_heat_time_window": {"default_value": 5}, - - "layer_height": {"maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" }, - "layer_height_0": {"maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" }, - "initial_layer_line_width_factor": {"value": 110 }, - - "wall_thickness": {"value": "(line_width * 3) if infill_sparse_density < 95 else line_width" }, - "roofing_layer_count": {"value": "0" }, - "top_bottom_thickness": {"value": "(layer_height_0 + (layer_height * (top_layers - 1)))" }, - "top_layers": {"value": "4 if infill_sparse_density < 95 else 1" }, - "bottom_layers": {"value": "(top_layers)" }, - "wall_0_inset": {"value": "0" }, - "inset_direction": {"value": "'outside_in'" }, - "alternate_extra_perimeter": {"value": false }, - "fill_outline_gaps": {"value": true }, - "z_seam_type": {"value": "'shortest'"}, - "z_seam_x": {"value": "300"}, - "z_seam_y": {"value": "325"}, - "z_seam_corner": {"value": "'z_seam_corner_inner'"}, - "skin_outline_count": {"value": "0"}, - "ironing_line_spacing": {"value": "line_width / 4 * 3"}, - "ironing_flow": {"value": "0"}, - "ironing_inset": {"value": "ironing_line_spacing + (ironing_line_spacing - skin_line_width * (1.0 + ironing_flow / 100) / 2 if ironing_pattern == 'concentric' else skin_line_width * (1.0 - ironing_flow / 100) / 2)"}, - "speed_ironing": {"value": "150"}, - - "infill_sparse_density": {"value": 100}, - "infill_pattern": {"value": "'lines'"}, - "infill_before_walls": {"value": true}, - - "default_material_print_temperature": {"maximum_value": "401" }, - "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_final_print_temperature": {"value": "material_print_temperature", - "maximum_value": "401" }, - "material_break_preparation_temperature": {"maximum_value": "401" }, - "material_bed_temperature_layer_0": {"value": "material_bed_temperature"}, - "material_flow_layer_0": {"value": "material_flow"}, - "retraction_enable": {"value": true }, - "retract_at_layer_change": {"value": false }, - "retraction_min_travel": {"value": "(round(line_width * 10))"}, - "switch_extruder_retraction_speeds": {"value": "(retraction_speed)"}, - "switch_extruder_prime_speed": {"value": "(retraction_prime_speed)"}, - - "speed_print": {"value": "50"}, - "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_topbottom": {"value": "speed_layer_0"}, - "speed_travel": {"value": "250"}, - "speed_travel_layer_0": {"value": "speed_travel"}, - "speed_support_interface": {"value": "speed_topbottom"}, - "speed_z_hop": {"value": 10}, - "speed_slowdown_layers": {"value": 1}, - "acceleration_print": {"value": 1000}, - "acceleration_travel": {"value": 1000}, - "jerk_print": {"value": 10}, - "jerk_travel": {"value": 10}, - - "retraction_hop_enabled": {"value": false}, - "retraction_hop": {"value": 1}, - "retraction_combing": {"value": "'off'"}, - - "cool_fan_speed": {"value": 0}, - "cool_fan_enabled": {"value": true}, - "cool_min_layer_time_fan_speed_max": {"value": "cool_min_layer_time"}, - "cool_min_layer_time": {"value": 30}, - "cool_min_speed": {"value": "5"}, - "cool_lift_head": {"value": false}, - - "support_pattern": {"value": "'grid'"}, - "support_infill_rate": {"value": 30}, - "support_z_distance": {"value": 0}, - "support_xy_distance": {"value": 0.4}, - "support_join_distance": {"value": 10}, - "support_interface_pattern": {"value": "'lines'"}, - "support_roof_pattern": {"value": "'concentric'"}, - "support_interface_enable": {"value": true}, - "support_interface_height": {"value": "layer_height * 3"}, - "support_bottom_height": {"value": "layer_height"}, - - "adhesion_type": {"value": "'brim'"}, - "skirt_gap": {"value": 1}, - "skirt_brim_minimal_length": {"value": 50}, - - "prime_tower_size": {"value": 20.6 }, - "prime_tower_position_x": {"value": 125 }, - "prime_tower_position_y": {"value": 70 }, - "prime_blob_enable": {"default_value": false }, - - "meshfix_maximum_resolution": {"value": 0.01 }, - "meshfix_maximum_travel_resolution":{"value": 0.1 }, - "meshfix_maximum_deviation": {"value": 0.005 }, - - "minimum_polygon_circumference": {"value": 0.05 }, - "coasting_enable": {"value": false}, - "coasting_volume": {"value": 0.1}, - "coasting_min_volume": {"value": 0.17}, - "coasting_speed": {"value": 90}, - "wall_overhang_angle": {"value": 60}, - "bridge_settings_enabled": {"value": true}, - "bridge_wall_min_length": {"value": 3}, - "bridge_skin_support_threshold": {"value": 90}, - "bridge_wall_speed": {"value": 15}, - "bridge_wall_material_flow": {"value": 130}, - "bridge_skin_speed": {"value": 15}, - "bridge_skin_material_flow": {"value": 130}, - "bridge_fan_speed": {"value": 0}, - "bridge_skin_density_2": {"value": 100}, - "bridge_skin_density_3": {"value": 100}, - "bridge_skin_material_flow_2": {"value": 110}, - "bridge_skin_material_flow_3": {"value": 100}, - "bridge_skin_speed_2": {"value": 20}, - "bridge_skin_speed_3": {"value": 30} + "overrides": + { + "acceleration_print": { "value": 1000 }, + "acceleration_travel": { "value": 1000 }, + "adhesion_type": { "value": "'brim'" }, + "alternate_extra_perimeter": { "value": false }, + "bottom_layers": { "value": "(top_layers)" }, + "bridge_fan_speed": { "value": 0 }, + "bridge_settings_enabled": { "value": true }, + "bridge_skin_density_2": { "value": 100 }, + "bridge_skin_density_3": { "value": 100 }, + "bridge_skin_material_flow": { "value": 130 }, + "bridge_skin_material_flow_2": { "value": 110 }, + "bridge_skin_material_flow_3": { "value": 100 }, + "bridge_skin_speed": { "value": 15 }, + "bridge_skin_speed_2": { "value": 20 }, + "bridge_skin_speed_3": { "value": 30 }, + "bridge_skin_support_threshold": { "value": 90 }, + "bridge_wall_material_flow": { "value": 130 }, + "bridge_wall_min_length": { "value": 3 }, + "bridge_wall_speed": { "value": 15 }, + "coasting_enable": { "value": false }, + "coasting_min_volume": { "value": 0.17 }, + "coasting_speed": { "value": 90 }, + "coasting_volume": { "value": 0.1 }, + "cool_fan_enabled": { "value": true }, + "cool_fan_speed": { "value": 0 }, + "cool_lift_head": { "value": false }, + "cool_min_layer_time": { "value": 30 }, + "cool_min_layer_time_fan_speed_max": { "value": "cool_min_layer_time" }, + "cool_min_speed": { "value": "5" }, + "default_material_print_temperature": { "maximum_value": "401" }, + "fill_outline_gaps": { "value": true }, + "gantry_height": { "value": "35" }, + "infill_before_walls": { "value": true }, + "infill_pattern": { "value": "'lines'" }, + "infill_sparse_density": { "value": 100 }, + "initial_layer_line_width_factor": { "value": 110 }, + "inset_direction": { "value": "'outside_in'" }, + "ironing_flow": { "value": "0" }, + "ironing_inset": { "value": "ironing_line_spacing + (ironing_line_spacing - skin_line_width * (1.0 + ironing_flow / 100) / 2 if ironing_pattern == 'concentric' else skin_line_width * (1.0 - ironing_flow / 100) / 2)" }, + "ironing_line_spacing": { "value": "line_width / 4 * 3" }, + "jerk_print": { "value": 10 }, + "jerk_travel": { "value": 10 }, + "layer_height": { "maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" }, + "layer_height_0": { "maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" }, + "machine_acceleration": { "default_value": 180 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 325 }, + "machine_end_gcode": { "default_value": "" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "RepRap (RepRap)" }, + "machine_heated_bed": { "default_value": true }, + "machine_heated_build_volume": { "default_value": true }, + "machine_height": { "default_value": 400 }, + "machine_max_feedrate_z": { "default_value": 10 }, + "machine_min_cool_heat_time_window": { "default_value": 5 }, + "machine_nozzle_cool_down_speed": { "default_value": 20 }, + "machine_nozzle_heat_up_speed": { "default_value": 12 }, + "machine_start_gcode": { "default_value": "\n;Neither Hybrid AM Systems nor any of Hybrid AM Systems representatives has any liabilities or gives any warranties on this .gcode file, or on any or all objects made with this .gcode file.\n\nM114\n\nM140 S{material_bed_temperature_layer_0}\nM118 // action:chamber_fan_on\nM141 S{build_volume_temperature}\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\n\nG1 Z10 F900\nG1 X-25 Y20 F12000\n\nM190 S{material_bed_temperature_layer_0}\n\nM117 HMS434 Printing ..." }, + "machine_width": { "default_value": 450 }, + "material_bed_temp_wait": { "default_value": false }, + "material_bed_temperature_layer_0": { "value": "material_bed_temperature" }, + "material_break_preparation_temperature": { "maximum_value": "401" }, + "material_diameter": { "default_value": 1.75 }, + "material_final_print_temperature": + { + "maximum_value": "401", + "value": "material_print_temperature" + }, + "material_flow_layer_0": { "value": "material_flow" }, + "material_initial_print_temperature": + { + "maximum_value": "401", + "maximum_value_warning": "material_print_temperature + 15", + "value": "material_print_temperature" + }, + "material_print_temp_wait": { "default_value": false }, + "material_print_temperature": { "maximum_value": "401" }, + "material_print_temperature_layer_0": { "maximum_value": "401" }, + "meshfix_maximum_deviation": { "value": 0.005 }, + "meshfix_maximum_resolution": { "value": 0.01 }, + "meshfix_maximum_travel_resolution": { "value": 0.1 }, + "minimum_polygon_circumference": { "value": 0.05 }, + "optimize_wall_printing_order": { "default_value": true }, + "prime_blob_enable": { "default_value": false }, + "prime_tower_position_x": { "value": 125 }, + "prime_tower_position_y": { "value": 70 }, + "prime_tower_size": { "value": 20.6 }, + "retract_at_layer_change": { "value": false }, + "retraction_combing": { "value": "'off'" }, + "retraction_enable": { "value": true }, + "retraction_extra_prime_amount": { "minimum_value_warning": "-2.0" }, + "retraction_hop": { "value": 1 }, + "retraction_hop_enabled": { "value": false }, + "retraction_min_travel": { "value": "(round(line_width * 10))" }, + "roofing_layer_count": { "value": "0" }, + "skin_outline_count": { "value": "0" }, + "skirt_brim_minimal_length": { "value": 50 }, + "skirt_gap": { "value": 1 }, + "speed_ironing": { "value": "150" }, + "speed_layer_0": { "value": "(speed_print / 5 * 4) if speed_print > 45 else speed_print" }, + "speed_print": { "value": "50" }, + "speed_slowdown_layers": { "value": 1 }, + "speed_support_interface": { "value": "speed_topbottom" }, + "speed_topbottom": { "value": "speed_layer_0" }, + "speed_travel": { "value": "250" }, + "speed_travel_layer_0": { "value": "speed_travel" }, + "speed_wall": { "value": "(speed_print/ 5 * 3) if speed_print > 45 else speed_print" }, + "speed_wall_x": { "value": "speed_wall" }, + "speed_z_hop": { "value": 10 }, + "support_bottom_height": { "value": "layer_height" }, + "support_infill_rate": { "value": 30 }, + "support_interface_enable": { "value": true }, + "support_interface_height": { "value": "layer_height * 3" }, + "support_interface_pattern": { "value": "'lines'" }, + "support_join_distance": { "value": 10 }, + "support_pattern": { "value": "'grid'" }, + "support_roof_pattern": { "value": "'concentric'" }, + "support_xy_distance": { "value": 0.4 }, + "support_z_distance": { "value": 0 }, + "switch_extruder_prime_speed": { "value": "(retraction_prime_speed)" }, + "switch_extruder_retraction_speeds": { "value": "(retraction_speed)" }, + "top_bottom_thickness": { "value": "(layer_height_0 + (layer_height * (top_layers - 1)))" }, + "top_layers": { "value": "4 if infill_sparse_density < 95 else 1" }, + "wall_0_inset": { "value": "0" }, + "wall_overhang_angle": { "value": 60 }, + "wall_thickness": { "value": "(line_width * 3) if infill_sparse_density < 95 else line_width" }, + "z_seam_corner": { "value": "'z_seam_corner_inner'" }, + "z_seam_type": { "value": "'shortest'" }, + "z_seam_x": { "value": "300" }, + "z_seam_y": { "value": "325" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ideagen3D_sapphire_plus.def.json b/resources/definitions/ideagen3D_sapphire_plus.def.json index a8541401c2..f7af38ad93 100644 --- a/resources/definitions/ideagen3D_sapphire_plus.def.json +++ b/resources/definitions/ideagen3D_sapphire_plus.def.json @@ -9,26 +9,28 @@ "manufacturer": "Ideagen3D", "file_formats": "text/x-gcode", "platform": "ideagen3D_sapphire_plus.3mf", - "has_materials": true, "has_machine_quality": false, + "has_materials": true, "machine_extruder_trains": { "0": "ideagen3D_sapphire_plus_0" } }, "overrides": { - "machine_name": { "default_value": "ideagen3D Sapphire Plus" }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 300 }, + "gantry_height": { "value": 65 }, "machine_depth": { "default_value": 300 }, - "machine_height": { "default_value": 350 }, - "machine_head_with_fans_polygon": { "default_value": [ + "machine_end_gcode": { "default_value": ";End GCode by ideagen3D\n\nM104 S0 ;Set nozzle temperature to 0\nM140 S0 ;Set Bed temperature to 0\n\nG92 E1 ;Prepare to retract filament\nG1 E-1 F300 ;Retract filament\nG28 X0 Y0 ;Home X and Y\nM84 ;Disable Steppers" }, + "machine_head_with_fans_polygon": + { + "default_value": [ [-30, -20], [-30, 40], [30, -20], [30, 40] ] }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 350 }, + "machine_name": { "default_value": "ideagen3D Sapphire Plus" }, "machine_start_gcode": { "default_value": ";Start GCode by ideagen3D\n\nG1 Z15.0 F6000 ;Move the platform down 15mm\n\n;Initialize Temperature\nM140 S{material_bed_temperature_layer_0} ;heat bed and continue\nM104 S{material_print_temperature_layer_0} ;heat nozzle and continue\nM190 S{material_bed_temperature_layer_0} ;wait for bed temperature to reach initial layer temperature\nM109 S{material_print_temperature_layer_0} ;wait for hot end temperature to reach initial layer temperature\n\nG28 M420 S1 ; Home & Enable Bed Levelling\n\n;Prime the extruder\nG92 E0\nG1 X1 Y280 Z0.2 ;Prepare to Purge\nG1 Y20 Z0.2 F1500.0 E15 ;Purge line\nG92 E0" }, - "machine_end_gcode": { "default_value": ";End GCode by ideagen3D\n\nM104 S0 ;Set nozzle temperature to 0\nM140 S0 ;Set Bed temperature to 0\n\nG92 E1 ;Prepare to retract filament\nG1 E-1 F300 ;Retract filament\nG28 X0 Y0 ;Home X and Y\nM84 ;Disable Steppers" }, - "gantry_height": { "value": 65 } + "machine_width": { "default_value": 300 } } -} +} \ No newline at end of file diff --git a/resources/definitions/imade3d_jellybox.def.json b/resources/definitions/imade3d_jellybox.def.json index 134ccc720c..0e9a4548cd 100644 --- a/resources/definitions/imade3d_jellybox.def.json +++ b/resources/definitions/imade3d_jellybox.def.json @@ -2,36 +2,40 @@ "version": 2, "name": "Imade3D JellyBOX Original", "inherits": "imade3d_jellybox_root", - "metadata": { + "metadata": + { "visible": true, "author": "Imade3D", "platform": "imade3d_jellybox_platform.3mf", - "platform_offset": [ 0, -0.3, 0], - "preferred_variant_name": "0.4 mm", - "preferred_quality_type": "fast", + "has_machine_quality": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true, - "machine_extruder_trains": { - "0": "imade3d_jellybox_extruder_0" - } - }, - - "overrides": { - "machine_head_with_fans_polygon": { "default_value": [[ 0, 0 ],[ 0, 0 ],[ 0, 0 ],[ 0, 0 ]]}, - "machine_name": { "default_value": "IMADE3D JellyBOX Original" }, - "machine_width": { "default_value": 170 }, - "machine_height": { "default_value": 145 }, + "machine_extruder_trains": { "0": "imade3d_jellybox_extruder_0" }, + "platform_offset": [ + 0, + -0.3, + 0 + ], + "preferred_quality_type": "fast", + "preferred_variant_name": "0.4 mm" + }, + "overrides": + { "machine_depth": { "default_value": 160 }, - "machine_start_gcode": { - "default_value": ";---------------------------------------\n; ; ; Jellybox Start Script Begin ; ; ;\n;_______________________________________\n; for slicer: CURA 3\n; start gcode last modified Jun 1, 2019\n\n; Print Settings Summary\n; (leave these alone: this is only a list of the slicing settings)\n; (overwriting these values will NOT change your printer's behavior)\n; sliced for : {machine_name}\n; jobname : {jobname}\n; gcode generated : {day}, {date}, {time}\n; est. print time : {print_time}\n; nozzle diameter : {machine_nozzle_size}\n; filament diameter : {material_diameter}\n; layer height : {layer_height}\n; 1st layer height : {layer_height_0}\n; line width : {line_width} \n; outer wall wipe dist. : {wall_0_wipe_dist}\n; infill line width : {infill_line_width}\n; wall thickness : {wall_thickness}\n; top thickness : {top_thickness}\n; bottom thickness : {bottom_thickness}\n; infill density : {infill_sparse_density}\n; infill pattern : {infill_pattern}\n; print temperature : {material_print_temperature}\n; 1st layer print temp. : {material_print_temperature_layer_0}\n; heated bed temperature : {material_bed_temperature}\n; 1st layer bed temp. : {material_bed_temperature_layer_0}\n; regular fan speed : {cool_fan_speed_min}\n; max fan speed : {cool_fan_speed_max}\n; retraction amount : {retraction_amount}\n; retr. retract speed : {retraction_retract_speed}\n; retr. prime speed : {retraction_prime_speed}\n; build plate adhesion : {adhesion_type}\n; support ? {support_enable}\n; spiralized ? {magic_spiralize}\n\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nM117 Preparing ;write Preparing\nM190 S{material_bed_temperature_layer_0} ;wait for the bed to reach desired temperature\nM109 S180 ;wait for the extruder to reach 180C\nG28 ;home all axes\nM203 Z4 ;slow Z speed down for greater accuracy when probing\nG29 O ;run auto bed leveling procedure IF leveling not active already\n; M500 ;optionally save the mesh\nM203 Z7 ;pick up z speed again for printing\nG28 X ;home x to get as far from the plate as possible\nM420 S1 ;(re) enable bed leveling if turned off by the G28\nG0 Y0 F5000 ;position Y in front\nG0 Z15 F3000 ;position Z\nM109 S{material_print_temperature_layer_0} ;wait for the extruder to reach desired temperature\nM300 S440 P300 ;play a tone\n; M0 Ready! Click to start ; optionally, stop and wait for user to continue\nM420 S1 ;(re) enable bed leveling to make iron-sure\nM117 Print starting ;write Print starting\n;================ ;PRINT:LINE start\nG90 ;absolute positioning\nG92 E0 ;reset the extruder position\nM420 S1 ;(re) enable bed leveling to make iron-sure\nG0 Z0 ;get Z down\nM83 ;relative extrusion mode\nM420 S1 ;(re) enable bed leveling to make iron-sure\nG1 E20 F300 ;extrude __mm of feed stock\nG1 E18 F250 ;extrude __mm of feed stock\nG1 E10 F250 ;extrude __mm of feed stock\nG4 S2 ;pause for ooze\nM400 ;make sure all is finished\nM420 S1 ;(re) enable bed leveling to make iron-sure\nG0 F500 X3 Y0 Z0.3;get to the start of the LINE\nG1 E2 F300 ;extrude __mm of feed stock\nG1 F1000 X152 E7 ;print a thick LINE extruding __mm along the way\nG92 E0 ;reset the extruder position\n;---------------------------------------------\n; ; ; Jellybox Printer Start Script End ; ; ;\n;_____________________________________________\n" + "machine_end_gcode": { "default_value": "\n;---------------------------------\n;;; Jellybox End Script Begin ;;;\n;_________________________________\n; end gcode last modified Nov 30, 2018\nM117 Finishing Up ;write Finishing Up\n\nM107 ;turn the fan off\nM104 S0 ;extruder heater off\nM140 S0 ;bed heater off (if you have it)\nG91 ;relative positioning (includes extruder)\nG1 E-1 F2500 ;retract the filament a bit before lifting the nozzle to release some of the pressure\nG1 Z0.5 E-4 X-10 F9000 ;get out and retract filament even more\nG1 E-25 F2500 ;retract even more\nG90 ;absolute positioning (includes extruder)\nG28 X ;home X so the head is out of the way\nG1 Y140 ;move Y forward, so the print is more accessible\nM84 ;steppers off\n\nM117 Print finished ;write Print finished\n;---------------------------------------\n;;; Jellybox End Script End ;;;\n;_______________________________________" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [0, 0], + [0, 0], + [0, 0], + [0, 0] + ] }, - "machine_end_gcode": { - "default_value": "\n;---------------------------------\n;;; Jellybox End Script Begin ;;;\n;_________________________________\n; end gcode last modified Nov 30, 2018\nM117 Finishing Up ;write Finishing Up\n\nM107 ;turn the fan off\nM104 S0 ;extruder heater off\nM140 S0 ;bed heater off (if you have it)\nG91 ;relative positioning (includes extruder)\nG1 E-1 F2500 ;retract the filament a bit before lifting the nozzle to release some of the pressure\nG1 Z0.5 E-4 X-10 F9000 ;get out and retract filament even more\nG1 E-25 F2500 ;retract even more\nG90 ;absolute positioning (includes extruder)\nG28 X ;home X so the head is out of the way\nG1 Y140 ;move Y forward, so the print is more accessible\nM84 ;steppers off\n\nM117 Print finished ;write Print finished\n;---------------------------------------\n;;; Jellybox End Script End ;;;\n;_______________________________________" - }, - - "retraction_prime_speed": { - "value": "max(retraction_speed - 30, 5)" - } + "machine_height": { "default_value": 145 }, + "machine_name": { "default_value": "IMADE3D JellyBOX Original" }, + "machine_start_gcode": { "default_value": ";---------------------------------------\n; ; ; Jellybox Start Script Begin ; ; ;\n;_______________________________________\n; for slicer: CURA 3\n; start gcode last modified Jun 1, 2019\n\n; Print Settings Summary\n; (leave these alone: this is only a list of the slicing settings)\n; (overwriting these values will NOT change your printer's behavior)\n; sliced for : {machine_name}\n; jobname : {jobname}\n; gcode generated : {day}, {date}, {time}\n; est. print time : {print_time}\n; nozzle diameter : {machine_nozzle_size}\n; filament diameter : {material_diameter}\n; layer height : {layer_height}\n; 1st layer height : {layer_height_0}\n; line width : {line_width} \n; outer wall wipe dist. : {wall_0_wipe_dist}\n; infill line width : {infill_line_width}\n; wall thickness : {wall_thickness}\n; top thickness : {top_thickness}\n; bottom thickness : {bottom_thickness}\n; infill density : {infill_sparse_density}\n; infill pattern : {infill_pattern}\n; print temperature : {material_print_temperature}\n; 1st layer print temp. : {material_print_temperature_layer_0}\n; heated bed temperature : {material_bed_temperature}\n; 1st layer bed temp. : {material_bed_temperature_layer_0}\n; regular fan speed : {cool_fan_speed_min}\n; max fan speed : {cool_fan_speed_max}\n; retraction amount : {retraction_amount}\n; retr. retract speed : {retraction_retract_speed}\n; retr. prime speed : {retraction_prime_speed}\n; build plate adhesion : {adhesion_type}\n; support ? {support_enable}\n; spiralized ? {magic_spiralize}\n\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nM117 Preparing ;write Preparing\nM190 S{material_bed_temperature_layer_0} ;wait for the bed to reach desired temperature\nM109 S180 ;wait for the extruder to reach 180C\nG28 ;home all axes\nM203 Z4 ;slow Z speed down for greater accuracy when probing\nG29 O ;run auto bed leveling procedure IF leveling not active already\n; M500 ;optionally save the mesh\nM203 Z7 ;pick up z speed again for printing\nG28 X ;home x to get as far from the plate as possible\nM420 S1 ;(re) enable bed leveling if turned off by the G28\nG0 Y0 F5000 ;position Y in front\nG0 Z15 F3000 ;position Z\nM109 S{material_print_temperature_layer_0} ;wait for the extruder to reach desired temperature\nM300 S440 P300 ;play a tone\n; M0 Ready! Click to start ; optionally, stop and wait for user to continue\nM420 S1 ;(re) enable bed leveling to make iron-sure\nM117 Print starting ;write Print starting\n;================ ;PRINT:LINE start\nG90 ;absolute positioning\nG92 E0 ;reset the extruder position\nM420 S1 ;(re) enable bed leveling to make iron-sure\nG0 Z0 ;get Z down\nM83 ;relative extrusion mode\nM420 S1 ;(re) enable bed leveling to make iron-sure\nG1 E20 F300 ;extrude __mm of feed stock\nG1 E18 F250 ;extrude __mm of feed stock\nG1 E10 F250 ;extrude __mm of feed stock\nG4 S2 ;pause for ooze\nM400 ;make sure all is finished\nM420 S1 ;(re) enable bed leveling to make iron-sure\nG0 F500 X3 Y0 Z0.3;get to the start of the LINE\nG1 E2 F300 ;extrude __mm of feed stock\nG1 F1000 X152 E7 ;print a thick LINE extruding __mm along the way\nG92 E0 ;reset the extruder position\n;---------------------------------------------\n; ; ; Jellybox Printer Start Script End ; ; ;\n;_____________________________________________\n" }, + "machine_width": { "default_value": 170 }, + "retraction_prime_speed": { "value": "max(retraction_speed - 30, 5)" } } -} +} \ No newline at end of file diff --git a/resources/definitions/imade3d_jellybox_2.def.json b/resources/definitions/imade3d_jellybox_2.def.json index 1774da0b1c..e6945ad159 100644 --- a/resources/definitions/imade3d_jellybox_2.def.json +++ b/resources/definitions/imade3d_jellybox_2.def.json @@ -2,39 +2,43 @@ "version": 2, "name": "Imade3D JellyBOX 2", "inherits": "imade3d_jellybox_root", - "metadata": { + "metadata": + { "visible": true, "author": "Imade3D", "platform": "imade3d_jellybox_2_platform.3mf", - "platform_offset": [ 0, -10, 0], - "preferred_variant_name": "0.4 mm", - "preferred_quality_type": "fast", + "has_machine_quality": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true, - "machine_extruder_trains": { - "0": "imade3d_jellybox_2_extruder_0" - } - }, - - "overrides": { - "gradual_infill_steps":{"default_value": 0}, - "gradual_infill_step_height": {"default_value": 3}, - "machine_head_with_fans_polygon": { "default_value": [[ 0, 0 ],[ 0, 0 ],[ 0, 0 ],[ 0, 0 ]]}, - "machine_name": { "default_value": "IMADE3D JellyBOX 2" }, - "machine_width": { "default_value": 180 }, - "machine_height": { "default_value": 145 }, + "machine_extruder_trains": { "0": "imade3d_jellybox_2_extruder_0" }, + "platform_offset": [ + 0, + -10, + 0 + ], + "preferred_quality_type": "fast", + "preferred_variant_name": "0.4 mm" + }, + "overrides": + { + "gradual_infill_step_height": { "default_value": 3 }, + "gradual_infill_steps": { "default_value": 0 }, "machine_depth": { "default_value": 165 }, + "machine_end_gcode": { "default_value": "\n;---------------------------------\n;;; Jellybox End Script Begin ;;;\n;_________________________________\n; end gcode last modified Nov 30, 2018\nM117 Finishing Up ;write Finishing Up\n\nM107 ;turn the fan off\nM104 S0 ;extruder heater off\nM140 S0 ;bed heater off (if you have it)\nG91 ;relative positioning (includes extruder)\nG1 E-1 F2500 ;retract the filament a bit before lifting the nozzle to release some of the pressure\nG1 Z0.5 E-4 X-10 F9000 ;get out and retract filament even more\nG1 E-25 F2500 ;retract even more\nG90 ;absolute positioning (includes extruder)\nG28 X ;home X so the head is out of the way\nG1 Y140 ;move Y forward, so the print is more accessible\nM84 ;steppers off\n\nM117 Print finished ;write Print finished\n;---------------------------------------\n;;; Jellybox End Script End ;;;\n;_______________________________________" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [0, 0], + [0, 0], + [0, 0], + [0, 0] + ] + }, + "machine_height": { "default_value": 145 }, + "machine_name": { "default_value": "IMADE3D JellyBOX 2" }, "machine_nozzle_size": { "default_value": 0.4 }, - "machine_start_gcode": { - "default_value": ";---------------------------------------\n; ; ; Jellybox Start Script Begin ; ; ;\n;_______________________________________\n; for slicer: CURA 3\n; start gcode last modified Jun 1, 2019\n\n; Print Settings Summary\n; (leave these alone: this is only a list of the slicing settings)\n; (overwriting these values will NOT change your printer's behavior)\n; sliced for : {machine_name}\n; jobname : {jobname}\n; gcode generated : {day}, {date}, {time}\n; est. print time : {print_time}\n; nozzle diameter : {machine_nozzle_size}\n; filament diameter : {material_diameter}\n; layer height : {layer_height}\n; 1st layer height : {layer_height_0}\n; line width : {line_width} \n; outer wall wipe dist. : {wall_0_wipe_dist}\n; infill line width : {infill_line_width}\n; wall thickness : {wall_thickness}\n; top thickness : {top_thickness}\n; bottom thickness : {bottom_thickness}\n; infill density : {infill_sparse_density}\n; infill pattern : {infill_pattern}\n; print temperature : {material_print_temperature}\n; 1st layer print temp. : {material_print_temperature_layer_0}\n; heated bed temperature : {material_bed_temperature}\n; 1st layer bed temp. : {material_bed_temperature_layer_0}\n; regular fan speed : {cool_fan_speed_min}\n; max fan speed : {cool_fan_speed_max}\n; retraction amount : {retraction_amount}\n; retr. retract speed : {retraction_retract_speed}\n; retr. prime speed : {retraction_prime_speed}\n; build plate adhesion : {adhesion_type}\n; support ? {support_enable}\n; spiralized ? {magic_spiralize}\n\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nM117 Preparing ;write Preparing\nM190 S{material_bed_temperature_layer_0} ;wait for the bed to reach desired temperature\nM109 S180 ;wait for the extruder to reach 180C\nG28 ;home all axes\nM203 Z4 ;slow Z speed down for greater accuracy when probing\nG29 O ;run auto bed leveling procedure IF leveling not active already\n; M500 ;optionally save the mesh\nM203 Z7 ;pick up z speed again for printing\nG28 X ;home x to get as far from the plate as possible\nM420 S1 ;(re) enable bed leveling if turned off by the G28\nG0 Y0 F5000 ;position Y in front\nG0 Z15 F3000 ;position Z\nM109 S{material_print_temperature_layer_0} ;wait for the extruder to reach desired temperature\nM300 S440 P300 ;play a tone\n; M0 Ready! Click to start ; optionally, stop and wait for user to continue\nM420 S1 ;(re) enable bed leveling to make iron-sure\nM117 Print starting ;write Print starting\n;================ ;PRINT:LINE start\nG90 ;absolute positioning\nG92 E0 ;reset the extruder position\nM420 S1 ;(re) enable bed leveling to make iron-sure\nG0 Z0 ;get Z down\nM83 ;relative extrusion mode\nM420 S1 ;(re) enable bed leveling to make iron-sure\nG1 E20 F300 ;extrude __mm of feed stock\nG1 E18 F250 ;extrude __mm of feed stock\nG1 E10 F250 ;extrude __mm of feed stock\nG4 S2 ;pause for ooze\nM400 ;make sure all is finished\nM420 S1 ;(re) enable bed leveling to make iron-sure\nG0 F500 X3 Y0 Z0.3;get to the start of the LINE\nG1 E2 F300 ;extrude __mm of feed stock\nG1 F1000 X152 E7 ;print a thick LINE extruding __mm along the way\nG92 E0 ;reset the extruder position\n;---------------------------------------------\n; ; ; Jellybox Printer Start Script End ; ; ;\n;_____________________________________________\n" - }, - "machine_end_gcode": { - "default_value": "\n;---------------------------------\n;;; Jellybox End Script Begin ;;;\n;_________________________________\n; end gcode last modified Nov 30, 2018\nM117 Finishing Up ;write Finishing Up\n\nM107 ;turn the fan off\nM104 S0 ;extruder heater off\nM140 S0 ;bed heater off (if you have it)\nG91 ;relative positioning (includes extruder)\nG1 E-1 F2500 ;retract the filament a bit before lifting the nozzle to release some of the pressure\nG1 Z0.5 E-4 X-10 F9000 ;get out and retract filament even more\nG1 E-25 F2500 ;retract even more\nG90 ;absolute positioning (includes extruder)\nG28 X ;home X so the head is out of the way\nG1 Y140 ;move Y forward, so the print is more accessible\nM84 ;steppers off\n\nM117 Print finished ;write Print finished\n;---------------------------------------\n;;; Jellybox End Script End ;;;\n;_______________________________________" - }, - - "retraction_prime_speed": { - "value": "max(retraction_speed - 30, 5)" - } + "machine_start_gcode": { "default_value": ";---------------------------------------\n; ; ; Jellybox Start Script Begin ; ; ;\n;_______________________________________\n; for slicer: CURA 3\n; start gcode last modified Jun 1, 2019\n\n; Print Settings Summary\n; (leave these alone: this is only a list of the slicing settings)\n; (overwriting these values will NOT change your printer's behavior)\n; sliced for : {machine_name}\n; jobname : {jobname}\n; gcode generated : {day}, {date}, {time}\n; est. print time : {print_time}\n; nozzle diameter : {machine_nozzle_size}\n; filament diameter : {material_diameter}\n; layer height : {layer_height}\n; 1st layer height : {layer_height_0}\n; line width : {line_width} \n; outer wall wipe dist. : {wall_0_wipe_dist}\n; infill line width : {infill_line_width}\n; wall thickness : {wall_thickness}\n; top thickness : {top_thickness}\n; bottom thickness : {bottom_thickness}\n; infill density : {infill_sparse_density}\n; infill pattern : {infill_pattern}\n; print temperature : {material_print_temperature}\n; 1st layer print temp. : {material_print_temperature_layer_0}\n; heated bed temperature : {material_bed_temperature}\n; 1st layer bed temp. : {material_bed_temperature_layer_0}\n; regular fan speed : {cool_fan_speed_min}\n; max fan speed : {cool_fan_speed_max}\n; retraction amount : {retraction_amount}\n; retr. retract speed : {retraction_retract_speed}\n; retr. prime speed : {retraction_prime_speed}\n; build plate adhesion : {adhesion_type}\n; support ? {support_enable}\n; spiralized ? {magic_spiralize}\n\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nM117 Preparing ;write Preparing\nM190 S{material_bed_temperature_layer_0} ;wait for the bed to reach desired temperature\nM109 S180 ;wait for the extruder to reach 180C\nG28 ;home all axes\nM203 Z4 ;slow Z speed down for greater accuracy when probing\nG29 O ;run auto bed leveling procedure IF leveling not active already\n; M500 ;optionally save the mesh\nM203 Z7 ;pick up z speed again for printing\nG28 X ;home x to get as far from the plate as possible\nM420 S1 ;(re) enable bed leveling if turned off by the G28\nG0 Y0 F5000 ;position Y in front\nG0 Z15 F3000 ;position Z\nM109 S{material_print_temperature_layer_0} ;wait for the extruder to reach desired temperature\nM300 S440 P300 ;play a tone\n; M0 Ready! Click to start ; optionally, stop and wait for user to continue\nM420 S1 ;(re) enable bed leveling to make iron-sure\nM117 Print starting ;write Print starting\n;================ ;PRINT:LINE start\nG90 ;absolute positioning\nG92 E0 ;reset the extruder position\nM420 S1 ;(re) enable bed leveling to make iron-sure\nG0 Z0 ;get Z down\nM83 ;relative extrusion mode\nM420 S1 ;(re) enable bed leveling to make iron-sure\nG1 E20 F300 ;extrude __mm of feed stock\nG1 E18 F250 ;extrude __mm of feed stock\nG1 E10 F250 ;extrude __mm of feed stock\nG4 S2 ;pause for ooze\nM400 ;make sure all is finished\nM420 S1 ;(re) enable bed leveling to make iron-sure\nG0 F500 X3 Y0 Z0.3;get to the start of the LINE\nG1 E2 F300 ;extrude __mm of feed stock\nG1 F1000 X152 E7 ;print a thick LINE extruding __mm along the way\nG92 E0 ;reset the extruder position\n;---------------------------------------------\n; ; ; Jellybox Printer Start Script End ; ; ;\n;_____________________________________________\n" }, + "machine_width": { "default_value": 180 }, + "retraction_prime_speed": { "value": "max(retraction_speed - 30, 5)" } } -} +} \ No newline at end of file diff --git a/resources/definitions/imade3d_jellybox_root.def.json b/resources/definitions/imade3d_jellybox_root.def.json index 6d5025d56a..83db4c29a2 100644 --- a/resources/definitions/imade3d_jellybox_root.def.json +++ b/resources/definitions/imade3d_jellybox_root.def.json @@ -2,92 +2,80 @@ "version": 2, "name": "imade3d_jellybox_root", "inherits": "fdmprinter", - "metadata": { + "metadata": + { + "visible": false, "author": "Imade3D", "manufacturer": "Imade3D", - "visible": false, "file_formats": "text/x-gcode", "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "filo3d_pla", - "generic_abs_175", - "generic_abs", - "generic_bam", - "generic_cpe_175", - "generic_cpe_plus", - "generic_cpe", - "generic_hips_175", - "generic_hips", - "generic_nylon_175", - "generic_nylon", - "generic_pc_175", - "generic_pc", - "generic_petg", - "generic_petg_175", - "generic_pla", - "generic_pla_175", - "generic_pp", - "generic_pva_175", - "generic_pva", - "generic_tough_pla", - "generic_tpu", - "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", - "tizyx_abs", - "tizyx_pla_bois", - "tizyx_pla", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla" + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fiberlogy_hd_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "filo3d_pla", + "generic_abs_175", + "generic_abs", + "generic_bam", + "generic_cpe_175", + "generic_cpe_plus", + "generic_cpe", + "generic_hips_175", + "generic_hips", + "generic_nylon_175", + "generic_nylon", + "generic_pc_175", + "generic_pc", + "generic_petg", + "generic_petg_175", + "generic_pla", + "generic_pla_175", + "generic_pp", + "generic_pva_175", + "generic_pva", + "generic_tough_pla", + "generic_tpu", + "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", + "tizyx_abs", + "tizyx_pla_bois", + "tizyx_pla", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "zyyx_pro_flex", + "zyyx_pro_pla" ] }, - "overrides": { - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "material_diameter": { - "default_value": 1.75 - }, - "material_print_temperature": { - "minimum_value": "0" - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_heated_bed": { - "default_value": true - }, - "material_bed_temperature": { - "minimum_value": "0" - }, - "material_standby_temperature": { - "minimum_value": "0" - }, + "overrides": + { + "machine_center_is_zero": { "default_value": false }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "material_bed_temperature": { "minimum_value": "0" }, + "material_diameter": { "default_value": 1.75 }, + "material_print_temperature": { "minimum_value": "0" }, + "material_standby_temperature": { "minimum_value": "0" }, "relative_extrusion": { - "value": true, - "enabled": true + "enabled": true, + "value": true } } -} +} \ No newline at end of file diff --git a/resources/definitions/inat_base.def.json b/resources/definitions/inat_base.def.json index 42a71ee149..1bf4ce3917 100644 --- a/resources/definitions/inat_base.def.json +++ b/resources/definitions/inat_base.def.json @@ -1,458 +1,327 @@ { - "name": "Inat Base description", "version": 2, + "name": "Inat Base description", "inherits": "fdmprinter", - "metadata": { + "metadata": + { + "visible": false, "author": "Inat s.r.o.", "manufacturer": "Inat s.r.o.", "file_formats": "text/x-gcode", - "visible": false, + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, "has_materials": true, "has_variants": false, - "variants_name": "Extruder:", - "preferred_variant_name": "0.4mm", - "has_machine_quality": true, + "machine_extruder_trains": { "0": "inat_extruder_0" }, "preferred_material": "generic_pla", "preferred_quality_type": "standard", - "machine_extruder_trains": { - "0": "inat_extruder_0" - }, - "first_start_actions": [ - "MachineSettingsAction" - ] + "preferred_variant_name": "0.4mm", + "variants_name": "Extruder:" }, - "overrides": { - "machine_start_gcode": { - "default_value": "G28 ;Home\nG0 X-2 Y150 F6000 ;Move to the side\nG0 Z0.3 F200 ;Move nozzle down\nM192 ; Wait for probe temperature to settle\nG28 Z\nG29\nG0 X0 Y0 Z30 F6000\nM84 E\nM0\nG1 Z15.0 F6000 ;Move the platform down 15mm\n" + "overrides": + { + "acceleration_infill": + { + "maximum_value_warning": "1500", + "minimum_value_warning": "100" }, - "machine_end_gcode": { - "default_value": "M400\nM104 S0\nM140 S0\nM107\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 R5 X\nG0 Y300 F3000\nM84\n" + "acceleration_layer_0": + { + "maximum_value_warning": "1500", + "minimum_value_warning": "100" }, - "material_diameter": { - "default_value": 1.75 + "acceleration_prime_tower": + { + "maximum_value_warning": "1500", + "minimum_value_warning": "100" }, - "machine_shape": { - "default_value": "rectangular" + "acceleration_print": + { + "maximum_value_warning": "1500", + "minimum_value_warning": "100", + "value": 500 }, - "machine_heated_bed": { - "default_value": true + "acceleration_print_layer_0": + { + "maximum_value_warning": "1500", + "minimum_value_warning": "100" }, - "machine_heated_build_volume": { - "default_value": false + "acceleration_roofing": + { + "maximum_value_warning": "1500", + "minimum_value_warning": "100" }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" + "acceleration_skirt_brim": + { + "maximum_value_warning": "1500", + "minimum_value_warning": "100" }, - "machine_head_with_fans_polygon": { + "acceleration_support": + { + "maximum_value_warning": "1500", + "minimum_value_warning": "100" + }, + "acceleration_support_bottom": + { + "maximum_value_warning": "1500", + "minimum_value_warning": "100" + }, + "acceleration_support_infill": + { + "maximum_value_warning": "1500", + "minimum_value_warning": "100" + }, + "acceleration_support_interface": + { + "maximum_value_warning": "1500", + "minimum_value_warning": "100" + }, + "acceleration_support_roof": + { + "maximum_value_warning": "1500", + "minimum_value_warning": "100" + }, + "acceleration_topbottom": + { + "maximum_value_warning": "1500", + "minimum_value_warning": "100" + }, + "acceleration_travel": + { + "maximum_value_warning": "1500", + "minimum_value_warning": "100", + "value": "acceleration_print" + }, + "acceleration_travel_layer_0": + { + "maximum_value_warning": "1500", + "minimum_value_warning": "100" + }, + "acceleration_wall": + { + "maximum_value_warning": "1500", + "minimum_value_warning": "100" + }, + "acceleration_wall_0": + { + "maximum_value_warning": "1500", + "minimum_value_warning": "100" + }, + "acceleration_wall_x": + { + "maximum_value_warning": "1500", + "minimum_value_warning": "100" + }, + "adhesion_type": { "value": "'skirt'" }, + "brim_outside_only": { "value": false }, + "cool_fan_speed_min": { "value": "0.5*cool_fan_speed" }, + "cool_min_layer_time_fan_speed_max": { "value": 10 }, + "default_material_bed_temperature": { "maximum_value": "150" }, + "default_material_print_temperature": { "maximum_value": "470" }, + "expand_skins_expand_distance": { "value": "4" }, + "gantry_height": { "value": 34 }, + "infill_before_walls": { "value": false }, + "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 50 else 'cubic'" }, + "infill_sparse_density": { "value": 30 }, + "infill_sparse_thickness": { "value": "layer_height if (2*layer_height > 0.8*machine_nozzle_size) else 2*layer_height" }, + "jerk_infill": + { + "maximum_value_warning": "20", + "value": "jerk_print" + }, + "jerk_layer_0": + { + "maximum_value_warning": "20", + "value": "jerk_print" + }, + "jerk_prime_tower": + { + "maximum_value_warning": "20", + "value": "jerk_print" + }, + "jerk_print": + { + "maximum_value_warning": "20", + "value": 8 + }, + "jerk_print_layer_0": + { + "maximum_value_warning": "20", + "value": "jerk_print" + }, + "jerk_roofing": + { + "maximum_value_warning": "20", + "value": "jerk_print" + }, + "jerk_skirt_brim": + { + "maximum_value_warning": "20", + "value": "jerk_print" + }, + "jerk_support": + { + "maximum_value_warning": "20", + "value": "jerk_print" + }, + "jerk_support_bottom": + { + "maximum_value_warning": "20", + "value": "jerk_print" + }, + "jerk_support_infill": + { + "maximum_value_warning": "20", + "value": "jerk_print" + }, + "jerk_support_interface": + { + "maximum_value_warning": "20", + "value": "jerk_print" + }, + "jerk_support_roof": + { + "maximum_value_warning": "20", + "value": "jerk_print" + }, + "jerk_topbottom": + { + "maximum_value_warning": "20", + "value": "jerk_print" + }, + "jerk_travel": + { + "maximum_value_warning": "20", + "value": "jerk_print" + }, + "jerk_travel_layer_0": + { + "maximum_value_warning": "20", + "value": "jerk_print" + }, + "jerk_wall": + { + "maximum_value_warning": "20", + "value": "jerk_print" + }, + "jerk_wall_0": + { + "maximum_value_warning": "20", + "value": "jerk_print" + }, + "jerk_wall_x": + { + "maximum_value_warning": "20", + "value": "jerk_print" + }, + "layer_height": { "value": 0.2 }, + "layer_height_0": { "value": "machine_nozzle_size / 2.0" }, + "line_width": + { + "maximum_value_warning": "1.6 * machine_nozzle_size", + "minimum_value_warning": "0.8 * machine_nozzle_size", + "value": "1.05 * machine_nozzle_size" + }, + "machine_acceleration": { "value": 500 }, + "machine_end_gcode": { "default_value": "M400\nM104 S0\nM140 S0\nM107\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 R5 X\nG0 Y300 F3000\nM84\n" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { "default_value": [ - [ - -86, - 66 - ], - [ - 44, - 66 - ], - [ - 44, - -96 - ], - [ - -86, - -96 - ] + [-86, 66], + [44, 66], + [44, -96], + [-86, -96] ] }, - "gantry_height": { "value": 34 }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "machine_max_feedrate_x": { - "value": 200 - }, - "machine_max_feedrate_y": { - "value": 200 - }, - "machine_max_feedrate_z": { - "value": 10 - }, - "machine_max_feedrate_e": { - "value": 100 - }, - "machine_max_acceleration_x": { - "value": 500 - }, - "machine_max_acceleration_y": { - "value": 500 - }, - "machine_max_acceleration_z": { - "value": 200 - }, - "machine_max_acceleration_e": { - "value": 2000 - }, - "machine_acceleration": { - "value": 500 - }, - "machine_max_jerk_xy": { - "value": 8 - }, - "machine_max_jerk_z": { - "value": 2.0 - }, - "machine_max_jerk_e": { - "value": 5.0 - }, - "layer_height": { - "value": 0.2 - }, - "layer_height_0": { - "value": "machine_nozzle_size / 2.0" - }, - "line_width": { - "value": "1.05 * machine_nozzle_size", - "minimum_value_warning": "0.8 * machine_nozzle_size", - "maximum_value_warning": "1.6 * machine_nozzle_size" - }, - "wall_thickness": { - "value": "max(3*wall_line_width, 1)" - }, - "roofing_layer_count": { - "value": 2 - }, - "top_bottom_thickness": { - "value": 1.0 - }, - "top_bottom_pattern": { - "value": "'zigzag'" - }, - "optimize_wall_printing_order": { - "value": true - }, - "xy_offset_layer_0": { - "value": "-0.5*line_width" - }, - "skin_outline_count": { - "value": 2 - }, - "infill_sparse_density": { - "value": 30 - }, - "infill_pattern": { - "value": "'zigzag' if infill_sparse_density > 50 else 'cubic'" - }, - "infill_sparse_thickness": { - "value": "layer_height if (2*layer_height > 0.8*machine_nozzle_size) else 2*layer_height" - }, - "infill_before_walls": { - "value": false - }, - "expand_skins_expand_distance": { - "value": "4" - }, - "default_material_print_temperature": { - "maximum_value": "470" - }, - "material_print_temperature": { - "maximum_value": "470" - }, - "material_print_temperature_layer_0": { - "value": "material_print_temperature", - "maximum_value": "470" - }, - "material_initial_print_temperature": { - "value": "material_print_temperature", - "maximum_value": "470" - }, - "material_final_print_temperature": { - "value": "material_print_temperature", - "maximum_value": "470" - }, - "default_material_bed_temperature": { - "maximum_value": "150" - }, - "material_bed_temperature": { - "maximum_value": "150" - }, - "material_bed_temperature_layer_0": { - "maximum_value": "150" - }, - "speed_wall": { - "value": "speed_print" - }, - "speed_wall_0": { - "value": "0.5 * speed_wall" - }, - "speed_wall_x": { - "value": "speed_wall" - }, - "speed_roofing": { - "value": "speed_wall_0" - }, - "speed_topbottom": { - "value": "speed_print" - }, - "speed_travel": { - "value": "150" - }, - "speed_layer_0": { - "value": "30" - }, - "speed_travel_layer_0": { - "value": "0.5 * speed_travel" - }, - "speed_z_hop": { - "value": 10 - }, - "acceleration_print": { - "minimum_value_warning": "100", - "maximum_value_warning": "1500", - "value": 500 - }, - "acceleration_infill": { - "minimum_value_warning": "100", - "maximum_value_warning": "1500" - }, - "acceleration_wall": { - "minimum_value_warning": "100", - "maximum_value_warning": "1500" - }, - "acceleration_wall_0": { - "minimum_value_warning": "100", - "maximum_value_warning": "1500" - }, - "acceleration_wall_x": { - "minimum_value_warning": "100", - "maximum_value_warning": "1500" - }, - "acceleration_roofing": { - "minimum_value_warning": "100", - "maximum_value_warning": "1500" - }, - "acceleration_topbottom": { - "minimum_value_warning": "100", - "maximum_value_warning": "1500" - }, - "acceleration_support": { - "minimum_value_warning": "100", - "maximum_value_warning": "1500" - }, - "acceleration_support_infill": { - "minimum_value_warning": "100", - "maximum_value_warning": "1500" - }, - "acceleration_support_interface": { - "minimum_value_warning": "100", - "maximum_value_warning": "1500" - }, - "acceleration_support_roof": { - "minimum_value_warning": "100", - "maximum_value_warning": "1500" - }, - "acceleration_support_bottom": { - "minimum_value_warning": "100", - "maximum_value_warning": "1500" - }, - "acceleration_prime_tower": { - "minimum_value_warning": "100", - "maximum_value_warning": "1500" - }, - "acceleration_travel": { - "value": "acceleration_print", - "minimum_value_warning": "100", - "maximum_value_warning": "1500" - }, - "acceleration_layer_0": { - "minimum_value_warning": "100", - "maximum_value_warning": "1500" - }, - "acceleration_print_layer_0": { - "minimum_value_warning": "100", - "maximum_value_warning": "1500" - }, - "acceleration_travel_layer_0": { - "minimum_value_warning": "100", - "maximum_value_warning": "1500" - }, - "acceleration_skirt_brim": { - "minimum_value_warning": "100", - "maximum_value_warning": "1500" - }, - "jerk_print": { - "maximum_value_warning": "20", - "value": 8 - }, - "jerk_infill": { - "maximum_value_warning": "20", - "value": "jerk_print" - }, - "jerk_wall": { - "maximum_value_warning": "20", - "value": "jerk_print" - }, - "jerk_wall_0": { - "maximum_value_warning": "20", - "value": "jerk_print" - }, - "jerk_wall_x": { - "maximum_value_warning": "20", - "value": "jerk_print" - }, - "jerk_roofing": { - "maximum_value_warning": "20", - "value": "jerk_print" - }, - "jerk_topbottom": { - "maximum_value_warning": "20", - "value": "jerk_print" - }, - "jerk_support": { - "maximum_value_warning": "20", - "value": "jerk_print" - }, - "jerk_support_infill": { - "maximum_value_warning": "20", - "value": "jerk_print" - }, - "jerk_support_interface": { - "maximum_value_warning": "20", - "value": "jerk_print" - }, - "jerk_support_roof": { - "maximum_value_warning": "20", - "value": "jerk_print" - }, - "jerk_support_bottom": { - "maximum_value_warning": "20", - "value": "jerk_print" - }, - "jerk_prime_tower": { - "maximum_value_warning": "20", - "value": "jerk_print" - }, - "jerk_travel": { - "maximum_value_warning": "20", - "value": "jerk_print" - }, - "jerk_layer_0": { - "maximum_value_warning": "20", - "value": "jerk_print" - }, - "jerk_print_layer_0": { - "maximum_value_warning": "20", - "value": "jerk_print" - }, - "jerk_travel_layer_0": { - "maximum_value_warning": "20", - "value": "jerk_print" - }, - "jerk_skirt_brim": { - "maximum_value_warning": "20", - "value": "jerk_print" - }, - "retraction_amount": { - "value": 1.8, - "maximum_value_warning": "2.0" - }, - "retraction_speed": { - "value": 45 - }, - "retraction_combing": { - "value": "'infill'" - }, - "retraction_hop_enabled": { - "value": true - }, - "retraction_hop": { - "value": "3*layer_height" - }, - "cool_fan_speed_min": { - "value": "0.5*cool_fan_speed" - }, - "cool_min_layer_time_fan_speed_max": { - "value": 10 - }, - "support_angle": { - "value": 60 - }, - "support_wall_count": { - "value": "1 if (support_structure == 'tree') else 0" - }, - "support_infill_rate": { - "value": 10 - }, - "support_infill_angles": { - "value": "[45]" - }, - "support_z_distance": { - "value": "layer_height if (2*layer_height > 0.8*machine_nozzle_size) else (2*layer_height)" - }, - "support_join_distance": { - "value": 5.0 - }, - "support_offset": { - "value": 3.0 - }, - "support_infill_sparse_thickness": { - "value": "infill_sparse_thickness" - }, - "support_interface_enable": { - "value": true - }, - "support_interface_height": { - "value": 1.0 - }, - "support_interface_density": { - "value": 80 - }, - "support_interface_pattern": { - "value": "'grid'" - }, - "support_interface_offset": { - "value": "support_offset" - }, - "support_fan_enable": { - "value": true - }, - "support_use_towers": { - "value": false - }, - "support_tree_angle": { - "value": 60 - }, - "adhesion_type": { - "value": "'skirt'" - }, - "skirt_line_count": { - "value": 5 - }, - "skirt_brim_minimal_length": { - "value": 500 - }, - "skirt_gap": { - "value": 10 - }, - "brim_outside_only": { - "value": false - }, - "raft_margin": { - "value": 10 - }, - "raft_airgap": { - "value": "0.5 * layer_height" - }, - "raft_interface_thickness": { - "value": "0.8*machine_nozzle_size", - "maximum_value_warning": "0.8 * machine_nozzle_size" - }, - "raft_interface_line_width": { - "value": "line_width" - }, - "raft_base_line_width": { - "value": "raft_interface_line_width" - }, - "raft_base_speed": { - "value": "speed_layer_0" - } + "machine_heated_bed": { "default_value": true }, + "machine_heated_build_volume": { "default_value": false }, + "machine_max_acceleration_e": { "value": 2000 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 200 }, + "machine_max_feedrate_e": { "value": 100 }, + "machine_max_feedrate_x": { "value": 200 }, + "machine_max_feedrate_y": { "value": 200 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_jerk_e": { "value": 5.0 }, + "machine_max_jerk_xy": { "value": 8 }, + "machine_max_jerk_z": { "value": 2.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "machine_shape": { "default_value": "rectangular" }, + "machine_start_gcode": { "default_value": "G28 ;Home\nG0 X-2 Y150 F6000 ;Move to the side\nG0 Z0.3 F200 ;Move nozzle down\nM192 ; Wait for probe temperature to settle\nG28 Z\nG29\nG0 X0 Y0 Z30 F6000\nM84 E\nM0\nG1 Z15.0 F6000 ;Move the platform down 15mm\n" }, + "material_bed_temperature": { "maximum_value": "150" }, + "material_bed_temperature_layer_0": { "maximum_value": "150" }, + "material_diameter": { "default_value": 1.75 }, + "material_final_print_temperature": + { + "maximum_value": "470", + "value": "material_print_temperature" + }, + "material_initial_print_temperature": + { + "maximum_value": "470", + "value": "material_print_temperature" + }, + "material_print_temperature": { "maximum_value": "470" }, + "material_print_temperature_layer_0": + { + "maximum_value": "470", + "value": "material_print_temperature" + }, + "optimize_wall_printing_order": { "value": true }, + "raft_airgap": { "value": "0.5 * layer_height" }, + "raft_base_line_width": { "value": "raft_interface_line_width" }, + "raft_base_speed": { "value": "speed_layer_0" }, + "raft_interface_line_width": { "value": "line_width" }, + "raft_interface_thickness": + { + "maximum_value_warning": "0.8 * machine_nozzle_size", + "value": "0.8*machine_nozzle_size" + }, + "raft_margin": { "value": 10 }, + "retraction_amount": + { + "maximum_value_warning": "2.0", + "value": 1.8 + }, + "retraction_combing": { "value": "'infill'" }, + "retraction_hop": { "value": "3*layer_height" }, + "retraction_hop_enabled": { "value": true }, + "retraction_speed": { "value": 45 }, + "roofing_layer_count": { "value": 2 }, + "skin_outline_count": { "value": 2 }, + "skirt_brim_minimal_length": { "value": 500 }, + "skirt_gap": { "value": 10 }, + "skirt_line_count": { "value": 5 }, + "speed_layer_0": { "value": "30" }, + "speed_roofing": { "value": "speed_wall_0" }, + "speed_topbottom": { "value": "speed_print" }, + "speed_travel": { "value": "150" }, + "speed_travel_layer_0": { "value": "0.5 * speed_travel" }, + "speed_wall": { "value": "speed_print" }, + "speed_wall_0": { "value": "0.5 * speed_wall" }, + "speed_wall_x": { "value": "speed_wall" }, + "speed_z_hop": { "value": 10 }, + "support_angle": { "value": 60 }, + "support_fan_enable": { "value": true }, + "support_infill_angles": { "value": "[45]" }, + "support_infill_rate": { "value": 10 }, + "support_infill_sparse_thickness": { "value": "infill_sparse_thickness" }, + "support_interface_density": { "value": 80 }, + "support_interface_enable": { "value": true }, + "support_interface_height": { "value": 1.0 }, + "support_interface_offset": { "value": "support_offset" }, + "support_interface_pattern": { "value": "'grid'" }, + "support_join_distance": { "value": 5.0 }, + "support_offset": { "value": 3.0 }, + "support_tree_angle": { "value": 60 }, + "support_use_towers": { "value": false }, + "support_wall_count": { "value": "1 if (support_structure == 'tree') else 0" }, + "support_z_distance": { "value": "layer_height if (2*layer_height > 0.8*machine_nozzle_size) else (2*layer_height)" }, + "top_bottom_pattern": { "value": "'zigzag'" }, + "top_bottom_thickness": { "value": 1.0 }, + "wall_thickness": { "value": "max(3*wall_line_width, 1)" }, + "xy_offset_layer_0": { "value": "-0.5*line_width" } } } \ No newline at end of file diff --git a/resources/definitions/inat_proton_x_rail.def.json b/resources/definitions/inat_proton_x_rail.def.json index ffaca10bdf..486893e554 100644 --- a/resources/definitions/inat_proton_x_rail.def.json +++ b/resources/definitions/inat_proton_x_rail.def.json @@ -1,31 +1,27 @@ { - - "name": "Proton X Rail", "version": 2, + "name": "Proton X Rail", "inherits": "inat_base", - "metadata": { + "metadata": + { "visible": true, - "quality_definition": "inat_base", "platform": "inat_proton_x_buildplate.stl", - "platform_offset": [ 0, -1.1, 0] + "platform_offset": [ + 0, + -1.1, + 0 + ], + "quality_definition": "inat_base" }, - "overrides": { - "machine_name": { "default_value": "Proton X Rail" }, - "machine_width": { "default_value": 304 }, + "overrides": + { "machine_depth": { "default_value": 304 }, "machine_height": { "default_value": 300 }, - "machine_max_acceleration_x": { - "value": 500 - }, - "machine_max_acceleration_y": { - "value": 800 - }, - "machine_max_acceleration_z": { - "value": 200 - }, - "machine_max_jerk_xy": { - "value": 10 - } - + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 800 }, + "machine_max_acceleration_z": { "value": 200 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_name": { "default_value": "Proton X Rail" }, + "machine_width": { "default_value": 304 } } } \ No newline at end of file diff --git a/resources/definitions/inat_proton_x_rod.def.json b/resources/definitions/inat_proton_x_rod.def.json index 1c3592bbd3..6a512809fe 100644 --- a/resources/definitions/inat_proton_x_rod.def.json +++ b/resources/definitions/inat_proton_x_rod.def.json @@ -1,18 +1,23 @@ { - - "name": "Proton X Rod", "version": 2, + "name": "Proton X Rod", "inherits": "inat_base", - "metadata": { + "metadata": + { "visible": true, - "quality_definition": "inat_base", "platform": "inat_proton_x_buildplate.stl", - "platform_offset": [ 0, -1.1, 0] + "platform_offset": [ + 0, + -1.1, + 0 + ], + "quality_definition": "inat_base" }, - "overrides": { - "machine_name": { "default_value": "Proton X Rod" }, - "machine_width": { "default_value": 304 }, + "overrides": + { "machine_depth": { "default_value": 304 }, - "machine_height": { "default_value": 300 } + "machine_height": { "default_value": 300 }, + "machine_name": { "default_value": "Proton X Rod" }, + "machine_width": { "default_value": 304 } } } \ No newline at end of file diff --git a/resources/definitions/innovo_inventor.def.json b/resources/definitions/innovo_inventor.def.json index e930b994c3..6b7648366d 100644 --- a/resources/definitions/innovo_inventor.def.json +++ b/resources/definitions/innovo_inventor.def.json @@ -2,37 +2,30 @@ "version": 2, "name": "Innovo Inventor", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Adam Rumjahn", "manufacturer": "Innovo", "file_formats": "text/x-gcode", "platform": "inventor_platform.3mf", - "platform_offset": [-180, -0.25, 160], - "machine_extruder_trains": - { - "0": "innovo_inventor_extruder_0" - } + "machine_extruder_trains": { "0": "innovo_inventor_extruder_0" }, + "platform_offset": [ + -180, + -0.25, + 160 + ] }, - - "overrides": { - "machine_name": { "default_value": "Innovo INVENTOR" }, - "machine_width": { - "default_value": 340 - }, - "machine_height": { - "default_value": 290 - }, - "machine_depth": { - "default_value": 300 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_center_is_zero": { - "default_value": true - }, - "machine_head_with_fans_polygon": { + "overrides": + { + "gantry_height": { "value": "82.3" }, + "layer_height": { "default_value": 0.15 }, + "machine_center_is_zero": { "default_value": true }, + "machine_depth": { "default_value": 300 }, + "machine_end_gcode": { "default_value": "M104 S0 ; turn off extruders\nM140 S0 ; heated bed heater off\nG91 ; relative positioning\nG1 E-2 F5000; retract 2mm\nG28 Z; move bed down\nG90 ; absolute positioning\nM84 ; disable motors" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { "default_value": [ [-43.7, -19.2], [-43.7, 55], @@ -40,32 +33,14 @@ [43.7, -19.2] ] }, - "gantry_height": { - "value": "82.3" - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G28 ; Home extruder\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM190 S{material_bed_temperature}\nM104 T0 S{material_print_temperature}\nM109 T0 S{material_print_temperature}\nM104 T1 S{material_print_temperature}\nM109 T1 S{material_print_temperature}\n;G32 S3 ; auto level\nG92 E0 ; Reset extruder position" - }, - "machine_end_gcode": { - "default_value": "M104 S0 ; turn off extruders\nM140 S0 ; heated bed heater off\nG91 ; relative positioning\nG1 E-2 F5000; retract 2mm\nG28 Z; move bed down\nG90 ; absolute positioning\nM84 ; disable motors" - }, - "layer_height": { - "default_value": 0.15 - }, - "wall_thickness": { - "value": "0.8" - }, - "top_bottom_thickness": { - "default_value": 1.2 - }, - "speed_print": { - "default_value": 50 - }, - "speed_layer_0": { - "minimum_value": 0.1 - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 290 }, + "machine_name": { "default_value": "Innovo INVENTOR" }, + "machine_start_gcode": { "default_value": "G28 ; Home extruder\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM190 S{material_bed_temperature}\nM104 T0 S{material_print_temperature}\nM109 T0 S{material_print_temperature}\nM104 T1 S{material_print_temperature}\nM109 T1 S{material_print_temperature}\n;G32 S3 ; auto level\nG92 E0 ; Reset extruder position" }, + "machine_width": { "default_value": 340 }, + "speed_layer_0": { "minimum_value": 0.1 }, + "speed_print": { "default_value": 50 }, + "top_bottom_thickness": { "default_value": 1.2 }, + "wall_thickness": { "value": "0.8" } } -} +} \ No newline at end of file diff --git a/resources/definitions/jgaurora_a1.def.json b/resources/definitions/jgaurora_a1.def.json index a952949b1f..cd8195cbd3 100644 --- a/resources/definitions/jgaurora_a1.def.json +++ b/resources/definitions/jgaurora_a1.def.json @@ -1,72 +1,35 @@ { - "name": "JGAurora A1", "version": 2, + "name": "JGAurora A1", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Samuel Pinches", "manufacturer": "JGAurora", "file_formats": "text/x-gcode", - "preferred_quality_type": "fast", - "machine_extruder_trains": - { - "0": "jgaurora_a1_extruder_0" - } + "machine_extruder_trains": { "0": "jgaurora_a1_extruder_0" }, + "preferred_quality_type": "fast" }, - "overrides": { - "machine_name": { - "default_value": "JGAurora A1" - }, - "machine_start_gcode": { - "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 ;home all axis\nM420 S1 ;turn on mesh bed levelling if enabled in firmware\nG92 E0 ;zero the extruded length\nG1 Z1 F1000 ;move up slightly\nG1 X60.0 Z0 E9.0 F1000.0;intro line\nG1 X100.0 E21.5 F1000.0 ;continue line\nG92 E0 ;zero the extruded length again\n; -- end of START GCODE --" - }, - "machine_end_gcode": { - "default_value": "; -- END GCODE --\nM104 S0 ;turn off nozzle heater\nM140 S0 ;turn off bed heater\nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament slightly\nG90 ;set to absolute positioning\nG28 X0 ;move to the X-axis origin (Home)\nG0 Y280 F600 ;bring the bed to the front for easy print removal\nM84 ;turn off stepper motors\n; -- end of END GCODE --" - }, - "machine_width": { - "default_value": 300 - }, - "machine_height": { - "default_value": 300 - }, - "machine_depth": { - "default_value": 300 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_center_is_zero": { - "default_value": false - }, - "gantry_height": { - "value": "10" - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "material_diameter": { - "default_value": 1.75 - }, - "layer_height_0": { - "default_value": 0.12 - }, - "wall_thickness": { - "value": "1.2" - }, - "speed_print": { - "default_value": 40 - }, - "support_enable": { - "default_value": true - }, - "retraction_enable": { - "default_value": true - }, - "retraction_amount": { - "default_value": 6 - }, - "retraction_speed": { - "default_value": 40 - } + "overrides": + { + "gantry_height": { "value": "10" }, + "layer_height_0": { "default_value": 0.12 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 300 }, + "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0 ;turn off nozzle heater\nM140 S0 ;turn off bed heater\nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament slightly\nG90 ;set to absolute positioning\nG28 X0 ;move to the X-axis origin (Home)\nG0 Y280 F600 ;bring the bed to the front for easy print removal\nM84 ;turn off stepper motors\n; -- end of END GCODE --" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 300 }, + "machine_name": { "default_value": "JGAurora A1" }, + "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 ;home all axis\nM420 S1 ;turn on mesh bed levelling if enabled in firmware\nG92 E0 ;zero the extruded length\nG1 Z1 F1000 ;move up slightly\nG1 X60.0 Z0 E9.0 F1000.0;intro line\nG1 X100.0 E21.5 F1000.0 ;continue line\nG92 E0 ;zero the extruded length again\n; -- end of START GCODE --" }, + "machine_width": { "default_value": 300 }, + "material_diameter": { "default_value": 1.75 }, + "retraction_amount": { "default_value": 6 }, + "retraction_enable": { "default_value": true }, + "retraction_speed": { "default_value": 40 }, + "speed_print": { "default_value": 40 }, + "support_enable": { "default_value": true }, + "wall_thickness": { "value": "1.2" } } -} +} \ No newline at end of file diff --git a/resources/definitions/jgaurora_a3s.def.json b/resources/definitions/jgaurora_a3s.def.json index 2427f961c1..0c01a0c763 100644 --- a/resources/definitions/jgaurora_a3s.def.json +++ b/resources/definitions/jgaurora_a3s.def.json @@ -1,72 +1,35 @@ { - "name": "JGAurora A3S", "version": 2, + "name": "JGAurora A3S", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Samuel Pinches", "manufacturer": "JGAurora", "file_formats": "text/x-gcode", - "preferred_quality_type": "normal", - "machine_extruder_trains": - { - "0": "jgaurora_a3s_extruder_0" - } + "machine_extruder_trains": { "0": "jgaurora_a3s_extruder_0" }, + "preferred_quality_type": "normal" }, - "overrides": { - "machine_name": { - "default_value": "JGAurora A3S" - }, - "machine_start_gcode": { - "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 ;home all axis\nG92 E0 ;zero the extruded length\nG1 Z1 F1000 ;move up slightly\nG1 X60.0 Z0 E9.0 F1000.0;intro line\nG1 X100.0 E21.5 F1000.0 ;continue line\nG92 E0 ;zero the extruded length again\n; -- end of START GCODE --" - }, - "machine_end_gcode": { - "default_value": "; -- END GCODE --\nM104 S0 ;turn off nozzle heater\nM140 S0 ;turn off bed heater\nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament slightly\nG90 ;set to absolute positioning\nG28 X0 ;move to the X-axis origin (Home)\nG0 Y200 F600 ;bring the bed to the front for easy print removal\nM84 ;turn off stepper motors\n; -- end of END GCODE --" - }, - "machine_width": { - "default_value": 205 - }, - "machine_height": { - "default_value": 205 - }, - "machine_depth": { - "default_value": 205 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_center_is_zero": { - "default_value": false - }, - "gantry_height": { - "value": "10" - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "material_diameter": { - "default_value": 1.75 - }, - "layer_height_0": { - "default_value": 0.12 - }, - "wall_thickness": { - "value": "1.2" - }, - "speed_print": { - "default_value": 35 - }, - "support_enable": { - "default_value": true - }, - "retraction_enable": { - "default_value": true - }, - "retraction_amount": { - "default_value": 8 - }, - "retraction_speed": { - "default_value": 45 - } + "overrides": + { + "gantry_height": { "value": "10" }, + "layer_height_0": { "default_value": 0.12 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 205 }, + "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0 ;turn off nozzle heater\nM140 S0 ;turn off bed heater\nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament slightly\nG90 ;set to absolute positioning\nG28 X0 ;move to the X-axis origin (Home)\nG0 Y200 F600 ;bring the bed to the front for easy print removal\nM84 ;turn off stepper motors\n; -- end of END GCODE --" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 205 }, + "machine_name": { "default_value": "JGAurora A3S" }, + "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 ;home all axis\nG92 E0 ;zero the extruded length\nG1 Z1 F1000 ;move up slightly\nG1 X60.0 Z0 E9.0 F1000.0;intro line\nG1 X100.0 E21.5 F1000.0 ;continue line\nG92 E0 ;zero the extruded length again\n; -- end of START GCODE --" }, + "machine_width": { "default_value": 205 }, + "material_diameter": { "default_value": 1.75 }, + "retraction_amount": { "default_value": 8 }, + "retraction_enable": { "default_value": true }, + "retraction_speed": { "default_value": 45 }, + "speed_print": { "default_value": 35 }, + "support_enable": { "default_value": true }, + "wall_thickness": { "value": "1.2" } } -} +} \ No newline at end of file diff --git a/resources/definitions/jgaurora_a5.def.json b/resources/definitions/jgaurora_a5.def.json index 7ecd84c826..88cfb7dc33 100644 --- a/resources/definitions/jgaurora_a5.def.json +++ b/resources/definitions/jgaurora_a5.def.json @@ -1,74 +1,41 @@ { - "name": "JGAurora A5 & A5S", "version": 2, + "name": "JGAurora A5 & A5S", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Samuel Pinches", "manufacturer": "JGAurora", "file_formats": "text/x-gcode", "platform": "jgaurora_a5.3mf", - "platform_offset": [-242, -101, 273], - "preferred_quality_type": "fast", - "machine_extruder_trains": - { - "0": "jgaurora_a5_extruder_0" - } + "machine_extruder_trains": { "0": "jgaurora_a5_extruder_0" }, + "platform_offset": [ + -242, + -101, + 273 + ], + "preferred_quality_type": "fast" }, - "overrides": { - "machine_name": { - "default_value": "JGAurora A5 & A5S" - }, - "machine_start_gcode": { - "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 ;home all axis\nM420 S1 ;turn on mesh bed levelling if enabled in firmware\nG92 E0 ;zero the extruded length\nG1 Z1 F1000 ;move up slightly\nG1 X60.0 Z0 E9.0 F1000.0;intro line\nG1 X100.0 E21.5 F1000.0 ;continue line\nG92 E0 ;zero the extruded length again\n; -- end of START GCODE --" - }, - "machine_end_gcode": { - "default_value": "; -- END GCODE --\nM104 S0 ;turn off nozzle heater\nM140 S0 ;turn off bed heater\nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament slightly\nG90 ;set to absolute positioning\nG28 X0 ;move to the X-axis origin (Home)\nG0 Y280 F600 ;bring the bed to the front for easy print removal\nM84 ;turn off stepper motors\n; -- end of END GCODE --" - }, - "machine_width": { - "default_value": 300 - }, - "machine_height": { - "default_value": 320 - }, - "machine_depth": { - "default_value": 300 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_center_is_zero": { - "default_value": false - }, - "gantry_height": { - "value": "10" - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "material_diameter": { - "default_value": 1.75 - }, - "layer_height_0": { - "default_value": 0.12 - }, - "wall_thickness": { - "value": "1.2" - }, - "speed_print": { - "default_value": 40 - }, - "support_enable": { - "default_value": true - }, - "retraction_enable": { - "default_value": true - }, - "retraction_amount": { - "default_value": 8 - }, - "retraction_speed": { - "default_value": 45 - } + "overrides": + { + "gantry_height": { "value": "10" }, + "layer_height_0": { "default_value": 0.12 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 300 }, + "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0 ;turn off nozzle heater\nM140 S0 ;turn off bed heater\nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament slightly\nG90 ;set to absolute positioning\nG28 X0 ;move to the X-axis origin (Home)\nG0 Y280 F600 ;bring the bed to the front for easy print removal\nM84 ;turn off stepper motors\n; -- end of END GCODE --" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 320 }, + "machine_name": { "default_value": "JGAurora A5 & A5S" }, + "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 ;home all axis\nM420 S1 ;turn on mesh bed levelling if enabled in firmware\nG92 E0 ;zero the extruded length\nG1 Z1 F1000 ;move up slightly\nG1 X60.0 Z0 E9.0 F1000.0;intro line\nG1 X100.0 E21.5 F1000.0 ;continue line\nG92 E0 ;zero the extruded length again\n; -- end of START GCODE --" }, + "machine_width": { "default_value": 300 }, + "material_diameter": { "default_value": 1.75 }, + "retraction_amount": { "default_value": 8 }, + "retraction_enable": { "default_value": true }, + "retraction_speed": { "default_value": 45 }, + "speed_print": { "default_value": 40 }, + "support_enable": { "default_value": true }, + "wall_thickness": { "value": "1.2" } } -} +} \ No newline at end of file diff --git a/resources/definitions/jgaurora_a6.def.json b/resources/definitions/jgaurora_a6.def.json index 523285c8e5..f5cb0e9001 100644 --- a/resources/definitions/jgaurora_a6.def.json +++ b/resources/definitions/jgaurora_a6.def.json @@ -2,47 +2,41 @@ "version": 2, "name": "JGAurora A6", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "CrissR", "manufacturer": "JGAurora", "file_formats": "text/x-gcode", "platform": "jgaurora_a6_platform.stl", - "supports_usb_connection": true, - "supports_network_connection": false, - "has_machine_quality": true, - "quality_definition": "jgaurora_a6", - "has_variants": false, - "preferred_quality_type": "normal", - "machine_extruder_trains": - { - "0": "jgaurora_a6_extruder_0" - } + "has_machine_quality": true, + "has_variants": false, + "machine_extruder_trains": { "0": "jgaurora_a6_extruder_0" }, + "preferred_quality_type": "normal", + "quality_definition": "jgaurora_a6", + "supports_network_connection": false, + "supports_usb_connection": true }, - - "overrides": { - "machine_name": { "default_value": "JGAurora A6" }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 300 }, - "machine_height": { "default_value": 200 }, - "machine_depth": { "default_value": 200 }, - "machine_center_is_zero": { "default_value": false }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "gantry_height": { "value": 10 }, "layer_height": { "default_value": 0.16 }, "layer_height_0": { "default_value": 0.2 }, - "retraction_enable": { "default_value": true }, - "retraction_amount": { "default_value": 4 }, - "retraction_speed": { "default_value": 45 }, - "adhesion_type": { "default_value": "skirt" }, - "speed_print": { "default_value": 60}, - "gantry_height": { "value": 10 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0;heated bed heater off\nG91;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\nG28 X0 Y0;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90;absolute positioning\nM104 S0 ; turn off extruder\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X178 Y180 F4200 ; park print head\nM84 ; disable motors" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "M190 S{print_bed_temperature} ;bed temperature line\nM109 S{print_temperature} ;temperature line\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F{travel_speed} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nF200 E3;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{travel_speed}\nG1 Z0.0 F{travel_speed}\nM117 Printing... ;LCD Message" - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off\nM140 S0;heated bed heater off\nG91;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\nG28 X0 Y0;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90;absolute positioning\nM104 S0 ; turn off extruder\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X178 Y180 F4200 ; park print head\nM84 ; disable motors" - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 200 }, + "machine_name": { "default_value": "JGAurora A6" }, + "machine_nozzle_size": { "default_value": 0.4 }, + "machine_start_gcode": { "default_value": "M190 S{print_bed_temperature} ;bed temperature line\nM109 S{print_temperature} ;temperature line\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F{travel_speed} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nF200 E3;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{travel_speed}\nG1 Z0.0 F{travel_speed}\nM117 Printing... ;LCD Message" }, + "machine_width": { "default_value": 300 }, + "material_diameter": { "default_value": 1.75 }, + "retraction_amount": { "default_value": 4 }, + "retraction_enable": { "default_value": true }, + "retraction_speed": { "default_value": 45 }, + "speed_print": { "default_value": 60 } } -} +} \ No newline at end of file diff --git a/resources/definitions/jgaurora_jgmaker_magic.def.json b/resources/definitions/jgaurora_jgmaker_magic.def.json index 58067b6dd3..b94cfdcac7 100644 --- a/resources/definitions/jgaurora_jgmaker_magic.def.json +++ b/resources/definitions/jgaurora_jgmaker_magic.def.json @@ -1,72 +1,35 @@ { - "name": "JGAurora JGMaker Magic", "version": 2, + "name": "JGAurora JGMaker Magic", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Samuel Pinches", "manufacturer": "JGAurora", "file_formats": "text/x-gcode", - "preferred_quality_type": "fast", - "machine_extruder_trains": - { - "0": "jgaurora_jgmaker_magic_extruder_0" - } + "machine_extruder_trains": { "0": "jgaurora_jgmaker_magic_extruder_0" }, + "preferred_quality_type": "fast" }, - "overrides": { - "machine_name": { - "default_value": "JGAurora JGMaker Magic" - }, - "machine_start_gcode": { - "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 ;home all axis\nM420 S1 ;turn on mesh bed levelling if enabled in firmware\nG92 E0 ;zero the extruded length\nG1 Z1 F1000 ;move up slightly\nG1 X60.0 Z0 E9.0 F1000.0;intro line\nG1 X100.0 E21.5 F1000.0 ;continue line\nG92 E0 ;zero the extruded length again\n; -- end of START GCODE --" - }, - "machine_end_gcode": { - "default_value": "; -- END GCODE --\nM104 S0 ;turn off nozzle heater\nM140 S0 ;turn off bed heater\nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament slightly\nG90 ;set to absolute positioning\nG28 X0 ;move to the X-axis origin (Home)\nG0 Y280 F600 ;bring the bed to the front for easy print removal\nM84 ;turn off stepper motors\n; -- end of END GCODE --" - }, - "machine_width": { - "default_value": 220 - }, - "machine_height": { - "default_value": 250 - }, - "machine_depth": { - "default_value": 220 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_center_is_zero": { - "default_value": false - }, - "gantry_height": { - "value": "10" - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "material_diameter": { - "default_value": 1.75 - }, - "layer_height_0": { - "default_value": 0.2 - }, - "wall_thickness": { - "value": "1.2" - }, - "speed_print": { - "default_value": 60 - }, - "support_enable": { - "default_value": true - }, - "retraction_enable": { - "default_value": true - }, - "retraction_amount": { - "default_value": 5 - }, - "retraction_speed": { - "default_value": 50 - } + "overrides": + { + "gantry_height": { "value": "10" }, + "layer_height_0": { "default_value": 0.2 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 220 }, + "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0 ;turn off nozzle heater\nM140 S0 ;turn off bed heater\nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament slightly\nG90 ;set to absolute positioning\nG28 X0 ;move to the X-axis origin (Home)\nG0 Y280 F600 ;bring the bed to the front for easy print removal\nM84 ;turn off stepper motors\n; -- end of END GCODE --" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "JGAurora JGMaker Magic" }, + "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 ;home all axis\nM420 S1 ;turn on mesh bed levelling if enabled in firmware\nG92 E0 ;zero the extruded length\nG1 Z1 F1000 ;move up slightly\nG1 X60.0 Z0 E9.0 F1000.0;intro line\nG1 X100.0 E21.5 F1000.0 ;continue line\nG92 E0 ;zero the extruded length again\n; -- end of START GCODE --" }, + "machine_width": { "default_value": 220 }, + "material_diameter": { "default_value": 1.75 }, + "retraction_amount": { "default_value": 5 }, + "retraction_enable": { "default_value": true }, + "retraction_speed": { "default_value": 50 }, + "speed_print": { "default_value": 60 }, + "support_enable": { "default_value": true }, + "wall_thickness": { "value": "1.2" } } -} +} \ No newline at end of file diff --git a/resources/definitions/jgaurora_z_603s.def.json b/resources/definitions/jgaurora_z_603s.def.json index d122500dfb..c7a5d4aec4 100644 --- a/resources/definitions/jgaurora_z_603s.def.json +++ b/resources/definitions/jgaurora_z_603s.def.json @@ -1,72 +1,35 @@ { - "name": "JGAurora Z-603S", "version": 2, + "name": "JGAurora Z-603S", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Samuel Pinches", "manufacturer": "JGAurora", "file_formats": "text/x-gcode", - "preferred_quality_type": "fast", - "machine_extruder_trains": - { - "0": "jgaurora_z_603s_extruder_0" - } + "machine_extruder_trains": { "0": "jgaurora_z_603s_extruder_0" }, + "preferred_quality_type": "fast" }, - "overrides": { - "machine_name": { - "default_value": "JGAurora Z-603S" - }, - "machine_start_gcode": { - "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 ;home all axis\nM420 S1 ;turn on mesh bed levelling if enabled in firmware\nG92 E0 ;zero the extruded length\nG1 Z1 F1000 ;move up slightly\nG1 X60.0 Z0 E9.0 F1000.0;intro line\nG1 X100.0 E21.5 F1000.0 ;continue line\nG92 E0 ;zero the extruded length again\n; -- end of START GCODE --" - }, - "machine_end_gcode": { - "default_value": "; -- END GCODE --\nM104 S0 ;turn off nozzle heater\nM140 S0 ;turn off bed heater\nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament slightly\nG90 ;set to absolute positioning\nG28 X0 Y0 F600 ;move to the X/Y-axis origin (Home)\nM84 ;turn off stepper motors\n; -- end of END GCODE --" - }, - "machine_width": { - "default_value": 280 - }, - "machine_height": { - "default_value": 175 - }, - "machine_depth": { - "default_value": 180 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_center_is_zero": { - "default_value": false - }, - "gantry_height": { - "value": "10" - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "material_diameter": { - "default_value": 1.75 - }, - "layer_height_0": { - "default_value": 0.2 - }, - "wall_thickness": { - "value": "1.2" - }, - "speed_print": { - "default_value": 60 - }, - "support_enable": { - "default_value": true - }, - "retraction_enable": { - "default_value": true - }, - "retraction_amount": { - "default_value": 5 - }, - "retraction_speed": { - "default_value": 50 - } + "overrides": + { + "gantry_height": { "value": "10" }, + "layer_height_0": { "default_value": 0.2 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 180 }, + "machine_end_gcode": { "default_value": "; -- END GCODE --\nM104 S0 ;turn off nozzle heater\nM140 S0 ;turn off bed heater\nG91 ;set to relative positioning\nG1 E-10 F300 ;retract the filament slightly\nG90 ;set to absolute positioning\nG28 X0 Y0 F600 ;move to the X/Y-axis origin (Home)\nM84 ;turn off stepper motors\n; -- end of END GCODE --" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 175 }, + "machine_name": { "default_value": "JGAurora Z-603S" }, + "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21 ;set units to millimetres\nG90 ;set to absolute positioning\nM106 S0 ;set fan speed to zero (turned off)\nG28 ;home all axis\nM420 S1 ;turn on mesh bed levelling if enabled in firmware\nG92 E0 ;zero the extruded length\nG1 Z1 F1000 ;move up slightly\nG1 X60.0 Z0 E9.0 F1000.0;intro line\nG1 X100.0 E21.5 F1000.0 ;continue line\nG92 E0 ;zero the extruded length again\n; -- end of START GCODE --" }, + "machine_width": { "default_value": 280 }, + "material_diameter": { "default_value": 1.75 }, + "retraction_amount": { "default_value": 5 }, + "retraction_enable": { "default_value": true }, + "retraction_speed": { "default_value": 50 }, + "speed_print": { "default_value": 60 }, + "support_enable": { "default_value": true }, + "wall_thickness": { "value": "1.2" } } -} +} \ No newline at end of file diff --git a/resources/definitions/julia.def.json b/resources/definitions/julia.def.json index 2055191e61..6041b03df1 100644 --- a/resources/definitions/julia.def.json +++ b/resources/definitions/julia.def.json @@ -1,41 +1,39 @@ { - "name": "Julia", "version": 2, + "name": "Julia", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "manufacturer": "Fracktal", "file_formats": "text/x-gcode", - "platform_offset": [ 0, 0, 0], - "machine_extruder_trains": - { - "0": "julia_extruder_0" - } + "machine_extruder_trains": { "0": "julia_extruder_0" }, + "platform_offset": [ + 0, + 0, + 0 + ] }, - - "overrides": { - "machine_start_gcode": { - "default_value": " ;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {infill_sparse_density}\n ;metric values\n M107\n G28\n G29\n G90 ;absolute positioning\n G92 E0; reset extruder distance\n G1 Z5 F300 ;move nozzle up 5mm for safe homing\n G1 X0 Y0 Z0 F5000; move nozzle to home\n M300 S600P200\n M300 S800 P200\n M190 S{material_bed_temperature} ;Uncomment to add your own bed temperature line\n M109 S{material_print_temperature} ;Uncomment to add your own temperature line\n M82 ;set extruder to absolute mode\n M107 ;start with the fan off\n G1 Z15.0 F{speed_travel} ;move the platform down 15mm\n G92 E0 ;zero the extruded length\n G1 F200 E3 ;extrude 3mm of feed stock\n G92 E0 ;zero the extruded length again\n G1 F{speed_travel}\n ;Put printing message on LCD screen\n M117 Printing...\n" - }, - "machine_end_gcode": { - "default_value": " M104 S0 ;extruder heater off\n M140 S0 ;heated bed heater off (if you have it)\n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning\n" - }, + "overrides": + { + "infill_sparse_density": { "default_value": 10 }, "layer_height": { "default_value": 0.2 }, - "support_angle": { "default_value": 30 }, "layer_height_0": { "default_value": 0.2 }, - "speed_print": { "default_value": 80 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 250 }, + "machine_end_gcode": { "default_value": " M104 S0 ;extruder heater off\n M140 S0 ;heated bed heater off (if you have it)\n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning\n" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 260 }, + "machine_name": { "default_value": "Julia V2" }, + "machine_start_gcode": { "default_value": " ;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {infill_sparse_density}\n ;metric values\n M107\n G28\n G29\n G90 ;absolute positioning\n G92 E0; reset extruder distance\n G1 Z5 F300 ;move nozzle up 5mm for safe homing\n G1 X0 Y0 Z0 F5000; move nozzle to home\n M300 S600P200\n M300 S800 P200\n M190 S{material_bed_temperature} ;Uncomment to add your own bed temperature line\n M109 S{material_print_temperature} ;Uncomment to add your own temperature line\n M82 ;set extruder to absolute mode\n M107 ;start with the fan off\n G1 Z15.0 F{speed_travel} ;move the platform down 15mm\n G92 E0 ;zero the extruded length\n G1 F200 E3 ;extrude 3mm of feed stock\n G92 E0 ;zero the extruded length again\n G1 F{speed_travel}\n ;Put printing message on LCD screen\n M117 Printing...\n" }, + "machine_width": { "default_value": 210 }, "prime_tower_size": { "default_value": 8.660254037844387 }, "retraction_amount": { "default_value": 3 }, - "support_pattern": { "default_value": "grid" }, - "infill_sparse_density": { "default_value": 10 }, - "machine_extruder_count": { "default_value": 1 }, "retraction_combing": { "value": "'off'" }, - "machine_heated_bed": { "default_value": true }, - "machine_center_is_zero": { "default_value": false }, - "machine_height": { "default_value": 260 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_depth": { "default_value": 250 }, - "machine_width": { "default_value": 210 }, - "machine_name": { "default_value": "Julia V2" } + "speed_print": { "default_value": 80 }, + "support_angle": { "default_value": 30 }, + "support_pattern": { "default_value": "grid" } } -} +} \ No newline at end of file diff --git a/resources/definitions/kemiq_q2_beta.def.json b/resources/definitions/kemiq_q2_beta.def.json index 8957e75a28..decefe103d 100644 --- a/resources/definitions/kemiq_q2_beta.def.json +++ b/resources/definitions/kemiq_q2_beta.def.json @@ -2,7 +2,8 @@ "version": 2, "name": "Kemiq Q2 Beta", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Kemiq", "manufacturer": "Kemiq", @@ -10,47 +11,21 @@ "platform": "kemiq_q2.3mf", "has_machine_quality": true, "has_materials": true, - "machine_extruder_trains": - { - "0": "kemiq_q2_beta_extruder_0" - } + "machine_extruder_trains": { "0": "kemiq_q2_beta_extruder_0" } }, - - "overrides": { + "overrides": + { + "gantry_height": { "value": "0" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84\nM80 ;Lights Off" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 273 }, "machine_name": { "default_value": "Kemiq Q2 Beta" }, - - "machine_width": { - "default_value": 190 - }, - "machine_depth": { - "default_value": 200 - }, - "machine_height": { - "default_value": 273 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_nozzle_heat_up_speed": { - "default_value": 2 - }, - "machine_nozzle_cool_down_speed": { - "default_value": 2 - }, - "gantry_height": { - "value": "0" - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G28 ;Home\nG1 Z15.0 F6000 ;Move the platform down 15mm\nG92 E0\nG1 F200 E3\nG92 E0\nM80 ;Lights On" - }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84\nM80 ;Lights Off" - } + "machine_nozzle_cool_down_speed": { "default_value": 2 }, + "machine_nozzle_heat_up_speed": { "default_value": 2 }, + "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F6000 ;Move the platform down 15mm\nG92 E0\nG1 F200 E3\nG92 E0\nM80 ;Lights On" }, + "machine_width": { "default_value": 190 } } -} +} \ No newline at end of file diff --git a/resources/definitions/kemiq_q2_gama.def.json b/resources/definitions/kemiq_q2_gama.def.json index 6bb99125ef..36f63c530b 100644 --- a/resources/definitions/kemiq_q2_gama.def.json +++ b/resources/definitions/kemiq_q2_gama.def.json @@ -2,7 +2,8 @@ "version": 2, "name": "Kemiq Q2 Gama", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Kemiq", "manufacturer": "Kemiq", @@ -10,48 +11,21 @@ "platform": "kemiq_q2.3mf", "has_machine_quality": true, "has_materials": true, - "machine_extruder_trains": - { - "0": "kemiq_q2_gama_extruder_0" - } + "machine_extruder_trains": { "0": "kemiq_q2_gama_extruder_0" } }, - - "overrides": { - "machine_name": { - "default_value": "Kemiq Q2 Gama" - }, - "machine_width": { - "default_value": 190 - }, - "machine_depth": { - "default_value": 200 - }, - "machine_height": { - "default_value": 273 - }, - "machine_heated_bed": { - "default_value": false - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_nozzle_heat_up_speed": { - "default_value": 2 - }, - "machine_nozzle_cool_down_speed": { - "default_value": 2 - }, - "gantry_height": { - "value": "0" - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G28 ;Home\nG1 Z15.0 F6000 ;Move the platform down 15mm\nG92 E0\nG1 F200 E3\nG92 E0\nM80 ;Lights On" - }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84\nM80 ;Lights Off" - } + "overrides": + { + "gantry_height": { "value": "0" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84\nM80 ;Lights Off" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 273 }, + "machine_name": { "default_value": "Kemiq Q2 Gama" }, + "machine_nozzle_cool_down_speed": { "default_value": 2 }, + "machine_nozzle_heat_up_speed": { "default_value": 2 }, + "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F6000 ;Move the platform down 15mm\nG92 E0\nG1 F200 E3\nG92 E0\nM80 ;Lights On" }, + "machine_width": { "default_value": 190 } } -} +} \ No newline at end of file diff --git a/resources/definitions/key3d_tyro.def.json b/resources/definitions/key3d_tyro.def.json index 0bfc78c115..3e8630ea81 100644 --- a/resources/definitions/key3d_tyro.def.json +++ b/resources/definitions/key3d_tyro.def.json @@ -1,38 +1,33 @@ { - "name": "Tyro", "version": 2, + "name": "Tyro", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "DragonJe", "manufacturer": "Key3D", "file_formats": "text/x-gcode", - "platform_offset": [0, 0, 0], + "has_machine_quality": true, "has_materials": true, "has_variants": false, - "preferred_quality_type": "normal", - "has_machine_quality": true, + "machine_extruder_trains": { "0": "key3d_tyro_extruder_0" }, + "platform_offset": [ + 0, + 0, + 0 + ], "preferred_material": "generic_pla", - "machine_extruder_trains": - { - "0": "key3d_tyro_extruder_0" - } + "preferred_quality_type": "normal" }, - - "overrides": { - "machine_name": { - "default_value": "Tyro" - }, - "machine_width": { - "default_value": 150 - }, - "machine_height": { - "default_value": 150 - }, - "machine_depth": { - "default_value": 150 - }, - "machine_head_with_fans_polygon": { + "overrides": + { + "gantry_height": { "value": "30" }, + "machine_depth": { "default_value": 150 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\n ; Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { "default_value": [ [-30, 34], [-30, -32], @@ -40,26 +35,12 @@ [30, 34] ] }, - "gantry_height": { - "value": "30" - }, - "machine_heated_bed": { - "default_value": false - }, - "machine_heated_build_volume": { - "default_value": false - }, - "material_diameter": { - "default_value": 1.75 - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G28 ; Home\nG1 Z15.0 F6000 ; Move Z axis up 15mm\n ; Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" - }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\n ; Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" - } + "machine_heated_bed": { "default_value": false }, + "machine_heated_build_volume": { "default_value": false }, + "machine_height": { "default_value": 150 }, + "machine_name": { "default_value": "Tyro" }, + "machine_start_gcode": { "default_value": "G28 ; Home\nG1 Z15.0 F6000 ; Move Z axis up 15mm\n ; Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" }, + "machine_width": { "default_value": 150 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/definitions/kingroon_base.def.json b/resources/definitions/kingroon_base.def.json index c78f1fc31a..c06df233c2 100644 --- a/resources/definitions/kingroon_base.def.json +++ b/resources/definitions/kingroon_base.def.json @@ -1,26 +1,13 @@ { - "name": "Kingroon Base Printer", "version": 2, + "name": "Kingroon Base Printer", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": false, "author": "notamu", "manufacturer": "Kingroon", "file_formats": "text/x-gcode", - "first_start_actions": ["MachineSettingsAction"], - - "machine_extruder_trains": { - "0": "kingroon_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", "exclude_materials": [ "3D-Fuel_PLA_PRO_Black", "3D-Fuel_PLA_SnapSupport", @@ -124,146 +111,134 @@ "volumic_strong_ultra", "zyyx_pro_flex", "zyyx_pro_pla" - ] + ], + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { "0": "kingroon_base_extruder_0" }, + "preferred_material": "generic_pla", + "preferred_quality_type": "standard", + "preferred_variant_name": "0.4mm Nozzle", + "variants_name": "Nozzle Size" }, - "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 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 }, - "machine_height": { "default_value": 180 }, - - "machine_max_feedrate_x": { "default_value": 100 }, - "machine_max_feedrate_y": { "default_value": 100 }, - "machine_max_feedrate_z": { "default_value": 10 }, - "machine_max_feedrate_e": { "default_value": 100 }, - - "machine_max_acceleration_x": { "default_value": 500 }, - "machine_max_acceleration_y": { "default_value": 500 }, - "machine_max_acceleration_z": { "default_value": 50 }, - "machine_max_acceleration_e": { "default_value": 500 }, - "machine_acceleration": { "default_value": 500 }, - - "machine_max_jerk_xy": { "default_value": 10 }, - "machine_max_jerk_z": { "default_value": 0.3 }, - "machine_max_jerk_e": { "default_value": 5 }, - - "machine_heated_bed": { "default_value": true }, - - "material_diameter": { "default_value": 1.75 }, - + "overrides": + { + "acceleration_enabled": { "value": false }, "acceleration_print": { "value": 500 }, + "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, "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" }, - + "adaptive_layer_height_variation": { "value": 0.04 }, + "adaptive_layer_height_variation_step": { "value": 0.04 }, + "adhesion_type": { "value": "'none' if support_enable else 'skirt'" }, + "brim_replaces_support": { "value": false }, + "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, + "cool_min_layer_time": { "value": 10 }, + "default_material_bed_temperature": { "maximum_value": "150" }, + "default_material_print_temperature": + { + "maximum_value": "275", + "maximum_value_warning": "260" + }, + "fill_outline_gaps": { "value": false }, + "infill_before_walls": { "value": false }, + "infill_overlap": { "value": 30.0 }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, + "infill_sparse_density": { "value": "15" }, + "infill_wipe_dist": { "value": 0.0 }, + "jerk_enabled": { "value": false }, "jerk_print": { "value": 8 }, "jerk_travel": { "value": "jerk_print" }, "jerk_travel_layer_0": { "value": "jerk_travel" }, - - "acceleration_enabled": { "value": false }, - "jerk_enabled": { "value": false }, - - "default_material_print_temperature": { "maximum_value_warning": "260", "maximum_value": "275" }, - "default_material_bed_temperature": { "maximum_value": "150" }, - - "speed_print": { "value": 60.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_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 }, - - "material_initial_print_temperature": { "value": "material_print_temperature" }, + "machine_acceleration": { "default_value": 500 }, + "machine_depth": { "default_value": 180 }, + "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_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 180 }, + "machine_max_acceleration_e": { "default_value": 500 }, + "machine_max_acceleration_x": { "default_value": 500 }, + "machine_max_acceleration_y": { "default_value": 500 }, + "machine_max_acceleration_z": { "default_value": 50 }, + "machine_max_feedrate_e": { "default_value": 100 }, + "machine_max_feedrate_x": { "default_value": 100 }, + "machine_max_feedrate_y": { "default_value": 100 }, + "machine_max_feedrate_z": { "default_value": 10 }, + "machine_max_jerk_e": { "default_value": 5 }, + "machine_max_jerk_xy": { "default_value": 10 }, + "machine_max_jerk_z": { "default_value": 0.3 }, + "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_width": { "default_value": 180 }, + "material_diameter": { "default_value": 1.75 }, "material_final_print_temperature": { "value": "material_print_temperature" }, - - "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_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_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", - "maximum_value": 200 - }, - "retraction_retract_speed": { - "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", - "maximum_value": 200 - }, - "retraction_prime_speed": { - "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", - "maximum_value": 200 - }, - - "retraction_hop_enabled": { "value": true }, - "retraction_hop": { "value": "layer_height*2" }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "meshfix_maximum_resolution": { "value": "0.05" }, + "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" }, + "minimum_interface_area": { "value": 10 }, + "minimum_support_area": { "value": 2 }, + "optimize_wall_printing_order": { "value": true }, + "retraction_amount": { "value": 2 }, "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'infill'" }, "retraction_combing_max_distance": { "value": 30 }, + "retraction_count_max": { "value": 100 }, + "retraction_extrusion_window": { "value": 2 }, + "retraction_hop": { "value": "layer_height*2" }, + "retraction_hop_enabled": { "value": true }, + "retraction_min_travel": { "value": 1.5 }, + "retraction_prime_speed": + { + "maximum_value": 200, + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')" + }, + "retraction_retract_speed": + { + "maximum_value": 200, + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')" + }, + "retraction_speed": + { + "maximum_value": 200, + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')" + }, + "skin_overlap": { "value": 10.0 }, + "skirt_brim_speed": { "value": "speed_layer_0" }, + "skirt_gap": { "value": 10.0 }, + "skirt_line_count": { "value": 4 }, + "speed_layer_0": { "value": 20.0 }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_print": { "value": 60.0 }, + "speed_roofing": { "value": "speed_topbottom" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_support_interface": { "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_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, + "speed_wall_x": { "value": "speed_wall" }, + "speed_z_hop": { "value": 5 }, + "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width / 2.0 / layer_height)))" }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 4 }, + "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_enable": { "value": true }, + "support_interface_height": { "value": "layer_height * 4" }, + "support_interface_pattern": { "value": "'grid'" }, + "support_interface_skip_height": { "value": 0.2 }, + "support_pattern": { "value": "'zigzag'" }, + "support_use_towers": { "value": false }, + "support_wall_count": { "value": 1 }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height * 2" }, + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, "travel_avoid_other_parts": { "value": true }, "travel_avoid_supports": { "value": true }, "travel_retract_before_outer_wall": { "value": true }, - - "retraction_amount": { "value": 2 }, - "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_min_layer_time": { "value": 10 }, - - "adhesion_type": { "value": "'none' if support_enable else 'skirt'" }, - "brim_replaces_support": { "value": false }, - "skirt_gap": { "value": 10.0 }, - "skirt_line_count": { "value": 4 }, - - "adaptive_layer_height_variation": { "value": 0.04 }, - "adaptive_layer_height_variation_step": { "value": 0.04 }, - - "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_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": 2 }, - "minimum_interface_area": { "value": 10 }, - "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, - "wall_thickness": {"value": "line_width * 2" } - + "wall_0_wipe_dist": { "value": 0.0 }, + "wall_thickness": { "value": "line_width * 2" }, + "z_seam_corner": { "value": "'z_seam_corner_none'" }, + "z_seam_type": { "value": "'back'" } } -} +} \ No newline at end of file diff --git a/resources/definitions/kingroon_kp3.def.json b/resources/definitions/kingroon_kp3.def.json index 7dc04b2cce..69e2de1644 100644 --- a/resources/definitions/kingroon_kp3.def.json +++ b/resources/definitions/kingroon_kp3.def.json @@ -1,22 +1,23 @@ { - "name": "Kingroon KP3", "version": 2, + "name": "Kingroon KP3", "inherits": "kingroon_base", - "overrides": { - "machine_name": { "default_value": "Kingroon KP3" }, - "machine_steps_per_mm_x": { "value": 80 }, - "machine_steps_per_mm_y": { "value": 80 }, - "machine_steps_per_mm_z": { "value": 400 }, - "machine_steps_per_mm_e": { "value": 95 }, - "retraction_amount": { "value": 4 }, - "retraction_speed": { "value": 40 }, - "retraction_extrusion_window": { "value": 4 }, - "speed_travel": { "value": 100 } - - }, - "metadata": { - "quality_definition": "kingroon_base", + "metadata": + { "visible": true, - "platform": "kingroon_kp3.stl" + "platform": "kingroon_kp3.stl", + "quality_definition": "kingroon_base" + }, + "overrides": + { + "machine_name": { "default_value": "Kingroon KP3" }, + "machine_steps_per_mm_e": { "value": 95 }, + "machine_steps_per_mm_x": { "value": 80 }, + "machine_steps_per_mm_y": { "value": 80 }, + "machine_steps_per_mm_z": { "value": 400 }, + "retraction_amount": { "value": 4 }, + "retraction_extrusion_window": { "value": 4 }, + "retraction_speed": { "value": 40 }, + "speed_travel": { "value": 100 } } -} +} \ No newline at end of file diff --git a/resources/definitions/kingroon_kp3s.def.json b/resources/definitions/kingroon_kp3s.def.json index 00120ed8f8..52ef5e4643 100644 --- a/resources/definitions/kingroon_kp3s.def.json +++ b/resources/definitions/kingroon_kp3s.def.json @@ -1,33 +1,34 @@ { - "name": "Kingroon KP3S", "version": 2, + "name": "Kingroon KP3S", "inherits": "kingroon_base", - "overrides": { - "machine_name": { "default_value": "Kingroon KP3S" }, - "machine_steps_per_mm_x": { "value": 160 }, - "machine_steps_per_mm_y": { "value": 160 }, - "machine_steps_per_mm_z": { "value": 800 }, - "machine_steps_per_mm_e": { "value": 764 }, + "metadata": + { + "visible": true, + "platform": "kingroon_kp3s.stl", + "quality_definition": "kingroon_base" + }, + "overrides": + { + "machine_acceleration": { "value": 1000 }, + "machine_max_acceleration_e": { "value": 1000 }, + "machine_max_acceleration_x": { "value": 1000 }, + "machine_max_acceleration_y": { "value": 1000 }, + "machine_max_acceleration_z": { "value": 100 }, + "machine_max_feedrate_e": { "value": 100 }, "machine_max_feedrate_x": { "value": 200 }, "machine_max_feedrate_y": { "value": 200 }, "machine_max_feedrate_z": { "value": 4 }, - "machine_max_feedrate_e": { "value": 100 }, - "machine_max_acceleration_x": { "value": 1000 }, - "machine_max_acceleration_y": { "value": 1000 }, - "machine_max_acceleration_z": { "value": 100 }, - "machine_max_acceleration_e": { "value": 1000 }, - "machine_acceleration": { "value": 1000 }, - "machine_max_jerk_xy": { "value": 15 }, + "machine_max_jerk_xy": { "value": 15 }, "machine_max_jerk_z": { "value": 0.4 }, - "retraction_amount": { "value": 1 }, - "retraction_speed": { "value": 40 }, + "machine_name": { "default_value": "Kingroon KP3S" }, + "machine_steps_per_mm_e": { "value": 764 }, + "machine_steps_per_mm_x": { "value": 160 }, + "machine_steps_per_mm_y": { "value": 160 }, + "machine_steps_per_mm_z": { "value": 800 }, + "retraction_amount": { "value": 1 }, "retraction_extrusion_window": { "value": 1 }, + "retraction_speed": { "value": 40 }, "speed_z_hop": { "value": 4 } - - }, - "metadata": { - "quality_definition": "kingroon_base", - "visible": true, - "platform": "kingroon_kp3s.stl" } -} +} \ No newline at end of file diff --git a/resources/definitions/klema_180.def.json b/resources/definitions/klema_180.def.json new file mode 100644 index 0000000000..c3bb89d36d --- /dev/null +++ b/resources/definitions/klema_180.def.json @@ -0,0 +1,29 @@ +{ + "version": 2, + "name": "KLEMA 180", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "KLEMA LTD", + "manufacturer": "KLEMA", + "file_formats": "text/x-gcode", + "has_machine_quality": false, + "has_materials": true, + "has_variants": false, + "machine_extruder_trains": { "0": "klema_180_m1_t1_extruder_1" }, + "preferred_variant_name": "Standard 0.4mm", + "quality_definition": "klema", + "variants_name": "KLEMA 180 Size" + }, + "overrides": + { + "machine_depth": { "default_value": 180 }, + "machine_end_gcode": { "default_value": "M104 S0 ;\nM140 S0 ;\nM107 ;\nG91 ;\nG1 E-1 F300 ;\nG1 Z+65 E-2 X-20 Y-20 F2000 ;\nG28 X0 Y0 ;\nG90" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 220 }, + "machine_name": { "default_value": "KLEMA 180" }, + "machine_start_gcode": { "default_value": "M140 S{material_bed_temperature_layer_0} ;\nM190 S{material_bed_temperature_layer_0} ;\nM501 ;\nM104 S150 ;\nG28 ;\nG90 ;\nG0 X0 Y0 F6000 ;\nM109 S{material_print_temperature_layer_0} ;\nG0 Z0.3 F300 ;\nG92 E0 ;\nG1 X70 E10 F500 ;\nG92 E0 ;\nG1 E-1 F500 ;\nG92 E0 ;\nG1 Z1 ;\nG1 X100 F6000 ;\nG1 E-1 F500 ;\nG92 E0" }, + "machine_width": { "default_value": 180 } + } +} \ No newline at end of file diff --git a/resources/definitions/klema_250.def.json b/resources/definitions/klema_250.def.json new file mode 100644 index 0000000000..b1552aaa0e --- /dev/null +++ b/resources/definitions/klema_250.def.json @@ -0,0 +1,34 @@ +{ + "version": 2, + "name": "KLEMA 250", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "KLEMA LTD", + "manufacturer": "KLEMA", + "file_formats": "text/x-gcode", + "has_machine_quality": false, + "has_materials": true, + "has_variants": false, + "machine_extruder_trains": { "0": "klema_250_m1_t1_extruder_1" }, + "platform_offset": [ + 0, + 0, + 0 + ], + "preferred_variant_name": "Standard 0.4mm", + "quality_definition": "klema", + "variants_name": "KLEMA 250 Size" + }, + "overrides": + { + "machine_depth": { "default_value": 250 }, + "machine_end_gcode": { "default_value": "M104 S0 ;\nM140 S0 ;\nM107 ;\nG91 ;\nG1 E-1 F300 ;\nG1 Z+65 E-2 X-20 Y-20 F2000 ;\nG28 X0 Y0 ;\nG90" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 350 }, + "machine_name": { "default_value": "KLEMA 250" }, + "machine_start_gcode": { "default_value": "M140 S{material_bed_temperature_layer_0} ;\nM190 S{material_bed_temperature_layer_0} ;\nM501 ;\nM104 S150 ;\nG28 ;\nG90 ;\nG0 X0 Y0 F6000 ;\nM109 S{material_print_temperature_layer_0} ;\nG0 Z0.3 F300 ;\nG92 E0 ;\nG1 X70 E10 F500 ;\nG92 E0 ;\nG1 E-1 F500 ;\nG92 E0 ;\nG1 Z1 ;\nG1 X100 F6000 ;\nG1 E-1 F500 ;\nG92 E0" }, + "machine_width": { "default_value": 250 } + } +} \ No newline at end of file diff --git a/resources/definitions/klema_250_pro.def.json b/resources/definitions/klema_250_pro.def.json new file mode 100644 index 0000000000..e215159b6a --- /dev/null +++ b/resources/definitions/klema_250_pro.def.json @@ -0,0 +1,29 @@ +{ + "version": 2, + "name": "KLEMA 250 Pro", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "KLEMA LTD", + "manufacturer": "KLEMA", + "file_formats": "text/x-gcode", + "has_machine_quality": false, + "has_materials": true, + "has_variants": false, + "machine_extruder_trains": { "0": "klema_250_pro_m1_t2_extruder_1" }, + "preferred_variant_name": "Standard 0.4mm", + "quality_definition": "klema", + "variants_name": "KLEMA 250 Pro Size" + }, + "overrides": + { + "machine_depth": { "default_value": 250 }, + "machine_end_gcode": { "default_value": "M104 S0 ;\nM140 S0 ;\nM107 ;\nG91 ;\nG1 E-1 F300 ;\nG1 Z+65 E-2 X-20 Y-20 F2000 ;\nG28 X0 Y0 ;\nG90" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 350 }, + "machine_name": { "default_value": "KLEMA 250 Pro" }, + "machine_start_gcode": { "default_value": "M140 S{material_bed_temperature_layer_0} ;\nM190 S{material_bed_temperature_layer_0} ;\nM501 ;\nM104 S150 ;\nG28 ;\nG90 ;\nG0 X0 Y0 F6000 ;\nM109 S{material_print_temperature_layer_0} ;\nG0 Z0.3 F300 ;\nG92 E0 ;\nG1 X70 E10 F500 ;\nG92 E0 ;\nG1 E-1 F500 ;\nG92 E0 ;\nG1 Z1 ;\nG1 X100 F6000 ;\nG1 E-1 F500 ;\nG92 E0" }, + "machine_width": { "default_value": 250 } + } +} \ No newline at end of file diff --git a/resources/definitions/klema_250_twin.def.json b/resources/definitions/klema_250_twin.def.json new file mode 100644 index 0000000000..47a6d566f2 --- /dev/null +++ b/resources/definitions/klema_250_twin.def.json @@ -0,0 +1,34 @@ +{ + "version": 2, + "name": "KLEMA 250 Twin", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "KLEMA LTD", + "manufacturer": "KLEMA", + "file_formats": "text/x-gcode", + "has_machine_quality": false, + "has_materials": true, + "has_variants": false, + "machine_extruder_trains": + { + "0": "klema_250_twin_m1_t1_extruder_1", + "1": "klema_250_twin_m1_t1_extruder_2" + }, + "preferred_variant_name": "Standard 0.4mm", + "quality_definition": "klema", + "variants_name": "KLEMA 250 Twin Size" + }, + "overrides": + { + "machine_depth": { "default_value": 250 }, + "machine_end_gcode": { "default_value": "M104 S0 ;\nM140 S0 ;\nM107 ;\nG91 ;\nG1 E-1 F300 ;\nG1 Z+65 E-2 X-20 Y-20 F2000 ;\nG28 X0 Y0 ;\nG90" }, + "machine_extruder_count": { "value": 2 }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 350 }, + "machine_name": { "default_value": "KLEMA 250 Twin" }, + "machine_start_gcode": { "default_value": "M140 S{material_bed_temperature_layer_0} ;\nM190 S{material_bed_temper109 S{material_print_temperature_layer_0} ;\nG0 Z0.3 F300 ;\nG92 E0 ;\nG1 X70 E10 F500 ;\nG92 E0 ;\nG1 E-1 F500 ;\nG92 E0 ;\nG1 Z1 ;\nG1 X100 F6000 ;\nG1 E-1 F500 ;\nG92 E0" }, + "machine_width": { "default_value": 250 } + } +} \ No newline at end of file diff --git a/resources/definitions/klema_500.def.json b/resources/definitions/klema_500.def.json new file mode 100644 index 0000000000..afc1bb3dff --- /dev/null +++ b/resources/definitions/klema_500.def.json @@ -0,0 +1,29 @@ +{ + "version": 2, + "name": "KLEMA 500", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "KLEMA LTD", + "manufacturer": "KLEMA", + "file_formats": "text/x-gcode", + "has_machine_quality": false, + "has_materials": true, + "has_variants": false, + "machine_extruder_trains": { "0": "klema_500_m1_t1_extruder_1" }, + "preferred_variant_name": "Standard 0.4mm", + "quality_definition": "klema", + "variants_name": "KLEMA 500 Size" + }, + "overrides": + { + "machine_depth": { "default_value": 250 }, + "machine_end_gcode": { "default_value": "M104 S0 ;\nM140 S0 ;\nM107 ;\nG91 ;\nG1 E-1 F300 ;\nG1 Z+65 E-2 X-20 Y-20 F2000 ;\nG28 X0 Y0 ;\nG90" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 555 }, + "machine_name": { "default_value": "KLEMA 500" }, + "machine_start_gcode": { "default_value": "M140 S{material_bed_temperature_layer_0} ;\nM190 S{material_bed_temperature_layer_0} ;\nM501 ;\nM104 S150 ;\nG28 ;\nG90 ;\nG0 X0 Y0 F6000 ;\nM109 S{material_print_temperature_layer_0} ;\nG0 Z0.3 F300 ;\nG92 E0 ;\nG1 X70 E10 F500 ;\nG92 E0 ;\nG1 E-1 F500 ;\nG92 E0 ;\nG1 Z1 ;\nG1 X100 F6000 ;\nG1 E-1 F500 ;\nG92 E0" }, + "machine_width": { "default_value": 250 } + } +} \ No newline at end of file diff --git a/resources/definitions/koonovo_base.def.json b/resources/definitions/koonovo_base.def.json index 868129109e..1456bc68e7 100644 --- a/resources/definitions/koonovo_base.def.json +++ b/resources/definitions/koonovo_base.def.json @@ -1,112 +1,84 @@ { - "name": "Koonovo Base Printer", "version": 2, + "name": "Koonovo Base Printer", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": false, "author": "Koonovo", "manufacturer": "Koonovo", "file_formats": "text/x-gcode", "platform": "koonovo.obj", - "platform_texture": "koonovo.png", - "first_start_actions": [ "MachineSettingsAction" ], - "machine_extruder_trains": {"0": "koonovo_base_extruder_0"}, - - "has_materials": true, "has_machine_quality": true, - - - "preferred_quality_type": "standard", - "preferred_material": "generic_pla" + "has_materials": true, + "machine_extruder_trains": { "0": "koonovo_base_extruder_0" }, + "platform_texture": "koonovo.png", + "preferred_material": "generic_pla", + "preferred_quality_type": "standard" }, - - - "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": 200 }, - "machine_max_feedrate_y": { "value": 200 }, - "machine_max_feedrate_z": { "value": 50 }, - "machine_max_feedrate_e": { "value": 100 }, - + "overrides": + { + "acceleration_print": { "value": 500 }, + "acceleration_travel": { "value": 500 }, + "adhesion_type": { "value": "'skirt'" }, + "brim_replaces_support": { "value": false }, + "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, + "cool_min_layer_time": { "value": 10 }, + "default_material_print_temperature": { "value": "195" }, + "fill_outline_gaps": { "value": false }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, + "infill_sparse_density": { "value": "15" }, + "machine_acceleration": { "value": 500 }, + "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_heated_bed": { "default_value": true }, + "machine_max_acceleration_e": { "value": 2000 }, "machine_max_acceleration_x": { "value": 500 }, "machine_max_acceleration_y": { "value": 500 }, "machine_max_acceleration_z": { "value": 50 }, - "machine_max_acceleration_e": { "value": 2000 }, - "machine_acceleration": { "value": 500 }, - - "machine_heated_bed": { "default_value": true }, - - "material_diameter": { "default_value": 1.75 }, - - - "acceleration_print": { "value": 500 }, - "acceleration_travel": { "value": 500 }, - - - "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'" }, - - "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" }, + "machine_max_feedrate_e": { "value": 100 }, + "machine_max_feedrate_x": { "value": 200 }, + "machine_max_feedrate_y": { "value": 200 }, + "machine_max_feedrate_z": { "value": 50 }, + "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..." }, + "material_bed_temperature": { "value": "55" }, "material_bed_temperature_layer_0": { "value": "material_bed_temperature" }, + "material_diameter": { "default_value": 1.75 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_initial_print_temperature": { "value": "material_print_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 180.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 }, + "minimum_interface_area": { "value": 10 }, + "minimum_support_area": { "value": 2 }, "retraction_amount": { "value": 2.5 }, "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 }, + "skirt_gap": { "value": 6.0 }, + "skirt_line_count": { "value": 3 }, + "speed_layer_0": { "value": 25.0 }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_print": { "value": 50.0 }, + "speed_support": { "value": "speed_wall_0" }, + "speed_travel": { "value": "120.0 if speed_print < 60 else 180.0 if speed_print > 100 else speed_print * 2.2" }, + "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 25 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, + "speed_wall_x": { "value": "speed_wall" }, + "speed_z_hop": { "value": 5 }, "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_enable": { "value": true }, + "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, + "support_interface_density": { "value": 33.333 }, "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 } - - + "support_pattern": { "value": "'zigzag'" }, + "support_use_towers": { "value": false }, + "support_wall_count": { "value": 1 }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, + "wall_thickness": { "value": "line_width * 2" } } -} +} \ No newline at end of file diff --git a/resources/definitions/koonovo_elf.def.json b/resources/definitions/koonovo_elf.def.json index 03dcc6e632..a40a79545d 100644 --- a/resources/definitions/koonovo_elf.def.json +++ b/resources/definitions/koonovo_elf.def.json @@ -1,25 +1,27 @@ { - "name": "Koonovo Elf", "version": 2, + "name": "Koonovo Elf", "inherits": "koonovo_base", - "overrides": { - "machine_name": { "default_value": "Koonovo Elf" }, - "machine_width": { "default_value": 310 }, + "metadata": + { + "visible": true, + "quality_definition": "koonovo_base" + }, + "overrides": + { + "gantry_height": { "value": 0 }, "machine_depth": { "default_value": 310 }, - "machine_height": { "default_value": 345 }, - "machine_head_with_fans_polygon": { "default_value": [ + "machine_head_with_fans_polygon": + { + "default_value": [ [-26, 34], [-26, -32], [32, -32], [32, 34] ] }, - - "gantry_height": { "value": 0 } - - }, - "metadata": { - "quality_definition": "koonovo_base", - "visible": true + "machine_height": { "default_value": 345 }, + "machine_name": { "default_value": "Koonovo Elf" }, + "machine_width": { "default_value": 310 } } -} +} \ No newline at end of file diff --git a/resources/definitions/koonovo_kn3.def.json b/resources/definitions/koonovo_kn3.def.json index 2f8ba71ecf..ec3c26042a 100644 --- a/resources/definitions/koonovo_kn3.def.json +++ b/resources/definitions/koonovo_kn3.def.json @@ -1,127 +1,102 @@ -{ - "name": "Koonovo KN3 Idex", - "version": 2, - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Koonovo", - "manufacturer": "Koonovo", - "file_formats": "text/x-gcode", - "platform": "koonovo_kn3.stl", - "quality_definition": "koonovo_base", - - "first_start_actions": ["MachineSettingsAction"], - "machine_extruder_trains": { - "0": "koonovo_kn3_extruder_0", - "1": "koonovo_kn3_extruder_1" - }, - - "has_materials": true, - "has_machine_quality": true, - - "preferred_quality_type": "standard", - "preferred_material": "generic_pla" - }, - - "overrides": { - "machine_name": { "default_value": "Koonovo KN3" }, - "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 }, - - "machine_extruder_count": { "default_value": 2 }, - - "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": 200 }, - "machine_max_feedrate_y": { "value": 200 }, - "machine_max_feedrate_z": { "value": 50 }, - "machine_max_feedrate_e": { "value": 100 }, - - "machine_max_acceleration_x": { "value": 500 }, - "machine_max_acceleration_y": { "value": 500 }, - "machine_max_acceleration_z": { "value": 50 }, - "machine_max_acceleration_e": { "value": 2000 }, - "machine_acceleration": { "value": 500 }, - - "machine_heated_bed": { "default_value": true }, - - "material_diameter": { "default_value": 1.75 }, - - - "acceleration_print": { "value": 500 }, - "acceleration_travel": { "value": 500 }, - - - "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'" }, - - "default_material_print_temperature": { "value": "195" }, - "material_initial_print_temperature": { "value": "material_print_temperature" }, - "material_final_print_temperature": { "value": "material_print_temperature" }, - "default_material_bed_temperature": { "value": "55" }, - "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 180.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": 2.5 }, - "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 } - } -} +{ + "version": 2, + "name": "Koonovo KN3 Idex", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Koonovo", + "manufacturer": "Koonovo", + "file_formats": "text/x-gcode", + "platform": "koonovo_kn3.stl", + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, + "has_materials": true, + "machine_extruder_trains": + { + "0": "koonovo_kn3_extruder_0", + "1": "koonovo_kn3_extruder_1" + }, + "preferred_material": "generic_pla", + "preferred_quality_type": "standard", + "quality_definition": "koonovo_base" + }, + "overrides": + { + "acceleration_print": { "value": 500 }, + "acceleration_travel": { "value": 500 }, + "adhesion_type": { "value": "'skirt'" }, + "brim_replaces_support": { "value": false }, + "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, + "cool_min_layer_time": { "value": 10 }, + "default_material_bed_temperature": { "value": "55" }, + "default_material_print_temperature": { "value": "195" }, + "fill_outline_gaps": { "value": false }, + "gantry_height": { "value": 0 }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, + "infill_sparse_density": { "value": "15" }, + "machine_acceleration": { "value": 500 }, + "machine_depth": { "default_value": 310 }, + "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_extruder_count": { "default_value": 2 }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-26, 34], + [-26, -32], + [32, -32], + [32, 34] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 400 }, + "machine_max_acceleration_e": { "value": 2000 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 50 }, + "machine_max_feedrate_e": { "value": 100 }, + "machine_max_feedrate_x": { "value": 200 }, + "machine_max_feedrate_y": { "value": 200 }, + "machine_max_feedrate_z": { "value": 50 }, + "machine_name": { "default_value": "Koonovo KN3" }, + "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_width": { "default_value": 310 }, + "material_diameter": { "default_value": 1.75 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "material_standby_temperature": { "value": "material_print_temperature" }, + "minimum_interface_area": { "value": 10 }, + "minimum_support_area": { "value": 2 }, + "retraction_amount": { "value": 2.5 }, + "retraction_speed": { "value": 40 }, + "skirt_gap": { "value": 6.0 }, + "skirt_line_count": { "value": 3 }, + "speed_layer_0": { "value": 25.0 }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_print": { "value": 50.0 }, + "speed_support": { "value": "speed_wall_0" }, + "speed_travel": { "value": "120.0 if speed_print < 60 else 180.0 if speed_print > 100 else speed_print * 2.2" }, + "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 25 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, + "speed_wall_x": { "value": "speed_wall" }, + "speed_z_hop": { "value": 5 }, + "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 4 }, + "support_enable": { "value": true }, + "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_enable": { "value": true }, + "support_interface_height": { "value": "layer_height * 4" }, + "support_interface_pattern": { "value": "'grid'" }, + "support_interface_skip_height": { "value": 0.2 }, + "support_pattern": { "value": "'zigzag'" }, + "support_use_towers": { "value": false }, + "support_wall_count": { "value": 1 }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, + "wall_thickness": { "value": "line_width * 2" } + } +} \ No newline at end of file diff --git a/resources/definitions/koonovo_kn5.def.json b/resources/definitions/koonovo_kn5.def.json index e770579487..3d6b17fcbc 100644 --- a/resources/definitions/koonovo_kn5.def.json +++ b/resources/definitions/koonovo_kn5.def.json @@ -1,125 +1,102 @@ -{ - "name": "Koonovo KN5 Idex", - "version": 2, - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Koonovo", - "manufacturer": "Koonovo", - "file_formats": "text/x-gcode", - "platform": "koonovo_kn5.stl", - "quality_definition": "koonovo_base", - - "first_start_actions": ["MachineSettingsAction"], - "machine_extruder_trains": { - "0": "koonovo_kn5_extruder_0", - "1": "koonovo_kn5_extruder_1" - }, - - "has_materials": true, - "has_machine_quality": true, - - "preferred_quality_type": "standard", - "preferred_material": "generic_pla" - }, - - "overrides": - { - "machine_name": { "default_value": "Koonovo KN5" }, - "machine_width": { "default_value": 420 }, - "machine_depth": { "default_value": 420 }, - "machine_height": { "default_value": 400 }, - "machine_head_with_fans_polygon": { "default_value": [ - [-26, 34], - [-26, -32], - [32, -32], - [32, 34] - ] - }, - - "gantry_height": { "value": 0 }, - - "machine_extruder_count": { "default_value": 2 }, - - "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": 200 }, - "machine_max_feedrate_y": { "value": 200 }, - "machine_max_feedrate_z": { "value": 50 }, - "machine_max_feedrate_e": { "value": 100 }, - - "machine_max_acceleration_x": { "value": 500 }, - "machine_max_acceleration_y": { "value": 500 }, - "machine_max_acceleration_z": { "value": 50 }, - "machine_max_acceleration_e": { "value": 2000 }, - "machine_acceleration": { "value": 500 }, - - "machine_heated_bed": { "default_value": true }, - - "material_diameter": { "default_value": 1.75 }, - - "acceleration_print": { "value": 500 }, - "acceleration_travel": { "value": 500 }, - - "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'" }, - - "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" }, - "default_material_bed_temperature": { "value": "45" }, - - "speed_print": { "value": 50.0 } , - "speed_wall_x": { "value": "speed_wall" }, - "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_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": 2.5 }, - "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 } - } +{ + "version": 2, + "name": "Koonovo KN5 Idex", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Koonovo", + "manufacturer": "Koonovo", + "file_formats": "text/x-gcode", + "platform": "koonovo_kn5.stl", + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, + "has_materials": true, + "machine_extruder_trains": + { + "0": "koonovo_kn5_extruder_0", + "1": "koonovo_kn5_extruder_1" + }, + "preferred_material": "generic_pla", + "preferred_quality_type": "standard", + "quality_definition": "koonovo_base" + }, + "overrides": + { + "acceleration_print": { "value": 500 }, + "acceleration_travel": { "value": 500 }, + "adhesion_type": { "value": "'skirt'" }, + "brim_replaces_support": { "value": false }, + "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, + "cool_min_layer_time": { "value": 10 }, + "default_material_bed_temperature": { "value": "45" }, + "default_material_print_temperature": { "value": "195" }, + "fill_outline_gaps": { "value": false }, + "gantry_height": { "value": 0 }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, + "infill_sparse_density": { "value": "15" }, + "machine_acceleration": { "value": 500 }, + "machine_depth": { "default_value": 420 }, + "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_extruder_count": { "default_value": 2 }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-26, 34], + [-26, -32], + [32, -32], + [32, 34] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 400 }, + "machine_max_acceleration_e": { "value": 2000 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 50 }, + "machine_max_feedrate_e": { "value": 100 }, + "machine_max_feedrate_x": { "value": 200 }, + "machine_max_feedrate_y": { "value": 200 }, + "machine_max_feedrate_z": { "value": 50 }, + "machine_name": { "default_value": "Koonovo KN5" }, + "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_width": { "default_value": 420 }, + "material_diameter": { "default_value": 1.75 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "material_standby_temperature": { "value": "material_print_temperature" }, + "minimum_interface_area": { "value": 10 }, + "minimum_support_area": { "value": 2 }, + "retraction_amount": { "value": 2.5 }, + "retraction_speed": { "value": 40 }, + "skirt_gap": { "value": 6.0 }, + "skirt_line_count": { "value": 3 }, + "speed_layer_0": { "value": 25.0 }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_print": { "value": 50.0 }, + "speed_support": { "value": "speed_wall_0" }, + "speed_travel": { "value": "120.0 if speed_print < 60 else 180.0 if speed_print > 100 else speed_print * 2.2" }, + "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 25 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, + "speed_wall_x": { "value": "speed_wall" }, + "speed_z_hop": { "value": 5 }, + "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 4 }, + "support_enable": { "value": true }, + "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_enable": { "value": true }, + "support_interface_height": { "value": "layer_height * 4" }, + "support_interface_pattern": { "value": "'grid'" }, + "support_interface_skip_height": { "value": 0.2 }, + "support_pattern": { "value": "'zigzag'" }, + "support_use_towers": { "value": false }, + "support_wall_count": { "value": 1 }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, + "wall_thickness": { "value": "line_width * 2" } + } } \ No newline at end of file diff --git a/resources/definitions/koonovo_pyramid.def.json b/resources/definitions/koonovo_pyramid.def.json index 8e4ff8a20e..5817c1d908 100644 --- a/resources/definitions/koonovo_pyramid.def.json +++ b/resources/definitions/koonovo_pyramid.def.json @@ -1,24 +1,27 @@ { - "name": "Koonovo Pyramid", "version": 2, + "name": "Koonovo Pyramid", "inherits": "koonovo_base", - "overrides": { - "machine_name": { "default_value": "Koonovo Pyramid" }, - "machine_width": { "default_value": 310 }, + "metadata": + { + "visible": true, + "quality_definition": "koonovo_base" + }, + "overrides": + { + "gantry_height": { "value": 0 }, "machine_depth": { "default_value": 310 }, - "machine_height": { "default_value": 400 }, - "machine_head_with_fans_polygon": { "default_value": [ + "machine_head_with_fans_polygon": + { + "default_value": [ [-26, 34], [-26, -32], [32, -32], [32, 34] ] }, - - "gantry_height": { "value": 0 } - }, - "metadata": { - "quality_definition": "koonovo_base", - "visible": true + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "Koonovo Pyramid" }, + "machine_width": { "default_value": 310 } } -} +} \ No newline at end of file diff --git a/resources/definitions/kosher.def.json b/resources/definitions/kosher.def.json index f769d7c7a9..ea483a3e34 100644 --- a/resources/definitions/kosher.def.json +++ b/resources/definitions/kosher.def.json @@ -2,52 +2,59 @@ "version": 2, "name": "Kosher", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Venkat Kamesh", "manufacturer": "Sri Vignan Technologies", - "weight": 3, "file_formats": "text/x-gcode", "platform": "ultimaker3_platform.obj", - "platform_texture": "koshertext.png", - "platform_offset": [0, 0, 0], "has_material": true, "has_variants": true, - "preferred_variant_name": "0.4 mm Nozzle", "machine_extruder_trains": { "0": "kosher_extruder_0", "1": "kosher_extruder_1" - } + }, + "platform_offset": [ + 0, + 0, + 0 + ], + "platform_texture": "koshertext.png", + "preferred_variant_name": "0.4 mm Nozzle", + "weight": 3 }, - - "overrides": { - "machine_name": { "default_value": "Kosher" }, - "machine_width": { "default_value": 220 }, - "machine_height": { "default_value": 300 }, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "gantry_height": { "value": "48" }, + "ironing_enabled": { "default_value": true }, + "line_width": { "value": "machine_nozzle_size" }, + "machine_acceleration": { "default_value": 3000 }, + "machine_center_is_zero": { "default_value": false }, "machine_depth": { "default_value": 220 }, + "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0 T1\nM104 S0 T0\nM140 S0\nG28 X0 Y0\nT0\nM605 S1\nM84" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "Marlin" }, "machine_heated_bed": { "default_value": true }, - "machine_acceleration": {"default_value": 3000}, + "machine_height": { "default_value": 300 }, + "machine_max_feedrate_e": { "value": 150 }, "machine_max_feedrate_x": { "value": 300 }, "machine_max_feedrate_y": { "value": 300 }, "machine_max_feedrate_z": { "value": 40 }, - "machine_max_feedrate_e": { "value": 150 }, - "machine_use_extruder_offset_to_offset_coords": {"default_value": false}, - "machine_center_is_zero": {"default_value": false}, - "gantry_height": {"value": "48"}, - "line_width": {"value": "machine_nozzle_size"}, - "speed_travel": {"maximum_value": "300", "value": "200"}, - "optimize_wall_printing_order": { "value": "True" }, - "material_diameter": { "default_value": 1.75}, - "retraction_amount": {"default_value": 6.5}, - "retraction_speed": { "default_value": 30}, - - "adhesion_type": { "default_value": "skirt" }, - "machine_gcode_flavor": { "default_value": "Marlin"}, - "ironing_enabled":{"default_value": true}, - + "machine_name": { "default_value": "Kosher" }, "machine_start_gcode": { "default_value": "M605 S0\nG21\nG90\nM82\nM107\nG28\nT1\nG92 E0\nG1 E16 F210\nG92 E0\nT0\nG92 E0\nG1 E16 F210\nG92 E0\n" }, - "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0 T1\nM104 S0 T0\nM140 S0\nG28 X0 Y0\nT0\nM605 S1\nM84" }, - "machine_extruder_count": { "default_value": 2 } + "machine_use_extruder_offset_to_offset_coords": { "default_value": false }, + "machine_width": { "default_value": 220 }, + "material_diameter": { "default_value": 1.75 }, + "optimize_wall_printing_order": { "value": "True" }, + "retraction_amount": { "default_value": 6.5 }, + "retraction_speed": { "default_value": 30 }, + "speed_travel": + { + "maximum_value": "300", + "value": "200" + } } -} +} \ No newline at end of file diff --git a/resources/definitions/kosher_duplication.def.json b/resources/definitions/kosher_duplication.def.json index f7add08a8b..4abc9c081c 100644 --- a/resources/definitions/kosher_duplication.def.json +++ b/resources/definitions/kosher_duplication.def.json @@ -2,50 +2,55 @@ "version": 2, "name": "Kosher Duplication", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Venkat Kamesh", "manufacturer": "Sri Vignan Technologies", - "weight": 3, "file_formats": "text/x-gcode", "platform": "ultimaker3_platform.obj", - "platform_texture": "koshertext.png", - "platform_offset": [52.5, 0, 0], "has_material": true, "has_variants": true, + "machine_extruder_trains": { "0": "kosher_dm_extruder" }, + "platform_offset": [ + 52.5, + 0, + 0 + ], + "platform_texture": "koshertext.png", "preferred_variant_name": "0.4 mm Nozzle", - "machine_extruder_trains": - { - "0": "kosher_dm_extruder" - } + "weight": 3 }, - - "overrides": { - "machine_name": { "default_value": "Kosher_Duplication" }, - "machine_width": { "default_value": 100 }, - "machine_height": { "default_value": 300 }, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "gantry_height": { "value": "48" }, + "ironing_enabled": { "default_value": true }, + "line_width": { "value": "machine_nozzle_size" }, + "machine_acceleration": { "default_value": 3000 }, + "machine_center_is_zero": { "default_value": false }, "machine_depth": { "default_value": 220 }, + "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM605 S1\nG28 X\nM84" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_gcode_flavor": { "default_value": "Marlin" }, "machine_heated_bed": { "default_value": true }, - "machine_acceleration": {"default_value": 3000}, + "machine_height": { "default_value": 300 }, + "machine_max_feedrate_e": { "value": 150 }, "machine_max_feedrate_x": { "value": 300 }, "machine_max_feedrate_y": { "value": 300 }, "machine_max_feedrate_z": { "value": 40 }, - "machine_max_feedrate_e": { "value": 150 }, - "machine_use_extruder_offset_to_offset_coords": {"default_value": false}, - "machine_center_is_zero": {"default_value": false}, - "gantry_height": {"value": "48"}, - "line_width": {"value": "machine_nozzle_size"}, - "speed_travel": {"maximum_value": "300", "value": "200"}, + "machine_name": { "default_value": "Kosher_Duplication" }, + "machine_start_gcode": { "default_value": "M605 S0\nT0\nM605 S2 R0 X266\nG28 X\nG28 Y\nG1 X-30 F9000\nG1 Y20 F9000\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature};\nM105\nM109 S{material_print_temperature};\nG92 E0\nG1 E16 F210\nG92 E0\nM605 S2 X100\nG28 X\nG28 Z\n" }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": false }, + "machine_width": { "default_value": 100 }, + "material_diameter": { "default_value": 1.75 }, "optimize_wall_printing_order": { "value": "True" }, - "material_diameter": { "default_value": 1.75}, - "retraction_amount": {"default_value": 6.5}, - "retraction_speed": { "default_value": 30}, - - "adhesion_type": { "default_value": "skirt" }, - "ironing_enabled":{"default_value": true}, - "machine_gcode_flavor": { "default_value": "Marlin"}, - "machine_start_gcode": {"default_value": "M605 S0\nT0\nM605 S2 R0 X266\nG28 X\nG28 Y\nG1 X-30 F9000\nG1 Y20 F9000\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature};\nM105\nM109 S{material_print_temperature};\nG92 E0\nG1 E16 F210\nG92 E0\nM605 S2 X100\nG28 X\nG28 Z\n"}, - "machine_end_gcode": {"default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM605 S1\nG28 X\nM84"}, - "machine_extruder_count": { "default_value": 1 } + "retraction_amount": { "default_value": 6.5 }, + "retraction_speed": { "default_value": 30 }, + "speed_travel": + { + "maximum_value": "300", + "value": "200" + } } -} +} \ No newline at end of file diff --git a/resources/definitions/kosher_mirror.def.json b/resources/definitions/kosher_mirror.def.json index a7d5c6ced4..66edd3ba68 100644 --- a/resources/definitions/kosher_mirror.def.json +++ b/resources/definitions/kosher_mirror.def.json @@ -2,50 +2,55 @@ "version": 2, "name": "Kosher Mirror", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Venkat Kamesh", "manufacturer": "Sri Vignan Technologies", - "weight": 3, "file_formats": "text/x-gcode", "platform": "ultimaker3_platform.obj", - "platform_texture": "koshertext.png", - "platform_offset": [65, 0, 0], "has_material": true, "has_variants": true, + "machine_extruder_trains": { "0": "kosher_mm_extruder" }, + "platform_offset": [ + 65, + 0, + 0 + ], + "platform_texture": "koshertext.png", "preferred_variant_name": "0.4 mm Nozzle", - "machine_extruder_trains": - { - "0": "kosher_mm_extruder" - } + "weight": 3 }, - - "overrides": { - "machine_name": { "default_value": "Kosher_Mirror" }, - "machine_width": { "default_value": 75 }, - "machine_height": { "default_value": 300 }, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "gantry_height": { "value": "48" }, + "ironing_enabled": { "default_value": true }, + "line_width": { "value": "machine_nozzle_size" }, + "machine_acceleration": { "default_value": 3000 }, + "machine_center_is_zero": { "default_value": false }, "machine_depth": { "default_value": 220 }, + "machine_end_gcode": { "default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM605 S1\nG28 X\nM84" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_gcode_flavor": { "default_value": "Marlin" }, "machine_heated_bed": { "default_value": true }, - "machine_acceleration": {"default_value": 3000}, + "machine_height": { "default_value": 300 }, + "machine_max_feedrate_e": { "value": 150 }, "machine_max_feedrate_x": { "value": 300 }, "machine_max_feedrate_y": { "value": 300 }, "machine_max_feedrate_z": { "value": 40 }, - "machine_max_feedrate_e": { "value": 150 }, - "machine_use_extruder_offset_to_offset_coords": {"default_value": false}, - "machine_center_is_zero": {"default_value": false}, - "gantry_height": {"value": "48"}, - "line_width": {"value": "machine_nozzle_size"}, - "speed_travel": {"maximum_value": "300", "value": "200"}, + "machine_name": { "default_value": "Kosher_Mirror" }, + "machine_start_gcode": { "default_value": "M605 S0\nT0\nM605 S2 R0 X220\nM605 S3 X220\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature};\nM105\nM109 S{material_print_temperature};\nG28\nG1 X-50 F9000\nG92 E0\nG1 E16 F210\nG92 E0\n" }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": false }, + "machine_width": { "default_value": 75 }, + "material_diameter": { "default_value": 1.75 }, "optimize_wall_printing_order": { "value": "True" }, - "material_diameter": { "default_value": 1.75}, - "retraction_amount": {"default_value": 6.5}, - "retraction_speed": { "default_value": 30}, - - "adhesion_type": { "default_value": "skirt" }, - "ironing_enabled":{"default_value": true}, - "machine_gcode_flavor": { "default_value": "Marlin"}, - "machine_start_gcode": {"default_value": "M605 S0\nT0\nM605 S2 R0 X220\nM605 S3 X220\nG21\nG90\nM82\nM107\nM104 S{material_print_temperature};\nM105\nM109 S{material_print_temperature};\nG28\nG1 X-50 F9000\nG92 E0\nG1 E16 F210\nG92 E0\n" }, - "machine_end_gcode": {"default_value": "G91\nG1 Z+0.5 E-16 Y+10 F9000\nG90\nM107\nM104 S0\nM140 S0\nM117\nM605 S0\nG28 X0 Y0\nM605 S1\nG28 X\nM84"}, - "machine_extruder_count": { "default_value": 1 } + "retraction_amount": { "default_value": 6.5 }, + "retraction_speed": { "default_value": 30 }, + "speed_travel": + { + "maximum_value": "300", + "value": "200" + } } -} +} \ No newline at end of file diff --git a/resources/definitions/kossel_mini.def.json b/resources/definitions/kossel_mini.def.json index 492e8fbd7c..0c28c051ab 100644 --- a/resources/definitions/kossel_mini.def.json +++ b/resources/definitions/kossel_mini.def.json @@ -2,46 +2,30 @@ "version": 2, "name": "Kossel Mini", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Claudio Sampaio (Patola)", "manufacturer": "Johann", "file_formats": "text/x-gcode", "platform": "kossel_platform.3mf", - "platform_offset": [0, -0.25, 0], - "machine_extruder_trains": - { - "0": "kossel_mini_extruder_0" - } + "machine_extruder_trains": { "0": "kossel_mini_extruder_0" }, + "platform_offset": [ + 0, + -0.25, + 0 + ] }, - - "overrides": { - "machine_heated_bed": { - "default_value": true - }, - "machine_width": { - "default_value": 170 - }, - "machine_height": { - "default_value": 200 - }, - "machine_depth": { - "default_value": 170 - }, - "machine_center_is_zero": { - "default_value": true - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 ;Home all axes (max endstops)\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG28 ;Home all axes (max endstops)\nM84 ;steppers off\nG90 ;absolute positioning" - }, - "machine_shape": { - "default_value": "elliptic" - } + "overrides": + { + "machine_center_is_zero": { "default_value": true }, + "machine_depth": { "default_value": 170 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG28 ;Home all axes (max endstops)\nM84 ;steppers off\nG90 ;absolute positioning" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 200 }, + "machine_shape": { "default_value": "elliptic" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 ;Home all axes (max endstops)\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, + "machine_width": { "default_value": 170 } } -} +} \ No newline at end of file diff --git a/resources/definitions/kossel_pro.def.json b/resources/definitions/kossel_pro.def.json index 11a08ed6d6..8090a1d832 100644 --- a/resources/definitions/kossel_pro.def.json +++ b/resources/definitions/kossel_pro.def.json @@ -2,45 +2,30 @@ "version": 2, "name": "Kossel Pro", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Chris Petersen", "manufacturer": "Johann", "file_formats": "text/x-gcode", "platform": "kossel_pro_build_platform.3mf", - "platform_offset": [0, -0.25, 0], - "machine_extruder_trains": - { - "0": "kossel_pro_extruder_0" - } + "machine_extruder_trains": { "0": "kossel_pro_extruder_0" }, + "platform_offset": [ + 0, + -0.25, + 0 + ] }, - "overrides": { - "machine_heated_bed": { - "default_value": true - }, - "machine_width": { - "default_value": 240 - }, - "machine_height": { - "default_value": 240 - }, - "machine_depth": { - "default_value": 240 - }, - "machine_center_is_zero": { - "default_value": true - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "; info: M303 E0 S200 C8 ; Pid auto-tune \n\nM140 S{material_bed_temperature}; Start heating up the base\nG28 ; Home to top 3 endstops\n; Autolevel and adjust first layer\n; Adjust this value to fit your own printer! (positive is thicker)\n; This default value is intentionally very high to accommodate the\n; variety of print heads used with this printer. Many of you will\n; need tiny values like Z0 or Z0.1. Use feeler gauges to dial this\n; in as accurately as possible.\nG29 Z10\n\n; Squirt and wipe ;\nM109 S220 ; Wait for the temp to hit 220\nG00 X125 Y-60 Z0.1 ;\nG92 E0 ;\nG01 E25 F100 ; Extrude a little bit to replace oozage from auto levelling\nG01 X90 Y-50 F6000 ;\nG01 Z5 ;\n\n; Set the extruder to the requested print temperature\nM104 S{material_print_temperature}\n" - }, - "machine_end_gcode": { - "default_value": "M104 S0 ; turn off temperature\nM140 S0 ; turn off bed\nG28 ; home all axes\nM84 ; disable motors\n" - }, - "machine_shape": { - "default_value": "elliptic" - } + "overrides": + { + "machine_center_is_zero": { "default_value": true }, + "machine_depth": { "default_value": 240 }, + "machine_end_gcode": { "default_value": "M104 S0 ; turn off temperature\nM140 S0 ; turn off bed\nG28 ; home all axes\nM84 ; disable motors\n" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 240 }, + "machine_shape": { "default_value": "elliptic" }, + "machine_start_gcode": { "default_value": "; info: M303 E0 S200 C8 ; Pid auto-tune \n\nM140 S{material_bed_temperature}; Start heating up the base\nG28 ; Home to top 3 endstops\n; Autolevel and adjust first layer\n; Adjust this value to fit your own printer! (positive is thicker)\n; This default value is intentionally very high to accommodate the\n; variety of print heads used with this printer. Many of you will\n; need tiny values like Z0 or Z0.1. Use feeler gauges to dial this\n; in as accurately as possible.\nG29 Z10\n\n; Squirt and wipe ;\nM109 S220 ; Wait for the temp to hit 220\nG00 X125 Y-60 Z0.1 ;\nG92 E0 ;\nG01 E25 F100 ; Extrude a little bit to replace oozage from auto levelling\nG01 X90 Y-50 F6000 ;\nG01 Z5 ;\n\n; Set the extruder to the requested print temperature\nM104 S{material_print_temperature}\n" }, + "machine_width": { "default_value": 240 } } -} +} \ No newline at end of file diff --git a/resources/definitions/kupido.def.json b/resources/definitions/kupido.def.json index 667f25a1c4..3a202653c4 100644 --- a/resources/definitions/kupido.def.json +++ b/resources/definitions/kupido.def.json @@ -8,41 +8,101 @@ "author": "Kupido", "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", "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", + "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" + ], "has_machine_quality": true, "has_materials": true, "has_variants": false, - "supports_usb_connection": false, - "machine_extruder_trains": - { - "0": "kupido_extruder_0" - } + "machine_extruder_trains": { "0": "kupido_extruder_0" }, + "platform_offset": [ + 0, + 0, + 0 + ], + "preferred_material": "generic_pla", + "supports_usb_connection": false }, - - "overrides": { + "overrides": + { + "adhesion_type": + { + "default_value": "raft", + "options": + { + "brim": "Brim", + "none": "None", + "raft": "Raft" + } + }, + "gantry_height": { "value": "55" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 195 }, + "machine_end_gcode": { "default_value": ";End GCode\nM104 S0 ;extruder heater off \nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nG28 Z0\nM84 ;steppers off\nG90 ;absolute positioning\n;{profile_string}" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [75, 18], + [18, 18], + [18, 35], + [75, 35] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 190 }, "machine_name": { "default_value": "KUPIDO" }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 195 }, - "machine_height": { "default_value": 190 }, - "machine_depth": { "default_value": 195 }, - "machine_center_is_zero": { "default_value": false }, - "gantry_height": { "value": "55" }, - "retraction_amount": { "default_value": 1 }, - "support_enable": { "default_value": true}, - "machine_head_with_fans_polygon": { - "default_value": [[75, 18],[18, 18],[18, 35],[75, 35]] - }, - "adhesion_type": {"options": {"raft": "Raft" ,"none": "None", "brim": "Brim"}, "default_value": "raft"}, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": - { - "default_value": ";Sliced at: {day} {date} {time} \n ;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density} \n ;Print time: {print_time} \n ;Filament used: {filament_amount}m {filament_weight}g \n ;Filament cost: {filament_cost} \n G28 X0 Y0 ;move X Y to endstops \n G28 Z0 ;move Z to endstops \n M190 S{material_bed_temperature} ;bed temp \n M107 ; switch fan off \n M109 S{material_print_temperature} ;extruder temp set \n G1 F3000 \n G1 Z10 \n G92 E0 ;zero the extruded length \n G1 F200 E1 ;extrude 1mm of feed stock \n G92 E0 ;zero the extruded length again \n G4 P7000 ; wait 7000ms \n M117 Printing... ;Put printing message on LCD screen" - }, - "machine_end_gcode": - { - "default_value": ";End GCode\nM104 S0 ;extruder heater off \nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nG28 Z0\nM84 ;steppers off\nG90 ;absolute positioning\n;{profile_string}" - } + "machine_start_gcode": { "default_value": ";Sliced at: {day} {date} {time} \n ;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density} \n ;Print time: {print_time} \n ;Filament used: {filament_amount}m {filament_weight}g \n ;Filament cost: {filament_cost} \n G28 X0 Y0 ;move X Y to endstops \n G28 Z0 ;move Z to endstops \n M190 S{material_bed_temperature} ;bed temp \n M107 ; switch fan off \n M109 S{material_print_temperature} ;extruder temp set \n G1 F3000 \n G1 Z10 \n G92 E0 ;zero the extruded length \n G1 F200 E1 ;extrude 1mm of feed stock \n G92 E0 ;zero the extruded length again \n G4 P7000 ; wait 7000ms \n M117 Printing... ;Put printing message on LCD screen" }, + "machine_width": { "default_value": 195 }, + "retraction_amount": { "default_value": 1 }, + "support_enable": { "default_value": true } } } \ No newline at end of file diff --git a/resources/definitions/leapfrog_bolt_pro.def.json b/resources/definitions/leapfrog_bolt_pro.def.json index e7ccc76735..a5b0a53345 100644 --- a/resources/definitions/leapfrog_bolt_pro.def.json +++ b/resources/definitions/leapfrog_bolt_pro.def.json @@ -2,21 +2,13 @@ "version": 2, "name": "Leapfrog Bolt Pro", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Karan and Vincent 20191104", "manufacturer": "Leapfrog B.V.", - "platform": "leapfrog_bolt_pro_platform.3mf", - "platform_offset": [0, 0, -14], "file_formats": "text/x-gcode", - "supports_usb_connection": false, - "supports_network_connection": false, - "has_materials": true, - "has_machine_quality": true, - "has_variants": true, - "preferred_variant_name": "Brass 0.4", - "preferred_material": "leapfrog_epla_natural", - "variants_name": "Hot end", + "platform": "leapfrog_bolt_pro_platform.3mf", "exclude_materials": [ "generic_pla_175", "generic_abs_175", @@ -71,44 +63,66 @@ "zyyx_pro_flex", "zyyx_pro_pla" ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, "machine_extruder_trains": { "0": "leapfrog_bolt_pro_extruder_right", "1": "leapfrog_bolt_pro_extruder_left" - } + }, + "platform_offset": [ + 0, + 0, + -14 + ], + "preferred_material": "leapfrog_epla_natural", + "preferred_variant_name": "Brass 0.4", + "supports_network_connection": false, + "supports_usb_connection": false, + "variants_name": "Hot end" }, - "overrides": { - "machine_name": {"default_value": "Leapfrog Bolt Pro" }, - "machine_extruder_count": {"default_value": 2}, - "machine_center_is_zero": {"default_value": false}, - "machine_width": {"default_value": 302}, - "machine_height": {"default_value": 205}, - "machine_depth": {"default_value": 322}, - "machine_heated_bed": {"default_value": true}, - "machine_head_with_fans_polygon": {"default_value": [[-60, 110 ], [-60, -45], [60, -45 ], [60, 110]]}, - "machine_max_feedrate_z": {"default_value": 16.7 }, - "machine_max_feedrate_e": {"default_value": 50 }, - "machine_max_acceleration_z": {"default_value": 100 }, - "machine_acceleration": {"default_value": 400 }, - "machine_max_jerk_xy": {"default_value": 20 }, - "machine_max_jerk_z": {"default_value": 0.4 }, - "machine_max_jerk_e": {"default_value": 5 }, - "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"}, - "material_final_print_temperature": {"value": "default_material_print_temperature" }, - "material_initial_print_temperature": {"value": "default_material_print_temperature" }, - "gantry_height": {"value": "20"}, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "build_volume_temperature": { "enabled": false }, + "gantry_height": { "value": "20" }, + "machine_acceleration": { "default_value": 400 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 322 }, + "machine_end_gcode": { "default_value": "G92 E0\nG1 E-3 F300\nM104 S0 T0\nM104 S0 T1\nM140 S0\nG28 X0 Y0\nM84" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-60, 110], + [-60, -45], + [60, -45], + [60, 110] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 205 }, + "machine_max_acceleration_z": { "default_value": 100 }, + "machine_max_feedrate_e": { "default_value": 50 }, + "machine_max_feedrate_z": { "default_value": 16.7 }, + "machine_max_jerk_e": { "default_value": 5 }, + "machine_max_jerk_xy": { "default_value": 20 }, + "machine_max_jerk_z": { "default_value": 0.4 }, + "machine_name": { "default_value": "Leapfrog Bolt Pro" }, + "machine_start_gcode": { "default_value": "G90\nG28 X0 Y0 Z0\nG1 Z5 F1000\nG92 E0\nG1 Y-32 F12000\nG1 E15 F1000\nG1 E45 F150\nG4 S5" }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, + "machine_width": { "default_value": 302 }, + "material_final_print_temperature": { "value": "default_material_print_temperature" }, + "material_initial_print_temperature": { "value": "default_material_print_temperature" }, + "material_standby_temperature": { "enabled": false }, + "prime_tower_enable": { "resolve": "extruders_enabled_count > 1" }, + "prime_tower_position_x": { "value": "169" }, + "prime_tower_position_y": { "value": "25" }, + "retraction_amount": { "default_value": 2 }, "retraction_combing": { "value": "'all'" }, - "retraction_amount": {"default_value": 2}, - "adhesion_type": {"default_value": "skirt"}, - "skirt_line_count": {"default_value": 3}, - "machine_use_extruder_offset_to_offset_coords": {"default_value": true}, - "machine_start_gcode": {"default_value": "G90\nG28 X0 Y0 Z0\nG1 Z5 F1000\nG92 E0\nG1 Y-32 F12000\nG1 E15 F1000\nG1 E45 F150\nG4 S5"}, - "machine_end_gcode": {"default_value": "G92 E0\nG1 E-3 F300\nM104 S0 T0\nM104 S0 T1\nM140 S0\nG28 X0 Y0\nM84"}, - "prime_tower_enable": { "resolve": "extruders_enabled_count > 1"}, - "prime_tower_position_x": {"value": "169" }, - "prime_tower_position_y": {"value": "25" }, - "speed_travel": { "value": "200" }, - "build_volume_temperature": {"enabled": false}, - "material_standby_temperature": {"enabled": false } + "skirt_line_count": { "default_value": 3 }, + "speed_travel": { "value": "200" } } -} +} \ No newline at end of file diff --git a/resources/definitions/leapfrog_creatr_hs.def.json b/resources/definitions/leapfrog_creatr_hs.def.json index 762e1e88e2..be417802ec 100644 --- a/resources/definitions/leapfrog_creatr_hs.def.json +++ b/resources/definitions/leapfrog_creatr_hs.def.json @@ -1,35 +1,43 @@ { - "version": 2, + "version": 2, "name": "Leapfrog Creatr HS", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Psychometer", "manufacturer": "Leapfrog B.V.", "file_formats": "text/x-gcode", - "supports_usb_connection": true, "machine_extruder_trains": { "0": "leapfrog_creatr_hs_extruder_right", "1": "leapfrog_creatr_hs_extruder_left" - } + }, + "supports_usb_connection": true }, - "overrides": { - "machine_name": {"default_value": "Leapfrog Creatr HS" }, - "machine_width": {"default_value": 270}, - "machine_depth": {"default_value": 280}, - "machine_height": {"default_value": 180}, - "machine_shape": { "default_value": "Rectangular"}, - "machine_center_is_zero": {"default_value": false}, - "machine_heated_bed": {"default_value": true}, - "build_volume_temperature": {"enabled": false}, - "machine_gcode_flavor": {"default_value": "Marlin"}, - - "machine_head_with_fans_polygon": {"default_value": [[-40, -50 ], [-40, 100], [40, -50 ], [40, 100]]}, - "gantry_height": {"value": "2"}, - "machine_extruder_count": {"default_value": 2}, - - "machine_start_gcode": {"default_value": "M107 ; start with the fan off\nG28 X0 Y0 ; home XY axes\nG28 Z0 ; home Z\nG92 X0 Y0 Z0 E0 ; reset software positions\nG1 Z15.0 F180\nT0\nG92 E0 ; zero the extruded length\nG1 E3 F200\nG92 E0 ; zero the extruded length again\nG1 F225"}, - "machine_end_gcode": {"default_value": "M104 S0 T0 ; turn off right extruder\nM104 S0 T1 ; turn off left extruder\nM140 S0 T0 ; turn off bed\nG1 Z200 F1200 ; drop bed\nG28 X0 ; home X axis\nM84 ; disable motors"} + "overrides": + { + "build_volume_temperature": { "enabled": false }, + "gantry_height": { "value": "2" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 280 }, + "machine_end_gcode": { "default_value": "M104 S0 T0 ; turn off right extruder\nM104 S0 T1 ; turn off left extruder\nM140 S0 T0 ; turn off bed\nG1 Z200 F1200 ; drop bed\nG28 X0 ; home X axis\nM84 ; disable motors" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "Marlin" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-40, -50], + [-40, 100], + [40, -50], + [40, 100] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 180 }, + "machine_name": { "default_value": "Leapfrog Creatr HS" }, + "machine_shape": { "default_value": "Rectangular" }, + "machine_start_gcode": { "default_value": "M107 ; start with the fan off\nG28 X0 Y0 ; home XY axes\nG28 Z0 ; home Z\nG92 X0 Y0 Z0 E0 ; reset software positions\nG1 Z15.0 F180\nT0\nG92 E0 ; zero the extruded length\nG1 E3 F200\nG92 E0 ; zero the extruded length again\nG1 F225" }, + "machine_width": { "default_value": 270 } } -} +} \ No newline at end of file diff --git a/resources/definitions/leapfrog_creatr_hs_xl.def.json b/resources/definitions/leapfrog_creatr_hs_xl.def.json index 78567ac647..a22494bc93 100644 --- a/resources/definitions/leapfrog_creatr_hs_xl.def.json +++ b/resources/definitions/leapfrog_creatr_hs_xl.def.json @@ -1,35 +1,43 @@ { - "version": 2, + "version": 2, "name": "Leapfrog Creatr HS XL", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Psychometer", "manufacturer": "Leapfrog B.V.", "file_formats": "text/x-gcode", - "supports_usb_connection": true, "machine_extruder_trains": { "0": "leapfrog_creatr_hs_xl_extruder_right", "1": "leapfrog_creatr_hs_xl_extruder_left" - } + }, + "supports_usb_connection": true }, - "overrides": { - "machine_name": {"default_value": "Leapfrog Creatr HS XL" }, - "machine_width": {"default_value": 270}, - "machine_depth": {"default_value": 280}, - "machine_height": {"default_value": 590}, - "machine_shape": { "default_value": "Rectangular"}, - "machine_center_is_zero": {"default_value": false}, - "machine_heated_bed": {"default_value": true}, - "build_volume_temperature": {"enabled": false}, - "machine_gcode_flavor": {"default_value": "Marlin"}, - - "machine_head_with_fans_polygon": {"default_value": [[-40, -50 ], [-40, 100], [40, -50 ], [40, 100]]}, - "gantry_height": {"value": "2"}, - "machine_extruder_count": {"default_value": 2}, - - "machine_start_gcode": {"default_value": "M107 ; start with the fan off\nG28 X0 Y0 ; home XY axes\nG28 Z0 ; home Z\nG92 X0 Y0 Z0 E0 ; reset software positions\nG1 Z15.0 F180\nT0\nG92 E0 ; zero the extruded length\nG1 E3 F200\nG92 E0 ; zero the extruded length again\nG1 F225"}, - "machine_end_gcode": {"default_value": "G92 E0 ; Zero extruder\nG1 E-6.00 F1500 ; Retract filament\nM104 S0 T0 ; turn off right extruder\nM104 S0 T1 ; turn off left extruder\nM140 S0 T0 ; turn off bed\nG1 Z590 F1200 ; drop bed\nG28 X0 ; home X axis\nG1 Y270 F12000 ; Move Y axis to the backside\nM84 ; disable motors"} + "overrides": + { + "build_volume_temperature": { "enabled": false }, + "gantry_height": { "value": "2" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 280 }, + "machine_end_gcode": { "default_value": "G92 E0 ; Zero extruder\nG1 E-6.00 F1500 ; Retract filament\nM104 S0 T0 ; turn off right extruder\nM104 S0 T1 ; turn off left extruder\nM140 S0 T0 ; turn off bed\nG1 Z590 F1200 ; drop bed\nG28 X0 ; home X axis\nG1 Y270 F12000 ; Move Y axis to the backside\nM84 ; disable motors" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "Marlin" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-40, -50], + [-40, 100], + [40, -50], + [40, 100] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 590 }, + "machine_name": { "default_value": "Leapfrog Creatr HS XL" }, + "machine_shape": { "default_value": "Rectangular" }, + "machine_start_gcode": { "default_value": "M107 ; start with the fan off\nG28 X0 Y0 ; home XY axes\nG28 Z0 ; home Z\nG92 X0 Y0 Z0 E0 ; reset software positions\nG1 Z15.0 F180\nT0\nG92 E0 ; zero the extruded length\nG1 E3 F200\nG92 E0 ; zero the extruded length again\nG1 F225" }, + "machine_width": { "default_value": 270 } } -} +} \ No newline at end of file diff --git a/resources/definitions/liquid.def.json b/resources/definitions/liquid.def.json index e9617ab141..200c6b9c8e 100644 --- a/resources/definitions/liquid.def.json +++ b/resources/definitions/liquid.def.json @@ -2,99 +2,37 @@ "version": 2, "name": "Liquid", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Liquid 3D", "manufacturer": "Liquid 3D", "file_formats": "text/x-gcode", - "icon": "icon_ultimaker2", "platform": "liquid_platform.stl", + "exclude_materials": [ + "generic_hips", + "generic_pva", + "structur3d_dap100silicone" + ], "has_machine_quality": true, "has_materials": true, "has_variant_buildplates": false, "has_variants": true, - "exclude_materials": [ "generic_hips", "generic_pva", "structur3d_dap100silicone" ], - "preferred_variant_name": "VO 0.4", - "preferred_quality_type": "normal", - "variants_name": "Extruder", - "supports_usb_connection": true, + "icon": "icon_ultimaker2", + "machine_extruder_trains": { "0": "liquid_extruder" }, "nozzle_offsetting_for_disallowed_areas": false, - "weight": -1, - "machine_extruder_trains": - { - "0": "liquid_extruder" - } + "preferred_quality_type": "normal", + "preferred_variant_name": "VO 0.4", + "supports_usb_connection": true, + "variants_name": "Extruder", + "weight": -1 }, - - "overrides": { - "machine_name": { "default_value": "Liquid" }, - "machine_width": { "default_value": 200 }, - "machine_depth": { "default_value": 200 }, - "machine_height": { "default_value": 200 }, - "machine_heated_bed": { "default_value": true }, - "machine_nozzle_heat_up_speed": { "default_value": 1.4 }, - "machine_nozzle_cool_down_speed": { "default_value": 0.8 }, - "machine_gcode_flavor": { "default_value": "RepRap (RepRap)" }, - "machine_start_gcode": { - "default_value": "G21 ; set units to millimeters\nG90 ; use absolute positioning\nM83 ; relative extrusion mode\nM104 S{material_print_temperature_layer_0} ; set extruder temp\nM140 S{material_bed_temperature_layer_0} ; set bed temp\nM190 S{material_bed_temperature_layer_0} ; wait for bed temp\nM109 S{material_print_temperature_layer_0} ; wait for extruder temp\nG32 ; mesh bed leveling\nG92 E0.0 ; reset extruder distance position\nG1 X0 Y-2 Z0.3 F4000.0 ; go outside print area\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X110.0 E15.5 F1000.0 ; intro line\nG92 E0.0 ; reset extruder distance position" - }, - "machine_end_gcode": { - "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off heatbed\nM106 S0 ; turn off fan\nG91 ; relative positioning\nG1 Z1 F360 ; lift Z by 1mm\nG90 ; absolute positioning\nG1 X10 Y200 F3200; home X axis and push Y forward\nG1 Z200 F1200; home Z axis\nM84 ; disable motors" - }, - "machine_head_with_fans_polygon": - { - "default_value": - [ - [ -65.0, -45.0 ], - [ -65.0, 30.0 ], - [ 50.0, 30.0 ], - [ 50.0, -45.0 ] - ] - }, - "machine_max_feedrate_x": { "default_value": 300 }, - "machine_max_feedrate_y": { "default_value": 300 }, - "machine_max_feedrate_z": { "default_value": 40 }, - "machine_max_feedrate_e": { - "default_value": 45 - }, - "machine_acceleration": { "default_value": 3000 }, - "gantry_height": { "value": "67" }, - - "material_diameter": { "default_value": 1.75 }, - "material_print_temperature": { - "minimum_value": "0" - }, - "material_bed_temperature": { - "minimum_value": "0", - "maximum_value_warning": "125" - }, - "material_bed_temperature_layer_0": - { - "maximum_value_warning": "125" - }, - "material_standby_temperature": { - "minimum_value": "0" - }, - - "speed_travel": - { - "maximum_value": "150", - "value": "150" - }, - - "relative_extrusion": - { - "value": true, - "enabled": true - }, + "overrides": + { "acceleration_enabled": { "value": true }, "acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, "acceleration_print": { "value": "4000" }, - "line_width": { "value": "machine_nozzle_size * 0.875" }, - "machine_min_cool_heat_time_window": { "value": "15" }, - "default_material_print_temperature": { "value": "200" }, - "multiple_mesh_overlap": { "value": "0" }, "acceleration_support_interface": { "value": "acceleration_topbottom" }, "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 500 / 4000)" }, "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 4000)" }, @@ -104,10 +42,13 @@ "cool_fan_speed": { "value": "70" }, "cool_fan_speed_max": { "value": "100" }, "cool_min_speed": { "value": "30" }, + "default_material_print_temperature": { "value": "200" }, + "gantry_height": { "value": "67" }, "infill_line_width": { "value": "round(line_width * 0.5 / 0.35, 2)" }, "infill_overlap": { "value": "0" }, "infill_pattern": { "value": "'triangles'" }, "infill_wipe_dist": { "value": "0" }, + "initial_layer_line_width_factor": { "value": "120" }, "jerk_enabled": { "value": "True" }, "jerk_layer_0": { "value": "jerk_topbottom" }, "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 15)" }, @@ -118,7 +59,45 @@ "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 15)" }, "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" }, "layer_height_0": { "value": "0.2" }, - + "line_width": { "value": "machine_nozzle_size * 0.875" }, + "machine_acceleration": { "default_value": 3000 }, + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off heatbed\nM106 S0 ; turn off fan\nG91 ; relative positioning\nG1 Z1 F360 ; lift Z by 1mm\nG90 ; absolute positioning\nG1 X10 Y200 F3200; home X axis and push Y forward\nG1 Z200 F1200; home Z axis\nM84 ; disable motors" }, + "machine_gcode_flavor": { "default_value": "RepRap (RepRap)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-65.0, -45.0], + [-65.0, 30.0], + [50.0, 30.0], + [50.0, -45.0] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 200 }, + "machine_max_feedrate_e": { "default_value": 45 }, + "machine_max_feedrate_x": { "default_value": 300 }, + "machine_max_feedrate_y": { "default_value": 300 }, + "machine_max_feedrate_z": { "default_value": 40 }, + "machine_min_cool_heat_time_window": { "value": "15" }, + "machine_name": { "default_value": "Liquid" }, + "machine_nozzle_cool_down_speed": { "default_value": 0.8 }, + "machine_nozzle_heat_up_speed": { "default_value": 1.4 }, + "machine_start_gcode": { "default_value": "G21 ; set units to millimeters\nG90 ; use absolute positioning\nM83 ; relative extrusion mode\nM104 S{material_print_temperature_layer_0} ; set extruder temp\nM140 S{material_bed_temperature_layer_0} ; set bed temp\nM190 S{material_bed_temperature_layer_0} ; wait for bed temp\nM109 S{material_print_temperature_layer_0} ; wait for extruder temp\nG32 ; mesh bed leveling\nG92 E0.0 ; reset extruder distance position\nG1 X0 Y-2 Z0.3 F4000.0 ; go outside print area\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X110.0 E15.5 F1000.0 ; intro line\nG92 E0.0 ; reset extruder distance position" }, + "machine_width": { "default_value": 200 }, + "material_bed_temperature": + { + "maximum_value_warning": "125", + "minimum_value": "0" + }, + "material_bed_temperature_layer_0": { "maximum_value_warning": "125" }, + "material_diameter": { "default_value": 1.75 }, + "material_print_temperature": { "minimum_value": "0" }, + "material_standby_temperature": { "minimum_value": "0" }, + "meshfix_maximum_deviation": { "value": "layer_height / 4" }, + "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 100" }, + "multiple_mesh_overlap": { "value": "0" }, + "optimize_wall_printing_order": { "value": "True" }, "raft_airgap": { "value": "0" }, "raft_base_speed": { "value": "20" }, "raft_base_thickness": { "value": "0.3" }, @@ -130,18 +109,22 @@ "raft_margin": { "value": "10" }, "raft_speed": { "value": "25" }, "raft_surface_layers": { "value": "1" }, - + "relative_extrusion": + { + "enabled": true, + "value": true + }, "retraction_amount": { "value": "3" }, + "retraction_combing": { "value": "'all'" }, "retraction_count_max": { "value": "10" }, "retraction_extrusion_window": { "value": "1" }, "retraction_hop": { "value": "2" }, - "retraction_hop_enabled": { "value": "True" }, + "retraction_hop_enabled": { "value": "True" }, "retraction_hop_only_when_collides": { "value": "True" }, "retraction_min_travel": { "value": "5" }, - "retraction_speed": { "value": "35" }, - "retraction_retract_speed": { "value": "35" }, "retraction_prime_speed": { "value": "35" }, - + "retraction_retract_speed": { "value": "35" }, + "retraction_speed": { "value": "35" }, "skin_overlap": { "value": "10" }, "speed_layer_0": { "value": "20" }, "speed_prime_tower": { "value": "speed_topbottom" }, @@ -149,29 +132,26 @@ "speed_support": { "value": "speed_wall_0" }, "speed_support_interface": { "value": "speed_topbottom" }, "speed_topbottom": { "value": "math.ceil(speed_print * 20 / 35)" }, + "speed_travel": + { + "maximum_value": "150", + "value": "150" + }, "speed_wall": { "value": "math.ceil(speed_print * 30 / 35)" }, "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 30)" }, "speed_wall_x": { "value": "speed_wall" }, - "support_angle": { "value": "45" }, "support_pattern": { "value": "'triangles'" }, "support_use_towers": { "value": "False" }, "support_xy_distance": { "value": "wall_line_width_0 * 2.5" }, "support_xy_distance_overhang": { "value": "wall_line_width_0" }, "support_z_distance": { "value": "0" }, - "top_bottom_thickness": { "value": "1" }, - "travel_avoid_supports": { "value": "True" }, "travel_avoid_distance": { "value": "machine_nozzle_tip_outer_diameter / 2 * 1.5" }, - + "travel_avoid_supports": { "value": "True" }, "wall_0_inset": { "value": "0" }, "wall_line_width_x": { "value": "round(line_width * 0.3 / 0.35, 2)" }, "wall_thickness": { "value": "1" }, - "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 100" }, - "meshfix_maximum_deviation": { "value": "layer_height / 4" }, - "optimize_wall_printing_order": { "value": "True" }, - "retraction_combing": { "value": "'all'" }, - "initial_layer_line_width_factor": { "value": "120" }, "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" } } -} +} \ No newline at end of file diff --git a/resources/definitions/longer_base.def.json b/resources/definitions/longer_base.def.json index 435b3000ab..ac479895b1 100644 --- a/resources/definitions/longer_base.def.json +++ b/resources/definitions/longer_base.def.json @@ -1,157 +1,129 @@ { - "name": "Longer Base Printer", "version": 2, + "name": "Longer Base Printer", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": false, "author": "Longer", "manufacturer": "Longer", "file_formats": "text/x-gcode", - "first_start_actions": ["MachineSettingsAction"], - - "machine_extruder_trains": { - "0": "longer_base_extruder_0" - }, - + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true, - "variants_name": "Nozzle Size", - - "preferred_variant_name": "0.4mm Nozzle", + "machine_extruder_trains": { "0": "longer_base_extruder_0" }, + "preferred_material": "generic_pla", "preferred_quality_type": "standard", - "preferred_material": "generic_pla" - + "preferred_variant_name": "0.4mm Nozzle", + "variants_name": "Nozzle Size" }, - "overrides": { - "machine_name": { "default_value": "LONGER Base Printer" }, - "machine_start_gcode": { "default_value": "; LONGER Start G-code\nG21 ; metric values\nG90 ; absolute positioning\nM82 ; set extruder to absolute mode\nM107 ; start with the fan off\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish\n" }, - "machine_end_gcode": { "default_value": "; LONGER End G-code\nG91 ;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\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\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 }, - + "overrides": + { + "acceleration_enabled": { "value": false }, "acceleration_print": { "value": 500 }, + "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, "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" }, - + "adaptive_layer_height_variation": { "value": 0.04 }, + "adaptive_layer_height_variation_step": { "value": 0.04 }, + "adhesion_type": { "value": "'raft'" }, + "brim_replaces_support": { "value": false }, + "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, + "cool_min_layer_time": { "value": 10 }, + "fill_outline_gaps": { "value": false }, + "infill_before_walls": { "value": false }, + "infill_overlap": { "value": 30.0 }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, + "infill_wipe_dist": { "value": 0.0 }, + "jerk_enabled": { "value": false }, "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": 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_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" }, - - - "optimize_wall_printing_order": { "value": "True" }, - - "material_initial_print_temperature": { "value": "material_print_temperature" }, + "machine_acceleration": { "value": 500 }, + "machine_end_gcode": { "default_value": "; LONGER End G-code\nG91 ;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\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z\n" }, + "machine_heated_bed": { "default_value": true }, + "machine_max_acceleration_e": { "value": 5000 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 100 }, + "machine_max_feedrate_e": { "value": 50 }, + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_jerk_e": { "value": 5 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.4 }, + "machine_name": { "default_value": "LONGER Base Printer" }, + "machine_start_gcode": { "default_value": "; LONGER Start G-code\nG21 ; metric values\nG90 ; absolute positioning\nM82 ; set extruder to absolute mode\nM107 ; start with the fan off\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish\n" }, + "material_diameter": { "default_value": 1.75 }, "material_final_print_temperature": { "value": "material_print_temperature" }, - - "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 }, - + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "meshfix_maximum_resolution": { "value": "0.25" }, + "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" }, + "minimum_interface_area": { "value": 10 }, + "minimum_support_area": { "value": 2 }, + "optimize_wall_printing_order": { "value": "True" }, "retraction_amount": { "default_value": 5 }, - "retraction_speed": { - "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", - "maximum_value": 200, - "default_value": 45 - }, - "retraction_retract_speed": { - "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", - "maximum_value": 200 - }, - "retraction_prime_speed": { - "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", - "maximum_value": 200 - }, - - "retraction_hop": { "value": 0.2 }, "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, "retraction_combing_max_distance": { "value": 30 }, + "retraction_count_max": { "value": 100 }, + "retraction_extrusion_window": { "value": 10 }, + "retraction_hop": { "value": 0.2 }, + "retraction_min_travel": { "value": 1.5 }, + "retraction_prime_speed": + { + "maximum_value": 200, + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')" + }, + "retraction_retract_speed": + { + "maximum_value": 200, + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')" + }, + "retraction_speed": + { + "default_value": 45, + "maximum_value": 200, + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')" + }, + "skin_overlap": { "value": 10.0 }, + "skirt_brim_speed": { "value": "speed_layer_0" }, + "skirt_gap": { "value": 10.0 }, + "skirt_line_count": { "value": 3 }, + "speed_layer_0": { "value": 20.0 }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_print": { "value": 50.0 }, + "speed_roofing": { "value": "speed_topbottom" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_support_interface": { "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_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, + "speed_wall_x": { "value": "speed_wall" }, + "speed_z_hop": { "value": 5 }, + "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 4 }, + "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_enable": { "value": true }, + "support_interface_height": { "value": "layer_height * 4" }, + "support_interface_pattern": { "value": "'grid'" }, + "support_interface_skip_height": { "value": 0.2 }, + "support_pattern": { "value": "'zigzag'" }, + "support_use_towers": { "value": false }, + "support_wall_count": { "value": 1 }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, "travel_avoid_other_parts": { "value": true }, "travel_avoid_supports": { "value": true }, "travel_retract_before_outer_wall": { "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_min_layer_time": { "value": 10 }, - - "adhesion_type": { "value": "'raft'" }, - "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": 2 }, - "minimum_interface_area": { "value": 10 }, - "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, - "wall_thickness": {"value": "line_width * 2" } - + "wall_0_wipe_dist": { "value": 0.0 }, + "wall_thickness": { "value": "line_width * 2" }, + "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, + "z_seam_type": { "value": "'back'" } } -} +} \ No newline at end of file diff --git a/resources/definitions/longer_cube2.def.json b/resources/definitions/longer_cube2.def.json index a971da6c54..87ae407b37 100644 --- a/resources/definitions/longer_cube2.def.json +++ b/resources/definitions/longer_cube2.def.json @@ -1,34 +1,37 @@ { - "name": "Longer Cube2", "version": 2, + "name": "Longer Cube2", "inherits": "longer_base", - "metadata": { - "quality_definition": "longer_base", + "metadata": + { "visible": true, "platform": "longer_cube2_platform.stl", - "platform_offset": [-60, -3 ,70] + "platform_offset": [ + -60, + -3, + 70 + ], + "quality_definition": "longer_base" }, - "overrides": { - "machine_name": { "default_value": "LONGER Cube2" }, - "machine_start_gcode": { "default_value": "; LONGER Cube2 Start G-code\nG21 ; metric values\nG90 ; absolute positioning\nM82 ; set extruder to absolute mode\nM107 ; start with the fan off\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\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 Y120.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y120.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish\n" }, - "machine_end_gcode": { "default_value": "; LONGER Cube2 End G-code\nG91 ;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\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM84 X Y E ;Disable all steppers but Z\n" }, - - "machine_heated_bed": { "default_value": false }, - - "machine_width": { "default_value": 120 }, + "overrides": + { + "gantry_height": { "value": 18 }, "machine_depth": { "default_value": 140 }, - "machine_height": { "default_value": 105 }, - - "machine_head_with_fans_polygon": { "default_value": [ + "machine_end_gcode": { "default_value": "; LONGER Cube2 End G-code\nG91 ;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\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM84 X Y E ;Disable all steppers but Z\n" }, + "machine_head_with_fans_polygon": + { + "default_value": [ [-22, 31], [-22, -21], [14, -21], [14, 31] ] }, - - "gantry_height": { "value": 18 }, - + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 105 }, + "machine_name": { "default_value": "LONGER Cube2" }, + "machine_start_gcode": { "default_value": "; LONGER Cube2 Start G-code\nG21 ; metric values\nG90 ; absolute positioning\nM82 ; set extruder to absolute mode\nM107 ; start with the fan off\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\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 Y120.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y120.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish\n" }, + "machine_width": { "default_value": 120 }, "speed_travel": { "value": 65 } } -} +} \ No newline at end of file diff --git a/resources/definitions/longer_lk1.def.json b/resources/definitions/longer_lk1.def.json index 42cbb8a4d3..44bfa2b49e 100644 --- a/resources/definitions/longer_lk1.def.json +++ b/resources/definitions/longer_lk1.def.json @@ -1,29 +1,34 @@ { - "name": "Longer LK1", "version": 2, + "name": "Longer LK1", "inherits": "longer_base", - "metadata": { - "quality_definition": "longer_base", + "metadata": + { "visible": true, "platform": "longer_310mm_platform.stl", - "platform_offset": [-155, -3 ,155] + "platform_offset": [ + -155, + -3, + 155 + ], + "quality_definition": "longer_base" }, - "overrides": { - "machine_name": { "default_value": "LONGER LK1" }, - "machine_width": { "default_value": 300 }, + "overrides": + { + "gantry_height": { "value": 33 }, "machine_depth": { "default_value": 300 }, - "machine_height": { "default_value": 400 }, - - "machine_head_with_fans_polygon": { "default_value": [ + "machine_head_with_fans_polygon": + { + "default_value": [ [-22, 39], [-22, -34], [58, -34], [58, 39] ] }, - - "gantry_height": { "value": 33 }, - + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "LONGER LK1" }, + "machine_width": { "default_value": 300 }, "speed_travel": { "value": 65 } } -} +} \ No newline at end of file diff --git a/resources/definitions/longer_lk1plus.def.json b/resources/definitions/longer_lk1plus.def.json index 46d5e424de..da3bd3291c 100644 --- a/resources/definitions/longer_lk1plus.def.json +++ b/resources/definitions/longer_lk1plus.def.json @@ -1,29 +1,34 @@ { - "name": "Longer LK1 Plus", "version": 2, + "name": "Longer LK1 Plus", "inherits": "longer_base", - "metadata": { - "quality_definition": "longer_base", + "metadata": + { "visible": true, "platform": "longer_415mm_platform.stl", - "platform_offset": [-207.5, -3 ,207.5] + "platform_offset": [ + -207.5, + -3, + 207.5 + ], + "quality_definition": "longer_base" }, - "overrides": { - "machine_name": { "default_value": "LONGER LK1 Plus" }, - "machine_width": { "default_value": 400 }, + "overrides": + { + "gantry_height": { "value": 33 }, "machine_depth": { "default_value": 400 }, - "machine_height": { "default_value": 500 }, - - "machine_head_with_fans_polygon": { "default_value": [ + "machine_head_with_fans_polygon": + { + "default_value": [ [-22, 39], [-22, -34], [58, -34], [58, 39] ] }, - - "gantry_height": { "value": 33 }, - + "machine_height": { "default_value": 500 }, + "machine_name": { "default_value": "LONGER LK1 Plus" }, + "machine_width": { "default_value": 400 }, "speed_travel": { "value": 65 } } -} +} \ No newline at end of file diff --git a/resources/definitions/longer_lk1pro.def.json b/resources/definitions/longer_lk1pro.def.json index ee0a2e0ac7..384ba5a912 100644 --- a/resources/definitions/longer_lk1pro.def.json +++ b/resources/definitions/longer_lk1pro.def.json @@ -1,27 +1,33 @@ { - "name": "Longer LK1 Pro", "version": 2, + "name": "Longer LK1 Pro", "inherits": "longer_base", - "metadata": { - "quality_definition": "longer_base", + "metadata": + { "visible": true, "platform": "longer_310mm_platform.stl", - "platform_offset": [-155, -3 ,155] + "platform_offset": [ + -155, + -3, + 155 + ], + "quality_definition": "longer_base" }, - "overrides": { - "machine_name": { "default_value": "LONGER LK1 Pro" }, - "machine_width": { "default_value": 300 }, + "overrides": + { + "gantry_height": { "value": 33 }, "machine_depth": { "default_value": 300 }, - "machine_height": { "default_value": 400 }, - - "machine_head_with_fans_polygon": { "default_value": [ + "machine_head_with_fans_polygon": + { + "default_value": [ [-22, 39], [-22, -34], [58, -34], [58, 39] ] }, - - "gantry_height": { "value": 33 } + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "LONGER LK1 Pro" }, + "machine_width": { "default_value": 300 } } -} +} \ No newline at end of file diff --git a/resources/definitions/longer_lk4.def.json b/resources/definitions/longer_lk4.def.json index 2639265014..607aef894c 100644 --- a/resources/definitions/longer_lk4.def.json +++ b/resources/definitions/longer_lk4.def.json @@ -1,29 +1,34 @@ { - "name": "Longer LK4", "version": 2, + "name": "Longer LK4", "inherits": "longer_base", - "metadata": { - "quality_definition": "longer_base", + "metadata": + { "visible": true, "platform": "longer_235mm_platform.stl", - "platform_offset": [-117.5, -3 ,117.5] + "platform_offset": [ + -117.5, + -3, + 117.5 + ], + "quality_definition": "longer_base" }, - "overrides": { - "machine_name": { "default_value": "LONGER LK4" }, - "machine_width": { "default_value": 220 }, + "overrides": + { + "gantry_height": { "value": 33 }, "machine_depth": { "default_value": 220 }, - "machine_height": { "default_value": 250 }, - - "machine_head_with_fans_polygon": { "default_value": [ + "machine_head_with_fans_polygon": + { + "default_value": [ [-22, 39], [-22, -34], [58, -34], [58, 39] ] }, - - "gantry_height": { "value": 33 }, - + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "LONGER LK4" }, + "machine_width": { "default_value": 220 }, "speed_travel": { "value": 65 } } -} +} \ No newline at end of file diff --git a/resources/definitions/longer_lk4pro.def.json b/resources/definitions/longer_lk4pro.def.json index 6cd83b6048..481887ed0b 100644 --- a/resources/definitions/longer_lk4pro.def.json +++ b/resources/definitions/longer_lk4pro.def.json @@ -1,27 +1,33 @@ { - "name": "Longer LK4 Pro", "version": 2, + "name": "Longer LK4 Pro", "inherits": "longer_base", - "metadata": { - "quality_definition": "longer_base", + "metadata": + { "visible": true, "platform": "longer_235mm_platform.stl", - "platform_offset": [-117.5, -3 ,117.5] + "platform_offset": [ + -117.5, + -3, + 117.5 + ], + "quality_definition": "longer_base" }, - "overrides": { - "machine_name": { "default_value": "LONGER LK4 Pro" }, - "machine_width": { "default_value": 220 }, + "overrides": + { + "gantry_height": { "value": 33 }, "machine_depth": { "default_value": 220 }, - "machine_height": { "default_value": 250 }, - - "machine_head_with_fans_polygon": { "default_value": [ + "machine_head_with_fans_polygon": + { + "default_value": [ [-22, 39], [-22, -34], [58, -34], [58, 39] ] }, - - "gantry_height": { "value": 33 } + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "LONGER LK4 Pro" }, + "machine_width": { "default_value": 220 } } -} +} \ No newline at end of file diff --git a/resources/definitions/longer_lk5.def.json b/resources/definitions/longer_lk5.def.json index a33026fe10..e5831fb38e 100644 --- a/resources/definitions/longer_lk5.def.json +++ b/resources/definitions/longer_lk5.def.json @@ -1,29 +1,34 @@ { - "name": "Longer LK5", "version": 2, + "name": "Longer LK5", "inherits": "longer_base", - "metadata": { - "quality_definition": "longer_base", + "metadata": + { "visible": true, "platform": "longer_310mm_platform.stl", - "platform_offset": [-155, -3 ,155] + "platform_offset": [ + -155, + -3, + 155 + ], + "quality_definition": "longer_base" }, - "overrides": { - "machine_name": { "default_value": "LONGER LK5" }, - "machine_width": { "default_value": 300 }, + "overrides": + { + "gantry_height": { "value": 33 }, "machine_depth": { "default_value": 300 }, - "machine_height": { "default_value": 400 }, - - "machine_head_with_fans_polygon": { "default_value": [ + "machine_head_with_fans_polygon": + { + "default_value": [ [-22, 39], [-22, -34], [58, -34], [58, 39] ] }, - - "gantry_height": { "value": 33 }, - + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "LONGER LK5" }, + "machine_width": { "default_value": 300 }, "speed_travel": { "value": 65 } } -} +} \ No newline at end of file diff --git a/resources/definitions/longer_lk5pro.def.json b/resources/definitions/longer_lk5pro.def.json index e16038d4b7..b98a13ace0 100644 --- a/resources/definitions/longer_lk5pro.def.json +++ b/resources/definitions/longer_lk5pro.def.json @@ -1,27 +1,33 @@ { - "name": "Longer LK5 Pro", "version": 2, + "name": "Longer LK5 Pro", "inherits": "longer_base", - "metadata": { - "quality_definition": "longer_base", + "metadata": + { "visible": true, "platform": "longer_310mm_platform.stl", - "platform_offset": [-155, -3 ,155] + "platform_offset": [ + -155, + -3, + 155 + ], + "quality_definition": "longer_base" }, - "overrides": { - "machine_name": { "default_value": "LONGER LK5 Pro" }, - "machine_width": { "default_value": 300 }, + "overrides": + { + "gantry_height": { "value": 33 }, "machine_depth": { "default_value": 300 }, - "machine_height": { "default_value": 400 }, - - "machine_head_with_fans_polygon": { "default_value": [ + "machine_head_with_fans_polygon": + { + "default_value": [ [-22, 39], [-22, -34], [58, -34], [58, 39] ] }, - - "gantry_height": { "value": 33 } + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "LONGER LK5 Pro" }, + "machine_width": { "default_value": 300 } } -} +} \ No newline at end of file diff --git a/resources/definitions/lotmaxx_sc10.def.json b/resources/definitions/lotmaxx_sc10.def.json index 6700521b53..f2ef02c664 100644 --- a/resources/definitions/lotmaxx_sc10.def.json +++ b/resources/definitions/lotmaxx_sc10.def.json @@ -1,62 +1,68 @@ { - "name": "Lotmaxx SC-10", "version": 2, + "name": "Lotmaxx SC-10", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "lotmaxx.com", "manufacturer": "Lotmaxx", "file_formats": "text/x-gcode", "platform": "lotmaxx_sc_10_20_platform.3mf", "has_materials": true, - "machine_extruder_trains": - { - "0": "lotmaxx_sc10_extruder_0" - } + "machine_extruder_trains": { "0": "lotmaxx_sc10_extruder_0" } }, "overrides": { - "machine_name": { "default_value": "Lotmaxx SC-10" }, - "machine_width": { "default_value": 235 }, - "machine_depth": { "default_value": 235 }, - "machine_height": { "default_value": 320 }, - "machine_head_with_fans_polygon": { "default_value": [[-32,11],[-32,-32],[28,-32],[28,11]] }, - "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_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" }, + "acceleration_enabled": { "value": false }, "adhesion_type": { "value": "'none' if support_enable else 'skirt'" }, - "skirt_gap":{ "value": 5.0 }, - "skirt_line_count":{ "value": 4 } + "cool_fan_enabled": { "value": true }, + "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, + "cool_min_layer_time": { "value": 10 }, + "gantry_height": { "value": 40 }, + "jerk_enabled": { "value": false }, + "jerk_print": { "value": 8 }, + "jerk_travel": { "value": "jerk_print" }, + "jerk_travel_layer_0": { "value": " jerk_travel" }, + "machine_depth": { "default_value": 235 }, + "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_head_with_fans_polygon": + { + "default_value": [ + [-32, 11], + [-32, -32], + [28, -32], + [28, 11] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 320 }, + "machine_max_jerk_e": { "value": 5 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.4 }, + "machine_name": { "default_value": "Lotmaxx SC-10" }, + "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_width": { "default_value": 235 }, + "material_diameter": { "default_value": 1.75 }, + "meshfix_maximum_resolution": { "value": "0.25" }, + "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" }, + "retraction_count_max": { "value": 100 }, + "retraction_enable": { "value": true }, + "retraction_extrusion_window": { "value": 10 }, + "retraction_min_travel": { "value": 1.5 }, + "skirt_brim_speed": { "value": "speed_layer_0" }, + "skirt_gap": { "value": 5.0 }, + "skirt_line_count": { "value": 4 }, + "speed_infill": { "value": "speed_print * 2" }, + "speed_layer_0": { "value": 20.0 }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_print": { "value": 60.0 }, + "speed_roofing": { "value": "speed_topbottom" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_support_interface": { "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_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, + "speed_wall_0": { "value": "speed_wall" }, + "speed_wall_x": { "value": "speed_wall" } } -} +} \ No newline at end of file diff --git a/resources/definitions/lotmaxx_sc20.def.json b/resources/definitions/lotmaxx_sc20.def.json index 1aa982430d..216d42fc06 100644 --- a/resources/definitions/lotmaxx_sc20.def.json +++ b/resources/definitions/lotmaxx_sc20.def.json @@ -1,61 +1,68 @@ { - "name": "Lotmaxx SC-20", "version": 2, + "name": "Lotmaxx SC-20", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "lotmaxx.com", "manufacturer": "Lotmaxx", "file_formats": "text/x-gcode", "platform": "lotmaxx_sc_10_20_platform.3mf", "has_materials": true, - "machine_extruder_trains": - { - "0": "lotmaxx_sc20_extruder_0" - } + "machine_extruder_trains": { "0": "lotmaxx_sc20_extruder_0" } }, - "overrides": { - "machine_name": { "default_value": "Lotmaxx SC-20" }, - "machine_width": { "default_value": 235 }, - "machine_depth": { "default_value": 235 }, - "machine_height": { "default_value": 320 }, - "machine_head_with_fans_polygon": { "default_value": [[-32,11],[-32,-32],[28,-32],[28,11]] }, - "gantry_height": { "value": 40 }, - "machine_start_gcode": { "default_value": "; SC-20 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-20 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_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" }, + "overrides": + { + "acceleration_enabled": { "value": false }, "adhesion_type": { "value": "'none' if support_enable else 'skirt'" }, - "skirt_gap":{ "value":5.0 }, - "skirt_line_count":{ "value":4 } + "cool_fan_enabled": { "value": true }, + "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, + "cool_min_layer_time": { "value": 10 }, + "gantry_height": { "value": 40 }, + "jerk_enabled": { "value": false }, + "jerk_print": { "value": 8 }, + "jerk_travel": { "value": "jerk_print" }, + "jerk_travel_layer_0": { "value": "jerk_travel" }, + "machine_depth": { "default_value": 235 }, + "machine_end_gcode": { "default_value": "; SC-20 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_head_with_fans_polygon": + { + "default_value": [ + [-32, 11], + [-32, -32], + [28, -32], + [28, 11] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 320 }, + "machine_max_jerk_e": { "value": 5 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.4 }, + "machine_name": { "default_value": "Lotmaxx SC-20" }, + "machine_start_gcode": { "default_value": "; SC-20 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_width": { "default_value": 235 }, + "material_diameter": { "default_value": 1.75 }, + "meshfix_maximum_resolution": { "value": "0.25" }, + "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" }, + "retraction_count_max": { "value": 100 }, + "retraction_enable": { "value": true }, + "retraction_extrusion_window": { "value": 10 }, + "retraction_min_travel": { "value": 1.5 }, + "skirt_brim_speed": { "value": "speed_layer_0" }, + "skirt_gap": { "value": 5.0 }, + "skirt_line_count": { "value": 4 }, + "speed_infill": { "value": "speed_print * 2" }, + "speed_layer_0": { "value": 20.0 }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_print": { "value": 60.0 }, + "speed_roofing": { "value": "speed_topbottom" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_support_interface": { "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_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, + "speed_wall_0": { "value": "speed_wall" }, + "speed_wall_x": { "value": "speed_wall" } } -} +} \ No newline at end of file diff --git a/resources/definitions/lotmaxx_sc60.def.json b/resources/definitions/lotmaxx_sc60.def.json index a18e197757..0dd8f3ab6d 100644 --- a/resources/definitions/lotmaxx_sc60.def.json +++ b/resources/definitions/lotmaxx_sc60.def.json @@ -1,72 +1,73 @@ { - "name": "Lotmaxx Shark", "version": 2, + "name": "Lotmaxx Shark", "inherits": "fdmprinter", - "overrides": { - "machine_name": { "default_value": "Lotmaxx Shark" }, - "machine_width": { "default_value": 235 }, - "machine_depth": { "default_value": 235 }, - "machine_height": { "default_value": 265 }, - "machine_head_with_fans_polygon": { "default_value": [ - [-50.7,16.8], - [-50.7,-29.5], - [46.9,-29.5], - [49.9,16.8] - ] - }, - "gantry_height": { "value": 29 }, - "machine_heated_bed": {"value": true}, - "machine_start_gcode":{ - "default_value":"G28 ;Home\nG92 E0 ;Reset Extruder\nG1 Z4.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" - }, - "acceleration_print":{"value":1000}, - "acceleration_travel":{"value":1000}, - "acceleration_travel_layer_0":{"value":1000.0}, - "expand_skins_expand_distance":{"value":0.8}, - "fill_outline_gaps":{"default_value":false}, - "infill_sparse_density":{"value":15}, - "meshfix_maximum_resolution":{"value":0.25}, - "optimize_wall_printing_order":{"value":true}, - "retract_at_layer_change":{"value":false}, - "retraction_amount":{"value":4.5}, - "roofing_layer_count":{"value":1}, - "skin_preshrink":{"value":0.8}, - "speed_layer_0":{"value":30}, - "speed_print":{"value":45}, - "speed_roofing":{"value":35}, - "speed_topbottom":{"value":35}, - "speed_travel":{"value":80}, - "speed_wall_0":{"value":32}, - "speed_wall_x":{"value":32}, - "support_infill_rate":{"value":5}, - "support_pattern":{"default_value":"lines"}, - "support_use_towers":{"value":false}, - "wall_overhang_speed_factor":{"value":50}, - "z_seam_corner":{"default_value":"z_seam_corner_any"}, - "z_seam_relative":{"value":true}, - "z_seam_type":{"default_value":"sharpest_corner"}, - "zig_zaggify_infill":{"value":true}, - "adhesion_type":{"default_value":"skirt"}, - "prime_tower_enable":{"value":true}, - "prime_tower_position_x":{"value": 50}, - "prime_tower_position_y":{"value": 50}, - "prime_tower_min_volume":{"value": 30}, - "switch_extruder_retraction_amount": {"value": 100}, - "switch_extruder_retraction_speeds": {"value": 60} - }, - "metadata": { + "metadata": + { "visible": true, "author": "lotmaxx.com", "manufacturer": "Lotmaxx", "platform": "lotmaxx_sc_10_20_platform.3mf", - "machine_extruder_trains": { + "has_materials": true, + "machine_extruder_trains": + { "0": "lotmaxx_sc60_extruder_left", "1": "lotmaxx_sc60_extruder_right" }, - "has_materials": true, "preferred_quality_type": "normal" + }, + "overrides": + { + "acceleration_print": { "value": 1000 }, + "acceleration_travel": { "value": 1000 }, + "acceleration_travel_layer_0": { "value": 1000.0 }, + "adhesion_type": { "default_value": "skirt" }, + "expand_skins_expand_distance": { "value": 0.8 }, + "fill_outline_gaps": { "default_value": false }, + "gantry_height": { "value": 29 }, + "infill_sparse_density": { "value": 15 }, + "machine_depth": { "default_value": 235 }, + "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_head_with_fans_polygon": + { + "default_value": [ + [-50.7, 16.8], + [-50.7, -29.5], + [46.9, -29.5], + [49.9, 16.8] + ] + }, + "machine_heated_bed": { "value": true }, + "machine_height": { "default_value": 265 }, + "machine_name": { "default_value": "Lotmaxx Shark" }, + "machine_start_gcode": { "default_value": "G28 ;Home\nG92 E0 ;Reset Extruder\nG1 Z4.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_width": { "default_value": 235 }, + "meshfix_maximum_resolution": { "value": 0.25 }, + "optimize_wall_printing_order": { "value": true }, + "prime_tower_enable": { "value": true }, + "prime_tower_min_volume": { "value": 30 }, + "prime_tower_position_x": { "value": 50 }, + "prime_tower_position_y": { "value": 50 }, + "retract_at_layer_change": { "value": false }, + "retraction_amount": { "value": 4.5 }, + "roofing_layer_count": { "value": 1 }, + "skin_preshrink": { "value": 0.8 }, + "speed_layer_0": { "value": 30 }, + "speed_print": { "value": 45 }, + "speed_roofing": { "value": 35 }, + "speed_topbottom": { "value": 35 }, + "speed_travel": { "value": 80 }, + "speed_wall_0": { "value": 32 }, + "speed_wall_x": { "value": 32 }, + "support_infill_rate": { "value": 5 }, + "support_pattern": { "default_value": "lines" }, + "support_use_towers": { "value": false }, + "switch_extruder_retraction_amount": { "value": 100 }, + "switch_extruder_retraction_speeds": { "value": 60 }, + "wall_overhang_speed_factor": { "value": 50 }, + "z_seam_corner": { "default_value": "z_seam_corner_any" }, + "z_seam_relative": { "value": true }, + "z_seam_type": { "default_value": "sharpest_corner" }, + "zig_zaggify_infill": { "value": true } } -} +} \ No newline at end of file diff --git a/resources/definitions/lulzbot_mini_2_common.def.json b/resources/definitions/lulzbot_mini_2_common.def.json index 0895a52e18..825d303aad 100644 --- a/resources/definitions/lulzbot_mini_2_common.def.json +++ b/resources/definitions/lulzbot_mini_2_common.def.json @@ -2,70 +2,29 @@ "version": 2, "name": "Lulzbot Mini 2", "inherits": "fdmprinter", - "metadata": { + "metadata": + { + "visible": false, "author": "Tom Callaway ", "manufacturer": "Fargo Additive Manufacturing Equipment 3D, LLC", - "visible": false, - "preferred_material": "generic_pla", - "exclude_materials": [ "structur3d_dap100silicone" ] + "exclude_materials": [ "structur3d_dap100silicone" ], + "preferred_material": "generic_pla" }, - "overrides": { - "machine_center_is_zero": - { - "default_value": false - }, - "machine_nozzle_size": - { - "default_value": 0.5 - }, - "machine_gcode_flavor": - { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_acceleration": - { - "default_value": 1000 - }, - "acceleration_print": - { - "default_value": 1000 - }, - "jerk_print": - { - "default_value": 20 - }, - "machine_max_feedrate_x": - { - "default_value": 800 - }, - "machine_max_feedrate_y": - { - "default_value": 800 - }, - "machine_max_feedrate_z": - { - "default_value": 8 - }, - "machine_max_feedrate_e": - { - "default_value": 40 - }, - "machine_max_acceleration_x": - { - "default_value": 9000 - }, - "machine_max_acceleration_y": - { - "default_value": 9000 - }, - "machine_max_acceleration_z": - { - "default_value": 100 - }, - "machine_max_acceleration_e": - { - "default_value": 1000 - } + "overrides": + { + "acceleration_print": { "default_value": 1000 }, + "jerk_print": { "default_value": 20 }, + "machine_acceleration": { "default_value": 1000 }, + "machine_center_is_zero": { "default_value": false }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_max_acceleration_e": { "default_value": 1000 }, + "machine_max_acceleration_x": { "default_value": 9000 }, + "machine_max_acceleration_y": { "default_value": 9000 }, + "machine_max_acceleration_z": { "default_value": 100 }, + "machine_max_feedrate_e": { "default_value": 40 }, + "machine_max_feedrate_x": { "default_value": 800 }, + "machine_max_feedrate_y": { "default_value": 800 }, + "machine_max_feedrate_z": { "default_value": 8 }, + "machine_nozzle_size": { "default_value": 0.5 } } -} - +} \ No newline at end of file diff --git a/resources/definitions/lulzbot_mini_2_se.def.json b/resources/definitions/lulzbot_mini_2_se.def.json index 6cf43d8af4..dd613d6f5b 100644 --- a/resources/definitions/lulzbot_mini_2_se.def.json +++ b/resources/definitions/lulzbot_mini_2_se.def.json @@ -1,38 +1,54 @@ { - "version": 2, - "name": "Lulzbot Mini 2 | SE | 0.5 mm", - "inherits": "lulzbot_mini_2_common", - "metadata": { + "version": 2, + "name": "Lulzbot Mini 2 | SE | 0.5 mm", + "inherits": "lulzbot_mini_2_common", + "metadata": + { + "visible": true, "author": "Tom Callaway ", "manufacturer": "Fargo Additive Manufacturing Equipment 3D, LLC", - "visible": true, "file_formats": "text/x-gcode", "platform": "lulzbot_mini.stl", - "platform_offset": [-100, -11, 100], - "machine_extruder_trains": { - "0": "lulzbot_mini_2_se_extruder" - } - }, - - "overrides": { - "machine_name": { "default_value": "Lulzbot Mini 2 | SE | 0.5 mm" }, - "machine_width": { "default_value": 162 }, - "machine_depth": { "default_value": 162 }, - "machine_height": { "default_value": 180 }, - "machine_heated_bed": { "default_value": true }, - "machine_start_gcode": { - "default_value": "; This G-Code has been generated specifically for the Lulzbot Mini 2 with SE 0.5 mm toolhead\nM73 P0 ; clear GLCD progress bar\nM75 ; start GLCD timer\nG26 ; clear potential 'probe fail' condition\nM107 ; disable fans\nM420 S0 ; disable leveling matrix\nG90 ; absolute positioning\nM82 ; set extruder to absolute mode\nG92 E0 ; set extruder position to 0\nM140 S{material_bed_temperature_layer_0} ; start bed heating up\nG28 ; home all axes\nG0 X0 Y187 Z156 F200 ; move away from endstops\nM117 Mini 2 Wiping... ; progress indicator message on LCD\nM109 R{material_standby_temperature} ; soften material before retraction\nG1 E-15 F75 ; retract filament\nG1 X45 Y176 F11520 ; move above wiper pad\nG1 Z0 F1200 ; push nozzle into wiper\nG1 X45 Y178 Z-.5 F4000 ; wiping\nG1 X55 Y176 Z-.5 F4000 ; wiping\nG1 X45 Y177 Z0 F4000 ; wiping\nG1 X55 Y176 F4000 ; wiping\nG1 X45 Y178 F4000 ; wiping\nG1 X55 Y176 F4000 ; wiping\nG1 X45 Y178 F4000 ; wiping\nG1 X55 Y176 F4000 ; wiping\nG1 X60 Y178 F4000 ; wiping\nG1 X80 Y176 F4000 ; wiping\nG1 X60 Y178 F4000 ; wiping\nG1 X80 Y176 F4000 ; wiping\nG1 X60 Y178 F4000 ; wiping\nG1 X90 Y176 F4000 ; wiping\nG1 X80 Y178 F4000 ; wiping\nG1 X100 Y176 F4000 ; wiping\nG1 X80 Y178 F4000 ; wiping\nG1 X100 Y176 F4000 ; wiping\nG1 X80 Y178 F4000 ; wiping\nG1 X100 Y176 F4000 ; wiping\nG1 X110 Y178 F4000 ; wiping\nG1 X100 Y176 F4000 ; wiping\nG1 X110 Y178 F4000 ; wiping\nG1 X100 Y176 F4000 ; wiping\nG1 X110 Y178 F4000 ; wiping\nG1 X115 Y176 Z-0.5 F1000 ; wiping\nG1 Z10 ; raise extruder\nG28 X0 Y0 ; home X and Y\nM204 S300 ; set probing acceleration\nG29 ; start auto-leveling sequence\nM420 S1 ; enable leveling matrix\nM425 Z ; use measured Z backlash for compensation\nM425 Z F0 ; turn off measured Z backlash compensation by default\nM204 S2000 ; restore standard acceleration\nG1 X5 Y15 Z10 F5000 ; move up off last probe point\nG4 S1 ; pause\nM400 ; wait for moves to finish\nM117 Heating... ; progress indicator message on LCD\nM109 R{material_print_temperature_layer_0} ; wait for extruder to reach initial printing temp\nM190 R{material_bed_temperature_layer_0} ; wait for bed to reach printing temp\nG1 Z2 E0 F75 ; prime tiny bit of filament into the nozzle\nM117 Mini 2 Printing... ; progress indicator message on LCD\n" - }, - "machine_end_gcode": { - "default_value": "; part removal temp is hardcoded to 45\nM400 ; wait for moves to finish\nM140 S45 ; start bed cooling\nM104 S0 ; disable hotend\nM107 ; disable fans\nG92 E5 ; set extruder to 5mm for retract on print end\nM117 Cooling please wait ; progress indicator message on LCD\nG1 X5 Y5 Z183 E0 F3000 ; move to cooling position\nG1 E5 ; re-prime extruder\nM190 R45 ; wait for bed to cool down to removal temp\nG1 X145 F1000 ; move extruder out of the way\nG1 Y175 F1000 ; present finished print\nM140 S0 ; cool down\nM77 ; end LCD print timer\nG90 ; absolute positioning\nM18 X Y E ; turn off X Y and E axis\nM117 Print Complete. ; print complete message\n" - }, - "machine_disallowed_areas": { - "default_value": [ - [[ 85, 85], [ 85, 77], [ 77, 85]], - [[-85, 85], [-85, 77], [-77, 85]], - [[ 85,-85], [ 85,-77], [ 77,-85]], - [[-85,-85], [-85,-77], [-77,-85]] - ] - } - } -} + "machine_extruder_trains": { "0": "lulzbot_mini_2_se_extruder" }, + "platform_offset": [ + -100, + -11, + 100 + ] + }, + "overrides": + { + "machine_depth": { "default_value": 162 }, + "machine_disallowed_areas": + { + "default_value": [ + [ + [85, 85], + [85, 77], + [77, 85] + ], + [ + [-85, 85], + [-85, 77], + [-77, 85] + ], + [ + [85, -85], + [85, -77], + [77, -85] + ], + [ + [-85, -85], + [-85, -77], + [-77, -85] + ] + ] + }, + "machine_end_gcode": { "default_value": "; part removal temp is hardcoded to 45\nM400 ; wait for moves to finish\nM140 S45 ; start bed cooling\nM104 S0 ; disable hotend\nM107 ; disable fans\nG92 E5 ; set extruder to 5mm for retract on print end\nM117 Cooling please wait ; progress indicator message on LCD\nG1 X5 Y5 Z183 E0 F3000 ; move to cooling position\nG1 E5 ; re-prime extruder\nM190 R45 ; wait for bed to cool down to removal temp\nG1 X145 F1000 ; move extruder out of the way\nG1 Y175 F1000 ; present finished print\nM140 S0 ; cool down\nM77 ; end LCD print timer\nG90 ; absolute positioning\nM18 X Y E ; turn off X Y and E axis\nM117 Print Complete. ; print complete message\n" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 180 }, + "machine_name": { "default_value": "Lulzbot Mini 2 | SE | 0.5 mm" }, + "machine_start_gcode": { "default_value": "; This G-Code has been generated specifically for the Lulzbot Mini 2 with SE 0.5 mm toolhead\nM73 P0 ; clear GLCD progress bar\nM75 ; start GLCD timer\nG26 ; clear potential 'probe fail' condition\nM107 ; disable fans\nM420 S0 ; disable leveling matrix\nG90 ; absolute positioning\nM82 ; set extruder to absolute mode\nG92 E0 ; set extruder position to 0\nM140 S{material_bed_temperature_layer_0} ; start bed heating up\nG28 ; home all axes\nG0 X0 Y187 Z156 F200 ; move away from endstops\nM117 Mini 2 Wiping... ; progress indicator message on LCD\nM109 R{material_standby_temperature} ; soften material before retraction\nG1 E-15 F75 ; retract filament\nG1 X45 Y176 F11520 ; move above wiper pad\nG1 Z0 F1200 ; push nozzle into wiper\nG1 X45 Y178 Z-.5 F4000 ; wiping\nG1 X55 Y176 Z-.5 F4000 ; wiping\nG1 X45 Y177 Z0 F4000 ; wiping\nG1 X55 Y176 F4000 ; wiping\nG1 X45 Y178 F4000 ; wiping\nG1 X55 Y176 F4000 ; wiping\nG1 X45 Y178 F4000 ; wiping\nG1 X55 Y176 F4000 ; wiping\nG1 X60 Y178 F4000 ; wiping\nG1 X80 Y176 F4000 ; wiping\nG1 X60 Y178 F4000 ; wiping\nG1 X80 Y176 F4000 ; wiping\nG1 X60 Y178 F4000 ; wiping\nG1 X90 Y176 F4000 ; wiping\nG1 X80 Y178 F4000 ; wiping\nG1 X100 Y176 F4000 ; wiping\nG1 X80 Y178 F4000 ; wiping\nG1 X100 Y176 F4000 ; wiping\nG1 X80 Y178 F4000 ; wiping\nG1 X100 Y176 F4000 ; wiping\nG1 X110 Y178 F4000 ; wiping\nG1 X100 Y176 F4000 ; wiping\nG1 X110 Y178 F4000 ; wiping\nG1 X100 Y176 F4000 ; wiping\nG1 X110 Y178 F4000 ; wiping\nG1 X115 Y176 Z-0.5 F1000 ; wiping\nG1 Z10 ; raise extruder\nG28 X0 Y0 ; home X and Y\nM204 S300 ; set probing acceleration\nG29 ; start auto-leveling sequence\nM420 S1 ; enable leveling matrix\nM425 Z ; use measured Z backlash for compensation\nM425 Z F0 ; turn off measured Z backlash compensation by default\nM204 S2000 ; restore standard acceleration\nG1 X5 Y15 Z10 F5000 ; move up off last probe point\nG4 S1 ; pause\nM400 ; wait for moves to finish\nM117 Heating... ; progress indicator message on LCD\nM109 R{material_print_temperature_layer_0} ; wait for extruder to reach initial printing temp\nM190 R{material_bed_temperature_layer_0} ; wait for bed to reach printing temp\nG1 Z2 E0 F75 ; prime tiny bit of filament into the nozzle\nM117 Mini 2 Printing... ; progress indicator message on LCD\n" }, + "machine_width": { "default_value": 162 } + } +} \ No newline at end of file diff --git a/resources/definitions/lulzbot_mini_2_sl.def.json b/resources/definitions/lulzbot_mini_2_sl.def.json index cecaca1541..7aa80e0fed 100644 --- a/resources/definitions/lulzbot_mini_2_sl.def.json +++ b/resources/definitions/lulzbot_mini_2_sl.def.json @@ -1,38 +1,54 @@ { - "version": 2, - "name": "Lulzbot Mini 2 | SL | 0.25 mm (Micro)", - "inherits": "lulzbot_mini_2_common", - "metadata": { + "version": 2, + "name": "Lulzbot Mini 2 | SL | 0.25 mm (Micro)", + "inherits": "lulzbot_mini_2_common", + "metadata": + { + "visible": true, "author": "Tom Callaway ", "manufacturer": "Fargo Additive Manufacturing Equipment 3D, LLC", - "visible": true, "file_formats": "text/x-gcode", "platform": "lulzbot_mini.stl", - "platform_offset": [-100, -11, 100], - "machine_extruder_trains": { - "0": "lulzbot_mini_2_sl_extruder" - } - }, - - "overrides": { - "machine_name": { "default_value": "Lulzbot Mini 2 | SL | 0.25 mm (Micro)" }, - "machine_width": { "default_value": 162 }, - "machine_depth": { "default_value": 162 }, - "machine_height": { "default_value": 180 }, - "machine_heated_bed": { "default_value": true }, - "machine_start_gcode": { - "default_value": "; This G-Code has been generated specifically for the Lulzbot Mini 2 with SL 0.25 mm toolhead\nM73 P0 ; clear GLCD progress bar\nM75 ; start GLCD timer\nG26 ; clear potential 'probe fail' condition\nM107 ; disable fans\nM420 S0 ; disable leveling matrix\nG90 ; absolute positioning\nM82 ; set extruder to absolute mode\nG92 E0 ; set extruder position to 0\nM140 S{material_bed_temperature_layer_0} ; start bed heating up\nG28 ; home all axes\nG0 X0 Y187 Z156 F200 ; move away from endstops\nM117 Mini 2 Wiping... ; progress indicator message on LCD\nM109 R{material_standby_temperature} ; soften material before retraction\nG1 E-15 F75 ; retract filament\nG1 X45 Y176 F11520 ; move above wiper pad\nG1 Z0 F1200 ; push nozzle into wiper\nG1 X45 Y178 Z-.5 F4000 ; wiping\nG1 X55 Y176 Z-.5 F4000 ; wiping\nG1 X45 Y177 Z0 F4000 ; wiping\nG1 X55 Y176 F4000 ; wiping\nG1 X45 Y178 F4000 ; wiping\nG1 X55 Y176 F4000 ; wiping\nG1 X45 Y178 F4000 ; wiping\nG1 X55 Y176 F4000 ; wiping\nG1 X60 Y178 F4000 ; wiping\nG1 X80 Y176 F4000 ; wiping\nG1 X60 Y178 F4000 ; wiping\nG1 X80 Y176 F4000 ; wiping\nG1 X60 Y178 F4000 ; wiping\nG1 X90 Y176 F4000 ; wiping\nG1 X80 Y178 F4000 ; wiping\nG1 X100 Y176 F4000 ; wiping\nG1 X80 Y178 F4000 ; wiping\nG1 X100 Y176 F4000 ; wiping\nG1 X80 Y178 F4000 ; wiping\nG1 X100 Y176 F4000 ; wiping\nG1 X110 Y178 F4000 ; wiping\nG1 X100 Y176 F4000 ; wiping\nG1 X110 Y178 F4000 ; wiping\nG1 X100 Y176 F4000 ; wiping\nG1 X110 Y178 F4000 ; wiping\nG1 X115 Y176 Z-0.5 F1000 ; wiping\nG1 Z10 ; raise extruder\nG28 X0 Y0 ; home X and Y\nM204 S300 ; set probing acceleration\nG29 ; start auto-leveling sequence\nM420 S1 ; enable leveling matrix\nM425 Z ; use measured Z backlash for compensation\nM425 Z F0 ; turn off measured Z backlash compensation by default\nM204 S2000 ; restore standard acceleration\nG1 X5 Y15 Z10 F5000 ; move up off last probe point\nG4 S1 ; pause\nM400 ; wait for moves to finish\nM117 Heating... ; progress indicator message on LCD\nM109 R{material_print_temperature_layer_0} ; wait for extruder to reach initial printing temp\nM190 R{material_bed_temperature_layer_0} ; wait for bed to reach printing temp\nG1 Z2 E0 F75 ; prime tiny bit of filament into the nozzle\nM117 Mini 2 Printing... ; progress indicator message on LCD\n" - }, - "machine_end_gcode": { - "default_value": "; part removal temp is hardcoded to 45\nM400 ; wait for moves to finish\nM140 S45 ; start bed cooling\nM104 S0 ; disable hotend\nM107 ; disable fans\nG92 E5 ; set extruder to 5mm for retract on print end\nM117 Cooling please wait ; progress indicator message on LCD\nG1 X5 Y5 Z183 E0 F3000 ; move to cooling position\nG1 E5 ; re-prime extruder\nM190 R45 ; wait for bed to cool down to removal temp\nG1 X145 F1000 ; move extruder out of the way\nG1 Y175 F1000 ; present finished print\nM140 S0 ; cool down\nM77 ; end LCD print timer\nG90 ; absolute positioning\nM18 X Y E ; turn off X Y and E axis\nM117 Print Complete. ; print complete message\n" - }, - "machine_disallowed_areas": { - "default_value": [ - [[ 85, 85], [ 85, 77], [ 77, 85]], - [[-85, 85], [-85, 77], [-77, 85]], - [[ 85,-85], [ 85,-77], [ 77,-85]], - [[-85,-85], [-85,-77], [-77,-85]] - ] - } - } -} + "machine_extruder_trains": { "0": "lulzbot_mini_2_sl_extruder" }, + "platform_offset": [ + -100, + -11, + 100 + ] + }, + "overrides": + { + "machine_depth": { "default_value": 162 }, + "machine_disallowed_areas": + { + "default_value": [ + [ + [85, 85], + [85, 77], + [77, 85] + ], + [ + [-85, 85], + [-85, 77], + [-77, 85] + ], + [ + [85, -85], + [85, -77], + [77, -85] + ], + [ + [-85, -85], + [-85, -77], + [-77, -85] + ] + ] + }, + "machine_end_gcode": { "default_value": "; part removal temp is hardcoded to 45\nM400 ; wait for moves to finish\nM140 S45 ; start bed cooling\nM104 S0 ; disable hotend\nM107 ; disable fans\nG92 E5 ; set extruder to 5mm for retract on print end\nM117 Cooling please wait ; progress indicator message on LCD\nG1 X5 Y5 Z183 E0 F3000 ; move to cooling position\nG1 E5 ; re-prime extruder\nM190 R45 ; wait for bed to cool down to removal temp\nG1 X145 F1000 ; move extruder out of the way\nG1 Y175 F1000 ; present finished print\nM140 S0 ; cool down\nM77 ; end LCD print timer\nG90 ; absolute positioning\nM18 X Y E ; turn off X Y and E axis\nM117 Print Complete. ; print complete message\n" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 180 }, + "machine_name": { "default_value": "Lulzbot Mini 2 | SL | 0.25 mm (Micro)" }, + "machine_start_gcode": { "default_value": "; This G-Code has been generated specifically for the Lulzbot Mini 2 with SL 0.25 mm toolhead\nM73 P0 ; clear GLCD progress bar\nM75 ; start GLCD timer\nG26 ; clear potential 'probe fail' condition\nM107 ; disable fans\nM420 S0 ; disable leveling matrix\nG90 ; absolute positioning\nM82 ; set extruder to absolute mode\nG92 E0 ; set extruder position to 0\nM140 S{material_bed_temperature_layer_0} ; start bed heating up\nG28 ; home all axes\nG0 X0 Y187 Z156 F200 ; move away from endstops\nM117 Mini 2 Wiping... ; progress indicator message on LCD\nM109 R{material_standby_temperature} ; soften material before retraction\nG1 E-15 F75 ; retract filament\nG1 X45 Y176 F11520 ; move above wiper pad\nG1 Z0 F1200 ; push nozzle into wiper\nG1 X45 Y178 Z-.5 F4000 ; wiping\nG1 X55 Y176 Z-.5 F4000 ; wiping\nG1 X45 Y177 Z0 F4000 ; wiping\nG1 X55 Y176 F4000 ; wiping\nG1 X45 Y178 F4000 ; wiping\nG1 X55 Y176 F4000 ; wiping\nG1 X45 Y178 F4000 ; wiping\nG1 X55 Y176 F4000 ; wiping\nG1 X60 Y178 F4000 ; wiping\nG1 X80 Y176 F4000 ; wiping\nG1 X60 Y178 F4000 ; wiping\nG1 X80 Y176 F4000 ; wiping\nG1 X60 Y178 F4000 ; wiping\nG1 X90 Y176 F4000 ; wiping\nG1 X80 Y178 F4000 ; wiping\nG1 X100 Y176 F4000 ; wiping\nG1 X80 Y178 F4000 ; wiping\nG1 X100 Y176 F4000 ; wiping\nG1 X80 Y178 F4000 ; wiping\nG1 X100 Y176 F4000 ; wiping\nG1 X110 Y178 F4000 ; wiping\nG1 X100 Y176 F4000 ; wiping\nG1 X110 Y178 F4000 ; wiping\nG1 X100 Y176 F4000 ; wiping\nG1 X110 Y178 F4000 ; wiping\nG1 X115 Y176 Z-0.5 F1000 ; wiping\nG1 Z10 ; raise extruder\nG28 X0 Y0 ; home X and Y\nM204 S300 ; set probing acceleration\nG29 ; start auto-leveling sequence\nM420 S1 ; enable leveling matrix\nM425 Z ; use measured Z backlash for compensation\nM425 Z F0 ; turn off measured Z backlash compensation by default\nM204 S2000 ; restore standard acceleration\nG1 X5 Y15 Z10 F5000 ; move up off last probe point\nG4 S1 ; pause\nM400 ; wait for moves to finish\nM117 Heating... ; progress indicator message on LCD\nM109 R{material_print_temperature_layer_0} ; wait for extruder to reach initial printing temp\nM190 R{material_bed_temperature_layer_0} ; wait for bed to reach printing temp\nG1 Z2 E0 F75 ; prime tiny bit of filament into the nozzle\nM117 Mini 2 Printing... ; progress indicator message on LCD\n" }, + "machine_width": { "default_value": 162 } + } +} \ No newline at end of file diff --git a/resources/definitions/lulzbot_taz_pro_common.def.json b/resources/definitions/lulzbot_taz_pro_common.def.json index 1e75322ae1..2aa6ef4174 100644 --- a/resources/definitions/lulzbot_taz_pro_common.def.json +++ b/resources/definitions/lulzbot_taz_pro_common.def.json @@ -2,83 +2,37 @@ "version": 2, "name": "Lulzbot TAZ Pro", "inherits": "fdmprinter", - "metadata": { + "metadata": + { + "visible": false, "author": "Tom Callaway ", "manufacturer": "Fargo Additive Manufacturing Equipment 3D, LLC", - "visible": false, - "preferred_material": "generic_pla", - "exclude_materials": [ "structur3d_dap100silicone" ] + "exclude_materials": [ "structur3d_dap100silicone" ], + "preferred_material": "generic_pla" }, - "overrides": { - "material_print_temperature": { + "overrides": + { + "acceleration_print": { "default_value": 500 }, + "jerk_print": { "default_value": 12 }, + "machine_acceleration": { "default_value": 500 }, + "machine_center_is_zero": { "default_value": false }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_max_acceleration_e": { "default_value": 1000 }, + "machine_max_acceleration_x": { "default_value": 9000 }, + "machine_max_acceleration_y": { "default_value": 9000 }, + "machine_max_acceleration_z": { "default_value": 100 }, + "machine_max_feedrate_e": { "default_value": 40 }, + "machine_max_feedrate_x": { "default_value": 800 }, + "machine_max_feedrate_y": { "default_value": 800 }, + "machine_max_feedrate_z": { "default_value": 3 }, + "machine_nozzle_size": { "default_value": 0.5 }, + "material_bed_temperature": + { + "maximum_value_warning": "125", "minimum_value": "0" }, - "material_bed_temperature": { - "minimum_value": "0", - "maximum_value_warning": "125" - }, - "material_bed_temperature_layer_0": - { - "maximum_value_warning": "125" - }, - "material_standby_temperature": { - "minimum_value": "0" - }, - "machine_center_is_zero": - { - "default_value": false - }, - "machine_nozzle_size": - { - "default_value": 0.5 - }, - "machine_gcode_flavor": - { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_acceleration": - { - "default_value": 500 - }, - "acceleration_print": - { - "default_value": 500 - }, - "jerk_print": - { - "default_value": 12 - }, - "machine_max_feedrate_x": - { - "default_value": 800 - }, - "machine_max_feedrate_y": - { - "default_value": 800 - }, - "machine_max_feedrate_z": - { - "default_value": 3 - }, - "machine_max_feedrate_e": - { - "default_value": 40 - }, - "machine_max_acceleration_x": - { - "default_value": 9000 - }, - "machine_max_acceleration_y": - { - "default_value": 9000 - }, - "machine_max_acceleration_z": - { - "default_value": 100 - }, - "machine_max_acceleration_e": - { - "default_value": 1000 - } + "material_bed_temperature_layer_0": { "maximum_value_warning": "125" }, + "material_print_temperature": { "minimum_value": "0" }, + "material_standby_temperature": { "minimum_value": "0" } } -} +} \ No newline at end of file diff --git a/resources/definitions/lulzbot_taz_pro_dual.def.json b/resources/definitions/lulzbot_taz_pro_dual.def.json index ba34e5a0ce..d4d208098a 100644 --- a/resources/definitions/lulzbot_taz_pro_dual.def.json +++ b/resources/definitions/lulzbot_taz_pro_dual.def.json @@ -1,34 +1,36 @@ { - "version": 2, - "name": "Lulzbot TAZ Pro Dual Extruder", - "inherits": "lulzbot_taz_pro_common", - "metadata": { + "version": 2, + "name": "Lulzbot TAZ Pro Dual Extruder", + "inherits": "lulzbot_taz_pro_common", + "metadata": + { + "visible": true, "author": "Tom Callaway ", "manufacturer": "Fargo Additive Manufacturing Equipment 3D, LLC", - "visible": true, "file_formats": "text/x-gcode", "platform": "lulzbot_taz_pro_bed.stl", - "platform_offset": [0, -10, 0], - "machine_extruder_trains": { + "machine_extruder_trains": + { "0": "lulzbot_taz_pro_dual_extruder_0", "1": "lulzbot_taz_pro_dual_extruder_1" - } - }, - - "overrides": { - "machine_name": { "default_value": "Lulzbot TAZ Pro" }, - "machine_width": { "default_value": 282 }, - "machine_depth": { "default_value": 286 }, - "machine_height": { "default_value": 286 }, - "machine_heated_bed": { "default_value": true }, - "machine_start_gcode": { - "default_value": "; This profile is designed specifically for the LulzBot TAZ Pro with Dual Extruder Tool Head\nM73 P0 ; clear GLCD progress bar\nM75 ; start GLCD timer\nM107 ; disable fans\nG90 ; absolute positioning\nM420 S0 ; disable previous leveling matrix\nM140 S{material_bed_temperature_layer_0} ; begin bed temping up\nM104 S{material_standby_temperature} T0 ; soften filament\nM104 S{material_standby_temperature} T1 ; soften filament\nG28 ; home\nM117 Heating... ; LCD status message\nM109 R{material_standby_temperature} T0 ; wait for temp\nM109 R{material_standby_temperature} T1 ; wait for temp\nT0 ; select this extruder first\nM82 ; set extruder to absolute mode\nG92 E0 ; set extruder to zero\nG1 E-10 F100 ; retract 10mm of filament on first extruder\nG0 X50 F1000 ; move over to switch extruders\nT1 ; switch extruders\nM82 ; set extruder to absolute mode\nG92 E0 ; set extruder to zero\nG1 E-10 F100 ; retract 10mm of filament on second extruder\nM104 S{material_standby_temperature} T0 ; set to wipe temp\nM104 S{material_standby_temperature} T1 ; set to wipe temp\nM106 ; turn on fans to speed cooling\nT0 ; select first extruder for probing\nG1 X-16.5 Y100 F2000 ; move above wiper pad\nM117 Cooling... ; LCD status message\nM109 R{material_standby_temperature} T0 ; wait for T0 to reach temp\nM109 R{material_standby_temperature} T1 ; wait for T1 to reach temp\nM107 ; turn off fan\nG1 Z 1.0 ; push nozzle into wiper\nG1 X -16.5 Y100 F1000 ; slow wipe\nG1 X -16.5 Y90 F1000 ; slow wipe\nG1 X -15.5 Y86 F2000 ; fast wipe\nG1 X -17.5 Y80 F2000 ; fast wipe\nG1 X -15.5 Y74 F2000 ; fast wipe\nG1 X -17.5 Y70 F2000 ; fast wipe\nG1 X -16.5 Y68 F1000 ; slow wipe\nG1 X -16.5 Y60 F1000 ; slow wipe\nG1 X -14.5 Y60 F1000 ; slow wipe\nG1 X -14.5 Y46 F1000 ; slow wipe\nG1 X -17.5 Y46 F1000 ; slow wipe\nG1 X -17.5 Y60 F1000 ; slow wipe\nG1 X -14.5 Y60 F1000 ; slow wipe\nG1 X -14.5 Y46 F1000 ; slow wipe\nG1 X -17.5 Y46 F1000 ; slow wipe\nG1 X -17.5 Y60 F1000 ; slow wipe\nG1 X -14.5 Y60 F1000 ; slow wipe\nG1 X -14.5 Y46 F1000 ; slow wipe\nG1 X -17.5 Y46 F1000 ; slow wipe\nG1 X -17.5 Y60 F1000 ; slow wipe\nG1 X -16.5 Y60 F1000 ; slow wipe\nG1 X -16.5 Y42 F1000 ; slow wipe\nG1 X -15.5 Y40 F2000 ; fast wipe\nG1 X -17.5 Y38 F2000 ; fast wipe\nG1 X -15.5 Y36 F2000 ; fast wipe\nG1 X -17.5 Y34 F2000 ; fast wipe\nG1 X -16.5 Y30 F1000 ; slow wipe\nG1 X -16.5 Y19 F1000 ; slow wipe\nG1 X -16.5 Y19 Z20 F1000 ; raise extruder\nM106 S255 ; turn on fan to blow away fuzzies\nG4 S5 ; wait 5 seconds\nM107 ; turn off fan\nG0 X50 F1000 ; move over to switch extruders\nT1 ; switch to second extruder\nG1 X296.5 Y100 F5000 ; move E2 above second wiper pad\nG1 Z 1.0 ; push nozzle into wiper\nG1 X 296.5 Y100 F1000 ; slow wipe\nG1 X 296.5 Y90 F1000 ; slow wipe\nG1 X 297.5 Y86 F2000 ; fast wipe\nG1 X 295.5 Y80 F2000 ; fast wipe\nG1 X 297.5 Y74 F2000 ; fast wipe\nG1 X 295.5 Y70 F2000 ; fast wipe\nG1 X 296.5 Y68 F1000 ; slow wipe\nG1 X 296.5 Y60 F1000 ; slow wipe\nG1 X 298 Y60 F1000 ; slow wipe\nG1 X 298 Y46 F1000 ; slow wipe\nG1 X 295 Y46 F1000 ; slow wipe\nG1 X 295 Y60 F1000 ; slow wipe\nG1 X 298 Y60 F1000 ; slow wipe\nG1 X 298 Y46 F1000 ; slow wipe\nG1 X 295 Y46 F1000 ; slow wipe\nG1 X 295 Y60 F1000 ; slow wipe\nG1 X 298 Y60 F1000 ; slow wipe\nG1 X 298 Y46 F1000 ; slow wipe\nG1 X 295 Y46 F1000 ; slow wipe\nG1 X 295 Y60 F1000 ; slow wipe\nG1 X 296.5 Y60 F1000 ; slow wipe\nG1 X 296.5 Y42 F1000 ; slow wipe\nG1 X 297.5 Y40 F2000 ; fast wipe\nG1 X 295.5 Y38 F2000 ; fast wipe\nG1 X 297.5 Y36 F2000 ; fast wipe\nG1 X 295.5 Y34 F2000 ; fast wipe\nG1 X 297.5 Y30 F1000 ; slow wipe\nG1 X 296.5 Y19 F1000 ; slow wipe\nG1 X 296.5 Y19 Z20 F1000 ; raise extruder\nM106 S255 ; turn on fan to blow away fuzzies\nG4 S5 ; wait 5 seconds\nM107 ; turn off fan\nG0 X247 F1000 ; move over to switch extruders\nT0 ; switch to first extruder\nM109 R{material_standby_temperature} ; heat to probe temp\nM204 S100 ; set accel for probing\nG29 ; probe sequence (for auto-leveling)\nM420 S1 ; enable leveling matrix\nM204 S500 ; set accel back to normal\nM104 S{material_print_temperature_layer_0} T0 ; set extruder temp\nM104 S{material_print_temperature_layer_0} T1 ; set extruder temp\nG1 X100 Y-29 Z0.5 F3000 ; move to open space\nM400 ; clear buffer\nM117 Heating... ; LCD status message\nM109 R{material_print_temperature_layer_0} T0 ; set extruder temp and wait\nM109 R{material_print_temperature_layer_0} T1 ; set extruder temp and wait\nM117 Purging... ; LCD status message\nT0 ; select this extruder first\nG1 E0 F100 ; undo retraction\nG92 E-30 ; set extruder negative amount to purge\nG1 E0 F100 ; purge XXmm of filament\nG1 E-3 F200 ; purge retraction\nG1 Z0.45 ; clear bed (barely)\nG1 X100 Y10 F4000 ; move above bed to shear off filament\nM106 S255 ; turn on fan\nG4 S7 ; wait 7 seconds\nM107 ; turn off fan\nG1 X180 Y-29 Z0.45 F3000 ; move to open space\nT1 ; set extruder\nG1 E0 F100 ; undo retraction\nG92 E-30 ; set extruder negative amount to purge\nG1 E0 F100 ; purge XXmm of filament\nG1 E-4 F200 ; purge retraction\nG1 Z0.35 ; clear bed (barely)\nG1 X180 Y10 F4000 ; move above bed to shear off filament\nT0 ; set extruder\nM190 R{material_bed_temperature_layer_0} ; get bed temping up during first layer\nG1 Z2 E0 F75 ; raise head and 0 extruder\nM82 ; set to absolute mode\nM400 ; clear buffer\nM117 TAZ Printing... ; LCD status message\n" - }, - "machine_end_gcode": { - "default_value": "; part removal temp is hardcoded to 45\nM400\nM104 S0 T0 ; T0 hotend off\nM104 S0 T1 ; T1 hotend off\nM107 ; fans off\nG91 ; relative positioning\nT0\nG1 E-1 F300 ; retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z20 E-1 X-20 Y-20 F2000 ; move Z up a bit and retract filament even more\nG1 E0 ; re-prime extruder 1\nT1\nG1 E-1 F300 ; retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 E0 ; re-prime extruder 2\nT0\nM117 Cooling please wait ; progress indicator message\nG90 ; absolute positioning\nG1 Y0 F3000 ; move to cooling position\nM190 R45 ; set bed to cool off\nG1 Y280 F3000 ; present finished print\nM140 S0 ; cool down\nM77 ; stop GLCD timer\nM18 X Y E ; turn off x y and e axis\nG90 ; absolute positioning\nM117 Print complete ; progress indicator message\n" - }, - "machine_extruder_count": { "default_value": 2 }, - "layer_start_x": { "value": 100 }, - "layer_start_y": { "value": 100 } - } -} + }, + "platform_offset": [ + 0, + -10, + 0 + ] + }, + "overrides": + { + "layer_start_x": { "value": 100 }, + "layer_start_y": { "value": 100 }, + "machine_depth": { "default_value": 286 }, + "machine_end_gcode": { "default_value": "; part removal temp is hardcoded to 45\nM400\nM104 S0 T0 ; T0 hotend off\nM104 S0 T1 ; T1 hotend off\nM107 ; fans off\nG91 ; relative positioning\nT0\nG1 E-1 F300 ; retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z20 E-1 X-20 Y-20 F2000 ; move Z up a bit and retract filament even more\nG1 E0 ; re-prime extruder 1\nT1\nG1 E-1 F300 ; retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 E0 ; re-prime extruder 2\nT0\nM117 Cooling please wait ; progress indicator message\nG90 ; absolute positioning\nG1 Y0 F3000 ; move to cooling position\nM190 R45 ; set bed to cool off\nG1 Y280 F3000 ; present finished print\nM140 S0 ; cool down\nM77 ; stop GLCD timer\nM18 X Y E ; turn off x y and e axis\nG90 ; absolute positioning\nM117 Print complete ; progress indicator message\n" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 286 }, + "machine_name": { "default_value": "Lulzbot TAZ Pro" }, + "machine_start_gcode": { "default_value": "; This profile is designed specifically for the LulzBot TAZ Pro with Dual Extruder Tool Head\nM73 P0 ; clear GLCD progress bar\nM75 ; start GLCD timer\nM107 ; disable fans\nG90 ; absolute positioning\nM420 S0 ; disable previous leveling matrix\nM140 S{material_bed_temperature_layer_0} ; begin bed temping up\nM104 S{material_standby_temperature} T0 ; soften filament\nM104 S{material_standby_temperature} T1 ; soften filament\nG28 ; home\nM117 Heating... ; LCD status message\nM109 R{material_standby_temperature} T0 ; wait for temp\nM109 R{material_standby_temperature} T1 ; wait for temp\nT0 ; select this extruder first\nM82 ; set extruder to absolute mode\nG92 E0 ; set extruder to zero\nG1 E-10 F100 ; retract 10mm of filament on first extruder\nG0 X50 F1000 ; move over to switch extruders\nT1 ; switch extruders\nM82 ; set extruder to absolute mode\nG92 E0 ; set extruder to zero\nG1 E-10 F100 ; retract 10mm of filament on second extruder\nM104 S{material_standby_temperature} T0 ; set to wipe temp\nM104 S{material_standby_temperature} T1 ; set to wipe temp\nM106 ; turn on fans to speed cooling\nT0 ; select first extruder for probing\nG1 X-16.5 Y100 F2000 ; move above wiper pad\nM117 Cooling... ; LCD status message\nM109 R{material_standby_temperature} T0 ; wait for T0 to reach temp\nM109 R{material_standby_temperature} T1 ; wait for T1 to reach temp\nM107 ; turn off fan\nG1 Z 1.0 ; push nozzle into wiper\nG1 X -16.5 Y100 F1000 ; slow wipe\nG1 X -16.5 Y90 F1000 ; slow wipe\nG1 X -15.5 Y86 F2000 ; fast wipe\nG1 X -17.5 Y80 F2000 ; fast wipe\nG1 X -15.5 Y74 F2000 ; fast wipe\nG1 X -17.5 Y70 F2000 ; fast wipe\nG1 X -16.5 Y68 F1000 ; slow wipe\nG1 X -16.5 Y60 F1000 ; slow wipe\nG1 X -14.5 Y60 F1000 ; slow wipe\nG1 X -14.5 Y46 F1000 ; slow wipe\nG1 X -17.5 Y46 F1000 ; slow wipe\nG1 X -17.5 Y60 F1000 ; slow wipe\nG1 X -14.5 Y60 F1000 ; slow wipe\nG1 X -14.5 Y46 F1000 ; slow wipe\nG1 X -17.5 Y46 F1000 ; slow wipe\nG1 X -17.5 Y60 F1000 ; slow wipe\nG1 X -14.5 Y60 F1000 ; slow wipe\nG1 X -14.5 Y46 F1000 ; slow wipe\nG1 X -17.5 Y46 F1000 ; slow wipe\nG1 X -17.5 Y60 F1000 ; slow wipe\nG1 X -16.5 Y60 F1000 ; slow wipe\nG1 X -16.5 Y42 F1000 ; slow wipe\nG1 X -15.5 Y40 F2000 ; fast wipe\nG1 X -17.5 Y38 F2000 ; fast wipe\nG1 X -15.5 Y36 F2000 ; fast wipe\nG1 X -17.5 Y34 F2000 ; fast wipe\nG1 X -16.5 Y30 F1000 ; slow wipe\nG1 X -16.5 Y19 F1000 ; slow wipe\nG1 X -16.5 Y19 Z20 F1000 ; raise extruder\nM106 S255 ; turn on fan to blow away fuzzies\nG4 S5 ; wait 5 seconds\nM107 ; turn off fan\nG0 X50 F1000 ; move over to switch extruders\nT1 ; switch to second extruder\nG1 X296.5 Y100 F5000 ; move E2 above second wiper pad\nG1 Z 1.0 ; push nozzle into wiper\nG1 X 296.5 Y100 F1000 ; slow wipe\nG1 X 296.5 Y90 F1000 ; slow wipe\nG1 X 297.5 Y86 F2000 ; fast wipe\nG1 X 295.5 Y80 F2000 ; fast wipe\nG1 X 297.5 Y74 F2000 ; fast wipe\nG1 X 295.5 Y70 F2000 ; fast wipe\nG1 X 296.5 Y68 F1000 ; slow wipe\nG1 X 296.5 Y60 F1000 ; slow wipe\nG1 X 298 Y60 F1000 ; slow wipe\nG1 X 298 Y46 F1000 ; slow wipe\nG1 X 295 Y46 F1000 ; slow wipe\nG1 X 295 Y60 F1000 ; slow wipe\nG1 X 298 Y60 F1000 ; slow wipe\nG1 X 298 Y46 F1000 ; slow wipe\nG1 X 295 Y46 F1000 ; slow wipe\nG1 X 295 Y60 F1000 ; slow wipe\nG1 X 298 Y60 F1000 ; slow wipe\nG1 X 298 Y46 F1000 ; slow wipe\nG1 X 295 Y46 F1000 ; slow wipe\nG1 X 295 Y60 F1000 ; slow wipe\nG1 X 296.5 Y60 F1000 ; slow wipe\nG1 X 296.5 Y42 F1000 ; slow wipe\nG1 X 297.5 Y40 F2000 ; fast wipe\nG1 X 295.5 Y38 F2000 ; fast wipe\nG1 X 297.5 Y36 F2000 ; fast wipe\nG1 X 295.5 Y34 F2000 ; fast wipe\nG1 X 297.5 Y30 F1000 ; slow wipe\nG1 X 296.5 Y19 F1000 ; slow wipe\nG1 X 296.5 Y19 Z20 F1000 ; raise extruder\nM106 S255 ; turn on fan to blow away fuzzies\nG4 S5 ; wait 5 seconds\nM107 ; turn off fan\nG0 X247 F1000 ; move over to switch extruders\nT0 ; switch to first extruder\nM109 R{material_standby_temperature} ; heat to probe temp\nM204 S100 ; set accel for probing\nG29 ; probe sequence (for auto-leveling)\nM420 S1 ; enable leveling matrix\nM204 S500 ; set accel back to normal\nM104 S{material_print_temperature_layer_0} T0 ; set extruder temp\nM104 S{material_print_temperature_layer_0} T1 ; set extruder temp\nG1 X100 Y-29 Z0.5 F3000 ; move to open space\nM400 ; clear buffer\nM117 Heating... ; LCD status message\nM109 R{material_print_temperature_layer_0} T0 ; set extruder temp and wait\nM109 R{material_print_temperature_layer_0} T1 ; set extruder temp and wait\nM117 Purging... ; LCD status message\nT0 ; select this extruder first\nG1 E0 F100 ; undo retraction\nG92 E-30 ; set extruder negative amount to purge\nG1 E0 F100 ; purge XXmm of filament\nG1 E-3 F200 ; purge retraction\nG1 Z0.45 ; clear bed (barely)\nG1 X100 Y10 F4000 ; move above bed to shear off filament\nM106 S255 ; turn on fan\nG4 S7 ; wait 7 seconds\nM107 ; turn off fan\nG1 X180 Y-29 Z0.45 F3000 ; move to open space\nT1 ; set extruder\nG1 E0 F100 ; undo retraction\nG92 E-30 ; set extruder negative amount to purge\nG1 E0 F100 ; purge XXmm of filament\nG1 E-4 F200 ; purge retraction\nG1 Z0.35 ; clear bed (barely)\nG1 X180 Y10 F4000 ; move above bed to shear off filament\nT0 ; set extruder\nM190 R{material_bed_temperature_layer_0} ; get bed temping up during first layer\nG1 Z2 E0 F75 ; raise head and 0 extruder\nM82 ; set to absolute mode\nM400 ; clear buffer\nM117 TAZ Printing... ; LCD status message\n" }, + "machine_width": { "default_value": 282 } + } +} \ No newline at end of file diff --git a/resources/definitions/makeR_pegasus.def.json b/resources/definitions/makeR_pegasus.def.json index a8fbf49875..3f72c2108d 100644 --- a/resources/definitions/makeR_pegasus.def.json +++ b/resources/definitions/makeR_pegasus.def.json @@ -2,37 +2,29 @@ "version": 2, "name": "Maker Pegasus", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Maker", "manufacturer": "Maker", "file_formats": "text/x-gcode", "platform": "makeR_pegasus_platform.3mf", - "platform_offset": [-200, -10, 200], - "machine_extruder_trains": - { - "0": "makeR_pegasus_extruder_0" - } + "machine_extruder_trains": { "0": "makeR_pegasus_extruder_0" }, + "platform_offset": [ + -200, + -10, + 200 + ] }, - - "overrides": { - "machine_name": { "default_value": "makeR Pegasus" }, - "machine_heated_bed": { - "default_value": true - }, - "machine_width": { - "default_value": 400 - }, - "machine_height": { - "default_value": 400 - }, - "machine_depth": { - "default_value": 400 - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_head_with_fans_polygon": { + "overrides": + { + "gantry_height": { "value": "25" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 400 }, + "machine_end_gcode": { "default_value": "M104 S0;Turn off temperature\nG28 X0; Home X\nM84; Disable Motors" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { "default_value": [ [-75, -18], [-75, 35], @@ -40,17 +32,10 @@ [18, -18] ] }, - "gantry_height": { - "value": "25" - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G1 Z15;\nG28;Home\nG29;Auto Level\nG1 Z5 F5000;Move the platform down 15mm" - }, - "machine_end_gcode": { - "default_value": "M104 S0;Turn off temperature\nG28 X0; Home X\nM84; Disable Motors" - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "makeR Pegasus" }, + "machine_start_gcode": { "default_value": "G1 Z15;\nG28;Home\nG29;Auto Level\nG1 Z5 F5000;Move the platform down 15mm" }, + "machine_width": { "default_value": 400 } } } \ No newline at end of file diff --git a/resources/definitions/makeR_prusa_tairona_i3.def.json b/resources/definitions/makeR_prusa_tairona_i3.def.json index f56dc314a2..c973e79d9a 100644 --- a/resources/definitions/makeR_prusa_tairona_i3.def.json +++ b/resources/definitions/makeR_prusa_tairona_i3.def.json @@ -2,37 +2,29 @@ "version": 2, "name": "Maker Prusa Tairona i3", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Maker", "manufacturer": "Maker", "file_formats": "text/x-gcode", "platform": "makeR_prusa_tairona_i3_platform.3mf", - "platform_offset": [-2, 0, 0], - "machine_extruder_trains": - { - "0": "makeR_prusa_tairona_i3_extruder_0" - } + "machine_extruder_trains": { "0": "makeR_prusa_tairona_i3_extruder_0" }, + "platform_offset": [ + -2, + 0, + 0 + ] }, - - "overrides": { - "machine_name": { "default_value": "makeR Prusa Tairona I3" }, - "machine_heated_bed": { - "default_value": true - }, - "machine_width": { - "default_value": 200 - }, - "machine_height": { - "default_value": 200 - }, - "machine_depth": { - "default_value": 200 - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_head_with_fans_polygon": { + "overrides": + { + "gantry_height": { "value": "55" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "M104 S0;Turn off temperature\nG28 X0; Home X\nM84; Disable Motors" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { "default_value": [ [-75, -18], [-75, 35], @@ -40,17 +32,10 @@ [18, -18] ] }, - "gantry_height": { - "value": "55" - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G1 Z15;\nG28;Home\nG29;Auto Level\nG1 Z5 F5000;Move the platform down 15mm" - }, - "machine_end_gcode": { - "default_value": "M104 S0;Turn off temperature\nG28 X0; Home X\nM84; Disable Motors" - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 200 }, + "machine_name": { "default_value": "makeR Prusa Tairona I3" }, + "machine_start_gcode": { "default_value": "G1 Z15;\nG28;Home\nG29;Auto Level\nG1 Z5 F5000;Move the platform down 15mm" }, + "machine_width": { "default_value": 200 } } } \ No newline at end of file diff --git a/resources/definitions/makeblock_mcreate.def.json b/resources/definitions/makeblock_mcreate.def.json index 7a2d575395..e2970943be 100644 --- a/resources/definitions/makeblock_mcreate.def.json +++ b/resources/definitions/makeblock_mcreate.def.json @@ -2,67 +2,36 @@ "version": 2, "name": "Makeblock mCreate", "inherits": "fdmprinter", - "metadata": { + "metadata": + { + "visible": true, "author": "Makeblock", "manufacturer": "Makeblock", - "visible": true, "file_formats": "application/gzip;text/x-gcode", "has_machine_quality": true, - "preferred_quality_type": "normal", - "machine_extruder_trains": { - "0": "makeblock_mcreate_extruder_0" - } + "machine_extruder_trains": { "0": "makeblock_mcreate_extruder_0" }, + "preferred_quality_type": "normal" }, - "overrides": { - "machine_name": { - "default_value": "Makeblock mCreate" - }, - "machine_width": { - "default_value": 225 - }, - "machine_depth": { - "default_value": 225 - }, - "machine_height": { - "default_value": 300 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_head_with_fans_polygon": { + "overrides": + { + "gantry_height": { "value": 15.0 }, + "machine_depth": { "default_value": 225 }, + "machine_end_gcode": { "default_value": "; Mcreate end Gcode \nG4 ; Wait command in buffer have finished \nG92 E0 \nG1 E-2 F300; retract filament \nG28 X Z; home x z axis \nG1 F3000 Y220;Move Heat Bed to the front for easy print removal \nM104 S0; Turn off the nozzle heat \nM140 S0; Turn off the bed heat \nM107 ; Turn off the Fan \nM84 ; Disable stepper motors \n; End of GCode" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_gcode_flavor": { "default_value": "Marlin" }, + "machine_head_with_fans_polygon": + { "default_value": [ - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ], - [ - 0, - 0 - ] + [0, 0], + [0, 0], + [0, 0], + [0, 0] ] }, - "machine_gcode_flavor": { - "default_value": "Marlin" - }, - "gantry_height": { - "value": 15.0 - }, - "machine_extruder_count": { - "default_value": 1 - }, - "machine_start_gcode": { - "default_value": "; Mcreate Start Gcode \nG28 ; Home all axes \nG92 E0 ; Reset Extruder\nG1 X0 Y0 Z15 F3000.0 ; Move to start position \nG1 E10 F400 ;load filament \nG1 E2 F400 ;retarct filament \nG92 E0 ; Reset Extruder \nG1 X0 Y130 Z15 F3000.0 \nG12 ; clean nozzle \nG1 X0 Y0 Z0.3 F3000.0 ; Move to start position \nG1 E9.0 F400 ;loadsome filament \nG92 E0 ; Reset Extruder \n; End of start GCode" - }, - "machine_end_gcode": { - "default_value": "; Mcreate end Gcode \nG4 ; Wait command in buffer have finished \nG92 E0 \nG1 E-2 F300; retract filament \nG28 X Z; home x z axis \nG1 F3000 Y220;Move Heat Bed to the front for easy print removal \nM104 S0; Turn off the nozzle heat \nM140 S0; Turn off the bed heat \nM107 ; Turn off the Fan \nM84 ; Disable stepper motors \n; End of GCode" - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 300 }, + "machine_name": { "default_value": "Makeblock mCreate" }, + "machine_start_gcode": { "default_value": "; Mcreate Start Gcode \nG28 ; Home all axes \nG92 E0 ; Reset Extruder\nG1 X0 Y0 Z15 F3000.0 ; Move to start position \nG1 E10 F400 ;load filament \nG1 E2 F400 ;retarct filament \nG92 E0 ; Reset Extruder \nG1 X0 Y130 Z15 F3000.0 \nG12 ; clean nozzle \nG1 X0 Y0 Z0.3 F3000.0 ; Move to start position \nG1 E9.0 F400 ;loadsome filament \nG92 E0 ; Reset Extruder \n; End of start GCode" }, + "machine_width": { "default_value": 225 } } -} +} \ No newline at end of file diff --git a/resources/definitions/makeit_pro_l.def.json b/resources/definitions/makeit_pro_l.def.json index 237a8ac09e..dfba300698 100644 --- a/resources/definitions/makeit_pro_l.def.json +++ b/resources/definitions/makeit_pro_l.def.json @@ -2,7 +2,8 @@ "version": 2, "name": "Makeit Pro-L", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "unknown", "manufacturer": "Makeit 3D", @@ -14,86 +15,40 @@ "1": "makeit_l_dual_2nd" } }, - - "overrides": { - "machine_name": { "default_value": "MAKEiT Pro-L" }, - "machine_width": { - "default_value": 305 - }, - "machine_height": { - "default_value": 330 - }, - "machine_depth": { - "default_value": 254 - }, - "machine_center_is_zero": { - "default_value": false - }, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "cool_min_layer_time_fan_speed_max": { "default_value": 5 }, + "gantry_height": { "value": "330" }, + "infill_sparse_density": { "default_value": 20 }, + "layer_height": { "default_value": 0.2 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 254 }, + "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-5 F9000 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+5 X+20 Y+20 F9000 ;move Z up a bit\nM117 MAKEiT Pro@Done\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\nM81" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_head_with_fans_polygon": { "default_value": [ - [ -305, 28 ], - [ -305, -28 ], - [ 305, 28 ], - [ 305, -28 ] + [-305, 28], + [-305, -28], + [305, 28], + [305, -28] ] }, - "gantry_height": { - "value": "330" - }, - "machine_use_extruder_offset_to_offset_coords": { - "default_value": true - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG92 E0 ;zero the extruded length\nG28 ;home\nG1 F200 E30 ;extrude 30 mm of feed stock\nG92 E0 ;zero the extruded length\nG1 E-5 ;retract 5 mm\nG28 SC ;Do homeing, clean nozzles and let printer to know that printing started\nG92 X-6 ;Sets Curas checker board to match printers heated bed coordinates\nG1 F{speed_travel}\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-5 F9000 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+5 X+20 Y+20 F9000 ;move Z up a bit\nM117 MAKEiT Pro@Done\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\nM81" - }, - "machine_extruder_count": { - "default_value": 2 - }, - "print_sequence": { - "enabled": true - }, - "prime_tower_position_x": { - "value": "185" - }, - "prime_tower_position_y": { - "value": "160" - }, - "layer_height": { - "default_value": 0.2 - }, - "retraction_speed": { - "default_value": 180 - }, - "infill_sparse_density": { - "default_value": 20 - }, - "retraction_amount": { - "default_value": 6 - }, - "speed_print": { - "default_value": 60 - }, - "wall_thickness": { - "value": "1.2" - }, - "cool_min_layer_time_fan_speed_max": { - "default_value": 5 - }, - "adhesion_type": { - "default_value": "skirt" - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_heat_zone_length": { - "default_value": 20 - } + "machine_heat_zone_length": { "default_value": 20 }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 330 }, + "machine_name": { "default_value": "MAKEiT Pro-L" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG92 E0 ;zero the extruded length\nG28 ;home\nG1 F200 E30 ;extrude 30 mm of feed stock\nG92 E0 ;zero the extruded length\nG1 E-5 ;retract 5 mm\nG28 SC ;Do homeing, clean nozzles and let printer to know that printing started\nG92 X-6 ;Sets Curas checker board to match printers heated bed coordinates\nG1 F{speed_travel}\nM117 Printing..." }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, + "machine_width": { "default_value": 305 }, + "prime_tower_position_x": { "value": "185" }, + "prime_tower_position_y": { "value": "160" }, + "print_sequence": { "enabled": true }, + "retraction_amount": { "default_value": 6 }, + "retraction_speed": { "default_value": 180 }, + "speed_print": { "default_value": 60 }, + "wall_thickness": { "value": "1.2" } } -} +} \ No newline at end of file diff --git a/resources/definitions/makeit_pro_m.def.json b/resources/definitions/makeit_pro_m.def.json index 3eb0850555..7b42c3acaf 100644 --- a/resources/definitions/makeit_pro_m.def.json +++ b/resources/definitions/makeit_pro_m.def.json @@ -2,7 +2,8 @@ "version": 2, "name": "Makeit Pro-M", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "unknown", "manufacturer": "Makeit 3D", @@ -14,83 +15,39 @@ "1": "makeit_dual_2nd" } }, - - "overrides": { - "machine_name": { "default_value": "MAKEiT Pro-M" }, - "machine_width": { - "default_value": 200 - }, - "machine_height": { - "default_value": 200 - }, - "machine_depth": { - "default_value": 240 - }, - "machine_center_is_zero": { - "default_value": false - }, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "cool_min_layer_time_fan_speed_max": { "default_value": 5 }, + "gantry_height": { "value": "200" }, + "infill_sparse_density": { "default_value": 20 }, + "layer_height": { "default_value": 0.2 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 240 }, + "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-5 F9000 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+5 X+20 Y+20 F9000 ;move Z up a bit\nM117 MAKEiT Pro@Done\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\nM81" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_head_with_fans_polygon": { "default_value": [ - [ -200, 240 ], - [ -200, -32 ], - [ 200, 240 ], - [ 200, -32 ] + [-200, 240], + [-200, -32], + [200, 240], + [200, -32] ] }, - "gantry_height": { - "value": "200" - }, - "machine_use_extruder_offset_to_offset_coords": { - "default_value": true - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG92 E0 ;zero the extruded length\nG28 ;home\nG1 F200 E30 ;extrude 30 mm of feed stock\nG92 E0 ;zero the extruded length\nG1 E-5 ;retract 5 mm\nG28 SC ;Do homeing, clean nozzles and let printer to know that printing started\nG92 X-6 ;Sets Curas checker board to match printers heated bed coordinates\nG1 F{speed_travel}\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-5 F9000 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+5 X+20 Y+20 F9000 ;move Z up a bit\nM117 MAKEiT Pro@Done\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\nM81" - }, - "machine_extruder_count": { - "default_value": 2 - }, - "print_sequence": { - "enabled": false - }, - "prime_tower_position_x": { - "value": "185" - }, - "prime_tower_position_y": { - "value": "160" - }, - "layer_height": { - "default_value": 0.2 - }, - "retraction_speed": { - "default_value": 180 - }, - "infill_sparse_density": { - "default_value": 20 - }, - "retraction_amount": { - "default_value": 6 - }, - "speed_print": { - "default_value": 60 - }, - "wall_thickness": { - "value": "1.2" - }, - "cool_min_layer_time_fan_speed_max": { - "default_value": 5 - }, - "adhesion_type": { - "default_value": "skirt" - }, - "machine_heated_bed": { - "default_value": true - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 200 }, + "machine_name": { "default_value": "MAKEiT Pro-M" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG92 E0 ;zero the extruded length\nG28 ;home\nG1 F200 E30 ;extrude 30 mm of feed stock\nG92 E0 ;zero the extruded length\nG1 E-5 ;retract 5 mm\nG28 SC ;Do homeing, clean nozzles and let printer to know that printing started\nG92 X-6 ;Sets Curas checker board to match printers heated bed coordinates\nG1 F{speed_travel}\nM117 Printing..." }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, + "machine_width": { "default_value": 200 }, + "prime_tower_position_x": { "value": "185" }, + "prime_tower_position_y": { "value": "160" }, + "print_sequence": { "enabled": false }, + "retraction_amount": { "default_value": 6 }, + "retraction_speed": { "default_value": 180 }, + "speed_print": { "default_value": 60 }, + "wall_thickness": { "value": "1.2" } } -} +} \ No newline at end of file diff --git a/resources/definitions/makeit_pro_mx.def.json b/resources/definitions/makeit_pro_mx.def.json index 9322d2f510..f7728af7f6 100644 --- a/resources/definitions/makeit_pro_mx.def.json +++ b/resources/definitions/makeit_pro_mx.def.json @@ -2,7 +2,8 @@ "version": 2, "name": "Makeit Pro-MX", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "unknown", "manufacturer": "Makeit 3D", @@ -14,83 +15,39 @@ "1": "makeit_mx_dual_2nd" } }, - - "overrides": { - "machine_name": { "default_value": "MAKEiT Pro-MX" }, - "machine_width": { - "default_value": 200 - }, - "machine_height": { - "default_value": 330 - }, - "machine_depth": { - "default_value": 240 - }, - "machine_center_is_zero": { - "default_value": false - }, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "cool_min_layer_time_fan_speed_max": { "default_value": 5 }, + "gantry_height": { "value": "200" }, + "infill_sparse_density": { "default_value": 20 }, + "layer_height": { "default_value": 0.2 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 240 }, + "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-5 F9000 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+5 X+20 Y+20 F9000 ;move Z up a bit\nM117 MAKEiT Pro@Done\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\nM81" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_head_with_fans_polygon": { "default_value": [ - [ -200, 240 ], - [ -200, -32 ], - [ 200, 240 ], - [ 200, -32 ] + [-200, 240], + [-200, -32], + [200, 240], + [200, -32] ] }, - "gantry_height": { - "value": "200" - }, - "machine_use_extruder_offset_to_offset_coords": { - "default_value": true - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG92 E0 ;zero the extruded length\nG28 ;home\nG1 F200 E30 ;extrude 30 mm of feed stock\nG92 E0 ;zero the extruded length\nG1 E-5 ;retract 5 mm\nG28 SC ;Do homeing, clean nozzles and let printer to know that printing started\nG92 X-6 ;Sets Curas checker board to match printers heated bed coordinates\nG1 F{speed_travel}\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-5 F9000 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+5 X+20 Y+20 F9000 ;move Z up a bit\nM117 MAKEiT Pro@Done\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\nM81" - }, - "machine_extruder_count": { - "default_value": 2 - }, - "print_sequence": { - "enabled": false - }, - "prime_tower_position_x": { - "value": "185" - }, - "prime_tower_position_y": { - "value": "160" - }, - "layer_height": { - "default_value": 0.2 - }, - "retraction_speed": { - "default_value": 180 - }, - "infill_sparse_density": { - "default_value": 20 - }, - "retraction_amount": { - "default_value": 6 - }, - "speed_print": { - "default_value": 60 - }, - "wall_thickness": { - "value": "1.2" - }, - "cool_min_layer_time_fan_speed_max": { - "default_value": 5 - }, - "adhesion_type": { - "default_value": "skirt" - }, - "machine_heated_bed": { - "default_value": true - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 330 }, + "machine_name": { "default_value": "MAKEiT Pro-MX" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG92 E0 ;zero the extruded length\nG28 ;home\nG1 F200 E30 ;extrude 30 mm of feed stock\nG92 E0 ;zero the extruded length\nG1 E-5 ;retract 5 mm\nG28 SC ;Do homeing, clean nozzles and let printer to know that printing started\nG92 X-6 ;Sets Curas checker board to match printers heated bed coordinates\nG1 F{speed_travel}\nM117 Printing..." }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, + "machine_width": { "default_value": 200 }, + "prime_tower_position_x": { "value": "185" }, + "prime_tower_position_y": { "value": "160" }, + "print_sequence": { "enabled": false }, + "retraction_amount": { "default_value": 6 }, + "retraction_speed": { "default_value": 180 }, + "speed_print": { "default_value": 60 }, + "wall_thickness": { "value": "1.2" } } } \ No newline at end of file diff --git a/resources/definitions/maker_made_300x.def.json b/resources/definitions/maker_made_300x.def.json index c7b888dfff..0d9ec79f1b 100644 --- a/resources/definitions/maker_made_300x.def.json +++ b/resources/definitions/maker_made_300x.def.json @@ -1,141 +1,150 @@ -{ - "version": 2, - "name": "Maker Made 300x", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "DragonJe", - "manufacturer": "Maker Made", - "file_formats": "text/x-gcode", - "platform_offset": [0, 0, 0], - "has_materials": true, - "has_variants": false, - "preferred_quality_type": "normal", - "has_machine_quality": false, - "preferred_material": "generic_pla", - "machine_extruder_trains": - { - "0": "maker_made_300x_extruder_0" - } - }, - - "overrides": { - "machine_name": {"default_value": "Maker Made 300x"}, - "machine_width": {"default_value": 300}, - "machine_height": {"default_value": 400}, - "machine_depth": {"default_value": 300}, - "machine_head_with_fans_polygon": {"default_value": [[-30, 34],[-30, -32],[30, -32],[30, 34]]}, - "gantry_height": {"value": "30"}, - "machine_heated_bed": {"default_value": true}, - "material_diameter": {"default_value": 1.75}, - "machine_gcode_flavor": {"default_value": " RepRap (Marlin/Sprinter)"}, - "machine_start_gcode": {"default_value": "G28 ;Home\n G29 ;Auto Level\n G92 E0 ;Reset Extruder\n G1 Z5.0 F3000 ;Move Z Axis up\n G1 X25 Y295.0 Z0.28 F3000.0 ;Move to extrude\n G1 X250 Y295.0 Z0.28 F1500.0 E15 ;Draw the first line\n G1 X25 Y290.0 Z0.28 F3000.0 ;Move to side a little\n G1 X250 Y290.0 Z0.28 F1500.0 E30 ;Draw the second line\n G92 E0 ;Reset Extruder\n G1 Z5.0 F3000 ;Move Z Axis up" }, - "machine_end_gcode": {"default_value": "M104 S0\n M140 S0\n ;Retract the filament\n G92 E1\n G1 E-1 F300\n G28 X0 Y0\n G1 Y300 F3000 ;Move bed forward\n M84" }, - - "layer_height": {"value": 0.16}, - "layer_height_0": {"value": 0.32}, - "line_width": {"value": 0.4}, - "wall_line_width_0": {"value": 0.4}, - "initial_layer_line_width_factor": {"value": 100}, - "wall_thickness": {"value": 0.8}, - "wall_0_wipe_dist": {"value": 0.2}, - "roofing_layer_count": {"value": 1}, - "top_bottom_thickness": {"value": 0.6}, - "top_thickness": {"value": 0.8}, - "top_layers": {"value": 5}, - "bottom_thickness": {"value": 0.6}, - "bottom_layers": {"value": 3}, - "top_bottom_pattern": {"value": "'lines'" }, - "top_bottom_pattern_0": {"value": "'lines'" }, - "wall_0_inset": {"value": 0}, - "optimize_wall_printing_order": {"value": false }, - "inset_direction": {"value": "'inside_out'" }, - "alternate_extra_perimeter": {"value": false }, - "fill_outline_gaps": {"value": true }, - "xy_offset": {"value": 0}, - "skin_no_small_gaps_heuristic": {"value": true }, - "skin_outline_count": {"value": 1}, - "ironing_enabled": {"value": false }, - "infill_sparse_density": {"value": 20 }, - "zig_zaggify_infill": {"value": false }, - "infill_multiplier": {"value": 1}, - "infill_wall_line_count": {"value": 0}, - "infill_overlap": {"value": 10}, - "skin_overlap": {"value": 5}, - "infill_wipe_dist": {"value": 0.1}, - "gradual_infill_steps": {"value": 0}, - "infill_before_walls": {"value": false }, - "infill_support_enabled": {"value": false }, - "max_skin_angle_for_expansion": {"value": 90}, - "default_material_print_temperature": {"value": 220}, - "material_print_temperature_layer_0": {"value": 220}, - "material_initial_print_temperature": {"value": 220}, - "material_final_print_temperature": {"value": 220}, - "default_material_bed_temperature": {"value": 50}, - "material_bed_temperature": {"value": 50}, - "material_flow": {"value": 100}, - "retraction_enable": {"value": true }, - "retract_at_layer_change": {"value": false }, - "retraction_amount": {"value": 5}, - "retraction_speed": {"value": 45}, - "retraction_extra_prime_amount": {"value": 0}, - "retraction_min_travel": {"value": 0.8}, - "retraction_count_max": {"value": 90}, - "retraction_extrusion_window": {"value": 5}, - "limit_support_retractions": {"value": true }, - "switch_extruder_retraction_amount": {"value": 16}, - "switch_extruder_retraction_speeds": {"value": 20}, - "speed_print": {"value": 50}, - "speed_travel": {"value": 150}, - "speed_layer_0": {"value": 10}, - "speed_travel_layer_0": {"value": 50}, - "speed_slowdown_layers": {"value": 2}, - "acceleration_enabled": {"value": false }, - "acceleration_roofing": {"value": 3000 }, - "jerk_enabled": {"value": false }, - "retraction_combing": {"value": "'infill'" }, - "travel_retract_before_outer_wall": {"value": false }, - "travel_avoid_other_parts": {"value": true }, - "retraction_hop_enabled": {"value": false }, - "cool_fan_enabled": {"value": true }, - "cool_fan_speed": {"value": 100}, - "cool_fan_speed_0": {"value": 0}, - "cool_fan_full_at_height": {"value": 0.32 }, - "cool_lift_head": {"value": false }, - "support_enable": {"value": true }, - "support_type": {"value": "'everywhere'" }, - "support_angle": {"value": "50"}, - "support_pattern": {"value": "'grid'"}, - "support_wall_count": {"value": "1 if (support_structure == 'tree') else 0" }, - "zig_zaggify_support": {"value": false }, - "support_infill_rate": {"value": "15 if support_enable else 0"}, - "support_brim_enable": {"value": true }, - "support_brim_line_count": {"value": 5}, - "support_z_distance": {"value": 0.2}, - "support_xy_distance": {"value": 0.7}, - "support_xy_distance_overhang": {"value": 0.2}, - "support_bottom_stair_step_height": {"value": 0.3}, - "support_bottom_stair_step_width": {"value": 5.0}, - "support_join_distance": {"value": 2.0}, - "support_offset": {"value": 0.2}, - "gradual_support_infill_steps": {"value": 0}, - "support_roof_enable": {"value": true }, - "support_bottom_enable": {"value": false }, - "support_roof_height": {"value": 0.45}, - "support_roof_density": {"value": 45}, - "support_roof_pattern": {"value": "'lines'" }, - "support_fan_enable": {"value": false }, - "support_use_towers": {"value": true }, - "support_tower_diameter": {"value": 3}, - "support_tower_roof_angle": {"value": "65"}, - "adhesion_type": {"value": "'skirt'"}, - "skirt_line_count": {"value": 2}, - "skirt_gap": {"value": 3}, - "meshfix_union_all": {"value": true }, - "meshfix_union_all_remove_holes": {"value": false }, - "meshfix_extensive_stitching": {"value": false }, - "meshfix_keep_open_polygons": {"value": false }, - "multiple_mesh_overlap": {"value": "0.16"}, - "carve_multiple_volumes": {"value": false } - } -} +{ + "version": 2, + "name": "Maker Made 300x", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "DragonJe", + "manufacturer": "Maker Made", + "file_formats": "text/x-gcode", + "has_machine_quality": false, + "has_materials": true, + "has_variants": false, + "machine_extruder_trains": { "0": "maker_made_300x_extruder_0" }, + "platform_offset": [ + 0, + 0, + 0 + ], + "preferred_material": "generic_pla", + "preferred_quality_type": "normal" + }, + "overrides": + { + "acceleration_enabled": { "value": false }, + "acceleration_roofing": { "value": 3000 }, + "adhesion_type": { "value": "'skirt'" }, + "alternate_extra_perimeter": { "value": false }, + "bottom_layers": { "value": 3 }, + "bottom_thickness": { "value": 0.6 }, + "carve_multiple_volumes": { "value": false }, + "cool_fan_enabled": { "value": true }, + "cool_fan_full_at_height": { "value": 0.32 }, + "cool_fan_speed": { "value": 100 }, + "cool_fan_speed_0": { "value": 0 }, + "cool_lift_head": { "value": false }, + "default_material_bed_temperature": { "value": 50 }, + "default_material_print_temperature": { "value": 220 }, + "fill_outline_gaps": { "value": true }, + "gantry_height": { "value": "30" }, + "gradual_infill_steps": { "value": 0 }, + "gradual_support_infill_steps": { "value": 0 }, + "infill_before_walls": { "value": false }, + "infill_multiplier": { "value": 1 }, + "infill_overlap": { "value": 10 }, + "infill_sparse_density": { "value": 20 }, + "infill_support_enabled": { "value": false }, + "infill_wall_line_count": { "value": 0 }, + "infill_wipe_dist": { "value": 0.1 }, + "initial_layer_line_width_factor": { "value": 100 }, + "inset_direction": { "value": "'inside_out'" }, + "ironing_enabled": { "value": false }, + "jerk_enabled": { "value": false }, + "layer_height": { "value": 0.16 }, + "layer_height_0": { "value": 0.32 }, + "limit_support_retractions": { "value": true }, + "line_width": { "value": 0.4 }, + "machine_depth": { "default_value": 300 }, + "machine_end_gcode": { "default_value": "M104 S0\n M140 S0\n ;Retract the filament\n G92 E1\n G1 E-1 F300\n G28 X0 Y0\n G1 Y300 F3000 ;Move bed forward\n M84" }, + "machine_gcode_flavor": { "default_value": " RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-30, 34], + [-30, -32], + [30, -32], + [30, 34] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "Maker Made 300x" }, + "machine_start_gcode": { "default_value": "G28 ;Home\n G29 ;Auto Level\n G92 E0 ;Reset Extruder\n G1 Z5.0 F3000 ;Move Z Axis up\n G1 X25 Y295.0 Z0.28 F3000.0 ;Move to extrude\n G1 X250 Y295.0 Z0.28 F1500.0 E15 ;Draw the first line\n G1 X25 Y290.0 Z0.28 F3000.0 ;Move to side a little\n G1 X250 Y290.0 Z0.28 F1500.0 E30 ;Draw the second line\n G92 E0 ;Reset Extruder\n G1 Z5.0 F3000 ;Move Z Axis up" }, + "machine_width": { "default_value": 300 }, + "material_bed_temperature": { "value": 50 }, + "material_diameter": { "default_value": 1.75 }, + "material_final_print_temperature": { "value": 220 }, + "material_flow": { "value": 100 }, + "material_initial_print_temperature": { "value": 220 }, + "material_print_temperature_layer_0": { "value": 220 }, + "max_skin_angle_for_expansion": { "value": 90 }, + "meshfix_extensive_stitching": { "value": false }, + "meshfix_keep_open_polygons": { "value": false }, + "meshfix_union_all": { "value": true }, + "meshfix_union_all_remove_holes": { "value": false }, + "multiple_mesh_overlap": { "value": "0.16" }, + "optimize_wall_printing_order": { "value": false }, + "retract_at_layer_change": { "value": false }, + "retraction_amount": { "value": 5 }, + "retraction_combing": { "value": "'infill'" }, + "retraction_count_max": { "value": 90 }, + "retraction_enable": { "value": true }, + "retraction_extra_prime_amount": { "value": 0 }, + "retraction_extrusion_window": { "value": 5 }, + "retraction_hop_enabled": { "value": false }, + "retraction_min_travel": { "value": 0.8 }, + "retraction_speed": { "value": 45 }, + "roofing_layer_count": { "value": 1 }, + "skin_no_small_gaps_heuristic": { "value": true }, + "skin_outline_count": { "value": 1 }, + "skin_overlap": { "value": 5 }, + "skirt_gap": { "value": 3 }, + "skirt_line_count": { "value": 2 }, + "speed_layer_0": { "value": 10 }, + "speed_print": { "value": 50 }, + "speed_slowdown_layers": { "value": 2 }, + "speed_travel": { "value": 150 }, + "speed_travel_layer_0": { "value": 50 }, + "support_angle": { "value": "50" }, + "support_bottom_enable": { "value": false }, + "support_bottom_stair_step_height": { "value": 0.3 }, + "support_bottom_stair_step_width": { "value": 5.0 }, + "support_brim_enable": { "value": true }, + "support_brim_line_count": { "value": 5 }, + "support_enable": { "value": true }, + "support_fan_enable": { "value": false }, + "support_infill_rate": { "value": "15 if support_enable else 0" }, + "support_join_distance": { "value": 2.0 }, + "support_offset": { "value": 0.2 }, + "support_pattern": { "value": "'grid'" }, + "support_roof_density": { "value": 45 }, + "support_roof_enable": { "value": true }, + "support_roof_height": { "value": 0.45 }, + "support_roof_pattern": { "value": "'lines'" }, + "support_tower_diameter": { "value": 3 }, + "support_tower_roof_angle": { "value": "65" }, + "support_type": { "value": "'everywhere'" }, + "support_use_towers": { "value": true }, + "support_wall_count": { "value": "1 if (support_structure == 'tree') else 0" }, + "support_xy_distance": { "value": 0.7 }, + "support_xy_distance_overhang": { "value": 0.2 }, + "support_z_distance": { "value": 0.2 }, + "switch_extruder_retraction_amount": { "value": 16 }, + "switch_extruder_retraction_speeds": { "value": 20 }, + "top_bottom_pattern": { "value": "'lines'" }, + "top_bottom_pattern_0": { "value": "'lines'" }, + "top_bottom_thickness": { "value": 0.6 }, + "top_layers": { "value": 5 }, + "top_thickness": { "value": 0.8 }, + "travel_avoid_other_parts": { "value": true }, + "travel_retract_before_outer_wall": { "value": false }, + "wall_0_inset": { "value": 0 }, + "wall_0_wipe_dist": { "value": 0.2 }, + "wall_line_width_0": { "value": 0.4 }, + "wall_thickness": { "value": 0.8 }, + "xy_offset": { "value": 0 }, + "zig_zaggify_infill": { "value": false }, + "zig_zaggify_support": { "value": false } + } +} \ No newline at end of file diff --git a/resources/definitions/maker_starter.def.json b/resources/definitions/maker_starter.def.json index ea849b7039..e654ee0915 100644 --- a/resources/definitions/maker_starter.def.json +++ b/resources/definitions/maker_starter.def.json @@ -2,98 +2,44 @@ "version": 2, "name": "3DMaker Starter", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "tvlgiao", "manufacturer": "3DMaker", "file_formats": "text/x-gcode;model/stl;application/x-wavefront-obj", "platform": "makerstarter_platform.3mf", - "preferred_quality_type": "draft", - "machine_extruder_trains": - { - "0": "maker_starter_extruder_0" - } + "machine_extruder_trains": { "0": "maker_starter_extruder_0" }, + "preferred_quality_type": "draft" }, - - "overrides": { + "overrides": + { + "adhesion_type": { "default_value": "raft" }, + "cool_min_layer_time": { "default_value": 5 }, + "cool_min_layer_time_fan_speed_max": { "default_value": 10 }, + "gantry_height": { "value": "55" }, + "infill_sparse_density": { "default_value": 20 }, + "layer_height_0": { "default_value": 0.2 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 185 }, + "machine_disallowed_areas": { "default_value": [] }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 200 }, "machine_name": { "default_value": "3DMaker Starter" }, - "machine_width": { - "default_value": 210 - }, - "machine_depth": { - "default_value": 185 - }, - "machine_height": { - "default_value": 200 - }, - "machine_heated_bed": { - "default_value": false - }, - "machine_center_is_zero": { - "default_value": false - }, - "gantry_height": { - "value": "55" - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_disallowed_areas": { - "default_value": [] - }, - "machine_nozzle_tip_outer_diameter": { - "default_value": 1 - }, - "machine_nozzle_head_distance": { - "default_value": 3 - }, - "layer_height_0": { - "default_value": 0.2 - }, - "speed_print": { - "default_value": 50 - }, - "speed_slowdown_layers": { - "default_value": 4 - }, - "infill_sparse_density": { - "default_value": 20 - }, - "cool_min_layer_time": { - "default_value": 5 - }, - "cool_min_layer_time_fan_speed_max": { - "default_value": 10 - }, - "support_type": { - "default_value": "Everywhere" - }, - "support_angle": { - "default_value": 45 - }, - "support_xy_distance": { - "default_value": 1 - }, - "support_z_distance": { - "default_value": 0.2 - }, - "support_pattern": { - "default_value": "zigzag" - }, - "support_infill_rate": { - "value": "15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15" - }, - "adhesion_type": { - "default_value": "raft" - }, - "skirt_brim_minimal_length": { - "default_value": 100 - }, - "raft_airgap": { - "default_value": 0.2 - }, - "raft_surface_layers": { - "default_value": 2 - } + "machine_nozzle_head_distance": { "default_value": 3 }, + "machine_nozzle_tip_outer_diameter": { "default_value": 1 }, + "machine_width": { "default_value": 210 }, + "raft_airgap": { "default_value": 0.2 }, + "raft_surface_layers": { "default_value": 2 }, + "skirt_brim_minimal_length": { "default_value": 100 }, + "speed_print": { "default_value": 50 }, + "speed_slowdown_layers": { "default_value": 4 }, + "support_angle": { "default_value": 45 }, + "support_infill_rate": { "value": "15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15" }, + "support_pattern": { "default_value": "zigzag" }, + "support_type": { "default_value": "Everywhere" }, + "support_xy_distance": { "default_value": 1 }, + "support_z_distance": { "default_value": 0.2 } } -} +} \ No newline at end of file diff --git a/resources/definitions/makerbotreplicator.def.json b/resources/definitions/makerbotreplicator.def.json index 6977ee8f5c..1839f2ac0a 100644 --- a/resources/definitions/makerbotreplicator.def.json +++ b/resources/definitions/makerbotreplicator.def.json @@ -1,30 +1,32 @@ { - "name": "MakerBotReplicator", "version": 2, + "name": "MakerBotReplicator", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "manufacturer": "MakerBot", - "machine_x3g_variant": "r1", "file_formats": "application/x3g", - "platform_offset": [ 0, 0, 0], - "machine_extruder_trains": - { - "0": "makerbotreplicator_extruder_0" - } + "machine_extruder_trains": { "0": "makerbotreplicator_extruder_0" }, + "machine_x3g_variant": "r1", + "platform_offset": [ + 0, + 0, + 0 + ] }, - - "overrides": { - "prime_tower_size": { "default_value": 10.0 }, + "overrides": + { "infill_sparse_density": { "default_value": 10 }, "layer_height": { "default_value": 0.15 }, - "machine_extruder_count": { "default_value": 1 }, - "machine_heated_bed": { "default_value": true }, "machine_center_is_zero": { "default_value": false }, - "machine_height": { "default_value": 150 }, - "machine_gcode_flavor": { "default_value": "MakerBot" }, "machine_depth": { "default_value": 145 }, + "machine_extruder_count": { "default_value": 1 }, + "machine_gcode_flavor": { "default_value": "MakerBot" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 150 }, + "machine_name": { "default_value": "MakerBot Replicator" }, "machine_width": { "default_value": 225 }, - "machine_name": { "default_value": "MakerBot Replicator" } + "prime_tower_size": { "default_value": 10.0 } } -} +} \ No newline at end of file diff --git a/resources/definitions/makergear_m2.def.json b/resources/definitions/makergear_m2.def.json index 50115a6787..81f02072e8 100644 --- a/resources/definitions/makergear_m2.def.json +++ b/resources/definitions/makergear_m2.def.json @@ -1,49 +1,51 @@ { - "name": "MakerGear M2", "version": 2, + "name": "MakerGear M2", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "William Anderson", "manufacturer": "MakerGear", + "file_formats": "text/x-gcode", "platform": "makergear_m2_platform.3mf", - "file_formats": "text/x-gcode", "has_materials": true, - "machine_extruder_trains": - { - "0": "makergear_m2_v3b" - } + "machine_extruder_trains": { "0": "makergear_m2_v3b" } }, - - "overrides": { - "machine_name": { "default_value": "MakerGear M2" }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 200 }, - "machine_height": { "default_value": 190 }, - "machine_depth": { "default_value": 250 }, - "machine_center_is_zero": { "default_value": false }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_size": { "default_value": 0.4 }, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "gantry_height": { "value": 24 }, "layer_height": { "default_value": 0.15 }, "layer_height_0": { "default_value": 0.2 }, - "retraction_amount": { "default_value": 0.2 }, - "retraction_speed": { "default_value": 50 }, - "adhesion_type": { "default_value": "skirt" }, - "machine_head_with_fans_polygon": { "default_value": [[-16,10],[11,10],[11,-41],[-16,-41]] }, - "gantry_height": { "value": 24 }, - "machine_max_feedrate_z": { "default_value": 200 }, - "machine_max_feedrate_e": { "default_value": 100 }, - "machine_max_acceleration_z": { "default_value": 500 }, "machine_acceleration": { "default_value": 1000 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 250 }, + "machine_end_gcode": { "default_value": "G92 E0 ; zero extruder\nG1 E-2.0000 F2000 ; retract filament\nM104 S0 ; extruder off\nM140 S0 ; bed off\nM107 ; fan off\nG90 ; absolute coords\nG28 X0 ; home X\nM18 S0 ; disable steppers" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-16, 10], + [11, 10], + [11, -41], + [-16, -41] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 190 }, + "machine_max_acceleration_z": { "default_value": 500 }, + "machine_max_feedrate_e": { "default_value": 100 }, + "machine_max_feedrate_z": { "default_value": 200 }, + "machine_max_jerk_e": { "default_value": 2.5 }, "machine_max_jerk_xy": { "default_value": 10 }, "machine_max_jerk_z": { "default_value": 0.2 }, - "machine_max_jerk_e": { "default_value": 2.5 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "G21 ; use mms\nM140 S{material_bed_temperature_layer_0} ; heat bed\nM104 S{material_print_temperature_layer_0} ; heat extruder\nG90 ; abs coords\nM82 ; abs extruder\nM107 ; fan off\nG28 Z ; home Z\nG1 Z10 F1200 ; lift nozzle\nG28 X Y ; home XY\nG92 E0 ; zero extruder\nG1 X230 Y50 F9600 ; move nozzle to priming location\nM190 S{material_bed_temperature_layer_0} ; wait for bed\nM109 S{material_print_temperature_layer_0} ; wait for nozzle\nG1 E10 Z0.3 F225 ; prime and lower nozzle\nG1 X190 Z0.1 F1200 ; wipe nozzle\nG92 E0 ; zero extruder" - }, - "machine_end_gcode": { - "default_value": "G92 E0 ; zero extruder\nG1 E-2.0000 F2000 ; retract filament\nM104 S0 ; extruder off\nM140 S0 ; bed off\nM107 ; fan off\nG90 ; absolute coords\nG28 X0 ; home X\nM18 S0 ; disable steppers" - } + "machine_name": { "default_value": "MakerGear M2" }, + "machine_nozzle_size": { "default_value": 0.4 }, + "machine_start_gcode": { "default_value": "G21 ; use mms\nM140 S{material_bed_temperature_layer_0} ; heat bed\nM104 S{material_print_temperature_layer_0} ; heat extruder\nG90 ; abs coords\nM82 ; abs extruder\nM107 ; fan off\nG28 Z ; home Z\nG1 Z10 F1200 ; lift nozzle\nG28 X Y ; home XY\nG92 E0 ; zero extruder\nG1 X230 Y50 F9600 ; move nozzle to priming location\nM190 S{material_bed_temperature_layer_0} ; wait for bed\nM109 S{material_print_temperature_layer_0} ; wait for nozzle\nG1 E10 Z0.3 F225 ; prime and lower nozzle\nG1 X190 Z0.1 F1200 ; wipe nozzle\nG92 E0 ; zero extruder" }, + "machine_width": { "default_value": 200 }, + "material_diameter": { "default_value": 1.75 }, + "retraction_amount": { "default_value": 0.2 }, + "retraction_speed": { "default_value": 50 } } -} +} \ No newline at end of file diff --git a/resources/definitions/malyan_m180.def.json b/resources/definitions/malyan_m180.def.json index 7c32ebfba0..6ae55beffd 100644 --- a/resources/definitions/malyan_m180.def.json +++ b/resources/definitions/malyan_m180.def.json @@ -2,66 +2,39 @@ "version": 2, "name": "Malyan M180", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Ghostkeeper", "manufacturer": "Malyan", - "machine_x3g_variant": "r1d", "file_formats": "application/x3g", - "machine_extruder_trains": - { - "0": "malyan_m180_extruder_0" - } + "machine_extruder_trains": { "0": "malyan_m180_extruder_0" }, + "machine_x3g_variant": "r1d" }, - - "overrides": { - "machine_name": { "default_value": "Malyan M180" }, - "machine_width": { - "default_value": 230 - }, - "machine_height": { - "default_value": 165 - }, - "machine_depth": { - "default_value": 145 - }, - "machine_center_is_zero": { - "default_value": true - }, - "machine_head_with_fans_polygon": { + "overrides": + { + "gantry_height": { "value": "55" }, + "machine_center_is_zero": { "default_value": true }, + "machine_depth": { "default_value": 145 }, + "machine_end_gcode": { "default_value": "G92 Z0\nG1 Z10 F400\nM18\nM109 S0 T0\nM104 S0 T0\nM73 P100 (end build progress)\nG162 X Y F3000\nM18" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { "default_value": [ - [ -75, 35 ], - [ -75, -18 ], - [ 18, -18 ], - [ 18, 35 ] + [-75, 35], + [-75, -18], + [18, -18], + [18, 35] ] }, - "machine_max_feedrate_z": { - "default_value": 400 - }, - "machine_steps_per_mm_x": { - "default_value": 93 - }, - "machine_steps_per_mm_y": { - "default_value": 93 - }, - "machine_steps_per_mm_z": { - "default_value": 1600 - }, - "machine_steps_per_mm_e": { - "default_value": 92 - }, - "gantry_height": { - "value": "55" - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "M136\nM73 P0\nM103\nG21\nG90\nM320\n;(**** begin homing ****)\nG162 X Y F4000\nG161 Z F3500\nG92 Z-5\nG1 Z0.0\nG161 Z F100\nM132 X Y Z A B\n;(**** end homing ****)\nG92 X147 Y66 Z5\nG1 X105 Y-60 Z10 F4000.0\nG130 X127 Y127 A127 B127\nG0 X105 Y-60\nG1 Z0.3 F300\nG92 E0\nG1 X100 E10 F300\nG92 E0\nG1 Z0.0 F300\nM320" - }, - "machine_end_gcode": { - "default_value": "G92 Z0\nG1 Z10 F400\nM18\nM109 S0 T0\nM104 S0 T0\nM73 P100 (end build progress)\nG162 X Y F3000\nM18" - } + "machine_height": { "default_value": 165 }, + "machine_max_feedrate_z": { "default_value": 400 }, + "machine_name": { "default_value": "Malyan M180" }, + "machine_start_gcode": { "default_value": "M136\nM73 P0\nM103\nG21\nG90\nM320\n;(**** begin homing ****)\nG162 X Y F4000\nG161 Z F3500\nG92 Z-5\nG1 Z0.0\nG161 Z F100\nM132 X Y Z A B\n;(**** end homing ****)\nG92 X147 Y66 Z5\nG1 X105 Y-60 Z10 F4000.0\nG130 X127 Y127 A127 B127\nG0 X105 Y-60\nG1 Z0.3 F300\nG92 E0\nG1 X100 E10 F300\nG92 E0\nG1 Z0.0 F300\nM320" }, + "machine_steps_per_mm_e": { "default_value": 92 }, + "machine_steps_per_mm_x": { "default_value": 93 }, + "machine_steps_per_mm_y": { "default_value": 93 }, + "machine_steps_per_mm_z": { "default_value": 1600 }, + "machine_width": { "default_value": 230 } } -} +} \ No newline at end of file diff --git a/resources/definitions/malyan_m200.def.json b/resources/definitions/malyan_m200.def.json index 2eeef96cbd..6a78e773a3 100644 --- a/resources/definitions/malyan_m200.def.json +++ b/resources/definitions/malyan_m200.def.json @@ -2,83 +2,79 @@ "version": 2, "name": "Malyan M200", "inherits": "fdmprinter", - "metadata": { + "metadata": + { + "visible": true, "author": "Brian Corbino, Tyler Gibson", "manufacturer": "Malyan", "file_formats": "text/x-gcode", "platform": "malyan_m200_platform.3mf", - "platform_offset": [0, -0.25, 0], + "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, "has_materials": true, + "machine_extruder_trains": { "0": "malyan_m200_extruder_0" }, + "platform_offset": [ + 0, + -0.25, + 0 + ], "preferred_quality_type": "normal", - "supports_usb_connection": true, - "visible": true, - "first_start_actions": ["MachineSettingsAction"], - "supported_actions": ["MachineSettingsAction"], - "machine_extruder_trains": - { - "0": "malyan_m200_extruder_0" - } - }, - - "overrides": { - "machine_name": { "default_value": "Malyan M200" }, - "speed_print": { "default_value": 50 }, - "speed_wall_0": { "value": "round(speed_print * 0.75, 2)" }, - "speed_wall_x": { "value": "speed_print" }, - "speed_support": { "value": "speed_wall_0" }, - "speed_layer_0": { "value": "round(speed_print / 2.0, 2)" }, - "speed_topbottom": {"value": "speed_print / 2"}, - + "supported_actions": [ "MachineSettingsAction" ], + "supports_usb_connection": true + }, + "overrides": + { + "adhesion_type": { "default_value": "raft" }, + "brim_width": { "default_value": 5 }, + "coasting_enable": { "default_value": true }, "layer_height": { - "minimum_value_warning": "0.04375", + "default_value": 0.13125, "maximum_value_warning": "machine_nozzle_size * 0.48125 + 0.0875", - "default_value": 0.13125 + "minimum_value_warning": "0.04375" }, "line_width": { "value": "round(machine_nozzle_size * 0.875, 2)" }, - - "material_print_temperature": { "minimum_value": "0" }, - "material_print_temperature_layer_0": { "value": "min(material_print_temperature + 5, 245)" }, - "material_bed_temperature": { "minimum_value": "0" }, - "material_bed_temperature_layer_0": { "value": "min(material_bed_temperature + 5, 70)" }, - "material_standby_temperature": { "minimum_value": "0" }, - "machine_show_variants": { "default_value": true }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode" : { - "default_value": "G21;(metric values)\nG90;(absolute positioning)\nM82;(set extruder to absolute mode)\nM107;(start with the fan off)\nG28;(Home the printer)\nG92 E0;(Reset the extruder to 0)\nG0 Z5 E5 F500;(Move up and prime the nozzle)\nG0 X-1 Z0;(Move outside the printable area)\nG1 Y60 E8 F500;(Draw a priming/wiping line to the rear)\nG1 X-1;(Move a little closer to the print area)\nG1 Y10 E16 F500;(draw more priming/wiping)\nG1 E15 F250;(Small retract)\nG92 E0;(Zero the extruder)" - }, - "machine_end_gcode" : { - "default_value": "G0 X0 Y120;(Stick out the part)\nM190 S0;(Turn off heat bed, don't wait.)\nG92 E10;(Set extruder to 10)\nG1 E7 F200;(retract 3mm)\nM104 S0;(Turn off nozzle, don't wait)\nG4 S300;(Delay 5 minutes)\nM107;(Turn off part fan)\nM84;(Turn off stepper motors.)" - }, - "machine_width": { "default_value": 120 }, - "machine_depth": { "default_value": 120 }, - "machine_height": { "default_value": 120 }, - "machine_heated_bed": { "default_value": true }, "machine_center_is_zero": { "default_value": false }, - "machine_max_feedrate_x": { "default_value": 150 }, - "machine_max_feedrate_y": { "default_value": 150 }, - "machine_max_feedrate_z": { "default_value": 1.5 }, - "machine_max_feedrate_e": { "default_value": 100 }, + "machine_depth": { "default_value": 120 }, + "machine_end_gcode": { "default_value": "G0 X0 Y120;(Stick out the part)\nM190 S0;(Turn off heat bed, don't wait.)\nG92 E10;(Set extruder to 10)\nG1 E7 F200;(retract 3mm)\nM104 S0;(Turn off nozzle, don't wait)\nG4 S300;(Delay 5 minutes)\nM107;(Turn off part fan)\nM84;(Turn off stepper motors.)" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 120 }, + "machine_max_acceleration_e": { "default_value": 10000 }, "machine_max_acceleration_x": { "default_value": 800 }, "machine_max_acceleration_y": { "default_value": 800 }, "machine_max_acceleration_z": { "default_value": 20 }, - "machine_max_acceleration_e": { "default_value": 10000 }, + "machine_max_feedrate_e": { "default_value": 100 }, + "machine_max_feedrate_x": { "default_value": 150 }, + "machine_max_feedrate_y": { "default_value": 150 }, + "machine_max_feedrate_z": { "default_value": 1.5 }, + "machine_max_jerk_e": { "default_value": 5 }, "machine_max_jerk_xy": { "default_value": 20 }, "machine_max_jerk_z": { "default_value": 0.4 }, - "machine_max_jerk_e": { "default_value": 5}, - "adhesion_type": { "default_value": "raft" }, - "raft_margin": { "default_value": 5 }, + "machine_name": { "default_value": "Malyan M200" }, + "machine_show_variants": { "default_value": true }, + "machine_start_gcode": { "default_value": "G21;(metric values)\nG90;(absolute positioning)\nM82;(set extruder to absolute mode)\nM107;(start with the fan off)\nG28;(Home the printer)\nG92 E0;(Reset the extruder to 0)\nG0 Z5 E5 F500;(Move up and prime the nozzle)\nG0 X-1 Z0;(Move outside the printable area)\nG1 Y60 E8 F500;(Draw a priming/wiping line to the rear)\nG1 X-1;(Move a little closer to the print area)\nG1 Y10 E16 F500;(draw more priming/wiping)\nG1 E15 F250;(Small retract)\nG92 E0;(Zero the extruder)" }, + "machine_width": { "default_value": 120 }, + "material_bed_temperature": { "minimum_value": "0" }, + "material_bed_temperature_layer_0": { "value": "min(material_bed_temperature + 5, 70)" }, + "material_print_temperature": { "minimum_value": "0" }, + "material_print_temperature_layer_0": { "value": "min(material_print_temperature + 5, 245)" }, + "material_standby_temperature": { "minimum_value": "0" }, "raft_airgap": { "default_value": 0.2625 }, "raft_base_thickness": { "value": "0.30625" }, "raft_interface_thickness": { "value": "0.21875" }, + "raft_margin": { "default_value": 5 }, "raft_surface_layers": { "default_value": 1 }, - "skirt_line_count": { "default_value": 2}, - "brim_width" : { "default_value": 5}, + "retraction_amount": { "default_value": 4.5 }, "retraction_combing": { "value": "'noskin'" }, - "retraction_amount" : { "default_value": 4.5}, - "retraction_speed" : { "default_value": 40}, - "coasting_enable": { "default_value": true }, - "speed_z_hop": {"default_value": 1.5} + "retraction_speed": { "default_value": 40 }, + "skirt_line_count": { "default_value": 2 }, + "speed_layer_0": { "value": "round(speed_print / 2.0, 2)" }, + "speed_print": { "default_value": 50 }, + "speed_support": { "value": "speed_wall_0" }, + "speed_topbottom": { "value": "speed_print / 2" }, + "speed_wall_0": { "value": "round(speed_print * 0.75, 2)" }, + "speed_wall_x": { "value": "speed_print" }, + "speed_z_hop": { "default_value": 1.5 } } -} +} \ No newline at end of file diff --git a/resources/definitions/mankati_fullscale_xt_plus.def.json b/resources/definitions/mankati_fullscale_xt_plus.def.json index b477adc7af..40121f6892 100644 --- a/resources/definitions/mankati_fullscale_xt_plus.def.json +++ b/resources/definitions/mankati_fullscale_xt_plus.def.json @@ -2,56 +2,47 @@ "version": 2, "name": "Mankati Fullscale XT Plus", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "RBC", "manufacturer": "Mankati", "file_formats": "text/x-gcode", "platform": "mankati_fullscale_xt_plus_platform.3mf", - "machine_extruder_trains": - { - "0": "mankati_fullscale_xt_plus_extruder_0" - } + "machine_extruder_trains": { "0": "mankati_fullscale_xt_plus_extruder_0" } }, - "overrides": { - "machine_name": { "default_value": "Mankati Fullscale XT Plus" }, - "machine_width": { "default_value": 260 }, + "overrides": + { + "cool_fan_enabled": { "default_value": false }, + "gantry_height": { "value": "0" }, + "layer_height": { "default_value": 0.2 }, "machine_depth": { "default_value": 260 }, - "machine_height": { "default_value": 300 }, - "machine_heated_bed": { "default_value": true }, - - "machine_head_with_fans_polygon": { + "machine_end_gcode": { "default_value": "M104 T0 S0 ; turn off extruder 1 heating\nM140 S0 ; turn off bed heating\nG91 ; relative positioning\nG1 F12000 E-0.5 ; retract 0.5 mm\nG1 F12000 Z30 ; move Z-axes 30 mm down\nG28 X0 Y0 ; home X axis and Y axes\nM84 ; disable motors\nM117 Ready!\n" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { "default_value": [ - [ -3, 3 ], - [ -3, -3 ], - [ 3, -3 ], - [ 3, 3 ] + [-3, 3], + [-3, -3], + [3, -3], + [3, 3] ] }, - "gantry_height": { "value": "0" }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - - "machine_start_gcode": { - "default_value": "M117 Initializing...\nG28 ; home all axes\nG90 ; use absolute coordinates\nG1 F12000 X0 Y0 Z30 ; lift nozzle 30 mm\nT0 ; select extruder 1\nG92 E0 ; reset extruder length\nG1 F100 Z30 E7 ; extrude 7mm while going up\nG92 E0 ; zero the extruder length\nM117 Printing...\n" - }, - "machine_end_gcode": { - "default_value": "M104 T0 S0 ; turn off extruder 1 heating\nM140 S0 ; turn off bed heating\nG91 ; relative positioning\nG1 F12000 E-0.5 ; retract 0.5 mm\nG1 F12000 Z30 ; move Z-axes 30 mm down\nG28 X0 Y0 ; home X axis and Y axes\nM84 ; disable motors\nM117 Ready!\n" - }, - - "layer_height": { "default_value": 0.2 }, - "wall_thickness": { "value": "0.8" }, - "top_bottom_thickness": { "default_value": 0.3 }, - "retraction_enable": { "default_value": true }, - "retraction_speed": { "default_value": 50 }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 300 }, + "machine_name": { "default_value": "Mankati Fullscale XT Plus" }, + "machine_start_gcode": { "default_value": "M117 Initializing...\nG28 ; home all axes\nG90 ; use absolute coordinates\nG1 F12000 X0 Y0 Z30 ; lift nozzle 30 mm\nT0 ; select extruder 1\nG92 E0 ; reset extruder length\nG1 F100 Z30 E7 ; extrude 7mm while going up\nG92 E0 ; zero the extruder length\nM117 Printing...\n" }, + "machine_width": { "default_value": 260 }, "retraction_amount": { "default_value": 0.8 }, + "retraction_enable": { "default_value": true }, "retraction_hop": { "default_value": 0.075 }, - "speed_print": { "default_value": 60 }, - "speed_layer_0": { - "minimum_value": "0.1" - }, - "cool_fan_enabled": { "default_value": false }, - "skirt_line_count": { "default_value": 3 }, + "retraction_speed": { "default_value": 50 }, + "skirt_brim_minimal_length": { "default_value": 200 }, "skirt_gap": { "default_value": 4 }, - "skirt_brim_minimal_length": { "default_value": 200 } + "skirt_line_count": { "default_value": 3 }, + "speed_layer_0": { "minimum_value": "0.1" }, + "speed_print": { "default_value": 60 }, + "top_bottom_thickness": { "default_value": 0.3 }, + "wall_thickness": { "value": "0.8" } } -} +} \ No newline at end of file diff --git a/resources/definitions/mbot3d_grid2plus.def.json b/resources/definitions/mbot3d_grid2plus.def.json index 7a8677a0c2..7709ec6673 100644 --- a/resources/definitions/mbot3d_grid2plus.def.json +++ b/resources/definitions/mbot3d_grid2plus.def.json @@ -1,57 +1,59 @@ { - "name": "MBot3D Grid 2+", "version": 2, + "name": "MBot3D Grid 2+", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Magicfirm", "manufacturer": "Magicfirm", "file_formats": "application/x3g", - "machine_x3g_variant": "r1", - "machine_extruder_trains": - { - "0": "mbot3d_grid2_extruder_0" - } + "machine_extruder_trains": { "0": "mbot3d_grid2_extruder_0" }, + "machine_x3g_variant": "r1" }, - - "overrides": { - "machine_name": { "default_value": "MBot3D Grid 2+" }, - "machine_start_gcode": { - "default_value": "M136\nG162 X Y F2000\nG161 Z F900\nG92 X0 Y0 Z-5 A0 B0\nG1 Z0.0 F900\nG161 Z F100\nM132 X Y Z A B\nG1 X125 Y115 Z10 F450\nG1 X0 Y115 Z10 F2000.0\nM133 T0\nG1 X20 Y115 Z0.5 F800\nG1 X0 Y115 Z0.5 F600 A12\nG92 A0\n" - }, - "machine_end_gcode": { - "default_value": "M18 A B(Turn off A and B steppers)\nG1 Z190 F900\nG162 X Y F2000\nM18 X Y Z(Turn off steppers after a build)\nM104 S0 T0\nM72 P1 ( Play Ta-Da song )\nM73 P100 (end build progress )\nM137 (build end)\n" - }, - "machine_width": { "default_value": 235 }, - "machine_depth": { "default_value": 210 }, - "machine_height": { "default_value": 190 }, - "machine_heated_bed": { "default_value": true }, - "machine_center_is_zero": { "default_value": true }, - "machine_gcode_flavor": { "default_value": "Makerbot" }, - "machine_head_with_fans_polygon": { "default_value": [ [ -37, 50 ], [ 25, 50 ], [ 25, -40 ], [ -37, -40 ] ] }, + "overrides": + { "gantry_height": { "value": 10 }, + "infill_overlap": { "value": "12 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0" }, + "machine_center_is_zero": { "default_value": true }, + "machine_depth": { "default_value": 210 }, + "machine_end_gcode": { "default_value": "M18 A B(Turn off A and B steppers)\nG1 Z190 F900\nG162 X Y F2000\nM18 X Y Z(Turn off steppers after a build)\nM104 S0 T0\nM72 P1 ( Play Ta-Da song )\nM73 P100 (end build progress )\nM137 (build end)\n" }, + "machine_gcode_flavor": { "default_value": "Makerbot" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-37, 50], + [25, 50], + [25, -40], + [-37, -40] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 190 }, + "machine_name": { "default_value": "MBot3D Grid 2+" }, + "machine_start_gcode": { "default_value": "M136\nG162 X Y F2000\nG161 Z F900\nG92 X0 Y0 Z-5 A0 B0\nG1 Z0.0 F900\nG161 Z F100\nM132 X Y Z A B\nG1 X125 Y115 Z10 F450\nG1 X0 Y115 Z10 F2000.0\nM133 T0\nG1 X20 Y115 Z0.5 F800\nG1 X0 Y115 Z0.5 F600 A12\nG92 A0\n" }, + "machine_steps_per_mm_e": { "default_value": 96.27520187033366 }, "machine_steps_per_mm_x": { "default_value": 88.888889 }, "machine_steps_per_mm_y": { "default_value": 88.888889 }, "machine_steps_per_mm_z": { "default_value": 400 }, - "machine_steps_per_mm_e": { "default_value": 96.27520187033366 }, + "machine_width": { "default_value": 235 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "raft_airgap": { "default_value": 0.15 }, + "raft_margin": { "default_value": 6 }, + "retract_at_layer_change": { "default_value": true }, "retraction_amount": { "default_value": 0.7 }, "retraction_speed": { "default_value": 15 }, + "speed_layer_0": { "value": 15 }, "speed_print": { "default_value": 50 }, + "speed_travel": { "value": 80 }, "speed_wall": { "value": 25 }, "speed_wall_x": { "value": 35 }, - "speed_travel": { "value": 80 }, - "speed_layer_0": { "value": 15 }, + "support_interface_density": { "default_value": 80 }, "support_interface_enable": { "default_value": true }, "support_interface_height": { "default_value": 0.8 }, - "support_interface_density": { "default_value": 80 }, "support_interface_pattern": { "default_value": "grid" }, - "infill_overlap": { "value": "12 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0" }, - "retract_at_layer_change": { "default_value": true }, - "travel_retract_before_outer_wall": { "default_value": true }, - "material_initial_print_temperature": { "value": "material_print_temperature" }, - "material_final_print_temperature": { "value": "material_print_temperature" }, "travel_avoid_other_parts": { "default_value": false }, - "raft_airgap": { "default_value": 0.15 }, - "raft_margin": { "default_value": 6 } + "travel_retract_before_outer_wall": { "default_value": true } } -} +} \ No newline at end of file diff --git a/resources/definitions/mbot3d_grid2plus_dual.def.json b/resources/definitions/mbot3d_grid2plus_dual.def.json index 648699cf1b..7f02cdad49 100644 --- a/resources/definitions/mbot3d_grid2plus_dual.def.json +++ b/resources/definitions/mbot3d_grid2plus_dual.def.json @@ -1,58 +1,63 @@ { - "name": "MBot3D Grid 2+ Dual", "version": 2, + "name": "MBot3D Grid 2+ Dual", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Magicfirm", "manufacturer": "Magicfirm", "file_formats": "application/x3g", - "machine_x3g_variant": "z", "machine_extruder_trains": { "0": "mbot3d_grid2_extruder_left", "1": "mbot3d_grid2_extruder_right" - } + }, + "machine_x3g_variant": "z" }, - - "overrides": { - "machine_name": { "default_value": "MBot3D Grid 2+ Dual" }, - "machine_start_gcode": { - "default_value": "M136\nG162 X Y F2000\nG161 Z F900\nG92 X0 Y0 Z-5 A0 B0\nG1 Z0.0 F900\nG161 Z F100\nM132 X Y Z A B\nG1 X125 Y115 Z10 F450\nG1 X0 Y115 Z10 F2000.0\nM133 T0\nG1 X20 Y115 Z0.5 F800\nG1 X0 Y115 Z0.5 F600 A12\nG92 A0\n" - }, - "machine_end_gcode": { - "default_value": "M18 A B(Turn off A and B steppers)\nG1 Z190 F900\nG162 X Y F2000\nM18 X Y Z(Turn off steppers after a build)\nM104 S0 T0\nM72 P1 ( Play Ta-Da song )\nM73 P100 (end build progress )\nM137 (build end)\n" - }, - "machine_width": { "default_value": 235 }, - "machine_depth": { "default_value": 210 }, - "machine_height": { "default_value": 190 }, - "machine_extruder_count": { "default_value": 2 }, - "machine_center_is_zero": { "default_value": true }, - "machine_gcode_flavor": { "default_value": "Makerbot" }, - "machine_head_with_fans_polygon": { "default_value": [ [ -37, 50 ], [ 25, 50 ], [ 25, -40 ], [ -37, -40 ] ] }, + "overrides": + { "gantry_height": { "value": 10 }, + "infill_overlap": { "value": "12 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0" }, + "machine_center_is_zero": { "default_value": true }, + "machine_depth": { "default_value": 210 }, + "machine_end_gcode": { "default_value": "M18 A B(Turn off A and B steppers)\nG1 Z190 F900\nG162 X Y F2000\nM18 X Y Z(Turn off steppers after a build)\nM104 S0 T0\nM72 P1 ( Play Ta-Da song )\nM73 P100 (end build progress )\nM137 (build end)\n" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "Makerbot" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-37, 50], + [25, 50], + [25, -40], + [-37, -40] + ] + }, + "machine_height": { "default_value": 190 }, + "machine_name": { "default_value": "MBot3D Grid 2+ Dual" }, + "machine_start_gcode": { "default_value": "M136\nG162 X Y F2000\nG161 Z F900\nG92 X0 Y0 Z-5 A0 B0\nG1 Z0.0 F900\nG161 Z F100\nM132 X Y Z A B\nG1 X125 Y115 Z10 F450\nG1 X0 Y115 Z10 F2000.0\nM133 T0\nG1 X20 Y115 Z0.5 F800\nG1 X0 Y115 Z0.5 F600 A12\nG92 A0\n" }, + "machine_steps_per_mm_e": { "default_value": 96.27520187033366 }, "machine_steps_per_mm_x": { "default_value": 88.888889 }, "machine_steps_per_mm_y": { "default_value": 88.888889 }, "machine_steps_per_mm_z": { "default_value": 400 }, - "machine_steps_per_mm_e": { "default_value": 96.27520187033366 }, + "machine_width": { "default_value": 235 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "raft_airgap": { "default_value": 0.15 }, + "raft_margin": { "default_value": 6 }, + "retract_at_layer_change": { "default_value": true }, "retraction_amount": { "default_value": 0.7 }, "retraction_speed": { "default_value": 15 }, + "speed_layer_0": { "value": 15 }, "speed_print": { "default_value": 50 }, + "speed_travel": { "value": 80 }, "speed_wall": { "value": 25 }, "speed_wall_x": { "value": 35 }, - "speed_travel": { "value": 80 }, - "speed_layer_0": { "value": 15 }, + "support_interface_density": { "default_value": 80 }, "support_interface_enable": { "default_value": true }, "support_interface_height": { "default_value": 0.8 }, - "support_interface_density": { "default_value": 80 }, "support_interface_pattern": { "default_value": "grid" }, - "infill_overlap": { "value": "12 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0" }, - "retract_at_layer_change": { "default_value": true }, - "travel_retract_before_outer_wall": { "default_value": true }, - "material_initial_print_temperature": { "value": "material_print_temperature" }, - "material_final_print_temperature": { "value": "material_print_temperature" }, "travel_avoid_other_parts": { "default_value": false }, - "raft_airgap": { "default_value": 0.15 }, - "raft_margin": { "default_value": 6 } + "travel_retract_before_outer_wall": { "default_value": true } } -} +} \ No newline at end of file diff --git a/resources/definitions/mbot3d_grid4.def.json b/resources/definitions/mbot3d_grid4.def.json index fa2deda027..841600e1f1 100644 --- a/resources/definitions/mbot3d_grid4.def.json +++ b/resources/definitions/mbot3d_grid4.def.json @@ -1,56 +1,33 @@ -{ - "version": 2, - "name": "MBot3D Grid 4", - "inherits": "fdmprinter", - "metadata": { - "author": "Magicfirm", - "manufacturer": "Magicfirm", - "visible": true, - "file_formats": "text/x-gcode", - "platform_offset": [ - 0, - 0, - 0 - ], - "has_materials": true, - "machine_extruder_trains": - { - "0": "mbot3d_grid4_extruder_0" - } - }, - "overrides": { - "machine_name": { - "default_value": "MBot3D Grid 4" - }, - "machine_width": { - "default_value": 235 - }, - "machine_depth": { - "default_value": 210 - }, - "machine_height": { - "default_value": 190 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "material_flow": { - "default_value": 100 - }, - "adhesion_type": { - "default_value": "skirt" - }, - "machine_start_gcode": { - "default_value": ";---------- START GCODE ----------\nG21 ; set units to millimeters\nG28 ; home all axes\nG29 ;Autolevel bed\nG1 Z10 F400\nG1 X145 Z10 F2400\nG92 E0\nG1 X145 Z0.5 F400\nG1 X120 Z0.5 E20 F360\nG92 E0.0\n;----------END START GCODE ----------\n" - }, - "machine_end_gcode": { - "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 Z190 F900\nG28 X Y ;home X Y axes\nM84 ; disable motors" - } - } +{ + "version": 2, + "name": "MBot3D Grid 4", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Magicfirm", + "manufacturer": "Magicfirm", + "file_formats": "text/x-gcode", + "has_materials": true, + "machine_extruder_trains": { "0": "mbot3d_grid4_extruder_0" }, + "platform_offset": [ + 0, + 0, + 0 + ] + }, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 210 }, + "machine_end_gcode": { "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 Z190 F900\nG28 X Y ;home X Y axes\nM84 ; disable motors" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 190 }, + "machine_name": { "default_value": "MBot3D Grid 4" }, + "machine_start_gcode": { "default_value": ";---------- START GCODE ----------\nG21 ; set units to millimeters\nG28 ; home all axes\nG29 ;Autolevel bed\nG1 Z10 F400\nG1 X145 Z10 F2400\nG92 E0\nG1 X145 Z0.5 F400\nG1 X120 Z0.5 E20 F360\nG92 E0.0\n;----------END START GCODE ----------\n" }, + "machine_width": { "default_value": 235 }, + "material_flow": { "default_value": 100 } + } } \ No newline at end of file diff --git a/resources/definitions/mbot3d_grid4_dual.def.json b/resources/definitions/mbot3d_grid4_dual.def.json index 891f5dc51f..c10a8d0945 100644 --- a/resources/definitions/mbot3d_grid4_dual.def.json +++ b/resources/definitions/mbot3d_grid4_dual.def.json @@ -2,58 +2,37 @@ "version": 2, "name": "MBot3D Grid 4 Dual", "inherits": "fdmprinter", - "metadata": { + "metadata": + { + "visible": true, "author": "Magicfirm", "manufacturer": "Magicfirm", - "visible": true, "file_formats": "text/x-gcode", + "has_materials": true, + "machine_extruder_trains": + { + "0": "mbot3d_grid4_extruder_left", + "1": "mbot3d_grid4_extruder_right" + }, "platform_offset": [ 0, 0, 0 - ], - "has_materials": true, - "machine_extruder_trains": { - "0": "mbot3d_grid4_extruder_left", - "1": "mbot3d_grid4_extruder_right" - } + ] }, - "overrides": { - "machine_name": { - "default_value": "MBot3D Grid 4 Dual" - }, - "machine_width": { - "default_value": 210 - }, - "machine_depth": { - "default_value": 210 - }, - "machine_height": { - "default_value": 190 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_extruder_count": { - "default_value": 2 - }, - "material_flow": { - "default_value": 100 - }, - "adhesion_type": { - "default_value": "skirt" - }, - "machine_start_gcode": { - "default_value": ";---------- START GCODE ----------\nG21 ; set units to millimeters\nG28 ; home all axes\nG29 ;Autolevel bed\nG1 Z10 F400\nG1 X145 Z10 F2400\nG92 E0\nG1 X145 Z0.5 F400\nG1 X120 Z0.5 E20 F360\nG92 E0.0\n;----------END START GCODE ----------\n" - }, - "machine_end_gcode": { - "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 Z190 F900\nG28 X Y ;home X Y axes\nM84 ; disable motors" - } + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 210 }, + "machine_end_gcode": { "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 Z190 F900\nG28 X Y ;home X Y axes\nM84 ; disable motors" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 190 }, + "machine_name": { "default_value": "MBot3D Grid 4 Dual" }, + "machine_start_gcode": { "default_value": ";---------- START GCODE ----------\nG21 ; set units to millimeters\nG28 ; home all axes\nG29 ;Autolevel bed\nG1 Z10 F400\nG1 X145 Z10 F2400\nG92 E0\nG1 X145 Z0.5 F400\nG1 X120 Z0.5 E20 F360\nG92 E0.0\n;----------END START GCODE ----------\n" }, + "machine_width": { "default_value": 210 }, + "material_flow": { "default_value": 100 } } } \ No newline at end of file diff --git a/resources/definitions/mendel90.def.json b/resources/definitions/mendel90.def.json index 55c1251f98..57e1276e6a 100644 --- a/resources/definitions/mendel90.def.json +++ b/resources/definitions/mendel90.def.json @@ -1,6 +1,6 @@ { - "name": "Mendel90", "version": 2, + "name": "Mendel90", "inherits": "fdmprinter", "metadata": { @@ -9,74 +9,40 @@ "manufacturer": "Nophead", "file_formats": "text/x-gcode", "platform": "mendel90_platform.3mf", - "platform_offset": [0, -23.6, 0], - "machine_extruder_trains": - { - "0": "mendel90_extruder_0" - } + "machine_extruder_trains": { "0": "mendel90_extruder_0" }, + "platform_offset": [ + 0, + -23.6, + 0 + ] }, - - "pages": [ - "BedLeveling" - ], - - "overrides": { - "machine_name": { "default_value": "Mendel90" }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;absolute extrusion\nM107 ;start with the fan off\nG28 ;home\nG92 E0 ;zero the extruded length\nM140 S{material_bed_temperature_layer_0} ; set the bed temperature and continue on\nG1 X-50 Y98 F9000 ;go to the left of the top\nG1 Z0.05 ; close to the bed\nM104 S{material_print_temperature_layer_0}; pre-heat the extruder continue on\nM190 S{material_bed_temperature_layer_0} ;set the bed temp & wait\nM109 S{material_print_temperature_layer_0};set the extruder temp for layer 0 & wait\nG92 E0 ;zero the extruded length\nG1 X50 E10 F300 ; make a thick line to prime extruder\nG92 E0 ; reset extruder\nG1 E-4 F1800\nG1 Z0.3 ;lift Z\n" - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nM107 ;carriage fan off\nG91 ;relative positioning\nG1 Z10 ;Move up Z 10mm\nG90 ;back to absolute mode\nG1 E-1 F1200 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG92 E0 ;zero the extruded length\nG1 Z200 X-100 F9000 ; go to top\nG1 Y100 F5000 ;Move Y to back\nM42 P42 S255 ;Turn on Bed cooling fan on\nG4 S10 ;Wait 10 seconds\nM42 P42 S0 ;Turn off bed cooling fan\nM84 ;steppers off\n" - }, - "material_bed_temp_wait": { - "default_value": true - }, - "material_print_temp_prepend": { - "default_value": true - }, - "machine_width": { - "default_value": 200 - }, - "machine_height": { - "default_value": 200 - }, - "machine_depth": { - "default_value": 200 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_center_is_zero": { - "default_value": true - }, - "machine_extruder_count": { - "default_value": 1 - }, - "machine_nozzle_tip_outer_diameter": { - "default_value": 1 - }, - "machine_nozzle_head_distance": { - "default_value": 5 - }, - "machine_heat_zone_length": { - "default_value": 16 - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "gantry_height": { - "value": "55" - }, + "overrides": + { + "gantry_height": { "value": "55" }, + "machine_center_is_zero": { "default_value": true }, + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nM107 ;carriage fan off\nG91 ;relative positioning\nG1 Z10 ;Move up Z 10mm\nG90 ;back to absolute mode\nG1 E-1 F1200 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG92 E0 ;zero the extruded length\nG1 Z200 X-100 F9000 ; go to top\nG1 Y100 F5000 ;Move Y to back\nM42 P42 S255 ;Turn on Bed cooling fan on\nG4 S10 ;Wait 10 seconds\nM42 P42 S0 ;Turn off bed cooling fan\nM84 ;steppers off\n" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_head_with_fans_polygon": { "default_value": [ - [ -12, 9 ], - [ -12, -9 ], - [ 14, 9 ], - [ 14, -9 ] + [-12, 9], + [-12, -9], + [14, 9], + [14, -9] ] - } - } -} - - + }, + "machine_heat_zone_length": { "default_value": 16 }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 200 }, + "machine_name": { "default_value": "Mendel90" }, + "machine_nozzle_head_distance": { "default_value": 5 }, + "machine_nozzle_tip_outer_diameter": { "default_value": 1 }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;absolute extrusion\nM107 ;start with the fan off\nG28 ;home\nG92 E0 ;zero the extruded length\nM140 S{material_bed_temperature_layer_0} ; set the bed temperature and continue on\nG1 X-50 Y98 F9000 ;go to the left of the top\nG1 Z0.05 ; close to the bed\nM104 S{material_print_temperature_layer_0}; pre-heat the extruder continue on\nM190 S{material_bed_temperature_layer_0} ;set the bed temp & wait\nM109 S{material_print_temperature_layer_0};set the extruder temp for layer 0 & wait\nG92 E0 ;zero the extruded length\nG1 X50 E10 F300 ; make a thick line to prime extruder\nG92 E0 ; reset extruder\nG1 E-4 F1800\nG1 Z0.3 ;lift Z\n" }, + "machine_width": { "default_value": 200 }, + "material_bed_temp_wait": { "default_value": true }, + "material_print_temp_prepend": { "default_value": true } + }, + "pages": [ "BedLeveling" ] +} \ No newline at end of file diff --git a/resources/definitions/mingda_1000pro.def.json b/resources/definitions/mingda_1000pro.def.json index 57c125a9b1..bfcab9c9ca 100644 --- a/resources/definitions/mingda_1000pro.def.json +++ b/resources/definitions/mingda_1000pro.def.json @@ -1,24 +1,20 @@ { - "name": "Mingda 1000Pro", "version": 2, + "name": "Mingda 1000Pro", "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 + "visible": true, + "quality_definition": "mingda_base" + }, + "overrides": + { + "gantry_height": { "value": 25 }, + "machine_depth": { "default_value": 1000 }, + "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_height": { "default_value": 1000 }, + "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_width": { "default_value": 1000 } } -} +} \ No newline at end of file diff --git a/resources/definitions/mingda_4h.def.json b/resources/definitions/mingda_4h.def.json index 8a977aedda..a9977fdf67 100644 --- a/resources/definitions/mingda_4h.def.json +++ b/resources/definitions/mingda_4h.def.json @@ -1,19 +1,18 @@ { - "name": "Mingda 4H", "version": 2, + "name": "Mingda 4H", "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 + "visible": true, + "quality_definition": "mingda_base" + }, + "overrides": + { + "gantry_height": { "value": 25 }, + "machine_depth": { "default_value": 200 }, + "machine_height": { "default_value": 200 }, + "machine_name": { "default_value": "Mingda 4H" }, + "machine_width": { "default_value": 300 } } -} +} \ No newline at end of file diff --git a/resources/definitions/mingda_600pro.def.json b/resources/definitions/mingda_600pro.def.json index c1cd812ab4..7909bcc872 100644 --- a/resources/definitions/mingda_600pro.def.json +++ b/resources/definitions/mingda_600pro.def.json @@ -1,24 +1,20 @@ { - "name": "Mingda 600Pro", "version": 2, + "name": "Mingda 600Pro", "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 + "visible": true, + "quality_definition": "mingda_base" + }, + "overrides": + { + "gantry_height": { "value": 25 }, + "machine_depth": { "default_value": 600 }, + "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_height": { "default_value": 600 }, + "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_width": { "default_value": 600 } } -} +} \ No newline at end of file diff --git a/resources/definitions/mingda_6h.def.json b/resources/definitions/mingda_6h.def.json index f306a8f2c4..63e39b7a5d 100644 --- a/resources/definitions/mingda_6h.def.json +++ b/resources/definitions/mingda_6h.def.json @@ -1,19 +1,18 @@ { - "name": "Mingda 6H", "version": 2, + "name": "Mingda 6H", "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 + "visible": true, + "quality_definition": "mingda_base" + }, + "overrides": + { + "gantry_height": { "value": 25 }, + "machine_depth": { "default_value": 300 }, + "machine_height": { "default_value": 500 }, + "machine_name": { "default_value": "Mingda 6H" }, + "machine_width": { "default_value": 400 } } -} +} \ No newline at end of file diff --git a/resources/definitions/mingda_base.def.json b/resources/definitions/mingda_base.def.json index 9205be8e4e..d0aa03d48b 100644 --- a/resources/definitions/mingda_base.def.json +++ b/resources/definitions/mingda_base.def.json @@ -1,26 +1,13 @@ { - "name": "Mingda Base Printer", "version": 2, + "name": "Mingda Base Printer", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": false, "author": "Mingda", "manufacturer": "Mingda", "file_formats": "text/x-gcode", - "first_start_actions": ["MachineSettingsAction"], - - "machine_extruder_trains": { - "0": "mingda_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", "exclude_materials": [ "Vertex_Delta_ABS", "Vertex_Delta_PET", @@ -67,142 +54,128 @@ "verbatim_bvoh_175", "zyyx_pro_flex", "zyyx_pro_pla" - ] + ], + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { "0": "mingda_base_extruder_0" }, + "preferred_material": "generic_pla", + "preferred_quality_type": "standard", + "preferred_variant_name": "0.4mm Nozzle", + "variants_name": "Nozzle Size" }, - "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_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 }, - "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 }, - + "overrides": + { + "acceleration_enabled": { "value": false }, "acceleration_print": { "value": 500 }, + "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, "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" }, - + "adaptive_layer_height_variation": { "value": 0.04 }, + "adaptive_layer_height_variation_step": { "value": 0.04 }, + "adhesion_type": { "value": "'none' if support_enable else 'raft'" }, + "brim_replaces_support": { "value": false }, + "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, + "cool_min_layer_time": { "value": 10 }, + "fill_outline_gaps": { "value": false }, + "infill_before_walls": { "value": false }, + "infill_overlap": { "value": 30.0 }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'grid'" }, + "infill_sparse_density": { "value": "15" }, + "infill_wipe_dist": { "value": 0.0 }, + "jerk_enabled": { "value": false }, "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_wall_x": { "value": "speed_wall" }, - "speed_roofing": { "value": "speed_topbottom" }, - "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": "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" }, - "speed_z_hop": { "value": 5 }, - - "skirt_brim_speed": { "value": "speed_layer_0" }, - "line_width": { "value": "machine_nozzle_size * 1" }, - - "optimize_wall_printing_order": { "value": true }, - - "material_initial_print_temperature": { "value": "material_print_temperature" }, + "machine_acceleration": { "value": 500 }, + "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_heated_bed": { "default_value": true }, + "machine_max_acceleration_e": { "value": 5000 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 100 }, + "machine_max_feedrate_e": { "value": 50 }, + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_jerk_e": { "value": 5 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.4 }, + "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" }, + "material_diameter": { "default_value": 1.75 }, "material_final_print_temperature": { "value": "material_print_temperature" }, - - "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 '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 }, - - "retraction_speed": { - "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", - "maximum_value": 200 - }, - "retraction_retract_speed": { - "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", - "maximum_value": 200 - }, - "retraction_prime_speed": { - "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", - "maximum_value": 200 - }, - - "retraction_hop_enabled": { "value": true }, - "retraction_hop": { "value": "layer_height*2" }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "meshfix_maximum_resolution": { "value": "0.05" }, + "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" }, + "minimum_interface_area": { "value": 10 }, + "minimum_support_area": { "value": 2 }, + "optimize_wall_printing_order": { "value": true }, + "retraction_amount": { "value": 2 }, "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'infill'" }, "retraction_combing_max_distance": { "value": 30 }, + "retraction_count_max": { "value": 100 }, + "retraction_enable": { "value": true }, + "retraction_extrusion_window": { "value": 3 }, + "retraction_hop": { "value": "layer_height*2" }, + "retraction_hop_enabled": { "value": true }, + "retraction_min_travel": { "value": 1.5 }, + "retraction_prime_speed": + { + "maximum_value": 200, + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')" + }, + "retraction_retract_speed": + { + "maximum_value": 200, + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')" + }, + "retraction_speed": + { + "maximum_value": 200, + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')" + }, + "skin_overlap": { "value": 10.0 }, + "skirt_brim_speed": { "value": "speed_layer_0" }, + "skirt_gap": { "value": 10.0 }, + "skirt_line_count": { "value": 4 }, + "speed_layer_0": { "value": 20.0 }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_print": { "value": 60.0 }, + "speed_print_layer_0": { "value": "speed_layer_0" }, + "speed_roofing": { "value": "speed_topbottom" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_support_interface": { "value": "speed_topbottom" }, + "speed_travel": { "value": "80.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 1.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_wall_x": { "value": "speed_wall" }, + "speed_z_hop": { "value": 5 }, + "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width / 2.0 / layer_height)))" }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 4 }, + "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_enable": { "value": true }, + "support_interface_height": { "value": "layer_height * 4" }, + "support_interface_pattern": { "value": "'grid'" }, + "support_interface_skip_height": { "value": 0.2 }, + "support_pattern": { "value": "'zigzag'" }, + "support_use_towers": { "value": false }, + "support_wall_count": { "value": 1 }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height * 2" }, + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, "travel_avoid_other_parts": { "value": true }, "travel_avoid_supports": { "value": true }, "travel_retract_before_outer_wall": { "value": true }, - - "retraction_amount": { "value": 2 }, - "retraction_enable": { "value": true }, - "retraction_count_max": { "value": 100 }, - "retraction_extrusion_window": { "value": 3 }, - "retraction_min_travel": { "value": 1.5 }, - - "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, - "cool_min_layer_time": { "value": 10 }, - - "adhesion_type": { "value": "'none' if support_enable else 'raft'" }, - "brim_replaces_support": { "value": false }, - "skirt_gap": { "value": 10.0 }, - "skirt_line_count": { "value": 4 }, - - "adaptive_layer_height_variation": { "value": 0.04 }, - "adaptive_layer_height_variation_step": { "value": 0.04 }, - - "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_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": 2 }, - "minimum_interface_area": { "value": 10 }, - "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, - "wall_thickness": {"value": "line_width * 2" } + "wall_0_material_flow": { "value": "0.95 * material_flow" }, + "wall_0_wipe_dist": { "value": 0.0 }, + "wall_thickness": { "value": "line_width * 2" }, + "z_seam_corner": { "value": "'z_seam_corner_none'" }, + "z_seam_type": { "value": "'back'" } } -} +} \ No newline at end of file diff --git a/resources/definitions/mingda_d2.def.json b/resources/definitions/mingda_d2.def.json index 56ac284156..54e969ab74 100644 --- a/resources/definitions/mingda_d2.def.json +++ b/resources/definitions/mingda_d2.def.json @@ -1,20 +1,24 @@ { - "name": "Mingda D2", "version": 2, + "name": "Mingda D2", "inherits": "mingda_base", - "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": { - "quality_definition": "mingda_base", "visible": true, "platform": "mingda_d2_base.stl", - "platform_offset": [ -205, -77, 65] + "platform_offset": [ + -205, + -77, + 65 + ], + "quality_definition": "mingda_base" + }, + "overrides": + { + "gantry_height": { "value": 25 }, + "machine_depth": { "default_value": 230 }, + "machine_height": { "default_value": 260 }, + "machine_name": { "default_value": "MINGDA D2" }, + "machine_width": { "default_value": 230 } } -} +} \ No newline at end of file diff --git a/resources/definitions/mingda_d3pro.def.json b/resources/definitions/mingda_d3pro.def.json index 230e59e4e0..89475e6f42 100644 --- a/resources/definitions/mingda_d3pro.def.json +++ b/resources/definitions/mingda_d3pro.def.json @@ -1,20 +1,24 @@ { - "name": "Mingda D3/Pro", "version": 2, + "name": "Mingda D3/Pro", "inherits": "mingda_base", - "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": { - "quality_definition": "mingda_base", "visible": true, "platform": "mingda_rock3_base.stl", - "platform_offset": [ -179, -108, 150] + "platform_offset": [ + -179, + -108, + 150 + ], + "quality_definition": "mingda_base" + }, + "overrides": + { + "gantry_height": { "value": 25 }, + "machine_depth": { "default_value": 320 }, + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "MINGDA D3/Pro" }, + "machine_width": { "default_value": 320 } } -} +} \ No newline at end of file diff --git a/resources/definitions/mingda_d4pro.def.json b/resources/definitions/mingda_d4pro.def.json index 283fda8165..478dac45f7 100644 --- a/resources/definitions/mingda_d4pro.def.json +++ b/resources/definitions/mingda_d4pro.def.json @@ -1,21 +1,25 @@ { - "name": "Mingda D4 Pro", "version": 2, + "name": "Mingda D4 Pro", "inherits": "mingda_base", - "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": { - "quality_definition": "mingda_base", "visible": true, "platform": "mingda_d4pro_base.stl", - "platform_offset": [ -177, -140, 170] + "platform_offset": [ + -177, + -140, + 170 + ], + "quality_definition": "mingda_base" + }, + "overrides": + { + "gantry_height": { "value": 25 }, + "machine_depth": { "default_value": 420 }, + "machine_height": { "default_value": 400 }, + "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 } } } \ No newline at end of file diff --git a/resources/definitions/mingda_magician_max.def.json b/resources/definitions/mingda_magician_max.def.json index 825a63f4ee..18323b0a29 100644 --- a/resources/definitions/mingda_magician_max.def.json +++ b/resources/definitions/mingda_magician_max.def.json @@ -1,24 +1,26 @@ { - "name": "Mingda Magician Max", "version": 2, + "name": "Mingda Magician Max", "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 }, - "gantry_height": { "value": 25 } - + "metadata": + { + "visible": true, + "platform": "mingda_magician_max_base.stl", + "platform_offset": [ + 0, + 0, + 4 + ], + "quality_definition": "mingda_base" }, - "metadata": { - "quality_definition": "mingda_base", - "visible": true, - "platform": "mingda_magician_max_base.stl", - "platform_offset": [ 0, 0, 4] + "overrides": + { + "gantry_height": { "value": 25 }, + "machine_depth": { "default_value": 320 }, + "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_height": { "default_value": 400 }, + "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_width": { "default_value": 320 } } -} +} \ No newline at end of file diff --git a/resources/definitions/mingda_magician_pro.def.json b/resources/definitions/mingda_magician_pro.def.json index c261f986e5..8ca11061a0 100644 --- a/resources/definitions/mingda_magician_pro.def.json +++ b/resources/definitions/mingda_magician_pro.def.json @@ -1,24 +1,26 @@ { - "name": "Mingda Magician Pro", "version": 2, + "name": "Mingda Magician Pro", "inherits": "mingda_base", - "overrides": { - "machine_name": { "default_value": "Mingda Magician Pro" }, - - "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 }, - "gantry_height": { "value": 25 } - - }, - "metadata": { - "quality_definition": "mingda_base", + "metadata": + { "visible": true, "platform": "mingda_magician_pro_base.stl", - "platform_offset": [ 0, 0, -4] + "platform_offset": [ + 0, + 0, + -4 + ], + "quality_definition": "mingda_base" + }, + "overrides": + { + "gantry_height": { "value": 25 }, + "machine_depth": { "default_value": 400 }, + "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_height": { "default_value": 400 }, + "machine_name": { "default_value": "Mingda Magician Pro" }, + "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_width": { "default_value": 400 } } -} +} \ No newline at end of file diff --git a/resources/definitions/mingda_magician_x.def.json b/resources/definitions/mingda_magician_x.def.json index 60b11e8a83..61270cf715 100644 --- a/resources/definitions/mingda_magician_x.def.json +++ b/resources/definitions/mingda_magician_x.def.json @@ -1,24 +1,26 @@ { - "name": "Mingda Magician X", "version": 2, + "name": "Mingda Magician X", "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 }, - "gantry_height": { "value": 25 } - - }, - "metadata": { - "quality_definition": "mingda_base", + "metadata": + { "visible": true, "platform": "mingda_magician_x_base.stl", - "platform_offset": [ 0, 0, 0] + "platform_offset": [ + 0, + 0, + 0 + ], + "quality_definition": "mingda_base" + }, + "overrides": + { + "gantry_height": { "value": 25 }, + "machine_depth": { "default_value": 230 }, + "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_height": { "default_value": 260 }, + "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_width": { "default_value": 230 } } -} +} \ No newline at end of file diff --git a/resources/definitions/mingda_rock3.def.json b/resources/definitions/mingda_rock3.def.json index c470d6e7e5..bc6d33ab44 100644 --- a/resources/definitions/mingda_rock3.def.json +++ b/resources/definitions/mingda_rock3.def.json @@ -1,19 +1,24 @@ { - "name": "Mingda Rock3/Pro", "version": 2, + "name": "Mingda Rock3/Pro", "inherits": "mingda_base", - "overrides": { - "machine_name": { "default_value": "MINGDA Rock3/Pro" }, - "machine_width": { "default_value": 320 }, - "machine_depth": { "default_value": 320 }, - "machine_height": { "default_value": 400 }, - "gantry_height": { "value": 25 } - - }, - "metadata": { - "quality_definition": "mingda_base", + "metadata": + { "visible": true, "platform": "mingda_rock3_base.stl", - "platform_offset": [ -179, -108, 150] + "platform_offset": [ + -179, + -108, + 150 + ], + "quality_definition": "mingda_base" + }, + "overrides": + { + "gantry_height": { "value": 25 }, + "machine_depth": { "default_value": 320 }, + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "MINGDA Rock3/Pro" }, + "machine_width": { "default_value": 320 } } -} +} \ No newline at end of file diff --git a/resources/definitions/mixware_hyper_s.def.json b/resources/definitions/mixware_hyper_s.def.json index b467f8e98c..2fbf273a78 100644 --- a/resources/definitions/mixware_hyper_s.def.json +++ b/resources/definitions/mixware_hyper_s.def.json @@ -1,360 +1,153 @@ { - "name": "Hyper S", "version": 2, + "name": "Hyper S", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Mixware", "manufacturer": "Mixware", "file_formats": "text/x-gcode", "platform": "mixware_hyper_s_platform.stl", - "has_materials": true, "has_machine_quality": true, + "has_materials": true, + "machine_extruder_trains": { "0": "mixware_hyper_s_extruder_0" }, "preferred_material": "generic_pla", - "preferred_quality": "coarse", - "machine_extruder_trains": { - "0": "mixware_hyper_s_extruder_0" - } + "preferred_quality": "coarse" }, - "overrides": { - "machine_name": { - "default_value": "Hyper S" - }, - "machine_start_gcode": { - "default_value": "M140 S{material_bed_temperature} ; Heat bed\nM109 S{material_print_temperature} ; Heat nozzle\nM190 S{material_bed_temperature} ; Wait for bed heating\nG28 ; home all axes\nM117 Purge extruder\nG92 E0 ; reset extruder\nG1 Z5.0 F1000 ; move z up little to prevent scratching of surface\nG1 X0.1 Y20 Z0.3 F5000.0 ; move to start-line position\nG1 X0.1 Y100.0 Z0.3 F1500.0 E15 ; draw 1st line\nG1 X0.4 Y100.0 Z0.3 F5000.0 ; move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; draw 2nd line\nG92 E0 ; reset extruder\nG1 Z5.0 F1000 ; move z up little to prevent scratching of surface" - }, - "machine_end_gcode": { - "default_value": "G91; relative positioning\nG1 Z1.0 F3000 ; move z up little to prevent scratching of print\nG90; absolute positioning\nG1 X0 Y200 F1000 ; prepare for part removal\nM104 S0; turn off extruder\nM140 S0 ; turn off bed\nG1 X0 Y220 F1000 ; prepare for part removal\nM84 ; disable motors\nM106 S0 ; turn off fan" - }, - "machine_width": { - "default_value": 300 - }, - "machine_depth": { - "default_value": 300 - }, - "machine_height": { - "default_value": 400 - }, - "raft_margin": { + "overrides": + { + "acceleration_enabled": { "default_value": false }, + "acceleration_print": { "default_value": 1000 }, + "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, + "acceleration_travel": { "value": 1000 }, + "acceleration_travel_layer_0": { "value": "acceleration_travel" }, + "adaptive_layer_height_variation": { "default_value": 0.04 }, + "adaptive_layer_height_variation_step": { "default_value": 0.04 }, + "adhesion_type": { "default_value": "skirt" }, + "brim_replaces_support": { "default_value": false }, + "brim_width": { "default_value": 3 }, + "cool_fan_enabled": { "default_value": true }, + "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, + "cool_min_layer_time": { "default_value": 10 }, + "fill_outline_gaps": { "default_value": false }, + "gantry_height": { "value": 25 }, + "infill_before_walls": { "default_value": false }, + "infill_overlap": { "value": 30.0 }, + "infill_sparse_density": { "default_value": 15 }, + "infill_wipe_dist": { "value": 0.0 }, + "ironing_line_spacing": { "default_value": 0.4 }, + "ironing_pattern": { "default_value": "concentric" }, + "jerk_enabled": { "default_value": false }, + "jerk_print": { "default_value": 10 }, + "jerk_travel": { "value": "jerk_print" }, + "jerk_travel_layer_0": { "value": "jerk_travel" }, + "line_width": { "value": 0.4 }, + "machine_acceleration": { "default_value": 500 }, + "machine_depth": { "default_value": 300 }, + "machine_end_gcode": { "default_value": "G91; relative positioning\nG1 Z1.0 F3000 ; move z up little to prevent scratching of print\nG90; absolute positioning\nG1 X0 Y200 F1000 ; prepare for part removal\nM104 S0; turn off extruder\nM140 S0 ; turn off bed\nG1 X0 Y220 F1000 ; prepare for part removal\nM84 ; disable motors\nM106 S0 ; turn off fan" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 400 }, + "machine_max_acceleration_e": { "default_value": 500 }, + "machine_max_acceleration_x": { "default_value": 500 }, + "machine_max_acceleration_y": { "default_value": 500 }, + "machine_max_acceleration_z": { "default_value": 100 }, + "machine_max_feedrate_e": { "default_value": 50 }, + "machine_max_feedrate_x": { "default_value": 500 }, + "machine_max_feedrate_y": { "default_value": 500 }, + "machine_max_feedrate_z": { "default_value": 10 }, + "machine_max_jerk_e": { "default_value": 5 }, + "machine_max_jerk_xy": { "default_value": 10 }, + "machine_max_jerk_z": { "default_value": 0.4 }, + "machine_name": { "default_value": "Hyper S" }, + "machine_start_gcode": { "default_value": "M140 S{material_bed_temperature} ; Heat bed\nM109 S{material_print_temperature} ; Heat nozzle\nM190 S{material_bed_temperature} ; Wait for bed heating\nG28 ; home all axes\nM117 Purge extruder\nG92 E0 ; reset extruder\nG1 Z5.0 F1000 ; move z up little to prevent scratching of surface\nG1 X0.1 Y20 Z0.3 F5000.0 ; move to start-line position\nG1 X0.1 Y100.0 Z0.3 F1500.0 E15 ; draw 1st line\nG1 X0.4 Y100.0 Z0.3 F5000.0 ; move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; draw 2nd line\nG92 E0 ; reset extruder\nG1 Z5.0 F1000 ; move z up little to prevent scratching of surface" }, + "machine_width": { "default_value": 300 }, + "material_diameter": { "default_value": 1.75 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_flow": { "default_value": 100 }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "material_print_temperature": { "maximum_value_warning": "330" }, + "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" }, + "minimum_interface_area": { "default_value": 10 }, + "minimum_support_area": { "default_value": 2 }, + "optimize_wall_printing_order": { "default_value": "True" }, + "raft_airgap": { "default_value": 0.24 }, + "raft_margin": + { "default_value": 3, "minimum_value_warning": "0.01" }, - "raft_airgap": { - "default_value": 0.24 + "retraction_amount": { "default_value": 2 }, + "retraction_combing": { "value": "all" }, + "retraction_combing_max_distance": { "default_value": 30 }, + "retraction_count_max": { "default_value": 100 }, + "retraction_enable": { "default_value": true }, + "retraction_extrusion_window": + { + "maximum_value_warning": "20", + "value": 10 }, - "brim_width": { - "default_value": 3 + "retraction_hop": { "default_value": 0.2 }, + "retraction_hop_enabled": { "default_value": false }, + "retraction_min_travel": { "value": 1.5 }, + "retraction_prime_speed": + { + "maximum_value": "200", + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')" }, - "machine_heated_bed": { - "default_value": true + "retraction_retract_speed": + { + "maximum_value": "200", + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')" }, - "material_diameter": { - "default_value": 1.75 - }, - "top_bottom_pattern": { - "default_value": "zigzag" - }, - "ironing_line_spacing": { - "default_value": 0.4 - }, - "ironing_pattern": { - "default_value": "concentric" - }, - "skin_no_small_gaps_heuristic": { - "default_value": false - }, - "retraction_hop_enabled": { - "default_value": false - }, - "support_enable": { - "default_value": true - }, - "support_type": { - "default_value": "buildplate" - }, - "support_angle": { - "default_value": 60 - }, - "support_pattern": { - "default_value": "zigzag" - }, - "support_infill_rate": { - "value": 15 - }, - "gantry_height": { - "value": 25 - }, - "machine_max_feedrate_x": { - "default_value": 500 - }, - "machine_max_feedrate_y": { - "default_value": 500 - }, - "machine_max_feedrate_z": { - "default_value": 10 - }, - "machine_max_feedrate_e": { - "default_value": 50 - }, - "machine_max_acceleration_x": { - "default_value": 500 - }, - "machine_max_acceleration_y": { - "default_value": 500 - }, - "machine_max_acceleration_z": { - "default_value": 100 - }, - "machine_max_acceleration_e": { - "default_value": 500 - }, - "machine_acceleration": { - "default_value": 500 - }, - "machine_max_jerk_xy": { - "default_value": 10 - }, - "machine_max_jerk_z": { - "default_value": 0.4 - }, - "machine_max_jerk_e": { - "default_value": 5 - }, - "acceleration_print": { - "default_value": 1000 - }, - "jerk_print": { - "default_value": 10 - }, - "acceleration_enabled": { - "default_value": false - }, - "jerk_enabled": { - "default_value": false - }, - "speed_print": { - "default_value": 40.0 - }, - "optimize_wall_printing_order": { - "default_value": "True" - }, - "z_seam_type": { - "default_value": "shortest" - }, - "infill_before_walls": { - "default_value": false - }, - "infill_sparse_density": { - "default_value": 15 - }, - "fill_outline_gaps": { - "default_value": false - }, - "retraction_hop": { - "default_value": 0.2 - }, - "travel_avoid_other_parts": { - "default_value": false - }, - "travel_retract_before_outer_wall": { - "default_value": true - }, - "retraction_amount": { - "default_value": 2 - }, - "retraction_enable": { - "default_value": true - }, - "retraction_count_max": { - "default_value": 100 - }, - "cool_fan_enabled": { - "default_value": true - }, - "cool_min_layer_time": { - "default_value": 10 - }, - "skirt_gap": { - "default_value": 8.0 - }, - "skirt_line_count": { - "default_value": 3 - }, - "adaptive_layer_height_variation": { - "default_value": 0.04 - }, - "adaptive_layer_height_variation_step": { - "default_value": 0.04 - }, - "support_use_towers": { - "default_value": false - }, - "support_interface_enable": { - "default_value": true - }, - "support_interface_density": { - "default_value": 33.333 - }, - "support_interface_pattern": { - "default_value": "grid" - }, - "support_interface_skip_height": { - "default_value": 0.24 - }, - "top_bottom_thickness": { - "default_value": 0.8 - }, - "material_flow": { - "default_value": 100 - }, - "material_print_temperature": { - "maximum_value_warning": "330" - }, - "acceleration_roofing": { - "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" - }, - "retraction_speed": { + "retraction_speed": + { "default_value": 40, - "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", - "maximum_value": "200" + "maximum_value": "200", + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')" }, - "retraction_retract_speed": { - "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", - "maximum_value": "200" - }, - "retraction_prime_speed": { - "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", - "maximum_value": "200" - }, - "speed_layer_0": { - "value": "speed_print / 2" - }, - "acceleration_travel_layer_0": { - "value": "acceleration_travel" - }, - "jerk_travel": { - "value": "jerk_print" - }, - "jerk_travel_layer_0": { - "value": "jerk_travel" - }, - "skirt_brim_speed": { - "value": "speed_layer_0" - }, - "speed_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_layer_0": { - "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" - }, - "speed_prime_tower": { - "value": "speed_topbottom" - }, - "speed_support": { - "value": "speed_wall_0" - }, - "speed_support_interface": { - "value": "speed_topbottom" - }, - "material_initial_print_temperature": { - "value": "material_print_temperature" - }, - "material_final_print_temperature": { - "value": "material_print_temperature" - }, - "cool_fan_full_at_height": { - "value": "layer_height_0 + 2 * layer_height" - }, - "adhesion_type": { - "default_value": "skirt" - }, - "meshfix_maximum_travel_resolution": { - "value": "meshfix_maximum_resolution" - }, - "support_xy_distance": { - "value": "wall_line_width_0 * 2" - }, - "support_xy_distance_overhang": { - "value": "wall_line_width_0" - }, - "support_z_distance": { - "value": "layer_height if layer_height >= 0.16 else layer_height * 2" - }, - "support_xy_overrides_z": { - "default_value": "xy_overrides_z" - }, - "support_interface_height": { - "value": "layer_height * 4" - }, - "wall_thickness": { - "value": "line_width * 2" - }, - "acceleration_travel": { - "value": 1000 - }, - "line_width": { - "value": 0.4 - }, - "speed_z_hop": { - "default_value": 5 - }, - "retraction_combing_max_distance": { - "default_value": 30 - }, - "travel_avoid_supports": { - "default_value": true - }, - "brim_replaces_support": { - "default_value": false - }, - "support_brim_width": { - "default_value": 4 - }, - "minimum_support_area": { - "default_value": 2 - }, - "minimum_interface_area": { - "default_value": 10 - }, - "support_wall_count": { - "value": 1 - }, - "support_brim_enable": { - "value": false - }, - "retraction_combing": { - "value": "all" - }, - "retraction_extrusion_window": { - "value": 10, - "maximum_value_warning": "20" - }, - "retraction_min_travel": { - "value": 1.5 - }, - "infill_wipe_dist": { - "value": 0.0 - }, - "skin_overlap": { - "value": 10.0 - }, - "infill_overlap": { - "value": 30.0 - }, - "wall_0_wipe_dist": { - "value": 0.0 - } + "skin_no_small_gaps_heuristic": { "default_value": false }, + "skin_overlap": { "value": 10.0 }, + "skirt_brim_speed": { "value": "speed_layer_0" }, + "skirt_gap": { "default_value": 8.0 }, + "skirt_line_count": { "default_value": 3 }, + "speed_layer_0": { "value": "speed_print / 2" }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_print": { "default_value": 40.0 }, + "speed_roofing": { "value": "speed_topbottom" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_support_interface": { "value": "speed_topbottom" }, + "speed_topbottom": { "value": "speed_print / 2" }, + "speed_travel": { "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" }, + "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, + "speed_wall_0": { "value": "speed_wall" }, + "speed_wall_x": { "value": "speed_wall" }, + "speed_z_hop": { "default_value": 5 }, + "support_angle": { "default_value": 60 }, + "support_brim_enable": { "value": false }, + "support_brim_width": { "default_value": 4 }, + "support_enable": { "default_value": true }, + "support_infill_rate": { "value": 15 }, + "support_interface_density": { "default_value": 33.333 }, + "support_interface_enable": { "default_value": true }, + "support_interface_height": { "value": "layer_height * 4" }, + "support_interface_pattern": { "default_value": "grid" }, + "support_interface_skip_height": { "default_value": 0.24 }, + "support_pattern": { "default_value": "zigzag" }, + "support_type": { "default_value": "buildplate" }, + "support_use_towers": { "default_value": false }, + "support_wall_count": { "value": 1 }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + "support_xy_overrides_z": { "default_value": "xy_overrides_z" }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height * 2" }, + "top_bottom_pattern": { "default_value": "zigzag" }, + "top_bottom_thickness": { "default_value": 0.8 }, + "travel_avoid_other_parts": { "default_value": false }, + "travel_avoid_supports": { "default_value": true }, + "travel_retract_before_outer_wall": { "default_value": true }, + "wall_0_wipe_dist": { "value": 0.0 }, + "wall_thickness": { "value": "line_width * 2" }, + "z_seam_type": { "default_value": "shortest" } } -} +} \ No newline at end of file diff --git a/resources/definitions/modix_v3_base.def.json b/resources/definitions/modix_v3_base.def.json new file mode 100644 index 0000000000..52763c2e98 --- /dev/null +++ b/resources/definitions/modix_v3_base.def.json @@ -0,0 +1,88 @@ +{ + "version": 2, + "name": "Modix Base Printer", + "inherits": "fdmprinter", + "metadata": + { + "author": "Modix", + "manufacturer": "Modix", + "file_formats": "text/x-gcode", + "has_variants": true, + "machine_extruder_trains": + { + "0": "modix_v3_extruder_0", + "1": "modix_v3_extruder_1" + }, + "preferred_variant_name": "0.4 mm Nozzle", + "variants_name": "Nozzle Size" + }, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, + "fill_outline_gaps": { "value": false }, + "gantry_height": { "value": "90.0" }, + "infill_before_walls": { "value": false }, + "infill_overlap": { "value": 30.0 }, + "infill_pattern": { "value": "'cubic'" }, + "infill_sparse_density": { "value": "15" }, + "layer_height_0": { "value": "round(machine_nozzle_size / 2, 1)" }, + "line_width": { "value": "machine_nozzle_size * 1.05" }, + "machine_end_gcode": { "default_value": "M83 ; extruder relative moves \nG1 E-5 F2700 ;retract a bit \nG10 P0 S0 R0 ; turn off extruder 0 \nG10 P1 S0 R0 ; turn off extruder 1 \nM106 S0 ; turn off fans \nT-1 P0 ; deselect any tools \nG4 P1 ; dwell 1ms \nG91 ;relative positioning \nG1 Z2 F500 ; Move print head up 2mm \nG90 ; absolute positioning \nG1 X{move.axes[0].min+2} Y{move.axes[1].max-2} F6000 ; move to the back left \nM84 ; disable motors" }, + "machine_gcode_flavor": { "default_value": "RepRap (RepRap)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-100, 30], + [-100, 65], + [30, -105], + [-31, -100] + ] + }, + "machine_name": { "default_value": "Modix Base Printer" }, + "machine_start_gcode": { "default_value": "G28 ; home all axes" }, + "material_diameter": { "default_value": 1.75 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "minimum_interface_area": { "value": 10 }, + "minimum_support_area": { "value": 2 }, + "optimize_wall_printing_order": { "value": "True" }, + "retraction_amount": { "value": 1 }, + "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'infill'" }, + "retraction_combing_max_distance": { "value": 5 }, + "retraction_count_max": { "value": 50 }, + "retraction_extrusion_window": { "value": 1 }, + "retraction_hop": { "value": "layer_height*4" }, + "retraction_hop_enabled": { "value": "support_enable" }, + "retraction_prime_speed": { "value": 40 }, + "retraction_retract_speed": { "value": 40 }, + "retraction_speed": { "default_value": 40 }, + "skin_overlap": { "value": 10.0 }, + "skirt_brim_minimal_length": { "default_value": 200 }, + "skirt_gap": { "value": 5.0 }, + "skirt_line_count": { "value": 3 }, + "speed_layer_0": { "value": 20.0 }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_support_interface": { "value": "speed_topbottom" }, + "speed_travel": { "value": 110.0 }, + "speed_wall_x": { "value": "speed_wall" }, + "speed_z_hop": { "value": 5 }, + "support_angle": { "value": 55 }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 5 }, + "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 15" }, + "support_interface_density": { "value": 40 }, + "support_interface_enable": { "value": true }, + "support_interface_height": { "value": "layer_height * 3" }, + "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.2 else layer_height * 2" }, + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, + "travel_avoid_supports": { "value": true }, + "travel_retract_before_outer_wall": { "value": true }, + "wall_thickness": { "value": "line_width * 2" }, + "z_seam_corner": { "value": "z_seam_corner_weighted" } + } +} \ No newline at end of file diff --git a/resources/definitions/modix_v3_big120X.def.json b/resources/definitions/modix_v3_big120X.def.json new file mode 100644 index 0000000000..9501ca96e1 --- /dev/null +++ b/resources/definitions/modix_v3_big120X.def.json @@ -0,0 +1,13 @@ +{ + "version": 2, + "name": "Modix V3 BIG-120X", + "inherits": "modix_v3_base", + "metadata": { "visible": true }, + "overrides": + { + "machine_depth": { "default_value": 600 }, + "machine_height": { "default_value": 640 }, + "machine_name": { "default_value": "Modix BIG-120X V3" }, + "machine_width": { "default_value": 1200 } + } +} \ No newline at end of file diff --git a/resources/definitions/modix_v3_big120Z.def.json b/resources/definitions/modix_v3_big120Z.def.json new file mode 100644 index 0000000000..132ca0cd5f --- /dev/null +++ b/resources/definitions/modix_v3_big120Z.def.json @@ -0,0 +1,13 @@ +{ + "version": 2, + "name": "Modix V3 BIG-120Z", + "inherits": "modix_v3_base", + "metadata": { "visible": true }, + "overrides": + { + "machine_depth": { "default_value": 600 }, + "machine_height": { "default_value": 1200 }, + "machine_name": { "default_value": "Modix BIG-120Z V3" }, + "machine_width": { "default_value": 600 } + } +} \ No newline at end of file diff --git a/resources/definitions/modix_v3_big180X.def.json b/resources/definitions/modix_v3_big180X.def.json new file mode 100644 index 0000000000..18f3d0521f --- /dev/null +++ b/resources/definitions/modix_v3_big180X.def.json @@ -0,0 +1,13 @@ +{ + "version": 2, + "name": "Modix V3 BIG-180X", + "inherits": "modix_v3_base", + "metadata": { "visible": true }, + "overrides": + { + "machine_depth": { "default_value": 600 }, + "machine_height": { "default_value": 600 }, + "machine_name": { "default_value": "Modix BIG-180X V3" }, + "machine_width": { "default_value": 1800 } + } +} \ No newline at end of file diff --git a/resources/definitions/modix_v3_big40.def.json b/resources/definitions/modix_v3_big40.def.json new file mode 100644 index 0000000000..8a44d919c2 --- /dev/null +++ b/resources/definitions/modix_v3_big40.def.json @@ -0,0 +1,13 @@ +{ + "version": 2, + "name": "Modix V3 BIG-40", + "inherits": "modix_v3_base", + "metadata": { "visible": true }, + "overrides": + { + "machine_depth": { "default_value": 400 }, + "machine_height": { "default_value": 800 }, + "machine_name": { "default_value": "Modix BIG-40 V3" }, + "machine_width": { "default_value": 400 } + } +} \ No newline at end of file diff --git a/resources/definitions/modix_v3_big60.def.json b/resources/definitions/modix_v3_big60.def.json new file mode 100644 index 0000000000..3db8825e61 --- /dev/null +++ b/resources/definitions/modix_v3_big60.def.json @@ -0,0 +1,13 @@ +{ + "version": 2, + "name": "Modix V3 BIG-60", + "inherits": "modix_v3_base", + "metadata": { "visible": true }, + "overrides": + { + "machine_depth": { "default_value": 600 }, + "machine_height": { "default_value": 660 }, + "machine_name": { "default_value": "Modix BIG-60 V3" }, + "machine_width": { "default_value": 600 } + } +} \ No newline at end of file diff --git a/resources/definitions/modix_v3_big_meter.def.json b/resources/definitions/modix_v3_big_meter.def.json new file mode 100644 index 0000000000..d6d2c968b9 --- /dev/null +++ b/resources/definitions/modix_v3_big_meter.def.json @@ -0,0 +1,13 @@ +{ + "version": 2, + "name": "Modix V3 BIG-Meter", + "inherits": "modix_v3_base", + "metadata": { "visible": true }, + "overrides": + { + "machine_depth": { "default_value": 1000 }, + "machine_height": { "default_value": 1000 }, + "machine_name": { "default_value": "Modix BIG-METER V3" }, + "machine_width": { "default_value": 1000 } + } +} \ No newline at end of file diff --git a/resources/definitions/modix_v4_base.def.json b/resources/definitions/modix_v4_base.def.json new file mode 100644 index 0000000000..7f02674355 --- /dev/null +++ b/resources/definitions/modix_v4_base.def.json @@ -0,0 +1,88 @@ +{ + "version": 2, + "name": "Modix Base Printer", + "inherits": "fdmprinter", + "metadata": + { + "author": "Modix", + "manufacturer": "Modix", + "file_formats": "text/x-gcode", + "has_variants": true, + "machine_extruder_trains": + { + "0": "modix_v4_extruder_0", + "1": "modix_v4_extruder_1" + }, + "preferred_variant_name": "0.4 mm Nozzle", + "variants_name": "Nozzle Size" + }, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, + "fill_outline_gaps": { "value": false }, + "gantry_height": { "value": "90.0" }, + "infill_before_walls": { "value": false }, + "infill_overlap": { "value": 30.0 }, + "infill_pattern": { "value": "'cubic'" }, + "infill_sparse_density": { "value": "15" }, + "layer_height_0": { "value": "round(machine_nozzle_size / 2, 1)" }, + "line_width": { "value": "machine_nozzle_size * 1.05" }, + "machine_end_gcode": { "default_value": "M83 ; extruder relative moves \nG1 E-5 F2700 ;retract a bit \nG10 P0 S0 R0 ; turn off extruder 0 \nM106 S0 ; turn off fans \nT-1 P0 ; deselect any tools \nG4 P1 ; dwell 1ms \nG91 ;relative positioning \nG1 Z2 F500 ; Move print head up 2mm \nG90 ; absolute positioning \nG1 X{move.axes[0].min+2} Y{move.axes[1].max-2} F6000 ; move to the back left \nM84 ; disable motors" }, + "machine_gcode_flavor": { "default_value": "RepRap (RepRap)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-100, 30], + [-100, 65], + [30, -105], + [-31, -100] + ] + }, + "machine_name": { "default_value": "Modix Base Printer" }, + "machine_start_gcode": { "default_value": "G28 ; home all axes" }, + "material_diameter": { "default_value": 1.75 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "minimum_interface_area": { "value": 10 }, + "minimum_support_area": { "value": 2 }, + "optimize_wall_printing_order": { "value": "True" }, + "retraction_amount": { "value": 1 }, + "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'infill'" }, + "retraction_combing_max_distance": { "value": 5 }, + "retraction_count_max": { "value": 50 }, + "retraction_extrusion_window": { "value": 1 }, + "retraction_hop": { "value": 2 }, + "retraction_hop_enabled": { "value": "support_enable" }, + "retraction_prime_speed": { "value": 40 }, + "retraction_retract_speed": { "value": 40 }, + "retraction_speed": { "default_value": 40 }, + "skin_overlap": { "value": 10.0 }, + "skirt_brim_minimal_length": { "default_value": 200 }, + "skirt_gap": { "value": 5.0 }, + "skirt_line_count": { "value": 3 }, + "speed_layer_0": { "value": 20.0 }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_support_interface": { "value": "speed_topbottom" }, + "speed_travel": { "value": 250.0 }, + "speed_wall_x": { "value": "speed_wall" }, + "speed_z_hop": { "value": 5 }, + "support_angle": { "value": 55 }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 5 }, + "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 15" }, + "support_interface_density": { "value": 40 }, + "support_interface_enable": { "value": true }, + "support_interface_height": { "value": "layer_height * 3" }, + "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.2 else layer_height * 2" }, + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, + "travel_avoid_supports": { "value": true }, + "travel_retract_before_outer_wall": { "value": true }, + "wall_thickness": { "value": "line_width * 2" }, + "z_seam_corner": { "value": "z_seam_corner_weighted" } + } +} \ No newline at end of file diff --git a/resources/definitions/modix_v4_big120X.def.json b/resources/definitions/modix_v4_big120X.def.json new file mode 100644 index 0000000000..792d158ba4 --- /dev/null +++ b/resources/definitions/modix_v4_big120X.def.json @@ -0,0 +1,13 @@ +{ + "version": 2, + "name": "Modix V4 BIG-120X", + "inherits": "modix_v4_base", + "metadata": { "visible": true }, + "overrides": + { + "machine_depth": { "default_value": 600 }, + "machine_height": { "default_value": 640 }, + "machine_name": { "default_value": "Modix BIG-120X V4" }, + "machine_width": { "default_value": 1200 } + } +} \ No newline at end of file diff --git a/resources/definitions/modix_v4_big120Z.def.json b/resources/definitions/modix_v4_big120Z.def.json new file mode 100644 index 0000000000..fa568f0423 --- /dev/null +++ b/resources/definitions/modix_v4_big120Z.def.json @@ -0,0 +1,13 @@ +{ + "version": 2, + "name": "Modix V4 BIG-120Z", + "inherits": "modix_v4_base", + "metadata": { "visible": true }, + "overrides": + { + "machine_depth": { "default_value": 600 }, + "machine_height": { "default_value": 1200 }, + "machine_name": { "default_value": "Modix BIG-120Z V4" }, + "machine_width": { "default_value": 600 } + } +} \ No newline at end of file diff --git a/resources/definitions/modix_v4_big180X.def.json b/resources/definitions/modix_v4_big180X.def.json new file mode 100644 index 0000000000..52b8d7a1c4 --- /dev/null +++ b/resources/definitions/modix_v4_big180X.def.json @@ -0,0 +1,13 @@ +{ + "version": 2, + "name": "Modix V4 BIG-180X", + "inherits": "modix_v4_base", + "metadata": { "visible": true }, + "overrides": + { + "machine_depth": { "default_value": 600 }, + "machine_height": { "default_value": 600 }, + "machine_name": { "default_value": "Modix BIG-180X V4" }, + "machine_width": { "default_value": 1800 } + } +} \ No newline at end of file diff --git a/resources/definitions/modix_v4_big60.def.json b/resources/definitions/modix_v4_big60.def.json new file mode 100644 index 0000000000..6ff69ce1bf --- /dev/null +++ b/resources/definitions/modix_v4_big60.def.json @@ -0,0 +1,13 @@ +{ + "version": 2, + "name": "Modix V4 BIG-60", + "inherits": "modix_v4_base", + "metadata": { "visible": true }, + "overrides": + { + "machine_depth": { "default_value": 600 }, + "machine_height": { "default_value": 660 }, + "machine_name": { "default_value": "Modix BIG-60 V4" }, + "machine_width": { "default_value": 600 } + } +} \ No newline at end of file diff --git a/resources/definitions/modix_v4_big_meter.def.json b/resources/definitions/modix_v4_big_meter.def.json new file mode 100644 index 0000000000..849807c27f --- /dev/null +++ b/resources/definitions/modix_v4_big_meter.def.json @@ -0,0 +1,13 @@ +{ + "version": 2, + "name": "Modix V4 BIG-Meter", + "inherits": "modix_v4_base", + "metadata": { "visible": true }, + "overrides": + { + "machine_depth": { "default_value": 1000 }, + "machine_height": { "default_value": 1000 }, + "machine_name": { "default_value": "Modix BIG-METER V4" }, + "machine_width": { "default_value": 1000 } + } +} \ No newline at end of file diff --git a/resources/definitions/monoprice_select_mini_v1.def.json b/resources/definitions/monoprice_select_mini_v1.def.json index 21497b13bc..8bbe9c0772 100644 --- a/resources/definitions/monoprice_select_mini_v1.def.json +++ b/resources/definitions/monoprice_select_mini_v1.def.json @@ -2,19 +2,17 @@ "version": 2, "name": "Monoprice Select Mini V1", "inherits": "malyan_m200", - "metadata": { + "metadata": + { + "visible": true, "author": "Brian Corbino, Tyler Gibson", "manufacturer": "Monoprice", "file_formats": "text/x-gcode", - "quality_definition": "malyan_m200", - "visible": true, - "machine_extruder_trains": - { - "0": "monoprice_select_mini_v1_extruder_0" - } - }, - - "overrides": { + "machine_extruder_trains": { "0": "monoprice_select_mini_v1_extruder_0" }, + "quality_definition": "malyan_m200" + }, + "overrides": + { "machine_name": { "default_value": "Monoprice Select Mini V1" } } -} +} \ No newline at end of file diff --git a/resources/definitions/monoprice_select_mini_v2.def.json b/resources/definitions/monoprice_select_mini_v2.def.json index 004de649f1..aced94320a 100644 --- a/resources/definitions/monoprice_select_mini_v2.def.json +++ b/resources/definitions/monoprice_select_mini_v2.def.json @@ -2,30 +2,25 @@ "version": 2, "name": "Monoprice Select Mini V2 (E3D)", "inherits": "malyan_m200", - "metadata": { + "metadata": + { + "visible": true, "author": "Tyler Gibson", "manufacturer": "Monoprice", "file_formats": "text/x-gcode", "has_machine_quality": true, "has_materials": true, - "preferred_quality_type": "normal", - "visible": true, - "machine_extruder_trains": - { - "0": "monoprice_select_mini_v2_extruder_0" - } - }, - - "overrides": { - "machine_name": { "default_value": "Monoprice Select Mini V2" }, - "machine_end_gcode": - { - "default_value": "G0 X0 Y120;(Stick out the part)\nM190 S0;(Turn off heat bed, don't wait.)\nG92 E10;(Set extruder to 10)\nG1 E7 F200;(retract 3mm)\nM104 S0;(Turn off nozzle, don't wait)\nG4 S300;(Delay 5 minutes)\nM107;(Turn off part fan)\nM84;(Turn off stepper motors.)" - }, + "machine_extruder_trains": { "0": "monoprice_select_mini_v2_extruder_0" }, + "preferred_quality_type": "normal" + }, + "overrides": + { "adhesion_type": { "default_value": "brim" }, + "machine_end_gcode": { "default_value": "G0 X0 Y120;(Stick out the part)\nM190 S0;(Turn off heat bed, don't wait.)\nG92 E10;(Set extruder to 10)\nG1 E7 F200;(retract 3mm)\nM104 S0;(Turn off nozzle, don't wait)\nG4 S300;(Delay 5 minutes)\nM107;(Turn off part fan)\nM84;(Turn off stepper motors.)" }, + "machine_name": { "default_value": "Monoprice Select Mini V2" }, + "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" }, + "retraction_amount": { "default_value": 2.5 }, "retraction_combing": { "value": "'noskin'" }, - "retraction_amount" : { "default_value": 2.5}, - "retraction_speed" : { "default_value": 40}, - "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" } + "retraction_speed": { "default_value": 40 } } -} +} \ No newline at end of file diff --git a/resources/definitions/monoprice_ultimate.def.json b/resources/definitions/monoprice_ultimate.def.json index 445347b54e..4ca119da17 100644 --- a/resources/definitions/monoprice_ultimate.def.json +++ b/resources/definitions/monoprice_ultimate.def.json @@ -2,47 +2,33 @@ "version": 2, "name": "Monoprice Ultimate", "inherits": "wanhao_d6", - "metadata": { + "metadata": + { "visible": true, "author": "Danny Tuppeny", "manufacturer": "Monoprice", "file_formats": "text/x-gcode", - "icon": "wanhao-icon.png", - "has_materials": true, "platform": "wanhao_200_200_platform.obj", - "platform_texture": "Wanhaobackplate.png", - "machine_extruder_trains": { - "0": "wanhao_d6_extruder_0" - }, - "platform_offset": [0, -28, 0] + "has_materials": true, + "icon": "wanhao-icon.png", + "machine_extruder_trains": { "0": "wanhao_d6_extruder_0" }, + "platform_offset": [ + 0, + -28, + 0 + ], + "platform_texture": "Wanhaobackplate.png" }, - "overrides": { - "machine_name": { - "default_value": "Monoprice Ultimate" - }, - "machine_max_acceleration_x": { - "default_value": 3000 - }, - "machine_max_acceleration_y": { - "default_value": 3000 - }, - "machine_max_acceleration_z": { - "default_value": 100 - }, - "machine_max_acceleration_e": { - "default_value": 500 - }, - "machine_acceleration": { - "default_value": 800 - }, - "machine_max_jerk_xy": { - "default_value": 10.0 - }, - "machine_max_jerk_z": { - "default_value": 0.4 - }, - "machine_max_jerk_e": { - "default_value": 1.0 - } + "overrides": + { + "machine_acceleration": { "default_value": 800 }, + "machine_max_acceleration_e": { "default_value": 500 }, + "machine_max_acceleration_x": { "default_value": 3000 }, + "machine_max_acceleration_y": { "default_value": 3000 }, + "machine_max_acceleration_z": { "default_value": 100 }, + "machine_max_jerk_e": { "default_value": 1.0 }, + "machine_max_jerk_xy": { "default_value": 10.0 }, + "machine_max_jerk_z": { "default_value": 0.4 }, + "machine_name": { "default_value": "Monoprice Ultimate" } } -} +} \ No newline at end of file diff --git a/resources/definitions/mp_mini_delta.def.json b/resources/definitions/mp_mini_delta.def.json index b003bb3853..fd6ddf180e 100644 --- a/resources/definitions/mp_mini_delta.def.json +++ b/resources/definitions/mp_mini_delta.def.json @@ -1,71 +1,61 @@ -{ - "version": 2, - "name": "MP Mini Delta", - "inherits": "fdmprinter", - "metadata": { - "author": "MPMD V1 Facebook Group", - "manufacturer": "Monoprice", - "file_formats": "text/x-gcode", - "platform": "mp_mini_delta_platform.3mf", - "supports_usb_connection": true, - "has_machine_quality": false, - "visible": true, - "platform_offset": [0, 0, 0], - "has_materials": true, - "has_variants": false, - "has_machine_materials": false, - "has_variant_materials": false, - "preferred_quality_type": "normal", - "machine_extruder_trains": - { - "0": "mp_mini_delta_extruder_0" - } - }, - - "overrides": { - "machine_start_gcode": - { - "default_value": ";MPMD V1 Basic Calibration Tutorial: \n; https://www.thingiverse.com/thing:3892011 \n; \n; If you want to put calibration values in your \n; Start Gcode, put them here. \n; \n;If on stock firmware, at minimum, consider adding \n;M665 R here since there is a firmware bug. \n; \n; Calibration part ends here \n; \nG90 ; switch to absolute positioning \nG92 E0 ; reset extrusion distance \nG1 E20 F200 ; purge 20mm of filament to prime nozzle. \nG92 E0 ; reset extrusion distance \nG4 S5 ; Pause for 5 seconds to allow time for removing extruded filament \nG28 ; start from home position \nG1 E-6 F900 ; retract 6mm of filament before starting the bed leveling process \nG92 E0 ; reset extrusion distance \nG4 S5 ; pause for 5 seconds to allow time for removing extruded filament \nG29 P2 Z0.28 ; Auto-level ; ADJUST Z higher or lower to set first layer height. Start with 0.02 adjustments. \nG1 Z30 ; raise Z 30mm to prepare for priming the nozzle \nG1 E5 F200 ; extrude 5mm of filament to help prime the nozzle just prior to the start of the print \nG92 E0 ; reset extrusion distance \nG4 S5 ; pause for 5 seconds to allow time for cleaning the nozzle and build plate if needed " - }, - "machine_end_gcode": - { - "default_value": "M107; \nM104 S0; turn off hotend heater \nM140 S0; turn off bed heater \nG91; Switch to use Relative Coordinates \nG1 E-2 F300; retract the filament a bit before lifting the nozzle to release some of the pressure \nG1 Z5 E-5 F4800; move nozzle up a bit and retract filament even more \nG28 X0; return to home positions so the nozzle is out of the way \nM84; turn off stepper motors \nG90; switch to absolute positioning \nM82; absolute extrusion mode" - }, - "machine_width": { "default_value": 110 }, - "machine_depth": { "default_value": 110 }, - "machine_height": { "default_value": 120 }, - "machine_heated_bed": { "default_value": true }, - "machine_shape": { "default_value": "elliptic" }, - "machine_center_is_zero": { "default_value": true }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "layer_height": { - "default_value": 0.14 - }, - "layer_height_0": { - "default_value": 0.21 - }, - "material_bed_temperature": { "value": 40 }, - "line_width": { "value": "round(machine_nozzle_size, 2)" }, - "material_bed_temperature_layer_0": { "value": "material_bed_temperature" }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_max_feedrate_x": { "default_value": 150 }, - "machine_max_feedrate_y": { "default_value": 150 }, - "machine_max_feedrate_z": { "default_value": 150 }, - "machine_max_feedrate_e": { "default_value": 50 }, - "machine_max_acceleration_x": { "default_value": 800 }, - "machine_max_acceleration_y": { "default_value": 800 }, - "machine_max_acceleration_z": { "default_value": 800 }, - "machine_max_acceleration_e": { "default_value": 10000 }, - "machine_acceleration": { "default_value": 3000 }, - "machine_max_jerk_xy": { "default_value": 20 }, - "machine_max_jerk_z": { "default_value": 20 }, - "machine_max_jerk_e": { "default_value": 5}, - "retraction_amount": { "default_value": 4 }, - "retraction_speed": { "default_value": 50 }, - "retraction_hop_enabled": { "default_value": false }, - "retract_at_layer_change": { "default_value": true }, - "coasting_enable": { "default_value": true } - } -} +{ + "version": 2, + "name": "MP Mini Delta", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "MPMD V1 Facebook Group", + "manufacturer": "Monoprice", + "file_formats": "text/x-gcode", + "platform": "mp_mini_delta_platform.3mf", + "has_machine_materials": false, + "has_machine_quality": false, + "has_materials": true, + "has_variant_materials": false, + "has_variants": false, + "machine_extruder_trains": { "0": "mp_mini_delta_extruder_0" }, + "platform_offset": [ + 0, + 0, + 0 + ], + "preferred_quality_type": "normal", + "supports_usb_connection": true + }, + "overrides": + { + "coasting_enable": { "default_value": true }, + "layer_height": { "default_value": 0.14 }, + "layer_height_0": { "default_value": 0.21 }, + "line_width": { "value": "round(machine_nozzle_size, 2)" }, + "machine_acceleration": { "default_value": 3000 }, + "machine_center_is_zero": { "default_value": true }, + "machine_depth": { "default_value": 110 }, + "machine_end_gcode": { "default_value": "M107; \nM104 S0; turn off hotend heater \nM140 S0; turn off bed heater \nG91; Switch to use Relative Coordinates \nG1 E-2 F300; retract the filament a bit before lifting the nozzle to release some of the pressure \nG1 Z5 E-5 F4800; move nozzle up a bit and retract filament even more \nG28 X0; return to home positions so the nozzle is out of the way \nM84; turn off stepper motors \nG90; switch to absolute positioning \nM82; absolute extrusion mode" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 120 }, + "machine_max_acceleration_e": { "default_value": 10000 }, + "machine_max_acceleration_x": { "default_value": 800 }, + "machine_max_acceleration_y": { "default_value": 800 }, + "machine_max_acceleration_z": { "default_value": 800 }, + "machine_max_feedrate_e": { "default_value": 50 }, + "machine_max_feedrate_x": { "default_value": 150 }, + "machine_max_feedrate_y": { "default_value": 150 }, + "machine_max_feedrate_z": { "default_value": 150 }, + "machine_max_jerk_e": { "default_value": 5 }, + "machine_max_jerk_xy": { "default_value": 20 }, + "machine_max_jerk_z": { "default_value": 20 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "machine_shape": { "default_value": "elliptic" }, + "machine_start_gcode": { "default_value": ";MPMD V1 Basic Calibration Tutorial: \n; https://www.thingiverse.com/thing:3892011 \n; \n; If you want to put calibration values in your \n; Start Gcode, put them here. \n; \n;If on stock firmware, at minimum, consider adding \n;M665 R here since there is a firmware bug. \n; \n; Calibration part ends here \n; \nG90 ; switch to absolute positioning \nG92 E0 ; reset extrusion distance \nG1 E20 F200 ; purge 20mm of filament to prime nozzle. \nG92 E0 ; reset extrusion distance \nG4 S5 ; Pause for 5 seconds to allow time for removing extruded filament \nG28 ; start from home position \nG1 E-6 F900 ; retract 6mm of filament before starting the bed leveling process \nG92 E0 ; reset extrusion distance \nG4 S5 ; pause for 5 seconds to allow time for removing extruded filament \nG29 P2 Z0.28 ; Auto-level ; ADJUST Z higher or lower to set first layer height. Start with 0.02 adjustments. \nG1 Z30 ; raise Z 30mm to prepare for priming the nozzle \nG1 E5 F200 ; extrude 5mm of filament to help prime the nozzle just prior to the start of the print \nG92 E0 ; reset extrusion distance \nG4 S5 ; pause for 5 seconds to allow time for cleaning the nozzle and build plate if needed " }, + "machine_width": { "default_value": 110 }, + "material_bed_temperature": { "value": 40 }, + "material_bed_temperature_layer_0": { "value": "material_bed_temperature" }, + "retract_at_layer_change": { "default_value": true }, + "retraction_amount": { "default_value": 4 }, + "retraction_hop_enabled": { "default_value": false }, + "retraction_speed": { "default_value": 50 } + } +} \ No newline at end of file diff --git a/resources/definitions/mp_mini_delta_v2.def.json b/resources/definitions/mp_mini_delta_v2.def.json index 30c7cb2823..12055a94ca 100644 --- a/resources/definitions/mp_mini_delta_v2.def.json +++ b/resources/definitions/mp_mini_delta_v2.def.json @@ -1,51 +1,46 @@ -{ - "version": 2, - "name": "MP Mini Delta V2", - "inherits": "fdmprinter", - "metadata": { - "author": "mpminidelta subreddit", - "manufacturer": "Monoprice", - "file_formats": "text/x-gcode", - "platform": "mp_mini_delta_platform.3mf", - "supports_usb_connection": true, - "has_machine_quality": false, - "visible": true, - "platform_offset": [0, 0, 0], - "has_materials": true, - "has_variants": false, - "has_machine_materials": false, - "has_variant_materials": false, - "preferred_quality_type": "normal", - "machine_extruder_trains": - { - "0": "mp_mini_delta_v2_extruder_0" - } - }, - - "overrides": { - "machine_start_gcode": - { - "default_value": ";(**** start.gcode for MP Mini Delta V2****)\nG21\nG90\nM82\nM107\nM104 S170\nG28 X0 Y0\nG28 Z0\nG29 Z0.4\nG1 Z15 F300\nM109 S{material_print_temperature_layer_0}\nG92 E0\nG1 F200 E3\nG92 E0\nG1 F2000\n" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for MP Mini Delta V2****)\nG28;(Stick out the part)\nM190 S0;(Turn off heat bed, don't wait.)\nG92 E10;(Set extruder to 10)\nG1 E7 F200;(retract 3mm)\nM104 S0;(Turn off nozzle, don't wait)\nG4 S300;(Delay 5 minutes)\nM107;(Turn off part fan)\nM84;(Turn off stepper motors.)" - }, - "material_print_temp_prepend":{"default_value":false}, - "material_bed_temperature": { "value": 40 }, - "machine_width": { "default_value": 110 }, - "machine_depth": { "default_value": 110 }, - "machine_height": { "default_value": 120 }, - "machine_heated_bed": { "default_value": true }, - "machine_shape": { "default_value": "elliptic" }, - "machine_center_is_zero": { "default_value": true }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "line_width": { "value": "round(machine_nozzle_size, 2)" }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "retraction_amount": { "default_value": 5 }, - "retraction_speed": { "default_value": 28 }, - "retraction_hop_enabled": { "default_value": false }, - "retract_at_layer_change": { "default_value": true } - } -} +{ + "version": 2, + "name": "MP Mini Delta V2", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "mpminidelta subreddit", + "manufacturer": "Monoprice", + "file_formats": "text/x-gcode", + "platform": "mp_mini_delta_platform.3mf", + "has_machine_materials": false, + "has_machine_quality": false, + "has_materials": true, + "has_variant_materials": false, + "has_variants": false, + "machine_extruder_trains": { "0": "mp_mini_delta_v2_extruder_0" }, + "platform_offset": [ + 0, + 0, + 0 + ], + "preferred_quality_type": "normal", + "supports_usb_connection": true + }, + "overrides": + { + "line_width": { "value": "round(machine_nozzle_size, 2)" }, + "machine_center_is_zero": { "default_value": true }, + "machine_depth": { "default_value": 110 }, + "machine_end_gcode": { "default_value": ";(**** end.gcode for MP Mini Delta V2****)\nG28;(Stick out the part)\nM190 S0;(Turn off heat bed, don't wait.)\nG92 E10;(Set extruder to 10)\nG1 E7 F200;(retract 3mm)\nM104 S0;(Turn off nozzle, don't wait)\nG4 S300;(Delay 5 minutes)\nM107;(Turn off part fan)\nM84;(Turn off stepper motors.)" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 120 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "machine_shape": { "default_value": "elliptic" }, + "machine_start_gcode": { "default_value": ";(**** start.gcode for MP Mini Delta V2****)\nG21\nG90\nM82\nM107\nM104 S170\nG28 X0 Y0\nG28 Z0\nG29 Z0.4\nG1 Z15 F300\nM109 S{material_print_temperature_layer_0}\nG92 E0\nG1 F200 E3\nG92 E0\nG1 F2000\n" }, + "machine_width": { "default_value": 110 }, + "material_bed_temperature": { "value": 40 }, + "material_print_temp_prepend": { "default_value": false }, + "retract_at_layer_change": { "default_value": true }, + "retraction_amount": { "default_value": 5 }, + "retraction_hop_enabled": { "default_value": false }, + "retraction_speed": { "default_value": 28 } + } +} \ No newline at end of file diff --git a/resources/definitions/nps.def.json b/resources/definitions/nps.def.json index b6f0bfffe8..633cf86b77 100644 --- a/resources/definitions/nps.def.json +++ b/resources/definitions/nps.def.json @@ -1,54 +1,61 @@ -{ - "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" - } - } -} +{ + "version": 2, + "name": "nps", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Naxe", + "manufacturer": "Naxe", + "file_formats": "text/x-gcode", + "platform": "npscura.stl", + "has_machine_quality": true, + "has_materials": true, + "machine_extruder_trains": { "0": "nps_extruder_0" }, + "platform_offset": [ + -212, + -83, + 215 + ] + }, + "overrides": + { + "adhesion_type": { "default_value": "none" }, + "fill_outline_gaps": { "default_value": true }, + "infill_sparse_density": { "default_value": 25 }, + "layer_height": { "default_value": 0.1 }, + "layer_height_0": { "default_value": 0.2 }, + "machine_acceleration": { "default_value": 1000 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 300 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84\n" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-38, 30], + [38, 30], + [38, -40], + [-38, -40] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 300 }, + "machine_max_acceleration_z": { "default_value": 500 }, + "machine_max_feedrate_e": { "default_value": 60 }, + "machine_max_feedrate_z": { "default_value": 20 }, + "machine_max_jerk_e": { "default_value": 5 }, + "machine_max_jerk_xy": { "default_value": 12 }, + "machine_max_jerk_z": { "default_value": 0.5 }, + "machine_name": { "default_value": "NAXE NP-S" }, + "machine_nozzle_size": { "default_value": 0.4 }, + "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_width": { "default_value": 300 }, + "material_diameter": { "default_value": 1.75 }, + "retract_at_layer_change": { "default_value": true }, + "retraction_amount": { "default_value": 0.2 }, + "retraction_combing_max_distance": { "default_value": 200 }, + "retraction_speed": { "default_value": 45 } + } +} \ No newline at end of file diff --git a/resources/definitions/nwa3d_a31.def.json b/resources/definitions/nwa3d_a31.def.json index fef44ac16b..5ab4fb1bfe 100644 --- a/resources/definitions/nwa3d_a31.def.json +++ b/resources/definitions/nwa3d_a31.def.json @@ -1,40 +1,35 @@ { - "name": "Nwa3D A31", "version": 2, + "name": "Nwa3D A31", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "DragonJe", "manufacturer": "Nwa 3D LLC", "file_formats": "text/x-gcode", - "platform_offset": [0, 0, 0], + "has_machine_quality": true, "has_materials": true, "has_variants": true, - "variants_name": "Nozzle Size", - "preferred_variant_name": "Standard 0.4mm", - "preferred_quality_type": "normal", - "has_machine_quality": true, + "machine_extruder_trains": { "0": "nwa3d_a31_extruder_0" }, + "platform_offset": [ + 0, + 0, + 0 + ], "preferred_material": "generic_pla", - "machine_extruder_trains": - { - "0": "nwa3d_a31_extruder_0" - } + "preferred_quality_type": "normal", + "preferred_variant_name": "Standard 0.4mm", + "variants_name": "Nozzle Size" }, - - "overrides": { - "machine_name": { - "default_value": "NWA3D A31" - }, - "machine_width": { - "default_value": 300 - }, - "machine_height": { - "default_value": 400 - }, - "machine_depth": { - "default_value": 300 - }, - "machine_head_with_fans_polygon": { + "overrides": + { + "gantry_height": { "value": "30" }, + "machine_depth": { "default_value": 300 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\n ; Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { "default_value": [ [-30, 34], [-30, -32], @@ -42,23 +37,11 @@ [30, 34] ] }, - "gantry_height": { - "value": "30" - }, - "machine_heated_bed": { - "default_value": true - }, - "material_diameter": { - "default_value": 1.75 - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G28 ; Home\nG1 Z15.0 F6000 ; Move Z axis up 15mm\n ; Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" - }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\n ; Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "NWA3D A31" }, + "machine_start_gcode": { "default_value": "G28 ; Home\nG1 Z15.0 F6000 ; Move Z axis up 15mm\n ; Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" }, + "machine_width": { "default_value": 300 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/definitions/nwa3d_a5.def.json b/resources/definitions/nwa3d_a5.def.json index 8c6b53b81e..047b47b2fb 100644 --- a/resources/definitions/nwa3d_a5.def.json +++ b/resources/definitions/nwa3d_a5.def.json @@ -1,38 +1,33 @@ { - "name": "Nwa3D A5", "version": 2, + "name": "Nwa3D A5", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "DragonJe", "manufacturer": "Nwa 3D LLC", "file_formats": "text/x-gcode", - "platform_offset": [0, 0, 0], + "has_machine_quality": true, "has_materials": true, "has_variants": false, - "preferred_quality_type": "normal", - "has_machine_quality": true, + "machine_extruder_trains": { "0": "nwa3d_a5_extruder_0" }, + "platform_offset": [ + 0, + 0, + 0 + ], "preferred_material": "generic_pla", - "machine_extruder_trains": - { - "0": "nwa3d_a5_extruder_0" - } + "preferred_quality_type": "normal" }, - - "overrides": { - "machine_name": { - "default_value": "NWA3D A5" - }, - "machine_width": { - "default_value": 125 - }, - "machine_height": { - "default_value": 100 - }, - "machine_depth": { - "default_value": 150 - }, - "machine_head_with_fans_polygon": { + "overrides": + { + "gantry_height": { "value": "30" }, + "machine_depth": { "default_value": 150 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\n ; Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" }, + "machine_gcode_flavor": { "default_value": "RepRap (RepRap)" }, + "machine_head_with_fans_polygon": + { "default_value": [ [-30, 34], [-30, -32], @@ -40,23 +35,11 @@ [30, 34] ] }, - "gantry_height": { - "value": "30" - }, - "machine_heated_bed": { - "default_value": false - }, - "material_diameter": { - "default_value": 1.75 - }, - "machine_gcode_flavor": { - "default_value": "RepRap (RepRap)" - }, - "machine_start_gcode": { - "default_value": "G28 ; Home\nG1 Z15.0 F6000 ; Move Z axis up 15mm\n ; Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" - }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\n ; Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" - } + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 100 }, + "machine_name": { "default_value": "NWA3D A5" }, + "machine_start_gcode": { "default_value": "G28 ; Home\nG1 Z15.0 F6000 ; Move Z axis up 15mm\n ; Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" }, + "machine_width": { "default_value": 125 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/definitions/ord.def.json b/resources/definitions/ord.def.json index 0701133e54..d059ad0c82 100644 --- a/resources/definitions/ord.def.json +++ b/resources/definitions/ord.def.json @@ -1,8 +1,9 @@ { - "name": "RoVa3D", "version": 2, + "name": "RoVa3D", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "manufacturer": "ORD Solutions", "file_formats": "text/x-gcode", @@ -14,20 +15,24 @@ "3": "ord_extruder_3", "4": "ord_extruder_4" }, - "platform_offset": [ 0, 0, 0] + "platform_offset": [ + 0, + 0, + 0 + ] }, - - "overrides": { - "prime_tower_size": { "default_value": 7.0710678118654755 }, + "overrides": + { "infill_sparse_density": { "default_value": 15 }, "layer_height": { "default_value": 0.3 }, - "machine_extruder_count": { "default_value": 5 }, - "machine_heated_bed": { "default_value": true }, "machine_center_is_zero": { "default_value": false }, - "machine_height": { "default_value": 200 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_depth": { "default_value": 250 }, + "machine_extruder_count": { "default_value": 5 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 200 }, + "machine_name": { "default_value": "RoVa3D" }, "machine_width": { "default_value": 215 }, - "machine_name": { "default_value": "RoVa3D" } + "prime_tower_size": { "default_value": 7.0710678118654755 } } -} +} \ No newline at end of file diff --git a/resources/definitions/pbr3d_g1.def.json b/resources/definitions/pbr3d_g1.def.json index fbe1d5bfc6..a344047772 100644 --- a/resources/definitions/pbr3d_g1.def.json +++ b/resources/definitions/pbr3d_g1.def.json @@ -2,44 +2,30 @@ "version": 2, "name": "PBR 3D Gen-I", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Kapil H. Sonone, Prof. Bahubali P. Fuladi", "manufacturer": "PBR Research", "file_formats": "text/x-gcode", "platform": "pbr3d_g1_buildplate.stl", - "platform_offset": [0, -5, 0], - "machine_extruder_trains": - { - "0": "pbr3d_g1_extruder_0" - } + "machine_extruder_trains": { "0": "pbr3d_g1_extruder_0" }, + "platform_offset": [ + 0, + -5, + 0 + ] }, - - "overrides": { + "overrides": + { + "gantry_height": { "value": "200" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\n;Retract the Filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 200 }, "machine_name": { "default_value": "PBR 3D Gen-I" }, - "machine_heated_bed": { - "default_value": true - }, - "machine_width": { - "default_value": 200 - }, - "machine_height": { - "default_value": 200 - }, - "machine_depth": { - "default_value": 200 - }, - "machine_center_is_zero": { - "default_value": false - }, - "gantry_height": { - "value": "200" - }, - "machine_start_gcode": { - "default_value": "G28 ;Home\nG1 Z15.0 F6000 ;Move the Platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" - }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\n;Retract the Filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" - } + "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F6000 ;Move the Platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" }, + "machine_width": { "default_value": 200 } } -} +} \ No newline at end of file diff --git a/resources/definitions/peopoly_moai.def.json b/resources/definitions/peopoly_moai.def.json index cbc668dc74..9ce1438fe3 100644 --- a/resources/definitions/peopoly_moai.def.json +++ b/resources/definitions/peopoly_moai.def.json @@ -2,264 +2,184 @@ "version": 2, "name": "Peopoly Moai", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Peopoly", "manufacturer": "Peopoly", "file_formats": "text/x-gcode", + "platform": "moai.obj", "has_machine_quality": true, "has_materials": false, - "platform": "moai.obj", - "platform_texture": "moai.jpg", - "machine_extruder_trains": { - "0": "peopoly_moai_extruder_0" - } + "machine_extruder_trains": { "0": "peopoly_moai_extruder_0" }, + "platform_texture": "moai.jpg" }, - - "overrides": { - "machine_name": { - "default_value": "Moai" - }, - "machine_width": { - "default_value": 130 - }, - "machine_height": { - "default_value": 180 - }, - "machine_depth": { - "default_value": 130 - }, - "machine_head_with_fans_polygon": + "overrides": + { + "acceleration_enabled": { - "default_value": [ - [ -20, 10 ], - [ -20, -10 ], - [ 10, 10 ], - [ 10, -10 ] - ] + "enabled": false, + "value": "False" }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" + "adaptive_layer_height_enabled": + { + "enabled": false, + "value": "False" }, - "machine_start_gcode": { - "default_value": "G28 ;Home" + "adhesion_type": { "value": "'none'" }, + "bottom_thickness": { "minimum_value_warning": "resolveOrValue('layer_height')" }, + "bridge_settings_enabled": + { + "enabled": false, + "value": "False" }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\nG28 X0 Y0\nM84" + "coasting_enable": + { + "enabled": false, + "value": "False" }, - "line_width": { - "minimum_value_warning": "machine_nozzle_size" + "cool_fan_enabled": + { + "enabled": false, + "value": "False" }, - "wall_line_width": { - "minimum_value_warning": "machine_nozzle_size" + "cool_fan_full_at_height": { "enabled": false }, + "cool_fan_full_layer": { "enabled": false }, + "cool_fan_speed_min": + { + "enabled": false, + "value": 0 }, - "wall_line_width_x": { - "minimum_value_warning": "machine_nozzle_size" + "cool_lift_head": + { + "enabled": false, + "value": "False" }, - "skin_line_width": { - "minimum_value_warning": "machine_nozzle_size" + "cool_min_layer_time": + { + "enabled": false, + "value": 0 }, - "infill_line_width": { - "minimum_value_warning": "machine_nozzle_size" + "cool_min_layer_time_fan_speed_max": { "enabled": false }, + "cool_min_speed": + { + "enabled": false, + "value": 0 }, - "skirt_brim_line_width": { - "minimum_value_warning": "machine_nozzle_size" + "draft_shield_enabled": + { + "enabled": false, + "value": "False" }, - "layer_height": { + "expand_skins_expand_distance": { "value": "( wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x ) / 2" }, + "flow_rate_extrusion_offset_factor": { "enabled": false }, + "flow_rate_max_extrusion_offset": { "enabled": false }, + "infill_angles": { "value": "[0, 90]" }, + "infill_line_width": { "minimum_value_warning": "machine_nozzle_size" }, + "infill_overlap": { "value": 15 }, + "infill_pattern": { "value": "'lines'" }, + "infill_sparse_density": { "value": 70 }, + "infill_sparse_thickness": { "maximum_value_warning": "0.5" }, + "infill_wipe_dist": { "value": 0 }, + "ironing_enabled": + { + "enabled": false, + "value": "False" + }, + "layer_height": + { "maximum_value_warning": "0.5", "minimum_value_warning": "0.02" }, - "layer_height_0": { + "layer_height_0": + { "maximum_value_warning": "0.5", "minimum_value_warning": "0.02", "value": "0.1" }, - "top_bottom_thickness": { - "minimum_value_warning": "0.1", - "value": "0.1" + "line_width": { "minimum_value_warning": "machine_nozzle_size" }, + "machine_depth": { "default_value": 130 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG28 X0 Y0\nM84" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-20, 10], + [-20, -10], + [10, 10], + [10, -10] + ] }, - "top_thickness": { - "minimum_value_warning": "resolveOrValue('layer_height')" - }, - "bottom_thickness": { - "minimum_value_warning": "resolveOrValue('layer_height')" - }, - "infill_sparse_thickness": { - "maximum_value_warning": "0.5" - }, - "speed_print": { - "maximum_value_warning": "300" - }, - "speed_infill": { - "maximum_value_warning": "300" - }, - "speed_wall": { - "maximum_value_warning": "300", - "value": "speed_print" - }, - "speed_wall_0": { - "maximum_value_warning": "300" - }, - "speed_wall_x": { - "maximum_value_warning": "300", - "value": "speed_print" - }, - "speed_topbottom": { - "maximum_value_warning": "300", - "value": "speed_print" - }, - "speed_travel": { - "value": 150 - }, - "speed_travel_layer_0": { - "value": 150 - }, - "speed_layer_0": { - "value": 5 - }, - "speed_slowdown_layers": { - "value": 3 - }, - "infill_overlap": { - "value": 15 - }, - "adhesion_type": { - "value": "'none'" - }, - "print_sequence": { - "enabled": false - }, - "support_enable": { - "enabled": false - }, - "machine_nozzle_temp_enabled": { - "value": "False" - }, - "material_bed_temperature": { - "enabled": false - }, - "cool_fan_enabled": { + "machine_height": { "default_value": 180 }, + "machine_name": { "default_value": "Moai" }, + "machine_nozzle_temp_enabled": { "value": "False" }, + "machine_start_gcode": { "default_value": "G28 ;Home" }, + "machine_width": { "default_value": 130 }, + "material_bed_temperature": { "enabled": false }, + "material_flow": { "enabled": false }, + "material_flow_layer_0": { "enabled": false }, + "meshfix_maximum_deviation": { "value": "0.002" }, + "minimum_polygon_circumference": { "value": "0.1" }, + "print_sequence": { "enabled": false }, + "relative_extrusion": + { "enabled": false, "value": "False" }, - "cool_fan_speed_min": { - "enabled": false, - "value": 0 - }, - "retraction_enable": { - "enabled": false, - "value": "False" - }, - "retraction_combing": { - "enabled": false, - "value": "'off'" - }, - "retract_at_layer_change": { + "retract_at_layer_change": + { "enabled": false, "value": false }, - "cool_min_layer_time_fan_speed_max": { - "enabled": false + "retraction_combing": + { + "enabled": false, + "value": "'off'" }, - "cool_fan_full_at_height": { - "enabled": false + "retraction_enable": + { + "enabled": false, + "value": "False" }, - "cool_fan_full_layer": { - "enabled": false + "skin_line_width": { "minimum_value_warning": "machine_nozzle_size" }, + "skin_no_small_gaps_heuristic": { "value": "False" }, + "skin_outline_count": { "value": 0 }, + "skin_overlap": { "value": 5 }, + "skirt_brim_line_width": { "minimum_value_warning": "machine_nozzle_size" }, + "speed_infill": { "maximum_value_warning": "300" }, + "speed_layer_0": { "value": 5 }, + "speed_print": { "maximum_value_warning": "300" }, + "speed_slowdown_layers": { "value": 3 }, + "speed_topbottom": + { + "maximum_value_warning": "300", + "value": "speed_print" }, - "minimum_polygon_circumference": { + "speed_travel": { "value": 150 }, + "speed_travel_layer_0": { "value": 150 }, + "speed_wall": + { + "maximum_value_warning": "300", + "value": "speed_print" + }, + "speed_wall_0": { "maximum_value_warning": "300" }, + "speed_wall_x": + { + "maximum_value_warning": "300", + "value": "speed_print" + }, + "support_enable": { "enabled": false }, + "top_bottom_thickness": + { + "minimum_value_warning": "0.1", "value": "0.1" }, - "meshfix_maximum_deviation": { - "value": "0.002" - }, - "skin_outline_count": { - "value": 0 - }, - "wall_0_wipe_dist": { - "value": "machine_nozzle_size / 3" - }, - "wall_thickness": { - "value": "0.5" - }, - "infill_sparse_density": { - "value": 70 - }, - "infill_pattern": { - "value": "'lines'" - }, - "infill_angles": { - "value": "[0,90]" - }, - "cool_min_layer_time": { - "enabled": false, - "value": 0 - }, - "cool_min_speed": { - "enabled": false, - "value": 0 - }, - "cool_lift_head": { - "enabled": false, - "value": "False" - }, - "material_flow": { - "enabled": false - }, - "material_flow_layer_0": { - "enabled": false - }, - "draft_shield_enabled": { - "enabled": false, - "value": "False" - }, - "z_seam_corner": { - "value": "'z_seam_corner_none'" - }, - "z_seam_type": { - "value": "'shortest'" - }, - "skin_no_small_gaps_heuristic": { - "value": "False" - }, - "ironing_enabled": { - "enabled": false, - "value": "False" - }, - "skin_overlap": { - "value": 5 - }, - "infill_wipe_dist": { - "value": 0 - }, - "expand_skins_expand_distance": { - "value": "( wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x ) / 2" - }, - "flow_rate_max_extrusion_offset": { - "enabled": false - }, - "flow_rate_extrusion_offset_factor": { - "enabled": false - }, - "adaptive_layer_height_enabled": { - "value": "False", - "enabled": false - }, - "bridge_settings_enabled": { - "value": "False", - "enabled": false - }, - "acceleration_enabled": { - "value": "False", - "enabled": false - }, - "relative_extrusion": { - "value": "False", - "enabled": false - }, - "coasting_enable": { - "value": "False", - "enabled": false - } + "top_thickness": { "minimum_value_warning": "resolveOrValue('layer_height')" }, + "wall_0_wipe_dist": { "value": "machine_nozzle_size / 3" }, + "wall_line_width": { "minimum_value_warning": "machine_nozzle_size" }, + "wall_line_width_x": { "minimum_value_warning": "machine_nozzle_size" }, + "wall_thickness": { "value": "0.5" }, + "z_seam_corner": { "value": "'z_seam_corner_none'" }, + "z_seam_type": { "value": "'shortest'" } } -} +} \ No newline at end of file diff --git a/resources/definitions/predator.def.json b/resources/definitions/predator.def.json index a8f4e56fe1..95f517d8d7 100644 --- a/resources/definitions/predator.def.json +++ b/resources/definitions/predator.def.json @@ -1,72 +1,67 @@ -{ - "version": 2, - "name": "Anycubic Predator", - "inherits": "fdmprinter", - "metadata": { - "author": "ksihota", - "manufacturer": "Anycubic", - "file_formats": "text/x-gcode", - "platform": "predator_platform.stl", - "platform_texture": "anycubic_predator.png", - "supports_usb_connection": true, - "visible": true, - "platform_offset": [0, 0, 0], - "has_materials": true, - "has_variants": false, - "has_machine_materials": false, - "has_variant_materials": false, - "has_machine_quality": true, - "quality_definition": "predator", - "preferred_quality_type": "normal", - "machine_extruder_trains": - { - "0": "predator_extruder_0" - } - }, - - "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 ;Home \nG1 Z15.0 F1000;short move \nG92 E0 ;zero the extruded length \nG1 F200 E3 ;extrude 3mm of feed stock adjust so I don't have to remove any filament \nG92 E0 ;zero the extruded length again \nG1 F4000 ;move to bed \n;Put printing message on LCD screen \nM117 Printing... \n;G5; this is in order to resume on Power failure (only works on SD prints)" - }, - "machine_end_gcode": - { - "default_value": "M104 S0 ;extruder heater off \nM140 S0 ;heated bed heater off \nG91 ;relative positioning \nG92 E0 ;zero the extruded length \nG1 E-2 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure \nG92 E0 ;zero the extruded length \n;M107 ;fan off \nG1 Z+0.5 E-5 ;move Z up a bit and retract filament even more \n;G1 X0.0 Y0.0 Z455.0 F4500 \nG28 ;Home all axes (max endstops) \nG90 ;absolute positioning \n;M109 S60 ; wait for extruder temp to drop to 60 \n;M84 ;steppers off \n;M81 ;turn off printer" - }, - "gantry_height": { - "value": 455 - }, - "machine_width": { "default_value": 370 }, - "machine_depth": { "default_value": 370 }, - "machine_height": { "default_value": 455 }, - "machine_heated_bed": { "default_value": true }, - "machine_shape": { "default_value": "elliptic" }, - "machine_center_is_zero": { "default_value": true }, - "machine_nozzle_size": { - "default_value": 0.4, - "minimum_value": 0.15, - "maximum_value": 0.80 - }, - "line_width": { "value": "round(machine_nozzle_size * 0.875, 2)" }, - "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" }, - "material_bed_temperature_layer_0": { "value": "material_bed_temperature + 5" }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_max_feedrate_x": { "default_value": 150 }, - "machine_max_feedrate_y": { "default_value": 150 }, - "machine_max_feedrate_z": { "default_value": 150 }, - "machine_max_feedrate_e": { "default_value": 50 }, - "machine_max_acceleration_x": { "default_value": 800 }, - "machine_max_acceleration_y": { "default_value": 800 }, - "machine_max_acceleration_z": { "default_value": 800 }, - "machine_max_acceleration_e": { "default_value": 10000 }, - "machine_acceleration": { "default_value": 3000 }, - "machine_max_jerk_xy": { "default_value": 20 }, - "machine_max_jerk_z": { "default_value": 20 }, - "machine_max_jerk_e": { "default_value": 5}, - "retraction_amount": { "default_value": 4 }, - "retraction_speed": { "default_value": 50 }, - "retraction_hop_enabled": { "default_value": false }, - "retract_at_layer_change": { "default_value": true }, - "coasting_enable": { "default_value": true } - } +{ + "version": 2, + "name": "Anycubic Predator", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "ksihota", + "manufacturer": "Anycubic", + "file_formats": "text/x-gcode", + "platform": "predator_platform.stl", + "has_machine_materials": false, + "has_machine_quality": true, + "has_materials": true, + "has_variant_materials": false, + "has_variants": false, + "machine_extruder_trains": { "0": "predator_extruder_0" }, + "platform_offset": [ + 0, + 0, + 0 + ], + "platform_texture": "anycubic_predator.png", + "preferred_quality_type": "normal", + "quality_definition": "predator", + "supports_usb_connection": true + }, + "overrides": + { + "coasting_enable": { "default_value": true }, + "gantry_height": { "value": 455 }, + "line_width": { "value": "round(machine_nozzle_size * 0.875, 2)" }, + "machine_acceleration": { "default_value": 3000 }, + "machine_center_is_zero": { "default_value": true }, + "machine_depth": { "default_value": 370 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off \nM140 S0 ;heated bed heater off \nG91 ;relative positioning \nG92 E0 ;zero the extruded length \nG1 E-2 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure \nG92 E0 ;zero the extruded length \n;M107 ;fan off \nG1 Z+0.5 E-5 ;move Z up a bit and retract filament even more \n;G1 X0.0 Y0.0 Z455.0 F4500 \nG28 ;Home all axes (max endstops) \nG90 ;absolute positioning \n;M109 S60 ; wait for extruder temp to drop to 60 \n;M84 ;steppers off \n;M81 ;turn off printer" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 455 }, + "machine_max_acceleration_e": { "default_value": 10000 }, + "machine_max_acceleration_x": { "default_value": 800 }, + "machine_max_acceleration_y": { "default_value": 800 }, + "machine_max_acceleration_z": { "default_value": 800 }, + "machine_max_feedrate_e": { "default_value": 50 }, + "machine_max_feedrate_x": { "default_value": 150 }, + "machine_max_feedrate_y": { "default_value": 150 }, + "machine_max_feedrate_z": { "default_value": 150 }, + "machine_max_jerk_e": { "default_value": 5 }, + "machine_max_jerk_xy": { "default_value": 20 }, + "machine_max_jerk_z": { "default_value": 20 }, + "machine_nozzle_size": + { + "default_value": 0.4, + "maximum_value": 0.8, + "minimum_value": 0.15 + }, + "machine_shape": { "default_value": "elliptic" }, + "machine_start_gcode": { "default_value": "G21 ;metric values \nG90 ;absolute positioning \nM82 ;set extruder to absolute mode \nM107 ;start with the fan off \nG28 ;Home \nG1 Z15.0 F1000;short move \nG92 E0 ;zero the extruded length \nG1 F200 E3 ;extrude 3mm of feed stock adjust so I don't have to remove any filament \nG92 E0 ;zero the extruded length again \nG1 F4000 ;move to bed \n;Put printing message on LCD screen \nM117 Printing... \n;G5; this is in order to resume on Power failure (only works on SD prints)" }, + "machine_width": { "default_value": 370 }, + "material_bed_temperature_layer_0": { "value": "material_bed_temperature + 5" }, + "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" }, + "retract_at_layer_change": { "default_value": true }, + "retraction_amount": { "default_value": 4 }, + "retraction_hop_enabled": { "default_value": false }, + "retraction_speed": { "default_value": 50 } + } } \ No newline at end of file diff --git a/resources/definitions/printrbot_play.def.json b/resources/definitions/printrbot_play.def.json index b1f7e72967..6f57c8a291 100644 --- a/resources/definitions/printrbot_play.def.json +++ b/resources/definitions/printrbot_play.def.json @@ -2,50 +2,52 @@ "version": 2, "name": "Printrbot Play", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Chris Pearson", "manufacturer": "Printrbot", "file_formats": "text/x-gcode", "platform": "printrbot_play.3mf", - "machine_extruder_trains": - { - "0": "printrbot_play_extruder_0" - } + "machine_extruder_trains": { "0": "printrbot_play_extruder_0" } }, - - "overrides": { - "machine_name": { "default_value": "Printrbot Play" }, - "machine_heated_bed": { "default_value": false }, - "machine_width": { "default_value": 100 }, - "machine_depth": { "default_value": 100 }, - "machine_height": { "default_value": 130 }, - "machine_center_is_zero": { "default_value": false }, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "gantry_height": { "value": "55" }, "layer_height": { "default_value": 0.2 }, "layer_height_0": { "default_value": 0.3 }, - "retraction_amount": { "default_value": 0.7 }, - "retraction_speed": { "default_value": 45}, - "adhesion_type": { "default_value": "skirt" }, - "machine_head_with_fans_polygon": { "default_value": [[-32,999],[37,999],[37,-32],[-32,-32]] }, - "gantry_height": { "value": "55" }, - "speed_print": { "default_value": 50 }, - "machine_max_feedrate_x": {"default_value": 125}, - "machine_max_feedrate_y": {"default_value": 125}, - "machine_max_feedrate_z": { "default_value": 5 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 100 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\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_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-32, 999], + [37, 999], + [37, -32], + [-32, -32] + ] + }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 130 }, + "machine_max_acceleration_e": { "default_value": 10000 }, "machine_max_acceleration_x": { "default_value": 2000 }, "machine_max_acceleration_y": { "default_value": 2000 }, "machine_max_acceleration_z": { "default_value": 30 }, - "machine_max_acceleration_e": { "default_value": 10000 }, + "machine_max_feedrate_x": { "default_value": 125 }, + "machine_max_feedrate_y": { "default_value": 125 }, + "machine_max_feedrate_z": { "default_value": 5 }, + "machine_max_jerk_e": { "default_value": 5.0 }, "machine_max_jerk_xy": { "default_value": 20 }, "machine_max_jerk_z": { "default_value": 0.4 }, - "machine_max_jerk_e": { "default_value": 5.0 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM106 ;start with the fan on for filament cooling\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG29 ;run auto bed leveling\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\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" - }, - "speed_z_hop": {"default_value": 5} + "machine_name": { "default_value": "Printrbot Play" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM106 ;start with the fan on for filament cooling\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG29 ;run auto bed leveling\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, + "machine_width": { "default_value": 100 }, + "retraction_amount": { "default_value": 0.7 }, + "retraction_speed": { "default_value": 45 }, + "speed_print": { "default_value": 50 }, + "speed_z_hop": { "default_value": 5 } } -} +} \ No newline at end of file diff --git a/resources/definitions/printrbot_play_heated.def.json b/resources/definitions/printrbot_play_heated.def.json index 7987f55010..846f2466a1 100644 --- a/resources/definitions/printrbot_play_heated.def.json +++ b/resources/definitions/printrbot_play_heated.def.json @@ -2,20 +2,18 @@ "version": 2, "name": "Printrbot Play (Heated Bed)", "inherits": "printrbot_play", - "metadata": { + "metadata": + { "visible": true, "author": "Chris Pearson", "manufacturer": "Printrbot", "file_formats": "text/x-gcode", - "machine_extruder_trains": - { - "0": "printrbot_play_heated_extruder_0" - } + "machine_extruder_trains": { "0": "printrbot_play_heated_extruder_0" } }, - - "overrides": { - "machine_name": { "default_value": "Printrbot Play (Heated Bed)" }, + "overrides": + { + "machine_depth": { "default_value": 203 }, "machine_heated_bed": { "default_value": true }, - "machine_depth": { "default_value": 203 } + "machine_name": { "default_value": "Printrbot Play (Heated Bed)" } } -} +} \ No newline at end of file diff --git a/resources/definitions/printrbot_simple.def.json b/resources/definitions/printrbot_simple.def.json index 23e60561ba..24d4de7da0 100644 --- a/resources/definitions/printrbot_simple.def.json +++ b/resources/definitions/printrbot_simple.def.json @@ -1,28 +1,29 @@ { - "version": 2, + "version": 2, "name": "Printrbot Simple", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Calvindog717", "manufacturer": "Printrbot", - "platform": "printrbot_simple_metal_platform.3mf", - "platform_offset": [0, -3.45, 0], "file_formats": "text/x-gcode", - "machine_extruder_trains": - { - "0": "printrbot_simple_extruder_0" - } + "platform": "printrbot_simple_metal_platform.3mf", + "machine_extruder_trains": { "0": "printrbot_simple_extruder_0" }, + "platform_offset": [ + 0, + -3.45, + 0 + ] }, - - "overrides": { - "machine_name": { "default_value": "Printrbot Simple" }, - "machine_heated_bed": { "default_value": false }, - "machine_width": { "default_value": 150 }, - "machine_height": { "default_value": 150 }, - "machine_depth": { "default_value": 140 }, + "overrides": + { "machine_center_is_zero": { "default_value": false }, - "machine_head_with_fans_polygon": { + "machine_depth": { "default_value": 140 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nM106 S0 ;fan off\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit\nG1 Z+1 E-5 F9000 ;move Z up a bit and retract even more\nG28 X0 Y0 ;home X/Y, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { "default_value": [ [-49, 20], [-49, -99999], @@ -30,13 +31,10 @@ [55, -99999] ] }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;home X/Y\nG28 Z0 ;home Z\nG92 E0 ;zero the extruded length\nG29 ;initiate auto bed leveling sequence" - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nM106 S0 ;fan off\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit\nG1 Z+1 E-5 F9000 ;move Z up a bit and retract even more\nG28 X0 Y0 ;home X/Y, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" - } + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 150 }, + "machine_name": { "default_value": "Printrbot Simple" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;home X/Y\nG28 Z0 ;home Z\nG92 E0 ;zero the extruded length\nG29 ;initiate auto bed leveling sequence" }, + "machine_width": { "default_value": 150 } } -} +} \ No newline at end of file diff --git a/resources/definitions/printrbot_simple_extended.def.json b/resources/definitions/printrbot_simple_extended.def.json index 433256b5f9..7cef98f274 100644 --- a/resources/definitions/printrbot_simple_extended.def.json +++ b/resources/definitions/printrbot_simple_extended.def.json @@ -1,43 +1,41 @@ { - "version": 2, + "version": 2, "name": "Printrbot Simple Metal Extended", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "samsector", "manufacturer": "Printrbot", - "platform": "printrbot_simple_metal_upgrade.3mf", - "platform_offset": [0, -0.3, 0], "file_formats": "text/x-gcode", - "machine_extruder_trains": - { - "0": "printrbot_simple_extended_extruder_0" - } + "platform": "printrbot_simple_metal_upgrade.3mf", + "machine_extruder_trains": { "0": "printrbot_simple_extended_extruder_0" }, + "platform_offset": [ + 0, + -0.3, + 0 + ] }, - - "overrides": { - "machine_name": { "default_value": "Printrbot Simple Metal Extended" }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 250 }, - "machine_height": { "default_value": 235 }, - "machine_depth": { "default_value": 150 }, + "overrides": + { + "gantry_height": { "value": "99999" }, "machine_center_is_zero": { "default_value": false }, - "machine_head_with_fans_polygon": { + "machine_depth": { "default_value": 150 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nM106 S0 ;fan off\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit\nG1 Z+1 E-5 F9000 ;move Z up a bit and retract even more\nG28 X0 Y0 ;home X/Y, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { "default_value": [ - [ 55, -20 ], - [ 55, 99999 ], - [ -49, 99999 ], - [ -49, -20 ] + [55, -20], + [55, 99999], + [-49, 99999], + [-49, -20] ] }, - "gantry_height": { "value": "99999" }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM106 ;start with the fan on\nG28 X0 Y0 ;home X/Y\nG28 Z0 ;home Z\nG92 E0 ;zero the extruded length\nG29 ;initiate auto bed leveling sequence\n;start cleaning sequance\nG1 X250 Y150 Z15 F4000\nG1 X250 Y150 Z0.30 F1000\nG1 X1 Y150 Z0.25 E15.0 F2000\nG1 X1 Y150 Z0.25 E14.0 F4000\nG1 X1 Y1 Z0.25 F16000\nG1 X1 Y1 Z0.25 E15.0 F4000\nG92 E0\nM107 ;start with the fan off\n;end cleaning sequance\n;G92 X132.4 Y20 ;correct bed origin (G29 changes it)" - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nM106 S0 ;fan off\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit\nG1 Z+1 E-5 F9000 ;move Z up a bit and retract even more\nG28 X0 Y0 ;home X/Y, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 235 }, + "machine_name": { "default_value": "Printrbot Simple Metal Extended" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM106 ;start with the fan on\nG28 X0 Y0 ;home X/Y\nG28 Z0 ;home Z\nG92 E0 ;zero the extruded length\nG29 ;initiate auto bed leveling sequence\n;start cleaning sequance\nG1 X250 Y150 Z15 F4000\nG1 X250 Y150 Z0.30 F1000\nG1 X1 Y150 Z0.25 E15.0 F2000\nG1 X1 Y150 Z0.25 E14.0 F4000\nG1 X1 Y1 Z0.25 F16000\nG1 X1 Y1 Z0.25 E15.0 F4000\nG92 E0\nM107 ;start with the fan off\n;end cleaning sequance\n;G92 X132.4 Y20 ;correct bed origin (G29 changes it)" }, + "machine_width": { "default_value": 250 } } -} +} \ No newline at end of file diff --git a/resources/definitions/printrbot_simple_makers_kit.def.json b/resources/definitions/printrbot_simple_makers_kit.def.json index 1223f2a4d9..6c68775172 100644 --- a/resources/definitions/printrbot_simple_makers_kit.def.json +++ b/resources/definitions/printrbot_simple_makers_kit.def.json @@ -2,24 +2,22 @@ "version": 2, "name": "Printrbot Simple Maker's Kit (1405)", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Timur Tabi", "manufacturer": "Printrbot", "file_formats": "text/x-gcode", - "machine_extruder_trains": - { - "0": "printrbot_simple_makers_kit_extruder_0" - } + "machine_extruder_trains": { "0": "printrbot_simple_makers_kit_extruder_0" } }, - - "overrides": { - "machine_name": { "default_value": "Printrbot Simple Maker's Kit (1405)" }, - "machine_heated_bed": { "default_value": false }, - "machine_width": { "default_value": 100 }, + "overrides": + { + "gantry_height": { "value": "1000" }, "machine_depth": { "default_value": 100 }, - "machine_height": { "default_value": 115 }, - "machine_head_with_fans_polygon": { + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nM106 S0 ;fan off\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit\nG1 Z+1 E-5 F9000 ;move Z up a bit and retract even more\nG28 X0 Y0 ;home X/Y, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { "default_value": [ [-40, 1000], [-40, -10], @@ -27,14 +25,10 @@ [60, -10] ] }, - "gantry_height": { "value": "1000" }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;home X/Y\nG28 Z0 ;home Z\nG92 E0 ;zero the extruded length\nG29 ;initiate auto bed leveling sequence" - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nM106 S0 ;fan off\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit\nG1 Z+1 E-5 F9000 ;move Z up a bit and retract even more\nG28 X0 Y0 ;home X/Y, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning" - } + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 115 }, + "machine_name": { "default_value": "Printrbot Simple Maker's Kit (1405)" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;home X/Y\nG28 Z0 ;home Z\nG92 E0 ;zero the extruded length\nG29 ;initiate auto bed leveling sequence" }, + "machine_width": { "default_value": 100 } } -} +} \ No newline at end of file diff --git a/resources/definitions/prusa_i3.def.json b/resources/definitions/prusa_i3.def.json index 9ad727fde8..5e7777f343 100644 --- a/resources/definitions/prusa_i3.def.json +++ b/resources/definitions/prusa_i3.def.json @@ -2,36 +2,24 @@ "version": 2, "name": "Prusa i3", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Quillford", "manufacturer": "Prusa3D", "file_formats": "text/x-gcode", "platform": "prusai3_platform.3mf", - "machine_extruder_trains": - { - "0": "prusa_i3_extruder_0" - } + "machine_extruder_trains": { "0": "prusa_i3_extruder_0" } }, - - "overrides": { - "machine_name": { "default_value": "Prusa i3" }, - "machine_heated_bed": { - "default_value": true - }, - "machine_width": { - "default_value": 200 - }, - "machine_height": { - "default_value": 200 - }, - "machine_depth": { - "default_value": 200 - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_head_with_fans_polygon": { + "overrides": + { + "gantry_height": { "value": "55" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\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_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { "default_value": [ [-75, -18], [-75, 35], @@ -39,17 +27,10 @@ [18, -18] ] }, - "gantry_height": { - "value": "55" - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\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_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 200 }, + "machine_name": { "default_value": "Prusa i3" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, + "machine_width": { "default_value": 200 } } } \ No newline at end of file diff --git a/resources/definitions/prusa_i3_mk2.def.json b/resources/definitions/prusa_i3_mk2.def.json index b38d9be910..29737f9246 100644 --- a/resources/definitions/prusa_i3_mk2.def.json +++ b/resources/definitions/prusa_i3_mk2.def.json @@ -2,46 +2,48 @@ "version": 2, "name": "Prusa i3 Mk2", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Apsu, Nounours2099", "manufacturer": "Prusa3D", "file_formats": "text/x-gcode", "platform": "prusai3_platform.3mf", "has_materials": true, - "machine_extruder_trains": - { - "0": "prusa_i3_mk2_extruder_0" - } + "machine_extruder_trains": { "0": "prusa_i3_mk2_extruder_0" } }, - - "overrides": { - "machine_name": { "default_value": "Prusa i3 Mk2" }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 250 }, - "machine_height": { "default_value": 200 }, - "machine_depth": { "default_value": 210 }, - "machine_center_is_zero": { "default_value": false }, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "gantry_height": { "value": "28" }, "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_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 210 }, + "machine_end_gcode": { "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y210; home X axis and push Y forward\nM84 ; disable motors" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-31, 31], + [34, 31], + [34, -40], + [-31, -40] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 200 }, + "machine_max_acceleration_z": { "default_value": 500 }, + "machine_max_feedrate_e": { "default_value": 120 }, + "machine_max_feedrate_z": { "default_value": 12 }, + "machine_max_jerk_e": { "default_value": 2.5 }, "machine_max_jerk_xy": { "default_value": 10 }, "machine_max_jerk_z": { "default_value": 0.2 }, - "machine_max_jerk_e": { "default_value": 2.5 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "G21 ; set units to millimeters\nG90 ; use absolute positioning\nM82 ; absolute extrusion mode\nM104 S{material_print_temperature_layer_0} ; set extruder temp\nM140 S{material_bed_temperature_layer_0} ; set bed temp\nM190 S{material_bed_temperature_layer_0} ; wait for bed temp\nM109 S{material_print_temperature_layer_0} ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG92 E0.0 ; reset extruder distance position\nG1 Y-3.0 F1000.0 ; go outside print area\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E21.5 F1000.0 ; intro line\nG92 E0.0 ; reset extruder distance position" - }, - "machine_end_gcode": { - "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y210; home X axis and push Y forward\nM84 ; disable motors" - } + "machine_name": { "default_value": "Prusa i3 Mk2" }, + "machine_start_gcode": { "default_value": "G21 ; set units to millimeters\nG90 ; use absolute positioning\nM82 ; absolute extrusion mode\nM104 S{material_print_temperature_layer_0} ; set extruder temp\nM140 S{material_bed_temperature_layer_0} ; set bed temp\nM190 S{material_bed_temperature_layer_0} ; wait for bed temp\nM109 S{material_print_temperature_layer_0} ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG92 E0.0 ; reset extruder distance position\nG1 Y-3.0 F1000.0 ; go outside print area\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E21.5 F1000.0 ; intro line\nG92 E0.0 ; reset extruder distance position" }, + "machine_width": { "default_value": 250 }, + "retraction_amount": { "default_value": 0.8 }, + "retraction_speed": { "default_value": 35 } } -} +} \ No newline at end of file diff --git a/resources/definitions/prusa_i3_mk3.def.json b/resources/definitions/prusa_i3_mk3.def.json index a7120a11f4..644b3a83c0 100644 --- a/resources/definitions/prusa_i3_mk3.def.json +++ b/resources/definitions/prusa_i3_mk3.def.json @@ -2,49 +2,51 @@ "version": 2, "name": "Prusa i3 Mk3/Mk3s", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Prusa Research", "manufacturer": "Prusa3D", "file_formats": "text/x-gcode", - "icon": "icon_ultimaker2", "platform": "Original_Prusa_i3_MK3S_MK3_platform.3mf", "has_materials": true, - "machine_extruder_trains": - { - "0": "prusa_i3_mk3_extruder_0" - } + "icon": "icon_ultimaker2", + "machine_extruder_trains": { "0": "prusa_i3_mk3_extruder_0" } }, - - "overrides": { - "machine_name": { "default_value": "Prusa i3 Mk3/Mk3s" }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 250 }, - "machine_height": { "default_value": 210 }, - "machine_depth": { "default_value": 210 }, - "machine_center_is_zero": { "default_value": false }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_size": { "default_value": 0.4 }, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "gantry_height": { "value": 28 }, "layer_height": { "default_value": 0.15 }, "layer_height_0": { "default_value": 0.2 }, - "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_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 210 }, + "machine_end_gcode": { "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y210; home X axis and push Y forward\nM84 ; disable motors" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-31, 31], + [34, 31], + [34, -40], + [-31, -40] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 210 }, + "machine_max_acceleration_z": { "default_value": 500 }, + "machine_max_feedrate_e": { "default_value": 120 }, + "machine_max_feedrate_z": { "default_value": 12 }, + "machine_max_jerk_e": { "default_value": 2.5 }, "machine_max_jerk_xy": { "default_value": 10 }, "machine_max_jerk_z": { "default_value": 0.2 }, - "machine_max_jerk_e": { "default_value": 2.5 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "G21 ; set units to millimeters\nG90 ; use absolute positioning\nM82 ; absolute extrusion mode\nM104 S{material_print_temperature_layer_0} ; set extruder temp\nM140 S{material_bed_temperature_layer_0} ; set bed temp\nM190 S{material_bed_temperature_layer_0} ; wait for bed temp\nM109 S{material_print_temperature_layer_0} ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG92 E0.0 ; reset extruder distance position\nG1 Y-3.0 F1000.0 ; go outside print area\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E21.5 F1000.0 ; intro line\nG92 E0.0 ; reset extruder distance position" - }, - "machine_end_gcode": { - "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y210; home X axis and push Y forward\nM84 ; disable motors" - } + "machine_name": { "default_value": "Prusa i3 Mk3/Mk3s" }, + "machine_nozzle_size": { "default_value": 0.4 }, + "machine_start_gcode": { "default_value": "G21 ; set units to millimeters\nG90 ; use absolute positioning\nM82 ; absolute extrusion mode\nM104 S{material_print_temperature_layer_0} ; set extruder temp\nM140 S{material_bed_temperature_layer_0} ; set bed temp\nM190 S{material_bed_temperature_layer_0} ; wait for bed temp\nM109 S{material_print_temperature_layer_0} ; wait for extruder temp\nG28 W ; home all without mesh bed level\nG80 ; mesh bed leveling\nG92 E0.0 ; reset extruder distance position\nG1 Y-3.0 F1000.0 ; go outside print area\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E21.5 F1000.0 ; intro line\nG92 E0.0 ; reset extruder distance position" }, + "machine_width": { "default_value": 250 }, + "material_diameter": { "default_value": 1.75 }, + "retraction_amount": { "default_value": 0.8 }, + "retraction_speed": { "default_value": 35 } } -} +} \ No newline at end of file diff --git a/resources/definitions/prusa_i3_xl.def.json b/resources/definitions/prusa_i3_xl.def.json index 5d59f340ab..0f0763cc3a 100644 --- a/resources/definitions/prusa_i3_xl.def.json +++ b/resources/definitions/prusa_i3_xl.def.json @@ -2,36 +2,24 @@ "version": 2, "name": "Prusa i3 xl", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "guigashm", "manufacturer": "Prusa3D", "file_formats": "text/x-gcode", "platform": "prusai3_xl_platform.3mf", - "machine_extruder_trains": - { - "0": "prusa_i3_xl_extruder_0" - } + "machine_extruder_trains": { "0": "prusa_i3_xl_extruder_0" } }, - - "overrides": { - "machine_name": { "default_value": "Prusa i3 xl" }, - "machine_heated_bed": { - "default_value": true - }, - "machine_width": { - "default_value": 200 - }, - "machine_height": { - "default_value": 200 - }, - "machine_depth": { - "default_value": 270 - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_head_with_fans_polygon": { + "overrides": + { + "gantry_height": { "value": "55" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 270 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\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_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { "default_value": [ [-75, -18], [-75, 35], @@ -39,17 +27,10 @@ [18, -18] ] }, - "gantry_height": { - "value": "55" - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\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_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 200 }, + "machine_name": { "default_value": "Prusa i3 xl" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, + "machine_width": { "default_value": 200 } } } \ No newline at end of file diff --git a/resources/definitions/punchtec_connect_xl.def.json b/resources/definitions/punchtec_connect_xl.def.json index cda6caa1f6..c069c2f764 100644 --- a/resources/definitions/punchtec_connect_xl.def.json +++ b/resources/definitions/punchtec_connect_xl.def.json @@ -1,8 +1,9 @@ { - "name": "Punchtec Connect XL", "version": 2, + "name": "Punchtec Connect XL", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "manufacturer": "Punchtec", "file_formats": "text/x-gcode", @@ -11,21 +12,33 @@ "0": "punchtec_connect_xl_extruder_0", "1": "punchtec_connect_xl_extruder_1" }, - "platform_offset": [ 0, 0, 0] + "platform_offset": [ + 0, + 0, + 0 + ] }, - - "overrides": { - "machine_head_with_fans_polygon": { "default_value": [[ 0, 0], [ 0, 0], [ 0, 0], [ 0, 0]] }, - "prime_tower_size": { "default_value": 8.660254037844387 }, + "overrides": + { "layer_height": { "default_value": 0.2 }, - "speed_print": { "default_value": 40 }, - "machine_extruder_count": { "default_value": 2 }, - "machine_heated_bed": { "default_value": true }, "machine_center_is_zero": { "default_value": false }, - "machine_height": { "default_value": 200 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_depth": { "default_value": 304 }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [0, 0], + [0, 0], + [0, 0], + [0, 0] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 200 }, + "machine_name": { "default_value": "Punchtec Connect XL" }, "machine_width": { "default_value": 304 }, - "machine_name": { "default_value": "Punchtec Connect XL" } + "prime_tower_size": { "default_value": 8.660254037844387 }, + "speed_print": { "default_value": 40 } } -} +} \ No newline at end of file diff --git a/resources/definitions/raise3D_N2_dual.def.json b/resources/definitions/raise3D_N2_dual.def.json index f5246f6bb6..690a9730b4 100644 --- a/resources/definitions/raise3D_N2_dual.def.json +++ b/resources/definitions/raise3D_N2_dual.def.json @@ -2,7 +2,8 @@ "version": 2, "name": "Raise3D N2 Dual", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Raise3D", "manufacturer": "Raise3D", @@ -14,71 +15,35 @@ "1": "raise3D_N2_dual_extruder_1" } }, - - "overrides": { - "machine_name": { "default_value": "Raise3D N2 Dual" }, - "machine_width": { - "default_value": 305 - }, - "machine_height": { - "default_value": 305 - }, - "machine_depth": { - "default_value": 305 - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_nozzle_heat_up_speed": { - "default_value": 6 - }, - "machine_nozzle_cool_down_speed": { - "default_value": 4 - }, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "gantry_height": { "value": "55" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 305 }, + "machine_end_gcode": { "default_value": "M107\nM1002\nM104 S0 T1\nM104 S0 T0\nM140 S0\nM117 Print Complete.\nG28 X0 Y0\nG91\nG1 Z10\nG90\nM84" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_head_with_fans_polygon": { "default_value": [ - [ -75, 35 ], - [ -75, -18 ], - [ 18, 35 ], - [ 18, -18 ] + [-75, 35], + [-75, -18], + [18, 35], + [18, -18] ] }, - "machine_min_cool_heat_time_window": { - "default_value": 3600 - }, - "retraction_amount": { - "default_value": 1.0 - }, - "adhesion_type": { - "default_value": "skirt" - }, - "gantry_height": { - "value": "55" - }, - "machine_use_extruder_offset_to_offset_coords": { - "default_value": true - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G90\nG21\n; home all axes\nG28\nG92 X0 Y0 Z0\n; move heatbed into position\nG1 X20.0 Y20.0 Z1.0 F1000\n; zero extruders\nG92 E0 E1\nT0; right tool\n; set extruder steps per mm\nM92 E140\nT1; left tool\n; set extruder steps per mm\nM92 E140\nT0; left tool\nG92 E0 E1\n; purge nozzle\nG1 E25 F250\nT1; left tool\nG92 E0 E1\n; purge nozzle\nG1 E25 F250\n; zero extruders\nG92 E0 E1\n; move heatbed down a little more\nG1 Z5.0 F20\n; wait 600ms\nG4 600\n; move to tack down the strands\nG1 X20.0 Y30.0 Z0 F9000\n; wait 600ms\nG4 600\n;move up a bit\nG1 Z5.0 F9000\n; wait 300ms\nG4 300\n;fast move to center\nG1 X152.5 Y152.5 F9000\nT0\n;Raise3D Job Start\nM117 Printing...\nM1001\n" - }, - "machine_end_gcode": { - "default_value": "M107\nM1002\nM104 S0 T1\nM104 S0 T0\nM140 S0\nM117 Print Complete.\nG28 X0 Y0\nG91\nG1 Z10\nG90\nM84" - }, - "machine_extruder_count": { - "default_value": 2 - }, - "prime_tower_position_x": { - "value": "195" - }, - "prime_tower_position_y": { - "value": "149" - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 305 }, + "machine_min_cool_heat_time_window": { "default_value": 3600 }, + "machine_name": { "default_value": "Raise3D N2 Dual" }, + "machine_nozzle_cool_down_speed": { "default_value": 4 }, + "machine_nozzle_heat_up_speed": { "default_value": 6 }, + "machine_start_gcode": { "default_value": "G90\nG21\n; home all axes\nG28\nG92 X0 Y0 Z0\n; move heatbed into position\nG1 X20.0 Y20.0 Z1.0 F1000\n; zero extruders\nG92 E0 E1\nT0; right tool\n; set extruder steps per mm\nM92 E140\nT1; left tool\n; set extruder steps per mm\nM92 E140\nT0; left tool\nG92 E0 E1\n; purge nozzle\nG1 E25 F250\nT1; left tool\nG92 E0 E1\n; purge nozzle\nG1 E25 F250\n; zero extruders\nG92 E0 E1\n; move heatbed down a little more\nG1 Z5.0 F20\n; wait 600ms\nG4 600\n; move to tack down the strands\nG1 X20.0 Y30.0 Z0 F9000\n; wait 600ms\nG4 600\n;move up a bit\nG1 Z5.0 F9000\n; wait 300ms\nG4 300\n;fast move to center\nG1 X152.5 Y152.5 F9000\nT0\n;Raise3D Job Start\nM117 Printing...\nM1001\n" }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, + "machine_width": { "default_value": 305 }, + "prime_tower_position_x": { "value": "195" }, + "prime_tower_position_y": { "value": "149" }, + "retraction_amount": { "default_value": 1.0 } } -} +} \ No newline at end of file diff --git a/resources/definitions/raise3D_N2_plus_dual.def.json b/resources/definitions/raise3D_N2_plus_dual.def.json index 02f5fd4e11..6699696015 100644 --- a/resources/definitions/raise3D_N2_plus_dual.def.json +++ b/resources/definitions/raise3D_N2_plus_dual.def.json @@ -2,7 +2,8 @@ "version": 2, "name": "Raise3D N2 Plus Dual", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Raise3D", "manufacturer": "Raise3D", @@ -14,71 +15,35 @@ "1": "raise3D_N2_plus_dual_extruder_1" } }, - - "overrides": { - "machine_name": { "default_value": "Raise3D N2 Plus Dual" }, - "machine_width": { - "default_value": 305 - }, - "machine_height": { - "default_value": 610 - }, - "machine_depth": { - "default_value": 305 - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_nozzle_heat_up_speed": { - "default_value": 6 - }, - "machine_nozzle_cool_down_speed": { - "default_value": 4 - }, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "gantry_height": { "value": "55" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 305 }, + "machine_end_gcode": { "default_value": "M107\nM1002\nM104 S0 T1\nM104 S0 T0\nM140 S0\nM117 Print Complete.\nG28 X0 Y0\nG91\nG1 Z10\nG90\nM84" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_head_with_fans_polygon": { "default_value": [ - [ -75, 35 ], - [ -75, -18 ], - [ 18, 35 ], - [ 18, -18 ] + [-75, 35], + [-75, -18], + [18, 35], + [18, -18] ] }, - "machine_min_cool_heat_time_window": { - "default_value": 3600 - }, - "retraction_amount": { - "default_value": 1.0 - }, - "adhesion_type": { - "default_value": "skirt" - }, - "gantry_height": { - "value": "55" - }, - "machine_use_extruder_offset_to_offset_coords": { - "default_value": true - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G90\nG21\n; home all axes\nG28\nG92 X0 Y0 Z0\n; move heatbed into position\nG1 X20.0 Y20.0 Z1.0 F1000\n; zero extruders\nG92 E0 E1\nT0; right tool\n; set extruder steps per mm\nM92 E140\nT1; left tool\n; set extruder steps per mm\nM92 E140\nT0; left tool\nG92 E0 E1\n; purge nozzle\nG1 E25 F250\nT1; left tool\nG92 E0 E1\n; purge nozzle\nG1 E25 F250\n; zero extruders\nG92 E0 E1\n; move heatbed down a little more\nG1 Z5.0 F20\n; wait 600ms\nG4 600\n; move to tack down the strands\nG1 X20.0 Y30.0 Z0 F9000\n; wait 600ms\nG4 600\n;move up a bit\nG1 Z5.0 F9000\n; wait 300ms\nG4 300\n;fast move to center\nG1 X152.5 Y152.5 F9000\nT0\n;Raise3D Job Start\nM117 Printing...\nM1001\n" - }, - "machine_end_gcode": { - "default_value": "M107\nM1002\nM104 S0 T1\nM104 S0 T0\nM140 S0\nM117 Print Complete.\nG28 X0 Y0\nG91\nG1 Z10\nG90\nM84" - }, - "machine_extruder_count": { - "default_value": 2 - }, - "prime_tower_position_x": { - "value": "195" - }, - "prime_tower_position_y": { - "value": "149" - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 610 }, + "machine_min_cool_heat_time_window": { "default_value": 3600 }, + "machine_name": { "default_value": "Raise3D N2 Plus Dual" }, + "machine_nozzle_cool_down_speed": { "default_value": 4 }, + "machine_nozzle_heat_up_speed": { "default_value": 6 }, + "machine_start_gcode": { "default_value": "G90\nG21\n; home all axes\nG28\nG92 X0 Y0 Z0\n; move heatbed into position\nG1 X20.0 Y20.0 Z1.0 F1000\n; zero extruders\nG92 E0 E1\nT0; right tool\n; set extruder steps per mm\nM92 E140\nT1; left tool\n; set extruder steps per mm\nM92 E140\nT0; left tool\nG92 E0 E1\n; purge nozzle\nG1 E25 F250\nT1; left tool\nG92 E0 E1\n; purge nozzle\nG1 E25 F250\n; zero extruders\nG92 E0 E1\n; move heatbed down a little more\nG1 Z5.0 F20\n; wait 600ms\nG4 600\n; move to tack down the strands\nG1 X20.0 Y30.0 Z0 F9000\n; wait 600ms\nG4 600\n;move up a bit\nG1 Z5.0 F9000\n; wait 300ms\nG4 300\n;fast move to center\nG1 X152.5 Y152.5 F9000\nT0\n;Raise3D Job Start\nM117 Printing...\nM1001\n" }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, + "machine_width": { "default_value": 305 }, + "prime_tower_position_x": { "value": "195" }, + "prime_tower_position_y": { "value": "149" }, + "retraction_amount": { "default_value": 1.0 } } -} +} \ No newline at end of file diff --git a/resources/definitions/raise3D_N2_plus_single.def.json b/resources/definitions/raise3D_N2_plus_single.def.json index 7ffdf08767..5508af2188 100644 --- a/resources/definitions/raise3D_N2_plus_single.def.json +++ b/resources/definitions/raise3D_N2_plus_single.def.json @@ -2,79 +2,43 @@ "version": 2, "name": "Raise3D N2 Plus Single", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Raise3D", "manufacturer": "Raise3D", "file_formats": "text/x-gcode", "has_materials": true, - "machine_extruder_trains": - { - "0": "raise3D_N2_plus_single_extruder_0" - } + "machine_extruder_trains": { "0": "raise3D_N2_plus_single_extruder_0" } }, - - "overrides": { - "machine_name": { "default_value": "Raise3D N2 Plus Single" }, - "machine_width": { - "default_value": 305 - }, - "machine_height": { - "default_value": 610 - }, - "machine_depth": { - "default_value": 305 - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_nozzle_heat_up_speed": { - "default_value": 6 - }, - "machine_nozzle_cool_down_speed": { - "default_value": 4 - }, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "gantry_height": { "value": "55" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 305 }, + "machine_end_gcode": { "default_value": "M107\nM1002\nM104 S0 T1\nM104 S0 T0\nM140 S0\nM117 Print Complete.\nG28 X0 Y0\nG91\nG1 Z10\nG90\nM84" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_head_with_fans_polygon": { "default_value": [ - [ -75, 35 ], - [ -75, -18 ], - [ 18, 35 ], - [ 18, -18 ] + [-75, 35], + [-75, -18], + [18, 35], + [18, -18] ] }, - "machine_min_cool_heat_time_window": { - "default_value": 3600 - }, - "retraction_amount": { - "default_value": 1.0 - }, - "adhesion_type": { - "default_value": "skirt" - }, - "gantry_height": { - "value": "55" - }, - "machine_use_extruder_offset_to_offset_coords": { - "default_value": true - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G90\nG21\n; home all axes\nG28\nG92 X0 Y0 Z0\n; move heatbed into position\nG1 X20.0 Y20.0 Z1.0 F1000\n; zero extruders\nG92 E0 E1\nT0; right tool\n; set extruder steps per mm\nM92 E140\n; purge nozzle\nG1 E25 F250\n; zero extruders\nG92 E0 E1\n; move heatbed down a little more\nG1 Z5.0 F20\n; wait 600ms\nG4 600\n; move to tack down the strands\nG1 X20.0 Y30.0 Z0 F9000\n; wait 600ms\nG4 600\n;move up a bit\nG1 Z5.0 F9000\n; wait 300ms\nG4 300\n;fast move to center\nG1 X152.5 Y152.5 F9000\nT0\n;Raise3D Job Start\nM117 Printing...\nM1001\n" - }, - "machine_end_gcode": { - "default_value": "M107\nM1002\nM104 S0 T1\nM104 S0 T0\nM140 S0\nM117 Print Complete.\nG28 X0 Y0\nG91\nG1 Z10\nG90\nM84" - }, - "prime_tower_position_x": { - "value": "195" - }, - "prime_tower_position_y": { - "value": "149" - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 610 }, + "machine_min_cool_heat_time_window": { "default_value": 3600 }, + "machine_name": { "default_value": "Raise3D N2 Plus Single" }, + "machine_nozzle_cool_down_speed": { "default_value": 4 }, + "machine_nozzle_heat_up_speed": { "default_value": 6 }, + "machine_start_gcode": { "default_value": "G90\nG21\n; home all axes\nG28\nG92 X0 Y0 Z0\n; move heatbed into position\nG1 X20.0 Y20.0 Z1.0 F1000\n; zero extruders\nG92 E0 E1\nT0; right tool\n; set extruder steps per mm\nM92 E140\n; purge nozzle\nG1 E25 F250\n; zero extruders\nG92 E0 E1\n; move heatbed down a little more\nG1 Z5.0 F20\n; wait 600ms\nG4 600\n; move to tack down the strands\nG1 X20.0 Y30.0 Z0 F9000\n; wait 600ms\nG4 600\n;move up a bit\nG1 Z5.0 F9000\n; wait 300ms\nG4 300\n;fast move to center\nG1 X152.5 Y152.5 F9000\nT0\n;Raise3D Job Start\nM117 Printing...\nM1001\n" }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, + "machine_width": { "default_value": 305 }, + "prime_tower_position_x": { "value": "195" }, + "prime_tower_position_y": { "value": "149" }, + "retraction_amount": { "default_value": 1.0 } } -} +} \ No newline at end of file diff --git a/resources/definitions/raise3D_N2_single.def.json b/resources/definitions/raise3D_N2_single.def.json index c4e346ae90..e5a9af0a0e 100644 --- a/resources/definitions/raise3D_N2_single.def.json +++ b/resources/definitions/raise3D_N2_single.def.json @@ -2,79 +2,43 @@ "version": 2, "name": "Raise3D N2 Single", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Raise3D", "manufacturer": "Raise3D", "file_formats": "text/x-gcode", "has_materials": true, - "machine_extruder_trains": - { - "0": "raise3D_N2_single_extruder_0" - } + "machine_extruder_trains": { "0": "raise3D_N2_single_extruder_0" } }, - - "overrides": { - "machine_name": { "default_value": "Raise3D N2 Single" }, - "machine_width": { - "default_value": 305 - }, - "machine_height": { - "default_value": 305 - }, - "machine_depth": { - "default_value": 305 - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_nozzle_heat_up_speed": { - "default_value": 6 - }, - "machine_nozzle_cool_down_speed": { - "default_value": 4 - }, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "gantry_height": { "value": "55" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 305 }, + "machine_end_gcode": { "default_value": "M107\nM1002\nM104 S0 T1\nM104 S0 T0\nM140 S0\nM117 Print Complete.\nG28 X0 Y0\nG91\nG1 Z10\nG90\nM84" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_head_with_fans_polygon": { "default_value": [ - [ -75, 35 ], - [ -75, -18 ], - [ 18, 35 ], - [ 18, -18 ] + [-75, 35], + [-75, -18], + [18, 35], + [18, -18] ] }, - "machine_min_cool_heat_time_window": { - "default_value": 3600 - }, - "retraction_amount": { - "default_value": 1.0 - }, - "adhesion_type": { - "default_value": "skirt" - }, - "gantry_height": { - "value": "55" - }, - "machine_use_extruder_offset_to_offset_coords": { - "default_value": true - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G90\nG21\n; home all axes\nG28\nG92 X0 Y0 Z0\n; move heatbed into position\nG1 X20.0 Y20.0 Z1.0 F1000\n; zero extruders\nG92 E0 E1\nT0; right tool\n; set extruder steps per mm\nM92 E140\n; purge nozzle\nG1 E25 F250\n; zero extruders\nG92 E0 E1\n; move heatbed down a little more\nG1 Z5.0 F20\n; wait 600ms\nG4 600\n; move to tack down the strands\nG1 X20.0 Y30.0 Z0 F9000\n; wait 600ms\nG4 600\n;move up a bit\nG1 Z5.0 F9000\n; wait 300ms\nG4 300\n;fast move to center\nG1 X152.5 Y152.5 F9000\nT0\n;Raise3D Job Start\nM117 Printing...\nM1001\n" - }, - "machine_end_gcode": { - "default_value": "M107\nM1002\nM104 S0 T1\nM104 S0 T0\nM140 S0\nM117 Print Complete.\nG28 X0 Y0\nG91\nG1 Z10\nG90\nM84" - }, - "prime_tower_position_x": { - "value": "195" - }, - "prime_tower_position_y": { - "value": "149" - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 305 }, + "machine_min_cool_heat_time_window": { "default_value": 3600 }, + "machine_name": { "default_value": "Raise3D N2 Single" }, + "machine_nozzle_cool_down_speed": { "default_value": 4 }, + "machine_nozzle_heat_up_speed": { "default_value": 6 }, + "machine_start_gcode": { "default_value": "G90\nG21\n; home all axes\nG28\nG92 X0 Y0 Z0\n; move heatbed into position\nG1 X20.0 Y20.0 Z1.0 F1000\n; zero extruders\nG92 E0 E1\nT0; right tool\n; set extruder steps per mm\nM92 E140\n; purge nozzle\nG1 E25 F250\n; zero extruders\nG92 E0 E1\n; move heatbed down a little more\nG1 Z5.0 F20\n; wait 600ms\nG4 600\n; move to tack down the strands\nG1 X20.0 Y30.0 Z0 F9000\n; wait 600ms\nG4 600\n;move up a bit\nG1 Z5.0 F9000\n; wait 300ms\nG4 300\n;fast move to center\nG1 X152.5 Y152.5 F9000\nT0\n;Raise3D Job Start\nM117 Printing...\nM1001\n" }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, + "machine_width": { "default_value": 305 }, + "prime_tower_position_x": { "value": "195" }, + "prime_tower_position_y": { "value": "149" }, + "retraction_amount": { "default_value": 1.0 } } -} +} \ No newline at end of file diff --git a/resources/definitions/renkforce_basic3.def.json b/resources/definitions/renkforce_basic3.def.json index 98b355bd53..00838107fa 100644 --- a/resources/definitions/renkforce_basic3.def.json +++ b/resources/definitions/renkforce_basic3.def.json @@ -1,17 +1,19 @@ { - "name": "Renkforce Basic 3", "version": 2, + "name": "Renkforce Basic 3", "inherits": "goofoo_small", - "overrides": { - "machine_name": { "default_value": "Renkforce Basic 3" }, - "machine_width": { "default_value": 120 }, - "machine_depth": { "default_value": 120 }, - "machine_height": { "default_value": 180 }, - "machine_heated_bed": { "default_value": false } - }, - "metadata": { + "metadata": + { + "visible": true, "author": "Simon Peter (based on RF100.ini by Conrad Electronic SE)", - "manufacturer": "Renkforce", - "visible": true + "manufacturer": "Renkforce" + }, + "overrides": + { + "machine_depth": { "default_value": 120 }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 180 }, + "machine_name": { "default_value": "Renkforce Basic 3" }, + "machine_width": { "default_value": 120 } } } \ No newline at end of file diff --git a/resources/definitions/renkforce_cubeone.def.json b/resources/definitions/renkforce_cubeone.def.json index 76f7263c3b..2ff4d812c3 100644 --- a/resources/definitions/renkforce_cubeone.def.json +++ b/resources/definitions/renkforce_cubeone.def.json @@ -1,30 +1,30 @@ { - "name": "Renkforce Cube One", "version": 2, + "name": "Renkforce Cube One", "inherits": "goofoo_small", - "overrides": { - + "metadata": + { + "visible": true, + "author": "Woosh (based on RF100.ini by Conrad Electronic SE)", + "manufacturer": "Renkforce" + }, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "layer_height": { "default_value": 0.4 }, + "layer_height_0": { "default_value": 0.5 }, + "machine_depth": { "default_value": 80 }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 80 }, "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 + "retraction_prime_speed": { "value": 80 }, + "retraction_speed": { "default_value": 60 }, + "speed_layer_0": { "value": 10 }, + "speed_print": { "value": 10 }, + "speed_print_layer_0": { "value": 10 }, + "speed_travel": { "value": 10 }, + "speed_travel_layer_0": { "value": 10 } } } \ No newline at end of file diff --git a/resources/definitions/renkforce_pro3.def.json b/resources/definitions/renkforce_pro3.def.json index 0c40fdc509..bcbcbe53f9 100644 --- a/resources/definitions/renkforce_pro3.def.json +++ b/resources/definitions/renkforce_pro3.def.json @@ -1,17 +1,18 @@ { - "name": "Renkforce Pro 3", "version": 2, + "name": "Renkforce Pro 3", "inherits": "goofoo_near", - "overrides": { - "machine_name": { "default_value": "Renkforce Pro 3" }, - "machine_width": { "default_value": 200 }, - "machine_depth": { "default_value": 200 }, - "machine_height": { "default_value": 150 } - - }, - "metadata": { + "metadata": + { + "visible": true, "author": "Simon Peter (based on RF100.ini by Conrad Electronic SE)", - "manufacturer": "Renkforce", - "visible": true + "manufacturer": "Renkforce" + }, + "overrides": + { + "machine_depth": { "default_value": 200 }, + "machine_height": { "default_value": 150 }, + "machine_name": { "default_value": "Renkforce Pro 3" }, + "machine_width": { "default_value": 200 } } } \ No newline at end of file diff --git a/resources/definitions/renkforce_pro6.def.json b/resources/definitions/renkforce_pro6.def.json index 63560506ea..9ed4ee0628 100644 --- a/resources/definitions/renkforce_pro6.def.json +++ b/resources/definitions/renkforce_pro6.def.json @@ -1,17 +1,18 @@ { - "name": "Renkforce Pro 6", "version": 2, + "name": "Renkforce Pro 6", "inherits": "goofoo_near", - "overrides": { - "machine_name": { "default_value": "Renkforce Pro 6" }, - "machine_width": { "default_value": 200 }, - "machine_depth": { "default_value": 200 }, - "machine_height": { "default_value": 200 } - - }, - "metadata": { + "metadata": + { + "visible": true, "author": "Simon Peter (based on RF100.ini by Conrad Electronic SE)", - "manufacturer": "Renkforce", - "visible": true + "manufacturer": "Renkforce" + }, + "overrides": + { + "machine_depth": { "default_value": 200 }, + "machine_height": { "default_value": 200 }, + "machine_name": { "default_value": "Renkforce Pro 6" }, + "machine_width": { "default_value": 200 } } } \ No newline at end of file diff --git a/resources/definitions/renkforce_pro6plus.def.json b/resources/definitions/renkforce_pro6plus.def.json index 09cb29719d..5e1da771c6 100644 --- a/resources/definitions/renkforce_pro6plus.def.json +++ b/resources/definitions/renkforce_pro6plus.def.json @@ -1,17 +1,18 @@ { - "name": "Renkforce Pro 6+", "version": 2, + "name": "Renkforce Pro 6+", "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": { + "metadata": + { + "visible": true, "author": "Woosh (based on RF100.ini by Conrad Electronic SE)", - "manufacturer": "Renkforce", - "visible": true + "manufacturer": "Renkforce" + }, + "overrides": + { + "machine_depth": { "default_value": 280 }, + "machine_height": { "default_value": 300 }, + "machine_name": { "default_value": "Renkforce Pro 6+" }, + "machine_width": { "default_value": 280 } } } \ No newline at end of file diff --git a/resources/definitions/renkforce_pro7dual.def.json b/resources/definitions/renkforce_pro7dual.def.json index c6322046a9..7d67b8f278 100755 --- a/resources/definitions/renkforce_pro7dual.def.json +++ b/resources/definitions/renkforce_pro7dual.def.json @@ -1,24 +1,33 @@ { - "name": "Renkforce Pro7 Dual", "version": 2, + "name": "Renkforce Pro7 Dual", "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" - }, + "metadata": + { + "visible": true, "author": "Woosh (based on RF100.ini by Conrad Electronic SE)", "manufacturer": "Renkforce", - "visible": true + "machine_extruder_trains": + { + "0": "renkforce_pro7dual_1st", + "1": "renkforce_pro7dual_2nd" + } + }, + "overrides": + { + "machine_depth": { "default_value": 250 }, + "machine_extruder_count": { "default_value": 2 }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [0, 0], + [0, 0], + [0, 0], + [0, 0] + ] + }, + "machine_height": { "default_value": 200 }, + "machine_name": { "default_value": "Renkforce Pro7 Dual" }, + "machine_width": { "default_value": 360 } } } \ No newline at end of file diff --git a/resources/definitions/renkforce_rf100.def.json b/resources/definitions/renkforce_rf100.def.json index f241df9a44..9aed88d026 100644 --- a/resources/definitions/renkforce_rf100.def.json +++ b/resources/definitions/renkforce_rf100.def.json @@ -2,78 +2,38 @@ "version": 2, "name": "Renkforce RF100", "inherits": "fdmprinter", - "metadata": { - "author": "Simon Peter (based on RF100.ini by Conrad Electronic SE)", - "file_formats": "text/x-gcode", - "manufacturer": "Renkforce", + "metadata": + { "visible": true, - "machine_extruder_trains": - { - "0": "renkforce_rf100_extruder_0" - } + "author": "Simon Peter (based on RF100.ini by Conrad Electronic SE)", + "manufacturer": "Renkforce", + "file_formats": "text/x-gcode", + "machine_extruder_trains": { "0": "renkforce_rf100_extruder_0" } }, - - "overrides": { - "adhesion_type": { - "default_value": "skirt" - }, - "bottom_thickness": { - "value": "0.6" - }, - "brim_width": { - "value": "3.0" - }, - "cool_fan_enabled": { - "value": "True" - }, - "cool_fan_full_at_height": { - "value": "0.5" - }, - "cool_fan_speed_max": { - "value": "100.0" - }, - "cool_fan_speed_min": { - "value": "100.0" - }, - "cool_lift_head": { - "value": "True" - }, - "cool_min_layer_time": { - "value": "1.0" - }, - "cool_min_speed": { - "value": "5.0" - }, - "infill_before_walls": { - "value": "True" - }, - "infill_line_width": { - "value": "0.6" - }, - "infill_overlap": { - "value": "15.0" - }, - "infill_sparse_density": { - "value": "26.0" - }, - "ironing_enabled": { - "value": "True" - }, - "layer_0_z_overlap": { - "value": "0.11" - }, - "layer_height_0": { - "value": "0.3" - }, - "machine_depth": { - "value": "100" - }, - "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" - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "bottom_thickness": { "value": "0.6" }, + "brim_width": { "value": "3.0" }, + "cool_fan_enabled": { "value": "True" }, + "cool_fan_full_at_height": { "value": "0.5" }, + "cool_fan_speed_max": { "value": "100.0" }, + "cool_fan_speed_min": { "value": "100.0" }, + "cool_lift_head": { "value": "True" }, + "cool_min_layer_time": { "value": "1.0" }, + "cool_min_speed": { "value": "5.0" }, + "default_material_print_temperature": { "value": "210.0" }, + "gantry_height": { "value": "8" }, + "infill_before_walls": { "value": "True" }, + "infill_line_width": { "value": "0.6" }, + "infill_overlap": { "value": "15.0" }, + "infill_sparse_density": { "value": "26.0" }, + "ironing_enabled": { "value": "True" }, + "layer_0_z_overlap": { "value": "0.11" }, + "layer_height_0": { "value": "0.3" }, + "machine_depth": { "value": "100" }, + "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" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_head_with_fans_polygon": { "default_value": [ @@ -83,146 +43,50 @@ [-26, 55] ] }, - "gantry_height": { - "value": "8" - }, - "machine_height": { - "value": "100" - }, - "machine_name": { - "default_value": "Renkforce RF100" - }, - "machine_start_gcode": { - "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": "100" - }, - "material_bed_temperature": { - "enabled": false - }, - "material_flow": { - "value": "110" - }, - "default_material_print_temperature": { - "value": "210.0" - }, - "ooze_shield_enabled": { - "value": "True" - }, - "raft_airgap": { - "value": "0.33" - }, - "raft_base_line_spacing": { - "value": "3.0" - }, - "raft_base_line_width": { - "value": "1.0" - }, - "raft_base_thickness": { - "value": "0.3" - }, - "raft_interface_line_spacing": { - "value": "3.0" - }, - "raft_interface_line_width": { - "value": "0.4" - }, - "raft_interface_thickness": { - "value": "0.27" - }, - "raft_margin": { - "value": "6.0" - }, - "raft_speed": { - "value": "20.0" - }, - "raft_surface_layers": { - "value": "2" - }, - "raft_surface_line_spacing": { - "value": "0.4" - }, - "raft_surface_line_width": { - "value": "0.4" - }, - "raft_surface_thickness": { - "value": "0.1" - }, - "retraction_amount": { - "value": "5.0" - }, - "retraction_combing": { - "value": "'all'" - }, - "retraction_enable": { - "value": "True" - }, - "retraction_min_travel": { - "value": "1.5" - }, - "skin_overlap": { - "value": "15.0" - }, - "skirt_brim_minimal_length": { - "value": "150.0" - }, - "skirt_gap": { - "value": "3.0" - }, - "skirt_line_count": { - "value": "3" - }, - "speed_infill": { - "value": "50.0" - }, - "speed_layer_0": { - "value": "15.0" - }, - "speed_print": { - "value": "50.0" - }, - "speed_topbottom": { - "value": "30.0" - }, - "speed_travel": { - "value": "50.0" - }, - "speed_wall_0": { - "value": "25.0" - }, - "speed_wall_x": { - "value": "35.0" - }, - "support_angle": { - "value": "60.0" - }, - "support_enable": { - "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" - }, - "support_pattern": { - "default_value": "lines" - }, - "support_type": { - "default_value": "everywhere" - }, - "support_xy_distance": { - "value": "0.7" - }, - "support_z_distance": { - "value": "0.35" - }, - "top_bottom_thickness": { - "value": "0.8" - }, - "wall_thickness": { - "value": "0.8" - } + "machine_height": { "value": "100" }, + "machine_name": { "default_value": "Renkforce RF100" }, + "machine_start_gcode": { "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": "100" }, + "material_bed_temperature": { "enabled": false }, + "material_flow": { "value": "110" }, + "ooze_shield_enabled": { "value": "True" }, + "raft_airgap": { "value": "0.33" }, + "raft_base_line_spacing": { "value": "3.0" }, + "raft_base_line_width": { "value": "1.0" }, + "raft_base_thickness": { "value": "0.3" }, + "raft_interface_line_spacing": { "value": "3.0" }, + "raft_interface_line_width": { "value": "0.4" }, + "raft_interface_thickness": { "value": "0.27" }, + "raft_margin": { "value": "6.0" }, + "raft_speed": { "value": "20.0" }, + "raft_surface_layers": { "value": "2" }, + "raft_surface_line_spacing": { "value": "0.4" }, + "raft_surface_line_width": { "value": "0.4" }, + "raft_surface_thickness": { "value": "0.1" }, + "retraction_amount": { "value": "5.0" }, + "retraction_combing": { "value": "'all'" }, + "retraction_enable": { "value": "True" }, + "retraction_min_travel": { "value": "1.5" }, + "skin_overlap": { "value": "15.0" }, + "skirt_brim_minimal_length": { "value": "150.0" }, + "skirt_gap": { "value": "3.0" }, + "skirt_line_count": { "value": "3" }, + "speed_infill": { "value": "50.0" }, + "speed_layer_0": { "value": "15.0" }, + "speed_print": { "value": "50.0" }, + "speed_topbottom": { "value": "30.0" }, + "speed_travel": { "value": "50.0" }, + "speed_wall_0": { "value": "25.0" }, + "speed_wall_x": { "value": "35.0" }, + "support_angle": { "value": "60.0" }, + "support_enable": { "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" }, + "support_pattern": { "default_value": "lines" }, + "support_type": { "default_value": "everywhere" }, + "support_xy_distance": { "value": "0.7" }, + "support_z_distance": { "value": "0.35" }, + "top_bottom_thickness": { "value": "0.8" }, + "wall_thickness": { "value": "0.8" } } -} +} \ No newline at end of file diff --git a/resources/definitions/renkforce_rf100_v2.def.json b/resources/definitions/renkforce_rf100_v2.def.json index 881b5c94ca..9d6b4043a2 100644 --- a/resources/definitions/renkforce_rf100_v2.def.json +++ b/resources/definitions/renkforce_rf100_v2.def.json @@ -2,78 +2,37 @@ "version": 2, "name": "Renkforce RF100 V2", "inherits": "fdmprinter", - "metadata": { - "author": "Simon Peter (based on RF100.ini by Conrad Electronic SE)", - "file_formats": "text/x-gcode", - "manufacturer": "Renkforce", + "metadata": + { "visible": true, - "machine_extruder_trains": - { - "0": "renkforce_rf100_extruder_0" - } + "author": "Simon Peter (based on RF100.ini by Conrad Electronic SE)", + "manufacturer": "Renkforce", + "file_formats": "text/x-gcode", + "machine_extruder_trains": { "0": "renkforce_rf100_extruder_0" } }, - - "overrides": { - "adhesion_type": { - "default_value": "skirt" - }, - "bottom_thickness": { - "value": "0.6" - }, - "brim_width": { - "value": "3.0" - }, - "cool_fan_enabled": { - "value": "True" - }, - "cool_fan_full_at_height": { - "value": "0.5" - }, - "cool_fan_speed_max": { - "value": "100.0" - }, - "cool_fan_speed_min": { - "value": "100.0" - }, - "cool_lift_head": { - "value": "True" - }, - "cool_min_layer_time": { - "value": "1.0" - }, - "cool_min_speed": { - "value": "5.0" - }, - "infill_before_walls": { - "value": "True" - }, - "infill_line_width": { - "value": "0.6" - }, - "infill_overlap": { - "value": "15.0" - }, - "infill_sparse_density": { - "value": "26.0" - }, - "ironing_enabled": { - "value": "True" - }, - "layer_0_z_overlap": { - "value": "0.11" - }, - "layer_height_0": { - "value": "0.3" - }, - "machine_depth": { - "value": "120" - }, - "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" - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "bottom_thickness": { "value": "0.6" }, + "brim_width": { "value": "3.0" }, + "cool_fan_enabled": { "value": "True" }, + "cool_fan_full_at_height": { "value": "0.5" }, + "cool_fan_speed_max": { "value": "100.0" }, + "cool_fan_speed_min": { "value": "100.0" }, + "cool_lift_head": { "value": "True" }, + "cool_min_layer_time": { "value": "1.0" }, + "cool_min_speed": { "value": "5.0" }, + "gantry_height": { "value": "8" }, + "infill_before_walls": { "value": "True" }, + "infill_line_width": { "value": "0.6" }, + "infill_overlap": { "value": "15.0" }, + "infill_sparse_density": { "value": "26.0" }, + "ironing_enabled": { "value": "True" }, + "layer_0_z_overlap": { "value": "0.11" }, + "layer_height_0": { "value": "0.3" }, + "machine_depth": { "value": "120" }, + "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" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_head_with_fans_polygon": { "default_value": [ @@ -83,143 +42,50 @@ [-26, 55] ] }, - "gantry_height": { - "value": "8" - }, - "machine_height": { - "value": "120" - }, - "machine_name": { - "default_value": "Renkforce RF100 V2" - }, - "machine_start_gcode": { - "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": "120" - }, - "material_bed_temperature": { - "enabled": false - }, - "material_flow": { - "value": "110" - }, - "ooze_shield_enabled": { - "value": "True" - }, - "raft_airgap": { - "value": "0.33" - }, - "raft_base_line_spacing": { - "value": "3.0" - }, - "raft_base_line_width": { - "value": "1.0" - }, - "raft_base_thickness": { - "value": "0.3" - }, - "raft_interface_line_spacing": { - "value": "3.0" - }, - "raft_interface_line_width": { - "value": "0.4" - }, - "raft_interface_thickness": { - "value": "0.27" - }, - "raft_margin": { - "value": "6.0" - }, - "raft_speed": { - "value": "20.0" - }, - "raft_surface_layers": { - "value": "2" - }, - "raft_surface_line_spacing": { - "value": "0.4" - }, - "raft_surface_line_width": { - "value": "0.4" - }, - "raft_surface_thickness": { - "value": "0.1" - }, - "retraction_amount": { - "value": "5.0" - }, - "retraction_combing": { - "value": "'all'" - }, - "retraction_enable": { - "value": "True" - }, - "retraction_min_travel": { - "value": "1.5" - }, - "skin_overlap": { - "value": "15.0" - }, - "skirt_brim_minimal_length": { - "value": "150.0" - }, - "skirt_gap": { - "value": "3.0" - }, - "skirt_line_count": { - "value": "3" - }, - "speed_infill": { - "value": "50.0" - }, - "speed_layer_0": { - "value": "15.0" - }, - "speed_print": { - "value": "50.0" - }, - "speed_topbottom": { - "value": "30.0" - }, - "speed_travel": { - "value": "50.0" - }, - "speed_wall_0": { - "value": "25.0" - }, - "speed_wall_x": { - "value": "35.0" - }, - "support_angle": { - "value": "60.0" - }, - "support_enable": { - "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" - }, - "support_pattern": { - "default_value": "lines" - }, - "support_type": { - "default_value": "everywhere" - }, - "support_xy_distance": { - "value": "0.7" - }, - "support_z_distance": { - "value": "0.35" - }, - "top_bottom_thickness": { - "value": "0.8" - }, - "wall_thickness": { - "value": "0.8" - } + "machine_height": { "value": "120" }, + "machine_name": { "default_value": "Renkforce RF100 V2" }, + "machine_start_gcode": { "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": "120" }, + "material_bed_temperature": { "enabled": false }, + "material_flow": { "value": "110" }, + "ooze_shield_enabled": { "value": "True" }, + "raft_airgap": { "value": "0.33" }, + "raft_base_line_spacing": { "value": "3.0" }, + "raft_base_line_width": { "value": "1.0" }, + "raft_base_thickness": { "value": "0.3" }, + "raft_interface_line_spacing": { "value": "3.0" }, + "raft_interface_line_width": { "value": "0.4" }, + "raft_interface_thickness": { "value": "0.27" }, + "raft_margin": { "value": "6.0" }, + "raft_speed": { "value": "20.0" }, + "raft_surface_layers": { "value": "2" }, + "raft_surface_line_spacing": { "value": "0.4" }, + "raft_surface_line_width": { "value": "0.4" }, + "raft_surface_thickness": { "value": "0.1" }, + "retraction_amount": { "value": "5.0" }, + "retraction_combing": { "value": "'all'" }, + "retraction_enable": { "value": "True" }, + "retraction_min_travel": { "value": "1.5" }, + "skin_overlap": { "value": "15.0" }, + "skirt_brim_minimal_length": { "value": "150.0" }, + "skirt_gap": { "value": "3.0" }, + "skirt_line_count": { "value": "3" }, + "speed_infill": { "value": "50.0" }, + "speed_layer_0": { "value": "15.0" }, + "speed_print": { "value": "50.0" }, + "speed_topbottom": { "value": "30.0" }, + "speed_travel": { "value": "50.0" }, + "speed_wall_0": { "value": "25.0" }, + "speed_wall_x": { "value": "35.0" }, + "support_angle": { "value": "60.0" }, + "support_enable": { "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" }, + "support_pattern": { "default_value": "lines" }, + "support_type": { "default_value": "everywhere" }, + "support_xy_distance": { "value": "0.7" }, + "support_z_distance": { "value": "0.35" }, + "top_bottom_thickness": { "value": "0.8" }, + "wall_thickness": { "value": "0.8" } } -} +} \ No newline at end of file diff --git a/resources/definitions/renkforce_rf100_xl.def.json b/resources/definitions/renkforce_rf100_xl.def.json index 02172dd317..9281ff5cd2 100644 --- a/resources/definitions/renkforce_rf100_xl.def.json +++ b/resources/definitions/renkforce_rf100_xl.def.json @@ -2,212 +2,80 @@ "version": 2, "name": "Renkforce RF100 XL", "inherits": "fdmprinter", - "metadata": { - "author": "Simon Peter (based on RF100.ini by Conrad Electronic SE)", - "file_formats": "text/x-gcode", - "manufacturer": "Renkforce", + "metadata": + { "visible": true, - "machine_extruder_trains": - { - "0": "renkforce_rf100_xl_extruder_0" - } + "author": "Simon Peter (based on RF100.ini by Conrad Electronic SE)", + "manufacturer": "Renkforce", + "file_formats": "text/x-gcode", + "machine_extruder_trains": { "0": "renkforce_rf100_xl_extruder_0" } }, - - "overrides": { - "adhesion_type": { - "default_value": "skirt" - }, - "bottom_thickness": { - "value": 0.6 - }, - "brim_width": { - "value": 3.0 - }, - "cool_fan_enabled": { - "value": true - }, - "cool_fan_full_at_height": { - "value": 0.5 - }, - "cool_fan_speed_max": { - "value": 100.0 - }, - "cool_fan_speed_min": { - "value": 100.0 - }, - "cool_lift_head": { - "value": true - }, - "cool_min_layer_time": { - "value": 1.0 - }, - "cool_min_speed": { - "value": 5.0 - }, - "infill_before_walls": { - "value": true - }, - "infill_line_width": { - "value": 0.6 - }, - "infill_overlap": { - "value": 15.0 - }, - "infill_sparse_density": { - "value": 26.0 - }, - "ironing_enabled": { - "value": true - }, - "layer_0_z_overlap": { - "value": 0.11 - }, - "layer_height_0": { - "value": 0.3 - }, - "machine_depth": { - "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" - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_height": { - "value": 200 - }, - "machine_name": { - "default_value": "Renkforce RF100 XL" - }, - "machine_start_gcode": { - "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 - }, - "material_bed_temperature": { - "value": 70 - }, - "ooze_shield_enabled": { - "value": true - }, - "raft_airgap": { - "value": 0.33 - }, - "raft_base_line_spacing": { - "value": 3.0 - }, - "raft_base_line_width": { - "value": 1.0 - }, - "raft_base_thickness": { - "value": 0.3 - }, - "raft_interface_line_spacing": { - "value": 3.0 - }, - "raft_interface_line_width": { - "value": 0.4 - }, - "raft_interface_thickness": { - "value": 0.27 - }, - "raft_margin": { - "value": 6.0 - }, - "raft_speed": { - "value": 20.0 - }, - "raft_surface_layers": { - "value": 2 - }, - "raft_surface_line_spacing": { - "value": 0.4 - }, - "raft_surface_line_width": { - "value": 0.4 - }, - "raft_surface_thickness": { - "value": 0.1 - }, - "retraction_amount": { - "value": 5.0 - }, - "retraction_combing": { - "value": "all" - }, - "retraction_enable": { - "value": true - }, - "retraction_min_travel": { - "value": 1.5 - }, - "skin_overlap": { - "value": 15.0 - }, - "skirt_brim_minimal_length": { - "value": 150.0 - }, - "skirt_gap": { - "value": 3.0 - }, - "skirt_line_count": { - "value": 3 - }, - "speed_infill": { - "value": 50.0 - }, - "speed_layer_0": { - "value": 15.0 - }, - "speed_print": { - "value": 50.0 - }, - "speed_topbottom": { - "value": 30.0 - }, - "speed_travel": { - "value": 50.0 - }, - "speed_wall_0": { - "value": 25.0 - }, - "speed_wall_x": { - "value": 35.0 - }, - "support_angle": { - "value": 60.0 - }, - "support_enable": { - "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 - }, - "support_pattern": { - "default_value": "lines" - }, - "support_type": { - "default_value": "everywhere" - }, - "support_xy_distance": { - "value": 0.7 - }, - "support_z_distance": { - "value": 0.35 - }, - "top_bottom_thickness": { - "value": 0.8 - }, - "wall_thickness": { - "value": 0.8 - } + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "bottom_thickness": { "value": 0.6 }, + "brim_width": { "value": 3.0 }, + "cool_fan_enabled": { "value": true }, + "cool_fan_full_at_height": { "value": 0.5 }, + "cool_fan_speed_max": { "value": 100.0 }, + "cool_fan_speed_min": { "value": 100.0 }, + "cool_lift_head": { "value": true }, + "cool_min_layer_time": { "value": 1.0 }, + "cool_min_speed": { "value": 5.0 }, + "infill_before_walls": { "value": true }, + "infill_line_width": { "value": 0.6 }, + "infill_overlap": { "value": 15.0 }, + "infill_sparse_density": { "value": 26.0 }, + "ironing_enabled": { "value": true }, + "layer_0_z_overlap": { "value": 0.11 }, + "layer_height_0": { "value": 0.3 }, + "machine_depth": { "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" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "value": 200 }, + "machine_name": { "default_value": "Renkforce RF100 XL" }, + "machine_start_gcode": { "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 }, + "material_bed_temperature": { "value": 70 }, + "ooze_shield_enabled": { "value": true }, + "raft_airgap": { "value": 0.33 }, + "raft_base_line_spacing": { "value": 3.0 }, + "raft_base_line_width": { "value": 1.0 }, + "raft_base_thickness": { "value": 0.3 }, + "raft_interface_line_spacing": { "value": 3.0 }, + "raft_interface_line_width": { "value": 0.4 }, + "raft_interface_thickness": { "value": 0.27 }, + "raft_margin": { "value": 6.0 }, + "raft_speed": { "value": 20.0 }, + "raft_surface_layers": { "value": 2 }, + "raft_surface_line_spacing": { "value": 0.4 }, + "raft_surface_line_width": { "value": 0.4 }, + "raft_surface_thickness": { "value": 0.1 }, + "retraction_amount": { "value": 5.0 }, + "retraction_combing": { "value": "all" }, + "retraction_enable": { "value": true }, + "retraction_min_travel": { "value": 1.5 }, + "skin_overlap": { "value": 15.0 }, + "skirt_brim_minimal_length": { "value": 150.0 }, + "skirt_gap": { "value": 3.0 }, + "skirt_line_count": { "value": 3 }, + "speed_infill": { "value": 50.0 }, + "speed_layer_0": { "value": 15.0 }, + "speed_print": { "value": 50.0 }, + "speed_topbottom": { "value": 30.0 }, + "speed_travel": { "value": 50.0 }, + "speed_wall_0": { "value": 25.0 }, + "speed_wall_x": { "value": 35.0 }, + "support_angle": { "value": 60.0 }, + "support_enable": { "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 }, + "support_pattern": { "default_value": "lines" }, + "support_type": { "default_value": "everywhere" }, + "support_xy_distance": { "value": 0.7 }, + "support_z_distance": { "value": 0.35 }, + "top_bottom_thickness": { "value": 0.8 }, + "wall_thickness": { "value": 0.8 } } -} +} \ No newline at end of file diff --git a/resources/definitions/rigid3d.def.json b/resources/definitions/rigid3d.def.json index d0c7b3ca31..62e4e70d7a 100644 --- a/resources/definitions/rigid3d.def.json +++ b/resources/definitions/rigid3d.def.json @@ -1,33 +1,32 @@ { - "name": "Rigid3D 2. Nesil", "version": 2, + "name": "Rigid3D 2. Nesil", "inherits": "rigid3d_base", - "metadata": { - "visible": true, - "quality_definition": "rigid3d_base", - - "preferred_quality_type": "standard" + "metadata": + { + "visible": true, + "preferred_quality_type": "standard", + "quality_definition": "rigid3d_base" }, - "overrides": { - "machine_name": { "default_value": "Rigid3D 2. Nesil" }, - - "machine_heated_bed": { "default_value": true }, - - "machine_width": { "default_value": 250 }, + "overrides": + { + "gantry_height": { "value": 20 }, + "machine_center_is_zero": { "default_value": false }, "machine_depth": { "default_value": 250 }, - "machine_height": { "default_value": 210 }, - - "machine_center_is_zero": { "default_value": false }, - - "machine_start_gcode": {"default_value": " ; -- START GCODE --\n G21\n G28 ; Home extruder\n G29 ; Autolevel bed\n M107 ; Turn off fan\n G90 ; Absolute positioning\n M82 ; Extruder in absolute mode\n G92 E0 ; Reset extruder position\n ; -- end of START GCODE --\n\n"}, - "machine_end_gcode": {"default_value": " ; -- END GCODE --\n G1 X0 Y230 ; Get extruder out of way.\n M107 ; Turn off fan\n G91 ; Relative positioning\n G0 Z20 ; Lift extruder up\n T0\n G1 E-1 ; Reduce filament pressure\n M104 T0 S0 ; Turn ectruder heater off\n G90 ; Absolute positioning\n G92 E0 ; Reset extruder position\n M140 S0 ; Disable heated bed\n M84 ; Turn steppers off\n ; -- end of END GCODE --\n"}, - - "machine_head_with_fans_polygon": { + "machine_end_gcode": { "default_value": " ; -- END GCODE --\n G1 X0 Y230 ; Get extruder out of way.\n M107 ; Turn off fan\n G91 ; Relative positioning\n G0 Z20 ; Lift extruder up\n T0\n G1 E-1 ; Reduce filament pressure\n M104 T0 S0 ; Turn ectruder heater off\n G90 ; Absolute positioning\n G92 E0 ; Reset extruder position\n M140 S0 ; Disable heated bed\n M84 ; Turn steppers off\n ; -- end of END GCODE --\n" }, + "machine_head_with_fans_polygon": + { "default_value": [ - [ -22, -67], [ -22, 51], [ 36, -67], [ 36, 51] - ] + [-22, -67], + [-22, 51], + [36, -67], + [36, 51] + ] }, - - "gantry_height": { "value": 20 } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 210 }, + "machine_name": { "default_value": "Rigid3D 2. Nesil" }, + "machine_start_gcode": { "default_value": " ; -- START GCODE --\n G21\n G28 ; Home extruder\n G29 ; Autolevel bed\n M107 ; Turn off fan\n G90 ; Absolute positioning\n M82 ; Extruder in absolute mode\n G92 E0 ; Reset extruder position\n ; -- end of START GCODE --\n\n" }, + "machine_width": { "default_value": 250 } } -} +} \ No newline at end of file diff --git a/resources/definitions/rigid3d_3rdgen.def.json b/resources/definitions/rigid3d_3rdgen.def.json index 7fd69164c3..c5a0e726c2 100644 --- a/resources/definitions/rigid3d_3rdgen.def.json +++ b/resources/definitions/rigid3d_3rdgen.def.json @@ -1,33 +1,32 @@ { - "name": "Rigid3D 3. Nesil", "version": 2, + "name": "Rigid3D 3. Nesil", "inherits": "rigid3d_base", - "metadata": { - "visible": true, - "quality_definition": "rigid3d_base", - - "preferred_quality_type": "standard" + "metadata": + { + "visible": true, + "preferred_quality_type": "standard", + "quality_definition": "rigid3d_base" }, - "overrides": { - "machine_name": { "default_value": "Rigid3D 3. Nesil" }, - - "machine_heated_bed": { "default_value": true }, - - "machine_width": { "default_value": 270 }, + "overrides": + { + "gantry_height": { "value": 20 }, + "machine_center_is_zero": { "default_value": false }, "machine_depth": { "default_value": 290 }, - "machine_height": { "default_value": 240 }, - - "machine_center_is_zero": { "default_value": false }, - - "machine_start_gcode": {"default_value": " ; -- START GCODE --\n G21\n G28 ; Home extruder\n G29 ; Autolevel bed\n M107 ; Turn off fan\n G90 ; Absolute positioning\n M82 ; Extruder in absolute mode\n G92 E0 ; Reset extruder position\n ; -- end of START GCODE --\n\n"}, - "machine_end_gcode": {"default_value": " ; -- END GCODE --\n G1 X0 Y230 ; Get extruder out of way.\n M107 ; Turn off fan\n G91 ; Relative positioning\n G0 Z20 ; Lift extruder up\n T0\n G1 E-1 ; Reduce filament pressure\n M104 T0 S0 ; Turn extruder heater off\n G90 ; Absolute positioning\n G92 E0 ; Reset extruder position\n M140 S0 ; Disable heated bed\n M84 ; Turn steppers off\n ; -- end of END GCODE --\n"}, - - "machine_head_with_fans_polygon": { + "machine_end_gcode": { "default_value": " ; -- END GCODE --\n G1 X0 Y230 ; Get extruder out of way.\n M107 ; Turn off fan\n G91 ; Relative positioning\n G0 Z20 ; Lift extruder up\n T0\n G1 E-1 ; Reduce filament pressure\n M104 T0 S0 ; Turn extruder heater off\n G90 ; Absolute positioning\n G92 E0 ; Reset extruder position\n M140 S0 ; Disable heated bed\n M84 ; Turn steppers off\n ; -- end of END GCODE --\n" }, + "machine_head_with_fans_polygon": + { "default_value": [ - [ -18, -20], [ -18, 45], [ 32, -20], [ 32, 45] - ] + [-18, -20], + [-18, 45], + [32, -20], + [32, 45] + ] }, - - "gantry_height": { "value": 20 } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 240 }, + "machine_name": { "default_value": "Rigid3D 3. Nesil" }, + "machine_start_gcode": { "default_value": " ; -- START GCODE --\n G21\n G28 ; Home extruder\n G29 ; Autolevel bed\n M107 ; Turn off fan\n G90 ; Absolute positioning\n M82 ; Extruder in absolute mode\n G92 E0 ; Reset extruder position\n ; -- end of START GCODE --\n\n" }, + "machine_width": { "default_value": 270 } } -} +} \ No newline at end of file diff --git a/resources/definitions/rigid3d_base.def.json b/resources/definitions/rigid3d_base.def.json index bc592ccff8..716b2e2ec4 100644 --- a/resources/definitions/rigid3d_base.def.json +++ b/resources/definitions/rigid3d_base.def.json @@ -1,30 +1,44 @@ { - "name": "Rigid3D Base Printer", "version": 2, + "name": "Rigid3D Base Printer", "inherits": "fdmprinter", - "metadata": { - "visible": false, - "author": "Mehmet SUTAŞ", - "manufacturer": "Rigid3D", + "metadata": + { + "visible": false, + "author": "Mehmet SUTA\u015e", + "manufacturer": "Rigid3D", "file_formats": "text/x-gcode", - "has_materials": true, - "has_machine_quality": true, - - "machine_extruder_trains":{ - "0": "rigid3d_base_extruder_0" - }, - "first_start_actions": ["MachineSettingsAction"], - "supported_actions": ["MachineSettingsAction"], - - "preferred_material": "generic_pla_175", "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", "dsm_novamid1070_175", - "emotiontech_abs", "emotiontech_absx", "emotiontech_acetate", "emotiontech_bvoh", "emotiontech_asax", "emotiontech_hips", "emotiontech_petg", "emotiontech_pla", "emotiontech_pva-m", "emotiontech_pva-oks", "emotiontech_pva-s", "emotiontech_tpu98a", - "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", - "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_bvoh", + "emotiontech_asax", + "emotiontech_hips", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pva-m", + "emotiontech_pva-oks", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "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", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", "fiberlogy_hd_pla", - "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", "generic_abs", "generic_bam", "generic_cffcpe", @@ -42,99 +56,111 @@ "generic_pva", "generic_tough_pla", "generic_tpu", - "imade3d_petg_175", "imade3d_pla_175", + "imade3d_petg_175", + "imade3d_pla_175", "innofill_innoflex60_175", - "leapfrog_abs_natural", "leapfrog_epla_natural", "leapfrog_pva_natural", + "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", + "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", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla", + "tizyx_pla_bois", + "tizyx_pva", "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", - "zyyx_pro_flex", "zyyx_pro_pla" - ] + "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", + "zyyx_pro_flex", + "zyyx_pro_pla" + ], + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, + "has_materials": true, + "machine_extruder_trains": { "0": "rigid3d_base_extruder_0" }, + "preferred_material": "generic_pla_175", + "supported_actions": [ "MachineSettingsAction" ] }, - "overrides": { - "machine_name": { "default_value": "Rigid3D Base Printer" }, - - "material_diameter": { "default_value": 1.75 }, - - "machine_max_feedrate_x": { "value": 100 }, - "machine_max_feedrate_y": { "value": 100 }, - "machine_max_feedrate_z": { "value": 8 }, - "machine_max_feedrate_e": { "value": 25 }, - - "machine_max_acceleration_x": { "value": 600 }, - "machine_max_acceleration_y": { "value": 600 }, - "machine_max_acceleration_z": { "value": 10 }, - "machine_max_acceleration_e": { "value": 1000 }, - "machine_acceleration": { "value": 600 }, - - "machine_max_jerk_xy": { "value": 10.0 }, - "machine_max_jerk_z": { "value": 0.3 }, - "machine_max_jerk_e": { "value": 5 }, - - - "wall_0_wipe_dist": { "value": 0.05 }, - "optimize_wall_printing_order": { "value": "True" }, - - "infill_sparse_density": { "value": 16 }, - "infill_wipe_dist": { "value": 0 }, - "infill_before_walls": { "value": "False" }, - - "material_initial_print_temperature": { "value": "material_print_temperature" }, - "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_bed_temperature_layer_0": { "value": "material_bed_temperature" }, - - "wall_0_material_flow": { "value": 95 }, - - "speed_print": { "value": 40.0 } , - "speed_topbottom": { "value": "speed_print" }, - "speed_support_interface": { "value": "speed_support" }, - "speed_travel": { "value": 80.0 }, - "speed_layer_0": { "value": 25.0 }, - - "acceleration_print": { "value": 600 }, + "overrides": + { + "acceleration_enabled": { "value": "False" }, + "acceleration_print": { "value": 600 }, "acceleration_travel": { "value": 600 }, "acceleration_travel_layer_0": { "value": "acceleration_travel" }, - + "adaptive_layer_height_variation": { "value": 0.16 }, + "adaptive_layer_height_variation_step": { "value": 0.04 }, + "adhesion_type": { "value": "'skirt'" }, + "infill_before_walls": { "value": "False" }, + "infill_sparse_density": { "value": 16 }, + "infill_wipe_dist": { "value": 0 }, + "jerk_enabled": { "value": "False" }, "jerk_print": { "value": 10 }, "jerk_travel": { "value": "jerk_print" }, "jerk_travel_layer_0": { "value": "jerk_travel" }, - - "acceleration_enabled": { "value": "False" }, - "jerk_enabled": { "value": "False" }, - - "retraction_amount": { "value": 1.50 }, - "retraction_prime_speed": { "value": 7 }, - "retraction_count_max": { "value": 5 }, - "retraction_combing": { "value": "'noskin'" }, - "travel_avoid_other_parts": { "value": "False" }, - - "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height * 2" }, - "support_interface_enable": { "value": true }, - "support_interface_density": { "value": 70 }, + "machine_acceleration": { "value": 600 }, + "machine_max_acceleration_e": { "value": 1000 }, + "machine_max_acceleration_x": { "value": 600 }, + "machine_max_acceleration_y": { "value": 600 }, + "machine_max_acceleration_z": { "value": 10 }, + "machine_max_feedrate_e": { "value": 25 }, + "machine_max_feedrate_x": { "value": 100 }, + "machine_max_feedrate_y": { "value": 100 }, + "machine_max_feedrate_z": { "value": 8 }, + "machine_max_jerk_e": { "value": 5 }, + "machine_max_jerk_xy": { "value": 10.0 }, + "machine_max_jerk_z": { "value": 0.3 }, + "machine_name": { "default_value": "Rigid3D Base Printer" }, + "material_bed_temperature_layer_0": { "value": "material_bed_temperature" }, + "material_diameter": { "default_value": 1.75 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "meshfix_maximum_deviation": { "value": 0.01 }, "minimum_interface_area": { "value": 5.0 }, "minimum_support_area": { "value": 5 }, + "optimize_wall_printing_order": { "value": "True" }, + "retraction_amount": { "value": 1.5 }, + "retraction_combing": { "value": "'noskin'" }, + "retraction_count_max": { "value": 5 }, + "retraction_prime_speed": { "value": 7 }, + "skirt_gap": { "value": 5.0 }, + "skirt_line_count": { "value": 2 }, + "speed_layer_0": { "value": 25.0 }, + "speed_print": { "value": 40.0 }, + "speed_support_interface": { "value": "speed_support" }, + "speed_topbottom": { "value": "speed_print" }, + "speed_travel": { "value": 80.0 }, + "speed_z_hop": { "default_value": 8 }, "support_brim_enable": { "value": "True" }, "support_brim_width": { "value": 4 }, + "support_interface_density": { "value": 70 }, + "support_interface_enable": { "value": true }, "support_xy_distance": { "value": "wall_line_width_0 * 2" }, "support_xy_distance_overhang": { "value": "wall_line_width_0" }, "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, - - "adhesion_type": { "value": "'skirt'" }, - "skirt_gap": { "value": 5.0 }, - "skirt_line_count": { "value": 2 }, - - "meshfix_maximum_deviation": { "value": 0.01 }, - - "adaptive_layer_height_variation": { "value": 0.16 }, - "adaptive_layer_height_variation_step": { "value": 0.04 }, - - "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, - "wall_thickness": {"value": "line_width * 2" }, - "speed_z_hop": {"default_value": 8} - + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height * 2" }, + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, + "travel_avoid_other_parts": { "value": "False" }, + "wall_0_material_flow": { "value": 95 }, + "wall_0_wipe_dist": { "value": 0.05 }, + "wall_thickness": { "value": "line_width * 2" } } } \ No newline at end of file diff --git a/resources/definitions/rigid3d_hobby.def.json b/resources/definitions/rigid3d_hobby.def.json index 19a65f7e1a..f625417b0b 100644 --- a/resources/definitions/rigid3d_hobby.def.json +++ b/resources/definitions/rigid3d_hobby.def.json @@ -1,26 +1,23 @@ { - "name": "Rigid3D Hobby", "version": 2, + "name": "Rigid3D Hobby", "inherits": "rigid3d_base", - "metadata": { - "visible": true, - "quality_definition": "rigid3d_base", - "preferred_quality_type": "standard", - - "preferred_material": "generic_pla_175", + "metadata": + { + "visible": true, "exclude_materials": [ - "chromatik_pla", + "chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_asax", - "emotiontech_hips", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pva-m", - "emotiontech_pva-oks", - "emotiontech_pva-s", - "emotiontech_tpu98a", + "emotiontech_abs", + "emotiontech_asax", + "emotiontech_hips", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pva-m", + "emotiontech_pva-oks", + "emotiontech_pva-s", + "emotiontech_tpu98a", "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", @@ -30,36 +27,36 @@ "filo3d_pla_green", "filo3d_pla_red", "generic_abs", - "generic_abs_175", + "generic_abs_175", "generic_bam", "generic_cffcpe", "generic_cffpa", "generic_cpe", - "generic_cpe_175", + "generic_cpe_175", "generic_cpe_plus", "generic_gffcpe", "generic_gffpa", "generic_hips", - "generic_hips_175", + "generic_hips_175", "generic_nylon", - "generic_nylon_175", + "generic_nylon_175", "generic_pc", - "generic_pc_175", + "generic_pc_175", "generic_petg", - "generic_petg_175", + "generic_petg_175", "generic_pla", "generic_pp", "generic_pva", - "generic_pva_175", + "generic_pva_175", "generic_tough_pla", "generic_tpu", - "generic_tpu_175", + "generic_tpu_175", "imade3d_petg_175", "imade3d_pla_175", "innofill_innoflex60_175", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", "octofiber_pla", "polyflex_pla", "polymax_pla", @@ -83,28 +80,30 @@ "Vertex_Delta_TPU", "zyyx_pro_flex", "zyyx_pro_pla" - ] + ], + "preferred_material": "generic_pla_175", + "preferred_quality_type": "standard", + "quality_definition": "rigid3d_base" }, - "overrides": { - "machine_name": { "default_value": "Rigid3D Hobby" }, - - "machine_heated_bed": { "default_value": false }, - - "machine_width": { "default_value": 150 }, + "overrides": + { + "gantry_height": { "value": 20 }, + "machine_center_is_zero": { "default_value": false }, "machine_depth": { "default_value": 150 }, - "machine_height": { "default_value": 150 }, - - "machine_center_is_zero": { "default_value": false }, - - "machine_start_gcode": {"default_value": "G21\nG28 ; Home extruder\nM420 S1 ; Enable MBL\nM107 ; Turn off fan\nG91 ; Relative positioning\nG1 Z5 F180;\nG1 X30 Y30 F3000;\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG92 E0 ; Reset extruder position\n"}, - "machine_end_gcode": {"default_value": "G1 X0 Y145 ; Get extruder out of way.\nM107 ; Turn off fan\nG91 ; Relative positioning\nG0 Z20 ; Lift extruder up\nT0\nG1 E-1 ; Reduce filament pressure\nM104 T0 S0 ; Turn extruder heater off\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM84 ; Turn steppers off\n"}, - - "machine_head_with_fans_polygon": { + "machine_end_gcode": { "default_value": "G1 X0 Y145 ; Get extruder out of way.\nM107 ; Turn off fan\nG91 ; Relative positioning\nG0 Z20 ; Lift extruder up\nT0\nG1 E-1 ; Reduce filament pressure\nM104 T0 S0 ; Turn extruder heater off\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM84 ; Turn steppers off\n" }, + "machine_head_with_fans_polygon": + { "default_value": [ - [ -16, -30], [ -16, 45], [ 16, -30], [ 16, 45] - ] + [-16, -30], + [-16, 45], + [16, -30], + [16, 45] + ] }, - - "gantry_height": { "value": 20 } + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 150 }, + "machine_name": { "default_value": "Rigid3D Hobby" }, + "machine_start_gcode": { "default_value": "G21\nG28 ; Home extruder\nM420 S1 ; Enable MBL\nM107 ; Turn off fan\nG91 ; Relative positioning\nG1 Z5 F180;\nG1 X30 Y30 F3000;\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG92 E0 ; Reset extruder position\n" }, + "machine_width": { "default_value": 150 } } -} +} \ No newline at end of file diff --git a/resources/definitions/rigid3d_mucit.def.json b/resources/definitions/rigid3d_mucit.def.json index ad0d4c7463..64c419e77d 100644 --- a/resources/definitions/rigid3d_mucit.def.json +++ b/resources/definitions/rigid3d_mucit.def.json @@ -1,28 +1,24 @@ { - "name": "Rigid3D Mucit", "version": 2, + "name": "Rigid3D Mucit", "inherits": "rigid3d_base", - "metadata": { - "visible": true, - "quality_definition": "rigid3d_base", - "preferred_quality_type": "standard", - "platform": "rigid3d_mucit_platform.3mf", - "platform_offset": [ 0, -19, 0], - - "preferred_material": "generic_pla_175", + "metadata": + { + "visible": true, + "platform": "rigid3d_mucit_platform.3mf", "exclude_materials": [ - "chromatik_pla", + "chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_asax", - "emotiontech_hips", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pva-m", - "emotiontech_pva-oks", - "emotiontech_pva-s", - "emotiontech_tpu98a", + "emotiontech_abs", + "emotiontech_asax", + "emotiontech_hips", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pva-m", + "emotiontech_pva-oks", + "emotiontech_pva-s", + "emotiontech_tpu98a", "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", @@ -32,36 +28,36 @@ "filo3d_pla_green", "filo3d_pla_red", "generic_abs", - "generic_abs_175", + "generic_abs_175", "generic_bam", "generic_cffcpe", "generic_cffpa", "generic_cpe", - "generic_cpe_175", + "generic_cpe_175", "generic_cpe_plus", "generic_gffcpe", "generic_gffpa", "generic_hips", - "generic_hips_175", + "generic_hips_175", "generic_nylon", - "generic_nylon_175", + "generic_nylon_175", "generic_pc", - "generic_pc_175", + "generic_pc_175", "generic_petg", - "generic_petg_175", + "generic_petg_175", "generic_pla", "generic_pp", "generic_pva", - "generic_pva_175", + "generic_pva_175", "generic_tough_pla", "generic_tpu", - "generic_tpu_175", + "generic_tpu_175", "imade3d_petg_175", "imade3d_pla_175", "innofill_innoflex60_175", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", "octofiber_pla", "polyflex_pla", "polymax_pla", @@ -85,28 +81,35 @@ "Vertex_Delta_TPU", "zyyx_pro_flex", "zyyx_pro_pla" - ] + ], + "platform_offset": [ + 0, + -19, + 0 + ], + "preferred_material": "generic_pla_175", + "preferred_quality_type": "standard", + "quality_definition": "rigid3d_base" }, - "overrides": { - "machine_name": { "default_value": "Rigid3D Mucit" }, - - "machine_heated_bed": { "default_value": false }, - - "machine_width": { "default_value": 150 }, + "overrides": + { + "gantry_height": { "value": 20 }, + "machine_center_is_zero": { "default_value": false }, "machine_depth": { "default_value": 150 }, - "machine_height": { "default_value": 150 }, - - "machine_center_is_zero": { "default_value": false }, - - "machine_start_gcode": {"default_value": "G21\nG28 ; Home extruder\nM420 S1 ; Enable MBL\nM107 ; Turn off fan\nG91 ; Relative positioning\nG1 Z5 F180;\nG1 X30 Y30 F3000;\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG92 E0 ; Reset extruder position\n"}, - "machine_end_gcode": {"default_value": "G1 X0 Y145 ; Get extruder out of way.\nM107 ; Turn off fan\nG91 ; Relative positioning\nG0 Z20 ; Lift extruder up\nT0\nG1 E-1 ; Reduce filament pressure\nM104 T0 S0 ; Turn extruder heater off\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM84 ; Turn steppers off\n"}, - - "machine_head_with_fans_polygon": { + "machine_end_gcode": { "default_value": "G1 X0 Y145 ; Get extruder out of way.\nM107 ; Turn off fan\nG91 ; Relative positioning\nG0 Z20 ; Lift extruder up\nT0\nG1 E-1 ; Reduce filament pressure\nM104 T0 S0 ; Turn extruder heater off\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM84 ; Turn steppers off\n" }, + "machine_head_with_fans_polygon": + { "default_value": [ - [ -20, 102], [ -20, -45], [ 45, -45], [ 45, 102] - ] + [-20, 102], + [-20, -45], + [45, -45], + [45, 102] + ] }, - - "gantry_height": { "value": 20 } + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 150 }, + "machine_name": { "default_value": "Rigid3D Mucit" }, + "machine_start_gcode": { "default_value": "G21\nG28 ; Home extruder\nM420 S1 ; Enable MBL\nM107 ; Turn off fan\nG91 ; Relative positioning\nG1 Z5 F180;\nG1 X30 Y30 F3000;\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG92 E0 ; Reset extruder position\n" }, + "machine_width": { "default_value": 150 } } -} +} \ No newline at end of file diff --git a/resources/definitions/rigid3d_mucit2.def.json b/resources/definitions/rigid3d_mucit2.def.json index 42499ba5e1..85f2e202c8 100644 --- a/resources/definitions/rigid3d_mucit2.def.json +++ b/resources/definitions/rigid3d_mucit2.def.json @@ -1,35 +1,39 @@ { - "name": "Rigid3D Mucit2", "version": 2, + "name": "Rigid3D Mucit2", "inherits": "rigid3d_base", - "metadata": { + "metadata": + { "visible": true, - "quality_definition": "rigid3d_base", - "preferred_quality_type": "standard", "platform": "rigid3d_mucit2_platform.3mf", - "platform_offset": [ 0, 0, 0], - - "preferred_material": "generic_pla_175" + "platform_offset": [ + 0, + 0, + 0 + ], + "preferred_material": "generic_pla_175", + "preferred_quality_type": "standard", + "quality_definition": "rigid3d_base" }, - "overrides": { - "machine_name": { "default_value": "Rigid3D Mucit2" }, - - "machine_heated_bed": { "default_value": true }, - - "machine_width": { "default_value": 150 }, - "machine_depth": { "default_value": 150 }, - "machine_height": { "default_value": 150 }, - + "overrides": + { + "gantry_height": { "value": 30 }, "machine_center_is_zero": { "default_value": false }, - - "machine_start_gcode": {"default_value": "G21\nG28\nM420 S1\nM107\nG90\nM82\nG92 E0\n"}, - "machine_end_gcode": {"default_value": "G92 E0\nT0\nG1 F1800 E-2\nG27 P2\nM107\nM104 T0 S0\nM140 S0\nG90\nG92 E0\nM84\n"}, - - "machine_head_with_fans_polygon": { + "machine_depth": { "default_value": 150 }, + "machine_end_gcode": { "default_value": "G92 E0\nT0\nG1 F1800 E-2\nG27 P2\nM107\nM104 T0 S0\nM140 S0\nG90\nG92 E0\nM84\n" }, + "machine_head_with_fans_polygon": + { "default_value": [ - [ -20, 40], [ -20, -65], [ 40, -65], [ 40, 40]] + [-20, 40], + [-20, -65], + [40, -65], + [40, 40] + ] }, - - "gantry_height": { "value": 30 } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 150 }, + "machine_name": { "default_value": "Rigid3D Mucit2" }, + "machine_start_gcode": { "default_value": "G21\nG28\nM420 S1\nM107\nG90\nM82\nG92 E0\n" }, + "machine_width": { "default_value": 150 } } -} +} \ No newline at end of file diff --git a/resources/definitions/rigid3d_zero.def.json b/resources/definitions/rigid3d_zero.def.json index d4db4f1281..887643450a 100644 --- a/resources/definitions/rigid3d_zero.def.json +++ b/resources/definitions/rigid3d_zero.def.json @@ -1,26 +1,23 @@ { - "name": "Rigid3D Zero", "version": 2, + "name": "Rigid3D Zero", "inherits": "rigid3d_base", - "metadata": { - "visible": true, - "quality_definition": "rigid3d_base", - "preferred_quality_type": "standard", - - "preferred_material": "generic_pla_175", + "metadata": + { + "visible": true, "exclude_materials": [ - "chromatik_pla", + "chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_asax", - "emotiontech_hips", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pva-m", - "emotiontech_pva-oks", - "emotiontech_pva-s", - "emotiontech_tpu98a", + "emotiontech_abs", + "emotiontech_asax", + "emotiontech_hips", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pva-m", + "emotiontech_pva-oks", + "emotiontech_pva-s", + "emotiontech_tpu98a", "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", @@ -30,36 +27,36 @@ "filo3d_pla_green", "filo3d_pla_red", "generic_abs", - "generic_abs_175", + "generic_abs_175", "generic_bam", "generic_cffcpe", "generic_cffpa", "generic_cpe", - "generic_cpe_175", + "generic_cpe_175", "generic_cpe_plus", "generic_gffcpe", "generic_gffpa", "generic_hips", - "generic_hips_175", + "generic_hips_175", "generic_nylon", - "generic_nylon_175", + "generic_nylon_175", "generic_pc", - "generic_pc_175", + "generic_pc_175", "generic_petg", - "generic_petg_175", + "generic_petg_175", "generic_pla", "generic_pp", "generic_pva", - "generic_pva_175", + "generic_pva_175", "generic_tough_pla", "generic_tpu", - "generic_tpu_175", + "generic_tpu_175", "imade3d_petg_175", "imade3d_pla_175", "innofill_innoflex60_175", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", "octofiber_pla", "polyflex_pla", "polymax_pla", @@ -83,28 +80,30 @@ "Vertex_Delta_TPU", "zyyx_pro_flex", "zyyx_pro_pla" - ] + ], + "preferred_material": "generic_pla_175", + "preferred_quality_type": "standard", + "quality_definition": "rigid3d_base" }, - "overrides": { - "machine_name": { "default_value": "Rigid3D Zero" }, - - "machine_heated_bed": { "default_value": false }, - - "machine_width": { "default_value": 250 }, + "overrides": + { + "gantry_height": { "value": 20 }, + "machine_center_is_zero": { "default_value": false }, "machine_depth": { "default_value": 250 }, - "machine_height": { "default_value": 190 }, - - "machine_center_is_zero": { "default_value": false }, - - "machine_start_gcode": {"default_value": " ; -- START GCODE --\n G21\n G28 ; Home extruder\n G29 ; Autolevel bed\n M107 ; Turn off fan\n G90 ; Absolute positioning\n M82 ; Extruder in absolute mode\n G92 E0 ; Reset extruder position\n ; -- end of START GCODE --\n\n"}, - "machine_end_gcode": {"default_value": " ; -- END GCODE --\n G1 X0 Y230 ; Get extruder out of way.\n M107 ; Turn off fan\n G91 ; Relative positioning\n G0 Z20 ; Lift extruder up\n T0\n G1 E-1 ; Reduce filament pressure\n M104 T0 S0 ; Turn ectruder heater off\n G90 ; Absolute positioning\n G92 E0 ; Reset extruder position\n M140 S0 ; Disable heated bed\n M84 ; Turn steppers off\n ; -- end of END GCODE --\n"}, - - "machine_head_with_fans_polygon": { + "machine_end_gcode": { "default_value": " ; -- END GCODE --\n G1 X0 Y230 ; Get extruder out of way.\n M107 ; Turn off fan\n G91 ; Relative positioning\n G0 Z20 ; Lift extruder up\n T0\n G1 E-1 ; Reduce filament pressure\n M104 T0 S0 ; Turn ectruder heater off\n G90 ; Absolute positioning\n G92 E0 ; Reset extruder position\n M140 S0 ; Disable heated bed\n M84 ; Turn steppers off\n ; -- end of END GCODE --\n" }, + "machine_head_with_fans_polygon": + { "default_value": [ - [ -40, -15], [ -40, 60], [ 30, -15], [ 30, 60] - ] + [-40, -15], + [-40, 60], + [30, -15], + [30, 60] + ] }, - - "gantry_height": { "value": 20 } + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 190 }, + "machine_name": { "default_value": "Rigid3D Zero" }, + "machine_start_gcode": { "default_value": " ; -- START GCODE --\n G21\n G28 ; Home extruder\n G29 ; Autolevel bed\n M107 ; Turn off fan\n G90 ; Absolute positioning\n M82 ; Extruder in absolute mode\n G92 E0 ; Reset extruder position\n ; -- end of START GCODE --\n\n" }, + "machine_width": { "default_value": 250 } } -} +} \ No newline at end of file diff --git a/resources/definitions/rigid3d_zero2.def.json b/resources/definitions/rigid3d_zero2.def.json index 8b0defb67a..eaa51d6606 100644 --- a/resources/definitions/rigid3d_zero2.def.json +++ b/resources/definitions/rigid3d_zero2.def.json @@ -1,34 +1,33 @@ { - "name": "Rigid3D Zero2", "version": 2, + "name": "Rigid3D Zero2", "inherits": "rigid3d_base", - "metadata": { - "visible": true, - "quality_definition": "rigid3d_base", - "preferred_quality_type": "standard", - - "platform": "rigid3d_zero2_platform.3mf" + "metadata": + { + "visible": true, + "platform": "rigid3d_zero2_platform.3mf", + "preferred_quality_type": "standard", + "quality_definition": "rigid3d_base" }, - "overrides": { - "machine_name": { "default_value": "Rigid3D Zero2" }, - - "machine_heated_bed": { "default_value": true }, - - "machine_width": { "default_value": 200 }, + "overrides": + { + "gantry_height": { "value": 25 }, + "machine_center_is_zero": { "default_value": false }, "machine_depth": { "default_value": 200 }, - "machine_height": { "default_value": 192 }, - - "machine_center_is_zero": { "default_value": false }, - - "machine_start_gcode": {"default_value": "; -- START GCODE --\nG21 ; mm olculer\nG28 ; Eksenleri sifirla\nM420 S1 ; Yazilim destekli tabla seviyeleme\nM107 ; Fani kapat\nG90 ; Mutlak konumlama\nG1 Z5 F180 ; Z eksenini 5mm yukselt\nG1 X30 Y30 F3000 ; Konuma git\nM82 ; Ekstruder mutlak mod\nG92 E0 ; Ekstruder konumu sifirla\n; -- end of START GCODE --"}, - "machine_end_gcode": {"default_value": "; -- END GCODE --\nG1 X0 Y180 ; Konuma git\nM107 ; Fani kapat\nG91 ; Goreceli konumlama\nG0 Z20 ; Tablayi alcalt\nT0\nG1 E-2 ; Filaman basincini dusur\nM104 T0 S0 ; Ekstruder isiticiyi kapat\nG90 ; Mutlak konumlama\nG92 E0 ; Ekstruder konumu sifirla\nM140 S0 ; Tabla isiticiyi kapat\nM84 ; Motorlari durdur\nM300 S2093 P150 ; Baski sonu melodisi\nM300 S2637 P150\nM300 S3135 P150\nM300 S4186 P150\nM300 S3135 P150\nM300 S2637 P150\nM300 S2793 P150\nM300 S2349 P150\nM300 S1975 P150\nM300 S2093 P450\n; -- end of END GCODE --\n"}, - - "machine_head_with_fans_polygon": { + "machine_end_gcode": { "default_value": "; -- END GCODE --\nG1 X0 Y180 ; Konuma git\nM107 ; Fani kapat\nG91 ; Goreceli konumlama\nG0 Z20 ; Tablayi alcalt\nT0\nG1 E-2 ; Filaman basincini dusur\nM104 T0 S0 ; Ekstruder isiticiyi kapat\nG90 ; Mutlak konumlama\nG92 E0 ; Ekstruder konumu sifirla\nM140 S0 ; Tabla isiticiyi kapat\nM84 ; Motorlari durdur\nM300 S2093 P150 ; Baski sonu melodisi\nM300 S2637 P150\nM300 S3135 P150\nM300 S4186 P150\nM300 S3135 P150\nM300 S2637 P150\nM300 S2793 P150\nM300 S2349 P150\nM300 S1975 P150\nM300 S2093 P450\n; -- end of END GCODE --\n" }, + "machine_head_with_fans_polygon": + { "default_value": [ - [ -30, 65], [ -30, -30], [ 30, -30], [ 30, 65] - ] + [-30, 65], + [-30, -30], + [30, -30], + [30, 65] + ] }, - - "gantry_height": { "value": 25 } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 192 }, + "machine_name": { "default_value": "Rigid3D Zero2" }, + "machine_start_gcode": { "default_value": "; -- START GCODE --\nG21 ; mm olculer\nG28 ; Eksenleri sifirla\nM420 S1 ; Yazilim destekli tabla seviyeleme\nM107 ; Fani kapat\nG90 ; Mutlak konumlama\nG1 Z5 F180 ; Z eksenini 5mm yukselt\nG1 X30 Y30 F3000 ; Konuma git\nM82 ; Ekstruder mutlak mod\nG92 E0 ; Ekstruder konumu sifirla\n; -- end of START GCODE --" }, + "machine_width": { "default_value": 200 } } -} +} \ No newline at end of file diff --git a/resources/definitions/rigidbot.def.json b/resources/definitions/rigidbot.def.json index 00062b1f52..e9e4d56629 100644 --- a/resources/definitions/rigidbot.def.json +++ b/resources/definitions/rigidbot.def.json @@ -2,70 +2,34 @@ "version": 2, "name": "RigidBot", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "RBC", "manufacturer": "RigidBot", "file_formats": "text/x-gcode", "platform": "rigidbot_platform.3mf", - "machine_extruder_trains": - { - "0": "rigidbot_extruder_0" - } + "machine_extruder_trains": { "0": "rigidbot_extruder_0" } }, - - "overrides": { + "overrides": + { + "cool_fan_enabled": { "default_value": false }, + "gantry_height": { "value": "0" }, + "layer_height": { "default_value": 0.2 }, + "machine_depth": { "default_value": 254 }, + "machine_end_gcode": { "default_value": ";End GCode\nM104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+10 E-1 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y230 F3000 ;move Y so the head is out of the way and Plate is moved forward\nM84 ;steppers off\nG90 ;absolute positioning" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 254 }, "machine_name": { "default_value": "RigidBot" }, - "machine_width": { - "default_value": 254 - }, - "machine_depth": { - "default_value": 254 - }, - "machine_height": { - "default_value": 254 - }, - "machine_heated_bed": { - "default_value": true - }, - "gantry_height": { - "value": "0" - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": ";Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {infill_sparse_density}\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nM205 X8 ;X/Y Jerk settings\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E7 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\n;Put printing message on LCD screen\nM117 Rigibot Printing..." - }, - "machine_end_gcode": { - "default_value": ";End GCode\nM104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+10 E-1 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y230 F3000 ;move Y so the head is out of the way and Plate is moved forward\nM84 ;steppers off\nG90 ;absolute positioning" - }, - "layer_height": { - "default_value": 0.2 - }, - "wall_thickness": { - "value": "0.8" - }, - "top_bottom_thickness": { - "default_value": 0.3 - }, - "speed_print": { - "default_value": 60 - }, - "speed_layer_0": { - "minimum_value": "0.1" - }, - "cool_fan_enabled": { - "default_value": false - }, - "skirt_line_count": { - "default_value": 3 - }, - "skirt_gap": { - "default_value": 4 - }, - "skirt_brim_minimal_length": { - "default_value": 200 - } + "machine_start_gcode": { "default_value": ";Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {infill_sparse_density}\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nM205 X8 ;X/Y Jerk settings\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E7 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\n;Put printing message on LCD screen\nM117 Rigibot Printing..." }, + "machine_width": { "default_value": 254 }, + "skirt_brim_minimal_length": { "default_value": 200 }, + "skirt_gap": { "default_value": 4 }, + "skirt_line_count": { "default_value": 3 }, + "speed_layer_0": { "minimum_value": "0.1" }, + "speed_print": { "default_value": 60 }, + "top_bottom_thickness": { "default_value": 0.3 }, + "wall_thickness": { "value": "0.8" } } -} +} \ No newline at end of file diff --git a/resources/definitions/rigidbot_big.def.json b/resources/definitions/rigidbot_big.def.json index a3df390cfa..e0c8df7ae6 100644 --- a/resources/definitions/rigidbot_big.def.json +++ b/resources/definitions/rigidbot_big.def.json @@ -2,70 +2,34 @@ "version": 2, "name": "RigidBotBig", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "RBC", "manufacturer": "RigidBot", "file_formats": "text/x-gcode", "platform": "rigidbotbig_platform.3mf", - "machine_extruder_trains": - { - "0": "rigidbot_big_extruder_0" - } + "machine_extruder_trains": { "0": "rigidbot_big_extruder_0" } }, - - "overrides": { + "overrides": + { + "cool_fan_enabled": { "default_value": false }, + "gantry_height": { "value": "0" }, + "layer_height": { "default_value": 0.2 }, + "machine_depth": { "default_value": 300 }, + "machine_end_gcode": { "default_value": ";End GCode\nM104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+10 E-1 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y230 F3000 ;move Y so the head is out of the way and Plate is moved forward\nM84 ;steppers off\nG90 ;absolute positioning" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 254 }, "machine_name": { "default_value": "RigidBotBig" }, - "machine_width": { - "default_value": 400 - }, - "machine_depth": { - "default_value": 300 - }, - "machine_height": { - "default_value": 254 - }, - "machine_heated_bed": { - "default_value": true - }, - "gantry_height": { - "value": "0" - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": ";Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {infill_sparse_density}\n;Print time: {print_time}\n;M190 S{material_bed_temperature} ;Uncomment to add your own bed temperature line\n;M109 S{material_print_temperature} ;Uncomment to add your own temperature line\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nM205 X8 ;X/Y Jerk settings\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E7 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\n;Put printing message on LCD screen\nM117 Rigibot Printing..." - }, - "machine_end_gcode": { - "default_value": ";End GCode\nM104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+10 E-1 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y230 F3000 ;move Y so the head is out of the way and Plate is moved forward\nM84 ;steppers off\nG90 ;absolute positioning" - }, - "layer_height": { - "default_value": 0.2 - }, - "wall_thickness": { - "value": "0.8" - }, - "top_bottom_thickness": { - "default_value": 0.3 - }, - "speed_print": { - "default_value": 60 - }, - "speed_layer_0": { - "minimum_value": "0.1" - }, - "cool_fan_enabled": { - "default_value": false - }, - "skirt_line_count": { - "default_value": 3 - }, - "skirt_gap": { - "default_value": 4 - }, - "skirt_brim_minimal_length": { - "default_value": 200 - } + "machine_start_gcode": { "default_value": ";Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {infill_sparse_density}\n;Print time: {print_time}\n;M190 S{material_bed_temperature} ;Uncomment to add your own bed temperature line\n;M109 S{material_print_temperature} ;Uncomment to add your own temperature line\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nM205 X8 ;X/Y Jerk settings\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E7 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\n;Put printing message on LCD screen\nM117 Rigibot Printing..." }, + "machine_width": { "default_value": 400 }, + "skirt_brim_minimal_length": { "default_value": 200 }, + "skirt_gap": { "default_value": 4 }, + "skirt_line_count": { "default_value": 3 }, + "speed_layer_0": { "minimum_value": "0.1" }, + "speed_print": { "default_value": 60 }, + "top_bottom_thickness": { "default_value": 0.3 }, + "wall_thickness": { "value": "0.8" } } } \ No newline at end of file diff --git a/resources/definitions/robo_3d_r1.def.json b/resources/definitions/robo_3d_r1.def.json index 0187d13dd0..c664107aa1 100644 --- a/resources/definitions/robo_3d_r1.def.json +++ b/resources/definitions/robo_3d_r1.def.json @@ -1,49 +1,47 @@ { - "name": "Robo 3D R1", "version": 2, + "name": "Robo 3D R1", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "manufacturer": "Robo 3D", "file_formats": "text/x-gcode", - "platform_offset": [ 0, 0, 0], - "machine_extruder_trains": - { - "0": "robo_3d_r1_extruder_0" - } + "machine_extruder_trains": { "0": "robo_3d_r1_extruder_0" }, + "platform_offset": [ + 0, + 0, + 0 + ] }, - - "overrides": { - "machine_start_gcode": { - "default_value": " G92 E0 ;\n M565 Z-1 ;\n G1 Z5 F5000 ;\n G29 ;\n" - }, - "machine_end_gcode": { - "default_value": " M104 S0 ;extruder heater off\n M140 S0 ;heated bed heater off (if you have it)\n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning\n" - }, - "cool_min_layer_time": { "default_value": 7 }, - "retraction_speed": { "default_value": 50 }, - "cool_min_speed": { "default_value": 19 }, - "support_angle": { "default_value": 50 }, - "prime_tower_size": { "default_value": 8.660254037844387 }, - "support_enable": { "default_value": true }, - "raft_airgap": { "default_value": 0.2 }, - "layer_height_0": { "default_value": 0.15 }, - "material_flow": { "default_value": 100 }, - "infill_sparse_density": { "default_value": 10 }, - "wall_thickness": { "value": "1.2" }, - "retraction_amount": { "default_value": 3 }, - "layer_height": { "default_value": 0.2 }, - "speed_print": { "default_value": 40 }, - "machine_extruder_count": { "default_value": 1 }, - "retraction_combing": { "value": "'off'" }, - "machine_heated_bed": { "default_value": true }, - "machine_center_is_zero": { "default_value": false }, - "machine_height": { "default_value": 210 }, + "overrides": + { "adhesion_type": { "default_value": "raft" }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "cool_min_layer_time": { "default_value": 7 }, + "cool_min_speed": { "default_value": 19 }, + "infill_sparse_density": { "default_value": 10 }, + "layer_height": { "default_value": 0.2 }, + "layer_height_0": { "default_value": 0.15 }, + "machine_center_is_zero": { "default_value": false }, "machine_depth": { "default_value": 245 }, + "machine_end_gcode": { "default_value": " M104 S0 ;extruder heater off\n M140 S0 ;heated bed heater off (if you have it)\n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning\n" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 210 }, + "machine_name": { "default_value": "ROBO 3D R1" }, + "machine_start_gcode": { "default_value": " G92 E0 ;\n M565 Z-1 ;\n G1 Z5 F5000 ;\n G29 ;\n" }, "machine_width": { "default_value": 225 }, + "material_flow": { "default_value": 100 }, + "prime_tower_size": { "default_value": 8.660254037844387 }, + "raft_airgap": { "default_value": 0.2 }, + "retraction_amount": { "default_value": 3 }, + "retraction_combing": { "value": "'off'" }, + "retraction_speed": { "default_value": 50 }, + "speed_print": { "default_value": 40 }, + "support_angle": { "default_value": 50 }, + "support_enable": { "default_value": true }, "support_z_distance": { "default_value": 0.22 }, - "machine_name": { "default_value": "ROBO 3D R1" } + "wall_thickness": { "value": "1.2" } } -} +} \ No newline at end of file diff --git a/resources/definitions/seckit_skgo.def.json b/resources/definitions/seckit_skgo.def.json index cb413cd9ba..0b58667882 100644 --- a/resources/definitions/seckit_skgo.def.json +++ b/resources/definitions/seckit_skgo.def.json @@ -2,58 +2,37 @@ "version": 2, "name": "SecKit SK-Go", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Ernest Lin", "manufacturer": "SecKit 3DP Design", "file_formats": "text/x-gcode", - "has_materials": true, "has_machine_quality": false, - "preferred_quality_type": "normal", - "machine_extruder_trains": - { - "0": "seckit_skgo_extruder_0" - } + "has_materials": true, + "machine_extruder_trains": { "0": "seckit_skgo_extruder_0" }, + "preferred_quality_type": "normal" }, - - - "overrides": { - "machine_name": { "default_value": "SecKit SK-Go" }, - "machine_width": { - "default_value": 310 - }, - "machine_depth": { - "default_value": 310 - }, - "machine_height": { - "default_value": 350 - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_heated_bed": { - "default_value": true - }, + "overrides": + { + "gantry_height": { "value": "50" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 310 }, + "machine_end_gcode": { "default value": "M104 S0\nM140 S0\nG91 ; relative position\nG1 Z10 F450\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG90 ; abs position\nG1 X10 Y280 F6000\nM84" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_head_with_fans_polygon": { "default_value": [ - [ -10, 20 ], - [ -10, -20 ], - [ 10, 20 ], - [ 10, -20 ] + [-10, 20], + [-10, -20], + [10, 20], + [10, -20] ] }, - "gantry_height": { - "value": "50" - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "M569 S1 X Y ; enable StealthChop for Sensorless Homing\nG28 ; Home\nM569 S0 X Y ; disable StealthChop for normal print\nM900 K0.07 ; K factor of linear advance\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0\nG90 ; abs position" - }, - "machine_end_gcode": { - "default value": "M104 S0\nM140 S0\nG91 ; relative position\nG1 Z10 F450\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG90 ; abs position\nG1 X10 Y280 F6000\nM84" - } - } -} + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 350 }, + "machine_name": { "default_value": "SecKit SK-Go" }, + "machine_start_gcode": { "default_value": "M569 S1 X Y ; enable StealthChop for Sensorless Homing\nG28 ; Home\nM569 S0 X Y ; disable StealthChop for normal print\nM900 K0.07 ; K factor of linear advance\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0\nG90 ; abs position" }, + "machine_width": { "default_value": 310 } + } +} \ No newline at end of file diff --git a/resources/definitions/seckit_sktank.def.json b/resources/definitions/seckit_sktank.def.json index 4b3795d619..5cf31c97b6 100644 --- a/resources/definitions/seckit_sktank.def.json +++ b/resources/definitions/seckit_sktank.def.json @@ -2,58 +2,37 @@ "version": 2, "name": "SecKit SK-Tank", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Ernest Lin", "manufacturer": "SecKit 3DP Design", "file_formats": "text/x-gcode", - "has_materials": true, "has_machine_quality": false, - "preferred_quality_type": "normal", - "machine_extruder_trains": - { - "0": "seckit_sktank_extruder_0" - } + "has_materials": true, + "machine_extruder_trains": { "0": "seckit_sktank_extruder_0" }, + "preferred_quality_type": "normal" }, - - - "overrides": { - "machine_name": { "default_value": "SecKit SK-Tank" }, - "machine_width": { - "default_value": 350 - }, - "machine_depth": { - "default_value": 350 - }, - "machine_height": { - "default_value": 400 - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_heated_bed": { - "default_value": true - }, + "overrides": + { + "gantry_height": { "value": "50" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 350 }, + "machine_end_gcode": { "default value": "M104 S0\nM140 S0\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG90\nG1 X2 Y300 F6000\n; move bed to the bottom to prevent bed falls\n;G91\n;G1 Z300\nM106 P0 S0\nM18" }, + "machine_gcode_flavor": { "default_value": "RepRap (RepRap)" }, "machine_head_with_fans_polygon": { "default_value": [ - [ -10, 20 ], - [ -10, -20 ], - [ 10, 20 ], - [ 10, -20 ] + [-10, 20], + [-10, -20], + [10, 20], + [10, -20] ] }, - "gantry_height": { - "value": "50" - }, - "machine_gcode_flavor": { - "default_value": "RepRap (RepRap)" - }, - "machine_start_gcode": { - "default_value": "G32 ;auto bed tramming and find a correct Z datum\nG29 S1 ;load default mesh\nM572 D0 S0.08 ; Pressure advance\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" - }, - "machine_end_gcode": { - "default value": "M104 S0\nM140 S0\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG90\nG1 X2 Y300 F6000\n; move bed to the bottom to prevent bed falls\n;G91\n;G1 Z300\nM106 P0 S0\nM18" - } - } -} + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "SecKit SK-Tank" }, + "machine_start_gcode": { "default_value": "G32 ;auto bed tramming and find a correct Z datum\nG29 S1 ;load default mesh\nM572 D0 S0.08 ; Pressure advance\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nG1 F200 E3\nG92 E0" }, + "machine_width": { "default_value": 350 } + } +} \ No newline at end of file diff --git a/resources/definitions/seemecnc_artemis.def.json b/resources/definitions/seemecnc_artemis.def.json index 1501d2c68d..0ebc3ba851 100644 --- a/resources/definitions/seemecnc_artemis.def.json +++ b/resources/definitions/seemecnc_artemis.def.json @@ -2,42 +2,36 @@ "version": 2, "name": "SeeMeCNC Artemis", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "PouncingIguana, JJ", "manufacturer": "SeeMeCNC", "file_formats": "text/x-gcode", "platform": "artemis_platform.3mf", "has_materials": true, - "machine_extruder_trains": - { - "0": "seemecnc_artemis_extruder_0" - } + "machine_extruder_trains": { "0": "seemecnc_artemis_extruder_0" } }, - - "overrides": { + "overrides": + { "layer_height": { "default_value": 0.1618 }, "layer_height_0": { "default_value": 0.2 }, "machine_center_is_zero": { "default_value": true }, "machine_depth": { "default_value": 290 }, + "machine_end_gcode": { "default_value": "M203 Z24000\nM104 S0\nM140 S0\nM107\nG28\nM84" }, "machine_gcode_flavor": { "default_value": "RepRap (RepRap)" }, "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 530 }, "machine_max_feedrate_z": { "default_value": 400 }, "machine_name": { "default_value": "Artemis" }, "machine_shape": { "default_value": "elliptic" }, + "machine_start_gcode": { "default_value": "G28\nG1 Z15.0 F10000\nG92 E0" }, "machine_width": { "default_value": 290 }, "relative_extrusion": { "value": "False" }, "retraction_amount": { "default_value": 3.2 }, "retraction_combing": { "value": "'off'" }, "retraction_hop_enabled": { "default_value": true }, "retraction_hop_only_when_collides": { "default_value": false }, - "retraction_speed": { "default_value": 45 }, - "machine_start_gcode": { - "default_value": "G28\nG1 Z15.0 F10000\nG92 E0" - }, - "machine_end_gcode": { - "default_value": "M203 Z24000\nM104 S0\nM140 S0\nM107\nG28\nM84" - } + "retraction_speed": { "default_value": 45 } } -} +} \ No newline at end of file diff --git a/resources/definitions/seemecnc_v32.def.json b/resources/definitions/seemecnc_v32.def.json index 46a5e63f01..783c2b9d59 100644 --- a/resources/definitions/seemecnc_v32.def.json +++ b/resources/definitions/seemecnc_v32.def.json @@ -2,42 +2,36 @@ "version": 2, "name": "SeeMeCNC Rostock Max V3.2", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "PouncingIguana, JJ", "manufacturer": "SeeMeCNC", "file_formats": "text/x-gcode", "platform": "rostock_platform.3mf", "has_materials": true, - "machine_extruder_trains": - { - "0": "seemecnc_v32_extruder_0" - } + "machine_extruder_trains": { "0": "seemecnc_v32_extruder_0" } }, - - "overrides": { + "overrides": + { "layer_height": { "default_value": 0.1618 }, "layer_height_0": { "default_value": 0.2 }, "machine_center_is_zero": { "default_value": true }, "machine_depth": { "default_value": 265 }, + "machine_end_gcode": { "default_value": "M203 Z24000\nM104 S0\nM140 S0\nM107\nG28\nM84" }, "machine_gcode_flavor": { "default_value": "RepRap (RepRap)" }, "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 395 }, "machine_max_feedrate_z": { "default_value": 300 }, "machine_name": { "default_value": "Rostock Max V3.2" }, "machine_shape": { "default_value": "elliptic" }, + "machine_start_gcode": { "default_value": "G28\nG1 Z15.0 F10000\nG92 E0" }, "machine_width": { "default_value": 265 }, "relative_extrusion": { "value": "False" }, "retraction_amount": { "default_value": 3.2 }, "retraction_combing": { "value": "'off'" }, "retraction_hop_enabled": { "default_value": true }, "retraction_hop_only_when_collides": { "default_value": false }, - "retraction_speed": { "default_value": 45 }, - "machine_start_gcode": { - "default_value": "G28\nG1 Z15.0 F10000\nG92 E0" - }, - "machine_end_gcode": { - "default_value": "M203 Z24000\nM104 S0\nM140 S0\nM107\nG28\nM84" - } + "retraction_speed": { "default_value": 45 } } -} +} \ No newline at end of file diff --git a/resources/definitions/sh65.def.json b/resources/definitions/sh65.def.json index d26898d9dd..ea1f6e8aa2 100644 --- a/resources/definitions/sh65.def.json +++ b/resources/definitions/sh65.def.json @@ -1,51 +1,56 @@ -{ - "version": 2, - "name": "Volumic SH65", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Volumic", - "manufacturer": "Volumic", - "file_formats": "text/x-gcode", - "icon": "volumic-icon", - "platform": "SH65_platform.STL", - "has_materials": true, - "has_machine_quality": true, - "machine_extruder_trains":{"0": "sh65_extruder"} - }, - - "overrides": { - "machine_name": { "default_value": "VOLUMIC SH65" }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 650 }, - "machine_height": { "default_value": 300 }, - "machine_depth": { "default_value": 300 }, - "machine_center_is_zero": { "default_value": false }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "layer_height": { "default_value": 0.1 }, - "layer_height_0": { "default_value": 0.1 }, - "retraction_amount": { "default_value": 2.40 }, - "retraction_speed": { "default_value": 30 }, - "adhesion_type": { "default_value": "none" }, - "infill_sparse_density": { "default_value": 25 }, - "fill_outline_gaps": { "default_value": true }, - "retract_at_layer_change": { "default_value": true }, - "retraction_combing_max_distance": { "default_value": 200 }, - "machine_head_with_fans_polygon": { "default_value": [[-38,30],[38,30],[38,-40],[-38,-40]] }, - "machine_max_feedrate_z": { "default_value": 30 }, - "machine_max_feedrate_e": { "default_value": 60 }, - "machine_max_acceleration_z": { "default_value": 500 }, - "machine_acceleration": { "default_value": 2000 }, - "machine_max_jerk_xy": { "default_value": 10 }, - "machine_max_jerk_z": { "default_value": 0.4 }, - "machine_max_jerk_e": { "default_value": 5 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "M117 Demarrage\nM106 S0\nM140 S{material_bed_temperature_layer_0}\nM104 T0 S{material_print_temperature_layer_0}\nG28\nG90\nM82\nG92 E0\nG1 Z3 F600\n;M190 S{material_bed_temperature_layer_0}\nM109 T0 S{material_print_temperature_layer_0}\nM300 P350\nM117 Purge\nG1 Z0.15 F600\nG1 E10 F400\nG92 E0\nM117 Impression" - }, - "machine_end_gcode": { - "default_value": "M107\nG91\nT0\nG1 E-1\nM104 T0 S0\nG90\nG0 X1 Y190 F5000\nG92 E0\nM140 S0\nM84\nM300" - } - } -} +{ + "version": 2, + "name": "Volumic SH65", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Volumic", + "manufacturer": "Volumic", + "file_formats": "text/x-gcode", + "platform": "SH65_platform.STL", + "has_machine_quality": true, + "has_materials": true, + "icon": "volumic-icon", + "machine_extruder_trains": { "0": "sh65_extruder" } + }, + "overrides": + { + "adhesion_type": { "default_value": "none" }, + "fill_outline_gaps": { "default_value": true }, + "infill_sparse_density": { "default_value": 25 }, + "layer_height": { "default_value": 0.1 }, + "layer_height_0": { "default_value": 0.1 }, + "machine_acceleration": { "default_value": 2000 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 300 }, + "machine_end_gcode": { "default_value": "M107\nG91\nT0\nG1 E-1\nM104 T0 S0\nG90\nG0 X1 Y190 F5000\nG92 E0\nM140 S0\nM84\nM300" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-38, 30], + [38, 30], + [38, -40], + [-38, -40] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 300 }, + "machine_max_acceleration_z": { "default_value": 500 }, + "machine_max_feedrate_e": { "default_value": 60 }, + "machine_max_feedrate_z": { "default_value": 30 }, + "machine_max_jerk_e": { "default_value": 5 }, + "machine_max_jerk_xy": { "default_value": 10 }, + "machine_max_jerk_z": { "default_value": 0.4 }, + "machine_name": { "default_value": "VOLUMIC SH65" }, + "machine_nozzle_size": { "default_value": 0.4 }, + "machine_start_gcode": { "default_value": "M117 Demarrage\nM106 S0\nM140 S{material_bed_temperature_layer_0}\nM104 T0 S{material_print_temperature_layer_0}\nG28\nG90\nM82\nG92 E0\nG1 Z3 F600\n;M190 S{material_bed_temperature_layer_0}\nM109 T0 S{material_print_temperature_layer_0}\nM300 P350\nM117 Purge\nG1 Z0.15 F600\nG1 E10 F400\nG92 E0\nM117 Impression" }, + "machine_width": { "default_value": 650 }, + "material_diameter": { "default_value": 1.75 }, + "retract_at_layer_change": { "default_value": true }, + "retraction_amount": { "default_value": 2.4 }, + "retraction_combing_max_distance": { "default_value": 200 }, + "retraction_speed": { "default_value": 30 } + } +} \ No newline at end of file diff --git a/resources/definitions/skriware_2.def.json b/resources/definitions/skriware_2.def.json index 7bb6968865..2418a4c1b6 100644 --- a/resources/definitions/skriware_2.def.json +++ b/resources/definitions/skriware_2.def.json @@ -1,720 +1,271 @@ { - "name": "Skriware 2", - "version": 2, - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Skriware", - "manufacturer": "Skriware", - "file_formats": "text/x-gcode", - "has_machine_quality": true, - "platform_offset": [ - 0, - 0, - 0 - ], - "supports_usb_connection": false, - "platform": "skriware_2_platform.3mf", - "machine_extruder_trains": { - "0": "skriware_2_extruder_0", - "1": "skriware_2_extruder_1" - } - }, - "overrides": { - "raft_interface_thickness": { - "value": "0.2" - }, - "wipe_retraction_prime_speed": { - "value": "30" - }, - "support_skip_zag_per_mm": { - "default_value": 10 - }, - "default_material_bed_temperature": + "version": 2, + "name": "Skriware 2", + "inherits": "fdmprinter", + "metadata": { - "value": "50" - }, - "material_bed_temperature": { - "minimum_value_warning": "30", - "resolve": "extruderValues('material_bed_temperature')[adhesion_extruder_nr] if resolveOrValue('adhesion_type') == 'raft' else max(extruderValues('material_bed_temperature'))" - }, - "raft_airgap": { - "default_value": 0.2 - }, - "top_layers": { - "value": "4" - }, - "machine_extruder_count": { - "default_value": 2 - }, - "raft_surface_acceleration": { - "value": "400" - }, - "meshfix_maximum_travel_resolution": { - "value": "0.8" - }, - "machine_end_gcode": { - "default_value": "M59\nG92 E0\nG1 E-10 F300\nM104 T0 S0\nM104 T1 S0\nM140 S0\nG28 X0 Y0\nM84\nM106 S0\nM107\nM220 S100" - }, - "wall_material_flow": { - "value": "99" - }, - "raft_interface_jerk": { - "value": "10" - }, - "acceleration_topbottom": { - "value": "200" - }, - "prime_tower_size": { - "default_value": 1 - }, - "max_skin_angle_for_expansion": { - "default_value": 50 - }, - "raft_acceleration": { - "value": "400" - }, - "support_xy_distance": { - "default_value": 0.6 - }, - "xy_offset_layer_0": { - "value": "0.0" - }, - "raft_interface_fan_speed": { - "value": "40" - }, - "retraction_speed": { - "default_value": 30 - }, - "speed_print": { - "default_value": 20 - }, - "travel_avoid_supports": { - "default_value": true - }, - "infill_overlap_mm": { - "value": "0.0" - }, - "support_roof_height": { - "value": "0.4" - }, - "speed_travel_layer_0": { - "value": "80" - }, - "speed_wall_0": { - "value": "20" - }, - "acceleration_wall_x": { - "value": "200" - }, - "layer_0_z_overlap": { - "value": "0.1" - }, - "switch_extruder_retraction_speed": { - "value": "30" - }, - "raft_base_acceleration": { - "value": "400" - }, - "raft_base_speed": { - "value": "60" - }, - "wall_0_material_flow": { - "value": "99" - }, - "support_infill_rate": { - "value": "20" - }, - "raft_surface_layers": { - "default_value": 1 - }, - "machine_height": { - "default_value": 210 - }, - "retraction_prime_speed": { - "value": "60" - }, - "support_interface_material_flow": { - "value": "99" - }, - "raft_surface_fan_speed": { - "value": "80" - }, - "raft_base_line_width": { - "value": "0.4" - }, - "infill_line_distance": { - "value": "0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density * (2 if infill_pattern == 'grid' else (3 if infill_pattern == 'triangles' or infill_pattern == 'trihexagon' or infill_pattern == 'cubic' or infill_pattern == 'cubicsubdiv' else (2 if infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' else (1 if infill_pattern == 'cross' or infill_pattern == 'cross_3d' else 1))))" - }, - "default_material_print_temperature": { - "default_value": 200 - }, - "speed_roofing": { - "value": "20" - }, - "skin_material_flow": { - "value": "99" - }, - "cool_fan_full_layer": { - "value": "1" - }, - "material_break_preparation_temperature": { - "value": "195" - }, - "support_roof_density": { - "value": "70" - }, - "support_infill_sparse_thickness": { - "value": "0.2" - }, - "retraction_retract_speed": { - "value": "30" - }, - "speed_slowdown_layers": { - "default_value": 1 - }, - "support_line_distance": { - "value":"0 if support_infill_rate == 0 else (support_line_width * 100) / support_infill_rate * (2 if support_pattern == 'grid' else (3 if support_pattern == 'triangles' else 1))" - }, - "cool_lift_head": { - "default_value": true - }, - "min_skin_width_for_expansion": { - "value": "0.67" - }, - "cool_min_speed": { - "default_value": 5 - }, - "switch_extruder_retraction_speeds": { - "default_value": 30 - }, - "raft_base_line_spacing": { - "value": "0.8" - }, - "speed_support": { - "value": "50" - }, - "skirt_brim_material_flow": { - "value": "99" - }, - "speed_infill": { - "value": "80" - }, - "support_initial_layer_line_distance": { - "value": "2" - }, - "support_use_towers": { - "default_value": false - }, - "skin_no_small_gaps_heuristic": { - "default_value": true - }, - "acceleration_roofing": { - "value": "400" - }, - "material_initial_print_temperature": { - "value": "195" - }, - "material_diameter": { - "default_value": 1.75 - }, - "xy_offset": { - "default_value": 0.0 - }, - "support_extruder_nr": { - "value": "0" - }, - "support_brim_line_count": { - "value": "16" - }, - "support_interface_extruder_nr": { - "value": "0" - }, - "support_roof_extruder_nr": { - "value": "0" - }, - "material_adhesion_tendency": { - "default_value": 0 - }, - "material_standby_temperature": { - "default_value": 195 - }, - "cool_fan_speed_0": { - "default_value": 0, - "value": "cool_fan_speed if resolveOrValue('adhesion_type') == 'raft' else 0" - }, - "brim_line_count": { - "value": "17" - }, - "adhesion_type": { - "default_value": "raft" - }, - "switch_extruder_retraction_amount": { - "value": "20" - }, - "retraction_amount": { - "default_value": 3 - }, - "acceleration_travel": { - "value": "400" - }, - "jerk_print_layer_0": { - "value": "10" - }, - "raft_surface_thickness": { - "value": "0.2" - }, - "raft_base_jerk": { - "value": "10" - }, - "bottom_thickness": { - "value": "0.8" - }, - "roofing_material_flow": { - "value": "99" - }, - "top_skin_expand_distance": { - "value": "0.8" - }, - "speed_wall_x": { - "value": "20" - }, - "support_enable": { - "default_value": true - }, - "acceleration_print_layer_0": { - "value": "200" - }, - "jerk_prime_tower": { - "value": "5" - }, - "infill_before_walls": { - "default_value": false - }, - "raft_interface_line_spacing": { - "value": "0.4" - }, - "gantry_height": { - "value": "210" - }, - "material_print_temperature_layer_0": { - "value": "195" - }, - "raft_interface_line_width": { - "value": "0.4" - }, - "skirt_brim_line_width": { - "value": "0.5" - }, - "z_seam_y": { - "value": "180" - }, - "roofing_layer_count": { - "value": "1" - }, - "raft_margin": { - "default_value": 4 - }, - "cool_fan_full_at_height": { - "value": "0" - }, - "acceleration_support_interface": { - "value": "250" - }, - "retraction_min_travel": { - "value": "1" - }, - "acceleration_layer_0": { - "value": "200" - }, - "support_z_distance": { - "default_value": 0.2 - }, - "machine_heated_bed": { - "default_value": true - }, - "raft_jerk": { - "value": "10" - }, - "raft_surface_speed": { - "value": "60" - }, - "initial_layer_line_width_factor": { - "default_value": 120 - }, - "machine_start_gcode": { - "default_value": "G90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM420 S1 Z0.7 ;enable bed levelling\nG1 Z10 F250 ;move the platform down 10mm\nM107 ;fan off\nM42 P11 S255 ;turn on front fan\nM140 S{material_bed_temperature}\nM104 T0 S{material_print_temperature, 0}\nM104 T1 S{material_print_temperature, 1}\nG1 F2500 Y260 X0\nM190 S{material_bed_temperature}\nM109 T0 S{material_print_temperature, 0}\nM109 T1 S{material_print_temperature, 1}\nM60 ;enable E-FADE Algorithm\nM62 A ;filament sensor off\nG92 E0 ;zero the extruded length\nT1\nG92 E0;zero the extruded length\nG1 F300 Z0.3\nG1 F1200 X20\nG1 F1200 X180 E21 ;extrude 21 mm of feed stock\nG1 F1200 E11\nG1 F300 Z1.5\nG92 E0 ;zero the extruded length again\nT0\nG92 E0 ;zero the extruded length\nG1 F1200 Y258\nG1 F300 Z0.3\nG1 F1200 X40 E21 ;extrude 21 mm of feed stock\nG1 F1200 E11 ;retracting 10 mm\nG1 F300 Z1.5\nM63 A ;filament sensor reset\nM61 A ;filament sensor on\nG92 E0 ;zero the extruded length again\nM58 ;end of Start G-Code and signal retract management\nT{initial_extruder_nr}" - }, - "bottom_skin_preshrink": { - "value": "0.0" - }, - "ironing_inset": { - "value": "0.2 + (ironing_line_spacing - skin_line_width * (1.0 + ironing_flow / 100) / 2 if ironing_pattern == 'concentric' else skin_line_width * (1.0 - ironing_flow / 100) / 2)" - }, - "jerk_travel": { - "value": "10" - }, - "machine_depth": { - "default_value": 260 - }, - "jerk_skirt_brim": { - "value": "5" - }, - "infill_wipe_dist": { - "value": "0" - }, - "raft_interface_acceleration": { - "value": "400" - }, - "z_seam_x": { - "value": "115" - }, - "material_bed_temperature_layer_0": { - "value": "50", - "minimum_value_warning": "30", - "resolve": "extruderValues('material_bed_temperature_layer_0')[adhesion_extruder_nr] if resolveOrValue('adhesion_type') == 'raft' else max(extruderValues('material_bed_temperature_layer_0'))" - }, - "wipe_retraction_retract_speed": { - "value": "30" - }, - "jerk_travel_layer_0": { - "value": "10" - }, - "infill_overlap": { - "value": "0" - }, - "acceleration_support_infill": { - "value": "400" - }, - "support_bottom_material_flow": { - "value": "99" - }, - "jerk_support_roof": { - "value": "5" - }, - "wall_x_material_flow": { - "value": "99" - }, - "speed_support_interface": { - "value": "33.33" - }, - "jerk_layer_0": { - "value": "5" - }, - "support_angle": { - "default_value": 60 - }, - "infill_sparse_thickness": { - "value": "0.2" - }, - "prime_tower_position_y": { - "value": "1" - }, - "retraction_combing": { - "value": "'infill'" - }, - "acceleration_prime_tower": { - "value": "250" - }, - "acceleration_print": { - "default_value": 200 - }, - "acceleration_infill": { - "value": "400" - }, - "bridge_wall_speed": { - "value": "10.0" - }, - "acceleration_wall_0": { - "value": "200" - }, - "support_offset": { - "default_value": 0.2 - }, - "build_volume_temperature": { - "default_value": 28 - }, - "switch_extruder_prime_speed": { - "value": "60" - }, - "speed_prime_tower": { - "value": "20" - }, - "top_skin_preshrink": { - "value": "0.0" - }, - "jerk_ironing": { - "value": "5" - }, - "skin_outline_count": { - "value": 0 - }, - "skirt_brim_speed": { - "value": "10.0" - }, - "raft_base_thickness": { - "value": "0.2" - }, - "infill_sparse_density": { - "default_value": 15 - }, - "support_bottom_extruder_nr": { - "value": "0" - }, - "support_material_flow": { - "value": "98" - }, - "min_infill_area": { - "default_value": 1 - }, - "jerk_support": { - "value": "10" - }, - "bottom_skin_expand_distance": { - "value": "0.8" - }, - "retract_at_layer_change": { - "default_value": true - }, - "jerk_support_interface": { - "value": "5" - }, - "jerk_support_bottom": { - "value": "5" - }, - "optimize_wall_printing_order": { - "default_value": true - }, - "skirt_brim_minimal_length": { - "default_value": 50 - }, - "jerk_support_infill": { - "value": "10" - }, - "initial_bottom_layers": { - "value": "3" - }, - "prime_tower_position_x": { - "value": "1" - }, - "acceleration_support_bottom": { - "value": "250" - }, - "speed_support_roof": { - "value": "33.33" - }, - "speed_support_infill": { - "value": "80" - }, - "bridge_skin_speed_2": { - "value": "15" - }, - "raft_fan_speed": { - "default_value": 40 - }, - "wipe_retraction_amount": { - "value": "3" - }, - "skin_edge_support_thickness": { - "value": "0" - }, - "bottom_layers": { - "value": "3" - }, - "retraction_extrusion_window": { - "value": "3" - }, - "acceleration_ironing": { - "value": "250" - }, - "support_top_distance": { - "value": "0.2" - }, - "travel_retract_before_outer_wall": { - "default_value": true - }, - "material_flow": { - "default_value": 99 - }, - "support_bottom_distance": { - "value": "0.2" - }, - "expand_skins_expand_distance": { - "value": "0.8" - }, - "jerk_wall": { - "value": "10" - }, - "support_zag_skip_count": { - "value": "8" - }, - "connect_infill_polygons": { - "value": "False" - }, - "acceleration_skirt_brim": { - "value": "250" - }, - "z_seam_corner": { - "default_value": "z_seam_corner_weighted" - }, - "raft_surface_jerk": { - "value": "10" - }, - "cross_infill_pocket_size": { - "value": "5.33" - }, - "support_infill_extruder_nr": { - "value": "0" - }, - "acceleration_enabled": { - "default_value": true - }, - "jerk_wall_x": { - "value": "10" - }, - "skin_overlap": { - "value": "15" - }, - "infill_material_flow": { - "value": "99" - }, - "skin_preshrink": { - "value": "0.0" - }, - "speed_wall": { - "value": "20" - }, - "support_tree_collision_resolution": { - "value": "0.2" - }, - "meshfix_maximum_deviation": { - "default_value": 0.003 - }, - "jerk_roofing": { - "value": "10" - }, - "fill_outline_gaps": { - "default_value": true - }, - "layer_height": { - "default_value": 0.2 - }, - "remove_empty_first_layers": { - "default_value": false - }, - "prime_tower_flow": { - "value": "99" - }, - "support_roof_line_distance": { - "value": "0.57" - }, - "wipe_retraction_speed": { - "value": "30" - }, - "support_extruder_nr_layer_0": { - "value": "0" - }, - "layer_height_0": { - "default_value": 0.2 - }, - "multiple_mesh_overlap": { - "default_value": 0 - }, - "ooze_shield_dist": { - "default_value": 4 - }, - "jerk_enabled": { - "default_value": true - }, - "acceleration_support": { - "value": "200" - }, - "adhesion_extruder_nr": { - "value": "0" - }, - "skirt_line_count": { - "default_value": 2 - }, - "jerk_wall_0": { - "value": "5" - }, - "raft_speed": { - "value": "60" - }, - "speed_layer_0": { - "value": "20.0" - }, - "machine_width": { - "default_value": 210 - }, - "acceleration_wall": { - "value": "200" - }, - "jerk_infill": { - "value": "10" - }, - "wipe_hop_enable": { - "value": "False" - }, - "acceleration_travel_layer_0": { - "value": "400" - }, - "raft_interface_speed": { - "value": "60" - }, - "skin_edge_support_layers": { - "value": "0" - }, - "support_xy_distance_overhang": { - "value": "0.5" - }, - "brim_width": { - "default_value": 10 - }, - "coasting_enable": { - "default_value": true - }, - "jerk_print": { - "default_value": 10 - }, - "acceleration_support_roof": { - "value": "250" - }, - "prime_tower_min_volume": { - "default_value": 4 - }, - "support_roof_material_flow": { - "value": "99" - }, - "wall_0_wipe_dist": { - "value": "0" - }, - "jerk_topbottom": { - "value": "10" - }, - "retraction_count_max": { - "default_value": 30 - }, - "skin_overlap_mm": { - "value": "0.06" - }, - "extruders_enabled_count": { - "value": "2" - }, - "speed_support_bottom": { - "value": "33.33" - }, - "support_skip_some_zags": { - "default_value": true - }, - "ooze_shield_angle": { - "default_value": 50 - }, - "wall_thickness": { - "value": "1.2" - }, - "speed_print_layer_0": { - "value": "10.0" + "visible": true, + "author": "Skriware", + "manufacturer": "Skriware", + "file_formats": "text/x-gcode", + "platform": "skriware_2_platform.3mf", + "has_machine_quality": true, + "machine_extruder_trains": + { + "0": "skriware_2_extruder_0", + "1": "skriware_2_extruder_1" + }, + "platform_offset": [ + 0, + 0, + 0 + ], + "supports_usb_connection": false + }, + "overrides": + { + "acceleration_enabled": { "default_value": true }, + "acceleration_infill": { "value": "400" }, + "acceleration_ironing": { "value": "250" }, + "acceleration_layer_0": { "value": "200" }, + "acceleration_prime_tower": { "value": "250" }, + "acceleration_print": { "default_value": 200 }, + "acceleration_print_layer_0": { "value": "200" }, + "acceleration_roofing": { "value": "400" }, + "acceleration_skirt_brim": { "value": "250" }, + "acceleration_support": { "value": "200" }, + "acceleration_support_bottom": { "value": "250" }, + "acceleration_support_infill": { "value": "400" }, + "acceleration_support_interface": { "value": "250" }, + "acceleration_support_roof": { "value": "250" }, + "acceleration_topbottom": { "value": "200" }, + "acceleration_travel": { "value": "400" }, + "acceleration_travel_layer_0": { "value": "400" }, + "acceleration_wall": { "value": "200" }, + "acceleration_wall_0": { "value": "200" }, + "acceleration_wall_x": { "value": "200" }, + "adhesion_extruder_nr": { "value": "0" }, + "adhesion_type": { "default_value": "raft" }, + "bottom_layers": { "value": "3" }, + "bottom_skin_expand_distance": { "value": "0.8" }, + "bottom_skin_preshrink": { "value": "0.0" }, + "bottom_thickness": { "value": "0.8" }, + "bridge_skin_speed_2": { "value": "15" }, + "bridge_wall_speed": { "value": "10.0" }, + "brim_line_count": { "value": "17" }, + "brim_width": { "default_value": 10 }, + "build_volume_temperature": { "default_value": 28 }, + "coasting_enable": { "default_value": true }, + "connect_infill_polygons": { "value": "False" }, + "cool_fan_full_at_height": { "value": "0" }, + "cool_fan_full_layer": { "value": "1" }, + "cool_fan_speed_0": + { + "default_value": 0, + "value": "cool_fan_speed if resolveOrValue('adhesion_type') == 'raft' else 0" + }, + "cool_lift_head": { "default_value": true }, + "cool_min_speed": { "default_value": 5 }, + "cross_infill_pocket_size": { "value": "5.33" }, + "default_material_bed_temperature": { "value": "50" }, + "default_material_print_temperature": { "default_value": 200 }, + "expand_skins_expand_distance": { "value": "0.8" }, + "extruders_enabled_count": { "value": "2" }, + "fill_outline_gaps": { "default_value": true }, + "gantry_height": { "value": "210" }, + "infill_before_walls": { "default_value": false }, + "infill_line_distance": { "value": "0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density * (2 if infill_pattern == 'grid' else (3 if infill_pattern == 'triangles' or infill_pattern == 'trihexagon' or infill_pattern == 'cubic' or infill_pattern == 'cubicsubdiv' else (2 if infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' else (1 if infill_pattern == 'cross' or infill_pattern == 'cross_3d' else 1))))" }, + "infill_material_flow": { "value": "99" }, + "infill_overlap": { "value": "0" }, + "infill_overlap_mm": { "value": "0.0" }, + "infill_sparse_density": { "default_value": 15 }, + "infill_sparse_thickness": { "value": "0.2" }, + "infill_wipe_dist": { "value": "0" }, + "initial_bottom_layers": { "value": "3" }, + "initial_layer_line_width_factor": { "default_value": 120 }, + "ironing_inset": { "value": "0.2 + (ironing_line_spacing - skin_line_width * (1.0 + ironing_flow / 100) / 2 if ironing_pattern == 'concentric' else skin_line_width * (1.0 - ironing_flow / 100) / 2)" }, + "jerk_enabled": { "default_value": true }, + "jerk_infill": { "value": "10" }, + "jerk_ironing": { "value": "5" }, + "jerk_layer_0": { "value": "5" }, + "jerk_prime_tower": { "value": "5" }, + "jerk_print": { "default_value": 10 }, + "jerk_print_layer_0": { "value": "10" }, + "jerk_roofing": { "value": "10" }, + "jerk_skirt_brim": { "value": "5" }, + "jerk_support": { "value": "10" }, + "jerk_support_bottom": { "value": "5" }, + "jerk_support_infill": { "value": "10" }, + "jerk_support_interface": { "value": "5" }, + "jerk_support_roof": { "value": "5" }, + "jerk_topbottom": { "value": "10" }, + "jerk_travel": { "value": "10" }, + "jerk_travel_layer_0": { "value": "10" }, + "jerk_wall": { "value": "10" }, + "jerk_wall_0": { "value": "5" }, + "jerk_wall_x": { "value": "10" }, + "layer_0_z_overlap": { "value": "0.1" }, + "layer_height": { "default_value": 0.2 }, + "layer_height_0": { "default_value": 0.2 }, + "machine_depth": { "default_value": 260 }, + "machine_end_gcode": { "default_value": "M59\nG92 E0\nG1 E-10 F300\nM104 T0 S0\nM104 T1 S0\nM140 S0\nG28 X0 Y0\nM84\nM106 S0\nM107\nM220 S100" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 210 }, + "machine_start_gcode": { "default_value": "G90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM420 S1 Z0.7 ;enable bed levelling\nG1 Z10 F250 ;move the platform down 10mm\nM107 ;fan off\nM42 P11 S255 ;turn on front fan\nM140 S{material_bed_temperature}\nM104 T0 S{material_print_temperature, 0}\nM104 T1 S{material_print_temperature, 1}\nG1 F2500 Y260 X0\nM190 S{material_bed_temperature}\nM109 T0 S{material_print_temperature, 0}\nM109 T1 S{material_print_temperature, 1}\nM60 ;enable E-FADE Algorithm\nM62 A ;filament sensor off\nG92 E0 ;zero the extruded length\nT1\nG92 E0;zero the extruded length\nG1 F300 Z0.3\nG1 F1200 X20\nG1 F1200 X180 E21 ;extrude 21 mm of feed stock\nG1 F1200 E11\nG1 F300 Z1.5\nG92 E0 ;zero the extruded length again\nT0\nG92 E0 ;zero the extruded length\nG1 F1200 Y258\nG1 F300 Z0.3\nG1 F1200 X40 E21 ;extrude 21 mm of feed stock\nG1 F1200 E11 ;retracting 10 mm\nG1 F300 Z1.5\nM63 A ;filament sensor reset\nM61 A ;filament sensor on\nG92 E0 ;zero the extruded length again\nM58 ;end of Start G-Code and signal retract management\nT{initial_extruder_nr}" }, + "machine_width": { "default_value": 210 }, + "material_adhesion_tendency": { "default_value": 0 }, + "material_bed_temperature": + { + "minimum_value_warning": "30", + "resolve": "extruderValues('material_bed_temperature')[adhesion_extruder_nr] if resolveOrValue('adhesion_type') == 'raft' else max(extruderValues('material_bed_temperature'))" + }, + "material_bed_temperature_layer_0": + { + "minimum_value_warning": "30", + "resolve": "extruderValues('material_bed_temperature_layer_0')[adhesion_extruder_nr] if resolveOrValue('adhesion_type') == 'raft' else max(extruderValues('material_bed_temperature_layer_0'))", + "value": "50" + }, + "material_break_preparation_temperature": { "value": "195" }, + "material_diameter": { "default_value": 1.75 }, + "material_flow": { "default_value": 99 }, + "material_initial_print_temperature": { "value": "195" }, + "material_print_temperature_layer_0": { "value": "195" }, + "material_standby_temperature": { "default_value": 195 }, + "max_skin_angle_for_expansion": { "default_value": 50 }, + "meshfix_maximum_deviation": { "default_value": 0.003 }, + "meshfix_maximum_travel_resolution": { "value": "0.8" }, + "min_infill_area": { "default_value": 1 }, + "min_skin_width_for_expansion": { "value": "0.67" }, + "multiple_mesh_overlap": { "default_value": 0 }, + "ooze_shield_angle": { "default_value": 50 }, + "ooze_shield_dist": { "default_value": 4 }, + "optimize_wall_printing_order": { "default_value": true }, + "prime_tower_flow": { "value": "99" }, + "prime_tower_min_volume": { "default_value": 4 }, + "prime_tower_position_x": { "value": "1" }, + "prime_tower_position_y": { "value": "1" }, + "prime_tower_size": { "default_value": 1 }, + "raft_acceleration": { "value": "400" }, + "raft_airgap": { "default_value": 0.2 }, + "raft_base_acceleration": { "value": "400" }, + "raft_base_jerk": { "value": "10" }, + "raft_base_line_spacing": { "value": "0.8" }, + "raft_base_line_width": { "value": "0.4" }, + "raft_base_speed": { "value": "60" }, + "raft_base_thickness": { "value": "0.2" }, + "raft_fan_speed": { "default_value": 40 }, + "raft_interface_acceleration": { "value": "400" }, + "raft_interface_fan_speed": { "value": "40" }, + "raft_interface_jerk": { "value": "10" }, + "raft_interface_line_spacing": { "value": "0.4" }, + "raft_interface_line_width": { "value": "0.4" }, + "raft_interface_speed": { "value": "60" }, + "raft_interface_thickness": { "value": "0.2" }, + "raft_jerk": { "value": "10" }, + "raft_margin": { "default_value": 4 }, + "raft_speed": { "value": "60" }, + "raft_surface_acceleration": { "value": "400" }, + "raft_surface_fan_speed": { "value": "80" }, + "raft_surface_jerk": { "value": "10" }, + "raft_surface_layers": { "default_value": 1 }, + "raft_surface_speed": { "value": "60" }, + "raft_surface_thickness": { "value": "0.2" }, + "remove_empty_first_layers": { "default_value": false }, + "retract_at_layer_change": { "default_value": true }, + "retraction_amount": { "default_value": 3 }, + "retraction_combing": { "value": "'infill'" }, + "retraction_count_max": { "default_value": 30 }, + "retraction_extrusion_window": { "value": "3" }, + "retraction_min_travel": { "value": "1" }, + "retraction_prime_speed": { "value": "60" }, + "retraction_retract_speed": { "value": "30" }, + "retraction_speed": { "default_value": 30 }, + "roofing_layer_count": { "value": "1" }, + "roofing_material_flow": { "value": "99" }, + "skin_edge_support_layers": { "value": "0" }, + "skin_edge_support_thickness": { "value": "0" }, + "skin_material_flow": { "value": "99" }, + "skin_no_small_gaps_heuristic": { "default_value": true }, + "skin_outline_count": { "value": 0 }, + "skin_overlap": { "value": "15" }, + "skin_overlap_mm": { "value": "0.06" }, + "skin_preshrink": { "value": "0.0" }, + "skirt_brim_line_width": { "value": "0.5" }, + "skirt_brim_material_flow": { "value": "99" }, + "skirt_brim_minimal_length": { "default_value": 50 }, + "skirt_brim_speed": { "value": "10.0" }, + "skirt_line_count": { "default_value": 2 }, + "speed_infill": { "value": "80" }, + "speed_layer_0": { "value": "20.0" }, + "speed_prime_tower": { "value": "20" }, + "speed_print": { "default_value": 20 }, + "speed_print_layer_0": { "value": "10.0" }, + "speed_roofing": { "value": "20" }, + "speed_slowdown_layers": { "default_value": 1 }, + "speed_support": { "value": "50" }, + "speed_support_bottom": { "value": "33.33" }, + "speed_support_infill": { "value": "80" }, + "speed_support_interface": { "value": "33.33" }, + "speed_support_roof": { "value": "33.33" }, + "speed_travel_layer_0": { "value": "80" }, + "speed_wall": { "value": "20" }, + "speed_wall_0": { "value": "20" }, + "speed_wall_x": { "value": "20" }, + "support_angle": { "default_value": 60 }, + "support_bottom_distance": { "value": "0.2" }, + "support_bottom_extruder_nr": { "value": "0" }, + "support_bottom_material_flow": { "value": "99" }, + "support_brim_line_count": { "value": "16" }, + "support_enable": { "default_value": true }, + "support_extruder_nr": { "value": "0" }, + "support_extruder_nr_layer_0": { "value": "0" }, + "support_infill_extruder_nr": { "value": "0" }, + "support_infill_rate": { "value": "20" }, + "support_infill_sparse_thickness": { "value": "0.2" }, + "support_initial_layer_line_distance": { "value": "2" }, + "support_interface_extruder_nr": { "value": "0" }, + "support_interface_material_flow": { "value": "99" }, + "support_line_distance": { "value": "0 if support_infill_rate == 0 else (support_line_width * 100) / support_infill_rate * (2 if support_pattern == 'grid' else (3 if support_pattern == 'triangles' else 1))" }, + "support_material_flow": { "value": "98" }, + "support_offset": { "default_value": 0.2 }, + "support_roof_density": { "value": "70" }, + "support_roof_extruder_nr": { "value": "0" }, + "support_roof_height": { "value": "0.4" }, + "support_roof_line_distance": { "value": "0.57" }, + "support_roof_material_flow": { "value": "99" }, + "support_skip_some_zags": { "default_value": true }, + "support_skip_zag_per_mm": { "default_value": 10 }, + "support_top_distance": { "value": "0.2" }, + "support_tree_collision_resolution": { "value": "0.2" }, + "support_use_towers": { "default_value": false }, + "support_xy_distance": { "default_value": 0.6 }, + "support_xy_distance_overhang": { "value": "0.5" }, + "support_z_distance": { "default_value": 0.2 }, + "support_zag_skip_count": { "value": "8" }, + "switch_extruder_prime_speed": { "value": "60" }, + "switch_extruder_retraction_amount": { "value": "20" }, + "switch_extruder_retraction_speed": { "value": "30" }, + "switch_extruder_retraction_speeds": { "default_value": 30 }, + "top_layers": { "value": "4" }, + "top_skin_expand_distance": { "value": "0.8" }, + "top_skin_preshrink": { "value": "0.0" }, + "travel_avoid_supports": { "default_value": true }, + "travel_retract_before_outer_wall": { "default_value": true }, + "wall_0_material_flow": { "value": "99" }, + "wall_0_wipe_dist": { "value": "0" }, + "wall_material_flow": { "value": "99" }, + "wall_thickness": { "value": "1.2" }, + "wall_x_material_flow": { "value": "99" }, + "wipe_hop_enable": { "value": "False" }, + "wipe_retraction_amount": { "value": "3" }, + "wipe_retraction_prime_speed": { "value": "30" }, + "wipe_retraction_retract_speed": { "value": "30" }, + "wipe_retraction_speed": { "value": "30" }, + "xy_offset": { "default_value": 0.0 }, + "xy_offset_layer_0": { "value": "0.0" }, + "z_seam_corner": { "default_value": "z_seam_corner_weighted" }, + "z_seam_x": { "value": "115" }, + "z_seam_y": { "value": "180" } } - } } \ No newline at end of file diff --git a/resources/definitions/smoothie.def.json b/resources/definitions/smoothie.def.json index 463fbc92c2..8f9812357b 100644 --- a/resources/definitions/smoothie.def.json +++ b/resources/definitions/smoothie.def.json @@ -2,11 +2,13 @@ "version": 2, "name": "Smoothie Custom Printer", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "grk3010", "manufacturer": "Custom", "file_formats": "text/x-gcode", + "first_start_actions": [ "MachineSettingsAction" ], "machine_extruder_trains": { "0": "custom_extruder_1", @@ -17,21 +19,13 @@ "5": "custom_extruder_6", "6": "custom_extruder_7", "7": "custom_extruder_8" - }, - "first_start_actions": ["MachineSettingsAction"] - }, - "overrides": { - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_always_write_active_tool": { - "default_value": true - }, - "machine_start_gcode": { - "default_value": "G28 X0 Y0 ; Home X Y\nM375; Load Bed Leveling Grid\nG1 X300 Y275 F15000 ; Move to bed center\nM280 S3.0 ; Deploy probe pin\n## NOTE: Adjust \"ZX.XX\" after G30 to be the Z-offset (in mm) between the probe and the nozzle\n## This is how you adjust nozzle printing height!\nG30 Z1.25 ; Move down to find bed & set Z home offset\nM280 S7.0 ; Retract probe\nG1 Z15.0 F600 ; move extruder up 15mm\nT0; Activate Extruder 1" - }, - "machine_end_gcode": { - "default_value": "G28 X0 Y0; Home X and Y\nM104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM107; turn off fans\nM84 ; disable motors" } + }, + "overrides": + { + "machine_always_write_active_tool": { "default_value": true }, + "machine_end_gcode": { "default_value": "G28 X0 Y0; Home X and Y\nM104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM107; turn off fans\nM84 ; disable motors" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_start_gcode": { "default_value": "G28 X0 Y0 ; Home X Y\nM375; Load Bed Leveling Grid\nG1 X300 Y275 F15000 ; Move to bed center\nM280 S3.0 ; Deploy probe pin\n## NOTE: Adjust \"ZX.XX\" after G30 to be the Z-offset (in mm) between the probe and the nozzle\n## This is how you adjust nozzle printing height!\nG30 Z1.25 ; Move down to find bed & set Z home offset\nM280 S7.0 ; Retract probe\nG1 Z15.0 F600 ; move extruder up 15mm\nT0; Activate Extruder 1" } } -} +} \ No newline at end of file diff --git a/resources/definitions/snakeoil_standard_180.def.json b/resources/definitions/snakeoil_standard_180.def.json new file mode 100644 index 0000000000..29cdd1e840 --- /dev/null +++ b/resources/definitions/snakeoil_standard_180.def.json @@ -0,0 +1,17 @@ +{ + "version": 2, + "name": "SnakeOil Standard 180", + "inherits": "snakeoil_standard_base", + "metadata": + { + "visible": true, + "quality_definition": "snakeoil_standard_base" + }, + "overrides": + { + "machine_depth": { "default_value": 180 }, + "machine_height": { "default_value": 180 }, + "machine_name": { "default_value": "SNAKEOIL STANDARD 180" }, + "machine_width": { "default_value": 180 } + } +} \ No newline at end of file diff --git a/resources/definitions/snakeoil_standard_250.def.json b/resources/definitions/snakeoil_standard_250.def.json new file mode 100644 index 0000000000..b103749acd --- /dev/null +++ b/resources/definitions/snakeoil_standard_250.def.json @@ -0,0 +1,17 @@ +{ + "version": 2, + "name": "SnakeOil Standard 250", + "inherits": "snakeoil_standard_base", + "metadata": + { + "visible": true, + "quality_definition": "snakeoil_standard_base" + }, + "overrides": + { + "machine_depth": { "default_value": 240 }, + "machine_height": { "default_value": 230 }, + "machine_name": { "default_value": "SNAKEOIL STANDARD 250" }, + "machine_width": { "default_value": 250 } + } +} \ No newline at end of file diff --git a/resources/definitions/snakeoil_standard_base.def.json b/resources/definitions/snakeoil_standard_base.def.json new file mode 100644 index 0000000000..700edf3d35 --- /dev/null +++ b/resources/definitions/snakeoil_standard_base.def.json @@ -0,0 +1,115 @@ +{ + "version": 2, + "name": "SnakeOil Standard Base", + "inherits": "fdmprinter", + "metadata": + { + "visible": false, + "author": "Chip", + "manufacturer": "SnakeOilXY", + "file_formats": "text/x-gcode", + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, + "machine_extruder_trains": { "0": "snakeoil_standard_extruder_0" }, + "preferred_material": "generic_abs", + "preferred_quality_type": "normal" + }, + "overrides": + { + "acceleration_enabled": { "default_value": true }, + "acceleration_layer_0": { "value": 10000 }, + "acceleration_print": { "default_value": 15000 }, + "acceleration_roofing": { "value": 10000 }, + "acceleration_travel_layer_0": { "value": 10000 }, + "acceleration_wall_0": { "value": 7500 }, + "adhesion_type": { "default_value": "skirt" }, + "alternate_extra_perimeter": { "default_value": true }, + "bridge_fan_speed_2": { "resolve": "max(cool_fan_speed, 50)" }, + "bridge_fan_speed_3": { "resolve": "max(cool_fan_speed, 20)" }, + "bridge_settings_enabled": { "default_value": true }, + "bridge_wall_coast": { "default_value": 10 }, + "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 }, + "cool_min_layer_time": { "default_value": 15 }, + "cool_min_layer_time_fan_speed_max": { "default_value": 20 }, + "gantry_height": { "value": 30 }, + "infill_before_walls": { "default_value": false }, + "infill_enable_travel_optimization": { "default_value": true }, + "jerk_roofing": { "value": 10 }, + "jerk_wall_0": { "value": 10 }, + "layer_height_0": { "resolve": "max(0.2, min(extruderValues('layer_height')))" }, + "line_width": { "value": "machine_nozzle_size * 1.125" }, + "machine_acceleration": { "default_value": 1500 }, + "machine_depth": { "default_value": 165 }, + "machine_end_gcode": { "default_value": "END_PRINT" }, + "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_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 165 }, + "machine_max_acceleration_x": { "default_value": 15000 }, + "machine_max_acceleration_y": { "default_value": 15000 }, + "machine_max_acceleration_z": { "default_value": 250 }, + "machine_max_feedrate_e": { "default_value": 120 }, + "machine_max_feedrate_z": { "default_value": 40 }, + "machine_max_jerk_e": { "default_value": 60 }, + "machine_name": { "default_value": "SNAKEOIL STANDARD" }, + "machine_start_gcode": { "default_value": ";Simple\nSTART_PRINT EXTRUDER_TEMP={material_print_temperature_layer_0} BED_TEMP={material_bed_temperature_layer_0}\n;Or with custom bed mesh area\n;START_PRINT EXTRUDER_TEMP={material_print_temperature_layer_0} BED_TEMP={material_bed_temperature_layer_0} AREA_START=%MINX%,%MINY% AREA_END=%MAXX%,%MAXY% FILAMENT_TYPE={material_type}" }, + "machine_steps_per_mm_x": { "default_value": 160 }, + "machine_steps_per_mm_y": { "default_value": 160 }, + "machine_steps_per_mm_z": { "default_value": 800 }, + "machine_use_extruder_offset_to_offset_coords": { "value": false }, + "machine_width": { "default_value": 165 }, + "material_diameter": { "default_value": 1.75 }, + "meshfix_maximum_resolution": { "default_value": 0.01 }, + "min_infill_area": { "default_value": 5.0 }, + "minimum_polygon_circumference": { "default_value": 0.2 }, + "optimize_wall_printing_order": { "default_value": true }, + "retraction_amount": { "default_value": 0.8 }, + "retraction_combing": { "value": "'noskin'" }, + "retraction_combing_max_distance": { "default_value": 10 }, + "retraction_hop": { "default_value": 0.2 }, + "retraction_hop_enabled": { "default_value": true }, + "retraction_prime_speed": + { + "maximum_value_warning": 130, + "value": "math.ceil(retraction_speed * 0.4)" + }, + "retraction_retract_speed": { "maximum_value_warning": 130 }, + "retraction_speed": + { + "default_value": 35, + "maximum_value_warning": 130 + }, + "roofing_layer_count": { "value": 1 }, + "skirt_brim_minimal_length": { "default_value": 550 }, + "speed_layer_0": { "value": "math.ceil(speed_print * 0.25)" }, + "speed_roofing": { "value": "math.ceil(speed_print * 0.33)" }, + "speed_slowdown_layers": { "default_value": 4 }, + "speed_topbottom": { "value": "math.ceil(speed_print * 0.33)" }, + "speed_travel": + { + "maximum_value_warning": 501, + "value": 300 + }, + "speed_travel_layer_0": { "value": "math.ceil(speed_travel * 0.4)" }, + "speed_wall": { "value": "math.ceil(speed_print * 0.33)" }, + "speed_wall_0": { "value": "math.ceil(speed_print * 0.33)" }, + "speed_wall_x": { "value": "math.ceil(speed_print * 0.66)" }, + "travel_avoid_other_parts": { "default_value": false }, + "wall_line_width": { "value": "machine_nozzle_size" }, + "wall_overhang_angle": { "default_value": 75 }, + "wall_overhang_speed_factor": { "default_value": 50 }, + "zig_zaggify_infill": { "value": true } + } +} \ No newline at end of file diff --git a/resources/definitions/snapmaker2.def.json b/resources/definitions/snapmaker2.def.json index 9a26ea21a7..81fa58dd04 100644 --- a/resources/definitions/snapmaker2.def.json +++ b/resources/definitions/snapmaker2.def.json @@ -2,76 +2,38 @@ "version": 2, "name": "Snapmaker 2", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": false, "manufacturer": "Snapmaker", "file_formats": "text/x-gcode", - "machine_extruder_trains": { - "0": "snapmaker_extruder_0" - }, - "has_materials": true, + "exclude_materials": [], "has_machine_quality": true, - "preferred_quality_type": "normal", + "has_materials": true, + "machine_extruder_trains": { "0": "snapmaker_extruder_0" }, "preferred_material": "generic_pla", - "exclude_materials": [ ] + "preferred_quality_type": "normal" }, - "overrides": { - "machine_name": { - "default_value": "Snapmaker" - }, - "machine_buildplate_type": { - "default_value": "aluminum" - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_start_gcode": { - "default_value": "M104 S{material_print_temperature_layer_0} ;Set Hotend Temperature\nM140 S{material_bed_temperature_layer_0} ;Set Bed Temperature\nG28 ;home\nG90 ;absolute positioning\nG1 X-10 Y-10 F3000 ;Move to corner \nG1 Z0 F1800 ;Go to zero offset\nM109 S{material_print_temperature_layer_0} ;Wait for Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ;Wait for Bed Temperature\nG92 E0 ;Zero set extruder position\nG1 E20 F200 ;Feed filament to clear nozzle\nG92 E0 ;Zero set extruder position" - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;Extruder heater off\nM140 S0 ;Heated bed heater off\nG90 ;absolute positioning\nG92 E0 ;Retract the filament\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z{machine_height} E-1 F3000 ;move Z up a bit and retract filament even more\nG1 X0 F3000 ;move X to min endstops, so the head is out of the way\nG1 Y{machine_depth} F3000 ;so the head is out of the way and Plate is moved forward" - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "material_diameter": { - "default_value": 1.75 - }, - "machine_max_acceleration_x": { - "default_value": 1000 - }, - "machine_max_acceleration_y": { - "default_value": 1000 - }, - "machine_max_acceleration_z": { - "default_value": 1000 - }, - "machine_max_acceleration_e": { - "default_value": 1000 - }, - "machine_acceleration": { - "default_value": 1000 - }, - "material_print_temp_prepend": { - "default_value": false - }, - "material_bed_temp_prepend": { - "default_value": false - }, - "default_material_print_temperature": { - "default_value": 205 - }, - "retraction_enable": { - "default_value": true - }, - "retraction_amount": { - "default_value": 5 - }, - "retraction_speed": { - "default_value": 60 - }, - "retract_at_layer_change": { - "default_value": false - } + "overrides": + { + "default_material_print_temperature": { "default_value": 205 }, + "machine_acceleration": { "default_value": 1000 }, + "machine_buildplate_type": { "default_value": "aluminum" }, + "machine_end_gcode": { "default_value": "M104 S0 ;Extruder heater off\nM140 S0 ;Heated bed heater off\nG90 ;absolute positioning\nG92 E0 ;Retract the filament\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z{machine_height} E-1 F3000 ;move Z up a bit and retract filament even more\nG1 X0 F3000 ;move X to min endstops, so the head is out of the way\nG1 Y{machine_depth} F3000 ;so the head is out of the way and Plate is moved forward" }, + "machine_heated_bed": { "default_value": true }, + "machine_max_acceleration_e": { "default_value": 1000 }, + "machine_max_acceleration_x": { "default_value": 1000 }, + "machine_max_acceleration_y": { "default_value": 1000 }, + "machine_max_acceleration_z": { "default_value": 1000 }, + "machine_name": { "default_value": "Snapmaker" }, + "machine_nozzle_size": { "default_value": 0.4 }, + "machine_start_gcode": { "default_value": "M104 S{material_print_temperature_layer_0} ;Set Hotend Temperature\nM140 S{material_bed_temperature_layer_0} ;Set Bed Temperature\nG28 ;home\nG90 ;absolute positioning\nG1 X-10 Y-10 F3000 ;Move to corner \nG1 Z0 F1800 ;Go to zero offset\nM109 S{material_print_temperature_layer_0} ;Wait for Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ;Wait for Bed Temperature\nG92 E0 ;Zero set extruder position\nG1 E20 F200 ;Feed filament to clear nozzle\nG92 E0 ;Zero set extruder position" }, + "material_bed_temp_prepend": { "default_value": false }, + "material_diameter": { "default_value": 1.75 }, + "material_print_temp_prepend": { "default_value": false }, + "retract_at_layer_change": { "default_value": false }, + "retraction_amount": { "default_value": 5 }, + "retraction_enable": { "default_value": true }, + "retraction_speed": { "default_value": 60 } } -} +} \ No newline at end of file diff --git a/resources/definitions/snapmaker2_A150.def.json b/resources/definitions/snapmaker2_A150.def.json index 8baea05016..be0d6c67df 100644 --- a/resources/definitions/snapmaker2_A150.def.json +++ b/resources/definitions/snapmaker2_A150.def.json @@ -1,39 +1,30 @@ -{ - "version": 2, - "name": "Snapmaker 2 A150", - "inherits": "snapmaker2", - "metadata": { - "visible": true, - "manufacturer": "Snapmaker", - "file_formats": "text/x-gcode", - "machine_extruder_trains": { - "0": "snapmaker_extruder_0" - }, - "quality_definition": "snapmaker2" - }, - "overrides": { - "machine_name": { - "default_value": "Snapmaker A150" - }, - "machine_width": { - "default_value": 160 - }, - "machine_depth": { - "default_value": 160 - }, - "machine_height": { - "default_value": 145 - }, - "machine_head_with_fans_polygon": { - "default_value": [ - [-67, 22], - [-67, -25], - [25.5, 22], - [25.5, -25] - ] - }, - "gantry_height": { - "value": 27 - } - } -} +{ + "version": 2, + "name": "Snapmaker 2 A150", + "inherits": "snapmaker2", + "metadata": + { + "visible": true, + "manufacturer": "Snapmaker", + "file_formats": "text/x-gcode", + "machine_extruder_trains": { "0": "snapmaker_extruder_0" }, + "quality_definition": "snapmaker2" + }, + "overrides": + { + "gantry_height": { "value": 27 }, + "machine_depth": { "default_value": 160 }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-67, 22], + [-67, -25], + [25.5, 22], + [25.5, -25] + ] + }, + "machine_height": { "default_value": 145 }, + "machine_name": { "default_value": "Snapmaker A150" }, + "machine_width": { "default_value": 160 } + } +} \ No newline at end of file diff --git a/resources/definitions/snapmaker2_A250.def.json b/resources/definitions/snapmaker2_A250.def.json index a61d52c46f..0fdc67b061 100644 --- a/resources/definitions/snapmaker2_A250.def.json +++ b/resources/definitions/snapmaker2_A250.def.json @@ -1,39 +1,30 @@ -{ - "version": 2, - "name": "Snapmaker 2 A250", - "inherits": "snapmaker2", - "metadata": { - "visible": true, - "manufacturer": "Snapmaker", - "file_formats": "text/x-gcode", - "machine_extruder_trains": { - "0": "snapmaker_extruder_0" - }, - "quality_definition": "snapmaker2" - }, - "overrides": { - "machine_name": { - "default_value": "Snapmaker A250" - }, - "machine_width": { - "default_value": 230 - }, - "machine_depth": { - "default_value": 250 - }, - "machine_height": { - "default_value": 235 - }, - "machine_head_with_fans_polygon": { - "default_value": [ - [-67, 22], - [-67, -25], - [25.5, 22], - [25.5, -25] - ] - }, - "gantry_height": { - "value": 27 - } - } -} +{ + "version": 2, + "name": "Snapmaker 2 A250", + "inherits": "snapmaker2", + "metadata": + { + "visible": true, + "manufacturer": "Snapmaker", + "file_formats": "text/x-gcode", + "machine_extruder_trains": { "0": "snapmaker_extruder_0" }, + "quality_definition": "snapmaker2" + }, + "overrides": + { + "gantry_height": { "value": 27 }, + "machine_depth": { "default_value": 250 }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-67, 22], + [-67, -25], + [25.5, 22], + [25.5, -25] + ] + }, + "machine_height": { "default_value": 235 }, + "machine_name": { "default_value": "Snapmaker A250" }, + "machine_width": { "default_value": 230 } + } +} \ No newline at end of file diff --git a/resources/definitions/snapmaker2_A350.def.json b/resources/definitions/snapmaker2_A350.def.json index 944e9ebc3b..985880f0a0 100644 --- a/resources/definitions/snapmaker2_A350.def.json +++ b/resources/definitions/snapmaker2_A350.def.json @@ -1,39 +1,30 @@ -{ - "version": 2, - "name": "Snapmaker 2 A350", - "inherits": "snapmaker2", - "metadata": { - "visible": true, - "manufacturer": "Snapmaker", - "file_formats": "text/x-gcode", - "machine_extruder_trains": { - "0": "snapmaker_extruder_0" - }, - "quality_definition": "snapmaker2" - }, - "overrides": { - "machine_name": { - "default_value": "Snapmaker A350" - }, - "machine_width": { - "default_value": 320 - }, - "machine_depth": { - "default_value": 350 - }, - "machine_height": { - "default_value": 330 - }, - "machine_head_with_fans_polygon": { - "default_value": [ - [-67, 22], - [-67, -25], - [25.5, 22], - [25.5, -25] - ] - }, - "gantry_height": { - "value": 27 - } - } -} +{ + "version": 2, + "name": "Snapmaker 2 A350", + "inherits": "snapmaker2", + "metadata": + { + "visible": true, + "manufacturer": "Snapmaker", + "file_formats": "text/x-gcode", + "machine_extruder_trains": { "0": "snapmaker_extruder_0" }, + "quality_definition": "snapmaker2" + }, + "overrides": + { + "gantry_height": { "value": 27 }, + "machine_depth": { "default_value": 350 }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-67, 22], + [-67, -25], + [25.5, 22], + [25.5, -25] + ] + }, + "machine_height": { "default_value": 330 }, + "machine_name": { "default_value": "Snapmaker A350" }, + "machine_width": { "default_value": 320 } + } +} \ No newline at end of file diff --git a/resources/definitions/sovol_base.def.json b/resources/definitions/sovol_base.def.json new file mode 100644 index 0000000000..125a3342b4 --- /dev/null +++ b/resources/definitions/sovol_base.def.json @@ -0,0 +1,117 @@ +{ + "version": 2, + "name": "Sovol Base Printer", + "inherits": "fdmprinter", + "metadata": + { + "visible": false, + "author": "ed3d.net", + "manufacturer": "Sovol 3D", + "file_formats": "text/x-gcode", + "exclude_materials": [ + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "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", + "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", + "structur3d_dap100silicone", + "tizyx_abs", + "tizyx_pla", + "tizyx_pla_bois", + "verbatim_bvoh_175", + "zyyx_pro_flex", + "zyyx_pro_pla" + ], + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "preferred_quality_type": "standard", + "preferred_variant_name": "0.4mm Nozzle", + "variants_name": "Nozzle Size" + }, + "overrides": + { + "acceleration_enabled": { "value": true }, + "acceleration_print": { "value": 500 }, + "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, + "acceleration_travel": { "value": 500 }, + "acceleration_travel_layer_0": { "value": "acceleration_travel" }, + "adaptive_layer_height_variation": { "value": 0.04 }, + "adaptive_layer_height_variation_step": { "value": 0.04 }, + "adhesion_type": { "value": "'skirt'" }, + "infill_before_walls": { "value": false }, + "infill_line_distance": { "value": "0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density * (2 if infill_pattern == 'grid' else (3 if infill_pattern == 'triangles' or infill_pattern == 'trihexagon' or infill_pattern == 'cubic' or infill_pattern == 'cubicsubdiv' else (2 if infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' else (1 if infill_pattern == 'cross' or infill_pattern == 'cross_3d' else 1))))" }, + "infill_overlap": { "value": 30.0 }, + "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 89 else 'cubic'" }, + "infill_sparse_density": { "value": 10.0 }, + "infill_wipe_dist": { "value": 0.0 }, + "jerk_enabled": { "value": true }, + "jerk_print": { "value": 8 }, + "jerk_travel": { "value": "jerk_print * 2" }, + "jerk_travel_layer_0": { "value": "jerk_travel" }, + "machine_acceleration": { "value": 500 }, + "machine_heated_bed": { "default_value": true }, + "machine_max_acceleration_e": { "value": 5000 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_feedrate_e": { "value": 50 }, + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_jerk_xy": { "value": 8 }, + "material_diameter": { "default_value": 1.75 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "optimize_wall_printing_order": { "value": "True" }, + "retraction_amount": { "default_value": 0.5 }, + "retraction_speed": { "default_value": 40 }, + "skin_monotonic": { "value": true }, + "skin_overlap": { "value": 10.0 }, + "speed_layer_0": { "value": 20.0 }, + "speed_print": { "value": 50.0 }, + "speed_topbottom": { "value": "math.ceil(speed_print * (50 / 100))" }, + "speed_wall": { "value": "math.ceil(speed_print * (50 / 100))" }, + "wall_0_wipe_dist": { "value": 0.0 }, + "wall_thickness": { "value": "line_width * 2" }, + "z_seam_corner": { "value": "'z_seam_corner_inner'" }, + "z_seam_type": { "value": "'sharpest_corner'" } + } +} \ No newline at end of file diff --git a/resources/definitions/sovol_base_bowden.def.json b/resources/definitions/sovol_base_bowden.def.json new file mode 100644 index 0000000000..670b24fffc --- /dev/null +++ b/resources/definitions/sovol_base_bowden.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Sovol Base Bowden Printer", + "inherits": "sovol_base", + "metadata": + { + "machine_extruder_trains": { "0": "sovol_bowden_extruder_0" }, + "quality_definition": "sovol_base_bowden" + }, + "overrides": + { + "retraction_amount": { "default_value": 5 }, + "retraction_speed": { "value": "machine_max_feedrate_e" } + } +} \ No newline at end of file diff --git a/resources/definitions/sovol_base_planetary.def.json b/resources/definitions/sovol_base_planetary.def.json new file mode 100644 index 0000000000..2191d2d4ad --- /dev/null +++ b/resources/definitions/sovol_base_planetary.def.json @@ -0,0 +1,12 @@ +{ + "version": 2, + "name": "Sovol Base Planetary Printer", + "inherits": "sovol_base", + "metadata": + { + "machine_extruder_trains": { "0": "sovol_planetary_extruder_0" }, + "quality_definition": "sovol_base_planetary" + }, + "overrides": + {} +} \ No newline at end of file diff --git a/resources/definitions/sovol_base_titan.def.json b/resources/definitions/sovol_base_titan.def.json new file mode 100644 index 0000000000..222cec0021 --- /dev/null +++ b/resources/definitions/sovol_base_titan.def.json @@ -0,0 +1,12 @@ +{ + "version": 2, + "name": "Sovol Base Titan Printer", + "inherits": "sovol_base", + "metadata": + { + "machine_extruder_trains": { "0": "sovol_titan_extruder_0" }, + "quality_definition": "sovol_base_titan" + }, + "overrides": + {} +} \ No newline at end of file diff --git a/resources/definitions/sovol_sv01.def.json b/resources/definitions/sovol_sv01.def.json new file mode 100644 index 0000000000..9d77c1c3f6 --- /dev/null +++ b/resources/definitions/sovol_sv01.def.json @@ -0,0 +1,29 @@ +{ + "version": 2, + "name": "Sovol SV01", + "inherits": "sovol_base_bowden", + "metadata": + { + "visible": true, + "quality_definition": "sovol_base_bowden" + }, + "overrides": + { + "gantry_height": { "value": 33 }, + "machine_depth": { "default_value": 240 }, + "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 X0 Y240 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_head_with_fans_polygon": + { + "default_value": [ + [-44, 16], + [-44, -60], + [44, -60], + [44, 16] + ] + }, + "machine_height": { "default_value": 300 }, + "machine_name": { "default_value": "SV01" }, + "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_width": { "default_value": 280 } + } +} \ No newline at end of file diff --git a/resources/definitions/sovol_sv01pro.def.json b/resources/definitions/sovol_sv01pro.def.json new file mode 100644 index 0000000000..346a3edc05 --- /dev/null +++ b/resources/definitions/sovol_sv01pro.def.json @@ -0,0 +1,29 @@ +{ + "version": 2, + "name": "Sovol SV01PRO", + "inherits": "sovol_base_titan", + "metadata": + { + "visible": true, + "quality_definition": "sovol_base_titan" + }, + "overrides": + { + "gantry_height": { "value": 33 }, + "machine_depth": { "default_value": 240 }, + "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 X0 Y240 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_head_with_fans_polygon": + { + "default_value": [ + [-44, 16], + [-44, -60], + [44, -60], + [44, 16] + ] + }, + "machine_height": { "default_value": 300 }, + "machine_name": { "default_value": "SV01PRO" }, + "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\nM420 S1 ;use bed mesh, must have used G29 previously\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_width": { "default_value": 280 } + } +} \ No newline at end of file diff --git a/resources/definitions/sovol_sv03.def.json b/resources/definitions/sovol_sv03.def.json new file mode 100644 index 0000000000..ae2fcd85fd --- /dev/null +++ b/resources/definitions/sovol_sv03.def.json @@ -0,0 +1,29 @@ +{ + "version": 2, + "name": "Sovol SV03", + "inherits": "sovol_base_titan", + "metadata": + { + "visible": true, + "quality_definition": "sovol_base_titan" + }, + "overrides": + { + "gantry_height": { "value": 33 }, + "machine_depth": { "default_value": 350 }, + "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 X0 Y240 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_head_with_fans_polygon": + { + "default_value": [ + [-44, 16], + [-44, -60], + [44, -60], + [44, 16] + ] + }, + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "SV03" }, + "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\nM420 S1 ;use bed mesh, must have used G29 previously\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_width": { "default_value": 350 } + } +} \ No newline at end of file diff --git a/resources/definitions/sovol_sv05.def.json b/resources/definitions/sovol_sv05.def.json new file mode 100644 index 0000000000..1715a7385c --- /dev/null +++ b/resources/definitions/sovol_sv05.def.json @@ -0,0 +1,29 @@ +{ + "version": 2, + "name": "Sovol SV05", + "inherits": "sovol_base_titan", + "metadata": + { + "visible": true, + "quality_definition": "sovol_base_titan" + }, + "overrides": + { + "gantry_height": { "value": 25 }, + "machine_depth": { "default_value": 220 }, + "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 X0 Y240 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_head_with_fans_polygon": + { + "default_value": [ + [-44, 16], + [-44, -60], + [44, -60], + [44, 16] + ] + }, + "machine_height": { "default_value": 300 }, + "machine_name": { "default_value": "SV05" }, + "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\nM420 S1 ;use bed mesh, must have used G29 previously\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_width": { "default_value": 220 } + } +} \ No newline at end of file diff --git a/resources/definitions/sovol_sv06.def.json b/resources/definitions/sovol_sv06.def.json new file mode 100644 index 0000000000..0060e2d913 --- /dev/null +++ b/resources/definitions/sovol_sv06.def.json @@ -0,0 +1,29 @@ +{ + "version": 2, + "name": "Sovol SV06", + "inherits": "sovol_base_planetary", + "metadata": + { + "visible": true, + "quality_definition": "sovol_base_planetary" + }, + "overrides": + { + "gantry_height": { "value": 25 }, + "machine_depth": { "default_value": 220 }, + "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 X0 Y240 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_head_with_fans_polygon": + { + "default_value": [ + [-44, 16], + [-44, -60], + [44, -60], + [44, 16] + ] + }, + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "SV06" }, + "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\nM420 S1 ;use bed mesh, must have used G29 previously\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_width": { "default_value": 220 } + } +} \ No newline at end of file diff --git a/resources/definitions/stereotech_start.def.json b/resources/definitions/stereotech_start.def.json index f6733d2ec7..1313addba5 100644 --- a/resources/definitions/stereotech_start.def.json +++ b/resources/definitions/stereotech_start.def.json @@ -2,44 +2,30 @@ "version": 2, "name": "Stereotech Start", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Stereotech", "manufacturer": "Stereotech LLC.", "file_formats": "text/x-gcode", "platform": "stereotech_start.3mf", "icon": "icon_ultimaker2", - "platform_offset": [0, 0, 0], - "machine_extruder_trains": - { - "0": "stereotech_start_extruder_0" - } + "machine_extruder_trains": { "0": "stereotech_start_extruder_0" }, + "platform_offset": [ + 0, + 0, + 0 + ] }, - - "overrides": { - "machine_heated_bed": { - "default_value": true - }, - "machine_width": { - "default_value": 190 - }, - "machine_height": { - "default_value": 190 - }, - "machine_depth": { - "default_value": 190 - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 ;Home all axes (max endstops)\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG28 ;Home all axes (max endstops)\nM84 ;steppers off\nG90 ;absolute positioning" - }, - "machine_shape": { - "default_value": "rectangular" - } + "overrides": + { + "machine_depth": { "default_value": 190 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG28 ;Home all axes (max endstops)\nM84 ;steppers off\nG90 ;absolute positioning" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 190 }, + "machine_shape": { "default_value": "rectangular" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 ;Home all axes (max endstops)\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, + "machine_width": { "default_value": 190 } } -} +} \ No newline at end of file diff --git a/resources/definitions/stereotech_ste320.def.json b/resources/definitions/stereotech_ste320.def.json index 3aa89effc5..2674841411 100644 --- a/resources/definitions/stereotech_ste320.def.json +++ b/resources/definitions/stereotech_ste320.def.json @@ -2,87 +2,51 @@ "version": 2, "name": "Stereotech STE320", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Stereotech", "manufacturer": "Stereotech LLC.", + "file_formats": "text/x-gcode", "platform": "stereotech_ste320_platform.obj", - "platform_texture": "StereotechSte320backplate.png", + "has_materials": true, + "machine_extruder_trains": + { + "0": "stereotech_ste320_1st", + "1": "stereotech_ste320_2nd" + }, "platform_offset": [ 0, 0, -14 ], - "file_formats": "text/x-gcode", - "has_materials": true, - "supports_usb_connection": false, - "machine_extruder_trains": { - "0": "stereotech_ste320_1st", - "1": "stereotech_ste320_2nd" - } + "platform_texture": "StereotechSte320backplate.png", + "supports_usb_connection": false }, - "overrides": { - "machine_name": { - "default_value": "Stereotech STE320" - }, - "machine_width": { - "default_value": 218 - }, - "machine_height": { - "default_value": 200 - }, - "machine_depth": { - "default_value": 210 - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_head_with_fans_polygon": { + "overrides": + { + "gantry_height": { "value": "25" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 210 }, + "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\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_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { "default_value": [ - [ - -29, - 22 - ], - [ - -29, - -20 - ], - [ - 27, - 22 - ], - [ - 27, - -20 - ] + [-29, 22], + [-29, -20], + [27, 22], + [27, -20] ] }, - "gantry_height": { - "value": "25" - }, - "machine_use_extruder_offset_to_offset_coords": { - "default_value": true - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 ;homing\nG1 Z15.0 F9000 ;move the platform down 15mm\nT1 ;Switch to the 2nd extruder\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F200 E-{switch_extruder_retraction_amount}\nT0 ;Switch to the 1st extruder\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." - }, - "machine_end_gcode": { - "default_value": "M104 T0 S0 ;1st extruder heater off\nM104 T1 S0 ;2nd extruder heater off\nM140 S0 ;heated bed heater off\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_extruder_count": { - "default_value": 2 - }, - "prime_tower_position_x": { - "value": "195" - }, - "prime_tower_position_y": { - "value": "149" - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 200 }, + "machine_name": { "default_value": "Stereotech STE320" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 ;homing\nG1 Z15.0 F9000 ;move the platform down 15mm\nT1 ;Switch to the 2nd extruder\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F200 E-{switch_extruder_retraction_amount}\nT0 ;Switch to the 1st extruder\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, + "machine_width": { "default_value": 218 }, + "prime_tower_position_x": { "value": "195" }, + "prime_tower_position_y": { "value": "149" } } } \ No newline at end of file diff --git a/resources/definitions/strateo3d.def.json b/resources/definitions/strateo3d.def.json index cc4038586c..e19dc31337 100644 --- a/resources/definitions/strateo3d.def.json +++ b/resources/definitions/strateo3d.def.json @@ -3,160 +3,299 @@ "name": "Strateo3D", "inherits": "fdmprinter", "metadata": + { + "visible": true, + "author": "eMotionTech", + "manufacturer": "eMotionTech", + "file_formats": "text/x-gcode", + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { - "author": "eMotionTech", - "manufacturer": "eMotionTech", - "visible": true, - "file_formats": "text/x-gcode", - "has_machine_quality": true, - "has_materials": true, - "has_variants": true, - "preferred_variant_name": "Standard 0.6", - "preferred_material": "emotiontech_pla", - "preferred_quality_type": "c", - "variants_name": "Print Head", - "machine_extruder_trains": - { - "0": "strateo3d_right_extruder", - "1": "strateo3d_left_extruder" - } + "0": "strateo3d_right_extruder", + "1": "strateo3d_left_extruder" }, - + "preferred_material": "emotiontech_pla", + "preferred_quality_type": "c", + "preferred_variant_name": "Standard 0.6", + "variants_name": "Print Head" + }, "overrides": + { + "acceleration_enabled": { "value": false }, + "acceleration_infill": { "maximum_value_warning": "1500" }, + "acceleration_layer_0": { - "machine_name": { "default_value": "Strateo3D" }, - "machine_width": { "default_value": 600 }, - "machine_depth": { "default_value": 420 }, - "machine_height": { "default_value": 495 }, - "machine_heated_bed": { "default_value": true }, - "machine_heated_build_volume": { "default_value": true }, - "machine_center_is_zero": { "default_value": false }, - "machine_head_with_fans_polygon": { "default_value": [ [ -76, -51.8 ] , [ 25, -51.8 ] , [ 25, 38.2 ] , [ -76, 38.2 ] ] }, - "gantry_height": { "value": "40" }, - "machine_extruder_count": { "default_value": 2 }, - "machine_gcode_flavor": { "default_value": "Marlin" }, - "machine_start_gcode": { "default_value": ";M104 T0 S{material_standby_temperature, 0} \n;M104 T1 S{material_standby_temperature, 1} \n;M140 S{material_bed_temperature_layer_0} \n;M141 S{build_volume_temperature} \nG28 \nG90 \nT{initial_extruder_nr} \nG1 X0 Y0 Z15 F6000 \n;M190 S{material_bed_temperature_layer_0} \n;M109 S{material_print_temperature_layer_0, initial_extruder_nr} \nG1 Z0.3 \nG92 E0 \nG1 F300 X45 E18 \n;G1 F1500 E17 \nG1 F600 X25 \nG1 F600 Z3" }, - "machine_end_gcode": { "default_value": "T1 \nM104 S0 \nT0 \nM104 S0 \nM140 S0 \nM141 S0 \nG91 \nG0 z1 \nG90 \nG28 \nM801.0 \nM84 \nM192" }, - "extruder_prime_pos_y": {"minimum_value": "0", "maximum_value": "machine_depth"}, - "extruder_prime_pos_x": {"minimum_value": "0", "maximum_value": "machine_width"}, - "machine_heat_zone_length": { "default_value": 7 }, - "default_material_print_temperature": { "maximum_value_warning": "400", "maximum_value": "415" }, - "material_print_temperature": { "maximum_value_warning": "400", "maximum_value": "415" }, - "material_print_temperature_layer_0": { "maximum_value_warning": "400", "maximum_value": "415" }, - "material_initial_print_temperature": { "maximum_value_warning": "400", "maximum_value": "415" }, - "material_final_print_temperature": { "maximum_value_warning": "400", "maximum_value": "415" }, - "material_standby_temperature": { "maximum_value_warning": "material_print_temperature - 40", "maximum_value": "material_print_temperature" }, - "material_bed_temperature": { "maximum_value_warning": "140", "maximum_value": "140" }, - "material_bed_temperature_layer_0": { "maximum_value_warning": "140", "maximum_value": "140" }, - "extruder_prime_pos_abs": { "default_value": true }, - "machine_acceleration": { "default_value": 1500 }, - "machine_max_jerk_xy": { "default_value": 0.01 }, - "machine_max_jerk_z": { "default_value": 0}, - - "acceleration_enabled": { "value": false }, - "acceleration_print": { "value": "machine_acceleration", "maximum_value_warning": "1500" }, - "acceleration_infill": { "maximum_value_warning": "1500" }, - "acceleration_wall": { "value": "math.ceil(acceleration_print * 1250 / acceleration_print)", "maximum_value_warning": "1500" }, - "acceleration_wall_0": { "value": "math.ceil(acceleration_print * 1000 / acceleration_print)", "maximum_value_warning": "1500" }, - "acceleration_wall_x": { "maximum_value_warning": "1500" }, - "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 1250 / acceleration_print)", "maximum_value_warning": "1500" }, - "acceleration_support": { "value": "acceleration_print", "maximum_value_warning": "1500" }, - "acceleration_support_infill": { "maximum_value_warning": "1500" }, - "acceleration_support_interface": { "value": "acceleration_topbottom", "maximum_value_warning": "1500" }, - "acceleration_support_roof": { "maximum_value_warning": "1500" }, - "acceleration_support_bottom": { "maximum_value_warning": "1500" }, - "acceleration_prime_tower": { "maximum_value_warning": "1500" }, - "acceleration_travel": { "value": "acceleration_print", "maximum_value_warning": "1500" }, - "acceleration_layer_0": { "value": "acceleration_topbottom", "maximum_value_warning": "1500" }, - "acceleration_print_layer_0": { "maximum_value_warning": "1500" }, - "acceleration_travel_layer_0": { "maximum_value_warning": "1500" }, - "acceleration_skirt_brim": { "maximum_value_warning": "1500" }, - - "adaptive_layer_height_variation": { "default_value": 0.1 }, - "adaptive_layer_height_variation_step": { "default_value": 0.05 }, - "adhesion_type": { "default_value": "skirt" }, - "expand_skins_expand_distance": { "value": "wall_line_width_0 + wall_line_count * wall_line_width_x" }, - "gradual_infill_step_height": { "value": "layer_height*10" }, - "gradual_support_infill_step_height": { "value": "layer_height*7" }, - "infill_before_walls": { "default_value": false }, - "infill_overlap": { "value": "0" }, - "infill_wipe_dist": { "value": "0" }, - - "jerk_enabled": { "value": "False", "maximum_value_warning": "0.01" }, - "jerk_print": { "value": "0.01", "maximum_value_warning": "0.01" }, - "jerk_infill": { "value": "0.01", "maximum_value_warning": "0.01" }, - "jerk_layer_0": { "value": "jerk_topbottom", "maximum_value_warning": "0.01" }, - "jerk_print_layer_0": { "maximum_value_warning": "0.01" }, - "jerk_travel_layer_0": { "maximum_value_warning": "0.01" }, - "jerk_skirt_brim": { "maximum_value_warning": "0.01" }, - "jerk_prime_tower": { "value": "jerk_print * 15 / 25", "maximum_value_warning": "0.01" }, - "jerk_support": { "value": "jerk_print * 15 / 25", "maximum_value_warning": "0.01" }, - "jerk_support_infill": { "maximum_value_warning": "0.01" }, - "jerk_support_interface": { "value": "jerk_topbottom", "maximum_value_warning": "0.01" }, - "jerk_support_roof": { "maximum_value_warning": "0.01" }, - "jerk_support_bottom": { "maximum_value_warning": "0.01" }, - "jerk_topbottom": { "value": "jerk_print * 5 / 25", "maximum_value_warning": "0.01" }, - "jerk_wall": { "value": "jerk_print * 5 / 25", "maximum_value_warning": "0.01" }, - "jerk_wall_0": { "value": "jerk_wall * 5 / 10", "maximum_value_warning": "0.01" }, - "jerk_wall_x": { "maximum_value_warning": "0.01" }, - "jerk_travel": { "value": "machine_max_jerk_xy", "maximum_value_warning": "0.01" }, - - "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, - "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, - "machine_min_cool_heat_time_window": { "value": "15" }, - "machine_nozzle_cool_down_speed": { "default_value": 0.50 }, - "machine_nozzle_heat_up_speed": { "default_value": 2.25 }, - "material_flow": { "default_value": 93 }, - "material_flow_layer_0": { "value": "math.ceil(material_flow*1)" }, - "meshfix_maximum_resolution": { "value": "0.5" }, - "meshfix_maximum_deviation": { "default_value": 0.04 }, - "optimize_wall_printing_order": { "value": "True" }, - "prime_blob_enable": { "enabled": false, "default_value": false }, - "prime_tower_min_volume": { "default_value": 35 }, - "prime_tower_position_x": { "value": "machine_width/2 + prime_tower_size/2" }, - "prime_tower_position_y": { "value": "machine_depth - prime_tower_size - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0) - 1" }, - "retraction_amount": { "default_value": 1.5 }, - "retraction_combing": { "value": "'all'" }, - "retraction_combing_max_distance": { "default_value": 5 }, - "retraction_count_max": { "default_value": 15 }, - "retraction_hop": { "value": "2" }, - "retraction_hop_enabled": { "value": "extruders_enabled_count > 1" }, - "retraction_hop_only_when_collides": { "value": "True" }, - "retraction_min_travel": { "value": "3*line_width" }, - "retraction_prime_speed": { "value": "retraction_speed-10" }, - "retraction_speed": { "default_value": 25 }, - "skin_overlap": { "value": "10" }, - "skirt_brim_minimal_length": { "default_value": 333 }, - "speed_layer_0": { "value": "20" }, - "speed_travel_layer_0": { "value": "100" }, - "speed_prime_tower": { "value": "speed_topbottom" }, - "speed_print": { "value": "50" }, - "speed_support": { "value": "speed_wall" }, - "speed_support_interface": { "value": "speed_topbottom" }, - "speed_topbottom": { "value": "math.ceil(speed_print * 20/35)" }, - "speed_travel": { "value": "150" }, - "speed_wall": { "value": "math.ceil(speed_print * 3/4)" }, - "speed_wall_0": { "value": "math.ceil(speed_wall * 2/3)" }, - "speed_wall_x": { "value": "speed_wall" }, - "support_angle": { "value": "50" }, - "support_bottom_distance": {"value": "extruderValue(support_bottom_extruder_nr if support_bottom_enable else support_infill_extruder_nr, 'support_z_distance/2') if support_type == 'everywhere' else 0", "maximum_value_warning": "machine_nozzle_size*1.5" }, - "support_interface_enable": { "default_value": true }, - "support_interface_height": { "value": "layer_height*3" }, - "support_interface_offset": { "value": "support_offset" }, - "support_top_distance": {"value": "extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance')", "maximum_value_warning": "machine_nozzle_size*1.5" }, - "support_use_towers": { "default_value": true }, - "support_xy_distance": { "value": "line_width * 1.7" }, - "support_xy_distance_overhang": { "value": "wall_line_width_0" }, - "support_z_distance": { "value": "layer_height*2", "maximum_value_warning": "machine_nozzle_size*1.5" }, - "switch_extruder_prime_speed": { "value": "retraction_prime_speed" }, - "switch_extruder_retraction_amount": { "value": "7" }, - "switch_extruder_retraction_speeds": {"value": "retraction_retract_speed"}, - "top_bottom_thickness": { "value": "3*layer_height", "minimum_value_warning": "layer_height*2" }, - "top_thickness": { "value": "top_bottom_thickness" }, - "top_layers": { "value": "0 if infill_sparse_density == 100 else math.ceil(round(top_thickness / resolveOrValue('layer_height'), 4))"}, - "bottom_thickness": { "value": "top_bottom_thickness-2*layer_height+layer_height_0" }, - "bottom_layers": { "value": "999999 if infill_sparse_density == 100 else math.ceil(round(((bottom_thickness-resolveOrValue('layer_height_0')) / resolveOrValue('layer_height'))+1, 4))"}, - "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, - "wall_thickness": { "value": "wall_line_width_0 + wall_line_width_x" } - } -} + "maximum_value_warning": "1500", + "value": "acceleration_topbottom" + }, + "acceleration_prime_tower": { "maximum_value_warning": "1500" }, + "acceleration_print": + { + "maximum_value_warning": "1500", + "value": "machine_acceleration" + }, + "acceleration_print_layer_0": { "maximum_value_warning": "1500" }, + "acceleration_skirt_brim": { "maximum_value_warning": "1500" }, + "acceleration_support": + { + "maximum_value_warning": "1500", + "value": "acceleration_print" + }, + "acceleration_support_bottom": { "maximum_value_warning": "1500" }, + "acceleration_support_infill": { "maximum_value_warning": "1500" }, + "acceleration_support_interface": + { + "maximum_value_warning": "1500", + "value": "acceleration_topbottom" + }, + "acceleration_support_roof": { "maximum_value_warning": "1500" }, + "acceleration_topbottom": + { + "maximum_value_warning": "1500", + "value": "math.ceil(acceleration_print * 1250 / acceleration_print)" + }, + "acceleration_travel": + { + "maximum_value_warning": "1500", + "value": "acceleration_print" + }, + "acceleration_travel_layer_0": { "maximum_value_warning": "1500" }, + "acceleration_wall": + { + "maximum_value_warning": "1500", + "value": "math.ceil(acceleration_print * 1250 / acceleration_print)" + }, + "acceleration_wall_0": + { + "maximum_value_warning": "1500", + "value": "math.ceil(acceleration_print * 1000 / acceleration_print)" + }, + "acceleration_wall_x": { "maximum_value_warning": "1500" }, + "adaptive_layer_height_variation": { "default_value": 0.1 }, + "adaptive_layer_height_variation_step": { "default_value": 0.05 }, + "adhesion_type": { "default_value": "skirt" }, + "bottom_layers": { "value": "999999 if infill_sparse_density == 100 else math.ceil(round(((bottom_thickness-resolveOrValue('layer_height_0')) / resolveOrValue('layer_height'))+1, 4))" }, + "bottom_thickness": { "value": "top_bottom_thickness-2*layer_height+layer_height_0" }, + "default_material_print_temperature": + { + "maximum_value": "415", + "maximum_value_warning": "400" + }, + "expand_skins_expand_distance": { "value": "wall_line_width_0 + wall_line_count * wall_line_width_x" }, + "extruder_prime_pos_abs": { "default_value": true }, + "extruder_prime_pos_x": + { + "maximum_value": "machine_width", + "minimum_value": "0" + }, + "extruder_prime_pos_y": + { + "maximum_value": "machine_depth", + "minimum_value": "0" + }, + "gantry_height": { "value": "40" }, + "gradual_infill_step_height": { "value": "layer_height*10" }, + "gradual_support_infill_step_height": { "value": "layer_height*7" }, + "infill_before_walls": { "default_value": false }, + "infill_overlap": { "value": "0" }, + "infill_wipe_dist": { "value": "0" }, + "jerk_enabled": + { + "maximum_value_warning": "0.01", + "value": "False" + }, + "jerk_infill": + { + "maximum_value_warning": "0.01", + "value": "0.01" + }, + "jerk_layer_0": + { + "maximum_value_warning": "0.01", + "value": "jerk_topbottom" + }, + "jerk_prime_tower": + { + "maximum_value_warning": "0.01", + "value": "jerk_print * 15 / 25" + }, + "jerk_print": + { + "maximum_value_warning": "0.01", + "value": "0.01" + }, + "jerk_print_layer_0": { "maximum_value_warning": "0.01" }, + "jerk_skirt_brim": { "maximum_value_warning": "0.01" }, + "jerk_support": + { + "maximum_value_warning": "0.01", + "value": "jerk_print * 15 / 25" + }, + "jerk_support_bottom": { "maximum_value_warning": "0.01" }, + "jerk_support_infill": { "maximum_value_warning": "0.01" }, + "jerk_support_interface": + { + "maximum_value_warning": "0.01", + "value": "jerk_topbottom" + }, + "jerk_support_roof": { "maximum_value_warning": "0.01" }, + "jerk_topbottom": + { + "maximum_value_warning": "0.01", + "value": "jerk_print * 5 / 25" + }, + "jerk_travel": + { + "maximum_value_warning": "0.01", + "value": "machine_max_jerk_xy" + }, + "jerk_travel_layer_0": { "maximum_value_warning": "0.01" }, + "jerk_wall": + { + "maximum_value_warning": "0.01", + "value": "jerk_print * 5 / 25" + }, + "jerk_wall_0": + { + "maximum_value_warning": "0.01", + "value": "jerk_wall * 5 / 10" + }, + "jerk_wall_x": { "maximum_value_warning": "0.01" }, + "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, + "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, + "machine_acceleration": { "default_value": 1500 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 420 }, + "machine_end_gcode": { "default_value": "T1 \nM104 S0 \nT0 \nM104 S0 \nM140 S0 \nM141 S0 \nG91 \nG0 z1 \nG90 \nG28 \nM801.0 \nM84 \nM192" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "Marlin" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-76, -51.8], + [25, -51.8], + [25, 38.2], + [-76, 38.2] + ] + }, + "machine_heat_zone_length": { "default_value": 7 }, + "machine_heated_bed": { "default_value": true }, + "machine_heated_build_volume": { "default_value": true }, + "machine_height": { "default_value": 495 }, + "machine_max_jerk_xy": { "default_value": 0.01 }, + "machine_max_jerk_z": { "default_value": 0 }, + "machine_min_cool_heat_time_window": { "value": "15" }, + "machine_name": { "default_value": "Strateo3D" }, + "machine_nozzle_cool_down_speed": { "default_value": 0.5 }, + "machine_nozzle_heat_up_speed": { "default_value": 2.25 }, + "machine_start_gcode": { "default_value": ";M104 T0 S{material_standby_temperature, 0} \n;M104 T1 S{material_standby_temperature, 1} \n;M140 S{material_bed_temperature_layer_0} \n;M141 S{build_volume_temperature} \nG28 \nG90 \nT{initial_extruder_nr} \nG1 X0 Y0 Z15 F6000 \n;M190 S{material_bed_temperature_layer_0} \n;M109 S{material_print_temperature_layer_0, initial_extruder_nr} \nG1 Z0.3 \nG92 E0 \nG1 F300 X45 E18 \n;G1 F1500 E17 \nG1 F600 X25 \nG1 F600 Z3" }, + "machine_width": { "default_value": 600 }, + "material_bed_temperature": + { + "maximum_value": "140", + "maximum_value_warning": "140" + }, + "material_bed_temperature_layer_0": + { + "maximum_value": "140", + "maximum_value_warning": "140" + }, + "material_final_print_temperature": + { + "maximum_value": "415", + "maximum_value_warning": "400" + }, + "material_flow": { "default_value": 93 }, + "material_flow_layer_0": { "value": "math.ceil(material_flow*1)" }, + "material_initial_print_temperature": + { + "maximum_value": "415", + "maximum_value_warning": "400" + }, + "material_print_temperature": + { + "maximum_value": "415", + "maximum_value_warning": "400" + }, + "material_print_temperature_layer_0": + { + "maximum_value": "415", + "maximum_value_warning": "400" + }, + "material_standby_temperature": + { + "maximum_value": "material_print_temperature", + "maximum_value_warning": "material_print_temperature - 40" + }, + "meshfix_maximum_deviation": { "default_value": 0.04 }, + "meshfix_maximum_resolution": { "value": "0.5" }, + "optimize_wall_printing_order": { "value": "True" }, + "prime_blob_enable": + { + "default_value": false, + "enabled": false + }, + "prime_tower_min_volume": { "default_value": 35 }, + "prime_tower_position_x": { "value": "machine_width/2 + prime_tower_size/2" }, + "prime_tower_position_y": { "value": "machine_depth - prime_tower_size - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0) - 1" }, + "retraction_amount": { "default_value": 1.5 }, + "retraction_combing": { "value": "'all'" }, + "retraction_combing_max_distance": { "default_value": 5 }, + "retraction_count_max": { "default_value": 15 }, + "retraction_hop": { "value": "2" }, + "retraction_hop_enabled": { "value": "extruders_enabled_count > 1" }, + "retraction_hop_only_when_collides": { "value": "True" }, + "retraction_min_travel": { "value": "3*line_width" }, + "retraction_prime_speed": { "value": "retraction_speed-10" }, + "retraction_speed": { "default_value": 25 }, + "skin_overlap": { "value": "10" }, + "skirt_brim_minimal_length": { "default_value": 333 }, + "speed_layer_0": { "value": "20" }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_print": { "value": "50" }, + "speed_support": { "value": "speed_wall" }, + "speed_support_interface": { "value": "speed_topbottom" }, + "speed_topbottom": { "value": "math.ceil(speed_print * 20/35)" }, + "speed_travel": { "value": "150" }, + "speed_travel_layer_0": { "value": "100" }, + "speed_wall": { "value": "math.ceil(speed_print * 3/4)" }, + "speed_wall_0": { "value": "math.ceil(speed_wall * 2/3)" }, + "speed_wall_x": { "value": "speed_wall" }, + "support_angle": { "value": "50" }, + "support_bottom_distance": + { + "maximum_value_warning": "machine_nozzle_size*1.5", + "value": "extruderValue(support_bottom_extruder_nr if support_bottom_enable else support_infill_extruder_nr, 'support_z_distance/2') if support_type == 'everywhere' else 0" + }, + "support_interface_enable": { "default_value": true }, + "support_interface_height": { "value": "layer_height*3" }, + "support_interface_offset": { "value": "support_offset" }, + "support_top_distance": + { + "maximum_value_warning": "machine_nozzle_size*1.5", + "value": "extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance')" + }, + "support_use_towers": { "default_value": true }, + "support_xy_distance": { "value": "line_width * 1.7" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + "support_z_distance": + { + "maximum_value_warning": "machine_nozzle_size*1.5", + "value": "layer_height*2" + }, + "switch_extruder_prime_speed": { "value": "retraction_prime_speed" }, + "switch_extruder_retraction_amount": { "value": "7" }, + "switch_extruder_retraction_speeds": { "value": "retraction_retract_speed" }, + "top_bottom_thickness": + { + "minimum_value_warning": "layer_height*2", + "value": "3*layer_height" + }, + "top_layers": { "value": "0 if infill_sparse_density == 100 else math.ceil(round(top_thickness / resolveOrValue('layer_height'), 4))" }, + "top_thickness": { "value": "top_bottom_thickness" }, + "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, + "wall_thickness": { "value": "wall_line_width_0 + wall_line_width_x" } + } +} \ No newline at end of file diff --git a/resources/definitions/stream20dual_mk2.def.json b/resources/definitions/stream20dual_mk2.def.json index 2bb491a906..c41303934d 100644 --- a/resources/definitions/stream20dual_mk2.def.json +++ b/resources/definitions/stream20dual_mk2.def.json @@ -2,51 +2,60 @@ "version": 2, "name": "Volumic Stream20Dual MK2", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Volumic", "manufacturer": "Volumic", "file_formats": "text/x-gcode", - "icon": "volumic-icon", "platform": "STREAM20PRO_platform.STL", - "machine_extruder_trains":{"0": "stream20dual_0","1": "stream20dual_1"}, "has_machine_quality": true, - "has_materials": true + "has_materials": true, + "icon": "volumic-icon", + "machine_extruder_trains": + { + "0": "stream20dual_0", + "1": "stream20dual_1" + } }, - - "overrides": { - "machine_name": { "default_value": "VOLUMIC STREAM20DUAL MK2" }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 165 }, - "machine_height": { "default_value": 240 }, - "machine_depth": { "default_value": 200 }, - "machine_center_is_zero": { "default_value": false }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_size": { "default_value": 0.4 }, + "overrides": + { + "adhesion_type": { "default_value": "none" }, + "fill_outline_gaps": { "default_value": true }, + "infill_sparse_density": { "default_value": 25 }, "layer_height": { "default_value": 0.1 }, "layer_height_0": { "default_value": 0.1 }, - "retraction_amount": { "default_value": 2 }, - "retraction_speed": { "default_value": 25 }, - "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": 2000 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "M107\nG91\nT0\nG1 E-1\nM104 T0 S0\nG90\nG0 X1 Y190 F5000\nG92 E0\nM140 S0\nM84\nM300" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-38, 30], + [38, 30], + [38, -40], + [-38, -40] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 240 }, + "machine_max_acceleration_z": { "default_value": 500 }, + "machine_max_feedrate_e": { "default_value": 60 }, + "machine_max_feedrate_z": { "default_value": 20 }, + "machine_max_jerk_e": { "default_value": 5 }, "machine_max_jerk_xy": { "default_value": 10 }, "machine_max_jerk_z": { "default_value": 0.4 }, - "machine_max_jerk_e": { "default_value": 5 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_extruder_count": {"default_value": 2}, - "machine_start_gcode": { - "default_value": "M117 Demarrage\nM106 S0\nM140 S{material_bed_temperature_layer_0}\nM104 T0 S{material_print_temperature_layer_0}\nG28\nG90\nM82\nG92 E0\nG1 Z3 F600\n;M190 S{material_bed_temperature_layer_0}\nM109 T0 S{material_print_temperature_layer_0}\nM300 P350\nM117 Purge\nG1 Z0.15 F600\nG1 E10 F400\nG92 E0\nM117 Impression" - }, - "machine_end_gcode": { - "default_value": "M107\nG91\nT0\nG1 E-1\nM104 T0 S0\nG90\nG0 X1 Y190 F5000\nG92 E0\nM140 S0\nM84\nM300" - } + "machine_name": { "default_value": "VOLUMIC STREAM20DUAL MK2" }, + "machine_nozzle_size": { "default_value": 0.4 }, + "machine_start_gcode": { "default_value": "M117 Demarrage\nM106 S0\nM140 S{material_bed_temperature_layer_0}\nM104 T0 S{material_print_temperature_layer_0}\nG28\nG90\nM82\nG92 E0\nG1 Z3 F600\n;M190 S{material_bed_temperature_layer_0}\nM109 T0 S{material_print_temperature_layer_0}\nM300 P350\nM117 Purge\nG1 Z0.15 F600\nG1 E10 F400\nG92 E0\nM117 Impression" }, + "machine_width": { "default_value": 165 }, + "material_diameter": { "default_value": 1.75 }, + "retract_at_layer_change": { "default_value": true }, + "retraction_amount": { "default_value": 2 }, + "retraction_combing_max_distance": { "default_value": 200 }, + "retraction_speed": { "default_value": 25 } } -} +} \ No newline at end of file diff --git a/resources/definitions/stream20pro_mk2.def.json b/resources/definitions/stream20pro_mk2.def.json index 1da3c01d1f..a7c9141b8c 100644 --- a/resources/definitions/stream20pro_mk2.def.json +++ b/resources/definitions/stream20pro_mk2.def.json @@ -2,50 +2,55 @@ "version": 2, "name": "Volumic Stream20Pro MK2", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Volumic", "manufacturer": "Volumic", "file_formats": "text/x-gcode", - "icon": "volumic-icon", "platform": "STREAM20PRO_platform.STL", - "has_materials": true, "has_machine_quality": true, - "machine_extruder_trains":{"0": "stream20_extruder"} + "has_materials": true, + "icon": "volumic-icon", + "machine_extruder_trains": { "0": "stream20_extruder" } }, - - "overrides": { - "machine_name": { "default_value": "VOLUMIC STREAM20PRO MK2" }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 200 }, - "machine_height": { "default_value": 240 }, - "machine_depth": { "default_value": 200 }, - "machine_center_is_zero": { "default_value": false }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_size": { "default_value": 0.4 }, + "overrides": + { + "adhesion_type": { "default_value": "none" }, + "fill_outline_gaps": { "default_value": true }, + "infill_sparse_density": { "default_value": 25 }, "layer_height": { "default_value": 0.1 }, "layer_height_0": { "default_value": 0.1 }, - "retraction_amount": { "default_value": 2 }, - "retraction_speed": { "default_value": 25 }, - "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": 50 }, - "machine_max_feedrate_e": { "default_value": 60 }, - "machine_max_acceleration_z": { "default_value": 500 }, "machine_acceleration": { "default_value": 2000 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "M107\nG91\nT0\nG1 E-1\nM104 T0 S0\nG90\nG0 X1 Y190 F5000\nG92 E0\nM140 S0\nM84\nM300" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-38, 30], + [38, 30], + [38, -40], + [-38, -40] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 240 }, + "machine_max_acceleration_z": { "default_value": 500 }, + "machine_max_feedrate_e": { "default_value": 60 }, + "machine_max_feedrate_z": { "default_value": 50 }, + "machine_max_jerk_e": { "default_value": 5 }, "machine_max_jerk_xy": { "default_value": 10 }, "machine_max_jerk_z": { "default_value": 0.4 }, - "machine_max_jerk_e": { "default_value": 5 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "M117 Demarrage\nM106 S0\nM140 S{material_bed_temperature_layer_0}\nM104 T0 S{material_print_temperature_layer_0}\nG28\nG90\nM82\nG92 E0\nG1 Z3 F600\n;M190 S{material_bed_temperature_layer_0}\nM109 T0 S{material_print_temperature_layer_0}\nM300 P350\nM117 Purge\nG1 Z0.15 F600\nG1 E10 F400\nG92 E0\nM117 Impression" - }, - "machine_end_gcode": { - "default_value": "M107\nG91\nT0\nG1 E-1\nM104 T0 S0\nG90\nG0 X1 Y190 F5000\nG92 E0\nM140 S0\nM84\nM300" - } + "machine_name": { "default_value": "VOLUMIC STREAM20PRO MK2" }, + "machine_nozzle_size": { "default_value": 0.4 }, + "machine_start_gcode": { "default_value": "M117 Demarrage\nM106 S0\nM140 S{material_bed_temperature_layer_0}\nM104 T0 S{material_print_temperature_layer_0}\nG28\nG90\nM82\nG92 E0\nG1 Z3 F600\n;M190 S{material_bed_temperature_layer_0}\nM109 T0 S{material_print_temperature_layer_0}\nM300 P350\nM117 Purge\nG1 Z0.15 F600\nG1 E10 F400\nG92 E0\nM117 Impression" }, + "machine_width": { "default_value": 200 }, + "material_diameter": { "default_value": 1.75 }, + "retract_at_layer_change": { "default_value": true }, + "retraction_amount": { "default_value": 2 }, + "retraction_combing_max_distance": { "default_value": 200 }, + "retraction_speed": { "default_value": 25 } } -} +} \ No newline at end of file diff --git a/resources/definitions/stream30dual_mk2.def.json b/resources/definitions/stream30dual_mk2.def.json index 4d16c978a9..b2688aedcb 100644 --- a/resources/definitions/stream30dual_mk2.def.json +++ b/resources/definitions/stream30dual_mk2.def.json @@ -2,51 +2,60 @@ "version": 2, "name": "Volumic Stream30Dual MK2", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Volumic", "manufacturer": "Volumic", "file_formats": "text/x-gcode", - "icon": "volumic-icon", "platform": "STREAM30PRO_platform.STL", - "machine_extruder_trains":{"0": "stream30dual_0","1": "stream30dual_1"}, "has_machine_quality": true, - "has_materials": true + "has_materials": true, + "icon": "volumic-icon", + "machine_extruder_trains": + { + "0": "stream30dual_0", + "1": "stream30dual_1" + } }, - - "overrides": { - "machine_name": { "default_value": "VOLUMIC STREAM30DUAL MK2" }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 265 }, - "machine_height": { "default_value": 300 }, - "machine_depth": { "default_value": 200 }, - "machine_center_is_zero": { "default_value": false }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_size": { "default_value": 0.4 }, + "overrides": + { + "adhesion_type": { "default_value": "none" }, + "fill_outline_gaps": { "default_value": true }, + "infill_sparse_density": { "default_value": 25 }, "layer_height": { "default_value": 0.1 }, "layer_height_0": { "default_value": 0.1 }, - "retraction_amount": { "default_value": 2 }, - "retraction_speed": { "default_value": 25 }, - "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": [[0,0],[0,0],[0,0],[0,0]] }, - "machine_max_feedrate_z": { "default_value": 50 }, - "machine_max_feedrate_e": { "default_value": 60 }, - "machine_max_acceleration_z": { "default_value": 500 }, "machine_acceleration": { "default_value": 2000 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "M107\nG91\nT0\nG1 E-1\nM104 T0 S0\nG90\nG0 X1 Y190 F5000\nG92 E0\nM140 S0\nM84\nM300" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [0, 0], + [0, 0], + [0, 0], + [0, 0] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 300 }, + "machine_max_acceleration_z": { "default_value": 500 }, + "machine_max_feedrate_e": { "default_value": 60 }, + "machine_max_feedrate_z": { "default_value": 50 }, + "machine_max_jerk_e": { "default_value": 5 }, "machine_max_jerk_xy": { "default_value": 10 }, "machine_max_jerk_z": { "default_value": 0.4 }, - "machine_max_jerk_e": { "default_value": 5 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_extruder_count": {"default_value": 2}, - "machine_start_gcode": { - "default_value": "M117 Demarrage\nM106 S0\nM140 S{material_bed_temperature_layer_0}\nM104 T0 S{material_print_temperature_layer_0}\nG28\nG90\nM82\nG92 E0\nG1 Z3 F600\n;M190 S{material_bed_temperature_layer_0}\nM109 T0 S{material_print_temperature_layer_0}\nM300 P350\nM117 Purge\nG1 Z0.15 F600\nG1 E10 F400\nG92 E0\nM117 Impression" - }, - "machine_end_gcode": { - "default_value": "M107\nG91\nT0\nG1 E-1\nM104 T0 S0\nG90\nG0 X1 Y190 F5000\nG92 E0\nM140 S0\nM84\nM300" - } + "machine_name": { "default_value": "VOLUMIC STREAM30DUAL MK2" }, + "machine_nozzle_size": { "default_value": 0.4 }, + "machine_start_gcode": { "default_value": "M117 Demarrage\nM106 S0\nM140 S{material_bed_temperature_layer_0}\nM104 T0 S{material_print_temperature_layer_0}\nG28\nG90\nM82\nG92 E0\nG1 Z3 F600\n;M190 S{material_bed_temperature_layer_0}\nM109 T0 S{material_print_temperature_layer_0}\nM300 P350\nM117 Purge\nG1 Z0.15 F600\nG1 E10 F400\nG92 E0\nM117 Impression" }, + "machine_width": { "default_value": 265 }, + "material_diameter": { "default_value": 1.75 }, + "retract_at_layer_change": { "default_value": true }, + "retraction_amount": { "default_value": 2 }, + "retraction_combing_max_distance": { "default_value": 200 }, + "retraction_speed": { "default_value": 25 } } -} +} \ No newline at end of file diff --git a/resources/definitions/stream30mk3.def.json b/resources/definitions/stream30mk3.def.json index 13a2571f02..c59c32362c 100644 --- a/resources/definitions/stream30mk3.def.json +++ b/resources/definitions/stream30mk3.def.json @@ -1,51 +1,56 @@ -{ - "version": 2, - "name": "Volumic Stream30Pro MK3", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Volumic", - "manufacturer": "Volumic", - "file_formats": "text/x-gcode", - "icon": "volumic-icon", - "platform": "STREAM30ULTRA_platform.STL", - "has_materials": true, - "has_machine_quality": true, - "machine_extruder_trains":{"0": "stream30mk3_extruder"} - }, - - "overrides": { - "machine_name": { "default_value": "VOLUMIC STREAM30PRO MK3" }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 300 }, - "machine_height": { "default_value": 310 }, - "machine_depth": { "default_value": 200 }, - "machine_center_is_zero": { "default_value": false }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "layer_height": { "default_value": 0.1 }, - "layer_height_0": { "default_value": 0.1 }, - "retraction_amount": { "default_value": 2.40 }, - "retraction_speed": { "default_value": 30 }, - "adhesion_type": { "default_value": "none" }, - "infill_sparse_density": { "default_value": 25 }, - "fill_outline_gaps": { "default_value": true }, - "retract_at_layer_change": { "default_value": true }, - "retraction_combing_max_distance": { "default_value": 200 }, - "machine_head_with_fans_polygon": { "default_value": [[-38,30],[38,30],[38,-40],[-38,-40]] }, - "machine_max_feedrate_z": { "default_value": 30 }, - "machine_max_feedrate_e": { "default_value": 60 }, - "machine_max_acceleration_z": { "default_value": 500 }, - "machine_acceleration": { "default_value": 2000 }, - "machine_max_jerk_xy": { "default_value": 10 }, - "machine_max_jerk_z": { "default_value": 0.4 }, - "machine_max_jerk_e": { "default_value": 5 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "M117 Demarrage\nM106 S0\nM140 S{material_bed_temperature_layer_0}\nM104 T0 S{material_print_temperature_layer_0}\nG28\nG90\nM82\nG92 E0\nG1 Z3 F600\n;M190 S{material_bed_temperature_layer_0}\nM109 T0 S{material_print_temperature_layer_0}\nM300 P350\nM117 Purge\nG1 Z0.15 F600\nG1 E10 F400\nG92 E0\nM117 Impression" - }, - "machine_end_gcode": { - "default_value": "M107\nG91\nT0\nG1 E-1\nM104 T0 S0\nG90\nG0 X1 Y190 F5000\nG92 E0\nM140 S0\nM84\nM300" - } - } -} +{ + "version": 2, + "name": "Volumic Stream30Pro MK3", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Volumic", + "manufacturer": "Volumic", + "file_formats": "text/x-gcode", + "platform": "STREAM30ULTRA_platform.STL", + "has_machine_quality": true, + "has_materials": true, + "icon": "volumic-icon", + "machine_extruder_trains": { "0": "stream30mk3_extruder" } + }, + "overrides": + { + "adhesion_type": { "default_value": "none" }, + "fill_outline_gaps": { "default_value": true }, + "infill_sparse_density": { "default_value": 25 }, + "layer_height": { "default_value": 0.1 }, + "layer_height_0": { "default_value": 0.1 }, + "machine_acceleration": { "default_value": 2000 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "M107\nG91\nT0\nG1 E-1\nM104 T0 S0\nG90\nG0 X1 Y190 F5000\nG92 E0\nM140 S0\nM84\nM300" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-38, 30], + [38, 30], + [38, -40], + [-38, -40] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 310 }, + "machine_max_acceleration_z": { "default_value": 500 }, + "machine_max_feedrate_e": { "default_value": 60 }, + "machine_max_feedrate_z": { "default_value": 30 }, + "machine_max_jerk_e": { "default_value": 5 }, + "machine_max_jerk_xy": { "default_value": 10 }, + "machine_max_jerk_z": { "default_value": 0.4 }, + "machine_name": { "default_value": "VOLUMIC STREAM30PRO MK3" }, + "machine_nozzle_size": { "default_value": 0.4 }, + "machine_start_gcode": { "default_value": "M117 Demarrage\nM106 S0\nM140 S{material_bed_temperature_layer_0}\nM104 T0 S{material_print_temperature_layer_0}\nG28\nG90\nM82\nG92 E0\nG1 Z3 F600\n;M190 S{material_bed_temperature_layer_0}\nM109 T0 S{material_print_temperature_layer_0}\nM300 P350\nM117 Purge\nG1 Z0.15 F600\nG1 E10 F400\nG92 E0\nM117 Impression" }, + "machine_width": { "default_value": 300 }, + "material_diameter": { "default_value": 1.75 }, + "retract_at_layer_change": { "default_value": true }, + "retraction_amount": { "default_value": 2.4 }, + "retraction_combing_max_distance": { "default_value": 200 }, + "retraction_speed": { "default_value": 30 } + } +} \ No newline at end of file diff --git a/resources/definitions/stream30pro_mk2.def.json b/resources/definitions/stream30pro_mk2.def.json index b313704dac..c6a523b2bc 100644 --- a/resources/definitions/stream30pro_mk2.def.json +++ b/resources/definitions/stream30pro_mk2.def.json @@ -2,50 +2,55 @@ "version": 2, "name": "Volumic Stream30Pro MK2", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Volumic", "manufacturer": "Volumic", "file_formats": "text/x-gcode", - "icon": "volumic-icon", "platform": "STREAM30PRO_platform.STL", - "has_materials": true, "has_machine_quality": true, - "machine_extruder_trains":{"0": "stream30_extruder"} + "has_materials": true, + "icon": "volumic-icon", + "machine_extruder_trains": { "0": "stream30_extruder" } }, - - "overrides": { - "machine_name": { "default_value": "VOLUMIC STREAM30PRO MK2" }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 300 }, - "machine_height": { "default_value": 300 }, - "machine_depth": { "default_value": 200 }, - "machine_center_is_zero": { "default_value": false }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_size": { "default_value": 0.4 }, + "overrides": + { + "adhesion_type": { "default_value": "none" }, + "fill_outline_gaps": { "default_value": true }, + "infill_sparse_density": { "default_value": 25 }, "layer_height": { "default_value": 0.1 }, "layer_height_0": { "default_value": 0.1 }, - "retraction_amount": { "default_value": 2 }, - "retraction_speed": { "default_value": 25 }, - "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": 50 }, - "machine_max_feedrate_e": { "default_value": 60 }, - "machine_max_acceleration_z": { "default_value": 500 }, "machine_acceleration": { "default_value": 2000 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "M107\nG91\nT0\nG1 E-1\nM104 T0 S0\nG90\nG0 X1 Y190 F5000\nG92 E0\nM140 S0\nM84\nM300" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-38, 30], + [38, 30], + [38, -40], + [-38, -40] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 300 }, + "machine_max_acceleration_z": { "default_value": 500 }, + "machine_max_feedrate_e": { "default_value": 60 }, + "machine_max_feedrate_z": { "default_value": 50 }, + "machine_max_jerk_e": { "default_value": 5 }, "machine_max_jerk_xy": { "default_value": 10 }, "machine_max_jerk_z": { "default_value": 0.4 }, - "machine_max_jerk_e": { "default_value": 5 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "M117 Demarrage\nM106 S0\nM140 S{material_bed_temperature_layer_0}\nM104 T0 S{material_print_temperature_layer_0}\nG28\nG90\nM82\nG92 E0\nG1 Z3 F600\n;M190 S{material_bed_temperature_layer_0}\nM109 T0 S{material_print_temperature_layer_0}\nM300 P350\nM117 Purge\nG1 Z0.15 F600\nG1 E10 F400\nG92 E0\nM117 Impression" - }, - "machine_end_gcode": { - "default_value": "M107\nG91\nT0\nG1 E-1\nM104 T0 S0\nG90\nG0 X1 Y190 F5000\nG92 E0\nM140 S0\nM84\nM300" - } + "machine_name": { "default_value": "VOLUMIC STREAM30PRO MK2" }, + "machine_nozzle_size": { "default_value": 0.4 }, + "machine_start_gcode": { "default_value": "M117 Demarrage\nM106 S0\nM140 S{material_bed_temperature_layer_0}\nM104 T0 S{material_print_temperature_layer_0}\nG28\nG90\nM82\nG92 E0\nG1 Z3 F600\n;M190 S{material_bed_temperature_layer_0}\nM109 T0 S{material_print_temperature_layer_0}\nM300 P350\nM117 Purge\nG1 Z0.15 F600\nG1 E10 F400\nG92 E0\nM117 Impression" }, + "machine_width": { "default_value": 300 }, + "material_diameter": { "default_value": 1.75 }, + "retract_at_layer_change": { "default_value": true }, + "retraction_amount": { "default_value": 2 }, + "retraction_combing_max_distance": { "default_value": 200 }, + "retraction_speed": { "default_value": 25 } } -} +} \ No newline at end of file diff --git a/resources/definitions/stream30ultra.def.json b/resources/definitions/stream30ultra.def.json index 731e213447..670948f3b6 100644 --- a/resources/definitions/stream30ultra.def.json +++ b/resources/definitions/stream30ultra.def.json @@ -2,50 +2,55 @@ "version": 2, "name": "Volumic Stream30Ultra", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Volumic", "manufacturer": "Volumic", "file_formats": "text/x-gcode", - "icon": "volumic-icon", "platform": "STREAM30ULTRA_platform.STL", - "has_materials": true, "has_machine_quality": true, - "machine_extruder_trains":{"0": "stream30ultra_extruder"} + "has_materials": true, + "icon": "volumic-icon", + "machine_extruder_trains": { "0": "stream30ultra_extruder" } }, - - "overrides": { - "machine_name": { "default_value": "VOLUMIC STREAM30ULTRA" }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 290 }, - "machine_height": { "default_value": 300 }, - "machine_depth": { "default_value": 200 }, - "machine_center_is_zero": { "default_value": false }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_size": { "default_value": 0.4 }, + "overrides": + { + "adhesion_type": { "default_value": "none" }, + "fill_outline_gaps": { "default_value": true }, + "infill_sparse_density": { "default_value": 25 }, "layer_height": { "default_value": 0.1 }, "layer_height_0": { "default_value": 0.1 }, - "retraction_amount": { "default_value": 2 }, - "retraction_speed": { "default_value": 25 }, - "adhesion_type": { "default_value": "none" }, - "infill_sparse_density": { "default_value": 25 }, - "fill_outline_gaps": { "default_value": true }, - "retract_at_layer_change": { "default_value": true }, - "retraction_combing_max_distance": { "default_value": 200 }, - "machine_head_with_fans_polygon": { "default_value": [[-38,30],[38,30],[38,-40],[-38,-40]] }, - "machine_max_feedrate_z": { "default_value": 30 }, - "machine_max_feedrate_e": { "default_value": 60 }, - "machine_max_acceleration_z": { "default_value": 500 }, "machine_acceleration": { "default_value": 2000 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "M107\nG91\nT0\nG1 E-1\nM104 T0 S0\nG90\nG0 X1 Y190 F5000\nG92 E0\nM140 S0\nM84\nM300" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-38, 30], + [38, 30], + [38, -40], + [-38, -40] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 300 }, + "machine_max_acceleration_z": { "default_value": 500 }, + "machine_max_feedrate_e": { "default_value": 60 }, + "machine_max_feedrate_z": { "default_value": 30 }, + "machine_max_jerk_e": { "default_value": 5 }, "machine_max_jerk_xy": { "default_value": 10 }, "machine_max_jerk_z": { "default_value": 0.4 }, - "machine_max_jerk_e": { "default_value": 5 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "M117 Demarrage\nM106 S0\nM140 S{material_bed_temperature_layer_0}\nM104 T0 S{material_print_temperature_layer_0}\nG28\nG90\nM82\nG92 E0\nG1 Z3 F600\n;M190 S{material_bed_temperature_layer_0}\nM109 T0 S{material_print_temperature_layer_0}\nM300 P350\nM117 Purge\nG1 Z0.15 F600\nG1 E10 F400\nG92 E0\nM117 Impression" - }, - "machine_end_gcode": { - "default_value": "M107\nG91\nT0\nG1 E-1\nM104 T0 S0\nG90\nG0 X1 Y190 F5000\nG92 E0\nM140 S0\nM84\nM300" - } + "machine_name": { "default_value": "VOLUMIC STREAM30ULTRA" }, + "machine_nozzle_size": { "default_value": 0.4 }, + "machine_start_gcode": { "default_value": "M117 Demarrage\nM106 S0\nM140 S{material_bed_temperature_layer_0}\nM104 T0 S{material_print_temperature_layer_0}\nG28\nG90\nM82\nG92 E0\nG1 Z3 F600\n;M190 S{material_bed_temperature_layer_0}\nM109 T0 S{material_print_temperature_layer_0}\nM300 P350\nM117 Purge\nG1 Z0.15 F600\nG1 E10 F400\nG92 E0\nM117 Impression" }, + "machine_width": { "default_value": 290 }, + "material_diameter": { "default_value": 1.75 }, + "retract_at_layer_change": { "default_value": true }, + "retraction_amount": { "default_value": 2 }, + "retraction_combing_max_distance": { "default_value": 200 }, + "retraction_speed": { "default_value": 25 } } -} +} \ No newline at end of file diff --git a/resources/definitions/stream30ultrasc.def.json b/resources/definitions/stream30ultrasc.def.json index 2f645a057b..251d2ea0ae 100644 --- a/resources/definitions/stream30ultrasc.def.json +++ b/resources/definitions/stream30ultrasc.def.json @@ -2,50 +2,55 @@ "version": 2, "name": "Volumic Stream30Ultra SC", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Volumic", "manufacturer": "Volumic", "file_formats": "text/x-gcode", - "icon": "volumic-icon", "platform": "STREAM30ULTRA_platform.STL", - "has_materials": true, "has_machine_quality": true, - "machine_extruder_trains":{"0": "stream30ultrasc_extruder"} + "has_materials": true, + "icon": "volumic-icon", + "machine_extruder_trains": { "0": "stream30ultrasc_extruder" } }, - - "overrides": { - "machine_name": { "default_value": "VOLUMIC STREAM30ULTRA SC" }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 300 }, - "machine_height": { "default_value": 310 }, - "machine_depth": { "default_value": 200 }, - "machine_center_is_zero": { "default_value": false }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_size": { "default_value": 0.4 }, + "overrides": + { + "adhesion_type": { "default_value": "none" }, + "fill_outline_gaps": { "default_value": true }, + "infill_sparse_density": { "default_value": 25 }, "layer_height": { "default_value": 0.1 }, "layer_height_0": { "default_value": 0.1 }, - "retraction_amount": { "default_value": 2.40 }, - "retraction_speed": { "default_value": 30 }, - "adhesion_type": { "default_value": "none" }, - "infill_sparse_density": { "default_value": 25 }, - "fill_outline_gaps": { "default_value": true }, - "retract_at_layer_change": { "default_value": true }, - "retraction_combing_max_distance": { "default_value": 200 }, - "machine_head_with_fans_polygon": { "default_value": [[-38,30],[38,30],[38,-40],[-38,-40]] }, - "machine_max_feedrate_z": { "default_value": 30 }, - "machine_max_feedrate_e": { "default_value": 60 }, - "machine_max_acceleration_z": { "default_value": 500 }, "machine_acceleration": { "default_value": 2000 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "M107\nG91\nT0\nG1 E-1\nM104 T0 S0\nG90\nG0 X1 Y190 F5000\nG92 E0\nM140 S0\nM84\nM300" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-38, 30], + [38, 30], + [38, -40], + [-38, -40] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 310 }, + "machine_max_acceleration_z": { "default_value": 500 }, + "machine_max_feedrate_e": { "default_value": 60 }, + "machine_max_feedrate_z": { "default_value": 30 }, + "machine_max_jerk_e": { "default_value": 5 }, "machine_max_jerk_xy": { "default_value": 10 }, "machine_max_jerk_z": { "default_value": 0.4 }, - "machine_max_jerk_e": { "default_value": 5 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "M117 Demarrage\nM106 S0\nM140 S{material_bed_temperature_layer_0}\nM104 T0 S{material_print_temperature_layer_0}\nG28\nG90\nM82\nG92 E0\nG1 Z3 F600\n;M190 S{material_bed_temperature_layer_0}\nM109 T0 S{material_print_temperature_layer_0}\nM300 P350\nM117 Purge\nG1 Z0.15 F600\nG1 E10 F400\nG92 E0\nM117 Impression" - }, - "machine_end_gcode": { - "default_value": "M107\nG91\nT0\nG1 E-1\nM104 T0 S0\nG90\nG0 X1 Y190 F5000\nG92 E0\nM140 S0\nM84\nM300" - } + "machine_name": { "default_value": "VOLUMIC STREAM30ULTRA SC" }, + "machine_nozzle_size": { "default_value": 0.4 }, + "machine_start_gcode": { "default_value": "M117 Demarrage\nM106 S0\nM140 S{material_bed_temperature_layer_0}\nM104 T0 S{material_print_temperature_layer_0}\nG28\nG90\nM82\nG92 E0\nG1 Z3 F600\n;M190 S{material_bed_temperature_layer_0}\nM109 T0 S{material_print_temperature_layer_0}\nM300 P350\nM117 Purge\nG1 Z0.15 F600\nG1 E10 F400\nG92 E0\nM117 Impression" }, + "machine_width": { "default_value": 300 }, + "material_diameter": { "default_value": 1.75 }, + "retract_at_layer_change": { "default_value": true }, + "retraction_amount": { "default_value": 2.4 }, + "retraction_combing_max_distance": { "default_value": 200 }, + "retraction_speed": { "default_value": 30 } } -} +} \ No newline at end of file diff --git a/resources/definitions/stream30ultrasc2.def.json b/resources/definitions/stream30ultrasc2.def.json index b1994044cf..6aed73f2c0 100644 --- a/resources/definitions/stream30ultrasc2.def.json +++ b/resources/definitions/stream30ultrasc2.def.json @@ -1,51 +1,56 @@ -{ - "version": 2, - "name": "Volumic Stream30Ultra SC2", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Volumic", - "manufacturer": "Volumic", - "file_formats": "text/x-gcode", - "icon": "volumic-icon", - "platform": "STREAM30ULTRA_platform.STL", - "has_materials": true, - "has_machine_quality": true, - "machine_extruder_trains":{"0": "stream30ultrasc2_extruder"} - }, - - "overrides": { - "machine_name": { "default_value": "VOLUMIC STREAM30ULTRA SC2" }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 300 }, - "machine_height": { "default_value": 310 }, - "machine_depth": { "default_value": 200 }, - "machine_center_is_zero": { "default_value": false }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "layer_height": { "default_value": 0.1 }, - "layer_height_0": { "default_value": 0.1 }, - "retraction_amount": { "default_value": 2.40 }, - "retraction_speed": { "default_value": 30 }, - "adhesion_type": { "default_value": "none" }, - "infill_sparse_density": { "default_value": 25 }, - "fill_outline_gaps": { "default_value": true }, - "retract_at_layer_change": { "default_value": true }, - "retraction_combing_max_distance": { "default_value": 200 }, - "machine_head_with_fans_polygon": { "default_value": [[-38,30],[38,30],[38,-40],[-38,-40]] }, - "machine_max_feedrate_z": { "default_value": 30 }, - "machine_max_feedrate_e": { "default_value": 60 }, - "machine_max_acceleration_z": { "default_value": 500 }, - "machine_acceleration": { "default_value": 2000 }, - "machine_max_jerk_xy": { "default_value": 10 }, - "machine_max_jerk_z": { "default_value": 0.4 }, - "machine_max_jerk_e": { "default_value": 5 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "M117 Demarrage\nM106 S0\nM140 S{material_bed_temperature_layer_0}\nM104 T0 S{material_print_temperature_layer_0}\nG28\nG90\nM82\nG92 E0\nG1 Z3 F600\n;M190 S{material_bed_temperature_layer_0}\nM109 T0 S{material_print_temperature_layer_0}\nM300 P350\nM117 Purge\nG1 Z0.15 F600\nG1 E10 F400\nG92 E0\nM117 Impression" - }, - "machine_end_gcode": { - "default_value": "M107\nG91\nT0\nG1 E-1\nM104 T0 S0\nG90\nG0 X1 Y190 F5000\nG92 E0\nM140 S0\nM84\nM300" - } - } -} +{ + "version": 2, + "name": "Volumic Stream30Ultra SC2", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Volumic", + "manufacturer": "Volumic", + "file_formats": "text/x-gcode", + "platform": "STREAM30ULTRA_platform.STL", + "has_machine_quality": true, + "has_materials": true, + "icon": "volumic-icon", + "machine_extruder_trains": { "0": "stream30ultrasc2_extruder" } + }, + "overrides": + { + "adhesion_type": { "default_value": "none" }, + "fill_outline_gaps": { "default_value": true }, + "infill_sparse_density": { "default_value": 25 }, + "layer_height": { "default_value": 0.1 }, + "layer_height_0": { "default_value": 0.1 }, + "machine_acceleration": { "default_value": 2000 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "M107\nG91\nT0\nG1 E-1\nM104 T0 S0\nG90\nG0 X1 Y190 F5000\nG92 E0\nM140 S0\nM84\nM300" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-38, 30], + [38, 30], + [38, -40], + [-38, -40] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 310 }, + "machine_max_acceleration_z": { "default_value": 500 }, + "machine_max_feedrate_e": { "default_value": 60 }, + "machine_max_feedrate_z": { "default_value": 30 }, + "machine_max_jerk_e": { "default_value": 5 }, + "machine_max_jerk_xy": { "default_value": 10 }, + "machine_max_jerk_z": { "default_value": 0.4 }, + "machine_name": { "default_value": "VOLUMIC STREAM30ULTRA SC2" }, + "machine_nozzle_size": { "default_value": 0.4 }, + "machine_start_gcode": { "default_value": "M117 Demarrage\nM106 S0\nM140 S{material_bed_temperature_layer_0}\nM104 T0 S{material_print_temperature_layer_0}\nG28\nG90\nM82\nG92 E0\nG1 Z3 F600\n;M190 S{material_bed_temperature_layer_0}\nM109 T0 S{material_print_temperature_layer_0}\nM300 P350\nM117 Purge\nG1 Z0.15 F600\nG1 E10 F400\nG92 E0\nM117 Impression" }, + "machine_width": { "default_value": 300 }, + "material_diameter": { "default_value": 1.75 }, + "retract_at_layer_change": { "default_value": true }, + "retraction_amount": { "default_value": 2.4 }, + "retraction_combing_max_distance": { "default_value": 200 }, + "retraction_speed": { "default_value": 30 } + } +} \ No newline at end of file diff --git a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json index 6b280a6c7b..c013c49e05 100644 --- a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json +++ b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json @@ -2,106 +2,90 @@ "version": 2, "name": "Discov3ry Complete", "inherits": "fdmprinter", - "metadata": { + "metadata": + { + "visible": true, "author": "Andrew Finkle, CTO", "manufacturer": "Structur3d.io", - "visible": true, "file_formats": "text/x-gcode", "platform": "ultimaker2_platform.obj", - "platform_texture": "Ultimaker2Plusbackplate.png", - "platform_offset": [0, 0, 0], + "firmware_file": "MarlinUltimaker2plus.hex", + "first_start_actions": [], + "has_machine_quality": false, "has_materials": true, "has_variants": true, - "variants_name": "Print core", - "preferred_variant_name": "0.84mm (Green)", + "machine_extruder_trains": { "0": "structur3d_discov3ry1_complete_um2plus_extruder_0" }, + "platform_offset": [ + 0, + 0, + 0 + ], + "platform_texture": "Ultimaker2Plusbackplate.png", "preferred_material": "structur3d_dap100silicone", - "has_machine_quality": false, "preferred_quality_type": "extra_fast", - "first_start_actions": [], + "preferred_variant_name": "0.84mm (Green)", "supported_actions": [], - "machine_extruder_trains": - { - "0": "structur3d_discov3ry1_complete_um2plus_extruder_0" - }, - "firmware_file": "MarlinUltimaker2plus.hex" + "variants_name": "Print core" }, - - "overrides": { - "machine_name": { "default_value": "Discov3ry Complete (Ultimaker 2+)" }, - "infill_sparse_density": { - "value": 100 - }, - "retraction_hop_enabled": { - "value": true - }, - "adhesion_type": { - "default_value": "skirt" - }, - "skirt_brim_minimal_length": { - "value": 1500 - }, - "speed_print": { - "value": 15 - }, - "speed_wall_x": { - "value": "speed_wall" - }, - "layer_height_0": { - "value": "round(machine_nozzle_size / 1.5, 2)" - }, - "line_width": { - "value": "round(machine_nozzle_size * 0.875, 2)" - }, - "speed_support": { - "value": "speed_wall_0" - }, - "machine_height": { - "default_value": 205 - }, - "machine_width": { - "default_value": 205 - }, - "machine_depth": { - "default_value": 205 - }, - "machine_show_variants": { - "default_value": true - }, - "gantry_height": { - "value": "52" - }, - "machine_nozzle_head_distance": { - "default_value": 5 - }, - "machine_heat_zone_length": { - "default_value": 20 + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "gantry_height": { "value": "52" }, + "infill_sparse_density": { "value": 100 }, + "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, + "line_width": { "value": "round(machine_nozzle_size * 0.875, 2)" }, + "machine_depth": { "default_value": 205 }, + "machine_disallowed_areas": + { + "default_value": [ + [ + [-115, 112.5], + [-78, 112.5], + [-80, 102.5], + [-115, 102.5] + ], + [ + [115, 112.5], + [115, 102.5], + [105, 102.5], + [103, 112.5] + ], + [ + [-115, -112.5], + [-115, -104.5], + [-84, -104.5], + [-82, -112.5] + ], + [ + [115, -112.5], + [108, -112.5], + [110, -104.5], + [115, -104.5] + ] + ] }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off \nM140 S0 ;heated bed heater off (if you have it) \nM92 E282 ;reset extruder EEPROM steps/mm for plastic filament \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_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_head_with_fans_polygon": { "default_value": [ - [ -44, 14 ], - [ -44, -34 ], - [ 64, 14 ], - [ 64, -34 ] + [-44, 14], + [-44, -34], + [64, 14], + [64, -34] ] }, - "machine_disallowed_areas": { - "default_value": [ - [[-115, 112.5], [ -78, 112.5], [ -80, 102.5], [-115, 102.5]], - [[ 115, 112.5], [ 115, 102.5], [ 105, 102.5], [ 103, 112.5]], - [[-115, -112.5], [-115, -104.5], [ -84, -104.5], [ -82, -112.5]], - [[ 115, -112.5], [ 108, -112.5], [ 110, -104.5], [ 115, -104.5]] - ] - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "\n;Updated Firmware (.hex and Marlin .ino) for \n;Ultimaker 2+ with Discov3ry Extruder available at: \n;https://github.com/Structur3d/UM2.1Discov3ry-Firmware-beta \n;**Learn more at https://www.structur3d.io** \n \nM104 S{material_print_temperature} ;Start heating extruder \nM140 S{material_bed_temperature} ;Start heating bed \nG21 ;metric values \nG90 ;absolute positioning \nM82 ;set extruder to absolute mode \nM107 ;start with the fan off \nM302 ;allow cold extrusion \nM92 E2589 ;set extruder EEPROM steps/mm for paste \nG28 Z0 ;move Z to bottom endstops \nG28 X0 Y0 ;move X/Y to endstops \nG1 X15 Y0 F4000 ;move X/Y to front of printer \nG1 Z15.0 F9000 ;move the platform to 15mm \nG92 E0 ;zero the extruded length \nG1 F200 E10 ;extrude 10 mm of feed stock \nG92 E0 ;zero the extruded length again \nG1 F9000 \n;Put printing message on LCD screen \nM117 Printing..." - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off \nM140 S0 ;heated bed heater off (if you have it) \nM92 E282 ;reset extruder EEPROM steps/mm for plastic filament \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_heat_zone_length": { "default_value": 20 }, + "machine_height": { "default_value": 205 }, + "machine_name": { "default_value": "Discov3ry Complete (Ultimaker 2+)" }, + "machine_nozzle_head_distance": { "default_value": 5 }, + "machine_show_variants": { "default_value": true }, + "machine_start_gcode": { "default_value": "\n;Updated Firmware (.hex and Marlin .ino) for \n;Ultimaker 2+ with Discov3ry Extruder available at: \n;https://github.com/Structur3d/UM2.1Discov3ry-Firmware-beta \n;**Learn more at https://www.structur3d.io** \n \nM104 S{material_print_temperature} ;Start heating extruder \nM140 S{material_bed_temperature} ;Start heating bed \nG21 ;metric values \nG90 ;absolute positioning \nM82 ;set extruder to absolute mode \nM107 ;start with the fan off \nM302 ;allow cold extrusion \nM92 E2589 ;set extruder EEPROM steps/mm for paste \nG28 Z0 ;move Z to bottom endstops \nG28 X0 Y0 ;move X/Y to endstops \nG1 X15 Y0 F4000 ;move X/Y to front of printer \nG1 Z15.0 F9000 ;move the platform to 15mm \nG92 E0 ;zero the extruded length \nG1 F200 E10 ;extrude 10 mm of feed stock \nG92 E0 ;zero the extruded length again \nG1 F9000 \n;Put printing message on LCD screen \nM117 Printing..." }, + "machine_width": { "default_value": 205 }, + "retraction_hop_enabled": { "value": true }, + "skirt_brim_minimal_length": { "value": 1500 }, + "speed_print": { "value": 15 }, + "speed_support": { "value": "speed_wall_0" }, + "speed_wall_x": { "value": "speed_wall" } } -} +} \ No newline at end of file diff --git a/resources/definitions/syndaveraxi.def.json b/resources/definitions/syndaveraxi.def.json index 186b89212f..b474d58163 100644 --- a/resources/definitions/syndaveraxi.def.json +++ b/resources/definitions/syndaveraxi.def.json @@ -1,46 +1,39 @@ { - "version": 2, + "version": 2, "name": "SyndaverAxi", "inherits": "fdmprinter", - "metadata": -{ - "type": "machine", + "metadata": + { "visible": true, "author": "Syndaver3D", "manufacturer": "Syndaver3D", "file_formats": "text/x-gcode", - "supports_usb_connection": true, + "machine_extruder_trains": { "0": "syndaveraxi_extruder_0" }, "preferred_quality_type": "draft", - "machine_extruder_trains": - { - "0": "syndaveraxi_extruder_0" - } + "supports_usb_connection": true, + "type": "machine" }, - - "overrides": { - "machine_name": { "default_value": "AXI" }, - "machine_shape": { "default_value": "rectangular"}, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 280 }, - "machine_depth": { "default_value": 280 }, - "machine_height": { "default_value": 285 }, + "overrides": + { + "gantry_height": { "value": "30" }, "machine_center_is_zero": { "default_value": false }, - "machine_head_with_fans_polygon": { + "machine_depth": { "default_value": 280 }, + "machine_end_gcode": { "default_value": "M400 ; wait for moves to finish\nM140 S50 ; start bed cooling\nM104 S0 ; disable hotend\nM107 ; disable fans\nM117 Cooling please wait\nG91 ; relative positioning\nG1 Z5 F3000 ; move Z up 5mm so it wont drag on the print\nG90 ; absolute positioning\nG1 X5 Y5 F3000 ; move to cooling position\nM190 R50 ; wait for bed to cool down to removal temp\nG1 X145 Y260 F1000 ; present finished print\nM140 S0 ; cool down bed\nM77 ; End LCD Print Timer\nM18 X Y E ; turn off x y and e axis\nM117 Print Complete." }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { "default_value": [ - [ 0, 0 ], - [ 0, 0 ], - [ 0, 0 ], - [ 0, 0 ] + [0, 0], + [0, 0], + [0, 0], + [0, 0] ] }, - "gantry_height": { "value": "30" }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - - "machine_start_gcode": { - "default_value": ";This G-Code has been generated specifically for Syndaver AXI with Hemera toolhead\nM73 P0 ; clear LCD progress bar\nM75 ; Start LCD Print Timer\nM107 ; disable fans\nM420 S0 ; disable leveling matrix\nM82 ; set extruder to absolute mode\nG92 E0 ; set extruder position to 0\nM140 S{material_bed_temperature_layer_0} ; start bed heating up\nM104 S170 ; start nozzle heating up\nG28 ; home all axes\nM117 AXI Heating Up...\nG1 X-17.5 Y100 F3000 ; move to wiper pad\nG1 Z10 F5000 ; move to wiper pad\nG29 L1 ; load leveling matrix slot 1\nG29 A ; ensure mesh is enabled\nM109 R170 ; wait for nozzle to reach wiping temp\nG1 E-3 ; retract material before wipe\nM117 AXI Wiping Nozzle...\nG1 Z-3 ; lower nozzle\nG1 Y90 F1000 ; slow wipe\nG1 Y65 F1000 ; slow wipe\nG1 Y80 F1000 ; slow wipe\nG1 Y65 F1000 ; slow wipe\nG1 Y55 F1000 ; slow wipe\nG1 Y30 F3000 ; fast wipe\nG1 Y55 F3000 ; fast wipe\nG1 Y30 F3000 ; fast wipe\nG1 Y55 F3000 ; fast wipe\nG1 Z10 ; raise nozzle\nM117 Heating...\nM190 R{material_bed_temperature_layer_0} ; wait for bed to reach printing temp\nM104 S{material_print_temperature_layer_0} ; set extruder to reach initial printing temp, held back for ooze reasons\nM117 Probe Z at Temp\nG28 Z ; re-probe Z0 to account for any thermal expansion in the bed\nG1 X-17.5 Y80 F3000 ; move to wiper pad\nG1 Z10 F5000 ; move to wiper pad\nM117 Heating...\nM109 R{material_print_temperature_layer_0} ; wait for extruder to reach initial printing temp\nM117 AXI Wiping Nozzle...\nG1 E0 ; prime material in nozzle\nG1 Z-3 ; final ooze wipe\nG1 Y60 F2000 ; final ooze wipe\nG1 Y20 F2000 ; final ooze wipe\nM117 AXI Starting Print\nG1 Z2 ; move nozzle back up to not run into things on print start\nM400 ; wait for moves to finish\nM117 AXI Printing" - }, - "machine_end_gcode": { - "default_value": "M400 ; wait for moves to finish\nM140 S50 ; start bed cooling\nM104 S0 ; disable hotend\nM107 ; disable fans\nM117 Cooling please wait\nG91 ; relative positioning\nG1 Z5 F3000 ; move Z up 5mm so it wont drag on the print\nG90 ; absolute positioning\nG1 X5 Y5 F3000 ; move to cooling position\nM190 R50 ; wait for bed to cool down to removal temp\nG1 X145 Y260 F1000 ; present finished print\nM140 S0 ; cool down bed\nM77 ; End LCD Print Timer\nM18 X Y E ; turn off x y and e axis\nM117 Print Complete." - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 285 }, + "machine_name": { "default_value": "AXI" }, + "machine_shape": { "default_value": "rectangular" }, + "machine_start_gcode": { "default_value": ";This G-Code has been generated specifically for Syndaver AXI with Hemera toolhead\nM73 P0 ; clear LCD progress bar\nM75 ; Start LCD Print Timer\nM107 ; disable fans\nM420 S0 ; disable leveling matrix\nM82 ; set extruder to absolute mode\nG92 E0 ; set extruder position to 0\nM140 S{material_bed_temperature_layer_0} ; start bed heating up\nM104 S170 ; start nozzle heating up\nG28 ; home all axes\nM117 AXI Heating Up...\nG1 X-17.5 Y100 F3000 ; move to wiper pad\nG1 Z10 F5000 ; move to wiper pad\nG29 L1 ; load leveling matrix slot 1\nG29 A ; ensure mesh is enabled\nM109 R170 ; wait for nozzle to reach wiping temp\nG1 E-3 ; retract material before wipe\nM117 AXI Wiping Nozzle...\nG1 Z-3 ; lower nozzle\nG1 Y90 F1000 ; slow wipe\nG1 Y65 F1000 ; slow wipe\nG1 Y80 F1000 ; slow wipe\nG1 Y65 F1000 ; slow wipe\nG1 Y55 F1000 ; slow wipe\nG1 Y30 F3000 ; fast wipe\nG1 Y55 F3000 ; fast wipe\nG1 Y30 F3000 ; fast wipe\nG1 Y55 F3000 ; fast wipe\nG1 Z10 ; raise nozzle\nM117 Heating...\nM190 R{material_bed_temperature_layer_0} ; wait for bed to reach printing temp\nM104 S{material_print_temperature_layer_0} ; set extruder to reach initial printing temp, held back for ooze reasons\nM117 Probe Z at Temp\nG28 Z ; re-probe Z0 to account for any thermal expansion in the bed\nG1 X-17.5 Y80 F3000 ; move to wiper pad\nG1 Z10 F5000 ; move to wiper pad\nM117 Heating...\nM109 R{material_print_temperature_layer_0} ; wait for extruder to reach initial printing temp\nM117 AXI Wiping Nozzle...\nG1 E0 ; prime material in nozzle\nG1 Z-3 ; final ooze wipe\nG1 Y60 F2000 ; final ooze wipe\nG1 Y20 F2000 ; final ooze wipe\nM117 AXI Starting Print\nG1 Z2 ; move nozzle back up to not run into things on print start\nM400 ; wait for moves to finish\nM117 AXI Printing" }, + "machine_width": { "default_value": 280 } } } \ No newline at end of file diff --git a/resources/definitions/syndaveraxi2.def.json b/resources/definitions/syndaveraxi2.def.json index 8ab0003e09..bad1d82dfd 100644 --- a/resources/definitions/syndaveraxi2.def.json +++ b/resources/definitions/syndaveraxi2.def.json @@ -1,46 +1,39 @@ { - "version": 2, + "version": 2, "name": "SyndaverAxi2", "inherits": "fdmprinter", - "metadata": -{ - "type": "machine", + "metadata": + { "visible": true, "author": "Syndaver3D", "manufacturer": "Syndaver3D", "file_formats": "text/x-gcode", - "supports_usb_connection": true, + "machine_extruder_trains": { "0": "syndaveraxi2_extruder_0" }, "preferred_quality_type": "draft", - "machine_extruder_trains": - { - "0": "syndaveraxi2_extruder_0" - } + "supports_usb_connection": true, + "type": "machine" }, - - "overrides": { - "machine_name": { "default_value": "AXI2" }, - "machine_shape": { "default_value": "rectangular"}, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 280 }, - "machine_depth": { "default_value": 280 }, - "machine_height": { "default_value": 280 }, + "overrides": + { + "gantry_height": { "value": "60" }, "machine_center_is_zero": { "default_value": false }, - "machine_head_with_fans_polygon": { + "machine_depth": { "default_value": 280 }, + "machine_end_gcode": { "default_value": "M400 ; wait for moves to finish\nM140 S50 ; start bed cooling\nM104 S0 ; disable hotend\nM107 ; disable fans\nM117 Cooling please wait\nG91 ; relative positioning\nG1 Z5 F3000 ; move Z up 5mm so it wont drag on the print\nG90 ; absolute positioning\nG1 X5 Y5 F3000 ; move to cooling position\nM190 R50 ; wait for bed to cool down to removal temp\nG1 X145 Y260 F1000 ; present finished print\nM140 S0 ; cool down bed\nM77 ; End LCD Print Timer\nM18 X Y E ; turn off x y and e axis\nM117 Print Complete." }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { "default_value": [ - [ 0, 0 ], - [ 0, 0 ], - [ 0, 0 ], - [ 0, 0 ] + [0, 0], + [0, 0], + [0, 0], + [0, 0] ] }, - "gantry_height": { "value": "60" }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - - "machine_start_gcode": { - "default_value": ";This G-Code has been generated specifically for Syndaver AXI 2 with Hemera toolhead\nM73 P0 ; clear LCD progress bar\nM75 ; Start LCD Print Timer\nM107 ; disable fans\nM420 S0 ; disable leveling matrix\nM82 ; set extruder to absolute mode\nG92 E0 ; set extruder position to 0\nM140 S{material_bed_temperature_layer_0} ; start bed heating up\nM104 S170 ; start nozzle heating up\nG28 ; home all axes\nM117 AXI Heating Up...\nG1 X-17.5 Y100 F3000 ; move to wiper pad\nG1 Z10 F5000 ; move to wiper pad\nG29 L1 ; load leveling matrix slot 1\nG29 A ; ensure mesh is enabled\nM109 R170 ; wait for nozzle to reach wiping temp\nG1 E-3 ; retract material before wipe\nM117 AXI Wiping Nozzle...\nG1 Z-3 ; lower nozzle\nG1 Y90 F1000 ; slow wipe\nG1 Y65 F1000 ; slow wipe\nG1 Y80 F1000 ; slow wipe\nG1 Y65 F1000 ; slow wipe\nG1 Y55 F1000 ; slow wipe\nG1 Y30 F3000 ; fast wipe\nG1 Y55 F3000 ; fast wipe\nG1 Y30 F3000 ; fast wipe\nG1 Y55 F3000 ; fast wipe\nG1 Z10 ; raise nozzle\nM117 Heating...\nM190 R{material_bed_temperature_layer_0} ; wait for bed to reach printing temp\nM104 S{material_print_temperature_layer_0} ; set extruder to reach initial printing temp, held back for ooze reasons\nM117 Probe Z at Temp\nG28 Z ; re-probe Z0 to account for any thermal expansion in the bed\nG1 X-17.5 Y80 F3000 ; move to wiper pad\nG1 Z10 F5000 ; move to wiper pad\nM117 Heating...\nM109 R{material_print_temperature_layer_0} ; wait for extruder to reach initial printing temp\nM117 AXI Wiping Nozzle...\nG1 E0 ; prime material in nozzle\nG1 Z-3 ; final ooze wipe\nG1 Y60 F2000 ; final ooze wipe\nG1 Y20 F2000 ; final ooze wipe\nM117 AXI Starting Print\nG1 Z2 ; move nozzle back up to not run into things on print start\nM400 ; wait for moves to finish\nM117 AXI Printing" - }, - "machine_end_gcode": { - "default_value": "M400 ; wait for moves to finish\nM140 S50 ; start bed cooling\nM104 S0 ; disable hotend\nM107 ; disable fans\nM117 Cooling please wait\nG91 ; relative positioning\nG1 Z5 F3000 ; move Z up 5mm so it wont drag on the print\nG90 ; absolute positioning\nG1 X5 Y5 F3000 ; move to cooling position\nM190 R50 ; wait for bed to cool down to removal temp\nG1 X145 Y260 F1000 ; present finished print\nM140 S0 ; cool down bed\nM77 ; End LCD Print Timer\nM18 X Y E ; turn off x y and e axis\nM117 Print Complete." - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 280 }, + "machine_name": { "default_value": "AXI2" }, + "machine_shape": { "default_value": "rectangular" }, + "machine_start_gcode": { "default_value": ";This G-Code has been generated specifically for Syndaver AXI 2 with Hemera toolhead\nM73 P0 ; clear LCD progress bar\nM75 ; Start LCD Print Timer\nM107 ; disable fans\nM420 S0 ; disable leveling matrix\nM82 ; set extruder to absolute mode\nG92 E0 ; set extruder position to 0\nM140 S{material_bed_temperature_layer_0} ; start bed heating up\nM104 S170 ; start nozzle heating up\nG28 ; home all axes\nM117 AXI Heating Up...\nG1 X-17.5 Y100 F3000 ; move to wiper pad\nG1 Z10 F5000 ; move to wiper pad\nG29 L1 ; load leveling matrix slot 1\nG29 A ; ensure mesh is enabled\nM109 R170 ; wait for nozzle to reach wiping temp\nG1 E-3 ; retract material before wipe\nM117 AXI Wiping Nozzle...\nG1 Z-3 ; lower nozzle\nG1 Y90 F1000 ; slow wipe\nG1 Y65 F1000 ; slow wipe\nG1 Y80 F1000 ; slow wipe\nG1 Y65 F1000 ; slow wipe\nG1 Y55 F1000 ; slow wipe\nG1 Y30 F3000 ; fast wipe\nG1 Y55 F3000 ; fast wipe\nG1 Y30 F3000 ; fast wipe\nG1 Y55 F3000 ; fast wipe\nG1 Z10 ; raise nozzle\nM117 Heating...\nM190 R{material_bed_temperature_layer_0} ; wait for bed to reach printing temp\nM104 S{material_print_temperature_layer_0} ; set extruder to reach initial printing temp, held back for ooze reasons\nM117 Probe Z at Temp\nG28 Z ; re-probe Z0 to account for any thermal expansion in the bed\nG1 X-17.5 Y80 F3000 ; move to wiper pad\nG1 Z10 F5000 ; move to wiper pad\nM117 Heating...\nM109 R{material_print_temperature_layer_0} ; wait for extruder to reach initial printing temp\nM117 AXI Wiping Nozzle...\nG1 E0 ; prime material in nozzle\nG1 Z-3 ; final ooze wipe\nG1 Y60 F2000 ; final ooze wipe\nG1 Y20 F2000 ; final ooze wipe\nM117 AXI Starting Print\nG1 Z2 ; move nozzle back up to not run into things on print start\nM400 ; wait for moves to finish\nM117 AXI Printing" }, + "machine_width": { "default_value": 280 } } } \ No newline at end of file diff --git a/resources/definitions/tam.def.json b/resources/definitions/tam.def.json index 080a3125db..84bbc9c8fb 100644 --- a/resources/definitions/tam.def.json +++ b/resources/definitions/tam.def.json @@ -2,62 +2,58 @@ "version": 2, "name": "Series 1 2014", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "TypeAMachines", "manufacturer": "TypeAMachines", "file_formats": "text/x-gcode", "platform": "tam_series1.3mf", - "platform_offset": [-580.0, -6.23, 253.5], "has_materials": false, - "machine_extruder_trains": - { - "0": "tam_extruder_0" - } + "machine_extruder_trains": { "0": "tam_extruder_0" }, + "platform_offset": [ + -580.0, + -6.23, + 253.5 + ] }, - "overrides": { - "machine_name": { "default_value": "TypeAMachines" }, - + "overrides": + { + "gantry_height": { "value": "35" }, + "infill_pattern": { "value": "'tetrahedral'" }, + "infill_sparse_density": { "default_value": 5 }, "layer_height": { "default_value": 0.2 }, "layer_height_0": { "default_value": 0.3 }, - "infill_sparse_density": { "default_value": 5 }, - "wall_thickness": { "value": "1" }, - "top_bottom_thickness": { "default_value": 1 }, - - "infill_pattern": { "value": "'tetrahedral'" }, - - "machine_width": { "default_value": 305 }, - "machine_depth": { "default_value": 305 }, - "machine_height": { "default_value": 305 }, - - "machine_heated_bed": { "default_value": true }, - "machine_head_with_fans_polygon": { "default_value": [ [ -35, 65 ], [ -35, -55 ], [ 55, 65 ], [ 55, -55 ] ] }, - "gantry_height": { "value": "35" }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_center_is_zero": { "default_value": false }, - - "speed_print": { "default_value": 60 }, - - "retraction_amount": { "default_value": 0.4 }, - "retraction_speed": { "default_value": 35}, - - "xy_offset": { "default_value": -0.01 }, - - "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, - - "machine_nozzle_tip_outer_diameter": { "default_value": 1 }, - "machine_nozzle_head_distance": { "default_value": 3 }, - + "machine_depth": { "default_value": 305 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\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_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-35, 65], + [-35, -55], + [55, 65], + [55, -55] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 305 }, + "machine_max_acceleration_e": { "default_value": 175 }, "machine_max_acceleration_x": { "default_value": 6000 }, "machine_max_acceleration_y": { "default_value": 6000 }, "machine_max_acceleration_z": { "default_value": 12000 }, - "machine_max_acceleration_e": { "default_value": 175 }, - - "machine_start_gcode": { - "default_value": ";-- START GCODE --\n;Sliced for Type A Machines Series 1\n;Sliced at: {day} {date} {time}\n;Basic settings:\n;Layer height: {layer_height}\n;Walls: {wall_thickness}\n;Fill: {fill_distance}\n;Print Speed: {print_speed}\n;Support: {support}\n;Retraction Speed: {retraction_speed}\n;Retraction Distance: {retraction_amount}\n;Print time: {print_time}\n;Filament used: {filament_amount}m {filament_weight}g\n;Settings based on: {material_profile}\nG21 ;metric values\nG90 ;absolute positioning\nG28 ;move to endstops\nG29 ;allows for auto-levelling\nG1 Z15.0 F12000 ;move the platform down 15mm\nG1 X150 Y5 F9000 ;center\nM140 S{material_bed_temperature} ;Prep Heat Bed\nM109 S{default_material_print_temperature} ;Heat To temp\nM190 S{material_bed_temperature} ;Heat Bed to temp\nG1 X150 Y5 Z0.3 ;move the platform to purge extrusion\nG92 E0 ;zero the extruded length\nG1 F200 X250 E30 ;extrude 30mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 X150 Y150 Z25 F12000 ;recenter and begin\nG1 F9000" - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\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_name": { "default_value": "TypeAMachines" }, + "machine_nozzle_head_distance": { "default_value": 3 }, + "machine_nozzle_tip_outer_diameter": { "default_value": 1 }, + "machine_start_gcode": { "default_value": ";-- START GCODE --\n;Sliced for Type A Machines Series 1\n;Sliced at: {day} {date} {time}\n;Basic settings:\n;Layer height: {layer_height}\n;Walls: {wall_thickness}\n;Fill: {fill_distance}\n;Print Speed: {print_speed}\n;Support: {support}\n;Retraction Speed: {retraction_speed}\n;Retraction Distance: {retraction_amount}\n;Print time: {print_time}\n;Filament used: {filament_amount}m {filament_weight}g\n;Settings based on: {material_profile}\nG21 ;metric values\nG90 ;absolute positioning\nG28 ;move to endstops\nG29 ;allows for auto-levelling\nG1 Z15.0 F12000 ;move the platform down 15mm\nG1 X150 Y5 F9000 ;center\nM140 S{material_bed_temperature} ;Prep Heat Bed\nM109 S{default_material_print_temperature} ;Heat To temp\nM190 S{material_bed_temperature} ;Heat Bed to temp\nG1 X150 Y5 Z0.3 ;move the platform to purge extrusion\nG92 E0 ;zero the extruded length\nG1 F200 X250 E30 ;extrude 30mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 X150 Y150 Z25 F12000 ;recenter and begin\nG1 F9000" }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, + "machine_width": { "default_value": 305 }, + "retraction_amount": { "default_value": 0.4 }, + "retraction_speed": { "default_value": 35 }, + "speed_print": { "default_value": 60 }, + "top_bottom_thickness": { "default_value": 1 }, + "wall_thickness": { "value": "1" }, + "xy_offset": { "default_value": -0.01 } } -} +} \ No newline at end of file diff --git a/resources/definitions/tank_m3.def.json b/resources/definitions/tank_m3.def.json index 9a65397a64..a9d9e3f1d0 100644 --- a/resources/definitions/tank_m3.def.json +++ b/resources/definitions/tank_m3.def.json @@ -1,25 +1,27 @@ -{ - "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 - } -} +{ + "version": 2, + "name": "Tank M3", + "inherits": "tank_m_base", + "metadata": + { + "visible": true, + "quality_definition": "tank_m_base" + }, + "overrides": + { + "gantry_height": { "value": 0 }, + "machine_depth": { "default_value": 235 }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-26, 34], + [-26, -32], + [32, -32], + [32, 34] + ] + }, + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "Tank M3" }, + "machine_width": { "default_value": 235 } + } +} \ No newline at end of file diff --git a/resources/definitions/tank_m3_max.def.json b/resources/definitions/tank_m3_max.def.json index ef271dc2f5..6b8b02f4e8 100644 --- a/resources/definitions/tank_m3_max.def.json +++ b/resources/definitions/tank_m3_max.def.json @@ -1,24 +1,27 @@ -{ - "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 - } -} +{ + "version": 2, + "name": "Tank M3 Max", + "inherits": "tank_m_base", + "metadata": + { + "visible": true, + "quality_definition": "tank_m_base" + }, + "overrides": + { + "gantry_height": { "value": 0 }, + "machine_depth": { "default_value": 310 }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-26, 34], + [-26, -32], + [32, -32], + [32, 34] + ] + }, + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "Tank M3 Max" }, + "machine_width": { "default_value": 310 } + } +} \ No newline at end of file diff --git a/resources/definitions/tank_m_base.def.json b/resources/definitions/tank_m_base.def.json index b3e0bcfb86..487ced6c65 100644 --- a/resources/definitions/tank_m_base.def.json +++ b/resources/definitions/tank_m_base.def.json @@ -1,112 +1,84 @@ -{ - "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 } - - - } -} +{ + "version": 2, + "name": "tank_m Base Printer", + "inherits": "fdmprinter", + "metadata": + { + "visible": false, + "author": "tank_m", + "manufacturer": "tank_m", + "file_formats": "text/x-gcode", + "platform": "tank_m.obj", + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, + "has_materials": true, + "machine_extruder_trains": { "0": "tank_m_base_extruder_0" }, + "platform_texture": "tank_m.png", + "preferred_material": "generic_pla", + "preferred_quality_type": "standard" + }, + "overrides": + { + "acceleration_print": { "value": 2500 }, + "acceleration_travel": { "value": 2500 }, + "adhesion_type": { "value": "'skirt'" }, + "brim_replaces_support": { "value": false }, + "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, + "cool_min_layer_time": { "value": 10 }, + "fill_outline_gaps": { "value": false }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, + "infill_sparse_density": { "value": "15" }, + "machine_acceleration": { "value": 2500 }, + "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_heated_bed": { "default_value": true }, + "machine_max_acceleration_e": { "value": 2000 }, + "machine_max_acceleration_x": { "value": 2500 }, + "machine_max_acceleration_y": { "value": 2500 }, + "machine_max_acceleration_z": { "value": 100 }, + "machine_max_feedrate_e": { "value": 500 }, + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 50 }, + "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..." }, + "material_bed_temperature": { "value": "55" }, + "material_bed_temperature_layer_0": { "value": "material_bed_temperature" }, + "material_diameter": { "default_value": 1.75 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "material_print_temperature": { "value": "195" }, + "material_standby_temperature": { "value": "material_print_temperature" }, + "minimum_interface_area": { "value": 10 }, + "minimum_support_area": { "value": 2 }, + "retraction_amount": { "value": 1.0 }, + "retraction_speed": { "value": 40 }, + "skirt_gap": { "value": 6.0 }, + "skirt_line_count": { "value": 3 }, + "speed_layer_0": { "value": 25.0 }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_print": { "value": 50.0 }, + "speed_support": { "value": "speed_wall_0" }, + "speed_travel": { "value": "120.0 if speed_print < 60 else 300.0 if speed_print > 100 else speed_print * 2.2" }, + "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 25 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, + "speed_wall_x": { "value": "speed_wall" }, + "speed_z_hop": { "value": 5 }, + "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 4 }, + "support_enable": { "value": true }, + "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_enable": { "value": true }, + "support_interface_height": { "value": "layer_height * 4" }, + "support_interface_pattern": { "value": "'grid'" }, + "support_interface_skip_height": { "value": 0.2 }, + "support_pattern": { "value": "'zigzag'" }, + "support_use_towers": { "value": false }, + "support_wall_count": { "value": 1 }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, + "wall_thickness": { "value": "line_width * 2" } + } +} \ No newline at end of file diff --git a/resources/definitions/tevo_blackwidow.def.json b/resources/definitions/tevo_blackwidow.def.json index 3ed71d3036..5d6a1597ca 100644 --- a/resources/definitions/tevo_blackwidow.def.json +++ b/resources/definitions/tevo_blackwidow.def.json @@ -2,61 +2,29 @@ "version": 2, "name": "Tevo Black Widow", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "TheTobby", "manufacturer": "Tevo", "file_formats": "text/x-gcode", - "has_materials": false, - "has_machine_quality": true, "platform": "tevo_blackwidow.3mf", - "preferred_quality_type": "normal", - "machine_extruder_trains": - { - "0": "tevo_blackwidow_extruder_0" - } + "has_machine_quality": true, + "has_materials": false, + "machine_extruder_trains": { "0": "tevo_blackwidow_extruder_0" }, + "preferred_quality_type": "normal" }, "overrides": { - "machine_name": - { - "default_value": "Tevo Black Widow" - }, - "machine_heated_bed": - { - "default_value": true - }, - "machine_width": - { - "default_value": 350 - }, - "machine_height": - { - "default_value": 250 - }, - "machine_depth": - { - "default_value": 250 - }, - "machine_center_is_zero": - { - "default_value": false - }, - "gantry_height": - { - "value": "0" - }, - "machine_gcode_flavor": - { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": - { - "default_value": "M280 P0 S160 ; release BLTouch alarm (OK to send for Non BLTouch)\nM420 Z2 ; set fade leveling at 2mm for BLTouch (OK to send for Non BLTouch)\nG28 ; home all\nG29 ; probe bed\nG92 E0 ;zero the extruded length\nG1 X0.0 Y50.0 Z10.0 F3600\n; perform wipe and prime\nG1 Z0.0 F1000\nG1 Z0.2 Y70.0 E9.0 F1000.0 ; prime\nG1 Y100.0 E12.5 F1000.0 ; prime\nG92 E0 ; zero extruder again\nM117 Printing..." - }, - "machine_end_gcode": - { - "default_value": "G92 E0 ; zero the extruded length again\nG1 E-1.5 F500 ; retract the filament to release some of the pressure\nM104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nG28 X0 ; home X axis\nG1 Y245 ; move Y axis to end position\nM84 ; disable motors\nM107 ; turn off fan" - } + "gantry_height": { "value": "0" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 250 }, + "machine_end_gcode": { "default_value": "G92 E0 ; zero the extruded length again\nG1 E-1.5 F500 ; retract the filament to release some of the pressure\nM104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nG28 X0 ; home X axis\nG1 Y245 ; move Y axis to end position\nM84 ; disable motors\nM107 ; turn off fan" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "Tevo Black Widow" }, + "machine_start_gcode": { "default_value": "M280 P0 S160 ; release BLTouch alarm (OK to send for Non BLTouch)\nM420 Z2 ; set fade leveling at 2mm for BLTouch (OK to send for Non BLTouch)\nG28 ; home all\nG29 ; probe bed\nG92 E0 ;zero the extruded length\nG1 X0.0 Y50.0 Z10.0 F3600\n; perform wipe and prime\nG1 Z0.0 F1000\nG1 Z0.2 Y70.0 E9.0 F1000.0 ; prime\nG1 Y100.0 E12.5 F1000.0 ; prime\nG92 E0 ; zero extruder again\nM117 Printing..." }, + "machine_width": { "default_value": 350 } } -} +} \ No newline at end of file diff --git a/resources/definitions/tevo_tarantula.def.json b/resources/definitions/tevo_tarantula.def.json index 8811776a8f..2874291f73 100644 --- a/resources/definitions/tevo_tarantula.def.json +++ b/resources/definitions/tevo_tarantula.def.json @@ -15,39 +15,37 @@ "1": "tevo_tarantula_extruder_1" } }, - "overrides": { - "machine_name": { "default_value": "Tevo Tarantula" }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 200 }, - "machine_height": { "default_value": 200 }, - "machine_depth": { "default_value": 200 }, + "acceleration_print": { "default_value": 2650 }, + "gantry_height": { "value": "55" }, + "machine_acceleration": { "default_value": 2650 }, "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG90 ;absolute positioning\nG1 X0 Y200 F3600 ;move extruder out of the way by moving the baseplate to the front for easier access to printed object\nM84 ;steppers off" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_head_with_fans_polygon": { - "default_value": - [ + "default_value": [ [-75, -18], [-75, 35], [18, 35], [18, -18] ] }, - "gantry_height": { "value": "55" }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_acceleration": { "default_value": 2650 }, - "machine_max_jerk_xy": { "default_value": 15.0 }, - "machine_max_jerk_z": { "default_value": 0.4 }, - "machine_max_jerk_e": { "default_value": 5 }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 200 }, + "machine_max_acceleration_x": { "default_value": 2650 }, + "machine_max_acceleration_y": { "default_value": 2650 }, "machine_max_feedrate_x": { "default_value": 255 }, "machine_max_feedrate_y": { "default_value": 225 }, "machine_max_feedrate_z": { "default_value": 3 }, - "machine_max_acceleration_x": { "default_value": 2650 }, - "machine_max_acceleration_y": { "default_value": 2650 }, - "acceleration_print": { "default_value": 2650 }, + "machine_max_jerk_e": { "default_value": 5 }, + "machine_max_jerk_xy": { "default_value": 15.0 }, + "machine_max_jerk_z": { "default_value": 0.4 }, + "machine_name": { "default_value": "Tevo Tarantula" }, "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, - "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG90 ;absolute positioning\nG1 X0 Y200 F3600 ;move extruder out of the way by moving the baseplate to the front for easier access to printed object\nM84 ;steppers off" }, + "machine_width": { "default_value": 200 }, "speed_z_hop": { "default_value": 3 } } -} +} \ No newline at end of file diff --git a/resources/definitions/tevo_tarantula_pro.def.json b/resources/definitions/tevo_tarantula_pro.def.json index 486ea92528..c79840b5bc 100644 --- a/resources/definitions/tevo_tarantula_pro.def.json +++ b/resources/definitions/tevo_tarantula_pro.def.json @@ -2,7 +2,8 @@ "version": 2, "name": "Tevo Tarantula Pro", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "FN59", "manufacturer": "Tevo", @@ -15,33 +16,41 @@ "1": "tevo_tarantula_pro_extruder_1" } }, - - "overrides": { - "machine_name": { "default_value": "Tevo Tarantula Pro" }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 240 }, - "machine_height": { "default_value": 260 }, - "machine_depth": { "default_value": 240 }, - "machine_center_is_zero": { "default_value": false }, - "layer_height": { "default_value": 0.15 }, - "retraction_amount": { "default_value": 4.5 }, - "retraction_speed": { "default_value": 35 }, + "overrides": + { + "acceleration_print": { "default_value": 2000 }, "adhesion_type": { "default_value": "brim" }, - "machine_head_with_fans_polygon": { "default_value": [[-42,29],[42,29],[42,-55],[-42,-55]] }, "gantry_height": { "value": "32" }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "layer_height": { "default_value": 0.15 }, "machine_acceleration": { "default_value": 2000 }, - "machine_max_jerk_xy": { "default_value": 15.0 }, - "machine_max_jerk_z": { "default_value": 0.4 }, - "machine_max_jerk_e": { "default_value": 5 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 240 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off\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\nG90 ;absolute positioning\nG1 X0 Y220 F3600 ;move extruder out of the way by moving the baseplate to the front for easier access to printed object\nM84 ;steppers off" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-42, 29], + [42, 29], + [42, -55], + [-42, -55] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 260 }, + "machine_max_acceleration_x": { "default_value": 2000 }, + "machine_max_acceleration_y": { "default_value": 2000 }, "machine_max_feedrate_x": { "default_value": 200 }, "machine_max_feedrate_y": { "default_value": 200 }, "machine_max_feedrate_z": { "default_value": 9 }, - "machine_max_acceleration_x": { "default_value": 2000 }, - "machine_max_acceleration_y": { "default_value": 2000 }, - "acceleration_print": { "default_value": 2000 }, + "machine_max_jerk_e": { "default_value": 5 }, + "machine_max_jerk_xy": { "default_value": 15.0 }, + "machine_max_jerk_z": { "default_value": 0.4 }, + "machine_name": { "default_value": "Tevo Tarantula Pro" }, "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z30.0 F9000 ;move the gentry up 30mm\nG92 E0 ;zero the extruded length\nG1 F200 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, - "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off\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\nG90 ;absolute positioning\nG1 X0 Y220 F3600 ;move extruder out of the way by moving the baseplate to the front for easier access to printed object\nM84 ;steppers off" }, + "machine_width": { "default_value": 240 }, + "retraction_amount": { "default_value": 4.5 }, + "retraction_speed": { "default_value": 35 }, "speed_z_hop": { "default_value": 9 } } -} +} \ No newline at end of file diff --git a/resources/definitions/tevo_tornado.def.json b/resources/definitions/tevo_tornado.def.json index 3b6c431feb..6b6db55e6a 100644 --- a/resources/definitions/tevo_tornado.def.json +++ b/resources/definitions/tevo_tornado.def.json @@ -1,34 +1,37 @@ { - "name": "Tevo Tornado", "version": 2, + "name": "Tevo Tornado", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "nean", "manufacturer": "Tevo", "file_formats": "text/x-gcode", "has_materials": true, - "machine_extruder_trains": { - "0": "tevo_tornado_extruder_0" - } + "machine_extruder_trains": { "0": "tevo_tornado_extruder_0" } }, - "overrides": { - "machine_name": { - "default_value": "Tevo Tornado" - }, - "machine_width": { - "default_value": 300 - }, - "machine_height": { - "default_value": 400 - }, - "machine_depth": { - "default_value": 300 - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_head_with_fans_polygon": { + "overrides": + { + "acceleration_enabled": { "default_value": true }, + "acceleration_print": { "default_value": 500 }, + "acceleration_travel": { "value": 500 }, + "acceleration_travel_layer_0": { "value": 500 }, + "adhesion_type": { "default_value": "skirt" }, + "cool_min_layer_time": { "default_value": 10 }, + "gantry_height": { "value": "30" }, + "infill_pattern": { "value": "'triangles'" }, + "jerk_enabled": { "default_value": true }, + "jerk_print": { "default_value": 8 }, + "jerk_travel": { "value": 8 }, + "jerk_travel_layer_0": { "value": 8 }, + "machine_acceleration": { "default_value": 1500 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 300 }, + "machine_end_gcode": { "default_value": ";\n; end_gcode\nG92 E0 ; zero the extruded length\nG1 E-5 F9000 ; retract\nM104 S0 ; turn off temperature\nM140 S0 ; turn off bed\nG91 ; relative positioning\nG1 E-1 F300 ; retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+20 E-5 X-20 Y-20 F7200 ; move Z up a bit and retract filament even more\nG1 X320 Y150 F10000 ; move right mid\nM107 ; turn off layer fan\nM84 ; disable motors\nG90 ; absolute positioning\n;\n;EOF" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { "default_value": [ [-30, 34], [-30, -32], @@ -36,80 +39,18 @@ [30, 34] ] }, - "top_bottom_thickness": { - "default_value": 1.2 - }, - "top_bottom_pattern": { - "default_value": "lines" - }, - "infill_pattern": { - "value": "'triangles'" - }, - "retraction_enable": { - "default_value": true - }, - "retraction_amount": { - "default_value": 6.8 - }, - "retraction_speed": { - "default_value": 40 - }, - "cool_min_layer_time": { - "default_value": 10 - }, - "adhesion_type": { - "default_value": "skirt" - }, - "skirt_line_count": { - "default_value": 4 - }, - "skirt_gap": { - "default_value": 10 - }, - "machine_heated_bed": { - "default_value": true - }, - "gantry_height": { - "value": "30" - }, - "acceleration_enabled": { - "default_value": true - }, - "acceleration_print": { - "default_value": 500 - }, - "acceleration_travel": { - "value": 500 - }, - "acceleration_travel_layer_0": { - "value": 500 - }, - "machine_acceleration": { - "default_value": 1500 - }, - "jerk_enabled": { - "default_value": true - }, - "jerk_print": { - "default_value": 8 - }, - "jerk_travel": { - "value": 8 - }, - "jerk_travel_layer_0": { - "value": 8 - }, - "machine_max_jerk_xy": { - "default_value": 6 - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "; start_gcode\nM117 Start Clean ; Indicate nozzle clean in progress on LCD\n;\nM104 S{material_print_temperature_layer_0} \nM109 S{material_print_temperature_layer_0} \nM109 R{material_print_temperature_layer_0} \n;\nM107 ; Turn layer fan off\nG21 ; Set to metric [change to G20 if you want Imperial]\nG90 ; Force coordinates to be absolute relative to the origin\nG28 ; Home X/Y/Z axis\n;\nG1 X3 Y1 Z15 F9000 ; Move safe Z height to shear strings\nG0 X1 Y1 Z0.2 F9000 ; Move in 1mm from edge and up [z] 0.2mm\nG92 E0 ; Set extruder to [0] zero\nG1 X100 E12 F500 ; Extrude 30mm filiment along X axis 100mm long to prime and clean the nozzle\nG92 E0 ; Reset extruder to [0] zero end of cleaning run\nG1 E-1 F500 ; Retract filiment by 1 mm to reduce string effect\nG1 X180 F4000 ; quick wipe away from the filament line / purge\nM117 End Clean ; Indicate nozzle clean in progress on LCD\n;\nM117 Printing...\n; Begin printing with sliced GCode after here\n;" - }, - "machine_end_gcode": { - "default_value": ";\n; end_gcode\nG92 E0 ; zero the extruded length\nG1 E-5 F9000 ; retract\nM104 S0 ; turn off temperature\nM140 S0 ; turn off bed\nG91 ; relative positioning\nG1 E-1 F300 ; retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+20 E-5 X-20 Y-20 F7200 ; move Z up a bit and retract filament even more\nG1 X320 Y150 F10000 ; move right mid\nM107 ; turn off layer fan\nM84 ; disable motors\nG90 ; absolute positioning\n;\n;EOF" - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 400 }, + "machine_max_jerk_xy": { "default_value": 6 }, + "machine_name": { "default_value": "Tevo Tornado" }, + "machine_start_gcode": { "default_value": "; start_gcode\nM117 Start Clean ; Indicate nozzle clean in progress on LCD\n;\nM104 S{material_print_temperature_layer_0} \nM109 S{material_print_temperature_layer_0} \nM109 R{material_print_temperature_layer_0} \n;\nM107 ; Turn layer fan off\nG21 ; Set to metric [change to G20 if you want Imperial]\nG90 ; Force coordinates to be absolute relative to the origin\nG28 ; Home X/Y/Z axis\n;\nG1 X3 Y1 Z15 F9000 ; Move safe Z height to shear strings\nG0 X1 Y1 Z0.2 F9000 ; Move in 1mm from edge and up [z] 0.2mm\nG92 E0 ; Set extruder to [0] zero\nG1 X100 E12 F500 ; Extrude 30mm filiment along X axis 100mm long to prime and clean the nozzle\nG92 E0 ; Reset extruder to [0] zero end of cleaning run\nG1 E-1 F500 ; Retract filiment by 1 mm to reduce string effect\nG1 X180 F4000 ; quick wipe away from the filament line / purge\nM117 End Clean ; Indicate nozzle clean in progress on LCD\n;\nM117 Printing...\n; Begin printing with sliced GCode after here\n;" }, + "machine_width": { "default_value": 300 }, + "retraction_amount": { "default_value": 6.8 }, + "retraction_enable": { "default_value": true }, + "retraction_speed": { "default_value": 40 }, + "skirt_gap": { "default_value": 10 }, + "skirt_line_count": { "default_value": 4 }, + "top_bottom_pattern": { "default_value": "lines" }, + "top_bottom_thickness": { "default_value": 1.2 } } -} +} \ No newline at end of file diff --git a/resources/definitions/tinyboy_e10.def.json b/resources/definitions/tinyboy_e10.def.json index 26c306cf4e..999e176ead 100644 --- a/resources/definitions/tinyboy_e10.def.json +++ b/resources/definitions/tinyboy_e10.def.json @@ -2,30 +2,24 @@ "version": 2, "name": "TinyBoy E10/J10/L10/M10", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Fred Chan", "manufacturer": "TinyBoy", "file_formats": "text/x-gcode", - "has_materials": false, "has_machine_quality": true, - "preferred_quality_type": "normal", - "machine_extruder_trains": - { - "0": "tinyboy_extruder_0" - } + "has_materials": false, + "machine_extruder_trains": { "0": "tinyboy_extruder_0" }, + "preferred_quality_type": "normal" }, - - "overrides": { - "machine_name": { "default_value": "TinyBoy E10" }, - "machine_width": { "default_value": 100 }, + "overrides": + { "machine_depth": { "default_value": 100 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E80\nG1 E-80 F2000\nG28 X0 Y0\nM84" }, "machine_height": { "default_value": 105 }, - "machine_start_gcode": { - "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" - }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\nG92 E80\nG1 E-80 F2000\nG28 X0 Y0\nM84" - } + "machine_name": { "default_value": "TinyBoy E10" }, + "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" }, + "machine_width": { "default_value": 100 } } -} +} \ No newline at end of file diff --git a/resources/definitions/tinyboy_e16.def.json b/resources/definitions/tinyboy_e16.def.json index 7f63405c79..38a18cb377 100644 --- a/resources/definitions/tinyboy_e16.def.json +++ b/resources/definitions/tinyboy_e16.def.json @@ -2,30 +2,24 @@ "version": 2, "name": "TinyBoy E16/L16/M16", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Fred Chan", "manufacturer": "TinyBoy", "file_formats": "text/x-gcode", - "has_materials": false, "has_machine_quality": true, - "preferred_quality_type": "normal", - "machine_extruder_trains": - { - "0": "tinyboy_extruder_0" - } + "has_materials": false, + "machine_extruder_trains": { "0": "tinyboy_extruder_0" }, + "preferred_quality_type": "normal" }, - - "overrides": { - "machine_name": { "default_value": "TinyBoy E16" }, - "machine_width": { "default_value": 100 }, - "machine_depth": { "default_value": 100 }, + "overrides": + { + "machine_depth": { "default_value": 100 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E80\nG1 E-80 F2000\nG28 X0 Y0\nM84" }, "machine_height": { "default_value": 165 }, - "machine_start_gcode": { - "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" - }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\nG92 E80\nG1 E-80 F2000\nG28 X0 Y0\nM84" - } + "machine_name": { "default_value": "TinyBoy E16" }, + "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" }, + "machine_width": { "default_value": 100 } } -} +} \ No newline at end of file diff --git a/resources/definitions/tinyboy_fabrikator15.def.json b/resources/definitions/tinyboy_fabrikator15.def.json index 9f440a249f..96c8a46847 100644 --- a/resources/definitions/tinyboy_fabrikator15.def.json +++ b/resources/definitions/tinyboy_fabrikator15.def.json @@ -1,43 +1,43 @@ -{ - "version": 2, - "name": "TinyBoy Fabrikator Mini 1.5", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Reiner Buehl", - "manufacturer": "TinyBoy", - "file_formats": "text/x-gcode", - "platform": "tinyboy_fabrikator15.stl", - "platform_offset": [-95, -3, -46], - "has_materials": true, - "preferred_material": "generic_pla_175", - "has_machine_quality": true, - "preferred_quality_type": "normal", - "machine_extruder_trains": - { - "0": "tinyboy_fabrikator15_extruder_0" - } - }, - - "overrides": { - "machine_name": { "default_value": "Fabrikator Mini 1.5" }, - "machine_width": { "default_value": 80 }, - "machine_depth": { "default_value": 80 }, - "machine_height": { "default_value": 80 }, - "machine_head_with_fans_polygon": { "default_value": [ - [-10, 35], - [-10, -18], - [28, -18], - [28, 35] - ] - }, - "gantry_height": { "value": 45 }, - "machine_center_is_zero": { "default_value": false }, - "machine_start_gcode": { - "default_value": ";Sliced at: {day} {date} {time}\n;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {infill_sparse_density}\n;Print time: {print_time}\n;Filament used: {filament_amount}m {filament_weight}g\n;Filament cost: {filament_cost}\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 X0.0 Y0.0 Z15.0 F6000 ;move the printhead up 15mm\nG92 E0 ;zero the extruded length\nM104 S{material_print_temperature} ;set extruder temperature\nM105\nM109 S{material_print_temperature} ;wait for extruder temperature\nG1 F200 E30 ;extrude 30mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F6000\n;Put printing message on LCD screen\nM117 Printing..." - }, - "machine_end_gcode": { - "default_value": ";End GCode\nM104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F6000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\n;{jobname}" - } - } -} +{ + "version": 2, + "name": "TinyBoy Fabrikator Mini 1.5", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Reiner Buehl", + "manufacturer": "TinyBoy", + "file_formats": "text/x-gcode", + "platform": "tinyboy_fabrikator15.stl", + "has_machine_quality": true, + "has_materials": true, + "machine_extruder_trains": { "0": "tinyboy_fabrikator15_extruder_0" }, + "platform_offset": [ + -95, + -3, + -46 + ], + "preferred_material": "generic_pla_175", + "preferred_quality_type": "normal" + }, + "overrides": + { + "gantry_height": { "value": 45 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 80 }, + "machine_end_gcode": { "default_value": ";End GCode\nM104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F6000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\n;{jobname}" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-10, 35], + [-10, -18], + [28, -18], + [28, 35] + ] + }, + "machine_height": { "default_value": 80 }, + "machine_name": { "default_value": "Fabrikator Mini 1.5" }, + "machine_start_gcode": { "default_value": ";Sliced at: {day} {date} {time}\n;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {infill_sparse_density}\n;Print time: {print_time}\n;Filament used: {filament_amount}m {filament_weight}g\n;Filament cost: {filament_cost}\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 X0.0 Y0.0 Z15.0 F6000 ;move the printhead up 15mm\nG92 E0 ;zero the extruded length\nM104 S{material_print_temperature} ;set extruder temperature\nM105\nM109 S{material_print_temperature} ;wait for extruder temperature\nG1 F200 E30 ;extrude 30mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F6000\n;Put printing message on LCD screen\nM117 Printing..." }, + "machine_width": { "default_value": 80 } + } +} \ No newline at end of file diff --git a/resources/definitions/tinyboy_ra20.def.json b/resources/definitions/tinyboy_ra20.def.json index 9f1e4c9071..f0bdd09170 100644 --- a/resources/definitions/tinyboy_ra20.def.json +++ b/resources/definitions/tinyboy_ra20.def.json @@ -2,35 +2,31 @@ "version": 2, "name": "TinyBoy RA20", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Fred Chan", "manufacturer": "TinyBoy", "file_formats": "text/x-gcode", "platform": "tinyboy_ra20.obj", - "platform_offset": [ 8, -73.3, -8 ], - "has_materials": false, "has_machine_quality": true, - "preferred_quality_type": "normal", - "machine_extruder_trains": - { - "0": "tinyboy_extruder_0" - } + "has_materials": false, + "machine_extruder_trains": { "0": "tinyboy_extruder_0" }, + "platform_offset": [ + 8, + -73.3, + -8 + ], + "preferred_quality_type": "normal" }, - - "overrides": { - "machine_name": { "default_value": "TinyBoy RA20" }, - "machine_width": { "default_value": 120 }, - "machine_depth": { "default_value": 120 }, - "machine_height": { "default_value": 205 }, + "overrides": + { + "machine_depth": { "default_value": 120 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E80\nG1 E-80 F2000\nG28 X0 Y0\nM84" }, "machine_heated_bed": { "default_value": true }, - - "machine_start_gcode": { - "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" - }, - "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0\nG92 E80\nG1 E-80 F2000\nG28 X0 Y0\nM84" - } + "machine_height": { "default_value": 205 }, + "machine_name": { "default_value": "TinyBoy RA20" }, + "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform" }, + "machine_width": { "default_value": 120 } } -} - +} \ No newline at end of file diff --git a/resources/definitions/tizyx_evy.def.json b/resources/definitions/tizyx_evy.def.json index 5cbdba0de5..fc2eadc2fb 100644 --- a/resources/definitions/tizyx_evy.def.json +++ b/resources/definitions/tizyx_evy.def.json @@ -1,41 +1,91 @@ { - "name": "Tizyx Evy", "version": 2, + "name": "Tizyx Evy", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Tizyx", "manufacturer": "Tizyx", "file_formats": "text/x-gcode", - + "platform": "tizyx_k25_platform.3mf", + "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" + ], + "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, "has_materials": true, "has_variants": true, - - "preferred_variant_name": "0.4mm", + "machine_extruder_trains": { "0": "tizyx_evy_extruder_0" }, + "platform_offset": [ + 0, + -4, + 0 + ], "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", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA", "Vertex_Delta_TPU", "zyyx_pro_flex", "zyyx_pro_pla" ], - - "machine_extruder_trains": - { - "0": "tizyx_evy_extruder_0" - }, - "platform": "tizyx_k25_platform.3mf", - "platform_offset": [0, -4, 0], - "first_start_actions": ["MachineSettingsAction"], - "supported_actions": ["MachineSettingsAction"] + "preferred_variant_name": "0.4mm", + "supported_actions": [ "MachineSettingsAction" ] }, - - "overrides": { - "machine_extruder_count": { "default_value": 1 }, - "machine_heated_bed": { "default_value": true }, - "machine_center_is_zero": { "default_value": false }, + "overrides": + { + "acceleration_enabled": { "value": "False" }, + "acceleration_print": { "value": "1500" }, + "adhesion_type": { "default_value": "skirt" }, + "cool_min_layer_time": { "default_value": 11 }, + "fill_outline_gaps": { "default_value": true }, "gantry_height": { "value": "500" }, - "machine_height": { "default_value": 255 }, + "infill_sparse_density": { "default_value": 15 }, + "layer_height": { "maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" }, + "layer_height_0": { "maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" }, + "machine_center_is_zero": { "default_value": false }, "machine_depth": { "default_value": 255 }, - "machine_width": { "default_value": 255 }, - "machine_head_with_fans_polygon": { + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG91\nG1 E-5 F300\nG1 Z+3 F3000\nG1 Y245 F3000\nM84" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_head_with_fans_polygon": + { "default_value": [ [25, 49], [25, -49], @@ -43,33 +93,18 @@ [25, 49] ] }, - - "adhesion_type": { "default_value": "skirt" }, - "skirt_line_count": {"default_value": 2}, - "skirt_gap": { "default_value": 2}, - "fill_outline_gaps": { "default_value": true}, - "infill_sparse_density": { "default_value": 15}, - "retraction_amount": { "default_value": 2.5}, - "retraction_speed": { "default_value": 30}, - "speed_print": { "default_value": 60}, - "cool_min_layer_time": { "default_value": 11}, - "layer_height": { "maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" }, - "layer_height_0": { "maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" }, - - "machine_start_gcode": - { - "default_value": "M82\nG90\nG28 X\nG28 Y\nG28 Z\nG29\nG91\nG1 Z0\nG90\nM82\nG92 E0\nG1 X125 Y245 F3000\nG1 Z0" - }, - "machine_end_gcode": - { - "default_value": "M104 S0\nM140 S0\nG91\nG1 E-5 F300\nG1 Z+3 F3000\nG1 Y245 F3000\nM84" - }, - - "acceleration_enabled": {"value": "False"}, - "acceleration_print": {"value": "1500"}, - "z_seam_type": {"default_value": "back"}, - "z_seam_x": {"value": "127.5"}, - "z_seam_y": {"value": "250"}, - "retraction_combing": {"value": "'off'"} + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 255 }, + "machine_start_gcode": { "default_value": "M82\nG90\nG28 X\nG28 Y\nG28 Z\nG29\nG91\nG1 Z0\nG90\nM82\nG92 E0\nG1 X125 Y245 F3000\nG1 Z0" }, + "machine_width": { "default_value": 255 }, + "retraction_amount": { "default_value": 2.5 }, + "retraction_combing": { "value": "'off'" }, + "retraction_speed": { "default_value": 30 }, + "skirt_gap": { "default_value": 2 }, + "skirt_line_count": { "default_value": 2 }, + "speed_print": { "default_value": 60 }, + "z_seam_type": { "default_value": "back" }, + "z_seam_x": { "value": "127.5" }, + "z_seam_y": { "value": "250" } } -} +} \ No newline at end of file diff --git a/resources/definitions/tizyx_evy_dual.def.json b/resources/definitions/tizyx_evy_dual.def.json index 2aafa5cecc..1ea1095af5 100644 --- a/resources/definitions/tizyx_evy_dual.def.json +++ b/resources/definitions/tizyx_evy_dual.def.json @@ -1,42 +1,80 @@ { - "name": "Tizyx Evy Dual", "version": 2, + "name": "Tizyx Evy Dual", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Tizyx", "manufacturer": "Tizyx", "file_formats": "text/x-gcode", - + "platform": "tizyx_k25_platform.3mf", + "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_cpe_175", + "generic_cpe_plus", + "generic_hips_175", + "generic_nylon_175", + "generic_pc_175", + "generic_pva_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" + ], + "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, "has_materials": true, "has_variants": true, - "preferred_variant_name": "Classic Extruder", - - "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_cpe_175", "generic_cpe_plus","generic_hips_175","generic_nylon_175", "generic_pc_175", "generic_pva_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": { "0": "tizyx_evy_dual_extruder_0", "1": "tizyx_evy_dual_extruder_1" }, - "platform": "tizyx_k25_platform.3mf", - "platform_offset": [0, -4, 0], - "first_start_actions": ["MachineSettingsAction"], - "supported_actions": ["MachineSettingsAction"] + "platform_offset": [ + 0, + -4, + 0 + ], + "preferred_material": "tizyx_pla", + "preferred_quality_type": "normal", + "preferred_variant_name": "Classic Extruder", + "supported_actions": [ "MachineSettingsAction" ] }, - - "overrides": { - "machine_extruder_count": { "default_value": 2 }, - "machine_heated_bed": { "default_value": true }, - "machine_center_is_zero": { "default_value": false }, + "overrides": + { + "acceleration_enabled": { "value": "False" }, + "acceleration_print": { "value": "1500" }, "gantry_height": { "value": "500" }, - "machine_height": { "default_value": 255 }, + "machine_center_is_zero": { "default_value": false }, "machine_depth": { "default_value": 255 }, - "machine_width": { "default_value": 255 }, - "machine_head_with_fans_polygon": { + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG91\nG1 E-5 F300\nG1 Z+3 F3000\nG1 Y245 F3000\nM84" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_head_with_fans_polygon": + { "default_value": [ [25, 49], [25, -49], @@ -44,20 +82,13 @@ [25, 49] ] }, - "machine_start_gcode": - { - "default_value": "M82\nG90\nG28 X\nG28 Y\nG28 Z\nG29\nG91\nG1 Z0\nG90\nM82\nG92 E0\nG1 X125 Y245 F3000\nG1 Z0" - }, - "machine_end_gcode": - { - "default_value": "M104 S0\nM140 S0\nG91\nG1 E-5 F300\nG1 Z+3 F3000\nG1 Y245 F3000\nM84" - }, - - "acceleration_enabled": {"value": "False"}, - "acceleration_print": {"value": "1500"}, - "z_seam_type": {"default_value": "back"}, - "z_seam_x": {"value": "127.5"}, - "z_seam_y": {"value": "250"}, - "retraction_combing": {"value": "'off'"} + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 255 }, + "machine_start_gcode": { "default_value": "M82\nG90\nG28 X\nG28 Y\nG28 Z\nG29\nG91\nG1 Z0\nG90\nM82\nG92 E0\nG1 X125 Y245 F3000\nG1 Z0" }, + "machine_width": { "default_value": 255 }, + "retraction_combing": { "value": "'off'" }, + "z_seam_type": { "default_value": "back" }, + "z_seam_x": { "value": "127.5" }, + "z_seam_y": { "value": "250" } } -} +} \ No newline at end of file diff --git a/resources/definitions/tizyx_k25.def.json b/resources/definitions/tizyx_k25.def.json index 14a9d3e410..cc301ab54e 100644 --- a/resources/definitions/tizyx_k25.def.json +++ b/resources/definitions/tizyx_k25.def.json @@ -1,60 +1,104 @@ -{ - "version": 2, - "name": "Tizyx K25", - "inherits": "fdmprinter", - "metadata": - { - "visible": true, - "author": "Tizyx", - "manufacturer": "Tizyx", - "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", "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, - "has_variants": true, - "preferred_variant_name": "0.4 mm", - "machine_extruder_trains": - { - "0": "tizyx_k25_extruder_0" - } - }, - - "overrides": - { - "machine_name": { "default_value": "TiZYX K25" }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 255 }, - "machine_height": { "default_value": 255 }, - "machine_depth": { "default_value": 255 }, - "machine_center_is_zero": { "default_value": false }, - "gantry_height": { "value": "500" }, - "machine_head_with_fans_polygon": { - "default_value": [ - [25, 49], - [25, -49], - [-25, -49], - [25, 49] - ] - }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": - { - "default_value": "M82\nG90\nG28 X\nG28 Y\nG28 Z\nG29\nG91\nG1 Z0\nG90\nM82\nG92 E0\nG1 X125 Y245 F3000\nG1 Z0" - }, - "machine_end_gcode": - { - "default_value": "M104 S0\nM140 S0\nG91\nG1 E-5 F300\nG1 Z+3 F3000\nG1 Y245 F3000\nM84" - }, - - - "acceleration_enabled": {"value": "False"}, - "acceleration_print": {"value": "1500"}, - "z_seam_type": {"default_value": "back"}, - "z_seam_x": {"value": "127.5"}, - "z_seam_y": {"value": "250"}, - "retraction_combing": {"value": "'off'"} - } -} +{ + "version": 2, + "name": "Tizyx K25", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Tizyx", + "manufacturer": "Tizyx", + "file_formats": "text/x-gcode", + "platform": "tizyx_k25_platform.3mf", + "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" + ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { "0": "tizyx_k25_extruder_0" }, + "platform_offset": [ + 0, + -4, + 0 + ], + "preferred_material": "tizyx_pla", + "preferred_variant_name": "0.4 mm" + }, + "overrides": + { + "acceleration_enabled": { "value": "False" }, + "acceleration_print": { "value": "1500" }, + "gantry_height": { "value": "500" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 255 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG91\nG1 E-5 F300\nG1 Z+3 F3000\nG1 Y245 F3000\nM84" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [25, 49], + [25, -49], + [-25, -49], + [25, 49] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 255 }, + "machine_name": { "default_value": "TiZYX K25" }, + "machine_start_gcode": { "default_value": "M82\nG90\nG28 X\nG28 Y\nG28 Z\nG29\nG91\nG1 Z0\nG90\nM82\nG92 E0\nG1 X125 Y245 F3000\nG1 Z0" }, + "machine_width": { "default_value": 255 }, + "retraction_combing": { "value": "'off'" }, + "z_seam_type": { "default_value": "back" }, + "z_seam_x": { "value": "127.5" }, + "z_seam_y": { "value": "250" } + } +} \ No newline at end of file diff --git a/resources/definitions/trimaker_cosmosII.def.json b/resources/definitions/trimaker_cosmosII.def.json index 0866582f18..475eb4e371 100644 --- a/resources/definitions/trimaker_cosmosII.def.json +++ b/resources/definitions/trimaker_cosmosII.def.json @@ -2,20 +2,13 @@ "version": 2, "name": "Trimaker Cosmos II", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Trimaker", "manufacturer": "Trimaker", "file_formats": "text/x-gcode", "platform": "trimaker_cosmosII_platform.stl", - "platform_offset": [-110.5, -28.3, 134], - - "has_machine_quality": true, - "preferred_quality_type": "normal", - "preferred_material": "redd_pla", - - "has_materials": true, - "machine_extruder_trains": {"0": "trimaker_cosmosII_extruder"}, "exclude_materials": [ "chromatik_pla", "dsm_arnitel2045_175", @@ -100,50 +93,56 @@ "Vertex_Delta_TPU", "zyyx_pro_flex", "zyyx_pro_pla" - ] + ], + "has_machine_quality": true, + "has_materials": true, + "machine_extruder_trains": { "0": "trimaker_cosmosII_extruder" }, + "platform_offset": [ + -110.5, + -28.3, + 134 + ], + "preferred_material": "redd_pla", + "preferred_quality_type": "normal" }, - - "overrides": { - - "machine_name": {"default_value": "Trimaker Cosmos II"}, - "machine_width": {"default_value": 200}, - "machine_depth": {"default_value": 200}, - "machine_height": {"default_value": 200}, - - "layer_height": {"default_value": 0.2}, - "material_flow": {"value": 100}, - "xy_offset": {"default_value": 0}, - "xy_offset_layer_0": {"value": -0.1}, - "wall_thickness": {"value": "line_width * 3" }, - "top_bottom_thickness": {"value": "layer_height * 6"}, - "infill_sparse_density": {"default_value": 25}, - "infill_pattern": {"value": "'grid'"}, - "infill_sparse_thickness": {"value": "resolveOrValue('layer_height')"}, - "default_material_bed_temperature": {"default_value": 60}, - "default_material_print_temperature": {"default_value": 200}, - "speed_print": {"default_value": 45}, - "speed_travel": {"value": "speed_print if magic_spiralize else 100"}, - "speed_wall_0": {"value": 35}, - "speed_wall_x": {"value": 45}, - "retraction_enable": {"default_value": true}, - "retraction_amount": {"default_value": 1}, - "retraction_speed": {"default_value": 45}, - "cool_fan_enabled": {"default_value": true}, - "cool_fan_speed": {"value": "100.0 if cool_fan_enabled else 0.0"}, - "support_enable": {"default_value": true}, - "support_type": {"default_value": "everywhere"}, - "support_angle": {"default_value": 50}, - "support_pattern": {"default_value": "zigzag"}, - "support_z_distance": {"default_value": 0.17}, - "support_xy_distance": {"default_value": 0.7}, - "adhesion_type": {"default_value": "skirt"}, - - "gantry_height": {"value": 2}, - "machine_start_gcode": {"default_value": ";Start GCode - Cosmos II - 3.x.x_SEGcTK_1.1\n M104 S120; Comienzo a calentar extrusor\n G21; Unidades en mm\n G90; absolute positioning\n M82; set extruder to absolute mode\n M107; Apagar FAN\n G28; Home\n M190 S{material_bed_temperature_layer_0}\n G29; Senso la cama\n M500\n G1 F5000 X0.5 Y0.5\n M109 S{material_print_temperature}\n M900 K0.04\n G1 F200 Z10\n G92 E0; Defino cero en la posición del actual del extrusor\n G1 F200 X0.5 Y0.5 Z0.300; Posiciono antes de hacer una línea\n G1 F900 X0.5 Y51.5 E2.56436; Hago una línea\n "}, - "machine_end_gcode": {"default_value": ";CODIGO FINAL\n M107; Fan off\n G90; Set to absolute positioning\n G1 X0 Y0 Z201; Get extruder out of way\n G92 E0; Reset extruder position\n G1 E-1; Reduce filament pressure\n G92 E0; Reset extruder position again\n M140 S0; Disable heated bed\n M104 S0; Disable extruder\n M84; Turn steppers off"}, - "machine_heated_bed": {"default_value": true}, - "material_diameter": {"default_value": 1.75}, - "machine_center_is_zero": {"default_value": false} - + "overrides": + { + "adhesion_type": { "default_value": "skirt" }, + "cool_fan_enabled": { "default_value": true }, + "cool_fan_speed": { "value": "100.0 if cool_fan_enabled else 0.0" }, + "default_material_bed_temperature": { "default_value": 60 }, + "default_material_print_temperature": { "default_value": 200 }, + "gantry_height": { "value": 2 }, + "infill_pattern": { "value": "'grid'" }, + "infill_sparse_density": { "default_value": 25 }, + "infill_sparse_thickness": { "value": "resolveOrValue('layer_height')" }, + "layer_height": { "default_value": 0.2 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": ";CODIGO FINAL\n M107; Fan off\n G90; Set to absolute positioning\n G1 X0 Y0 Z201; Get extruder out of way\n G92 E0; Reset extruder position\n G1 E-1; Reduce filament pressure\n G92 E0; Reset extruder position again\n M140 S0; Disable heated bed\n M104 S0; Disable extruder\n M84; Turn steppers off" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 200 }, + "machine_name": { "default_value": "Trimaker Cosmos II" }, + "machine_start_gcode": { "default_value": ";Start GCode - Cosmos II - 3.x.x_SEGcTK_1.1\n M104 S120; Comienzo a calentar extrusor\n G21; Unidades en mm\n G90; absolute positioning\n M82; set extruder to absolute mode\n M107; Apagar FAN\n G28; Home\n M190 S{material_bed_temperature_layer_0}\n G29; Senso la cama\n M500\n G1 F5000 X0.5 Y0.5\n M109 S{material_print_temperature}\n M900 K0.04\n G1 F200 Z10\n G92 E0; Defino cero en la posici\u00f3n del actual del extrusor\n G1 F200 X0.5 Y0.5 Z0.300; Posiciono antes de hacer una l\u00ednea\n G1 F900 X0.5 Y51.5 E2.56436; Hago una l\u00ednea\n " }, + "machine_width": { "default_value": 200 }, + "material_diameter": { "default_value": 1.75 }, + "material_flow": { "value": 100 }, + "retraction_amount": { "default_value": 1 }, + "retraction_enable": { "default_value": true }, + "retraction_speed": { "default_value": 45 }, + "speed_print": { "default_value": 45 }, + "speed_travel": { "value": "speed_print if magic_spiralize else 100" }, + "speed_wall_0": { "value": 35 }, + "speed_wall_x": { "value": 45 }, + "support_angle": { "default_value": 50 }, + "support_enable": { "default_value": true }, + "support_pattern": { "default_value": "zigzag" }, + "support_type": { "default_value": "everywhere" }, + "support_xy_distance": { "default_value": 0.7 }, + "support_z_distance": { "default_value": 0.17 }, + "top_bottom_thickness": { "value": "layer_height * 6" }, + "wall_thickness": { "value": "line_width * 3" }, + "xy_offset": { "default_value": 0 }, + "xy_offset_layer_0": { "value": -0.1 } } -} +} \ No newline at end of file diff --git a/resources/definitions/trimaker_nebula.def.json b/resources/definitions/trimaker_nebula.def.json index 2e789b97dd..c380f34a9a 100644 --- a/resources/definitions/trimaker_nebula.def.json +++ b/resources/definitions/trimaker_nebula.def.json @@ -2,20 +2,13 @@ "version": 2, "name": "Trimaker Nebula", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Trimaker", "manufacturer": "Trimaker", "file_formats": "text/x-gcode", "platform": "trimaker_nebula_platform.stl", - - "has_machine_quality": true, - "preferred_quality_type": "normal", - "preferred_material": "redd_pla", - - "platform_offset": [-117.5, -40, 147.5], - "has_materials": true, - "machine_extruder_trains": {"0": "trimaker_nebula_extruder"}, "exclude_materials": [ "chromatik_pla", "dsm_arnitel2045_175", @@ -100,50 +93,57 @@ "Vertex_Delta_TPU", "zyyx_pro_flex", "zyyx_pro_pla" - ] + ], + "has_machine_quality": true, + "has_materials": true, + "machine_extruder_trains": { "0": "trimaker_nebula_extruder" }, + "platform_offset": [ + -117.5, + -40, + 147.5 + ], + "preferred_material": "redd_pla", + "preferred_quality_type": "normal" }, - - "overrides": { - - "machine_name": {"default_value": "Trimaker Nebula"}, - "machine_width": {"default_value": 230}, - "machine_depth": {"default_value": 230}, - "machine_height": {"default_value": 260}, + "overrides": + { "acceleration_enabled": { "value": true }, - "layer_height": {"default_value": 0.2}, - "material_flow": {"value": 100}, - "xy_offset": {"default_value": 0}, - "xy_offset_layer_0": {"value": -0.1}, - "wall_thickness": {"value": "line_width * 3" }, - "top_bottom_thickness": {"value": "layer_height * 6"}, - "infill_sparse_density": {"default_value": 25}, - "infill_pattern": {"value": "'grid'"}, - "infill_sparse_thickness": {"value": "resolveOrValue('layer_height')"}, - "default_material_bed_temperature": {"default_value": 60}, - "default_material_print_temperature": {"default_value": 200}, - "speed_print": {"default_value": 45}, - "speed_travel": {"value": "speed_print if magic_spiralize else 100"}, - "speed_wall_0": {"value": 35}, - "speed_wall_x": {"value": 45}, - "retraction_enable": {"default_value": true}, - "retraction_amount": {"default_value": 1}, - "retraction_speed": {"default_value": 45}, - "cool_fan_enabled": {"default_value": true}, - "cool_fan_speed": {"value": "100.0 if cool_fan_enabled else 0.0"}, - "support_enable": {"default_value": true}, - "support_type": {"default_value": "everywhere"}, - "support_angle": {"default_value": 50}, - "support_pattern": {"default_value": "zigzag"}, - "support_z_distance": {"default_value": 0.17}, - "support_xy_distance": {"default_value": 0.7}, - "adhesion_type": {"default_value": "skirt"}, - - "gantry_height": {"value": 2}, - "machine_start_gcode": {"default_value": ";Trimaker Nebula Start Code\n G21; Unidades en mm\n G90; Posicion absoluta\n M82; Extrusor en modo absoluto\n M107; Fan apagado\n G28 X Y Z; Enviamos a home a todos los ejes\n M900 K=0; Linear advance desactivado\n M104 S110; Precalentamos el extrusor hasta 110 grados\n M190 S{material_bed_temperature_layer_0}; Calentamos cama y esperamos\n G29; Senso la cama\n M500\n G1 F5000 X0.5 Y0.5\n M109 S{material_print_temperature}; Calentamos extrusor y esperamos\n G92 E0; E=0\n G1 F200 X0.5 Y0.5 Z0.300\n G1 F900 X0.5 Y51.5 E2.56436; Hacemos una linea para limpiar extrusor\n"}, - "machine_end_gcode": {"default_value": ";Trimaker Nebula End Code\n M107; Apagamos fan\n G90\n G92 E0\n G1 X0 Y200\n G91\n G1 Z5\n G92 E0\n M140 S0; Enfriamos\n M104 S0; Enfriamos\n M84\n G90\n M117 Impresion finalizada\n M300 S440 P700\n"}, - "machine_heated_bed": {"default_value": true}, - "material_diameter": {"default_value": 1.75}, - "machine_center_is_zero": {"default_value": false} - + "adhesion_type": { "default_value": "skirt" }, + "cool_fan_enabled": { "default_value": true }, + "cool_fan_speed": { "value": "100.0 if cool_fan_enabled else 0.0" }, + "default_material_bed_temperature": { "default_value": 60 }, + "default_material_print_temperature": { "default_value": 200 }, + "gantry_height": { "value": 2 }, + "infill_pattern": { "value": "'grid'" }, + "infill_sparse_density": { "default_value": 25 }, + "infill_sparse_thickness": { "value": "resolveOrValue('layer_height')" }, + "layer_height": { "default_value": 0.2 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 230 }, + "machine_end_gcode": { "default_value": ";Trimaker Nebula End Code\n M107; Apagamos fan\n G90\n G92 E0\n G1 X0 Y200\n G91\n G1 Z5\n G92 E0\n M140 S0; Enfriamos\n M104 S0; Enfriamos\n M84\n G90\n M117 Impresion finalizada\n M300 S440 P700\n" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 260 }, + "machine_name": { "default_value": "Trimaker Nebula" }, + "machine_start_gcode": { "default_value": ";Trimaker Nebula Start Code\n G21; Unidades en mm\n G90; Posicion absoluta\n M82; Extrusor en modo absoluto\n M107; Fan apagado\n G28 X Y Z; Enviamos a home a todos los ejes\n M900 K=0; Linear advance desactivado\n M104 S110; Precalentamos el extrusor hasta 110 grados\n M190 S{material_bed_temperature_layer_0}; Calentamos cama y esperamos\n G29; Senso la cama\n M500\n G1 F5000 X0.5 Y0.5\n M109 S{material_print_temperature}; Calentamos extrusor y esperamos\n G92 E0; E=0\n G1 F200 X0.5 Y0.5 Z0.300\n G1 F900 X0.5 Y51.5 E2.56436; Hacemos una linea para limpiar extrusor\n" }, + "machine_width": { "default_value": 230 }, + "material_diameter": { "default_value": 1.75 }, + "material_flow": { "value": 100 }, + "retraction_amount": { "default_value": 1 }, + "retraction_enable": { "default_value": true }, + "retraction_speed": { "default_value": 45 }, + "speed_print": { "default_value": 45 }, + "speed_travel": { "value": "speed_print if magic_spiralize else 100" }, + "speed_wall_0": { "value": 35 }, + "speed_wall_x": { "value": 45 }, + "support_angle": { "default_value": 50 }, + "support_enable": { "default_value": true }, + "support_pattern": { "default_value": "zigzag" }, + "support_type": { "default_value": "everywhere" }, + "support_xy_distance": { "default_value": 0.7 }, + "support_z_distance": { "default_value": 0.17 }, + "top_bottom_thickness": { "value": "layer_height * 6" }, + "wall_thickness": { "value": "line_width * 3" }, + "xy_offset": { "default_value": 0 }, + "xy_offset_layer_0": { "value": -0.1 } } -} +} \ No newline at end of file diff --git a/resources/definitions/trimaker_nebula_plus.def.json b/resources/definitions/trimaker_nebula_plus.def.json index 0a2983e67e..afddeff91d 100644 --- a/resources/definitions/trimaker_nebula_plus.def.json +++ b/resources/definitions/trimaker_nebula_plus.def.json @@ -1,113 +1,124 @@ -{ - "version": 2, - "name": "Trimaker Nebula Plus", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Trimaker", - "manufacturer": "Trimaker", - "file_formats": "text/x-gcode", - "platform": "trimaker_nebula_platform.stl", - - "has_machine_quality": true, - "preferred_quality_type": "normal", - "preferred_material": "redd_pla", - - "platform_offset": [-117.5, -40, 147.5], - "has_materials": true, - "machine_extruder_trains": {"0": "trimaker_nebula_extruder"} - }, - - "overrides": { - - "machine_name": {"default_value": "Trimaker Nebula"}, - "machine_width": {"default_value": 230}, - "machine_depth": {"default_value": 230}, - "machine_height": {"default_value": 260}, - "machine_heated_bed": {"default_value": true}, - "machine_gcode_flavor": { "default_value": "Marlin (Volumetric)" }, - "machine_max_feedrate_x": { "default_value": 300 }, - "machine_max_feedrate_y": { "default_value": 300 }, - "machine_max_feedrate_z": { "default_value": 40 }, - "machine_acceleration": { "default_value": 3000 }, - "machine_extruder_count": { "default_value": 1 }, - - "acceleration_layer_0": { "value": "acceleration_topbottom" }, - "acceleration_print": { "value": "4000" }, - "acceleration_support": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, - "acceleration_support_interface": { "value": "acceleration_topbottom" }, - "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 500 / 4000)" }, - "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 4000)" }, - "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 500 / 1000)" }, - - - "layer_height": {"default_value": 0.2}, - "material_flow": {"value": 100}, - "xy_offset": {"default_value": 0}, - "xy_offset_layer_0": {"value": -0.1}, - "wall_thickness": {"value": "line_width * 3" }, - "top_bottom_thickness": {"value": "layer_height * 6"}, - "infill_sparse_density": {"default_value": 25}, - "infill_sparse_thickness": {"value": "resolveOrValue('layer_height')"}, - "default_material_bed_temperature": {"default_value": 60}, - "default_material_print_temperature": {"default_value": 200}, - - "speed_print": {"default_value": 45}, - "speed_travel": {"value": "speed_print if magic_spiralize else 100"}, - "speed_wall_0": {"value": 35}, - "speed_wall_x": {"value": 45}, - "speed_layer_0": {"value": 20}, - - "infill_before_walls": { "value": false }, - "infill_line_width": { "value": "round(line_width * 0.5 / 0.35, 2)" }, - "infill_overlap": { "value": "0" }, - "infill_pattern": { "value": "'grid'" }, - "infill_wipe_dist": { "value": "0" }, - - "jerk_enabled": { "value": "True" }, - "jerk_print": { "value": "20", "minimum_value_warning": 20 }, - "jerk_infill": {"minimum_value_warning": 20 }, - "jerk_wall": { "value": "jerk_print", "minimum_value_warning": 20 }, - "jerk_wall_0": { "value": "jerk_wall", "minimum_value_warning": 20 }, - "jerk_roofing": {"minimum_value_warning": 20 }, - "jerk_topbottom": { "value": "jerk_print", "minimum_value_warning": 20 }, - "jerk_support": { "value": "jerk_print", "minimum_value_warning": 20 }, - "jerk_support_infill": {"minimum_value_warning": 20 }, - "jerk_support_interface": { "value": "math.ceil(jerk_print * 5 / 20)"}, - "jerk_travel": {"minimum_value_warning": 20 }, - "jerk_layer_0": { "value": "jerk_topbottom", "minimum_value_warning": 20}, - "jerk_print_layer_0": {"minimum_value_warning": 20 }, - "jerk_travel_layer_0": {"minimum_value_warning": 20 }, - "jerk_skirt_brim": {"minimum_value_warning": 20 }, - - "line_width": { "value": "machine_nozzle_size * 0.875" }, - - "retraction_enable": {"default_value": true}, - "retraction_amount": {"default_value": 1}, - "retraction_speed": {"default_value": 45}, - - "skin_monotonic" : { "value": true }, - "skin_overlap": { "value": "10" }, - - - "cool_fan_enabled": {"default_value": true}, - "cool_fan_speed": {"value": "100.0 if cool_fan_enabled else 0.0"}, - - "support_enable": {"default_value": true}, - "support_type": {"default_value": "everywhere"}, - "support_angle": {"default_value": 50}, - "support_pattern": {"default_value": "zigzag"}, - "support_z_distance": {"default_value": 0.17}, - "support_xy_distance": {"default_value": 0.7}, - - "adhesion_type": {"default_value": "skirt"}, - - "optimize_wall_printing_order": { "value": "True" }, - - "gantry_height": {"value": 2}, - "machine_start_gcode": {"default_value": ";Trimaker Nebula Start Code\n G21; Unidades en mm\n G90; Posicion absoluta\n M82; Extrusor en modo absoluto\n M107; Fan apagado\n G28 X Y Z; Enviamos a home a todos los ejes\n M900 K=0; Linear advance desactivado\n M104 S110; Precalentamos el extrusor hasta 110 grados\n M190 S{material_bed_temperature_layer_0};\n G29; Senso la cama\n M500\n G1 F5000 X0.5 Y0.5\n Calentamos cama y esperamos\n M109 S{material_print_temperature}; Calentamos extrusor y esperamos\n G92 E0; E=0\n G1 F200 X0.5 Y0.5 Z0.300\n G1 F900 X0.5 Y51.5 E2.56436; Hacemos una linea para limpiar extrusor\n"}, - "machine_end_gcode": {"default_value": ";Trimaker Nebula End Code\n M107; Apagamos fan\n G90\n G92 E0\n G1 X0 Y200\n G91\n G1 Z5\n G92 E0\n M140 S0; Enfriamos\n M104 S0; Enfriamos\n M84\n G90\n M117 Impresion finalizada\n M300 S440 P700\n"}, - "material_diameter": {"default_value": 1.75}, - "machine_center_is_zero": {"default_value": false} - } -} +{ + "version": 2, + "name": "Trimaker Nebula Plus", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Trimaker", + "manufacturer": "Trimaker", + "file_formats": "text/x-gcode", + "platform": "trimaker_nebula_platform.stl", + "has_machine_quality": true, + "has_materials": true, + "machine_extruder_trains": { "0": "trimaker_nebula_extruder" }, + "platform_offset": [ + -117.5, + -40, + 147.5 + ], + "preferred_material": "redd_pla", + "preferred_quality_type": "normal" + }, + "overrides": + { + "acceleration_layer_0": { "value": "acceleration_topbottom" }, + "acceleration_print": { "value": "4000" }, + "acceleration_support": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, + "acceleration_support_interface": { "value": "acceleration_topbottom" }, + "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 500 / 4000)" }, + "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 4000)" }, + "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 500 / 1000)" }, + "adhesion_type": { "default_value": "skirt" }, + "cool_fan_enabled": { "default_value": true }, + "cool_fan_speed": { "value": "100.0 if cool_fan_enabled else 0.0" }, + "default_material_bed_temperature": { "default_value": 60 }, + "default_material_print_temperature": { "default_value": 200 }, + "gantry_height": { "value": 2 }, + "infill_before_walls": { "value": false }, + "infill_line_width": { "value": "round(line_width * 0.5 / 0.35, 2)" }, + "infill_overlap": { "value": "0" }, + "infill_pattern": { "value": "'grid'" }, + "infill_sparse_density": { "default_value": 25 }, + "infill_sparse_thickness": { "value": "resolveOrValue('layer_height')" }, + "infill_wipe_dist": { "value": "0" }, + "jerk_enabled": { "value": "True" }, + "jerk_infill": { "minimum_value_warning": 20 }, + "jerk_layer_0": + { + "minimum_value_warning": 20, + "value": "jerk_topbottom" + }, + "jerk_print": + { + "minimum_value_warning": 20, + "value": "20" + }, + "jerk_print_layer_0": { "minimum_value_warning": 20 }, + "jerk_roofing": { "minimum_value_warning": 20 }, + "jerk_skirt_brim": { "minimum_value_warning": 20 }, + "jerk_support": + { + "minimum_value_warning": 20, + "value": "jerk_print" + }, + "jerk_support_infill": { "minimum_value_warning": 20 }, + "jerk_support_interface": { "value": "math.ceil(jerk_print * 5 / 20)" }, + "jerk_topbottom": + { + "minimum_value_warning": 20, + "value": "jerk_print" + }, + "jerk_travel": { "minimum_value_warning": 20 }, + "jerk_travel_layer_0": { "minimum_value_warning": 20 }, + "jerk_wall": + { + "minimum_value_warning": 20, + "value": "jerk_print" + }, + "jerk_wall_0": + { + "minimum_value_warning": 20, + "value": "jerk_wall" + }, + "layer_height": { "default_value": 0.2 }, + "line_width": { "value": "machine_nozzle_size * 0.875" }, + "machine_acceleration": { "default_value": 3000 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 230 }, + "machine_end_gcode": { "default_value": ";Trimaker Nebula End Code\n M107; Apagamos fan\n G90\n G92 E0\n G1 X0 Y200\n G91\n G1 Z5\n G92 E0\n M140 S0; Enfriamos\n M104 S0; Enfriamos\n M84\n G90\n M117 Impresion finalizada\n M300 S440 P700\n" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_gcode_flavor": { "default_value": "Marlin (Volumetric)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 260 }, + "machine_max_feedrate_x": { "default_value": 300 }, + "machine_max_feedrate_y": { "default_value": 300 }, + "machine_max_feedrate_z": { "default_value": 40 }, + "machine_name": { "default_value": "Trimaker Nebula" }, + "machine_start_gcode": { "default_value": ";Trimaker Nebula Start Code\n G21; Unidades en mm\n G90; Posicion absoluta\n M82; Extrusor en modo absoluto\n M107; Fan apagado\n G28 X Y Z; Enviamos a home a todos los ejes\n M900 K=0; Linear advance desactivado\n M104 S110; Precalentamos el extrusor hasta 110 grados\n M190 S{material_bed_temperature_layer_0};\n G29; Senso la cama\n M500\n G1 F5000 X0.5 Y0.5\n Calentamos cama y esperamos\n M109 S{material_print_temperature}; Calentamos extrusor y esperamos\n G92 E0; E=0\n G1 F200 X0.5 Y0.5 Z0.300\n G1 F900 X0.5 Y51.5 E2.56436; Hacemos una linea para limpiar extrusor\n" }, + "machine_width": { "default_value": 230 }, + "material_diameter": { "default_value": 1.75 }, + "material_flow": { "value": 100 }, + "optimize_wall_printing_order": { "value": "True" }, + "retraction_amount": { "default_value": 1 }, + "retraction_enable": { "default_value": true }, + "retraction_speed": { "default_value": 45 }, + "skin_monotonic": { "value": true }, + "skin_overlap": { "value": "10" }, + "speed_layer_0": { "value": 20 }, + "speed_print": { "default_value": 45 }, + "speed_travel": { "value": "speed_print if magic_spiralize else 100" }, + "speed_wall_0": { "value": 35 }, + "speed_wall_x": { "value": 45 }, + "support_angle": { "default_value": 50 }, + "support_enable": { "default_value": true }, + "support_pattern": { "default_value": "zigzag" }, + "support_type": { "default_value": "everywhere" }, + "support_xy_distance": { "default_value": 0.7 }, + "support_z_distance": { "default_value": 0.17 }, + "top_bottom_thickness": { "value": "layer_height * 6" }, + "wall_thickness": { "value": "line_width * 3" }, + "xy_offset": { "default_value": 0 }, + "xy_offset_layer_0": { "value": -0.1 } + } +} \ No newline at end of file diff --git a/resources/definitions/tronxy_d01.def.json b/resources/definitions/tronxy_d01.def.json index 6a752656f7..0827412e1e 100644 --- a/resources/definitions/tronxy_d01.def.json +++ b/resources/definitions/tronxy_d01.def.json @@ -1,29 +1,31 @@ { - "name": "Tronxy D01", "version": 2, + "name": "Tronxy D01", "inherits": "tronxy_x", - "metadata": { - "quality_definition": "tronxy_x", + "metadata": + { "visible": true, - "platform": "tronxy.stl" + "platform": "tronxy.stl", + "quality_definition": "tronxy_x" }, - "overrides": { - "machine_name": { "default_value": "Tronxy D01" }, - "machine_width": { "default_value": 220 }, + "overrides": + { + "gantry_height": { "value": 30 }, + "machine_acceleration": { "value": 120 }, "machine_depth": { "default_value": 220 }, - "machine_height": { "default_value": 220 }, - "machine_head_with_fans_polygon": { "default_value": [ + "machine_end_gcode": { "default_value": "M83 ; Set extrder to Relative\nG1 E-5 F3000 ; Retract 5mm of filament at 50mm/s\nG90 ; Set all axis to Absolute \nG1 X0 Y{machine_depth} ; Park print head\nG1 Z10 ; Move up 10mm\nM106 S0 ; Set fan speed to 0\nM104 S0 ; Set bed temp to 0\nM140 S0 ; Set Nozzle temp to 0\nM84 ; Disable all stepper motors\n" }, + "machine_head_with_fans_polygon": + { + "default_value": [ [-32, 45], [-32, -30], [32, -30], [32, 45] ] }, - "gantry_height": { "value": 30 }, - + "machine_height": { "default_value": 220 }, + "machine_name": { "default_value": "Tronxy D01" }, "machine_start_gcode": { "default_value": "; D01 Start Code\nG21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\nG1 Z2.0 F3000 ; Move Z Axis up little to preventscratching of Heat Bed\nG1 X1 Y20 Z0.3 F3600.0 ; Move to start position\nG1 X1 Y200.0 Z0.3 F1500.0 E25 ; Draw the first line\nG1 X1.6 Y200.0 Z0.3 F3600.0 ; Move to side a little\nG1 X1.6 Y20 Z0.3 F1500.0 E50 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F3600.0 ; Move over to prevent blob squish" }, - "machine_end_gcode": { "default_value": "M83 ; Set extrder to Relative\nG1 E-5 F3000 ; Retract 5mm of filament at 50mm/s\nG90 ; Set all axis to Absolute \nG1 X0 Y{machine_depth} ; Park print head\nG1 Z10 ; Move up 10mm\nM106 S0 ; Set fan speed to 0\nM104 S0 ; Set bed temp to 0\nM140 S0 ; Set Nozzle temp to 0\nM84 ; Disable all stepper motors\n" }, - - "machine_acceleration": { "value": 120 } + "machine_width": { "default_value": 220 } } -} +} \ No newline at end of file diff --git a/resources/definitions/tronxy_x.def.json b/resources/definitions/tronxy_x.def.json index da8f94fffe..d6388c845d 100644 --- a/resources/definitions/tronxy_x.def.json +++ b/resources/definitions/tronxy_x.def.json @@ -1,147 +1,133 @@ { - "name": "Tronxy Base Printer", "version": 2, + "name": "Tronxy Base Printer", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": false, "author": "KV/AdderMk2", "manufacturer": "Tronxy", "file_formats": "text/x-gcode", - "first_start_actions": ["MachineSettingsAction"], - - "machine_extruder_trains": { + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": + { "0": "tronxy_base_extruder_0", "1": "tronxy_base_extruder_1" }, - - "has_materials": true, - "has_variants": true, - "has_machine_quality": true, - "variants_name": "Nozzle Size", - - "preferred_variant_name": "0.4mm Nozzle", + "preferred_material": "generic_pla", "preferred_quality_type": "normal", - "preferred_material": "generic_pla" + "preferred_variant_name": "0.4mm Nozzle", + "variants_name": "Nozzle Size" }, - "overrides": { - "machine_name": { "default_value": "Tronxy Base Printer" }, - "machine_start_gcode": { "default_value": "G21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\nG1 Z15.0 F{speed_travel_layer_0}\nG0 E3 F200\nG92 E0\n" }, - "machine_end_gcode": { "default_value": "M107 T0\nM104 S0\nM104 S0 T1\nM140 S0\nG92 E0\nG91\nG1 E-1 F300 \nG1 Z+0.5 E-5 X-20 Y-20 F9000\nG28 X0 Y0\nM84 ;steppers off\nG90 ;absolute positioning\n" }, - - - "machine_heated_bed": { "default_value": true }, - - "material_diameter": { "default_value": 1.75 }, - + "overrides": + { + "acceleration_enabled": { "value": false }, "acceleration_print": { "value": "machine_acceleration" }, + "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, "acceleration_travel": { "value": "machine_acceleration" }, "acceleration_travel_layer_0": { "value": "acceleration_travel" }, - "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, - + "adaptive_layer_height_variation": { "value": 0.04 }, + "adaptive_layer_height_variation_step": { "value": 0.04 }, + "adhesion_type": { "value": "'skirt'" }, + "brim_replaces_support": { "value": false }, + "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, + "cool_min_layer_time": { "value": 10 }, + "fill_outline_gaps": { "value": true }, + "infill_before_walls": { "value": false }, + "infill_overlap": { "value": 30.0 }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 56 else 'cubic'" }, + "infill_wipe_dist": { "value": 0.0 }, + "jerk_enabled": { "value": false }, "jerk_print": { "value": 12 }, "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_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_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" }, - "speed_support_interface": { "value": "speed_topbottom" }, - "speed_z_hop": { "value": 5 }, - - "skirt_brim_speed": { "value": "speed_layer_0" }, - - - "optimize_wall_printing_order": { "value": "True" }, - - "material_initial_print_temperature": { "value": "material_print_temperature" }, + "machine_end_gcode": { "default_value": "M107 T0\nM104 S0\nM104 S0 T1\nM140 S0\nG92 E0\nG91\nG1 E-1 F300 \nG1 Z+0.5 E-5 X-20 Y-20 F9000\nG28 X0 Y0\nM84 ;steppers off\nG90 ;absolute positioning\n" }, + "machine_heated_bed": { "default_value": true }, + "machine_name": { "default_value": "Tronxy Base Printer" }, + "machine_start_gcode": { "default_value": "G21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T0\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0} T0\nG28\nG92 E0\nG1 Z15.0 F{speed_travel_layer_0}\nG0 E3 F200\nG92 E0\n" }, + "material_diameter": { "default_value": 1.75 }, "material_final_print_temperature": { "value": "material_print_temperature" }, "material_flow": { "value": 95 }, "material_flow_layer_0": { "value": 95 }, - - "z_seam_type": { "value": "'sharpest_corner'" }, - "z_seam_corner": { "value": "'z_seam_corner_inner'" }, - - "infill_pattern": { "value": "'lines' if infill_sparse_density > 56 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": true }, - - "retraction_speed": { - "maximum_value_warning": "machine_max_feedrate_e", - "default_value": 45, - "maximum_value": 200 - }, - "retraction_retract_speed": { - "maximum_value_warning": "machine_max_feedrate_e", - "maximum_value": 200 - }, - "retraction_prime_speed": { - "maximum_value_warning": "machine_max_feedrate_e", - "maximum_value": 200 - }, - - "retraction_hop": { "value": 0.2 }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "meshfix_maximum_resolution": { "value": "0.25" }, + "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" }, + "minimum_interface_area": { "value": 10 }, + "minimum_support_area": { "value": 2 }, + "optimize_wall_printing_order": { "value": "True" }, + "retract_at_layer_change": { "value": true }, "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, "retraction_combing_max_distance": { "value": 30 }, + "retraction_count_max": { "value": 100 }, + "retraction_extrusion_window": { "value": 5 }, + "retraction_hop": { "value": 0.2 }, + "retraction_hop_enabled": { "value": true }, + "retraction_min_travel": { "value": 1.5 }, + "retraction_prime_speed": + { + "maximum_value": 200, + "maximum_value_warning": "machine_max_feedrate_e" + }, + "retraction_retract_speed": + { + "maximum_value": 200, + "maximum_value_warning": "machine_max_feedrate_e" + }, + "retraction_speed": + { + "default_value": 45, + "maximum_value": 200, + "maximum_value_warning": "machine_max_feedrate_e" + }, + "skin_overlap": { "value": 10.0 }, + "skirt_brim_speed": { "value": "speed_layer_0" }, + "skirt_gap": { "value": 10.0 }, + "skirt_line_count": { "value": 3 }, + "speed_layer_0": { "value": 30.0 }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_print": { "value": 60.0 }, + "speed_roofing": { "value": "speed_topbottom" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_support_interface": { "value": "speed_topbottom" }, + "speed_topbottom": { "value": "speed_print * 0.5" }, + "speed_travel": { "value": "60.0 if speed_print < 50 else 120.0 if speed_print > 80 else speed_print * 1.25" }, + "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_wall": { "value": "speed_print * 0.75" }, + "speed_wall_x": { "value": "speed_wall" }, + "speed_z_hop": { "value": 5 }, + "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 4 }, + "support_infill_angles": + { + "value": [ + 45 + ] + }, + "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 30" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_height": { "value": "layer_height * 4" }, + "support_interface_pattern": { "value": "'grid'" }, + "support_interface_skip_height": { "value": 0.2 }, + "support_pattern": { "value": "'zigzag'" }, + "support_use_towers": { "value": false }, + "support_wall_count": { "value": "1 if (support_structure == 'tree') else 0" }, + "support_xy_distance": { "value": "wall_line_width_0 * 3" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, + "top_bottom_pattern": { "value": "'zigzag'" }, + "top_bottom_pattern_0": { "value": "'zigzag'" }, + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, "travel_avoid_other_parts": { "value": false }, "travel_avoid_supports": { "value": true }, "travel_retract_before_outer_wall": { "value": true }, - - "retract_at_layer_change": { "value": true }, - "retraction_count_max": { "value": 100 }, - "retraction_extrusion_window": { "value": 5 }, - "retraction_hop_enabled": { "value": true }, - "retraction_min_travel": { "value": 1.5 }, - - "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, - "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_angles": { "value": [45] }, - "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 30" }, - "support_use_towers": { "value": false }, - "support_xy_distance": { "value": "wall_line_width_0 * 3" }, - "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 if (support_structure == 'tree') else 0" }, - "support_brim_enable": { "value": true }, - "support_brim_width": { "value": 4 }, - "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 }, - "top_bottom_pattern": {"value": "'zigzag'" }, - "top_bottom_pattern_0": {"value": "'zigzag'" }, - "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, - "wall_line_count": {"value": "3" } + "wall_0_wipe_dist": { "value": 0.0 }, + "wall_line_count": { "value": "3" }, + "z_seam_corner": { "value": "'z_seam_corner_inner'" }, + "z_seam_type": { "value": "'sharpest_corner'" } } } \ No newline at end of file diff --git a/resources/definitions/tronxy_x5sa.def.json b/resources/definitions/tronxy_x5sa.def.json index ba0b9a92e0..3ae615ff0e 100644 --- a/resources/definitions/tronxy_x5sa.def.json +++ b/resources/definitions/tronxy_x5sa.def.json @@ -1,30 +1,32 @@ { - "name": "Tronxy X5SA/X5ST/Pro/2E/D01 Plus", "version": 2, + "name": "Tronxy X5SA/X5ST/Pro/2E/D01 Plus", "inherits": "tronxy_x", - "metadata": { - "quality_definition": "tronxy_x", + "metadata": + { "visible": true, - "platform": "tronxy.stl" + "platform": "tronxy.stl", + "quality_definition": "tronxy_x" }, - "overrides": { - "machine_name": { "default_value": "Tronxy X5SA" }, - "machine_width": { "default_value": 330 }, + "overrides": + { + "gantry_height": { "value": 40 }, + "machine_acceleration": { "value": 150 }, "machine_depth": { "default_value": 330 }, - "machine_height": { "default_value": 400 }, - "machine_head_with_fans_polygon": { "default_value": [ + "machine_end_gcode": { "default_value": "G91 ; Set Positioning to Relative\nM83 ; Set Extruder to Relative\nG92 E0 ; Reset Extruder\nG1 E-4 F3000 ; Retract 4mm of filament\nG1 Z0.2 ; Raise nozzle .2mm\nG90 ; Set positioning to absolute\nG1 X{machine_width} Y{machine_depth} ; Park print head\nG91 ; Set Positioning to RelativeG1 Z10 ; Raise nozzle 10mm\nM106 S0 ; Turn off part fan\nM104 S0 ; Set nozzle temp to zero\nM140 S0 ; set bed temp to zero\nM84 X Y Z E ; Disable X Y Z and E steppers\n" }, + "machine_head_with_fans_polygon": + { + "default_value": [ [-48, 45], [-48, -30], [27, -30], [27, 45] ] }, - "gantry_height": { "value": 40 }, - "retraction_amount": { "value": 4.5 }, - - "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y220 F1500.0 E10 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E20 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, - "machine_end_gcode": { "default_value": "G91 ; Set Positioning to Relative\nM83 ; Set Extruder to Relative\nG92 E0 ; Reset Extruder\nG1 E-4 F3000 ; Retract 4mm of filament\nG1 Z0.2 ; Raise nozzle .2mm\nG90 ; Set positioning to absolute\nG1 X{machine_width} Y{machine_depth} ; Park print head\nG91 ; Set Positioning to RelativeG1 Z10 ; Raise nozzle 10mm\nM106 S0 ; Turn off part fan\nM104 S0 ; Set nozzle temp to zero\nM140 S0 ; set bed temp to zero\nM84 X Y Z E ; Disable X Y Z and E steppers\n" }, - - "machine_acceleration": { "value": 150 } + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "Tronxy X5SA" }, + "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y220 F1500.0 E10 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E20 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n" }, + "machine_width": { "default_value": 330 }, + "retraction_amount": { "value": 4.5 } } -} +} \ No newline at end of file diff --git a/resources/definitions/tronxy_x5sa_400.def.json b/resources/definitions/tronxy_x5sa_400.def.json index d1448a3287..d71b96f06b 100644 --- a/resources/definitions/tronxy_x5sa_400.def.json +++ b/resources/definitions/tronxy_x5sa_400.def.json @@ -1,30 +1,32 @@ { - "name": "Tronxy X5SA/X5ST/Pro/2E 400mm", "version": 2, + "name": "Tronxy X5SA/X5ST/Pro/2E 400mm", "inherits": "tronxy_x", - "metadata": { - "quality_definition": "tronxy_x", + "metadata": + { "visible": true, - "platform": "tronxy.stl" + "platform": "tronxy.stl", + "quality_definition": "tronxy_x" }, - "overrides": { - "machine_name": { "default_value": "Tronxy X5SA 400" }, - "machine_width": { "default_value": 400 }, + "overrides": + { + "gantry_height": { "value": 40 }, + "machine_acceleration": { "value": 150 }, "machine_depth": { "default_value": 400 }, - "machine_height": { "default_value": 400 }, - "machine_head_with_fans_polygon": { "default_value": [ + "machine_end_gcode": { "default_value": "G91 ; Set Positioning to Relative\nM83 ; Set Extruder to Relative\nG92 E0 ; Reset Extruder\nG1 E-4 F3000 ; Retract 4mm of filament\nG1 Z0.2 ; Raise nozzle .2mm\nG90 ; Set positioning to absolute\nG1 X{machine_width} Y{machine_depth} ; Park print head\nG91 ; Set Positioning to RelativeG1 Z10 ; Raise nozzle 10mm\nM106 S0 ; Turn off part fan\nM104 S0 ; Set nozzle temp to zero\nM140 S0 ; set bed temp to zero\nM84 X Y Z E ; Disable X Y Z and E steppers\n" }, + "machine_head_with_fans_polygon": + { + "default_value": [ [-48, 45], [-48, -30], [27, -30], [27, 45] ] }, - "gantry_height": { "value": 40 }, - "retraction_amount": { "value": 6.5 }, - - "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y290 F1500.0 E15 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E30 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, - "machine_end_gcode": { "default_value": "G91 ; Set Positioning to Relative\nM83 ; Set Extruder to Relative\nG92 E0 ; Reset Extruder\nG1 E-4 F3000 ; Retract 4mm of filament\nG1 Z0.2 ; Raise nozzle .2mm\nG90 ; Set positioning to absolute\nG1 X{machine_width} Y{machine_depth} ; Park print head\nG91 ; Set Positioning to RelativeG1 Z10 ; Raise nozzle 10mm\nM106 S0 ; Turn off part fan\nM104 S0 ; Set nozzle temp to zero\nM140 S0 ; set bed temp to zero\nM84 X Y Z E ; Disable X Y Z and E steppers\n" }, - - "machine_acceleration": { "value": 150 } + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "Tronxy X5SA 400" }, + "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y290 F1500.0 E15 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E30 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n" }, + "machine_width": { "default_value": 400 }, + "retraction_amount": { "value": 6.5 } } } \ No newline at end of file diff --git a/resources/definitions/tronxy_x5sa_500.def.json b/resources/definitions/tronxy_x5sa_500.def.json index 44f8d1ba1a..b08b5fbc7a 100644 --- a/resources/definitions/tronxy_x5sa_500.def.json +++ b/resources/definitions/tronxy_x5sa_500.def.json @@ -1,30 +1,32 @@ { - "name": "Tronxy X5SA/X5ST/Pro/2E 500mm", "version": 2, + "name": "Tronxy X5SA/X5ST/Pro/2E 500mm", "inherits": "tronxy_x", - "metadata": { - "quality_definition": "tronxy_x", + "metadata": + { "visible": true, - "platform": "tronxy.stl" + "platform": "tronxy.stl", + "quality_definition": "tronxy_x" }, - "overrides": { - "machine_name": { "default_value": "Tronxy X5SA 500" }, - "machine_width": { "default_value": 500 }, + "overrides": + { + "gantry_height": { "value": 40 }, + "machine_acceleration": { "value": 150 }, "machine_depth": { "default_value": 500 }, - "machine_height": { "default_value": 600 }, - "machine_head_with_fans_polygon": { "default_value": [ + "machine_end_gcode": { "default_value": "G91 ; Set Positioning to Relative\nM83 ; Set Extruder to Relative\nG92 E0 ; Reset Extruder\nG1 E-4 F3000 ; Retract 4mm of filament\nG1 Z0.2 ; Raise nozzle .2mm\nG90 ; Set positioning to absolute\nG1 X{machine_width} Y{machine_depth} ; Park print head\nG91 ; Set Positioning to RelativeG1 Z10 ; Raise nozzle 10mm\nM106 S0 ; Turn off part fan\nM104 S0 ; Set nozzle temp to zero\nM140 S0 ; set bed temp to zero\nM84 X Y Z E ; Disable X Y Z and E steppers\n" }, + "machine_head_with_fans_polygon": + { + "default_value": [ [-48, 45], [-48, -30], [27, -30], [27, 45] ] }, - "gantry_height": { "value": 40 }, - "retraction_amount": { "value": 6.5 }, - - "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y290 F1500.0 E15 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E30 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, - "machine_end_gcode": { "default_value": "G91 ; Set Positioning to Relative\nM83 ; Set Extruder to Relative\nG92 E0 ; Reset Extruder\nG1 E-4 F3000 ; Retract 4mm of filament\nG1 Z0.2 ; Raise nozzle .2mm\nG90 ; Set positioning to absolute\nG1 X{machine_width} Y{machine_depth} ; Park print head\nG91 ; Set Positioning to RelativeG1 Z10 ; Raise nozzle 10mm\nM106 S0 ; Turn off part fan\nM104 S0 ; Set nozzle temp to zero\nM140 S0 ; set bed temp to zero\nM84 X Y Z E ; Disable X Y Z and E steppers\n" }, - - "machine_acceleration": { "value": 150 } + "machine_height": { "default_value": 600 }, + "machine_name": { "default_value": "Tronxy X5SA 500" }, + "machine_start_gcode": { "default_value": "; X5SA Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y290 F1500.0 E15 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E30 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n" }, + "machine_width": { "default_value": 500 }, + "retraction_amount": { "value": 6.5 } } -} +} \ No newline at end of file diff --git a/resources/definitions/tronxy_xy2.def.json b/resources/definitions/tronxy_xy2.def.json index 7894141b9d..e3b994c01d 100644 --- a/resources/definitions/tronxy_xy2.def.json +++ b/resources/definitions/tronxy_xy2.def.json @@ -1,30 +1,32 @@ { - "name": "Tronxy XY-2", "version": 2, + "name": "Tronxy XY-2", "inherits": "tronxy_x", - "metadata": { - "quality_definition": "tronxy_x", + "metadata": + { "visible": true, - "platform": "tronxy.stl" + "platform": "tronxy.stl", + "quality_definition": "tronxy_x" }, - "overrides": { - "machine_name": { "default_value": "Tronxy XY-2" }, - "machine_width": { "default_value": 220 }, + "overrides": + { + "gantry_height": { "value": 40 }, + "machine_acceleration": { "value": 150 }, "machine_depth": { "default_value": 220 }, - "machine_height": { "default_value": 260 }, - "machine_head_with_fans_polygon": { "default_value": [ + "machine_end_gcode": { "default_value": "M83 ; Set extrder to Relative\nG1 E-5 F3000 ; Retract 5mm of filament at 50mm/s\nG90 ; Set all axis to Absolute \nG1 X0 Y{machine_depth} ; Park print head\nG1 Z10 ; Move up 10mm\nM106 S0 ; Set fan speed to 0\nM104 S0 ; Set bed temp to 0\nM140 S0 ; Set Nozzle temp to 0\nM84 ; Disable all stepper motors\n" }, + "machine_head_with_fans_polygon": + { + "default_value": [ [-30, 45], [-30, -30], [27, -30], [27, 45] ] }, - "gantry_height": { "value": 40 }, - "retraction_amount": { "value": 4.5 }, - - "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y220 F1500.0 E10 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E20 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, - "machine_end_gcode": { "default_value": "M83 ; Set extrder to Relative\nG1 E-5 F3000 ; Retract 5mm of filament at 50mm/s\nG90 ; Set all axis to Absolute \nG1 X0 Y{machine_depth} ; Park print head\nG1 Z10 ; Move up 10mm\nM106 S0 ; Set fan speed to 0\nM104 S0 ; Set bed temp to 0\nM140 S0 ; Set Nozzle temp to 0\nM84 ; Disable all stepper motors\n" }, - - "machine_acceleration": { "value": 150 } + "machine_height": { "default_value": 260 }, + "machine_name": { "default_value": "Tronxy XY-2" }, + "machine_start_gcode": { "default_value": "; XY-2 Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y220 F1500.0 E10 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E20 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n" }, + "machine_width": { "default_value": 220 }, + "retraction_amount": { "value": 4.5 } } -} +} \ No newline at end of file diff --git a/resources/definitions/tronxy_xy2pro.def.json b/resources/definitions/tronxy_xy2pro.def.json index ed16c34352..14064772a2 100644 --- a/resources/definitions/tronxy_xy2pro.def.json +++ b/resources/definitions/tronxy_xy2pro.def.json @@ -1,30 +1,32 @@ { - "name": "Tronxy XY-2 Pro/Pro 2E/XY3 SE", "version": 2, + "name": "Tronxy XY-2 Pro/Pro 2E/XY3 SE", "inherits": "tronxy_x", - "metadata": { - "quality_definition": "tronxy_x", + "metadata": + { "visible": true, - "platform": "tronxy.stl" + "platform": "tronxy.stl", + "quality_definition": "tronxy_x" }, - "overrides": { - "machine_name": { "default_value": "Tronxy XY-2 Pro" }, - "machine_width": { "default_value": 255 }, + "overrides": + { + "gantry_height": { "value": 40 }, + "machine_acceleration": { "value": 150 }, "machine_depth": { "default_value": 255 }, - "machine_height": { "default_value": 260 }, - "machine_head_with_fans_polygon": { "default_value": [ + "machine_end_gcode": { "default_value": "M83 ; Set extrder to Relative\nG1 E-5 F3000 ; Retract 5mm of filament at 50mm/s\nG90 ; Set all axis to Absolute \nG1 X0 Y{machine_depth} ; Park print head\nG1 Z10 ; Move up 10mm\nM106 S0 ; Set fan speed to 0\nM104 S0 ; Set bed temp to 0\nM140 S0 ; Set Nozzle temp to 0\nM84 ; Disable all stepper motors\n" }, + "machine_head_with_fans_polygon": + { + "default_value": [ [-48, 45], [-48, -30], [27, -30], [27, 45] ] }, - "gantry_height": { "value": 40 }, - "retraction_amount": { "value": 4.5 }, - - "machine_start_gcode": { "default_value": "; XY-2 Pro Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y220 F1500.0 E10 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E20 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, - "machine_end_gcode": { "default_value": "M83 ; Set extrder to Relative\nG1 E-5 F3000 ; Retract 5mm of filament at 50mm/s\nG90 ; Set all axis to Absolute \nG1 X0 Y{machine_depth} ; Park print head\nG1 Z10 ; Move up 10mm\nM106 S0 ; Set fan speed to 0\nM104 S0 ; Set bed temp to 0\nM140 S0 ; Set Nozzle temp to 0\nM84 ; Disable all stepper motors\n" }, - - "machine_acceleration": { "value": 150 } + "machine_height": { "default_value": 260 }, + "machine_name": { "default_value": "Tronxy XY-2 Pro" }, + "machine_start_gcode": { "default_value": "; XY-2 Pro Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y220 F1500.0 E10 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E20 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n" }, + "machine_width": { "default_value": 255 }, + "retraction_amount": { "value": 4.5 } } -} +} \ No newline at end of file diff --git a/resources/definitions/tronxy_xy3.def.json b/resources/definitions/tronxy_xy3.def.json index 345def8926..6ef59dc92d 100644 --- a/resources/definitions/tronxy_xy3.def.json +++ b/resources/definitions/tronxy_xy3.def.json @@ -1,30 +1,32 @@ { - "name": "Tronxy XY-3/Pro", "version": 2, + "name": "Tronxy XY-3/Pro", "inherits": "tronxy_x", - "metadata": { - "quality_definition": "tronxy_x", + "metadata": + { "visible": true, - "platform": "tronxy.stl" + "platform": "tronxy.stl", + "quality_definition": "tronxy_x" }, - "overrides": { - "machine_name": { "default_value": "Tronxy XY-3" }, - "machine_width": { "default_value": 310 }, + "overrides": + { + "gantry_height": { "value": 30 }, + "machine_acceleration": { "value": 150 }, "machine_depth": { "default_value": 310 }, - "machine_height": { "default_value": 330 }, - "machine_head_with_fans_polygon": { "default_value": [ + "machine_end_gcode": { "default_value": "M83 ; Set extrder to Relative\nG1 E-5 F3000 ; Retract 5mm of filament at 50mm/s\nG90 ; Set all axis to Absolute \nG1 X0 Y{machine_depth} ; Park print head\nG1 Z10 ; Move up 10mm\nM106 S0 ; Set fan speed to 0\nM104 S0 ; Set bed temp to 0\nM140 S0 ; Set Nozzle temp to 0\nM84 ; Disable all stepper motors\n" }, + "machine_head_with_fans_polygon": + { + "default_value": [ [-30, 45], [-30, -30], [27, -30], [27, 45] ] }, - "gantry_height": { "value": 30 }, - "retraction_amount": { "value": 5 }, - - "machine_start_gcode": { "default_value": "; XY-3 Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y220 F1500.0 E10 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E20 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, - "machine_end_gcode": { "default_value": "M83 ; Set extrder to Relative\nG1 E-5 F3000 ; Retract 5mm of filament at 50mm/s\nG90 ; Set all axis to Absolute \nG1 X0 Y{machine_depth} ; Park print head\nG1 Z10 ; Move up 10mm\nM106 S0 ; Set fan speed to 0\nM104 S0 ; Set bed temp to 0\nM140 S0 ; Set Nozzle temp to 0\nM84 ; Disable all stepper motors\n" }, - - "machine_acceleration": { "value": 150 } + "machine_height": { "default_value": 330 }, + "machine_name": { "default_value": "Tronxy XY-3" }, + "machine_start_gcode": { "default_value": "; XY-3 Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y220 F1500.0 E10 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E20 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n" }, + "machine_width": { "default_value": 310 }, + "retraction_amount": { "value": 5 } } -} +} \ No newline at end of file diff --git a/resources/definitions/tronxy_xy3proV2.def.json b/resources/definitions/tronxy_xy3proV2.def.json index 841c159375..b7348662d9 100644 --- a/resources/definitions/tronxy_xy3proV2.def.json +++ b/resources/definitions/tronxy_xy3proV2.def.json @@ -1,32 +1,33 @@ { - "name": "Tronxy XY-3 Pro V2", "version": 2, + "name": "Tronxy XY-3 Pro V2", "inherits": "tronxy_x", - "metadata": { - "quality_definition": "tronxy_x", + "metadata": + { "visible": true, - "platform": "tronxy.stl" + "platform": "tronxy.stl", + "quality_definition": "tronxy_x" }, - "overrides": { - "machine_name": { "default_value": "Tronxy XY-3" }, - "machine_width": { "default_value": 310 }, + "overrides": + { + "gantry_height": { "value": 30 }, + "machine_acceleration": { "value": 150 }, "machine_depth": { "default_value": 310 }, - "machine_height": { "default_value": 330 }, - "machine_head_with_fans_polygon": { "default_value": [ + "machine_end_gcode": { "default_value": "M83 ; Set extrder to Relative\nG1 E-5 F3000 ; Retract 5mm of filament at 50mm/s\nG90 ; Set all axis to Absolute \nG1 X0 Y{machine_depth} ; Park print head\nG1 Z10 ; Move up 10mm\nM106 S0 ; Set fan speed to 0\nM104 S0 ; Set bed temp to 0\nM140 S0 ; Set Nozzle temp to 0\nM84 ; Disable all stepper motors\n" }, + "machine_head_with_fans_polygon": + { + "default_value": [ [-30, 45], [-30, -30], [27, -30], [27, 45] ] }, - "gantry_height": { "value": 30 }, + "machine_height": { "default_value": 330 }, + "machine_name": { "default_value": "Tronxy XY-3" }, + "machine_start_gcode": { "default_value": "; XY-3 Pro Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y220 F1500.0 E10 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E20 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n" }, + "machine_width": { "default_value": 310 }, "retraction_amount": { "value": 0.5 }, - "retraction_speed": { "value": 45 }, - - - "machine_start_gcode": { "default_value": "; XY-3 Pro Start Code\nG21 ; Set units to millimeters\nG90 ; Set all axis to Absolute\nM82 ; Set extrusion to Absolute\nM107 ; Disable all fans\nM190 S{material_bed_temperature_layer_0} ; Set bed temperature and wait\nG28 ; Home all axis\n; Uncomment the line below to enable ABL Mesh probing\n;G29 ; Probe bed mesh for ABL\n; For best results do not run nozzle heater while performing ABL\nG1 Z5.0 ; Raise nozzle to prevent scratching of heat bed\nG1 X0 Y0 ; Move nozzle to Home before heating\nM109 S{material_print_temperature_layer_0} T0 ; Set nozzle temp and wait\nG92 E0 ; Set Extruder position to zero\n; Uncomment the following lines to enable nozzle purge line along left edge of bed\n;G1 Z2.0 F3000 ; Raise Z axis\n;G1 X1.1 Y20 Z0.2 F3600.0 ; Move to purge line start position\n;G1 Y220 F1500.0 E10 ; Draw first purge line\n;G1 X1.4 F3600.0 ; Move to side\n;G1 Y20 F1500.0 E20 ; Draw second purge line\n;G92 E0 ; Reset Extruder\n;G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n;G1 X5 Y20 Z0.2 F3600.0 ; Move over to finish nozzle wipe\n;G92 E0\n"}, - "machine_end_gcode": { "default_value": "M83 ; Set extrder to Relative\nG1 E-5 F3000 ; Retract 5mm of filament at 50mm/s\nG90 ; Set all axis to Absolute \nG1 X0 Y{machine_depth} ; Park print head\nG1 Z10 ; Move up 10mm\nM106 S0 ; Set fan speed to 0\nM104 S0 ; Set bed temp to 0\nM140 S0 ; Set Nozzle temp to 0\nM84 ; Disable all stepper motors\n" }, - - "machine_acceleration": { "value": 150 } + "retraction_speed": { "value": 45 } } -} +} \ No newline at end of file diff --git a/resources/definitions/two_trees_base.def.json b/resources/definitions/two_trees_base.def.json index 7e0495b469..b432d491cd 100644 --- a/resources/definitions/two_trees_base.def.json +++ b/resources/definitions/two_trees_base.def.json @@ -1,109 +1,88 @@ { - "name": "Two Trees Base Printer", "version": 2, + "name": "Two Trees Base Printer", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": false, "author": "3DGadgets.my", "manufacturer": "Two Trees", "file_formats": "text/x-gcode", - "first_start_actions": ["MachineSettingsAction"], - - "machine_extruder_trains": { - "0": "two_trees_base_extruder_0" - }, - + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true, - "variants_name": "Nozzle Size", - - "preferred_variant_name": "0.4mm Nozzle", + "machine_extruder_trains": { "0": "two_trees_base_extruder_0" }, + "preferred_material": "generic_pla", "preferred_quality_type": "standard", - "preferred_material": "generic_pla" - + "preferred_variant_name": "0.4mm Nozzle", + "variants_name": "Nozzle Size" }, - "overrides": { - "machine_name": { "default_value": "Two Trees Base Printer" }, - "machine_start_gcode": { "default_value": "G28 ;Home\nM420 S1 ;Enable ABL using saved Mesh and Fade Height\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move bed down\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 Bed up" }, - "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_heated_bed": { "default_value": true }, - - "material_diameter": { "default_value": 1.75 }, - - "speed_print": { "value": 50.0 }, - "speed_wall_x": { "value": "speed_print / 1.5" }, - "speed_roofing": { "value": "speed_topbottom" }, - "speed_layer_0": { "value": 20.0 }, - "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" }, - - - "optimize_wall_printing_order": { "value": "True" }, - - "z_seam_type": { "value": "'sharpest_corner'" }, - "z_seam_corner": { "value": "'z_seam_corner_inner'" }, - - "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, + "overrides": + { + "adaptive_layer_height_variation": { "value": 0.04 }, + "adaptive_layer_height_variation_step": { "value": 0.04 }, + "adhesion_type": { "value": "'skirt'" }, + "brim_replaces_support": { "value": false }, + "cool_fan_full_layer": { "value": "2" }, + "cool_min_layer_time": { "value": 10 }, + "fill_outline_gaps": { "value": false }, "infill_before_walls": { "value": false }, "infill_overlap": { "value": 30.0 }, - "skin_overlap": { "value": 10.0 }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, "infill_wipe_dist": { "value": 0.0 }, - "wall_0_wipe_dist": { "value": 0.0 }, - - "fill_outline_gaps": { "value": false }, - - "retraction_hop": { "value": 0.2 }, + "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_heated_bed": { "default_value": true }, + "machine_name": { "default_value": "Two Trees Base Printer" }, + "machine_start_gcode": { "default_value": "G28 ;Home\nM420 S1 ;Enable ABL using saved Mesh and Fade Height\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move bed down\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 Bed up" }, + "material_diameter": { "default_value": 1.75 }, + "meshfix_maximum_resolution": { "value": "0.25" }, + "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" }, + "minimum_interface_area": { "value": 10 }, + "minimum_support_area": { "value": 2 }, + "optimize_wall_printing_order": { "value": "True" }, + "retraction_amount": { "default_value": 7 }, "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, "retraction_combing_max_distance": { "value": 30 }, + "retraction_count_max": { "value": 100 }, + "retraction_extrusion_window": { "value": 10 }, + "retraction_hop": { "value": 0.2 }, + "retraction_min_travel": { "value": 1.5 }, + "retraction_speed": { "default_value": 40 }, + "skin_overlap": { "value": 10.0 }, + "skirt_brim_speed": { "value": "speed_layer_0" }, + "skirt_gap": { "value": 10.0 }, + "skirt_line_count": { "value": 3 }, + "speed_layer_0": { "value": 20.0 }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_print": { "value": 50.0 }, + "speed_roofing": { "value": "speed_topbottom" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_support_interface": { "value": "speed_topbottom" }, + "speed_wall_x": { "value": "speed_print / 1.5" }, + "speed_z_hop": { "value": 5 }, + "support_angle": { "value": 50 }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 5 }, + "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 25" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_height": { "value": "layer_height * 4" }, + "support_interface_pattern": { "value": "'grid'" }, + "support_interface_skip_height": { "value": 0.2 }, + "support_pattern": { "value": "'zigzag'" }, + "support_use_towers": { "value": false }, + "support_wall_count": { "value": "1 if (support_structure == 'tree') else 0" }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, "travel_avoid_other_parts": { "value": true }, "travel_avoid_supports": { "value": true }, "travel_retract_before_outer_wall": { "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_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": 50 }, - "support_pattern": { "value": "'zigzag'" }, - "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 25" }, - "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 if (support_structure == 'tree') else 0" }, - "support_brim_enable": { "value": true }, - "support_brim_width": { "value": 5 }, - - "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 }, - "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, - "wall_thickness": {"value": "line_width * 2" } + "wall_0_wipe_dist": { "value": 0.0 }, + "wall_thickness": { "value": "line_width * 2" }, + "z_seam_corner": { "value": "'z_seam_corner_inner'" }, + "z_seam_type": { "value": "'sharpest_corner'" } } -} +} \ No newline at end of file diff --git a/resources/definitions/two_trees_bluer.def.json b/resources/definitions/two_trees_bluer.def.json index 67e903f74d..138c10fc02 100644 --- a/resources/definitions/two_trees_bluer.def.json +++ b/resources/definitions/two_trees_bluer.def.json @@ -1,37 +1,38 @@ { - "name": "Two Trees Bluer", "version": 2, + "name": "Two Trees Bluer", "inherits": "two_trees_base", - "overrides": { - "machine_start_gcode": { "default_value": "G28 ;Home\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move bed down\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 Bed up" }, - "machine_name": { "default_value": "Two Trees Bluer" }, - "machine_width": { "default_value": 230 }, - "machine_depth": { "default_value": 230 }, - "machine_height": { "default_value": 280 }, - "machine_head_with_fans_polygon": { "default_value": [ - [-47, 37], - [-47, -23], - [47, -23], - [47, 37] - ] - }, - + "metadata": + { + "visible": true, + "platform": "twotrees235x235_generic.stl", + "quality_definition": "two_trees_base" + }, + "overrides": + { "gantry_height": { "value": 28 }, + "infill_material_flow": { "value": 100 }, + "infill_overlap": { "value": 30 }, + "machine_depth": { "default_value": 230 }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-47, 37], + [-47, -23], + [47, -23], + [47, 37] + ] + }, + "machine_height": { "default_value": 280 }, + "machine_name": { "default_value": "Two Trees Bluer" }, + "machine_start_gcode": { "default_value": "G28 ;Home\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move bed down\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 Bed up" }, + "machine_width": { "default_value": 230 }, + "material_flow": { "value": 90 }, + "retraction_amount": { "default_value": 8 }, + "retraction_speed": { "default_value": 50 }, + "skin_overlap": { "value": 20 }, "speed_print": { "value": 50.0 }, "speed_travel": { "value": 180 }, - "speed_travel_layer_0": { "value": 100 }, - "retraction_speed": { "default_value" : 50 }, - "retraction_amount": { "default_value" : 8 }, - - "material_flow": { "value": 90 }, - "infill_material_flow": { "value": 100 }, - - "infill_overlap": { "value": 30 }, - "skin_overlap": { "value": 20 } - }, - "metadata": { - "quality_definition": "two_trees_base", - "visible": true, - "platform": "twotrees235x235_generic.stl" + "speed_travel_layer_0": { "value": 100 } } -} +} \ No newline at end of file diff --git a/resources/definitions/two_trees_bluerplus.def.json b/resources/definitions/two_trees_bluerplus.def.json index 1e1dcd20c3..9fa727aacf 100644 --- a/resources/definitions/two_trees_bluerplus.def.json +++ b/resources/definitions/two_trees_bluerplus.def.json @@ -1,36 +1,37 @@ { - "name": "Two Trees Bluer Plus", "version": 2, + "name": "Two Trees Bluer Plus", "inherits": "two_trees_base", - "overrides": { + "metadata": + { + "visible": true, + "platform": "twotrees300x300_generic.stl", + "quality_definition": "two_trees_base" + }, + "overrides": + { + "gantry_height": { "value": 28 }, + "infill_material_flow": { "value": 100 }, + "infill_overlap": { "value": 30 }, + "machine_depth": { "default_value": 300 }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-47, 37], + [-47, -23], + [47, -23], + [47, 37] + ] + }, + "machine_height": { "default_value": 400 }, "machine_name": { "default_value": "Two Trees Bluer Plus" }, "machine_width": { "default_value": 300 }, - "machine_depth": { "default_value": 300 }, - "machine_height": { "default_value": 400 }, - "machine_head_with_fans_polygon": { "default_value": [ - [-47, 37], - [-47, -23], - [47, -23], - [47, 37] - ] - }, - - "gantry_height": { "value": 28 }, + "material_flow": { "value": 90 }, + "retraction_amount": { "default_value": 8 }, + "retraction_speed": { "default_value": 50 }, + "skin_overlap": { "value": 20 }, "speed_print": { "value": 50.0 }, "speed_travel": { "value": 180 }, - "speed_travel_layer_0": { "value": 100 }, - "retraction_speed": { "default_value" : 50 }, - "retraction_amount": { "default_value" : 8 }, - - "material_flow": { "value": 90 }, - "infill_material_flow": { "value": 100 }, - - "infill_overlap": { "value": 30 }, - "skin_overlap": { "value": 20 } - }, - "metadata": { - "quality_definition": "two_trees_base", - "visible": true, - "platform": "twotrees300x300_generic.stl" + "speed_travel_layer_0": { "value": 100 } } -} +} \ No newline at end of file diff --git a/resources/definitions/two_trees_sapphireplus.def.json b/resources/definitions/two_trees_sapphireplus.def.json index 8dae455a28..183c7b7f38 100644 --- a/resources/definitions/two_trees_sapphireplus.def.json +++ b/resources/definitions/two_trees_sapphireplus.def.json @@ -1,38 +1,37 @@ { - "name": "Two Trees Sapphire Plus", "version": 2, + "name": "Two Trees Sapphire Plus", "inherits": "two_trees_base", - "overrides": { + "metadata": + { + "visible": true, + "platform": "sapphireplus_platform.stl", + "quality_definition": "two_trees_base" + }, + "overrides": + { + "gantry_height": { "value": 65 }, + "infill_material_flow": { "value": 100 }, + "infill_overlap": { "value": 30 }, + "machine_depth": { "default_value": 300 }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-30, 19], + [30, 19], + [30, -49], + [-30, -49] + ] + }, + "machine_height": { "default_value": 350 }, "machine_name": { "default_value": "Two Trees Sapphire Plus" }, "machine_width": { "default_value": 300 }, - "machine_depth": { "default_value": 300 }, - "machine_height": { "default_value": 350 }, - "machine_head_with_fans_polygon": { "default_value": [ - [-30,19], - [30,19], - [30,-49], - [-30,-49] - ] - }, - - "gantry_height": { "value": 65 }, - + "material_flow": { "value": 90 }, + "retraction_amount": { "default_value": 7 }, + "retraction_speed": { "default_value": 40 }, + "skin_overlap": { "value": 20 }, "speed_print": { "value": 60.0 }, "speed_travel": { "value": 180 }, - "speed_travel_layer_0": { "value": 100 }, - "retraction_speed": { "default_value" : 40 }, - "retraction_amount": { "default_value" : 7 }, - - "material_flow": { "value": 90 }, - "infill_material_flow": { "value": 100 }, - - "infill_overlap": { "value": 30 }, - "skin_overlap": { "value": 20 } - }, - "metadata": { - "quality_definition": "two_trees_base", - "visible": true, - "platform": "sapphireplus_platform.stl" - + "speed_travel_layer_0": { "value": 100 } } -} +} \ No newline at end of file diff --git a/resources/definitions/two_trees_sapphirepro.def.json b/resources/definitions/two_trees_sapphirepro.def.json index 0a66a5e232..7f4a1714ae 100644 --- a/resources/definitions/two_trees_sapphirepro.def.json +++ b/resources/definitions/two_trees_sapphirepro.def.json @@ -1,39 +1,38 @@ { - "name": "Two Trees Sapphire Pro", "version": 2, + "name": "Two Trees Sapphire Pro", "inherits": "two_trees_base", - "overrides": { - "machine_start_gcode": { "default_value": "G28 ;Home\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move bed down\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 Bed up" }, - "machine_name": { "default_value": "Two Trees Sapphire Pro" }, - "machine_width": { "default_value": 220 }, - "machine_depth": { "default_value": 220 }, - "machine_height": { "default_value": 220 }, - "machine_head_with_fans_polygon": { "default_value": [ - [-30,19], - [30,19], - [30,-49], - [-30,-49] - ] - }, - + "metadata": + { + "visible": true, + "platform": "sapphirepro_platform.stl", + "quality_definition": "two_trees_base" + }, + "overrides": + { "gantry_height": { "value": 65 }, - + "infill_material_flow": { "value": 100 }, + "infill_overlap": { "value": 30 }, + "machine_depth": { "default_value": 220 }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-30, 19], + [30, 19], + [30, -49], + [-30, -49] + ] + }, + "machine_height": { "default_value": 220 }, + "machine_name": { "default_value": "Two Trees Sapphire Pro" }, + "machine_start_gcode": { "default_value": "G28 ;Home\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move bed down\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 Bed up" }, + "machine_width": { "default_value": 220 }, + "material_flow": { "value": 90 }, + "retraction_amount": { "default_value": 7 }, + "retraction_speed": { "default_value": 40 }, + "skin_overlap": { "value": 20 }, "speed_print": { "value": 60.0 }, "speed_travel": { "value": 180 }, - "speed_travel_layer_0": { "value": 100 }, - "retraction_speed": { "default_value" : 40 }, - "retraction_amount": { "default_value" : 7 }, - - "material_flow": { "value": 90 }, - "infill_material_flow": { "value": 100 }, - - "infill_overlap": { "value": 30 }, - "skin_overlap": { "value": 20 } - }, - "metadata": { - "quality_definition": "two_trees_base", - "visible": true, - "platform": "sapphirepro_platform.stl" - + "speed_travel_layer_0": { "value": 100 } } -} +} \ No newline at end of file diff --git a/resources/definitions/ubuild-3d_mr_bot_280.def.json b/resources/definitions/ubuild-3d_mr_bot_280.def.json index f1c7bc7581..b883287f6b 100644 --- a/resources/definitions/ubuild-3d_mr_bot_280.def.json +++ b/resources/definitions/ubuild-3d_mr_bot_280.def.json @@ -2,43 +2,49 @@ "version": 2, "name": "uBuild-3D Mr Bot 280", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "uBuild-3D", "manufacturer": "uBuild-3D", "file_formats": "text/x-gcode", "has_materials": true, - "preferred_quality_type": "draft", - "machine_extruder_trains": - { - "0": "ubuild-3d_mr_bot_280_extruder_0" - } + "machine_extruder_trains": { "0": "ubuild-3d_mr_bot_280_extruder_0" }, + "preferred_quality_type": "draft" }, - - "overrides": { - "machine_name": { "default_value": "Mr Bot 280" }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 275 }, - "machine_height": { "default_value": 275 }, - "machine_depth": { "default_value": 275 }, - "machine_center_is_zero": { "default_value": false }, - "layer_height_0": { "default_value": 0.1 }, - "retraction_amount": { "default_value": 2 }, - "retraction_speed": { "default_value": 50 }, + "overrides": + { "adhesion_type": { "default_value": "skirt" }, - "machine_nozzle_heat_up_speed": { "default_value": 2 }, - "machine_nozzle_cool_down_speed": { "default_value": 2 }, - "machine_head_with_fans_polygon": { "default_value": [[-20,20],[10,10],[10,10],[10,10]] }, "gantry_height": { "value": "275" }, - "machine_max_feedrate_z": { "default_value": 15 }, - "machine_max_feedrate_e": { "default_value": 60 }, - "machine_max_acceleration_z": { "default_value": 1000 }, + "layer_height_0": { "default_value": 0.1 }, "machine_acceleration": { "default_value": 2000 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 275 }, + "machine_end_gcode": { "default_value": "M400 ; wait for moves to finish\nG92 Z0 E0 ; reset Z position\nG1 E-2 F9000 ; retract material\nG1 Z2 ; get extruder out of the way\nM104 S0 ; turn off extruder\nG1 Y285 F3000 ; present finished print\nM140 S0 ; turn off bed\nM84 ; disable motors\nM117 Print complete" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-20, 20], + [10, 10], + [10, 10], + [10, 10] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 275 }, + "machine_max_acceleration_z": { "default_value": 1000 }, + "machine_max_feedrate_e": { "default_value": 60 }, + "machine_max_feedrate_z": { "default_value": 15 }, + "machine_max_jerk_e": { "default_value": 5 }, "machine_max_jerk_xy": { "default_value": 20 }, "machine_max_jerk_z": { "default_value": 0.4 }, - "machine_max_jerk_e": { "default_value": 5 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_name": { "default_value": "Mr Bot 280" }, + "machine_nozzle_cool_down_speed": { "default_value": 2 }, + "machine_nozzle_heat_up_speed": { "default_value": 2 }, "machine_start_gcode": { "default_value": "G21 ; set units to millimeters\nG90 ; use absolute positioning\nM82 ; absolute extrusion mode\nM140 S{material_bed_temperature} ; set bed temp\nM104 S{material_print_temperature} ; set extruder temp\nG28 ; home X, Y and Z\nG29 ; probe sequence (for auto-leveling)\nG1 Z15 F600 ; go to Z15 position\nG1 X0 Y-20 F10000 ; go to X0 Y-20 position\nM190 S{material_bed_temperature} ; wait for bed temp\nM109 S{material_print_temperature} ; wait for extruder temp\nG92 E0 ; reset extruder distance position\nG1 E25 F100 ; extrude 25mm of material\nG92 E0 ; reset extruder distance position\nM117 Printing..." }, - "machine_end_gcode": { "default_value": "M400 ; wait for moves to finish\nG92 Z0 E0 ; reset Z position\nG1 E-2 F9000 ; retract material\nG1 Z2 ; get extruder out of the way\nM104 S0 ; turn off extruder\nG1 Y285 F3000 ; present finished print\nM140 S0 ; turn off bed\nM84 ; disable motors\nM117 Print complete" } + "machine_width": { "default_value": 275 }, + "retraction_amount": { "default_value": 2 }, + "retraction_speed": { "default_value": 50 } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index f05ee97441..bb4a074fac 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -58,6 +58,7 @@ "jerk_travel_enabled": { "value": false }, "jerk_wall": { "minimum_value_warning": 20 }, "jerk_wall_0": { "minimum_value_warning": 20 }, + "layer_height": { "value": 0.15 }, "layer_height_0": { "value": "max(0.2, layer_height)" }, "line_width": { "value": "machine_nozzle_size" }, "machine_max_feedrate_e": { "default_value": 45 }, @@ -75,7 +76,7 @@ }, "meshfix_maximum_deviation": { "value": "machine_nozzle_size / 10" }, "meshfix_maximum_resolution": { "value": "max(speed_wall_0 / 75, 0.5)" }, - "minimum_support_area": { "value": "4.0" }, + "minimum_support_area": { "value": "(2 + support_offset)**2" }, "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" }, @@ -99,7 +100,7 @@ "skin_angles": { "value": "[] if infill_pattern not in ['cross', 'cross_3d'] else [20, 110]" }, "skin_edge_support_thickness": { "value": "4 * layer_height if infill_sparse_density < 30 else 0" }, "skin_material_flow": { "value": "0.95 * material_flow" }, - "skin_material_flow_layer_0": { "value": "0.85 * material_flow_layer_0" }, + "skin_material_flow_layer_0": { "value": "0.9 * material_flow_layer_0" }, "skin_monotonic": { "value": "roofing_layer_count == 0" }, "speed_equalize_flow_width_factor": { "value": "110.0" }, "speed_layer_0": { "value": "min(30, layer_height / layer_height_0 * speed_wall_0)" }, diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json index b28ce07770..f68d51dd6c 100644 --- a/resources/definitions/ultimaker2.def.json +++ b/resources/definitions/ultimaker2.def.json @@ -2,102 +2,105 @@ "version": 2, "name": "Ultimaker 2", "inherits": "ultimaker", - "metadata": { + "metadata": + { "visible": true, "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "weight": 3, "file_formats": "text/x-gcode", "platform": "ultimaker2_platform.obj", - "platform_texture": "Ultimaker2backplate.png", - "platform_offset": [9, 0, 0], - "has_materials": false, - "has_machine_quality": true, - "preferred_variant_name": "0.4 mm", - "machine_extruder_trains": - { - "0": "ultimaker2_extruder_0" - }, + "exclude_materials": [ + "generic_hips", + "generic_petg", + "structur3d_dap100silicone", + "ultimaker_petg_red", + "ultimaker_petg_blue", + "ultimaker_petg_grey", + "ultimaker_petg_black", + "ultimaker_petg_green", + "ultimaker_petg_white", + "ultimaker_petg_orange", + "ultimaker_petg_silver", + "ultimaker_petg_yellow", + "ultimaker_petg_transparent", + "ultimaker_petg_red_translucent", + "ultimaker_petg_blue_translucent", + "ultimaker_petg_green_translucent", + "ultimaker_petg_yellow_fluorescent" + ], "firmware_file": "MarlinUltimaker2.hex", - "exclude_materials": [ "generic_hips", "generic_petg", "structur3d_dap100silicone", "ultimaker_petg_red", "ultimaker_petg_blue", "ultimaker_petg_grey", "ultimaker_petg_black", "ultimaker_petg_green", "ultimaker_petg_white", "ultimaker_petg_orange", "ultimaker_petg_silver", "ultimaker_petg_yellow", "ultimaker_petg_transparent", "ultimaker_petg_red_translucent", "ultimaker_petg_blue_translucent", "ultimaker_petg_green_translucent", "ultimaker_petg_yellow_fluorescent"] + "has_machine_quality": true, + "has_materials": false, + "machine_extruder_trains": { "0": "ultimaker2_extruder_0" }, + "platform_offset": [ + 9, + 0, + 0 + ], + "platform_texture": "Ultimaker2backplate.png", + "preferred_variant_name": "0.4 mm", + "weight": 3 }, - "overrides": { - "machine_name": { "default_value": "Ultimaker 2" }, - "machine_start_gcode" : { - "value": "\"G0 F3000 Y50 ;avoid prime blob\" if machine_gcode_flavor == \"UltiGCode\" else \"G21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nG28 Z0 ;move Z to bottom endstops\\nG28 X0 Y0 ;move X/Y to endstops\\nG1 X15 Y0 F4000 ;move X/Y to front of printer\\nG1 Z15.0 F9000 ;move the platform to 15mm\\nG92 E0 ;zero the extruded length\\nG1 F200 E10 ;extrude 10 mm of feed stock\\nG92 E0 ;zero the extruded length again\\nG1 Y50 F9000\\n;Put printing message on LCD screen\\nM117 Printing...\"" - }, - "machine_end_gcode" : { - "value": "\";Version _2.6 of the firmware can abort the print too early if the file ends\\n;too soon. However if the file hasn't ended yet because there are comments at\\n;the end of the file, it won't abort yet. Therefore we have to put at least 512\\n;bytes at the end of the g-code so that the file is not yet finished by the\\n;time that the motion planner gets flushed. With firmware version _3.3 this\\n;should be fixed, so this comment wouldn't be necessary any more. Now we have\\n;to pad this text to make precisely 512 bytes.\" if machine_gcode_flavor == \"UltiGCode\" else \"M104 S0 ;extruder heater off\\nM140 S0 ;heated bed heater off (if you have it)\\nG91 ;relative positioning\\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\\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\\n;Version _2.6 of the firmware can abort the print too early if the file ends\\n;too soon. However if the file hasn't ended yet because there are comments at\\n;the end of the file, it won't abort yet. Therefore we have to put at least 512\\n;bytes at the end of the g-code so that the file is not yet finished by the\\n;time that the motion planner gets flushed. With firmware version _3.3 this\\n;should be fixed, so this comment wouldn't be necessary any more. Now we have\\n;to pad this text to make precisely 512 bytes.\"" - }, - "machine_width": { - "default_value": 223 - }, - "machine_depth": { - "default_value": 223 - }, - "machine_height": { - "default_value": 205 - }, - "machine_heated_bed": { - "default_value": true + "overrides": + { + "cool_fan_speed_0": { "value": 0 }, + "gantry_height": { "value": "48" }, + "layer_height_0": { "value": 0.3 }, + "machine_acceleration": { "default_value": 3000 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 223 }, + "machine_disallowed_areas": + { + "default_value": [ + [ + [-115, 112.5], + [-82, 112.5], + [-84, 102.5], + [-115, 102.5] + ], + [ + [115, 112.5], + [115, 102.5], + [110, 102.5], + [108, 112.5] + ], + [ + [-115, -112.5], + [-115, -104.5], + [-84, -104.5], + [-82, -112.5] + ], + [ + [115, -112.5], + [108, -112.5], + [110, -104.5], + [115, -104.5] + ] + ] }, + "machine_end_gcode": { "value": "\";Version _2.6 of the firmware can abort the print too early if the file ends\\n;too soon. However if the file hasn't ended yet because there are comments at\\n;the end of the file, it won't abort yet. Therefore we have to put at least 512\\n;bytes at the end of the g-code so that the file is not yet finished by the\\n;time that the motion planner gets flushed. With firmware version _3.3 this\\n;should be fixed, so this comment wouldn't be necessary any more. Now we have\\n;to pad this text to make precisely 512 bytes.\" if machine_gcode_flavor == \"UltiGCode\" else \"M104 S0 ;extruder heater off\\nM140 S0 ;heated bed heater off (if you have it)\\nG91 ;relative positioning\\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\\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\\n;Version _2.6 of the firmware can abort the print too early if the file ends\\n;too soon. However if the file hasn't ended yet because there are comments at\\n;the end of the file, it won't abort yet. Therefore we have to put at least 512\\n;bytes at the end of the g-code so that the file is not yet finished by the\\n;time that the motion planner gets flushed. With firmware version _3.3 this\\n;should be fixed, so this comment wouldn't be necessary any more. Now we have\\n;to pad this text to make precisely 512 bytes.\"" }, + "machine_gcode_flavor": { "default_value": "UltiGCode" }, "machine_head_with_fans_polygon": { "default_value": [ - [ -42, 12 ], - [ -42, -32 ], - [ 62, 12 ], - [ 62, -32 ] + [-42, 12], + [-42, -32], + [62, 12], + [62, -32] ] }, - "machine_center_is_zero": { - "default_value": false - }, - "gantry_height": { - "value": "48" - }, - "machine_use_extruder_offset_to_offset_coords": { - "default_value": true - }, - "machine_gcode_flavor": { - "default_value": "UltiGCode" - }, - "machine_disallowed_areas": { - "default_value": [ - [[-115, 112.5], [ -82, 112.5], [ -84, 102.5], [-115, 102.5]], - [[ 115, 112.5], [ 115, 102.5], [ 110, 102.5], [ 108, 112.5]], - [[-115, -112.5], [-115, -104.5], [ -84, -104.5], [ -82, -112.5]], - [[ 115, -112.5], [ 108, -112.5], [ 110, -104.5], [ 115, -104.5]] - ]}, - "machine_nozzle_tip_outer_diameter": { - "default_value": 1 - }, - "machine_nozzle_head_distance": { - "default_value": 3 - }, - "machine_max_feedrate_x": { - "default_value": 300 - }, - "machine_max_feedrate_y": { - "default_value": 300 - }, - "machine_max_feedrate_z": { - "default_value": 40 - }, - "machine_acceleration": { - "default_value": 3000 - }, - "support_z_distance": { - "value": "0.1" - }, - "cool_fan_speed_0": { - "value": 0 - }, - "layer_height_0": { - "value": 0.3 - }, - "speed_slowdown_layers": { - "value": 2 - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 205 }, + "machine_max_feedrate_x": { "default_value": 300 }, + "machine_max_feedrate_y": { "default_value": 300 }, + "machine_max_feedrate_z": { "default_value": 40 }, + "machine_name": { "default_value": "Ultimaker 2" }, + "machine_nozzle_head_distance": { "default_value": 3 }, + "machine_nozzle_tip_outer_diameter": { "default_value": 1 }, + "machine_start_gcode": { "value": "\"G0 F3000 Y50 ;avoid prime blob\" if machine_gcode_flavor == \"UltiGCode\" else \"G21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nG28 Z0 ;move Z to bottom endstops\\nG28 X0 Y0 ;move X/Y to endstops\\nG1 X15 Y0 F4000 ;move X/Y to front of printer\\nG1 Z15.0 F9000 ;move the platform to 15mm\\nG92 E0 ;zero the extruded length\\nG1 F200 E10 ;extrude 10 mm of feed stock\\nG92 E0 ;zero the extruded length again\\nG1 Y50 F9000\\n;Put printing message on LCD screen\\nM117 Printing...\"" }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, + "machine_width": { "default_value": 223 }, + "speed_slowdown_layers": { "value": 2 }, + "support_z_distance": { "value": "0.1" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker2_extended.def.json b/resources/definitions/ultimaker2_extended.def.json index 572634c602..92adfae7e4 100644 --- a/resources/definitions/ultimaker2_extended.def.json +++ b/resources/definitions/ultimaker2_extended.def.json @@ -2,25 +2,21 @@ "version": 2, "name": "Ultimaker 2 Extended", "inherits": "ultimaker2", - "metadata": { + "metadata": + { "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "quality_definition": "ultimaker2", - "weight": 3, "file_formats": "text/x-gcode", "platform": "ultimaker2_platform.obj", + "firmware_file": "MarlinUltimaker2extended.hex", + "machine_extruder_trains": { "0": "ultimaker2_extended_extruder_0" }, "platform_texture": "Ultimaker2Extendedbackplate.png", - "machine_extruder_trains": - { - "0": "ultimaker2_extended_extruder_0" - }, - "firmware_file": "MarlinUltimaker2extended.hex" + "quality_definition": "ultimaker2", + "weight": 3 }, - - "overrides": { - "machine_name": { "default_value": "Ultimaker 2 Extended" }, - "machine_height": { - "default_value": 305 - } + "overrides": + { + "machine_height": { "default_value": 305 }, + "machine_name": { "default_value": "Ultimaker 2 Extended" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker2_extended_olsson.def.json b/resources/definitions/ultimaker2_extended_olsson.def.json index d2eb7f9a5d..f2afc8c6d0 100644 --- a/resources/definitions/ultimaker2_extended_olsson.def.json +++ b/resources/definitions/ultimaker2_extended_olsson.def.json @@ -2,11 +2,9 @@ "version": 2, "name": "Ultimaker 2 Extended with Olsson", "inherits": "ultimaker2_extended", - "metadata": { - "has_variants": true - }, - - "overrides": { + "metadata": { "has_variants": true }, + "overrides": + { "machine_name": { "default_value": "Ultimaker 2 Extended with Olsson" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker2_extended_plus.def.json b/resources/definitions/ultimaker2_extended_plus.def.json index 0242115057..23f8a15f40 100644 --- a/resources/definitions/ultimaker2_extended_plus.def.json +++ b/resources/definitions/ultimaker2_extended_plus.def.json @@ -2,25 +2,21 @@ "version": 2, "name": "Ultimaker 2 Extended+", "inherits": "ultimaker2_plus", - "metadata": { + "metadata": + { "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "quality_definition": "ultimaker2_plus", - "weight": 2, "file_formats": "text/x-gcode", "platform": "ultimaker2_platform.obj", + "firmware_file": "MarlinUltimaker2extended-plus.hex", + "machine_extruder_trains": { "0": "ultimaker2_extended_plus_extruder_0" }, "platform_texture": "Ultimaker2ExtendedPlusbackplate.png", - "machine_extruder_trains": - { - "0": "ultimaker2_extended_plus_extruder_0" - }, - "firmware_file": "MarlinUltimaker2extended-plus.hex" + "quality_definition": "ultimaker2_plus", + "weight": 2 }, - - "overrides": { - "machine_name": { "default_value": "Ultimaker 2 Extended+" }, - "machine_height": { - "default_value": 305 - } + "overrides": + { + "machine_height": { "default_value": 305 }, + "machine_name": { "default_value": "Ultimaker 2 Extended+" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker2_go.def.json b/resources/definitions/ultimaker2_go.def.json index 774d215bef..e7ba8d1358 100644 --- a/resources/definitions/ultimaker2_go.def.json +++ b/resources/definitions/ultimaker2_go.def.json @@ -1,44 +1,59 @@ { - "version": 2, + "version": 2, "name": "Ultimaker 2 Go", "inherits": "ultimaker2", - "metadata": { + "metadata": + { "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "quality_definition": "ultimaker2", - "weight": 3, "file_formats": "text/x-gcode", "platform": "ultimaker2go_platform.obj", + "firmware_file": "MarlinUltimaker2go.hex", + "machine_extruder_trains": { "0": "ultimaker2_go_extruder_0" }, + "platform_offset": [ + 0, + 0, + 0 + ], "platform_texture": "Ultimaker2Gobackplate.png", - "platform_offset": [0, 0, 0], - "machine_extruder_trains": - { - "0": "ultimaker2_go_extruder_0" - }, - "firmware_file": "MarlinUltimaker2go.hex" + "quality_definition": "ultimaker2", + "weight": 3 }, - - "overrides": { - "machine_name": { "default_value": "Ultimaker 2 Go" }, - "machine_width": { - "default_value": 120 - }, - "machine_depth": { - "default_value": 120 - }, - "machine_height": { - "default_value": 115 - }, - "machine_heated_bed": { - "default_value": false - }, - "machine_disallowed_areas": { + "overrides": + { + "machine_depth": { "default_value": 120 }, + "machine_disallowed_areas": + { "default_value": [ - [[-60, 60], [-33, 60], [-35, 52], [-60, 52]], - [[ 60, 60], [ 60, 52], [ 35, 52], [ 33, 60]], - [[-60, -60], [-60, -52], [-35, -52], [-33, -60]], - [[ 60, -60], [ 33, -60], [ 35, -52], [ 60, -52]] + [ + [-60, 60], + [-33, 60], + [-35, 52], + [-60, 52] + ], + [ + [60, 60], + [60, 52], + [35, 52], + [33, 60] + ], + [ + [-60, -60], + [-60, -52], + [-35, -52], + [-33, -60] + ], + [ + [60, -60], + [33, -60], + [35, -52], + [60, -52] + ] ] - } + }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 115 }, + "machine_name": { "default_value": "Ultimaker 2 Go" }, + "machine_width": { "default_value": 120 } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker2_olsson.def.json b/resources/definitions/ultimaker2_olsson.def.json index 2f8b877942..74c562988f 100644 --- a/resources/definitions/ultimaker2_olsson.def.json +++ b/resources/definitions/ultimaker2_olsson.def.json @@ -2,12 +2,13 @@ "version": 2, "name": "Ultimaker 2 with Olsson Block", "inherits": "ultimaker2", - "metadata": { + "metadata": + { "has_variants": true, "quality_definition": "ultimaker2" }, - - "overrides": { + "overrides": + { "machine_name": { "default_value": "Ultimaker 2 with Olsson Block" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker2_plus.def.json b/resources/definitions/ultimaker2_plus.def.json index 0d4191383d..18b377813a 100644 --- a/resources/definitions/ultimaker2_plus.def.json +++ b/resources/definitions/ultimaker2_plus.def.json @@ -2,72 +2,104 @@ "version": 2, "name": "Ultimaker 2+", "inherits": "ultimaker2", - "metadata": { + "metadata": + { "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "weight": 1, "file_formats": "text/x-gcode", "platform": "ultimaker2_platform.obj", + "exclude_materials": [ + "generic_hips", + "generic_petg", + "generic_bam", + "ultimaker_bam", + "generic_pva", + "ultimaker_pva", + "generic_tough_pla", + "ultimaker_tough_pla_black", + "ultimaker_tough_pla_green", + "ultimaker_tough_pla_red", + "ultimaker_tough_pla_white", + "generic_cffcpe", + "generic_cffpa", + "generic_gffcpe", + "generic_gffpa", + "structur3d_dap100silicone", + "ultimaker_petg_red", + "ultimaker_petg_blue", + "ultimaker_petg_grey", + "ultimaker_petg_black", + "ultimaker_petg_green", + "ultimaker_petg_white", + "ultimaker_petg_orange", + "ultimaker_petg_silver", + "ultimaker_petg_yellow", + "ultimaker_petg_transparent", + "ultimaker_petg_red_translucent", + "ultimaker_petg_blue_translucent", + "ultimaker_petg_green_translucent", + "ultimaker_petg_yellow_fluorescent" + ], + "firmware_file": "MarlinUltimaker2plus.hex", + "first_start_actions": [], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { "0": "ultimaker2_plus_extruder_0" }, "platform_texture": "Ultimaker2Plusbackplate.png", "preferred_variant_name": "0.4 mm", - "has_variants": true, - "has_materials": true, - "has_machine_quality": true, - "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone", "ultimaker_petg_red", "ultimaker_petg_blue", "ultimaker_petg_grey", "ultimaker_petg_black", "ultimaker_petg_green", "ultimaker_petg_white", "ultimaker_petg_orange", "ultimaker_petg_silver", "ultimaker_petg_yellow", "ultimaker_petg_transparent", "ultimaker_petg_red_translucent", "ultimaker_petg_blue_translucent", "ultimaker_petg_green_translucent", "ultimaker_petg_yellow_fluorescent"], - "first_start_actions": [], "supported_actions": [], - "machine_extruder_trains": - { - "0": "ultimaker2_plus_extruder_0" - }, - "firmware_file": "MarlinUltimaker2plus.hex" + "weight": 1 }, - - "overrides": { - "machine_name": { "default_value": "Ultimaker 2+" }, - "speed_infill": { - "value": "speed_print" - }, - "speed_wall_x": { - "value": "speed_wall" - }, - "layer_height_0": { - "value": "round(machine_nozzle_size / 1.5, 2)" - }, - "speed_support": { - "value": "speed_wall_0" - }, - "machine_height": { - "default_value": 205 - }, - "machine_show_variants": { - "default_value": true - }, - "gantry_height": { - "value": "52" - }, - "machine_nozzle_head_distance": { - "default_value": 5 - }, - "machine_heat_zone_length": { - "default_value": 20 + "overrides": + { + "gantry_height": { "value": "52" }, + "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, + "machine_disallowed_areas": + { + "default_value": [ + [ + [-115, 112.5], + [-78, 112.5], + [-80, 102.5], + [-115, 102.5] + ], + [ + [115, 112.5], + [115, 102.5], + [105, 102.5], + [103, 112.5] + ], + [ + [-115, -112.5], + [-115, -104.5], + [-84, -104.5], + [-82, -112.5] + ], + [ + [115, -112.5], + [108, -112.5], + [110, -104.5], + [115, -104.5] + ] + ] }, "machine_head_with_fans_polygon": { "default_value": [ - [ -44, 14 ], - [ -44, -34 ], - [ 64, 14 ], - [ 64, -34 ] + [-44, 14], + [-44, -34], + [64, 14], + [64, -34] ] }, - "machine_disallowed_areas": { - "default_value": [ - [[-115, 112.5], [ -78, 112.5], [ -80, 102.5], [-115, 102.5]], - [[ 115, 112.5], [ 115, 102.5], [ 105, 102.5], [ 103, 112.5]], - [[-115, -112.5], [-115, -104.5], [ -84, -104.5], [ -82, -112.5]], - [[ 115, -112.5], [ 108, -112.5], [ 110, -104.5], [ 115, -104.5]] - ] - } + "machine_heat_zone_length": { "default_value": 20 }, + "machine_height": { "default_value": 205 }, + "machine_name": { "default_value": "Ultimaker 2+" }, + "machine_nozzle_head_distance": { "default_value": 5 }, + "machine_show_variants": { "default_value": true }, + "speed_infill": { "value": "speed_print" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_wall_x": { "value": "speed_wall" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker2_plus_connect.def.json b/resources/definitions/ultimaker2_plus_connect.def.json index 5674b4f030..ac3c84546d 100644 --- a/resources/definitions/ultimaker2_plus_connect.def.json +++ b/resources/definitions/ultimaker2_plus_connect.def.json @@ -2,87 +2,131 @@ "version": 2, "name": "Ultimaker 2+ Connect", "inherits": "ultimaker2", - "metadata": { + "metadata": + { "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "weight": 1, "file_formats": "application/x-ufp;text/x-gcode", "platform": "ultimaker2_plus_connect_platform.obj", - "platform_texture": "Ultimaker2PlusConnectbackplate.png", - "platform_offset": [-1, -6, 0], - "preferred_variant_name": "0.4 mm", - "has_variants": true, - "has_materials": true, + "exclude_materials": [ + "generic_hips", + "generic_petg", + "generic_bam", + "ultimaker_bam", + "generic_pva", + "ultimaker_pva", + "generic_tough_pla", + "ultimaker_tough_pla_black", + "ultimaker_tough_pla_green", + "ultimaker_tough_pla_red", + "ultimaker_tough_pla_white", + "generic_cffcpe", + "generic_cffpa", + "generic_gffcpe", + "generic_gffpa", + "structur3d_dap100silicone" + ], + "first_start_actions": [], "has_machine_materials": true, "has_machine_quality": true, - "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone" ], - "first_start_actions": [], + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { "0": "ultimaker2_plus_connect_extruder_0" }, + "platform_offset": [ + -1, + -6, + 0 + ], + "platform_texture": "Ultimaker2PlusConnectbackplate.png", + "preferred_variant_name": "0.4 mm", "supported_actions": [], - "machine_extruder_trains": - { - "0": "ultimaker2_plus_connect_extruder_0" - }, + "supports_network_connection": true, "supports_usb_connection": false, - "supports_network_connection": true + "weight": 1 }, - - "overrides": { - "machine_name": { "default_value": "Ultimaker 2+ Connect" }, - "machine_gcode_flavor": { "default_value": "Griffin" }, - "machine_width": { "default_value": 223 }, - "machine_depth": { "default_value": 220 }, - "machine_height": { "default_value": 205 }, - "machine_show_variants": { "default_value": true }, + "overrides": + { "gantry_height": { "value": "52" }, - "machine_nozzle_head_distance": { "default_value": 5 }, - "machine_heat_zone_length": { "default_value": 20 }, + "infill_overlap": { "value": "0" }, + "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'grid'" }, + "infill_wipe_dist": { "value": "0" }, + "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, + "machine_depth": { "default_value": 220 }, + "machine_disallowed_areas": + { + "default_value": [ + [ + [-115, 112.5], + [-83, 112.5], + [-85, 104.0], + [-115, 104.0] + ], + [ + [115, 112.5], + [115, 104.0], + [104, 104.0], + [102, 112.5] + ], + [ + [-115, -112.5], + [-115, -104.0], + [-87, -104.0], + [-85, -112.5] + ], + [ + [115, -112.5], + [104, -112.5], + [106, -104.0], + [115, -104.0] + ] + ] + }, + "machine_end_gcode": { "value": "''" }, + "machine_gcode_flavor": { "default_value": "Griffin" }, "machine_head_with_fans_polygon": { "default_value": [ - [ -44, 14 ], - [ -44, -34 ], - [ 64, 14 ], - [ 64, -34 ] + [-44, 14], + [-44, -34], + [64, 14], + [64, -34] ] }, - "machine_disallowed_areas": - { - "default_value": [ - [[-115, 112.5], [ -83, 112.5], [ -85, 104.0], [-115, 104.0]], - [[ 115, 112.5], [ 115, 104.0], [ 104, 104.0], [ 102, 112.5]], - [[-115, -112.5], [-115, -104.0], [ -87, -104.0], [ -85, -112.5]], - [[ 115, -112.5], [ 104, -112.5], [ 106, -104.0], [ 115, -104.0]] - ] - }, - "infill_wipe_dist": { "value": "0" }, - "infill_overlap": { "value": "0" }, - "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'grid'" }, - "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" }, - "speed_support": { "value": "speed_wall_0" }, - "material_initial_print_temperature": { - "value": "material_print_temperature", - "maximum_value": 260 - }, - "material_final_print_temperature": { - "value": "material_print_temperature", - "maximum_value": 260 - }, - "material_print_temperature_layer_0": { - "maximum_value": 260 - }, + "machine_heat_zone_length": { "default_value": 20 }, + "machine_height": { "default_value": 205 }, + "machine_name": { "default_value": "Ultimaker 2+ Connect" }, + "machine_nozzle_head_distance": { "default_value": 5 }, + "machine_show_variants": { "default_value": true }, "machine_start_gcode": { "value": "''" }, - "machine_end_gcode": { "value": "''" }, + "machine_width": { "default_value": 223 }, "material_bed_temperature": { "maximum_value": 110 }, "material_bed_temperature_layer_0": { "maximum_value": 110 }, + "material_final_print_temperature": + { + "maximum_value": 260, + "value": "material_print_temperature" + }, + "material_initial_print_temperature": + { + "maximum_value": 260, + "value": "material_print_temperature" + }, "material_print_temperature": { "maximum_value": 260 }, - "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" }, + "material_print_temperature_layer_0": { "maximum_value": 260 }, "meshfix_maximum_deviation": { "value": "(layer_height / 3) if magic_spiralize else (layer_height / 4)" }, + "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" }, "meshfix_maximum_travel_resolution": { "value": 0.5 }, - "prime_blob_enable": { "enabled": true, "default_value": true, "value": "resolveOrValue('print_sequence') != 'one_at_a_time'" }, + "optimize_wall_printing_order": { "value": "True" }, + "prime_blob_enable": + { + "default_value": true, + "enabled": true, + "value": "resolveOrValue('print_sequence') != 'one_at_a_time'" + }, "retraction_prime_speed": { "value": "15" }, - "retraction_speed": {"value": "45" }, - "speed_wall_x": { "value": "speed_wall" } + "retraction_speed": { "value": "45" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_wall_x": { "value": "speed_wall" }, + "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index eb19058a98..106f482b48 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -2,85 +2,54 @@ "version": 2, "name": "Ultimaker 3", "inherits": "ultimaker", - "metadata": { + "metadata": + { + "visible": true, "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "visible": true, "file_formats": "application/gzip;text/x-gcode", "platform": "ultimaker3_platform.obj", - "platform_texture": "Ultimaker3backplate.png", - "platform_offset": [0, 0, 0], + "bom_numbers": [ + 9066 + ], + "exclude_materials": [ + "generic_hips", + "generic_cffcpe", + "generic_cffpa", + "generic_gffcpe", + "generic_gffpa", + "structur3d_dap100silicone" + ], + "firmware_update_info": + { + "check_urls": [ "https://software.ultimaker.com/releases/firmware/9066/stable/um-update.swu.version" ], + "id": 9066, + "update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update" + }, + "first_start_actions": [ "DiscoverUM3Action" ], "has_machine_quality": true, "has_materials": true, "has_variants": true, - "exclude_materials": [ "generic_hips", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone" ], - "preferred_variant_name": "AA 0.4", - "preferred_quality_type": "normal", - "variants_name": "Print core", "machine_extruder_trains": { "0": "ultimaker3_extruder_left", "1": "ultimaker3_extruder_right" }, - "first_start_actions": [ "DiscoverUM3Action" ], + "platform_offset": [ + 0, + 0, + 0 + ], + "platform_texture": "Ultimaker3backplate.png", + "preferred_quality_type": "fast", + "preferred_variant_name": "AA 0.4", "supported_actions": [ "DiscoverUM3Action" ], - "supports_usb_connection": false, "supports_network_connection": true, - "firmware_update_info": { - "id": 9066, - "check_urls": - [ - "https://software.ultimaker.com/releases/firmware/9066/stable/um-update.swu.version" - ], - "update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update" - }, - "bom_numbers": [ - 9066 - ] + "supports_usb_connection": false, + "variants_name": "Print core" }, - - - - "overrides": { - "machine_name": { "default_value": "Ultimaker 3" }, - "machine_width": { "default_value": 233 }, - "machine_depth": { "default_value": 215 }, - "machine_height": { "default_value": 200 }, - "machine_heated_bed": { "default_value": true }, - "machine_nozzle_heat_up_speed": { "default_value": 1.4 }, - "machine_nozzle_cool_down_speed": { "default_value": 0.8 }, - "machine_head_with_fans_polygon": - { - "default_value": - [ - [ -41.9, -45.8 ], - [ -41.9, 33.9 ], - [ 59.9, 33.9 ], - [ 59.9, -45.8 ] - ] - }, - "machine_gcode_flavor": { "default_value": "Griffin" }, - "machine_max_feedrate_x": { "default_value": 300 }, - "machine_max_feedrate_y": { "default_value": 300 }, - "machine_max_feedrate_z": { "default_value": 40 }, - "machine_acceleration": { "default_value": 3000 }, - "gantry_height": { "value": "60" }, - "machine_disallowed_areas": { "default_value": [ - [[92.8, -53.4], [92.8, -97.5], [116.5, -97.5], [116.5, -53.4]], - [[73.8, 107.5], [73.8, 100.5], [116.5, 100.5], [116.5, 107.5]], - [[74.6, 107.5], [74.6, 100.5], [116.5, 100.5], [116.5, 107.5]], - [[74.9, -97.5], [74.9, -107.5], [116.5, -107.5], [116.5, -97.5]], - [[-116.5, -103.5], [-116.5, -107.5], [-100.9, -107.5], [-100.9, -103.5]], - [[-116.5, 105.8], [-96.9, 105.8], [-96.9, 107.5], [-116.5, 107.5]] - ]}, - "machine_extruder_count": { "default_value": 2 }, - "extruder_prime_pos_abs": { "default_value": true }, - "machine_start_gcode": { "default_value": "" }, - "machine_end_gcode": { "default_value": "G91 ;Relative movement\nG0 F15000 X8.0 Z0.5 E-4.5 ;Wiping+material retraction\nG0 F10000 Z1.5 E4.5 ;Compensation for the retraction\nG90 ;Disable relative movement" }, - "prime_tower_position_x": { "value": "machine_depth - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) - 30" }, - "prime_tower_wipe_enabled": { "default_value": false }, - - "prime_blob_enable": { "enabled": true, "default_value": true, "value": "resolveOrValue('print_sequence') != 'one_at_a_time'" }, + "overrides": + { "acceleration_enabled": { "value": true }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 3500)" }, "acceleration_print": { "value": "3500" }, @@ -93,22 +62,97 @@ "cool_fan_speed": { "value": "50" }, "cool_fan_speed_max": { "value": "100" }, "cool_min_speed": { "value": "5" }, + "default_material_print_temperature": { "value": "200" }, + "extruder_prime_pos_abs": { "default_value": true }, + "gantry_height": { "value": "60" }, "infill_overlap": { "value": "0" }, "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, "infill_wipe_dist": { "value": "0" }, "jerk_enabled": { "value": "True" }, "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, + "machine_acceleration": { "default_value": 3000 }, + "machine_depth": { "default_value": 215 }, + "machine_disallowed_areas": + { + "default_value": [ + [ + [92.8, -53.4], + [92.8, -97.5], + [116.5, -97.5], + [116.5, -53.4] + ], + [ + [73.8, 107.5], + [73.8, 100.5], + [116.5, 100.5], + [116.5, 107.5] + ], + [ + [74.6, 107.5], + [74.6, 100.5], + [116.5, 100.5], + [116.5, 107.5] + ], + [ + [74.9, -97.5], + [74.9, -107.5], + [116.5, -107.5], + [116.5, -97.5] + ], + [ + [-116.5, -103.5], + [-116.5, -107.5], + [-100.9, -107.5], + [-100.9, -103.5] + ], + [ + [-116.5, 105.8], + [-96.9, 105.8], + [-96.9, 107.5], + [-116.5, 107.5] + ] + ] + }, + "machine_end_gcode": { "default_value": "G91 ;Relative movement\nG0 F15000 X8.0 Z0.5 E-4.5 ;Wiping+material retraction\nG0 F10000 Z1.5 E4.5 ;Compensation for the retraction\nG90 ;Disable relative movement" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "Griffin" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-41.9, -45.8], + [-41.9, 33.9], + [59.9, 33.9], + [59.9, -45.8] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 200 }, + "machine_max_feedrate_x": { "default_value": 300 }, + "machine_max_feedrate_y": { "default_value": 300 }, + "machine_max_feedrate_z": { "default_value": 40 }, "machine_min_cool_heat_time_window": { "value": "15" }, - "default_material_print_temperature": { "value": "200" }, + "machine_name": { "default_value": "Ultimaker 3" }, + "machine_nozzle_cool_down_speed": { "default_value": 0.8 }, + "machine_nozzle_heat_up_speed": { "default_value": 1.4 }, + "machine_start_gcode": { "default_value": "" }, + "machine_width": { "default_value": 233 }, "material_bed_temperature": { "maximum_value": "115" }, "material_bed_temperature_layer_0": { "maximum_value": "115" }, "multiple_mesh_overlap": { "value": "0" }, "optimize_wall_printing_order": { "value": "True" }, + "prime_blob_enable": + { + "default_value": true, + "enabled": true, + "value": "resolveOrValue('print_sequence') != 'one_at_a_time'" + }, "prime_tower_enable": { "default_value": true }, + "prime_tower_position_x": { "value": "machine_depth - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) - 30" }, + "prime_tower_wipe_enabled": { "default_value": false }, "retraction_amount": { "value": "6.5" }, "retraction_hop": { "value": "2" }, - "retraction_hop_enabled": { "value": "extruders_enabled_count > 1" }, + "retraction_hop_enabled": { "value": "extruders_enabled_count > 1" }, "retraction_hop_only_when_collides": { "value": "True" }, "retraction_min_travel": { "value": "5" }, "retraction_prime_speed": { "value": "15" }, @@ -130,4 +174,4 @@ "wall_0_inset": { "value": "0" }, "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker3_extended.def.json b/resources/definitions/ultimaker3_extended.def.json index 970d3a405d..5afbbce1da 100644 --- a/resources/definitions/ultimaker3_extended.def.json +++ b/resources/definitions/ultimaker3_extended.def.json @@ -2,42 +2,45 @@ "version": 2, "name": "Ultimaker 3 Extended", "inherits": "ultimaker3", - "metadata": { + "metadata": + { + "visible": true, "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "quality_definition": "ultimaker3", - "visible": true, "file_formats": "application/gzip;text/x-gcode", "platform": "ultimaker3_platform.obj", - "platform_texture": "Ultimaker3Extendedbackplate.png", - "platform_offset": [0, 0, 0], + "bom_numbers": [ + 9511 + ], + "firmware_update_info": + { + "check_urls": [ "https://software.ultimaker.com/releases/firmware/9066/stable/um-update.swu.version" ], + "id": 9511, + "update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update" + }, + "first_start_actions": [ "DiscoverUM3Action" ], "has_machine_quality": true, "has_materials": true, "has_variants": true, - "preferred_variant_name": "AA 0.4", - "variants_name": "Print core", "machine_extruder_trains": { "0": "ultimaker3_extended_extruder_left", "1": "ultimaker3_extended_extruder_right" }, - "first_start_actions": [ "DiscoverUM3Action" ], + "platform_offset": [ + 0, + 0, + 0 + ], + "platform_texture": "Ultimaker3Extendedbackplate.png", + "preferred_variant_name": "AA 0.4", + "quality_definition": "ultimaker3", "supported_actions": [ "DiscoverUM3Action" ], - "firmware_update_info": { - "id": 9511, - "check_urls": - [ - "https://software.ultimaker.com/releases/firmware/9066/stable/um-update.swu.version" - ], - "update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update" - }, - "bom_numbers": [ - 9511 - ] + "variants_name": "Print core" }, - - "overrides": { - "machine_name": { "default_value": "Ultimaker 3 Extended" }, - "machine_height": { "default_value": 300 } + "overrides": + { + "machine_height": { "default_value": 300 }, + "machine_name": { "default_value": "Ultimaker 3 Extended" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker_original.def.json b/resources/definitions/ultimaker_original.def.json index e9afb3977e..c34dd4aadf 100644 --- a/resources/definitions/ultimaker_original.def.json +++ b/resources/definitions/ultimaker_original.def.json @@ -2,75 +2,84 @@ "version": 2, "name": "Ultimaker Original", "inherits": "ultimaker", - "metadata": { + "metadata": + { "visible": true, "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "weight": 4, "file_formats": "text/x-gcode", "platform": "ultimaker_platform.3mf", - "has_materials": true, - "has_machine_quality": true, - "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone", "ultimaker_petg_blue", "ultimaker_petg_grey", "ultimaker_petg_black", "ultimaker_petg_green", "ultimaker_petg_white", "ultimaker_petg_orange", "ultimaker_petg_silver", "ultimaker_petg_yellow", "ultimaker_petg_transparent", "ultimaker_petg_red_translucent", "ultimaker_petg_blue_translucent", "ultimaker_petg_green_translucent", "ultimaker_petg_yellow_fluorescent", "ultimaker_petg_red" ], - "first_start_actions": ["UMOUpgradeSelection", "BedLevel"], - "supported_actions": ["UMOUpgradeSelection", "BedLevel"], - "machine_extruder_trains": - { - "0": "ultimaker_original_extruder_0" - }, + "exclude_materials": [ + "generic_hips", + "generic_petg", + "generic_bam", + "ultimaker_bam", + "generic_pva", + "ultimaker_pva", + "generic_tough_pla", + "ultimaker_tough_pla_black", + "ultimaker_tough_pla_green", + "ultimaker_tough_pla_red", + "ultimaker_tough_pla_white", + "generic_cffcpe", + "generic_cffpa", + "generic_gffcpe", + "generic_gffpa", + "structur3d_dap100silicone", + "ultimaker_petg_blue", + "ultimaker_petg_grey", + "ultimaker_petg_black", + "ultimaker_petg_green", + "ultimaker_petg_white", + "ultimaker_petg_orange", + "ultimaker_petg_silver", + "ultimaker_petg_yellow", + "ultimaker_petg_transparent", + "ultimaker_petg_red_translucent", + "ultimaker_petg_blue_translucent", + "ultimaker_petg_green_translucent", + "ultimaker_petg_yellow_fluorescent", + "ultimaker_petg_red" + ], "firmware_file": "MarlinUltimaker-{baudrate}.hex", - "firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}.hex" + "firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}.hex", + "first_start_actions": [ + "UMOUpgradeSelection", + "BedLevel" + ], + "has_machine_quality": true, + "has_materials": true, + "machine_extruder_trains": { "0": "ultimaker_original_extruder_0" }, + "supported_actions": [ + "UMOUpgradeSelection", + "BedLevel" + ], + "weight": 4 }, - - "overrides": { - "machine_name": { "default_value": "Ultimaker Original" }, - "machine_width": { - "default_value": 205 - }, - "machine_height": { - "default_value": 200 - }, - "machine_depth": { - "default_value": 205 - }, - "machine_center_is_zero": { - "default_value": false - }, + "overrides": + { + "cool_fan_speed_0": { "value": 0 }, + "gantry_height": { "value": "55" }, + "infill_before_walls": { "value": "False" }, + "layer_height_0": { "value": 0.3 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 205 }, + "machine_end_gcode": { "value": "'M104 S0 ;extruder heater off' + ('\\nM140 S0 ;heated bed heater off' if machine_heated_bed else '') + '\\nG91 ;relative positioning\\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\\nM84 ;steppers off\\nG90 ;absolute positioning'" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_head_with_fans_polygon": { "default_value": [ - [ -75, 35 ], - [ -75, -18 ], - [ 18, 35 ], - [ 18, -18 ] + [-75, 35], + [-75, -18], + [18, 35], + [18, -18] ] }, - "gantry_height": { - "value": "55" - }, - "machine_use_extruder_offset_to_offset_coords": { - "default_value": true - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Y50 F9000\n;Put printing message on LCD screen\nM117 Printing..." - }, - "machine_end_gcode": { - "value": "'M104 S0 ;extruder heater off' + ('\\nM140 S0 ;heated bed heater off' if machine_heated_bed else '') + '\\nG91 ;relative positioning\\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\\nM84 ;steppers off\\nG90 ;absolute positioning'" - }, - "infill_before_walls": { - "value": "False" - }, - "cool_fan_speed_0": { - "value": 0 - }, - "layer_height_0": { - "value": 0.3 - }, - "speed_slowdown_layers": { - "value": 2 - } + "machine_height": { "default_value": 200 }, + "machine_name": { "default_value": "Ultimaker Original" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Y50 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, + "machine_width": { "default_value": 205 }, + "speed_slowdown_layers": { "value": 2 } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker_original_dual.def.json b/resources/definitions/ultimaker_original_dual.def.json index bda8a0ce12..59bc4fb8bb 100644 --- a/resources/definitions/ultimaker_original_dual.def.json +++ b/resources/definitions/ultimaker_original_dual.def.json @@ -2,74 +2,88 @@ "version": 2, "name": "Ultimaker Original Dual Extrusion", "inherits": "ultimaker", - "metadata": { + "metadata": + { "visible": true, "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "weight": 4, "file_formats": "text/x-gcode", "platform": "ultimaker_platform.3mf", - "has_materials": true, + "exclude_materials": [ + "generic_hips", + "generic_petg", + "generic_bam", + "ultimaker_bam", + "generic_pva", + "ultimaker_pva", + "generic_tough_pla", + "ultimaker_tough_pla_black", + "ultimaker_tough_pla_green", + "ultimaker_tough_pla_red", + "ultimaker_tough_pla_white", + "generic_cffcpe", + "generic_cffpa", + "generic_gffcpe", + "generic_gffpa", + "structur3d_dap100silicone", + "ultimaker_petg_blue", + "ultimaker_petg_grey", + "ultimaker_petg_black", + "ultimaker_petg_green", + "ultimaker_petg_white", + "ultimaker_petg_orange", + "ultimaker_petg_silver", + "ultimaker_petg_yellow", + "ultimaker_petg_transparent", + "ultimaker_petg_red_translucent", + "ultimaker_petg_blue_translucent", + "ultimaker_petg_green_translucent", + "ultimaker_petg_yellow_fluorescent", + "ultimaker_petg_red" + ], + "firmware_file": "MarlinUltimaker-{baudrate}-dual.hex", + "firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}-dual.hex", + "first_start_actions": [ + "UMOUpgradeSelection", + "BedLevel" + ], "has_machine_quality": true, - "quality_definition": "ultimaker_original", - "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone", "ultimaker_petg_blue", "ultimaker_petg_grey", "ultimaker_petg_black", "ultimaker_petg_green", "ultimaker_petg_white", "ultimaker_petg_orange", "ultimaker_petg_silver", "ultimaker_petg_yellow", "ultimaker_petg_transparent", "ultimaker_petg_red_translucent", "ultimaker_petg_blue_translucent", "ultimaker_petg_green_translucent", "ultimaker_petg_yellow_fluorescent", "ultimaker_petg_red" ], + "has_materials": true, "machine_extruder_trains": { "0": "ultimaker_original_dual_1st", "1": "ultimaker_original_dual_2nd" }, - "firmware_file": "MarlinUltimaker-{baudrate}-dual.hex", - "firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}-dual.hex", - "first_start_actions": ["UMOUpgradeSelection", "BedLevel"], - "supported_actions": ["UMOUpgradeSelection", "BedLevel"] + "quality_definition": "ultimaker_original", + "supported_actions": [ + "UMOUpgradeSelection", + "BedLevel" + ], + "weight": 4 }, - - "overrides": { - "machine_name": { "default_value": "Ultimaker Original" }, - "machine_width": { - "default_value": 205 - }, - "machine_height": { - "default_value": 200 - }, - "machine_depth": { - "default_value": 195 - }, - "machine_center_is_zero": { - "default_value": false - }, + "overrides": + { + "gantry_height": { "value": "55" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 195 }, + "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_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_head_with_fans_polygon": { "default_value": [ - [ -75, 35 ], - [ -75, -18 ], - [ 18, 35 ], - [ 18, -18 ] + [-75, 35], + [-75, -18], + [18, 35], + [18, -18] ] }, - "gantry_height": { - "value": "55" - }, - "machine_use_extruder_offset_to_offset_coords": { - "default_value": true - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nT1 ;Switch to the 2nd extruder\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F200 E-{switch_extruder_retraction_amount}\nT0 ;Switch to the 1st extruder\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." - }, - "machine_end_gcode": { - "default_value": "M104 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_extruder_count": { - "default_value": 2 - }, - "prime_tower_position_x": { - "value": "195" - }, - "prime_tower_position_y": { - "value": "149" - } + "machine_height": { "default_value": 200 }, + "machine_name": { "default_value": "Ultimaker Original" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nT1 ;Switch to the 2nd extruder\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F200 E-{switch_extruder_retraction_amount}\nT0 ;Switch to the 1st extruder\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, + "machine_width": { "default_value": 205 }, + "prime_tower_position_x": { "value": "195" }, + "prime_tower_position_y": { "value": "149" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker_original_plus.def.json b/resources/definitions/ultimaker_original_plus.def.json index 949e2e8d0d..26924a8ba6 100644 --- a/resources/definitions/ultimaker_original_plus.def.json +++ b/resources/definitions/ultimaker_original_plus.def.json @@ -2,31 +2,25 @@ "version": 2, "name": "Ultimaker Original+", "inherits": "ultimaker_original", - "metadata": { + "metadata": + { "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "weight": 4, "file_formats": "text/x-gcode", "platform": "ultimaker2_platform.obj", + "firmware_file": "MarlinUltimaker-UMOP-{baudrate}.hex", + "firmware_hbk_file": "MarlinUltimaker-UMOP-{baudrate}.hex", + "first_start_actions": [ "BedLevel" ], + "machine_extruder_trains": { "0": "ultimaker_original_plus_extruder_0" }, "platform_texture": "UltimakerPlusbackplate.png", "quality_definition": "ultimaker_original", - "first_start_actions": ["BedLevel"], - "supported_actions": ["BedLevel"], - "machine_extruder_trains": - { - "0": "ultimaker_original_plus_extruder_0" - }, - "firmware_file": "MarlinUltimaker-UMOP-{baudrate}.hex", - "firmware_hbk_file": "MarlinUltimaker-UMOP-{baudrate}.hex" + "supported_actions": [ "BedLevel" ], + "weight": 4 }, - - "overrides": { - "machine_name": { "default_value": "Ultimaker Original+" }, - "machine_heated_bed": { - "default_value": true - }, - "machine_max_feedrate_z": { - "default_value": 30 - } + "overrides": + { + "machine_heated_bed": { "default_value": true }, + "machine_max_feedrate_z": { "default_value": 30 }, + "machine_name": { "default_value": "Ultimaker Original+" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index ce94981307..3505c9b0a9 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -2,78 +2,53 @@ "version": 2, "name": "Ultimaker S3", "inherits": "ultimaker", - "metadata": { + "metadata": + { + "visible": true, "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "visible": true, "file_formats": "application/x-ufp;text/x-gcode", "platform": "ultimaker_s3_platform.obj", - "platform_texture": "UltimakerS3backplate.png", - "platform_offset": [0, 0, 0], + "bom_numbers": [213482, 213483], + "exclude_materials": [ + "generic_hips", + "generic_petg", + "structur3d_dap100silicone" + ], + "firmware_update_info": + { + "check_urls": [ "https://software.ultimaker.com/releases/firmware/213482/stable/um-update.swu.version" ], + "id": 213482, + "update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update" + }, + "first_start_actions": [ "DiscoverUM3Action" ], "has_machine_quality": true, "has_materials": true, "has_variant_buildplates": false, "has_variants": true, - "exclude_materials": [ "generic_hips", "generic_petg", "structur3d_dap100silicone" ], - "preferred_variant_name": "AA 0.4", - "preferred_quality_type": "normal", - "variants_name": "Print core", - "nozzle_offsetting_for_disallowed_areas": false, "machine_extruder_trains": { "0": "ultimaker_s3_extruder_left", "1": "ultimaker_s3_extruder_right" }, - "first_start_actions": [ "DiscoverUM3Action" ], + "nozzle_offsetting_for_disallowed_areas": false, + "platform_offset": [ + 0, + 0, + 0 + ], + "platform_texture": "UltimakerS3backplate.png", + "preferred_quality_type": "fast", + "preferred_variant_name": "AA 0.4", "supported_actions": [ "DiscoverUM3Action" ], - "supports_usb_connection": false, "supports_material_export": true, - "weight": -1, - "firmware_update_info": { - "id": 213482, - "check_urls": ["https://software.ultimaker.com/releases/firmware/213482/stable/um-update.swu.version"], - "update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update" - }, - "bom_numbers": [ - 213482, 213483 - ] + "supports_usb_connection": false, + "variants_name": "Print core", + "weight": -1 }, - - "overrides": { - "machine_name": { "default_value": "Ultimaker S3" }, - "machine_width": { "default_value": 230 }, - "machine_depth": { "default_value": 190 }, - "machine_height": { "default_value": 200 }, - "machine_heated_bed": { "default_value": true }, - "machine_nozzle_heat_up_speed": { "default_value": 1.4 }, - "machine_nozzle_cool_down_speed": { "default_value": 0.8 }, - "machine_head_with_fans_polygon": - { - "default_value": - [ - [ -41.4, -45.8 ], - [ -41.4, 36.0 ], - [ 63.3, 36.0 ], - [ 63.3, -45.8 ] - ] - }, - "machine_gcode_flavor": { "default_value": "Griffin" }, - "machine_max_feedrate_x": { "default_value": 300 }, - "machine_max_feedrate_y": { "default_value": 300 }, - "machine_max_feedrate_z": { "default_value": 40 }, - "machine_acceleration": { "default_value": 3000 }, - "gantry_height": { "value": "55" }, - "machine_extruder_count": { "default_value": 2 }, - "extruder_prime_pos_abs": { "default_value": true }, - "machine_start_gcode": { "default_value": "" }, - "machine_end_gcode": { "default_value": "" }, - "prime_blob_enable": { "enabled": true, "default_value": false }, + "overrides": + { "acceleration_enabled": { "value": true }, - "speed_travel": - { - "maximum_value": "150", - "value": "150" - }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 3500)" }, "acceleration_print": { "value": "3500" }, "acceleration_support": { "value": "math.ceil(acceleration_print * 2000 / 3500)" }, @@ -85,30 +60,66 @@ "cool_fan_speed": { "value": "50" }, "cool_fan_speed_max": { "value": "100" }, "cool_min_speed": { "value": "5" }, + "default_material_print_temperature": { "value": "200" }, + "extruder_prime_pos_abs": { "default_value": true }, + "gantry_height": { "value": "55" }, "infill_overlap": { "value": "0" }, "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, "infill_wipe_dist": { "value": "0" }, "jerk_enabled": { "value": "True" }, "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, + "machine_acceleration": { "default_value": 3000 }, + "machine_depth": { "default_value": 190 }, + "machine_end_gcode": { "default_value": "" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "Griffin" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-41.4, -45.8], + [-41.4, 36.0], + [63.3, 36.0], + [63.3, -45.8] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 200 }, + "machine_max_feedrate_x": { "default_value": 300 }, + "machine_max_feedrate_y": { "default_value": 300 }, + "machine_max_feedrate_z": { "default_value": 40 }, "machine_min_cool_heat_time_window": { "value": "15" }, - "default_material_print_temperature": { "value": "200" }, + "machine_name": { "default_value": "Ultimaker S3" }, + "machine_nozzle_cool_down_speed": { "default_value": 0.8 }, + "machine_nozzle_heat_up_speed": { "default_value": 1.4 }, + "machine_start_gcode": { "default_value": "" }, + "machine_width": { "default_value": 230 }, "multiple_mesh_overlap": { "value": "0" }, "optimize_wall_printing_order": { "value": "True" }, + "prime_blob_enable": + { + "default_value": false, + "enabled": true + }, "prime_tower_enable": { "value": "True" }, "retraction_amount": { "value": "6.5" }, "retraction_hop": { "value": "2" }, - "retraction_hop_enabled": { "value": "extruders_enabled_count > 1" }, + "retraction_hop_enabled": { "value": "extruders_enabled_count > 1" }, "retraction_hop_only_when_collides": { "value": "True" }, "retraction_min_travel": { "value": "5" }, "retraction_prime_speed": { "value": "15" }, - "retraction_speed": {"value": "45" }, + "retraction_speed": { "value": "45" }, "skin_overlap": { "value": "10" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_print": { "value": "35" }, "speed_support": { "value": "speed_wall_0" }, "speed_support_interface": { "value": "speed_topbottom" }, "speed_topbottom": { "value": "math.ceil(speed_print * 20 / 35)" }, + "speed_travel": + { + "maximum_value": "150", + "value": "150" + }, "speed_wall": { "value": "math.ceil(speed_print * 30 / 35)" }, "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 30)" }, "speed_wall_x": { "value": "speed_wall" }, @@ -120,4 +131,4 @@ "wall_0_inset": { "value": "0" }, "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index a77148c2c4..2796d5351a 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -2,80 +2,53 @@ "version": 2, "name": "Ultimaker S5", "inherits": "ultimaker", - "metadata": { + "metadata": + { + "visible": true, "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "visible": true, "file_formats": "application/x-ufp;text/x-gcode", "platform": "ultimaker_s5_platform.obj", - "platform_texture": "UltimakerS5backplate.png", - "platform_offset": [0, -30, -10], + "bom_numbers": [ + 9051, + 214475, + 214476 + ], + "firmware_update_info": + { + "check_urls": [ "https://software.ultimaker.com/releases/firmware/9051/stable/um-update.swu.version" ], + "id": 9051, + "update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update" + }, + "first_start_actions": [ "DiscoverUM3Action" ], "has_machine_quality": true, "has_materials": true, "has_variant_buildplates": true, "has_variants": true, - "preferred_variant_name": "AA 0.4", - "preferred_variant_buildplate_name": "Glass", - "preferred_quality_type": "normal", - "variants_name": "Print core", - "nozzle_offsetting_for_disallowed_areas": false, "machine_extruder_trains": { "0": "ultimaker_s5_extruder_left", "1": "ultimaker_s5_extruder_right" }, - "first_start_actions": [ "DiscoverUM3Action" ], + "nozzle_offsetting_for_disallowed_areas": false, + "platform_offset": [ + 0, + -30, + -10 + ], + "platform_texture": "UltimakerS5backplate.png", + "preferred_quality_type": "fast", + "preferred_variant_buildplate_name": "Glass", + "preferred_variant_name": "AA 0.4", "supported_actions": [ "DiscoverUM3Action" ], - "supports_usb_connection": false, - "supports_network_connection": true, "supports_material_export": true, - "weight": -2, - "firmware_update_info": { - "id": 9051, - "check_urls": ["https://software.ultimaker.com/releases/firmware/9051/stable/um-update.swu.version"], - "update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update" - }, - "bom_numbers": [ - 9051, 214475, 214476 - ] + "supports_network_connection": true, + "supports_usb_connection": false, + "variants_name": "Print core", + "weight": -2 }, - - "overrides": { - "machine_name": { "default_value": "Ultimaker S5" }, - "machine_width": { "default_value": 330 }, - "machine_depth": { "default_value": 240 }, - "machine_height": { "default_value": 300 }, - "machine_heated_bed": { "default_value": true }, - "machine_heated_build_volume": { "default_value": true }, - "machine_nozzle_heat_up_speed": { "default_value": 1.4 }, - "machine_nozzle_cool_down_speed": { "default_value": 0.8 }, - "machine_head_with_fans_polygon": - { - "default_value": - [ - [ -41.4, -45.8 ], - [ -41.4, 36.0 ], - [ 63.3, 36.0 ], - [ 63.3, -45.8 ] - ] - }, - "machine_gcode_flavor": { "default_value": "Griffin" }, - "machine_max_feedrate_x": { "default_value": 300 }, - "machine_max_feedrate_y": { "default_value": 300 }, - "machine_max_feedrate_z": { "default_value": 40 }, - "machine_acceleration": { "default_value": 3000 }, - "gantry_height": { "value": "55" }, - "machine_extruder_count": { "default_value": 2 }, - "extruder_prime_pos_abs": { "default_value": true }, - "machine_start_gcode": { "default_value": "" }, - "machine_end_gcode": { "default_value": "" }, - "prime_blob_enable": { "enabled": true, "default_value": false }, - - "speed_travel": - { - "maximum_value": "150", - "value": "150" - }, + "overrides": + { "acceleration_enabled": { "value": true }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 3500)" }, "acceleration_print": { "value": "3500" }, @@ -85,33 +58,72 @@ "acceleration_wall": { "value": "math.ceil(acceleration_print * 1500 / 3500)" }, "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 1000)" }, "brim_width": { "value": "3" }, + "build_volume_temperature": { "maximum_value": 50 }, "cool_fan_speed": { "value": "50" }, "cool_fan_speed_max": { "value": "100" }, "cool_min_speed": { "value": "5" }, + "default_material_print_temperature": { "value": "200" }, + "extruder_prime_pos_abs": { "default_value": true }, + "gantry_height": { "value": "55" }, "infill_overlap": { "value": "0" }, "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, "infill_wipe_dist": { "value": "0" }, "jerk_enabled": { "value": "True" }, "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, + "machine_acceleration": { "default_value": 3000 }, + "machine_depth": { "default_value": 240 }, + "machine_end_gcode": { "default_value": "" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "Griffin" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-41.4, -45.8], + [-41.4, 36.0], + [63.3, 36.0], + [63.3, -45.8] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_heated_build_volume": { "default_value": true }, + "machine_height": { "default_value": 300 }, + "machine_max_feedrate_x": { "default_value": 300 }, + "machine_max_feedrate_y": { "default_value": 300 }, + "machine_max_feedrate_z": { "default_value": 40 }, "machine_min_cool_heat_time_window": { "value": "15" }, - "default_material_print_temperature": { "value": "200" }, + "machine_name": { "default_value": "Ultimaker S5" }, + "machine_nozzle_cool_down_speed": { "default_value": 0.8 }, + "machine_nozzle_heat_up_speed": { "default_value": 1.4 }, + "machine_start_gcode": { "default_value": "" }, + "machine_width": { "default_value": 330 }, "multiple_mesh_overlap": { "value": "0" }, + "optimize_wall_printing_order": { "value": "True" }, + "prime_blob_enable": + { + "default_value": false, + "enabled": true + }, "prime_tower_enable": { "value": "True" }, "retraction_amount": { "value": "6.5" }, - "retraction_combing": { "value": "'no_outer_surfaces'"}, + "retraction_combing": { "value": "'no_outer_surfaces'" }, "retraction_hop": { "value": "2" }, - "retraction_hop_enabled": { "value": "extruders_enabled_count > 1" }, + "retraction_hop_enabled": { "value": "extruders_enabled_count > 1" }, "retraction_hop_only_when_collides": { "value": "True" }, "retraction_min_travel": { "value": "5" }, "retraction_prime_speed": { "value": "15" }, - "retraction_speed": {"value": "45" }, + "retraction_speed": { "value": "45" }, "skin_overlap": { "value": "10" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_print": { "value": "35" }, "speed_support": { "value": "speed_wall_0" }, "speed_support_interface": { "value": "speed_topbottom" }, "speed_topbottom": { "value": "math.ceil(speed_print * 20 / 35)" }, + "speed_travel": + { + "maximum_value": "150", + "value": "150" + }, "speed_wall": { "value": "math.ceil(speed_print * 30 / 35)" }, "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 30)" }, "speed_wall_x": { "value": "speed_wall" }, @@ -121,8 +133,6 @@ "top_bottom_thickness": { "value": "1" }, "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, "wall_0_inset": { "value": "0" }, - "optimize_wall_printing_order": { "value": "True" }, - "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" }, - "build_volume_temperature": { "maximum_value": 50 } + "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" } } -} +} \ No newline at end of file diff --git a/resources/definitions/uni_200.def.json b/resources/definitions/uni_200.def.json index f425a3d89f..9b1d498408 100644 --- a/resources/definitions/uni_200.def.json +++ b/resources/definitions/uni_200.def.json @@ -1,18 +1,20 @@ { - "name": "Uni 200", - "version": 2, - "inherits": "uni_base", - "metadata": { - "author": "Nail` Gimadeev (C)", - "visible": true, - "quality_definition": "uni_base", - "platform": "uni_200_platform.stl", - "platform_texture": "uni.png" - }, - "overrides": { - "machine_name": {"default_value": "uni_200"}, - "machine_width": {"default_value": 220}, - "machine_depth": {"default_value": 220}, - "machine_height": {"default_value": 250} - } -} + "version": 2, + "name": "Uni 200", + "inherits": "uni_base", + "metadata": + { + "visible": true, + "author": "Nail` Gimadeev (C)", + "platform": "uni_200_platform.stl", + "platform_texture": "uni.png", + "quality_definition": "uni_base" + }, + "overrides": + { + "machine_depth": { "default_value": 220 }, + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "uni_200" }, + "machine_width": { "default_value": 220 } + } +} \ No newline at end of file diff --git a/resources/definitions/uni_250.def.json b/resources/definitions/uni_250.def.json index c6a5642439..a6300a32e2 100644 --- a/resources/definitions/uni_250.def.json +++ b/resources/definitions/uni_250.def.json @@ -1,18 +1,20 @@ { - "name": "Uni 250", - "version": 2, - "inherits": "uni_base", - "metadata": { - "author": "Nail` Gimadeev (C)", - "visible": true, - "quality_definition": "uni_base", - "platform": "uni_250_platform.stl", - "platform_texture": "uni.png" - }, - "overrides": { - "machine_name": {"default_value": "uni_250"}, - "machine_width": {"default_value": 270}, - "machine_depth": {"default_value": 220}, - "machine_height": {"default_value": 250} - } -} + "version": 2, + "name": "Uni 250", + "inherits": "uni_base", + "metadata": + { + "visible": true, + "author": "Nail` Gimadeev (C)", + "platform": "uni_250_platform.stl", + "platform_texture": "uni.png", + "quality_definition": "uni_base" + }, + "overrides": + { + "machine_depth": { "default_value": 220 }, + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "uni_250" }, + "machine_width": { "default_value": 270 } + } +} \ No newline at end of file diff --git a/resources/definitions/uni_300.def.json b/resources/definitions/uni_300.def.json index 52cfc769cf..a5c8be60a6 100644 --- a/resources/definitions/uni_300.def.json +++ b/resources/definitions/uni_300.def.json @@ -1,18 +1,20 @@ { - "name": "Uni 300", - "version": 2, - "inherits": "uni_base", - "metadata": { - "author": "Nail` Gimadeev (C)", - "visible": true, - "quality_definition": "uni_base", - "platform": "uni_300_platform.stl", - "platform_texture": "uni.png" - }, - "overrides": { - "machine_name": {"default_value": "uni_300"}, - "machine_width": {"default_value": 320}, - "machine_depth": {"default_value": 220}, - "machine_height": {"default_value": 250} - } -} + "version": 2, + "name": "Uni 300", + "inherits": "uni_base", + "metadata": + { + "visible": true, + "author": "Nail` Gimadeev (C)", + "platform": "uni_300_platform.stl", + "platform_texture": "uni.png", + "quality_definition": "uni_base" + }, + "overrides": + { + "machine_depth": { "default_value": 220 }, + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "uni_300" }, + "machine_width": { "default_value": 320 } + } +} \ No newline at end of file diff --git a/resources/definitions/uni_base.def.json b/resources/definitions/uni_base.def.json index 1eadbc015f..1b3dbc104d 100644 --- a/resources/definitions/uni_base.def.json +++ b/resources/definitions/uni_base.def.json @@ -1,142 +1,148 @@ { - "name": "Uni Base Printer", "version": 2, + "name": "Uni Base Printer", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": false, "author": "Nail` Gimadeev (C)", "manufacturer": "Uni 3D", "file_formats": "text/x-gcode", - "first_start_actions": ["MachineSettingsAction"], - "machine_extruder_trains": { + "exclude_materials": [ + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "emotiontech_abs", + "emotiontech_asax", + "emotiontech_hips", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pva-m", + "emotiontech_pva-oks", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "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", + "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", + "zyyx_pro_flex", + "zyyx_pro_pla" + ], + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": + { "0": "uni_extruder_1st", "1": "uni_extruder_2nd" }, - "has_materials": true, "preferred_material": "generic_abs_175", - "has_variants": true, - "variants_name": "Nozzle Size", - "preferred_variant_name": "0.40mm Nozzle", - "has_machine_quality": true, "preferred_quality_type": "q020", - "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_asax", - "emotiontech_hips", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pva-m", - "emotiontech_pva-oks", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "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", - "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", - "zyyx_pro_flex", - "zyyx_pro_pla"] + "preferred_variant_name": "0.40mm Nozzle", + "variants_name": "Nozzle Size" }, - "overrides": { - "machine_name": {"default_value": "UNI Base Printer"}, - "machine_start_gcode": {"default_value": ";Sliced at: {day} {date} {time}\nG21\nG90\nM82\nM220 S100\nM221 S100\nG28\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0}\nG1 F600 Z15\nG92 E0\nG1 F300 E10\nM117 Printing...\n;\n"}, - "machine_end_gcode": {"default_value": "G91\nG1 E-1 F600\nG1 Z+1 E-3 X-20 Y-20 F4800\nM104 S0\nM106 S0\nM140 S0\nM220 S100\nM221 S100\nG28\nG90\nM84\n;\n"}, - "machine_heated_bed": {"default_value": true}, - "material_diameter": {"default_value": 1.75}, - "machine_shape": {"default_value": "rectangular"}, - "machine_width": {"default_value": 270}, - "machine_depth": {"default_value": 220}, - "machine_height": {"default_value": 250}, - "machine_extruder_count": {"value": 2}, - "machine_buildplate_type": {"value": "glass"}, - "machine_center_is_zero": {"default_value": false}, - "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"}, - "machine_head_with_fans_polygon": {"default_value": [ - [-10,10], - [-10,-10], - [10,-10], - [10,10] - ] - }, - "gantry_height": {"value": 55}, - "layer_height_0": {"value": "layer_height"}, - "line_width": {"value": "machine_nozzle_size"}, - "skin_line_width": {"value": "round(line_width * 1.0, 2)"}, - "infill_line_width": {"value": "round(line_width * 1.1, 2)"}, - "skirt_brim_line_width": {"value": "round(line_width * 1.1, 2)"}, - "initial_layer_line_width_factor": {"value": "100"}, - "bottom_thickness": {"value": "layer_height*3 if layer_height > 0.15 else 0.8"}, - "top_bottom_pattern": {"value": "'zigzag'"}, - "top_bottom_pattern_0": {"value": "'zigzag'"}, - "optimize_wall_printing_order": {"value": "True" }, - "z_seam_type": {"value": "'shortest'"}, - "skin_outline_count": {"value": "0"}, - "infill_pattern": {"value": "'gyroid'"}, - "zig_zaggify_infill": {"value": "True"}, - "infill_before_walls": {"value": "False"}, - "infill_enable_travel_optimization": {"value": "True"}, - "expand_skins_expand_distance": {"value": "3"}, - "retraction_min_travel": {"value": "3"}, - "retraction_amount": {"value": "4"}, - "speed_print": {"value": "80"}, - "speed_topbottom": {"value": "50"}, - "speed_layer_0": {"value": "25"}, - "speed_travel_layer_0": {"value": "40"}, - "retraction_combing": {"value": "'all'"}, - "retraction_combing_max_distance": {"value": "10"}, - "travel_avoid_other_parts": {"value": "False"}, - "cool_min_layer_time_fan_speed_max": {"value": "20"}, - "cool_fan_full_at_height": {"value": "layer_height*2"}, - "cool_min_layer_time": {"value": "5"}, - "cool_min_speed": {"value": "15"}, - "cool_lift_head": {"value": "True"}, - "support_enable": {"value": "True"}, - "support_angle": {"value": "65"}, - "support_brim_enable": {"value": "True"}, - "support_infill_rate": {"value": "20"}, - "support_offset": {"value": "2"}, - "adhesion_type": {"value": "'brim'"}, - "brim_width": {"value": "5"}, - "bridge_settings_enabled": {"value": "True"} + "overrides": + { + "adhesion_type": { "value": "'brim'" }, + "bottom_thickness": { "value": "layer_height*3 if layer_height > 0.15 else 0.8" }, + "bridge_settings_enabled": { "value": "True" }, + "brim_width": { "value": "5" }, + "cool_fan_full_at_height": { "value": "layer_height*2" }, + "cool_lift_head": { "value": "True" }, + "cool_min_layer_time": { "value": "5" }, + "cool_min_layer_time_fan_speed_max": { "value": "20" }, + "cool_min_speed": { "value": "15" }, + "expand_skins_expand_distance": { "value": "3" }, + "gantry_height": { "value": 55 }, + "infill_before_walls": { "value": "False" }, + "infill_enable_travel_optimization": { "value": "True" }, + "infill_line_width": { "value": "round(line_width * 1.1, 2)" }, + "infill_pattern": { "value": "'gyroid'" }, + "initial_layer_line_width_factor": { "value": "100" }, + "layer_height_0": { "value": "layer_height" }, + "line_width": { "value": "machine_nozzle_size" }, + "machine_buildplate_type": { "value": "glass" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 220 }, + "machine_end_gcode": { "default_value": "G91\nG1 E-1 F600\nG1 Z+1 E-3 X-20 Y-20 F4800\nM104 S0\nM106 S0\nM140 S0\nM220 S100\nM221 S100\nG28\nG90\nM84\n;\n" }, + "machine_extruder_count": { "value": 2 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-10, 10], + [-10, -10], + [10, -10], + [10, 10] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "UNI Base Printer" }, + "machine_shape": { "default_value": "rectangular" }, + "machine_start_gcode": { "default_value": ";Sliced at: {day} {date} {time}\nG21\nG90\nM82\nM220 S100\nM221 S100\nG28\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0}\nG1 F600 Z15\nG92 E0\nG1 F300 E10\nM117 Printing...\n;\n" }, + "machine_width": { "default_value": 270 }, + "material_diameter": { "default_value": 1.75 }, + "optimize_wall_printing_order": { "value": "True" }, + "retraction_amount": { "value": "4" }, + "retraction_combing": { "value": "'all'" }, + "retraction_combing_max_distance": { "value": "10" }, + "retraction_min_travel": { "value": "3" }, + "skin_line_width": { "value": "round(line_width * 1.0, 2)" }, + "skin_outline_count": { "value": "0" }, + "skirt_brim_line_width": { "value": "round(line_width * 1.1, 2)" }, + "speed_layer_0": { "value": "25" }, + "speed_print": { "value": "80" }, + "speed_topbottom": { "value": "50" }, + "speed_travel_layer_0": { "value": "40" }, + "support_angle": { "value": "65" }, + "support_brim_enable": { "value": "True" }, + "support_enable": { "value": "True" }, + "support_infill_rate": { "value": "20" }, + "support_offset": { "value": "2" }, + "top_bottom_pattern": { "value": "'zigzag'" }, + "top_bottom_pattern_0": { "value": "'zigzag'" }, + "travel_avoid_other_parts": { "value": "False" }, + "z_seam_type": { "value": "'shortest'" }, + "zig_zaggify_infill": { "value": "True" } } -} +} \ No newline at end of file diff --git a/resources/definitions/uni_mini.def.json b/resources/definitions/uni_mini.def.json index 4da67907f9..5c08db9fb3 100644 --- a/resources/definitions/uni_mini.def.json +++ b/resources/definitions/uni_mini.def.json @@ -1,18 +1,20 @@ { - "name": "Uni Mini", - "version": 2, - "inherits": "uni_base", - "metadata": { - "author": "Nail` Gimadeev (C)", - "visible": true, - "quality_definition": "uni_base", - "platform": "uni_mini_platform.stl", - "platform_texture": "uni.png" - }, - "overrides": { - "machine_name": {"default_value": "uni_mini"}, - "machine_width": {"default_value": 160}, - "machine_depth": {"default_value": 160}, - "machine_height": {"default_value": 175} - } -} + "version": 2, + "name": "Uni Mini", + "inherits": "uni_base", + "metadata": + { + "visible": true, + "author": "Nail` Gimadeev (C)", + "platform": "uni_mini_platform.stl", + "platform_texture": "uni.png", + "quality_definition": "uni_base" + }, + "overrides": + { + "machine_depth": { "default_value": 160 }, + "machine_height": { "default_value": 175 }, + "machine_name": { "default_value": "uni_mini" }, + "machine_width": { "default_value": 160 } + } +} \ No newline at end of file diff --git a/resources/definitions/uni_print_3d.def.json b/resources/definitions/uni_print_3d.def.json index 7d71d73540..050ec1589e 100644 --- a/resources/definitions/uni_print_3d.def.json +++ b/resources/definitions/uni_print_3d.def.json @@ -1,36 +1,33 @@ { - "name": "Uni-Print-3D", "version": 2, + "name": "Uni-Print-3D", "inherits": "fdmprinter", "metadata": { "visible": true, - "author": "Alexander Rössler", + "author": "Alexander R\u00f6ssler", "manufacturer": "TheCoolTool", "file_formats": "text/x-ngc;text/x-gcode", "platform": "uni_print_3d_platform.3mf", - "platform_offset": [0, 0, 0], - "machine_extruder_trains": { - "0": "uni_print_3d_extruder_0" - } + "machine_extruder_trains": { "0": "uni_print_3d_extruder_0" }, + "platform_offset": [ + 0, + 0, + 0 + ] }, - - "overrides": { - "machine_name": { "default_value": "UNI-PRINT-3D" }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 186 }, - "machine_height": { "default_value": 230 }, - "machine_depth": { "default_value": 220 }, + "overrides": + { "machine_center_is_zero": { "default_value": true }, - "machine_nozzle_heat_up_speed": { "default_value": 2.0 }, - "machine_nozzle_cool_down_speed": { "default_value": 2.0 }, + "machine_depth": { "default_value": 220 }, + "machine_end_gcode": { "default_value": "M104 P0 ; turn off hotend\nG0 X-80 Y100; move the extruder out of the way\nM420 R0.0 E0.1 D0.0 P0.6 ; signalize end of print\nM140 P0 ; turn off heatbed\nM65 P16 ; turn off external fan\nM65 P15 ; turn off power" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - - "machine_start_gcode": { - "default_value": "M53; enable feed-hold\nG0 Z2.0; always start from the same height to compensate backlash\nG28; move extruder to 0\nM420 R0.0 E0.0 D0.0 P0.1 ; turn the lights on\nM107; turn off fan\nG64 P0.05 Q0.05; path blending settings\nG23; unretract" - }, - "machine_end_gcode": { - "default_value": "M104 P0 ; turn off hotend\nG0 X-80 Y100; move the extruder out of the way\nM420 R0.0 E0.1 D0.0 P0.6 ; signalize end of print\nM140 P0 ; turn off heatbed\nM65 P16 ; turn off external fan\nM65 P15 ; turn off power" - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 230 }, + "machine_name": { "default_value": "UNI-PRINT-3D" }, + "machine_nozzle_cool_down_speed": { "default_value": 2.0 }, + "machine_nozzle_heat_up_speed": { "default_value": 2.0 }, + "machine_start_gcode": { "default_value": "M53; enable feed-hold\nG0 Z2.0; always start from the same height to compensate backlash\nG28; move extruder to 0\nM420 R0.0 E0.0 D0.0 P0.1 ; turn the lights on\nM107; turn off fan\nG64 P0.05 Q0.05; path blending settings\nG23; unretract" }, + "machine_width": { "default_value": 186 } } -} +} \ No newline at end of file diff --git a/resources/definitions/uniqbot_one.def.json b/resources/definitions/uniqbot_one.def.json index ec8336ae50..43231ee037 100644 --- a/resources/definitions/uniqbot_one.def.json +++ b/resources/definitions/uniqbot_one.def.json @@ -2,44 +2,24 @@ "version": 2, "name": "Uniqbot", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "author": "Unimatech", "manufacturer": "Unimatech", "file_formats": "text/x-gcode", - "machine_extruder_trains": - { - "0": "uniqbot_one_extruder_0" - } + "machine_extruder_trains": { "0": "uniqbot_one_extruder_0" } }, - - "overrides": { + "overrides": + { + "gantry_height": { "value": "55" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 160 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+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_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 120 }, "machine_name": { "default_value": "Uniqbot" }, - "machine_heated_bed": { - "default_value": false - }, - "machine_width": { - "default_value": 140 - }, - "machine_height": { - "default_value": 120 - }, - "machine_depth": { - "default_value": 160 - }, - "machine_center_is_zero": { - "default_value": false - }, - "gantry_height": { - "value": "55" - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+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_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, + "machine_width": { "default_value": 140 } } -} +} \ No newline at end of file diff --git a/resources/definitions/vertex_delta_k8800.def.json b/resources/definitions/vertex_delta_k8800.def.json index 71646d76ee..d667f4ca1c 100644 --- a/resources/definitions/vertex_delta_k8800.def.json +++ b/resources/definitions/vertex_delta_k8800.def.json @@ -1,139 +1,58 @@ { - "name": "Vertex Delta K8800", - "version": 2, - "inherits": "fdmprinter", - "metadata": { - "manufacturer": "Velleman N.V.", - "file_formats": "text/x-gcode", - "visible": true, - "author": "Velleman N.V.", - "has_machine_quality": true, - "has_materials": true, - "machine_extruder_trains": + "version": 2, + "name": "Vertex Delta K8800", + "inherits": "fdmprinter", + "metadata": { - "0": "vertex_delta_k8800_extruder_0" + "visible": true, + "author": "Velleman N.V.", + "manufacturer": "Velleman N.V.", + "file_formats": "text/x-gcode", + "has_machine_quality": true, + "has_materials": true, + "machine_extruder_trains": { "0": "vertex_delta_k8800_extruder_0" } + }, + "overrides": + { + "brim_width": { "value": 6 }, + "cool_fan_full_at_height": { "value": 2 }, + "cool_fan_full_layer": { "value": 11 }, + "cool_min_layer_time": { "value": 8 }, + "gantry_height": { "value": "0" }, + "infill_line_width": { "value": 0.35 }, + "infill_overlap": { "value": 5 }, + "infill_sparse_density": { "value": 40 }, + "line_width": { "value": 0.35 }, + "machine_center_is_zero": { "default_value": true }, + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "; Vertex Delta end code\nM107 ; Turn off fan\nG91 ; Relative positioning\nT0\nG1 E-1 F1500; Reduce filament pressure\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM300 S4000 P500\nM300 S3000 P500\nM300 S2000 P800\nG28\nM84 ; Turn steppers off" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_height": { "default_value": 225 }, + "machine_shape": { "default_value": "elliptic" }, + "machine_start_gcode": { "default_value": "; Vertex Delta Start Gcode\nM0 Is my nozzle clean?\nM400\nG28 ; Home extruder\nM106 S128 ; Start fan\nM104 T0 R130 ; Set cold nozzle\nM109 T0 R130 ; Wait for cold nozzle\nM117 Leveling bed...\nG29 ; Level Bed\nG1 X0 Y100 Z1 F2000\nG92 Z0.9 ; Set Z position (SET Z OFFSET HERE -> 1 - OFFSET)\nM107 ; Stop fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM104 T0 S{material_print_temperature}\nG92 E0 ; Reset extruder position\nM109 T0 S{material_print_temperature}\nM117 Priming nozzle...\nM83\nG1 E20 F100 ; purge/prime nozzle\nM82\nG92 E0 ; Reset extruder position\nG4 S3 ; Wait 3 seconds\nG1 Z5 F2000\nM117 Vertex Delta printing" }, + "machine_width": { "default_value": 200 }, + "min_infill_area": { "value": 0.1 }, + "retract_at_layer_change": { "value": true }, + "retraction_count_max": { "value": 15 }, + "retraction_extrusion_window": { "value": 1 }, + "retraction_hop": { "value": 0.1 }, + "retraction_hop_enabled": { "value": true }, + "retraction_min_travel": { "value": 1 }, + "skirt_brim_minimal_length": { "value": 50 }, + "skirt_brim_speed": { "value": 20 }, + "skirt_line_count": { "value": 2 }, + "speed_infill": { "value": 40 }, + "speed_layer_0": { "value": 20 }, + "speed_print": { "value": 35 }, + "speed_print_layer_0": { "value": 20 }, + "speed_topbottom": { "value": 35 }, + "speed_travel": { "value": 190 }, + "speed_wall": { "value": 35 }, + "speed_wall_x": { "value": 35 }, + "support_xy_distance": { "value": 1 }, + "support_z_distance": { "value": 0.4 }, + "top_bottom_thickness": { "value": 0.6 }, + "travel_retract_before_outer_wall": { "value": false }, + "wall_thickness": { "value": "0.7" } } - }, - "overrides": { - "machine_width": { - "default_value": 200 - }, - "machine_height": { - "default_value": 225 - }, - "machine_depth": { - "default_value": 200 - }, - "machine_center_is_zero": { - "default_value": true - }, - "machine_shape": { - "default_value": "elliptic" - }, - "gantry_height": { - "value": "0" - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "; Vertex Delta Start Gcode\nM0 Is my nozzle clean?\nM400\nG28 ; Home extruder\nM106 S128 ; Start fan\nM104 T0 R130 ; Set cold nozzle\nM109 T0 R130 ; Wait for cold nozzle\nM117 Leveling bed...\nG29 ; Level Bed\nG1 X0 Y100 Z1 F2000\nG92 Z0.9 ; Set Z position (SET Z OFFSET HERE -> 1 - OFFSET)\nM107 ; Stop fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM104 T0 S{material_print_temperature}\nG92 E0 ; Reset extruder position\nM109 T0 S{material_print_temperature}\nM117 Priming nozzle...\nM83\nG1 E20 F100 ; purge/prime nozzle\nM82\nG92 E0 ; Reset extruder position\nG4 S3 ; Wait 3 seconds\nG1 Z5 F2000\nM117 Vertex Delta printing" - }, - "machine_end_gcode": { - "default_value": "; Vertex Delta end code\nM107 ; Turn off fan\nG91 ; Relative positioning\nT0\nG1 E-1 F1500; Reduce filament pressure\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM300 S4000 P500\nM300 S3000 P500\nM300 S2000 P800\nG28\nM84 ; Turn steppers off" - }, - "line_width": { - "value": 0.35 - }, - "infill_line_width": { - "value": 0.35 - }, - "wall_thickness": { - "value": "0.7" - }, - "top_bottom_thickness": { - "value": 0.6 - }, - "infill_sparse_density": { - "value": 40 - }, - "infill_overlap": { - "value": 5 - }, - "min_infill_area": { - "value": 0.1 - }, - "retract_at_layer_change": { - "value": true - }, - "retraction_min_travel": { - "value": 1 - }, - "retraction_count_max": { - "value": 15 - }, - "retraction_extrusion_window": { - "value": 1 - }, - "speed_print": { - "value": 35 - }, - "speed_infill": { - "value": 40 - }, - "speed_wall": { - "value": 35 - }, - "speed_wall_x": { - "value": 35 - }, - "speed_topbottom": { - "value": 35 - }, - "speed_travel": { - "value": 190 - }, - "speed_layer_0": { - "value": 20 - }, - "speed_print_layer_0": { - "value": 20 - }, - "skirt_brim_speed": { - "value": 20 - }, - "travel_retract_before_outer_wall": { - "value": false - }, - "retraction_hop_enabled": { - "value": true - }, - "retraction_hop": { - "value": 0.1 - }, - "cool_fan_full_at_height": { - "value": 2 - }, - "cool_fan_full_layer": { - "value": 11 - }, - "cool_min_layer_time": { - "value": 8 - }, - "support_z_distance": { - "value": 0.4 - }, - "support_xy_distance": { - "value": 1 - }, - "brim_width": { - "value": 6 - }, - "skirt_line_count": { - "value": 2 - }, - "skirt_brim_minimal_length": { - "value": 50 - } - } } \ No newline at end of file diff --git a/resources/definitions/vertex_k8400.def.json b/resources/definitions/vertex_k8400.def.json index ef50499703..c23bb65fbf 100644 --- a/resources/definitions/vertex_k8400.def.json +++ b/resources/definitions/vertex_k8400.def.json @@ -2,40 +2,41 @@ "version": 2, "name": "Vertex K8400", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "manufacturer": "Velleman N.V.", "file_formats": "text/x-gcode", "platform": "Vertex_build_panel.3mf", - "platform_offset": [0, -3, 0], - "supports_usb_connection": true, - "supported_actions": ["MachineSettingsAction"], - "machine_extruder_trains": - { - "0": "vertex_k8400_extruder_0" - } + "machine_extruder_trains": { "0": "vertex_k8400_extruder_0" }, + "platform_offset": [ + 0, + -3, + 0 + ], + "supported_actions": [ "MachineSettingsAction" ], + "supports_usb_connection": true }, - "overrides": { - "machine_name": { "default_value": "Vertex K8400" }, - "machine_heated_bed": { - "default_value": true + "overrides": + { + "gantry_height": { "value": "18" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 200 }, + "machine_disallowed_areas": + { + "default_value": [ + [ + [-100, 100], + [-100, 80], + [100, 80], + [100, 100] + ] + ] }, - "machine_width": { - "default_value": 200 - }, - "machine_height": { - "default_value": 190 - }, - "machine_depth": { - "default_value": 200 - }, - "machine_disallowed_areas": { "default_value": [ - [[-100,100],[-100,80],[100,80],[100,100]] - ]}, - "machine_center_is_zero": { - "default_value": false - }, - "machine_head_with_fans_polygon": { + "machine_end_gcode": { "default_value": "G1 X0 Y0 Z130 ;Get extruder out of way\nM107 ;Turn off fan\n;Disable all extruders\nG91 ;Relative positioning\nT0\nG1 E-1 ;Reduce filament pressure\nM104 T0 S0\nG90 ;Absolute positioning\nG92 E0 ;Reset extruder position\nM140 S0 ;Disable heated bed\nM84 ;Turn steppers off" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { "default_value": [ [-60, -40], [-60, 40], @@ -43,17 +44,10 @@ [18, -40] ] }, - "gantry_height": { - "value": "18" - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "M104 T0 S{material_print_temperature_layer_0}\nG28 ;Home extruder\nG90 ;Absolute positioning\nM82 ;Extruder in absolute mode\nG1 Z1 F100\nG92 E0 ;Reset extruder position\nM109 T0 S{material_print_temperature_layer_0}\nG1 E20 F100\nG92 E0 ;Reset extruder position" - }, - "machine_end_gcode": { - "default_value": "G1 X0 Y0 Z130 ;Get extruder out of way\nM107 ;Turn off fan\n;Disable all extruders\nG91 ;Relative positioning\nT0\nG1 E-1 ;Reduce filament pressure\nM104 T0 S0\nG90 ;Absolute positioning\nG92 E0 ;Reset extruder position\nM140 S0 ;Disable heated bed\nM84 ;Turn steppers off" - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 190 }, + "machine_name": { "default_value": "Vertex K8400" }, + "machine_start_gcode": { "default_value": "M104 T0 S{material_print_temperature_layer_0}\nG28 ;Home extruder\nG90 ;Absolute positioning\nM82 ;Extruder in absolute mode\nG1 Z1 F100\nG92 E0 ;Reset extruder position\nM109 T0 S{material_print_temperature_layer_0}\nG1 E20 F100\nG92 E0 ;Reset extruder position" }, + "machine_width": { "default_value": 200 } } } \ No newline at end of file diff --git a/resources/definitions/vertex_k8400_dual.def.json b/resources/definitions/vertex_k8400_dual.def.json index e6e1062b4d..ccbf5f8d20 100644 --- a/resources/definitions/vertex_k8400_dual.def.json +++ b/resources/definitions/vertex_k8400_dual.def.json @@ -2,41 +2,44 @@ "version": 2, "name": "Vertex K8400 Dual", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "manufacturer": "Velleman N.V.", "file_formats": "text/x-gcode", "platform": "Vertex_build_panel.3mf", - "platform_offset": [0, -3, 0], - "machine_extruder_trains": { + "machine_extruder_trains": + { "0": "vertex_k8400_dual_1st", "1": "vertex_k8400_dual_2nd" - } + }, + "platform_offset": [ + 0, + -3, + 0 + ] }, - "overrides": { - "machine_name": { "default_value": "Vertex K8400 Dual" }, - "machine_heated_bed": { - "default_value": true + "overrides": + { + "gantry_height": { "value": "18" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 200 }, + "machine_disallowed_areas": + { + "default_value": [ + [ + [-111.85, 100], + [111.85, 100], + [-111.85, 80], + [111.85, 80] + ] + ] }, - "machine_width": { - "default_value": 223.7 - }, - "machine_height": { - "default_value": 190 - }, - "machine_depth": { - "default_value": 200 - }, - "machine_disallowed_areas": { "default_value": [ - [[-111.85,100],[111.85,100],[-111.85,80],[111.85,80]] - ]}, - "machine_center_is_zero": { - "default_value": false - }, - "machine_use_extruder_offset_to_offset_coords": { - "default_value": true - }, - "machine_head_with_fans_polygon": { + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\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_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { "default_value": [ [-60, -40], [-60, 40], @@ -44,20 +47,11 @@ [18, -40] ] }, - "gantry_height": { - "value": "18" - }, - "machine_extruder_count": { - "default_value": 2 - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\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_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 190 }, + "machine_name": { "default_value": "Vertex K8400 Dual" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, + "machine_width": { "default_value": 223.7 } } } \ No newline at end of file diff --git a/resources/definitions/vertex_nano_k8600.def.json b/resources/definitions/vertex_nano_k8600.def.json index 9f7b9d2cb7..8cbfdaf5fd 100644 --- a/resources/definitions/vertex_nano_k8600.def.json +++ b/resources/definitions/vertex_nano_k8600.def.json @@ -2,76 +2,36 @@ "version": 2, "name": "Vertex K8600", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "manufacturer": "Velleman N.V.", "file_formats": "text/x-gcode", - "supports_usb_connection": true, - "supported_actions": ["MachineSettingsAction"], - "machine_extruder_trains": { - "0": "vertex_nano_k8600_extruder_0" - } + "machine_extruder_trains": { "0": "vertex_nano_k8600_extruder_0" }, + "supported_actions": [ "MachineSettingsAction" ], + "supports_usb_connection": true }, - "overrides": { - "machine_name": { - "default_value": "Vertex K8600" - }, - "machine_heated_bed": { - "default_value": false - }, - "machine_width": { - "default_value": 80 - }, - "machine_height": { - "default_value": 75 - }, - "machine_depth": { - "default_value": 80 - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "; Vertex Nano Start G-code M0 is my nozzle clean M400 G28 ; Home extruder G90 ; Absolute positioning M82 ; Extruder in absolute mode M104 T0 S{material_print_temperature} G92 E0 ; Reset extruder position G1 Z1 F800 M109 T0 S{material_print_temperature} M117 Priming nozzle... M83 G1 E20 F100 ; purge/prime nozzle M82 G92 E0 ; Reset extruder position G4 S3 ; Wait 3 seconds G1 Z5 F2000 M117 Vertex Nano is printing" - }, - "machine_end_gcode": { - "default_value": "; Vertex Nano end G-Code G91 ; Relative positioning T0 G1 E-1 F1500; Reduce filament pressure M104 T0 S0 G90 ; Absolute positioning G92 E0 ; Reset extruder position G28 M84 ; Turn steppers off" - }, - "line_width": { - "value": 0.35 - }, - "infill_line_width": { - "value": 0.35 - }, - "wall_thickness": { - "value": "0.7" - }, - "top_bottom_thickness": { - "value": 0.6 - }, - "infill_sparse_density": { - "value": 40 - }, - "infill_overlap": { - "value": 5 - }, - "min_infill_area": { - "value": 0.1 - }, - "retract_at_layer_change": { - "value": true - }, - "retraction_min_travel": { - "value": 1 - }, - "retraction_count_max": { - "value": 15 - }, - "retraction_extrusion_window": { - "value": 1 - } + "overrides": + { + "infill_line_width": { "value": 0.35 }, + "infill_overlap": { "value": 5 }, + "infill_sparse_density": { "value": 40 }, + "line_width": { "value": 0.35 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 80 }, + "machine_end_gcode": { "default_value": "; Vertex Nano end G-Code G91 ; Relative positioning T0 G1 E-1 F1500; Reduce filament pressure M104 T0 S0 G90 ; Absolute positioning G92 E0 ; Reset extruder position G28 M84 ; Turn steppers off" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 75 }, + "machine_name": { "default_value": "Vertex K8600" }, + "machine_start_gcode": { "default_value": "; Vertex Nano Start G-code M0 is my nozzle clean M400 G28 ; Home extruder G90 ; Absolute positioning M82 ; Extruder in absolute mode M104 T0 S{material_print_temperature} G92 E0 ; Reset extruder position G1 Z1 F800 M109 T0 S{material_print_temperature} M117 Priming nozzle... M83 G1 E20 F100 ; purge/prime nozzle M82 G92 E0 ; Reset extruder position G4 S3 ; Wait 3 seconds G1 Z5 F2000 M117 Vertex Nano is printing" }, + "machine_width": { "default_value": 80 }, + "min_infill_area": { "value": 0.1 }, + "retract_at_layer_change": { "value": true }, + "retraction_count_max": { "value": 15 }, + "retraction_extrusion_window": { "value": 1 }, + "retraction_min_travel": { "value": 1 }, + "top_bottom_thickness": { "value": 0.6 }, + "wall_thickness": { "value": "0.7" } } -} +} \ No newline at end of file diff --git a/resources/definitions/vivedino_base.def.json b/resources/definitions/vivedino_base.def.json index 0a024c7792..54e4335a07 100644 --- a/resources/definitions/vivedino_base.def.json +++ b/resources/definitions/vivedino_base.def.json @@ -1,153 +1,119 @@ -{ - "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" } - } -} - +{ + "version": 2, + "name": "Vivedino/FormBot Base Printer", + "inherits": "fdmprinter", + "metadata": + { + "visible": false, + "author": "bitflipper11", + "manufacturer": "Vivedino, Formbot", + "file_formats": "text/x-gcode", + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { "0": "trex_base_extruder_0" }, + "preferred_material": "generic_pla", + "preferred_quality_type": "standard", + "preferred_variant_name": "0.4mm Nozzle", + "variants_name": "Nozzle Size" + }, + "overrides": + { + "acceleration_print": { "value": 500 }, + "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, + "acceleration_travel": { "value": 500 }, + "acceleration_travel_layer_0": { "value": "acceleration_travel" }, + "adaptive_layer_height_variation": { "value": 0.04 }, + "adaptive_layer_height_variation_step": { "value": 0.04 }, + "adhesion_type": { "value": "'skirt'" }, + "brim_replaces_support": { "value": false }, + "cool_fan_enabled": { "value": true }, + "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, + "cool_min_layer_time": { "value": 10 }, + "fill_outline_gaps": { "value": false }, + "infill_before_walls": { "value": false }, + "infill_overlap": { "value": 30.0 }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, + "infill_wipe_dist": { "value": 0.0 }, + "jerk_print": { "value": 8 }, + "jerk_travel": { "value": "jerk_print" }, + "jerk_travel_layer_0": { "value": "jerk_travel" }, + "line_width": { "value": "machine_nozzle_size * 0.95" }, + "machine_acceleration": { "value": 500 }, + "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_heated_bed": { "default_value": true }, + "machine_max_acceleration_e": { "value": 5000 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 100 }, + "machine_max_feedrate_e": { "value": 50 }, + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_jerk_e": { "value": 5 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.4 }, + "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" }, + "material_diameter": { "default_value": 1.75 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_flow": { "value": 100 }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "meshfix_maximum_resolution": { "value": 0.25 }, + "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" }, + "minimum_interface_area": { "value": 10 }, + "minimum_support_area": { "value": 10 }, + "optimize_wall_printing_order": { "value": true }, + "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, + "retraction_combing_max_distance": { "value": 30 }, + "retraction_count_max": { "value": 100 }, + "retraction_enable": { "value": true }, + "retraction_extrusion_window": { "value": 10 }, + "retraction_hop": { "value": 0.2 }, + "retraction_hop_enabled": { "value": false }, + "retraction_min_travel": { "value": 1.5 }, + "retraction_prime_speed": { "maximum_value": 200 }, + "retraction_retract_speed": { "maximum_value": 200 }, + "retraction_speed": { "maximum_value": 200 }, + "skin_overlap": { "value": 10.0 }, + "skirt_brim_speed": { "value": "speed_layer_0" }, + "skirt_gap": { "value": 10.0 }, + "skirt_line_count": { "value": 3 }, + "speed_layer_0": { "value": 20.0 }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_print": { "value": 50.0 }, + "speed_print_layer_0": { "value": "speed_layer_0" }, + "speed_roofing": { "value": "speed_topbottom" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_support_interface": { "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_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" }, + "speed_wall_x": { "value": "speed_wall" }, + "speed_z_hop": { "value": 5 }, + "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 4 }, + "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_enable": { "value": true }, + "support_interface_height": { "value": "layer_height * 4" }, + "support_interface_pattern": { "value": "'grid'" }, + "support_interface_skip_height": { "value": 0.2 }, + "support_pattern": { "value": "'zigzag'" }, + "support_use_towers": { "value": false }, + "support_wall_count": { "value": 1 }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, + "travel_avoid_other_parts": { "value": true }, + "travel_avoid_supports": { "value": true }, + "travel_retract_before_outer_wall": { "value": true }, + "wall_0_wipe_dist": { "value": 0.0 }, + "wall_thickness": { "value": "line_width * 2" }, + "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, + "z_seam_type": { "value": "'back'" } + } +} \ No newline at end of file diff --git a/resources/definitions/vivedino_trex2plus.def.json b/resources/definitions/vivedino_trex2plus.def.json index 51e5fafaed..0bd2a771a7 100644 --- a/resources/definitions/vivedino_trex2plus.def.json +++ b/resources/definitions/vivedino_trex2plus.def.json @@ -1,34 +1,37 @@ { - "name": "Vivedino T-REX 2+", "version": 2, + "name": "Vivedino T-REX 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": { + "metadata": + { "visible": true, - "quality_definition": "vivedino_trex2plus", "platform": "vivedino_trex.stl", - "machine_extruder_trains": { + "machine_extruder_trains": + { "0": "trex2_extruder_0", "1": "trex2_extruder_1" - } + }, + "quality_definition": "vivedino_trex2plus" + }, + "overrides": + { + "gantry_height": { "value": 30 }, + "machine_depth": { "default_value": 400 }, + "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_extruder_count": { "default_value": 2 }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-30, 34], + [-30, -32], + [30, -32], + [30, 34] + ] + }, + "machine_heat_zone_length": { "value": "10" }, + "machine_height": { "default_value": 500 }, + "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_width": { "default_value": 400 }, + "retraction_amount": { "value": "2" } } } \ No newline at end of file diff --git a/resources/definitions/vivedino_trex3.def.json b/resources/definitions/vivedino_trex3.def.json index 0195b94b54..43b84ac110 100644 --- a/resources/definitions/vivedino_trex3.def.json +++ b/resources/definitions/vivedino_trex3.def.json @@ -1,34 +1,37 @@ { - "name": "Vivedino T-REX 3", "version": 2, + "name": "Vivedino T-REX 3", "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": { + "metadata": + { "visible": true, - "quality_definition": "vivedino_trex3", "platform": "vivedino_trex.stl", - "machine_extruder_trains": { + "machine_extruder_trains": + { "0": "trex_extruder_0", "1": "trex_extruder_1" - } + }, + "quality_definition": "vivedino_trex3" + }, + "overrides": + { + "gantry_height": { "value": 30 }, + "machine_depth": { "default_value": 400 }, + "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_extruder_count": { "default_value": 2 }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-30, 34], + [-30, -32], + [30, -32], + [30, 34] + ] + }, + "machine_heat_zone_length": { "value": "10" }, + "machine_height": { "default_value": 500 }, + "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_width": { "default_value": 400 }, + "retraction_amount": { "value": "2" } } -} +} \ No newline at end of file diff --git a/resources/definitions/voron0_120.def.json b/resources/definitions/voron0_120.def.json index d0bf92f0e0..a6d29944e2 100644 --- a/resources/definitions/voron0_120.def.json +++ b/resources/definitions/voron0_120.def.json @@ -1,6 +1,6 @@ { - "name": "Voron 0", "version": 2, + "name": "Voron 0", "inherits": "voron2_base", "metadata": { @@ -10,9 +10,9 @@ }, "overrides": { - "machine_name": { "default_value": "VORON 0" }, - "machine_width": { "default_value": 120 }, - "machine_depth": { "default_value": 120 }, - "machine_height": { "default_value": 120 } + "machine_depth": { "default_value": 120 }, + "machine_height": { "default_value": 120 }, + "machine_name": { "default_value": "VORON 0" }, + "machine_width": { "default_value": 120 } } -} +} \ No newline at end of file diff --git a/resources/definitions/voron2_250.def.json b/resources/definitions/voron2_250.def.json index a479576458..a3f6ec3757 100644 --- a/resources/definitions/voron2_250.def.json +++ b/resources/definitions/voron2_250.def.json @@ -1,6 +1,6 @@ { - "name": "Voron2 250", "version": 2, + "name": "Voron2 250", "inherits": "voron2_base", "metadata": { @@ -10,9 +10,9 @@ }, "overrides": { - "machine_name": { "default_value": "VORON2 250" }, - "machine_width": { "default_value": 250 }, - "machine_depth": { "default_value": 250 }, - "machine_height": { "default_value": 250 } + "machine_depth": { "default_value": 250 }, + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "VORON2 250" }, + "machine_width": { "default_value": 250 } } -} +} \ No newline at end of file diff --git a/resources/definitions/voron2_300.def.json b/resources/definitions/voron2_300.def.json index 943b841c4d..b6bdee13be 100644 --- a/resources/definitions/voron2_300.def.json +++ b/resources/definitions/voron2_300.def.json @@ -1,6 +1,6 @@ { - "name": "Voron2 300", "version": 2, + "name": "Voron2 300", "inherits": "voron2_base", "metadata": { @@ -10,9 +10,9 @@ }, "overrides": { - "machine_name": { "default_value": "VORON2 300" }, - "machine_width": { "default_value": 300 }, - "machine_depth": { "default_value": 300 }, - "machine_height": { "default_value": 300 } + "machine_depth": { "default_value": 300 }, + "machine_height": { "default_value": 300 }, + "machine_name": { "default_value": "VORON2 300" }, + "machine_width": { "default_value": 300 } } -} +} \ No newline at end of file diff --git a/resources/definitions/voron2_350.def.json b/resources/definitions/voron2_350.def.json index 36e5e9339c..3c38b7ba0a 100644 --- a/resources/definitions/voron2_350.def.json +++ b/resources/definitions/voron2_350.def.json @@ -1,6 +1,6 @@ { - "name": "Voron2 350", "version": 2, + "name": "Voron2 350", "inherits": "voron2_base", "metadata": { @@ -10,9 +10,9 @@ }, "overrides": { - "machine_name": { "default_value": "VORON2 350" }, - "machine_width": { "default_value": 350 }, - "machine_depth": { "default_value": 350 }, - "machine_height": { "default_value": 350 } + "machine_depth": { "default_value": 350 }, + "machine_height": { "default_value": 350 }, + "machine_name": { "default_value": "VORON2 350" }, + "machine_width": { "default_value": 350 } } -} +} \ No newline at end of file diff --git a/resources/definitions/voron2_base.def.json b/resources/definitions/voron2_base.def.json index e735a6290f..1e76380b69 100644 --- a/resources/definitions/voron2_base.def.json +++ b/resources/definitions/voron2_base.def.json @@ -1,105 +1,125 @@ { - "name": "Voron2 Base", "version": 2, + "name": "Voron2 Base", "inherits": "fdmprinter", - "metadata": + "metadata": { "visible": false, "author": "Fulg, Maglin, pizzle_Dizzle", "manufacturer": "VoronDesign", "file_formats": "text/x-gcode", - "first_start_actions": ["MachineSettingsAction"], - "preferred_quality_type": "fast", + "exclude_materials": [], + "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, "has_materials": true, "has_variants": true, - "variants_name": "Toolhead", - "preferred_variant_name": "V6 0.40mm", "machine_extruder_trains": { "0": "voron2_extruder_0" }, "preferred_material": "generic_abs", - "exclude_materials": [] + "preferred_quality_type": "fast", + "preferred_variant_name": "V6 0.40mm", + "variants_name": "Toolhead" }, "overrides": { - "machine_name": { "default_value": "VORON2" }, - "machine_width": { "default_value": 250 }, - "machine_depth": { "default_value": 250 }, - "machine_height": { "default_value": 250 }, - "gantry_height": { "value": 30 }, - "machine_heated_bed": { "default_value": true }, - "machine_max_acceleration_x": { "default_value": 1500 }, - "machine_max_acceleration_y": { "default_value": 1500 }, - "machine_max_acceleration_z": { "default_value": 250 }, - "machine_acceleration": { "default_value": 1500 }, - "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": "RepRap (RepRap)" }, - "machine_start_gcode": { "default_value": "print_start" }, - "machine_end_gcode": { "default_value": "print_end" }, - "adhesion_type": { "default_value": "skirt" }, - "retraction_amount": { "default_value": 0.75 }, - "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_travel": { "value": 300, "maximum_value_warning": 501 }, - "speed_travel_layer_0": { "value": "math.ceil(speed_travel * 0.4)" }, - "speed_layer_0": { "value": "math.ceil(speed_print * 0.25)" }, - "speed_wall": { "value": "math.ceil(speed_print * 0.33)" }, - "speed_wall_0": { "value": "math.ceil(speed_print * 0.33)" }, - "speed_wall_x": { "value": "math.ceil(speed_print * 0.66)" }, - "speed_topbottom": { "value": "math.ceil(speed_print * 0.33)" }, - "speed_roofing": { "value": "math.ceil(speed_print * 0.33)" }, - "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": 2200 }, - "acceleration_wall_0": { "value": 1800 }, - "acceleration_layer_0": { "value": 1800 }, - "acceleration_travel_layer_0": { "value": 1800 }, - "acceleration_roofing": { "value": 1800 }, - "jerk_enabled": { "default_value": false }, - "jerk_wall_0": { "value": 10 }, - "jerk_roofing": { "value": 10 } + "acceleration_enabled": { "default_value": false }, + "acceleration_layer_0": { "value": 1800 }, + "acceleration_print": { "default_value": 2200 }, + "acceleration_roofing": { "value": 1800 }, + "acceleration_travel_layer_0": { "value": 1800 }, + "acceleration_wall_0": { "value": 1800 }, + "adhesion_type": { "default_value": "skirt" }, + "alternate_extra_perimeter": { "default_value": true }, + "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)" }, + "bridge_settings_enabled": { "default_value": true }, + "bridge_wall_coast": { "default_value": 10 }, + "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 }, + "cool_fan_speed_min": { "value": "cool_fan_speed" }, + "cool_min_layer_time": { "default_value": 15 }, + "cool_min_layer_time_fan_speed_max": { "default_value": 20 }, + "fill_outline_gaps": { "default_value": true }, + "gantry_height": { "value": 30 }, + "infill_before_walls": { "default_value": false }, + "infill_enable_travel_optimization": { "default_value": true }, + "jerk_enabled": { "default_value": false }, + "jerk_roofing": { "value": 10 }, + "jerk_wall_0": { "value": 10 }, + "layer_height_0": { "resolve": "max(0.2, min(extruderValues('layer_height')))" }, + "line_width": { "value": "machine_nozzle_size * 1.125" }, + "machine_acceleration": { "default_value": 1500 }, + "machine_depth": { "default_value": 250 }, + "machine_end_gcode": { "default_value": "print_end" }, + "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_gcode_flavor": { "default_value": "RepRap (RepRap)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-35, 65], + [-35, -50], + [35, -50], + [35, 65] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 250 }, + "machine_max_acceleration_x": { "default_value": 1500 }, + "machine_max_acceleration_y": { "default_value": 1500 }, + "machine_max_acceleration_z": { "default_value": 250 }, + "machine_max_feedrate_e": { "default_value": 120 }, + "machine_max_feedrate_z": { "default_value": 40 }, + "machine_max_jerk_e": { "default_value": 60 }, + "machine_max_jerk_xy": { "default_value": 20 }, + "machine_max_jerk_z": { "default_value": 1 }, + "machine_name": { "default_value": "VORON2" }, + "machine_start_gcode": { "default_value": "print_start" }, + "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_width": { "default_value": 250 }, + "meshfix_maximum_resolution": { "default_value": 0.01 }, + "min_infill_area": { "default_value": 5.0 }, + "minimum_polygon_circumference": { "default_value": 0.2 }, + "optimize_wall_printing_order": { "default_value": true }, + "retraction_amount": { "default_value": 0.75 }, + "retraction_combing": { "value": "'noskin'" }, + "retraction_combing_max_distance": { "default_value": 10 }, + "retraction_hop": { "default_value": 0.2 }, + "retraction_hop_enabled": { "default_value": true }, + "retraction_prime_speed": + { + "maximum_value_warning": 130, + "value": "math.ceil(retraction_speed * 0.4)" + }, + "retraction_retract_speed": { "maximum_value_warning": 130 }, + "retraction_speed": + { + "default_value": 30, + "maximum_value_warning": 130 + }, + "roofing_layer_count": { "value": 1 }, + "skirt_brim_minimal_length": { "default_value": 550 }, + "speed_layer_0": { "value": "math.ceil(speed_print * 0.25)" }, + "speed_roofing": { "value": "math.ceil(speed_print * 0.33)" }, + "speed_slowdown_layers": { "default_value": 4 }, + "speed_topbottom": { "value": "math.ceil(speed_print * 0.33)" }, + "speed_travel": + { + "maximum_value_warning": 501, + "value": 300 + }, + "speed_travel_layer_0": { "value": "math.ceil(speed_travel * 0.4)" }, + "speed_wall": { "value": "math.ceil(speed_print * 0.33)" }, + "speed_wall_0": { "value": "math.ceil(speed_print * 0.33)" }, + "speed_wall_x": { "value": "math.ceil(speed_print * 0.66)" }, + "travel_avoid_other_parts": { "default_value": false }, + "wall_line_width": { "value": "machine_nozzle_size" }, + "wall_overhang_angle": { "default_value": 75 }, + "wall_overhang_speed_factor": { "default_value": 50 }, + "zig_zaggify_infill": { "value": true } } -} +} \ No newline at end of file diff --git a/resources/definitions/voron2_custom.def.json b/resources/definitions/voron2_custom.def.json index 45612e0cba..21006464c0 100644 --- a/resources/definitions/voron2_custom.def.json +++ b/resources/definitions/voron2_custom.def.json @@ -1,6 +1,6 @@ { - "name": "Voron2 Custom", "version": 2, + "name": "Voron2 Custom", "inherits": "voron2_base", "metadata": { @@ -9,6 +9,6 @@ }, "overrides": { - "machine_name": { "default_value": "VORON2 Custom" } + "machine_name": { "default_value": "VORON2 Custom" } } -} +} \ No newline at end of file diff --git a/resources/definitions/vzbot_235.def.json b/resources/definitions/vzbot_235.def.json index 2752cb4241..a8312a2ab4 100644 --- a/resources/definitions/vzbot_235.def.json +++ b/resources/definitions/vzbot_235.def.json @@ -1,6 +1,6 @@ { - "name": "VzBot 235", "version": 2, + "name": "VzBot 235", "inherits": "vzbot_base", "metadata": { @@ -10,9 +10,9 @@ }, "overrides": { - "machine_name": { "default_value": "VzBot 235" }, - "machine_width": { "default_value": 235 }, - "machine_depth": { "default_value": 235 }, - "machine_height": { "default_value": 240 } + "machine_depth": { "default_value": 235 }, + "machine_height": { "default_value": 240 }, + "machine_name": { "default_value": "VzBot 235" }, + "machine_width": { "default_value": 235 } } } \ No newline at end of file diff --git a/resources/definitions/vzbot_330.def.json b/resources/definitions/vzbot_330.def.json index 74e65ea289..f85af31224 100644 --- a/resources/definitions/vzbot_330.def.json +++ b/resources/definitions/vzbot_330.def.json @@ -1,6 +1,6 @@ { - "name": "VzBot 330", "version": 2, + "name": "VzBot 330", "inherits": "vzbot_base", "metadata": { @@ -10,9 +10,9 @@ }, "overrides": { - "machine_name": { "default_value": "VzBot 330" }, - "machine_width": { "default_value": 330 }, - "machine_depth": { "default_value": 330 }, - "machine_height": { "default_value": 400 } + "machine_depth": { "default_value": 330 }, + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "VzBot 330" }, + "machine_width": { "default_value": 330 } } } \ No newline at end of file diff --git a/resources/definitions/vzbot_custom.def.json b/resources/definitions/vzbot_custom.def.json index 537b6c089c..47416529fd 100644 --- a/resources/definitions/vzbot_custom.def.json +++ b/resources/definitions/vzbot_custom.def.json @@ -1,6 +1,6 @@ { - "name": "VzBot Custom", "version": 2, + "name": "VzBot Custom", "inherits": "vzbot_base", "metadata": { @@ -9,9 +9,9 @@ }, "overrides": { - "machine_name": { "default_value": "VzBot Custom" }, - "machine_width": { "default_value": 400 }, - "machine_depth": { "default_value": 400 }, - "machine_height": { "default_value": 400 } + "machine_depth": { "default_value": 400 }, + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "VzBot Custom" }, + "machine_width": { "default_value": 400 } } } \ No newline at end of file diff --git a/resources/definitions/wanhao_d4s.def.json b/resources/definitions/wanhao_d4s.def.json index c1807923c6..e29fc4e58d 100644 --- a/resources/definitions/wanhao_d4s.def.json +++ b/resources/definitions/wanhao_d4s.def.json @@ -1,48 +1,32 @@ { - "version": 2, - "name": "Wanhao Duplicator 4S", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Ricardo Snoek", - "manufacturer": "Wanhao", - "file_formats": "text/x-gcode", - "has_materials": true, - "platform": "wanhao_225_145_platform.obj", - "platform_texture": "Wanhaobackplate.png", - "machine_extruder_trains": { - "0": "wanhao_d4s_extruder_0" + "version": 2, + "name": "Wanhao Duplicator 4S", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Ricardo Snoek", + "manufacturer": "Wanhao", + "file_formats": "text/x-gcode", + "platform": "wanhao_225_145_platform.obj", + "has_materials": true, + "machine_extruder_trains": { "0": "wanhao_d4s_extruder_0" }, + "platform_offset": [ + 0, + -28, + 5 + ], + "platform_texture": "Wanhaobackplate.png" }, - "platform_offset": [ - 0, - -28, - 5 - ] - }, - "overrides": { - "machine_name": { - "default_value": "Wanhao Duplicator 4S" - }, - "machine_width": { - "default_value": 225 - }, - "machine_height": { - "default_value": 150 - }, - "machine_depth": { - "default_value": 150 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\n G90 ;absolute positioning\n M82 ;set extruder to absolute mode\n M107 ;start with the fan off\n G28 X0 Y0 ;move X/Y to min endstops\n G28 Z0 ;move Z to min endstops\n G1 Z15.0 F{speed_travel} ;move the platform down 15mm\n G92 E0 ;zero the extruded length\n G1 F200 E6 ;extrude 6 mm of feed stock\n G92 E0 ;zero the extruded length again\n G1 F{speed_travel} \n ;Put printing message on LCD screen\n M117 Printing..." - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning" + "overrides": + { + "machine_depth": { "default_value": 150 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 150 }, + "machine_name": { "default_value": "Wanhao Duplicator 4S" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\n G90 ;absolute positioning\n M82 ;set extruder to absolute mode\n M107 ;start with the fan off\n G28 X0 Y0 ;move X/Y to min endstops\n G28 Z0 ;move Z to min endstops\n G1 Z15.0 F{speed_travel} ;move the platform down 15mm\n G92 E0 ;zero the extruded length\n G1 F200 E6 ;extrude 6 mm of feed stock\n G92 E0 ;zero the extruded length again\n G1 F{speed_travel} \n ;Put printing message on LCD screen\n M117 Printing..." }, + "machine_width": { "default_value": 225 } } - } -} +} \ No newline at end of file diff --git a/resources/definitions/wanhao_d6.def.json b/resources/definitions/wanhao_d6.def.json index eaaae54826..9f8f49a34f 100644 --- a/resources/definitions/wanhao_d6.def.json +++ b/resources/definitions/wanhao_d6.def.json @@ -1,51 +1,33 @@ { - "version": 2, - "name": "Wanhao Duplicator 6", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Ricardo Snoek", - "manufacturer": "Wanhao", - "file_formats": "text/x-gcode", - "has_materials": true, - "platform": "wanhao_200_200_platform.obj", - "platform_texture": "Wanhaobackplate.png", - "machine_extruder_trains": { - "0": "wanhao_d6_extruder_0" + "version": 2, + "name": "Wanhao Duplicator 6", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Ricardo Snoek", + "manufacturer": "Wanhao", + "file_formats": "text/x-gcode", + "platform": "wanhao_200_200_platform.obj", + "has_materials": true, + "machine_extruder_trains": { "0": "wanhao_d6_extruder_0" }, + "platform_offset": [ + 0, + -28, + 0 + ], + "platform_texture": "Wanhaobackplate.png" }, - "platform_offset": [ - 0, - -28, - 0 - ] - }, - "overrides": { - "machine_name": { - "default_value": "Wanhao Duplicator 6" - }, - "machine_width": { - "default_value": 200 - }, - "machine_height": { - "default_value": 180 - }, - "machine_depth": { - "default_value": 200 - }, - "machine_heated_bed": { - "default_value": true - }, - "gantry_height": { - "value": "55" - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\n G90 ;absolute positioning\n M82 ;set extruder to absolute mode\n M107 ;start with the fan off\n G28 X0 Y0 ;move X/Y to min endstops\n G28 Z0 ;move Z to min endstops\n G1 Z15.0 F{speed_travel} ;move the platform down 15mm\n G92 E0 ;zero the extruded length\n G1 F200 E6 ;extrude 6 mm of feed stock\n G92 E0 ;zero the extruded length again\n G1 F{speed_travel} \n ;Put printing message on LCD screen\n M117 Printing..." - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning" + "overrides": + { + "gantry_height": { "value": "55" }, + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 180 }, + "machine_name": { "default_value": "Wanhao Duplicator 6" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\n G90 ;absolute positioning\n M82 ;set extruder to absolute mode\n M107 ;start with the fan off\n G28 X0 Y0 ;move X/Y to min endstops\n G28 Z0 ;move Z to min endstops\n G1 Z15.0 F{speed_travel} ;move the platform down 15mm\n G92 E0 ;zero the extruded length\n G1 F200 E6 ;extrude 6 mm of feed stock\n G92 E0 ;zero the extruded length again\n G1 F{speed_travel} \n ;Put printing message on LCD screen\n M117 Printing..." }, + "machine_width": { "default_value": 200 } } - } -} +} \ No newline at end of file diff --git a/resources/definitions/wanhao_d6_plus.def.json b/resources/definitions/wanhao_d6_plus.def.json index b3b5ed9b0a..31d11e2a2c 100644 --- a/resources/definitions/wanhao_d6_plus.def.json +++ b/resources/definitions/wanhao_d6_plus.def.json @@ -1,48 +1,32 @@ { - "version": 2, - "name": "Wanhao Duplicator 6 Plus", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Ricardo Snoek", - "manufacturer": "Wanhao", - "file_formats": "text/x-gcode", - "has_materials": true, - "platform": "wanhao_200_200_platform.obj", - "platform_texture": "Wanhaobackplate.png", - "machine_extruder_trains": { - "0": "wanhao_d6_plus_extruder_0" + "version": 2, + "name": "Wanhao Duplicator 6 Plus", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Ricardo Snoek", + "manufacturer": "Wanhao", + "file_formats": "text/x-gcode", + "platform": "wanhao_200_200_platform.obj", + "has_materials": true, + "machine_extruder_trains": { "0": "wanhao_d6_plus_extruder_0" }, + "platform_offset": [ + 0, + -28, + 0 + ], + "platform_texture": "Wanhaobackplate.png" }, - "platform_offset": [ - 0, - -28, - 0 - ] - }, - "overrides": { - "machine_name": { - "default_value": "Wanhao Duplicator 6 Plus" - }, - "machine_width": { - "default_value": 200 - }, - "machine_height": { - "default_value": 180 - }, - "machine_depth": { - "default_value": 200 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\n G90 ;absolute positioning\n M82 ;set extruder to absolute mode\n M107 ;start with the fan off\n G28 X0 Y0 ;move X/Y to min endstops\n G28 Z0 ;move Z to min endstops\n G1 Z15.0 F{speed_travel} ;move the platform down 15mm\n G92 E0 ;zero the extruded length\n G1 F200 E6 ;extrude 6 mm of feed stock\n G92 E0 ;zero the extruded length again\n G1 F{speed_travel} \n ;Put printing message on LCD screen\n M117 Printing..." - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning" + "overrides": + { + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 180 }, + "machine_name": { "default_value": "Wanhao Duplicator 6 Plus" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\n G90 ;absolute positioning\n M82 ;set extruder to absolute mode\n M107 ;start with the fan off\n G28 X0 Y0 ;move X/Y to min endstops\n G28 Z0 ;move Z to min endstops\n G1 Z15.0 F{speed_travel} ;move the platform down 15mm\n G92 E0 ;zero the extruded length\n G1 F200 E6 ;extrude 6 mm of feed stock\n G92 E0 ;zero the extruded length again\n G1 F{speed_travel} \n ;Put printing message on LCD screen\n M117 Printing..." }, + "machine_width": { "default_value": 200 } } - } -} +} \ No newline at end of file diff --git a/resources/definitions/wanhao_d9.def.json b/resources/definitions/wanhao_d9.def.json index ac4d41fa40..45a02bbae3 100644 --- a/resources/definitions/wanhao_d9.def.json +++ b/resources/definitions/wanhao_d9.def.json @@ -1,39 +1,38 @@ -{ - "version": 2, - "name": "Wanhao Duplicator 9", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "manufacturer": "Wanhao", - "file_formats": "text/x-gcode", - "has_materials": true, - "platform": "wanhao_300_300_platform.obj", - "platform_texture": "Wanhaobackplate.png", - "machine_extruder_trains": { - "0": "wanhao_d9_extruder_0" - }, - "platform_offset": [ 0, -55, 0] - }, - - "overrides": { - "machine_name": { "default_value": "Wanhao Duplicator 9" }, - "machine_width": { "default_value": 300 }, - "machine_height": { "default_value": 400 }, - "machine_depth": { "default_value": 300 }, - "machine_heated_bed": { "default_value": true }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\n G90 ;absolute positioning\n M82 ;set extruder to absolute mode\n M107 ;start with the fan off\n G28 X0 Y0 ;move X/Y to min endstops\n G28 Z0 ;move Z to min endstops\n G1 Z15.0 F{speed_travel} ;move the platform down 15mm\n G92 E0 ;zero the extruded length\n G1 F200 E6 ;extrude 6 mm of feed stock\n G92 E0 ;zero the extruded length again\n G1 F{speed_travel} \n ;Put printing message on LCD screen\n M117 Printing..." - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning" - }, - "support_angle": { "default_value": 60 }, - "support_enable": { "default_value": true }, - "layer_height_0": { "default_value": 0.15 }, - "layer_height": { "default_value": 0.2 }, - "speed_print": { "default_value": 30 }, - "adhesion_type": { "default_value": "raft" }, - "support_z_distance": { "default_value": 0.22 } - } -} +{ + "version": 2, + "name": "Wanhao Duplicator 9", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "manufacturer": "Wanhao", + "file_formats": "text/x-gcode", + "platform": "wanhao_300_300_platform.obj", + "has_materials": true, + "machine_extruder_trains": { "0": "wanhao_d9_extruder_0" }, + "platform_offset": [ + 0, + -55, + 0 + ], + "platform_texture": "Wanhaobackplate.png" + }, + "overrides": + { + "adhesion_type": { "default_value": "raft" }, + "layer_height": { "default_value": 0.2 }, + "layer_height_0": { "default_value": 0.15 }, + "machine_depth": { "default_value": 300 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "Wanhao Duplicator 9" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\n G90 ;absolute positioning\n M82 ;set extruder to absolute mode\n M107 ;start with the fan off\n G28 X0 Y0 ;move X/Y to min endstops\n G28 Z0 ;move Z to min endstops\n G1 Z15.0 F{speed_travel} ;move the platform down 15mm\n G92 E0 ;zero the extruded length\n G1 F200 E6 ;extrude 6 mm of feed stock\n G92 E0 ;zero the extruded length again\n G1 F{speed_travel} \n ;Put printing message on LCD screen\n M117 Printing..." }, + "machine_width": { "default_value": 300 }, + "speed_print": { "default_value": 30 }, + "support_angle": { "default_value": 60 }, + "support_enable": { "default_value": true }, + "support_z_distance": { "default_value": 0.22 } + } +} \ No newline at end of file diff --git a/resources/definitions/wanhao_duplicator5S.def.json b/resources/definitions/wanhao_duplicator5S.def.json index b27a13fda8..5fc800a620 100644 --- a/resources/definitions/wanhao_duplicator5S.def.json +++ b/resources/definitions/wanhao_duplicator5S.def.json @@ -1,51 +1,33 @@ { - "version": 2, - "name": "Wanhao Duplicator 5S", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Ricardo Snoek", - "manufacturer": "Wanhao", - "file_formats": "text/x-gcode", - "has_materials": true, - "platform": "wanhao_300_200_platform.obj", - "platform_texture": "Wanhaobackplate.png", - "machine_extruder_trains": { - "0": "wanhao_duplicator5S_extruder_0" + "version": 2, + "name": "Wanhao Duplicator 5S", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Ricardo Snoek", + "manufacturer": "Wanhao", + "file_formats": "text/x-gcode", + "platform": "wanhao_300_200_platform.obj", + "has_materials": true, + "machine_extruder_trains": { "0": "wanhao_duplicator5S_extruder_0" }, + "platform_offset": [ + 0, + -28, + 0 + ], + "platform_texture": "Wanhaobackplate.png" }, - "platform_offset": [ - 0, - -28, - 0 - ] - }, - "overrides": { - "machine_name": { - "default_value": "Wanhao Duplicator 5S" - }, - "machine_width": { - "default_value": 300 - }, - "machine_height": { - "default_value": 600 - }, - "machine_depth": { - "default_value": 200 - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_heated_bed": { - "default_value": false - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\n G90 ;absolute positioning\n M82 ;set extruder to absolute mode\n M107 ;start with the fan off\n G28 X0 Y0 ;move X/Y to min endstops\n G28 Z0 ;move Z to min endstops\n G1 Z15.0 F{speed_travel} ;move the platform down 15mm\n G92 E0 ;zero the extruded length\n G1 F200 E6 ;extrude 6 mm of feed stock\n G92 E0 ;zero the extruded length again\n G1 F{speed_travel} \n ;Put printing message on LCD screen\n M117 Printing..." - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning" + "overrides": + { + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 600 }, + "machine_name": { "default_value": "Wanhao Duplicator 5S" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\n G90 ;absolute positioning\n M82 ;set extruder to absolute mode\n M107 ;start with the fan off\n G28 X0 Y0 ;move X/Y to min endstops\n G28 Z0 ;move Z to min endstops\n G1 Z15.0 F{speed_travel} ;move the platform down 15mm\n G92 E0 ;zero the extruded length\n G1 F200 E6 ;extrude 6 mm of feed stock\n G92 E0 ;zero the extruded length again\n G1 F{speed_travel} \n ;Put printing message on LCD screen\n M117 Printing..." }, + "machine_width": { "default_value": 300 } } - } -} +} \ No newline at end of file diff --git a/resources/definitions/wanhao_duplicator5Smini.def.json b/resources/definitions/wanhao_duplicator5Smini.def.json index e3ef0b92fe..c33f39a07c 100644 --- a/resources/definitions/wanhao_duplicator5Smini.def.json +++ b/resources/definitions/wanhao_duplicator5Smini.def.json @@ -1,48 +1,32 @@ { - "version": 2, - "name": "Wanhao Duplicator 5S Mini", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Ricardo Snoek", - "manufacturer": "Wanhao", - "file_formats": "text/x-gcode", - "has_materials": true, - "platform": "wanhao_300_200_platform.obj", - "platform_texture": "Wanhaobackplate.png", - "machine_extruder_trains": { - "0": "wanhao_duplicator5Smini_extruder_0" + "version": 2, + "name": "Wanhao Duplicator 5S Mini", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Ricardo Snoek", + "manufacturer": "Wanhao", + "file_formats": "text/x-gcode", + "platform": "wanhao_300_200_platform.obj", + "has_materials": true, + "machine_extruder_trains": { "0": "wanhao_duplicator5Smini_extruder_0" }, + "platform_offset": [ + 0, + -28, + 0 + ], + "platform_texture": "Wanhaobackplate.png" }, - "platform_offset": [ - 0, - -28, - 0 - ] - }, - "overrides": { - "machine_name": { - "default_value": "Wanhao Duplicator 5S Mini" - }, - "machine_width": { - "default_value": 300 - }, - "machine_height": { - "default_value": 180 - }, - "machine_depth": { - "default_value": 200 - }, - "machine_heated_bed": { - "default_value": false - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\n G90 ;absolute positioning\n M82 ;set extruder to absolute mode\n M107 ;start with the fan off\n G28 X0 Y0 ;move X/Y to min endstops\n G28 Z0 ;move Z to min endstops\n G1 Z15.0 F{speed_travel} ;move the platform down 15mm\n G92 E0 ;zero the extruded length\n G1 F200 E6 ;extrude 6 mm of feed stock\n G92 E0 ;zero the extruded length again\n G1 F{speed_travel} \n ;Put printing message on LCD screen\n M117 Printing..." - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning" + "overrides": + { + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 180 }, + "machine_name": { "default_value": "Wanhao Duplicator 5S Mini" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\n G90 ;absolute positioning\n M82 ;set extruder to absolute mode\n M107 ;start with the fan off\n G28 X0 Y0 ;move X/Y to min endstops\n G28 Z0 ;move Z to min endstops\n G1 Z15.0 F{speed_travel} ;move the platform down 15mm\n G92 E0 ;zero the extruded length\n G1 F200 E6 ;extrude 6 mm of feed stock\n G92 E0 ;zero the extruded length again\n G1 F{speed_travel} \n ;Put printing message on LCD screen\n M117 Printing..." }, + "machine_width": { "default_value": 300 } } - } -} +} \ No newline at end of file diff --git a/resources/definitions/wanhao_i3.def.json b/resources/definitions/wanhao_i3.def.json index 42b19c8748..dfc4e75fcd 100644 --- a/resources/definitions/wanhao_i3.def.json +++ b/resources/definitions/wanhao_i3.def.json @@ -1,48 +1,32 @@ { - "version": 2, - "name": "Wanhao Duplicator i3", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Ricardo Snoek", - "manufacturer": "Wanhao", - "file_formats": "text/x-gcode", - "has_materials": true, - "platform": "wanhao_200_200_platform.obj", - "platform_texture": "Wanhaobackplate.png", - "machine_extruder_trains": { - "0": "wanhao_i3_extruder_0" + "version": 2, + "name": "Wanhao Duplicator i3", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Ricardo Snoek", + "manufacturer": "Wanhao", + "file_formats": "text/x-gcode", + "platform": "wanhao_200_200_platform.obj", + "has_materials": true, + "machine_extruder_trains": { "0": "wanhao_i3_extruder_0" }, + "platform_offset": [ + 0, + -28, + 0 + ], + "platform_texture": "Wanhaobackplate.png" }, - "platform_offset": [ - 0, - -28, - 0 - ] - }, - "overrides": { - "machine_name": { - "default_value": "Wanhao Duplicator i3" - }, - "machine_width": { - "default_value": 200 - }, - "machine_height": { - "default_value": 180 - }, - "machine_depth": { - "default_value": 200 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\n G90 ;absolute positioning\n M82 ;set extruder to absolute mode\n M107 ;start with the fan off\n G28 X0 Y0 ;move X/Y to min endstops\n G28 Z0 ;move Z to min endstops\n G1 Z15.0 F{speed_travel} ;move the platform down 15mm\n G92 E0 ;zero the extruded length\n G1 F200 E6 ;extrude 6 mm of feed stock\n G92 E0 ;zero the extruded length again\n G1 F{speed_travel} \n ;Put printing message on LCD screen\n M117 Printing..." - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning" + "overrides": + { + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 180 }, + "machine_name": { "default_value": "Wanhao Duplicator i3" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\n G90 ;absolute positioning\n M82 ;set extruder to absolute mode\n M107 ;start with the fan off\n G28 X0 Y0 ;move X/Y to min endstops\n G28 Z0 ;move Z to min endstops\n G1 Z15.0 F{speed_travel} ;move the platform down 15mm\n G92 E0 ;zero the extruded length\n G1 F200 E6 ;extrude 6 mm of feed stock\n G92 E0 ;zero the extruded length again\n G1 F{speed_travel} \n ;Put printing message on LCD screen\n M117 Printing..." }, + "machine_width": { "default_value": 200 } } - } -} +} \ No newline at end of file diff --git a/resources/definitions/wanhao_i3mini.def.json b/resources/definitions/wanhao_i3mini.def.json index 0c70391c27..a4bfd38921 100644 --- a/resources/definitions/wanhao_i3mini.def.json +++ b/resources/definitions/wanhao_i3mini.def.json @@ -1,48 +1,32 @@ { - "version": 2, - "name": "Wanhao Duplicator i3 Mini", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Ricardo Snoek", - "manufacturer": "Wanhao", - "file_formats": "text/x-gcode", - "has_materials": true, - "platform": "wanhao_110_110_platform.obj", - "platform_texture": "Wanhaobackplate.png", - "machine_extruder_trains": { - "0": "wanhao_i3mini_extruder_0" + "version": 2, + "name": "Wanhao Duplicator i3 Mini", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Ricardo Snoek", + "manufacturer": "Wanhao", + "file_formats": "text/x-gcode", + "platform": "wanhao_110_110_platform.obj", + "has_materials": true, + "machine_extruder_trains": { "0": "wanhao_i3mini_extruder_0" }, + "platform_offset": [ + 0, + -15, + 7 + ], + "platform_texture": "Wanhaobackplate.png" }, - "platform_offset": [ - 0, - -15, - 7 - ] - }, - "overrides": { - "machine_name": { - "default_value": "Wanhao Duplicator i3 Mini" - }, - "machine_width": { - "default_value": 110 - }, - "machine_height": { - "default_value": 110 - }, - "machine_depth": { - "default_value": 110 - }, - "machine_heated_bed": { - "default_value": false - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\n G90 ;absolute positioning\n M82 ;set extruder to absolute mode\n M107 ;start with the fan off\n G28 X0 Y0 ;move X/Y to min endstops\n G28 Z0 ;move Z to min endstops\n G1 Z15.0 F{speed_travel} ;move the platform down 15mm\n G92 E0 ;zero the extruded length\n G1 F200 E6 ;extrude 6 mm of feed stock\n G92 E0 ;zero the extruded length again\n G1 F{speed_travel} \n ;Put printing message on LCD screen\n M117 Printing..." - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning" + "overrides": + { + "machine_depth": { "default_value": 110 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 110 }, + "machine_name": { "default_value": "Wanhao Duplicator i3 Mini" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\n G90 ;absolute positioning\n M82 ;set extruder to absolute mode\n M107 ;start with the fan off\n G28 X0 Y0 ;move X/Y to min endstops\n G28 Z0 ;move Z to min endstops\n G1 Z15.0 F{speed_travel} ;move the platform down 15mm\n G92 E0 ;zero the extruded length\n G1 F200 E6 ;extrude 6 mm of feed stock\n G92 E0 ;zero the extruded length again\n G1 F{speed_travel} \n ;Put printing message on LCD screen\n M117 Printing..." }, + "machine_width": { "default_value": 110 } } - } -} +} \ No newline at end of file diff --git a/resources/definitions/wanhao_i3plus.def.json b/resources/definitions/wanhao_i3plus.def.json index e454a40ae1..2d14723af8 100644 --- a/resources/definitions/wanhao_i3plus.def.json +++ b/resources/definitions/wanhao_i3plus.def.json @@ -1,48 +1,32 @@ { - "version": 2, - "name": "Wanhao Duplicator i3 Plus", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Ricardo Snoek", - "manufacturer": "Wanhao", - "file_formats": "text/x-gcode", - "has_materials": true, - "platform": "wanhao_200_200_platform.obj", - "platform_texture": "Wanhaobackplate.png", - "machine_extruder_trains": { - "0": "wanhao_i3plus_extruder_0" + "version": 2, + "name": "Wanhao Duplicator i3 Plus", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Ricardo Snoek", + "manufacturer": "Wanhao", + "file_formats": "text/x-gcode", + "platform": "wanhao_200_200_platform.obj", + "has_materials": true, + "machine_extruder_trains": { "0": "wanhao_i3plus_extruder_0" }, + "platform_offset": [ + 0, + -28, + 0 + ], + "platform_texture": "Wanhaobackplate.png" }, - "platform_offset": [ - 0, - -28, - 0 - ] - }, - "overrides": { - "machine_name": { - "default_value": "Wanhao Duplicator i3 Plus" - }, - "machine_width": { - "default_value": 200 - }, - "machine_depth": { - "default_value": 200 - }, - "machine_height": { - "default_value": 180 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\n G90 ;absolute positioning\n M82 ;set extruder to absolute mode\n M107 ;start with the fan off\n G28 X0 Y0 ;move X/Y to min endstops\n G28 Z0 ;move Z to min endstops\n G1 Z15.0 F{speed_travel} ;move the platform down 15mm\n G92 E0 ;zero the extruded length\n G1 F200 E6 ;extrude 6 mm of feed stock\n G92 E0 ;zero the extruded length again\n G1 F{speed_travel} \n ;Put printing message on LCD screen\n M117 Printing..." - }, - "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning" + "overrides": + { + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 180 }, + "machine_name": { "default_value": "Wanhao Duplicator i3 Plus" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\n G90 ;absolute positioning\n M82 ;set extruder to absolute mode\n M107 ;start with the fan off\n G28 X0 Y0 ;move X/Y to min endstops\n G28 Z0 ;move Z to min endstops\n G1 Z15.0 F{speed_travel} ;move the platform down 15mm\n G92 E0 ;zero the extruded length\n G1 F200 E6 ;extrude 6 mm of feed stock\n G92 E0 ;zero the extruded length again\n G1 F{speed_travel} \n ;Put printing message on LCD screen\n M117 Printing..." }, + "machine_width": { "default_value": 200 } } - } -} +} \ No newline at end of file diff --git a/resources/definitions/weedo_x40.def.json b/resources/definitions/weedo_x40.def.json index 305dd8b765..9816070c33 100644 --- a/resources/definitions/weedo_x40.def.json +++ b/resources/definitions/weedo_x40.def.json @@ -1,280 +1,279 @@ -{ - "version": 2, - "name": "Weedo X40", - "inherits": "fdmprinter", - "metadata": { - "author": "X40-Community.org", - "manufacturer": "Weedo", - "visible": true, - "file_formats": "text/x-gcode", - "platform": "weedo_x40.3mf", - "platform_offset": [ 0, 193, 35], - "has_machine_quality": true, - "has_materials": true, - "has_variants": true, - "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", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "generic_pc_175", - "generic_nylon_175", - "goofoo_abs", - "goofoo_asa", - "goofoo_bronze_pla", - "goofoo_emarble_pla", - "goofoo_esilk_pla", - "goofoo_hips", - "goofoo_pa_cf", - "goofoo_pa", - "goofoo_pc", - "goofoo_peek", - "goofoo_petg", - "goofoo_pla", - "goofoo_pva", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_wood_pla", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_acetate", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_copa", - "emotiontech_hips", - "emotiontech_nylon_1030", - "emotiontech_nylon_1030cf", - "emotiontech_nylon_1070", - "emotiontech_pc", - "emotiontech_pekk", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pla_hr_870", - "emotiontech_pva-m", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eryone_petg", - "eryone_pla_glow", - "eryone_pla_matte", - "eryone_pla_wood", - "eryone_pla", - "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", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fdplast_abs_tomato", - "fdplast_petg_gray", - "fdplast_pla_olive", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "layer_one_black_pla", - "layer_one_dark_gray_pla", - "layer_one_white_pla", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla_bois", - "tizyx_pla", - "tizyx_pva", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "volumic_abs_ultra", - "volumic_arma_ultra", - "volumic_asa_ultra", - "volumic_br80_ultra", - "volumic_bumper_ultra", - "volumic_cu80_ultra", - "volumic_flex93_ultra", - "volumic_medical_ultra", - "volumic_nylon_ultra", - "volumic_pekk_carbone", - "volumic_petg_ultra", - "volumic_petgcarbone_ultra", - "volumic_pla_ultra", - "volumic_pp_ultra", - "volumic_strong_ultra", - "volumic_support_ultra", - "zyyx_pro_flex", - "zyyx_pro_pla" - ], - "preferred_variant_name": "0.4mm Nozzle", - "preferred_quality_type": "normal", - "variants_name": "Nozzle Type", - "machine_extruder_trains": - { - "0": "weedo_x40_extruder_left_0", - "1": "weedo_x40_extruder_right_0" - } - }, - - "overrides": { - "machine_name": { "default_value": "Weedo X40" }, - "machine_width": { "default_value": 300 }, - "machine_depth": { "default_value": 300 }, - "machine_height": { "default_value": 400 }, - "machine_heated_bed": { "default_value": true }, - "machine_nozzle_heat_up_speed": { "default_value": 1.6 }, - "machine_nozzle_cool_down_speed": { "default_value": 0.75 }, - "machine_head_with_fans_polygon": - { - "default_value": - [ - [ -42.5, 18 ], - [ -42.5, -50 ], - [ 24.5, 18 ], - [ 24.5, -50.0 ] - ] - }, - "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_acceleration": { "value": 500 }, - "machine_max_acceleration_x": { "value": 500 }, - "machine_max_acceleration_y": { "value": 500 }, - "machine_max_acceleration_z": { "value": 100 }, - "machine_max_acceleration_e": { "value": 5000 }, - "gantry_height": { "value": "12" }, - "machine_extruder_count": { "default_value": 2 }, - "machine_start_gcode": {"default_value": "; x40-community.org configuration Rev. 08\n;(**** start.gcode for WEEDO X40 DUAL****)\nT{initial_extruder_nr} S ; Selected start extruder\nM140 S{material_bed_temperature_layer_0} ; Preheat bed\nM109 S{material_print_temperature_layer_0}; Preheat nozzle\nM73 P0 ; Set current print progress percentage\nG21 ; Millimeter Units\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nT0 S ; Select left extruder\nM301 H1 P15.53 I1.32 D45.75 ; PID left extruder with Weedo X40 coolingsystem\n;M301 H1 P13.32 I0.98 D45.13 ; PID left extruder with X40 Community coolingsystem\nM92 E94.90 ; Calibrate left extruder\nT1 S ; Select right extruder\nM301 H1 P15.44 I1.29 D46.11 ; PID right extruder with Weedo X40 coolingsystem\n;M301 H1 P13.32 I0.98 D45.13 ; PID right extruder with X40 Community coolingsystem\nM92 E94.90 ; Calibrate right extruder\nT0 S ; Select left extruder\nG28 ; Auto home\nG29 ; Bed Leveling\nG1 X-47 F3000 ; Move left nozzle to parking position\nT1 S ; select right extruder\nG1 X351 F3000 ; Move right nozzle to parking position\nM107 P0 ; Turn off left fan\nM107 P1 ; Turn off right fan\nT{initial_extruder_nr} S ; Set start extruder\nM190 S{material_bed_temperature_layer_0} ; Waiting for bed temperature\nG1 E50 F100 ; Extrude in parking position\nM77 ; Stop heat up timer\nM75 ; Start print timer\n" - }, - "machine_end_gcode": {"default_value": "(*********end X40 End.gcode*******)\nG28 X Y F3000\nG91 ; Relative positioning\nG1 E-6 ; Reduce filament pressure\nG90 ; Absolute positioning\nG0 Y300 F3000 ; Move headbed\nM104 S0 T0 ; Cool down left extruder\nM104 S0 T1 ; Cool down right extruder\nM140 S0 ; Cool down heatbed\nM107 P0 ; Turn off left fan\nM107 P1 ; Turn off right fan\nM82; Extruder in absolute mode\nM73 P100 ; Set print progress to 100%" }, - - "speed_travel": - { - "maximum_value": "150", - "value": "150" - }, - - "acceleration_enabled": { "value": false }, - "acceleration_print": { "value": 1000 }, - "acceleration_support": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, - "acceleration_support_interface": { "value": "acceleration_topbottom" }, - "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 500 / 4000)" }, - "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 4000)" }, - "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 500 / 1000)" }, - "acceleration_travel": { "value": 2000 }, - "acceleration_travel_layer_0": { "value": "acceleration_travel / 2" }, - "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, - "adhesion_type": { "value": "'brim'" }, - "brim_width": { "value": "8" }, - "bridge_settings_enabled": { "default_value": true }, - "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, - "cool_fan_speed": { "value": "50" }, - "cool_fan_speed_max": { "value": "100" }, - "cool_min_speed": { "value": "7" }, - "fill_outline_gaps": { "value": false }, - "infill_line_width": { "value": "round(line_width * 0.42 / 0.35, 2)" }, - "infill_overlap": { "value": 30.0 }, - "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, - "infill_wipe_dist": { "value": 0.0 }, - "infill_before_walls": { "value": false }, - "jerk_enabled": { "value": false }, - "jerk_print": { "value": 11 }, - - "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)" }, - "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_standby_temperature": { "value": "100" }, - "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_amount": { "default_value": 4.5 }, - "retraction_count_max": { "value": 100 }, - "retraction_extrusion_window": { "value": 8 }, - "retraction_hop": { "value": 0.5 }, - "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_wall_x": { "value": "speed_wall" }, - "speed_support_infill": { "value": 58.0 }, - "speed_travel_layer_0": { "value": 60 }, - "speed_support_roof": { "value": 39.0 }, - "speed_support_bottom": { "value": 39.0 }, - "speed_roofing": { "value": 30.0 }, - "support_angle": { "default_value": 45 }, - "support_pattern": { "value": "'zigzag'" }, - "support_use_towers": { "value": true }, - "support_fan_enable": { "value": true }, - "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_supported_skin_fan_speed": { "value": 100 }, - "switch_extruder_retraction_amount": { "value": 0 }, - "travel_avoid_other_parts": { "value": true }, - "travel_retract_before_outer_wall": { "value": true }, - "top_bottom_thickness": {"value": "line_width * 2" }, - "travel_avoid_supports": { "value": true }, - "wall_thickness": {"value": "line_width * 2" }, - "wall_0_wipe_dist": { "value": 0.0 }, - "meshfix_maximum_resolution": { "value": "0.25" }, - "optimize_wall_printing_order": { "value": "True" }, - "ooze_shield_enabled":{ "default_value":false }, - "ooze_shield_dist":{ "default_value":3.0 }, - "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, - "retraction_combing_max_distance": { "value": 30 }, - "retraction_speed": { "default_value": 28 }, - "z_seam_type": { "value": "'back'" }, - "z_seam_corner": { "value": "'z_seam_corner_weighted'" } - } -} +{ + "version": 2, + "name": "Weedo X40", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "X40-Community.org", + "manufacturer": "Weedo", + "file_formats": "text/x-gcode", + "platform": "weedo_x40.3mf", + "exclude_materials": [ + "3D-Fuel_PLA_PRO_Black", + "3D-Fuel_PLA_SnapSupport", + "bestfilament_abs_skyblue", + "bestfilament_petg_orange", + "bestfilament_pla_green", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "generic_pc_175", + "generic_nylon_175", + "goofoo_abs", + "goofoo_asa", + "goofoo_bronze_pla", + "goofoo_emarble_pla", + "goofoo_esilk_pla", + "goofoo_hips", + "goofoo_pa_cf", + "goofoo_pa", + "goofoo_pc", + "goofoo_peek", + "goofoo_petg", + "goofoo_pla", + "goofoo_pva", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_wood_pla", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_copa", + "emotiontech_hips", + "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", + "emotiontech_nylon_1070", + "emotiontech_pc", + "emotiontech_pekk", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pla_hr_870", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eryone_petg", + "eryone_pla_glow", + "eryone_pla_matte", + "eryone_pla_wood", + "eryone_pla", + "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", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fdplast_abs_tomato", + "fdplast_petg_gray", + "fdplast_pla_olive", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_black_pla", + "layer_one_dark_gray_pla", + "layer_one_white_pla", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla_bois", + "tizyx_pla", + "tizyx_pva", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "volumic_abs_ultra", + "volumic_arma_ultra", + "volumic_asa_ultra", + "volumic_br80_ultra", + "volumic_bumper_ultra", + "volumic_cu80_ultra", + "volumic_flex93_ultra", + "volumic_medical_ultra", + "volumic_nylon_ultra", + "volumic_pekk_carbone", + "volumic_petg_ultra", + "volumic_petgcarbone_ultra", + "volumic_pla_ultra", + "volumic_pp_ultra", + "volumic_strong_ultra", + "volumic_support_ultra", + "zyyx_pro_flex", + "zyyx_pro_pla" + ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": + { + "0": "weedo_x40_extruder_left_0", + "1": "weedo_x40_extruder_right_0" + }, + "platform_offset": [ + 0, + 193, + 35 + ], + "preferred_material": "generic_pla_175", + "preferred_quality_type": "normal", + "preferred_variant_name": "0.4mm Nozzle", + "variants_name": "Nozzle Type" + }, + "overrides": + { + "acceleration_enabled": { "value": false }, + "acceleration_print": { "value": 1000 }, + "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, + "acceleration_support": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, + "acceleration_support_interface": { "value": "acceleration_topbottom" }, + "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 500 / 4000)" }, + "acceleration_travel": { "value": 2000 }, + "acceleration_travel_layer_0": { "value": "acceleration_travel / 2" }, + "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 4000)" }, + "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 500 / 1000)" }, + "adhesion_type": { "value": "'brim'" }, + "bridge_settings_enabled": { "default_value": true }, + "brim_width": { "value": "8" }, + "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, + "cool_fan_speed": { "value": "50" }, + "cool_fan_speed_max": { "value": "100" }, + "cool_min_speed": { "value": "7" }, + "fill_outline_gaps": { "value": false }, + "gantry_height": { "value": "12" }, + "infill_before_walls": { "value": false }, + "infill_line_width": { "value": "round(line_width * 0.42 / 0.35, 2)" }, + "infill_overlap": { "value": 30.0 }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, + "infill_wipe_dist": { "value": 0.0 }, + "jerk_enabled": { "value": false }, + "jerk_print": { "value": 11 }, + "jerk_travel": { "value": 18 }, + "jerk_travel_layer_0": { "value": "jerk_travel" }, + "jerk_wall": { "value": "jerk_print - 2" }, + "layer_height_0": { "value": "round(layer_height * 1.5, 2)" }, + "machine_acceleration": { "value": 500 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 300 }, + "machine_end_gcode": { "default_value": "(*********end X40 End.gcode*******)\nG28 X Y F3000\nG91 ; Relative positioning\nG1 E-6 ; Reduce filament pressure\nG90 ; Absolute positioning\nG0 Y300 F3000 ; Move headbed\nM104 S0 T0 ; Cool down left extruder\nM104 S0 T1 ; Cool down right extruder\nM140 S0 ; Cool down heatbed\nM107 P0 ; Turn off left fan\nM107 P1 ; Turn off right fan\nM82; Extruder in absolute mode\nM73 P100 ; Set print progress to 100%" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-42.5, 18], + [-42.5, -50], + [24.5, 18], + [24.5, -50.0] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 400 }, + "machine_max_acceleration_e": { "value": 5000 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 100 }, + "machine_max_feedrate_e": { "value": 50 }, + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_jerk_e": { "value": 5 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.4 }, + "machine_min_cool_heat_time_window": { "default_value": 360 }, + "machine_name": { "default_value": "Weedo X40" }, + "machine_nozzle_cool_down_speed": { "default_value": 0.75 }, + "machine_nozzle_heat_up_speed": { "default_value": 1.6 }, + "machine_start_gcode": { "default_value": "; x40-community.org configuration Rev. 08\n;(**** start.gcode for WEEDO X40 DUAL****)\nT{initial_extruder_nr} S ; Selected start extruder\nM140 S{material_bed_temperature_layer_0} ; Preheat bed\nM109 S{material_print_temperature_layer_0}; Preheat nozzle\nM73 P0 ; Set current print progress percentage\nG21 ; Millimeter Units\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nT0 S ; Select left extruder\nM301 H1 P15.53 I1.32 D45.75 ; PID left extruder with Weedo X40 coolingsystem\n;M301 H1 P13.32 I0.98 D45.13 ; PID left extruder with X40 Community coolingsystem\nM92 E94.90 ; Calibrate left extruder\nT1 S ; Select right extruder\nM301 H1 P15.44 I1.29 D46.11 ; PID right extruder with Weedo X40 coolingsystem\n;M301 H1 P13.32 I0.98 D45.13 ; PID right extruder with X40 Community coolingsystem\nM92 E94.90 ; Calibrate right extruder\nT0 S ; Select left extruder\nG28 ; Auto home\nG29 ; Bed Leveling\nG1 X-47 F3000 ; Move left nozzle to parking position\nT1 S ; select right extruder\nG1 X351 F3000 ; Move right nozzle to parking position\nM107 P0 ; Turn off left fan\nM107 P1 ; Turn off right fan\nT{initial_extruder_nr} S ; Set start extruder\nM190 S{material_bed_temperature_layer_0} ; Waiting for bed temperature\nG1 E50 F100 ; Extrude in parking position\nM77 ; Stop heat up timer\nM75 ; Start print timer\n" }, + "machine_width": { "default_value": 300 }, + "material_diameter": { "default_value": 1.75 }, + "material_print_temp_prepend": { "default_value": false }, + "material_standby_temperature": { "value": "100" }, + "meshfix_maximum_resolution": { "value": "0.25" }, + "ooze_shield_dist": { "default_value": 3.0 }, + "ooze_shield_enabled": { "default_value": false }, + "optimize_wall_printing_order": { "value": "True" }, + "raft_airgap": { "default_value": 0.22 }, + "raft_base_speed": { "value": 20 }, + "raft_interface_speed": { "value": 33 }, + "raft_margin": { "default_value": 8 }, + "retraction_amount": { "default_value": 4.5 }, + "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, + "retraction_combing_max_distance": { "value": 30 }, + "retraction_count_max": { "value": 100 }, + "retraction_extrusion_window": { "value": 8 }, + "retraction_hop": { "value": 0.5 }, + "retraction_min_travel": { "value": 1.5 }, + "retraction_speed": { "default_value": 28 }, + "skin_overlap": { "value": 10.0 }, + "speed_layer_0": { "value": "round(speed_print / 2.5, 2)" }, + "speed_print": { "value": 50.0 }, + "speed_roofing": { "value": 30.0 }, + "speed_support": { "value": "speed_wall_0" }, + "speed_support_bottom": { "value": 39.0 }, + "speed_support_infill": { "value": 58.0 }, + "speed_support_interface": { "value": "speed_print" }, + "speed_support_roof": { "value": 39.0 }, + "speed_travel": + { + "maximum_value": "150", + "value": "150" + }, + "speed_travel_layer_0": { "value": 60 }, + "speed_wall_x": { "value": "speed_wall" }, + "support_angle": { "default_value": 45 }, + "support_fan_enable": { "value": true }, + "support_pattern": { "value": "'zigzag'" }, + "support_supported_skin_fan_speed": { "value": 100 }, + "support_use_towers": { "value": true }, + "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" }, + "switch_extruder_retraction_amount": { "value": 0 }, + "top_bottom_thickness": { "value": "line_width * 2" }, + "travel_avoid_other_parts": { "value": true }, + "travel_avoid_supports": { "value": true }, + "travel_retract_before_outer_wall": { "value": true }, + "wall_0_wipe_dist": { "value": 0.0 }, + "wall_thickness": { "value": "line_width * 2" }, + "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, + "z_seam_type": { "value": "'back'" } + } +} \ No newline at end of file diff --git a/resources/definitions/winbo_dragonl4.def.json b/resources/definitions/winbo_dragonl4.def.json index 86bac9f4e3..097fb8e5ea 100644 --- a/resources/definitions/winbo_dragonl4.def.json +++ b/resources/definitions/winbo_dragonl4.def.json @@ -2,52 +2,25 @@ "version": 2, "name": "Winbo Dragon(L)4", "inherits": "fdmprinter", - "metadata": { + "metadata": + { + "visible": true, "author": "Winbo", "manufacturer": "Winbo Smart Tech Co., Ltd.", - "visible": true, "file_formats": "text/x-gcode", - "supports_usb_connection": false, - "machine_extruder_trains": - { - "0": "winbo_dragonl4_extruder" - } + "machine_extruder_trains": { "0": "winbo_dragonl4_extruder" }, + "supports_usb_connection": false }, - - "overrides": { - "machine_name": { "default_value": "Winbo Dragon(L)4" }, - "machine_width": { "default_value": 615 }, - "machine_depth": { "default_value": 463 }, - "machine_height": { "default_value": 615 }, - "machine_heated_bed": { "default_value": true }, - "material_bed_temp_wait": { "default_value": false }, - "machine_nozzle_heat_up_speed": { "default_value": 1.4 }, - "machine_nozzle_cool_down_speed": { "default_value": 0.8 }, - "machine_head_with_fans_polygon": - { - "default_value": - [ - [ -50, 90 ],[ -50, -60 ],[ 50, -60 ],[ 50, 90 ] - ] - }, - "machine_gcode_flavor": { "default_value": "Marlin" }, - "machine_max_feedrate_x": { "default_value": 300 }, - "machine_max_feedrate_y": { "default_value": 300 }, - "machine_max_feedrate_z": { "default_value": 40 }, + "overrides": + { "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_layer_0": { "value": "acceleration_topbottom" }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, "acceleration_print": { "value": "1800" }, - "acceleration_travel": { "value": "2000" }, "acceleration_support": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, "acceleration_support_interface": { "value": "acceleration_topbottom" }, "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 500 / 4000)" }, + "acceleration_travel": { "value": "2000" }, "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 4000)" }, "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 500 / 1000)" }, "brim_width": { "value": "4" }, @@ -55,10 +28,14 @@ "cool_fan_speed": { "value": "100" }, "cool_fan_speed_max": { "value": "100" }, "cool_min_speed": { "value": "5" }, + "default_material_print_temperature": { "value": "200" }, "fill_outline_gaps": { "value": "True" }, + "gantry_height": { "value": "80" }, + "gradual_infill_step_height": { "value": "1" }, + "gradual_support_infill_step_height": { "value": "0.2" }, + "gradual_support_infill_steps": { "value": "1" }, "infill_overlap": { "value": "0" }, - "min_infill_area": { "value": "1" }, - "min_skin_width_for_expansion": { "value": "2" }, + "initial_layer_line_width_factor": { "value": "120" }, "jerk_enabled": { "value": "True" }, "jerk_layer_0": { "value": "jerk_topbottom" }, "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" }, @@ -66,20 +43,42 @@ "jerk_support": { "value": "math.ceil(jerk_print * 15 / 25)" }, "jerk_support_interface": { "value": "jerk_topbottom" }, "jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" }, + "jerk_travel": { "value": "25" }, "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')" }, - "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_interface_line_width": { "value": "support_line_width" }, + "machine_acceleration": { "default_value": 2000 }, + "machine_depth": { "default_value": 463 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E2\nG1 E0 F200\nG28 X0 Y0\nM84 X Y E" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_gcode_flavor": { "default_value": "Marlin" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-50, 90], + [-50, -60], + [50, -60], + [50, 90] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 615 }, + "machine_max_feedrate_x": { "default_value": 300 }, + "machine_max_feedrate_y": { "default_value": 300 }, + "machine_max_feedrate_z": { "default_value": 40 }, "machine_min_cool_heat_time_window": { "value": "15" }, - "default_material_print_temperature": { "value": "200" }, - "material_print_temperature_layer_0": { "value": "material_print_temperature - 5" }, + "machine_name": { "default_value": "Winbo Dragon(L)4" }, + "machine_nozzle_cool_down_speed": { "default_value": 0.8 }, + "machine_nozzle_heat_up_speed": { "default_value": 1.4 }, + "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_width": { "default_value": 615 }, + "material_bed_temp_wait": { "default_value": false }, "material_bed_temperature": { "maximum_value": "100" }, "material_bed_temperature_layer_0": { "maximum_value": "100" }, + "material_print_temperature_layer_0": { "value": "material_print_temperature - 5" }, + "min_infill_area": { "value": "1" }, + "min_skin_width_for_expansion": { "value": "2" }, + "prime_blob_enable": { "enabled": true }, "raft_airgap": { "value": "0" }, "raft_base_thickness": { "value": "0.3" }, "raft_interface_line_spacing": { "value": "0.5" }, @@ -97,27 +96,18 @@ "retraction_min_travel": { "value": "5" }, "retraction_prime_speed": { "value": "25" }, "skin_overlap": { "value": "10" }, + "speed_infill": { "value": "speed_print * line_width / infill_line_width" }, "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_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_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)" }, - "travel_avoid_distance": { "value": "3" }, - "gradual_support_infill_step_height": { "value": "0.2" }, - "gradual_support_infill_steps": { "value": "1" }, - "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_pattern": { "value": "'zigzag'" }, @@ -126,7 +116,17 @@ "support_interface_density": { "value": "80" }, "support_interface_enable": { "value": true }, "support_interface_height": { "value": "0.5" }, + "support_interface_line_width": { "value": "support_line_width" }, + "support_line_width": { "value": "max(min(line_width, 0.4),line_width / 2)" }, "support_roof_pattern": { "value": "'concentric'" }, + "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)" }, + "top_bottom_thickness": { "value": "max(1.2, layer_height * 6)" }, + "travel_avoid_distance": { "value": "3" }, + "wall_0_inset": { "value": "0.05" }, + "wall_line_width_0": { "value": "line_width-0.05" }, + "wall_line_width_x": { "value": "line_width" }, + "wall_thickness": { "value": "2.4" }, "z_seam_type": { "value": "'shortest'" } } -} +} \ No newline at end of file diff --git a/resources/definitions/winbo_mini2.def.json b/resources/definitions/winbo_mini2.def.json index 4c517a375e..fcb782d339 100644 --- a/resources/definitions/winbo_mini2.def.json +++ b/resources/definitions/winbo_mini2.def.json @@ -2,52 +2,25 @@ "version": 2, "name": "Winbo Mini2", "inherits": "fdmprinter", - "metadata": { + "metadata": + { + "visible": true, "author": "Winbo", "manufacturer": "Winbo Smart Tech Co., Ltd.", - "visible": true, "file_formats": "text/x-gcode", - "supports_usb_connection": true, - "machine_extruder_trains": - { - "0": "winbo_mini2_extruder" - } + "machine_extruder_trains": { "0": "winbo_mini2_extruder" }, + "supports_usb_connection": true }, - - "overrides": { - "machine_name": { "default_value": "Winbo Mini2" }, - "machine_width": { "default_value": 205 }, - "machine_depth": { "default_value": 155 }, - "machine_height": { "default_value": 205 }, - "machine_heated_bed": { "default_value": false }, - "material_bed_temp_wait": { "default_value": false }, - "machine_nozzle_heat_up_speed": { "default_value": 1.4 }, - "machine_nozzle_cool_down_speed": { "default_value": 0.8 }, - "machine_head_with_fans_polygon": - { - "default_value": - [ - [ -52, 30 ],[ -52, -40 ],[ 13, -40 ],[ 13, 30 ] - ] - }, + "overrides": + { "acceleration_enabled": { "value": true }, - "machine_gcode_flavor": { "default_value": "Marlin" }, - "machine_max_feedrate_x": { "default_value": 250 }, - "machine_max_feedrate_y": { "default_value": 200 }, - "machine_max_feedrate_z": { "default_value": 40 }, - "machine_acceleration": { "default_value": 3000 }, - "gantry_height": { "value": "75" }, - "machine_extruder_count": { "default_value": 1 }, - "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_layer_0": { "value": "acceleration_topbottom" }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, "acceleration_print": { "value": "2000" }, - "acceleration_travel": { "value": "2500" }, "acceleration_support": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, "acceleration_support_interface": { "value": "acceleration_topbottom" }, "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 500 / 4000)" }, + "acceleration_travel": { "value": "2500" }, "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 4000)" }, "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 500 / 1000)" }, "brim_width": { "value": "3" }, @@ -55,10 +28,14 @@ "cool_fan_speed": { "value": "100" }, "cool_fan_speed_max": { "value": "100" }, "cool_min_speed": { "value": "5" }, + "default_material_print_temperature": { "value": "200" }, "fill_outline_gaps": { "value": "True" }, + "gantry_height": { "value": "75" }, + "gradual_infill_step_height": { "value": "1" }, + "gradual_support_infill_step_height": { "value": "0.2" }, + "gradual_support_infill_steps": { "value": "1" }, "infill_overlap": { "value": "0" }, - "min_infill_area": { "value": "1" }, - "min_skin_width_for_expansion": { "value": "2" }, + "initial_layer_line_width_factor": { "value": "120" }, "jerk_enabled": { "value": "True" }, "jerk_layer_0": { "value": "jerk_topbottom" }, "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" }, @@ -66,20 +43,42 @@ "jerk_support": { "value": "math.ceil(jerk_print * 15 / 25)" }, "jerk_support_interface": { "value": "jerk_topbottom" }, "jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" }, + "jerk_travel": { "value": "25" }, "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" }, "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" }, - "wall_thickness": { "value": "1.2"}, "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_interface_line_width": { "value": "support_line_width" }, + "machine_acceleration": { "default_value": 3000 }, + "machine_depth": { "default_value": 155 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E2\nG1 E0 F200\nG28 X0 Y0\nM84 X Y E" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_gcode_flavor": { "default_value": "Marlin" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-52, 30], + [-52, -40], + [13, -40], + [13, 30] + ] + }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 205 }, + "machine_max_feedrate_x": { "default_value": 250 }, + "machine_max_feedrate_y": { "default_value": 200 }, + "machine_max_feedrate_z": { "default_value": 40 }, "machine_min_cool_heat_time_window": { "value": "15" }, - "default_material_print_temperature": { "value": "200" }, - "material_print_temperature_layer_0": { "value": "material_print_temperature - 5" }, + "machine_name": { "default_value": "Winbo Mini2" }, + "machine_nozzle_cool_down_speed": { "default_value": 0.8 }, + "machine_nozzle_heat_up_speed": { "default_value": 1.4 }, + "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_width": { "default_value": 205 }, + "material_bed_temp_wait": { "default_value": false }, "material_bed_temperature": { "maximum_value": "115" }, "material_bed_temperature_layer_0": { "maximum_value": "115" }, + "material_print_temperature_layer_0": { "value": "material_print_temperature - 5" }, + "min_infill_area": { "value": "1" }, + "min_skin_width_for_expansion": { "value": "2" }, + "prime_blob_enable": { "enabled": true }, "raft_airgap": { "value": "0" }, "raft_base_thickness": { "value": "0.3" }, "raft_interface_line_spacing": { "value": "0.5" }, @@ -97,27 +96,18 @@ "retraction_min_travel": { "value": "5" }, "retraction_prime_speed": { "value": "25" }, "skin_overlap": { "value": "10" }, + "speed_infill": { "value": "speed_print * line_width / infill_line_width" }, "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_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_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)" }, - "travel_avoid_distance": { "value": "3" }, - "gradual_support_infill_step_height": { "value": "0.2" }, - "gradual_support_infill_steps": { "value": "1" }, - "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_pattern": { "value": "'zigzag'" }, @@ -126,7 +116,17 @@ "support_interface_density": { "value": "80" }, "support_interface_enable": { "value": true }, "support_interface_height": { "value": "0.5" }, + "support_interface_line_width": { "value": "support_line_width" }, + "support_line_width": { "value": "max(min(line_width,0.4),line_width/2)" }, "support_roof_pattern": { "value": "'concentric'" }, + "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)" }, + "top_bottom_thickness": { "value": "max(1.2,layer_height*6)" }, + "travel_avoid_distance": { "value": "3" }, + "wall_0_inset": { "value": "0.05" }, + "wall_line_width_0": { "value": "line_width-0.05" }, + "wall_line_width_x": { "value": "line_width" }, + "wall_thickness": { "value": "1.2" }, "z_seam_type": { "value": "'shortest'" } } -} +} \ No newline at end of file diff --git a/resources/definitions/winbo_superhelper105.def.json b/resources/definitions/winbo_superhelper105.def.json index 5fa6fe7eb6..6314750746 100644 --- a/resources/definitions/winbo_superhelper105.def.json +++ b/resources/definitions/winbo_superhelper105.def.json @@ -2,52 +2,25 @@ "version": 2, "name": "Winbo Super Helper 105", "inherits": "fdmprinter", - "metadata": { + "metadata": + { + "visible": true, "author": "Winbo", "manufacturer": "Winbo Smart Tech Co., Ltd.", - "visible": true, "file_formats": "text/x-gcode", - "supports_usb_connection": true, - "machine_extruder_trains": - { - "0": "winbo_superhelper105_extruder" - } + "machine_extruder_trains": { "0": "winbo_superhelper105_extruder" }, + "supports_usb_connection": true }, - - "overrides": { - "machine_name": { "default_value": "Winbo Super Helper 105" }, - "machine_width": { "default_value": 108 }, - "machine_depth": { "default_value": 108 }, - "machine_height": { "default_value": 158 }, - "machine_heated_bed": { "default_value": false }, - "material_bed_temp_wait": { "default_value": false }, - "machine_nozzle_heat_up_speed": { "default_value": 1.4 }, - "machine_nozzle_cool_down_speed": { "default_value": 0.8 }, - "machine_head_with_fans_polygon": - { - "default_value": - [ - [ -110, 50 ],[ -110, -30 ],[ 110, -30 ],[ 110, 50 ] - ] - }, - "machine_gcode_flavor": { "default_value": "Marlin" }, - "machine_max_feedrate_x": { "default_value": 250 }, - "machine_max_feedrate_y": { "default_value": 200 }, - "machine_max_feedrate_z": { "default_value": 40 }, - "machine_acceleration": { "default_value": 2000 }, - "gantry_height": { "value": "200" }, - "machine_extruder_count": { "default_value": 1 }, - "machine_start_gcode": { "default_value": "G21\nG90\nM82\nM107\nG28 X0 Y0\nG28 Z0\nG1 F6000 Z0.3\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 }, + "overrides": + { "acceleration_enabled": { "value": "True" }, "acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, "acceleration_print": { "value": "2000" }, - "acceleration_travel": { "value": "1500" }, "acceleration_support": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, "acceleration_support_interface": { "value": "acceleration_topbottom" }, "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 500 / 4000)" }, + "acceleration_travel": { "value": "1500" }, "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 4000)" }, "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 500 / 1000)" }, "brim_width": { "value": "3" }, @@ -56,9 +29,12 @@ "cool_fan_speed_max": { "value": "100" }, "cool_min_speed": { "value": "5" }, "fill_outline_gaps": { "value": "True" }, + "gantry_height": { "value": "200" }, + "gradual_infill_step_height": { "value": "1" }, + "gradual_support_infill_step_height": { "value": "0.2" }, + "gradual_support_infill_steps": { "value": "1" }, "infill_overlap": { "value": "0" }, - "min_infill_area": { "value": "1" }, - "min_skin_width_for_expansion": { "value": "2" }, + "initial_layer_line_width_factor": { "value": "120" }, "jerk_enabled": { "value": "True" }, "jerk_layer_0": { "value": "jerk_topbottom" }, "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" }, @@ -66,10 +42,38 @@ "jerk_support": { "value": "math.ceil(jerk_print * 15 / 25)" }, "jerk_support_interface": { "value": "jerk_topbottom" }, "jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" }, + "jerk_travel": { "value": "25" }, "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" }, "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" }, - "wall_thickness": { "value": "0.8"}, "line_width": { "value": "extruderValue(-1,'machine_nozzle_size')" }, + "machine_acceleration": { "default_value": 2000 }, + "machine_depth": { "default_value": 108 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E2\nG1 E0 F200\nG28 X0 Y0\nM84 X Y E" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_gcode_flavor": { "default_value": "Marlin" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-110, 50], + [-110, -30], + [110, -30], + [110, 50] + ] + }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 158 }, + "machine_max_feedrate_x": { "default_value": 250 }, + "machine_max_feedrate_y": { "default_value": 200 }, + "machine_max_feedrate_z": { "default_value": 40 }, + "machine_name": { "default_value": "Winbo Super Helper 105" }, + "machine_nozzle_cool_down_speed": { "default_value": 0.8 }, + "machine_nozzle_heat_up_speed": { "default_value": 1.4 }, + "machine_start_gcode": { "default_value": "G21\nG90\nM82\nM107\nG28 X0 Y0\nG28 Z0\nG1 F6000 Z0.3\nG92 E0\nG1 F1000 X30 E8\nG92 E0\nM117 Printing." }, + "machine_width": { "default_value": 108 }, + "material_bed_temp_wait": { "default_value": false }, + "min_infill_area": { "value": "1" }, + "min_skin_width_for_expansion": { "value": "2" }, + "prime_blob_enable": { "enabled": true }, "raft_base_thickness": { "value": "0.3" }, "raft_interface_line_spacing": { "value": "0.5" }, "raft_interface_line_width": { "value": "0.5" }, @@ -86,27 +90,18 @@ "retraction_min_travel": { "value": "5" }, "retraction_prime_speed": { "value": "25" }, "skin_overlap": { "value": "10" }, + "speed_infill": { "value": "speed_print * line_width / infill_line_width" }, "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_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_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)" }, - "travel_avoid_distance": { "value": "3" }, - "gradual_support_infill_step_height": { "value": "0.2" }, - "gradual_support_infill_steps": { "value": "1" }, - "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_pattern": { "value": "'zigzag'" }, @@ -116,6 +111,11 @@ "support_interface_enable": { "value": true }, "support_interface_height": { "value": "0.5" }, "support_roof_pattern": { "value": "'concentric'" }, + "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)" }, + "top_bottom_thickness": { "value": "max(1.2,layer_height*6)" }, + "travel_avoid_distance": { "value": "3" }, + "wall_thickness": { "value": "0.8" }, "z_seam_type": { "value": "'shortest'" } } -} +} \ No newline at end of file diff --git a/resources/definitions/winbo_superhelper155.def.json b/resources/definitions/winbo_superhelper155.def.json index 77b4bc31c5..50b14bd41d 100644 --- a/resources/definitions/winbo_superhelper155.def.json +++ b/resources/definitions/winbo_superhelper155.def.json @@ -2,28 +2,29 @@ "version": 2, "name": "Winbo Super Helper 155", "inherits": "winbo_superhelper105", - "metadata": { + "metadata": + { + "visible": true, "author": "Winbo", "manufacturer": "Winbo Smart Tech Co., Ltd.", - "visible": true, "file_formats": "text/x-gcode", - "supports_usb_connection": true, - "machine_extruder_trains": - { - "0": "winbo_superhelper155_extruder" - } + "machine_extruder_trains": { "0": "winbo_superhelper155_extruder" }, + "supports_usb_connection": true }, - "overrides": { - "machine_name": { "default_value": "Winbo Super Helper 155" }, - "machine_width": { "default_value": 158 }, + "overrides": + { "machine_depth": { "default_value": 158 }, - "machine_height": { "default_value": 208 }, "machine_head_with_fans_polygon": { - "default_value": - [ - [ -160, 50 ],[ -160, -30 ],[ 160, -30 ],[ 160, 50 ] + "default_value": [ + [-160, 50], + [-160, -30], + [160, -30], + [160, 50] ] - } + }, + "machine_height": { "default_value": 208 }, + "machine_name": { "default_value": "Winbo Super Helper 155" }, + "machine_width": { "default_value": 158 } } -} +} \ No newline at end of file diff --git a/resources/definitions/xyzprinting_base.def.json b/resources/definitions/xyzprinting_base.def.json index d9fa789b23..f2fc2b2d90 100644 --- a/resources/definitions/xyzprinting_base.def.json +++ b/resources/definitions/xyzprinting_base.def.json @@ -1,47 +1,43 @@ { - "name": "XYZprinting Base Printer", "version": 2, + "name": "XYZprinting Base Printer", "inherits": "fdmprinter", - "metadata": { + "machine_end_gcode": { "default_value": ";end gcode\nM104 S0 T0\nM140 S0 T0\nG162 Z F1800\nG28 X Y\nM652\nM132 X Y Z A B\nG91\nM18" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_start_gcode": { "default_value": ";Start Gcode\nG90 ;absolute positioning\nM118 X25.00 Y25.00 Z20.00 T0\nM140 S{material_bed_temperature_layer_0} T0 ;Heat bed up to first layer temperature\nM104 S{material_print_temperature_layer_0} T0 ;Set nozzle temperature to first layer temperature\nM107 ;start with the fan off\nG90\nG28\nM132 X Y Z A B\nG1 Z50.000 F420\nG161 X Y F3300\nM7 T0\nM6 T0\nM651\nM907 X100 Y100 Z40 A100 B20 ;Digital potentiometer value\nM108 T0\n;Purge line\nG1 X-110.00 Y-60.00 F4800\nG1 Z{layer_height_0} F420\nG1 X-110.00 Y60.00 E17,4 F1200\n;Purge line end" }, + "metadata": + { "visible": false, "author": "XYZprinting Software", "manufacturer": "XYZprinting", "file_formats": "text/x-gcode", - "first_start_actions": ["MachineSettingsAction"], - "machine_extruder_trains": - { - "0": "xyzprinting_base_extruder_0" - }, + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true, - "preferred_quality_type": "normal", + "machine_extruder_trains": { "0": "xyzprinting_base_extruder_0" }, "preferred_material": "xyzprinting_antibact_pla", + "preferred_quality_type": "normal", "variants_name": "Nozzle Type" }, - "overrides": { - "machine_heated_bed": {"default_value": true}, - "machine_max_feedrate_x": { "value": 500 }, - "machine_max_feedrate_y": { "value": 500 }, - "machine_max_feedrate_z": { "value": 10 }, - "machine_max_feedrate_e": { "value": 50 }, + "overrides": + { + "adhesion_type": { "value": "'none' if support_enable else 'brim'" }, + "brim_width": { "value": 10.0 }, + "cool_fan_speed": { "value": 100 }, + "cool_fan_speed_0": { "value": 0 }, + "machine_acceleration": { "value": 500 }, + "machine_heated_bed": { "default_value": true }, + "machine_max_acceleration_e": { "value": 5000 }, "machine_max_acceleration_x": { "value": 1500 }, "machine_max_acceleration_y": { "value": 1500 }, "machine_max_acceleration_z": { "value": 500 }, - "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_feedrate_e": { "value": 50 }, + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, "machine_max_jerk_e": { "value": 5 }, - "adhesion_type": { "value": "'none' if support_enable else 'brim'" }, - "brim_width": { "value": 10.0 }, - "cool_fan_speed": { "value": 100 }, - "cool_fan_speed_0": { "value": 0 } - }, - - - "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"}, - "machine_start_gcode": {"default_value": ";Start Gcode\nG90 ;absolute positioning\nM118 X25.00 Y25.00 Z20.00 T0\nM140 S{material_bed_temperature_layer_0} T0 ;Heat bed up to first layer temperature\nM104 S{material_print_temperature_layer_0} T0 ;Set nozzle temperature to first layer temperature\nM107 ;start with the fan off\nG90\nG28\nM132 X Y Z A B\nG1 Z50.000 F420\nG161 X Y F3300\nM7 T0\nM6 T0\nM651\nM907 X100 Y100 Z40 A100 B20 ;Digital potentiometer value\nM108 T0\n;Purge line\nG1 X-110.00 Y-60.00 F4800\nG1 Z{layer_height_0} F420\nG1 X-110.00 Y60.00 E17,4 F1200\n;Purge line end"}, - "machine_end_gcode": {"default_value": ";end gcode\nM104 S0 T0\nM140 S0 T0\nG162 Z F1800\nG28 X Y\nM652\nM132 X Y Z A B\nG91\nM18" - } + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.4 } } +} \ No newline at end of file diff --git a/resources/definitions/xyzprinting_da_vinci_1p0_pro.def.json b/resources/definitions/xyzprinting_da_vinci_1p0_pro.def.json index 87700973b7..a61c2e8af5 100644 --- a/resources/definitions/xyzprinting_da_vinci_1p0_pro.def.json +++ b/resources/definitions/xyzprinting_da_vinci_1p0_pro.def.json @@ -1,52 +1,48 @@ { - "version": 2, + "version": 2, "name": "XYZprinting da Vinci 1.0 Pro", "inherits": "xyzprinting_base", - "metadata": { - "author": "XYZprinting Software", - "manufacturer": "XYZprinting", + "metadata": + { "visible": true, + "author": "XYZprinting Software", + "manufacturer": "XYZprinting", "file_formats": "text/x-gcode", - "has_machine_quality": true, + "has_machine_quality": true, "has_materials": true, "has_variants": true, - "supports_usb_connection": true, + "machine_extruder_trains": { "0": "xyzprinting_da_vinci_1p0_pro_extruder_0" }, "preferred_quality_type": "normal", - "quality_definition": "xyzprinting_da_vinci_1p0_pro", - "preferred_variant_name": "Copper 0.4mm Nozzle", - "variants_name": "Nozzle Type", - "machine_extruder_trains": { - "0": "xyzprinting_da_vinci_1p0_pro_extruder_0" - } + "preferred_variant_name": "Copper 0.4mm Nozzle", + "quality_definition": "xyzprinting_da_vinci_1p0_pro", + "supports_usb_connection": true, + "variants_name": "Nozzle Type" }, - - "overrides": { - "machine_name": { "default_value": "XYZprinting da Vinci 1.0 Pro" }, - "machine_shape": { "default_value": "rectangular"}, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 200.00 }, - "machine_depth": { "default_value": 200.00 }, - "machine_height": { "default_value":200.00 }, + "overrides": + { + "brim_line_count": { "value": 5 }, + "cool_fan_enabled": { "default_value": true }, + "cool_fan_speed_0": { "value": 100 }, "machine_center_is_zero": { "default_value": false }, - "machine_head_with_fans_polygon": { + "machine_depth": { "default_value": 200.0 }, + "machine_end_gcode": { "default_value": "M104 S0 ; turn off temperature\nM105 S0; \nG28 X0 ; home X axis\nM84 ; disable motors\n" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { "default_value": [ - [ -20, -10 ], - [ -20, 10 ], - [ 10, 10 ], - [ 10, -10 ] + [-20, -10], + [-20, 10], + [10, 10], + [10, -10] ] }, - "material_flow_layer_0": {"value": 120}, - "cool_fan_enabled": { "default_value": true }, - "cool_fan_speed_0": { "value": 100 }, - "brim_line_count": { "value" : 5 }, - "skirt_line_count": { "default_value" : 5 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "G28 ; home all axes\nG1 Z15 F5000 ; lift nozzle\nG92 E0\nG1 F200 E3\n" - }, - "machine_end_gcode": { - "default_value": "M104 S0 ; turn off temperature\nM105 S0; \nG28 X0 ; home X axis\nM84 ; disable motors\n" - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 200.0 }, + "machine_name": { "default_value": "XYZprinting da Vinci 1.0 Pro" }, + "machine_shape": { "default_value": "rectangular" }, + "machine_start_gcode": { "default_value": "G28 ; home all axes\nG1 Z15 F5000 ; lift nozzle\nG92 E0\nG1 F200 E3\n" }, + "machine_width": { "default_value": 200.0 }, + "material_flow_layer_0": { "value": 120 }, + "skirt_line_count": { "default_value": 5 } } -} +} \ No newline at end of file diff --git a/resources/definitions/xyzprinting_da_vinci_jr_1p0a_pro.def.json b/resources/definitions/xyzprinting_da_vinci_jr_1p0a_pro.def.json index ab2e1d9fcf..164c0eb579 100644 --- a/resources/definitions/xyzprinting_da_vinci_jr_1p0a_pro.def.json +++ b/resources/definitions/xyzprinting_da_vinci_jr_1p0a_pro.def.json @@ -1,53 +1,80 @@ { - "version": 2, + "version": 2, "name": "XYZprinting da Vinci Jr. 1.0A Pro", "inherits": "xyzprinting_base", - "metadata": { - "author": "XYZprinting Software", - "manufacturer": "XYZprinting", + "metadata": + { "visible": true, + "author": "XYZprinting Software", + "manufacturer": "XYZprinting", "file_formats": "text/x-gcode", - "has_machine_quality": true, + "exclude_materials": [ + "generic_hips", + "generic_petg", + "generic_bam", + "ultimaker_bam", + "generic_pva", + "ultimaker_pva", + "generic_tough_pla", + "ultimaker_tough_pla_black", + "ultimaker_tough_pla_green", + "ultimaker_tough_pla_red", + "ultimaker_tough_pla_white", + "generic_cffcpe", + "generic_cffpa", + "generic_gffcpe", + "generic_gffpa", + "structur3d_dap100silicone", + "ultimaker_petg_blue", + "ultimaker_petg_grey", + "ultimaker_petg_black", + "ultimaker_petg_green", + "ultimaker_petg_white", + "ultimaker_petg_orange", + "ultimaker_petg_silver", + "ultimaker_petg_yellow", + "ultimaker_petg_transparent", + "ultimaker_petg_red_translucent", + "ultimaker_petg_blue_translucent", + "ultimaker_petg_green_translucent", + "ultimaker_petg_yellow_fluorescent", + "ultimaker_petg_red" + ], + "has_machine_quality": true, "has_materials": true, "has_variants": true, - "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone", "ultimaker_petg_blue", "ultimaker_petg_grey", "ultimaker_petg_black", "ultimaker_petg_green", "ultimaker_petg_white", "ultimaker_petg_orange", "ultimaker_petg_silver", "ultimaker_petg_yellow", "ultimaker_petg_transparent", "ultimaker_petg_red_translucent", "ultimaker_petg_blue_translucent", "ultimaker_petg_green_translucent", "ultimaker_petg_yellow_fluorescent", "ultimaker_petg_red" ], - "supports_usb_connection": true, + "machine_extruder_trains": { "0": "xyzprinting_da_vinci_jr_1p0a_pro_extruder_0" }, "preferred_quality_type": "normal", - "quality_definition": "xyzprinting_da_vinci_jr_1p0a_pro", - "preferred_variant_name": "Copper 0.4mm Nozzle", - "variants_name": "Nozzle Type", - "machine_extruder_trains": { - "0": "xyzprinting_da_vinci_jr_1p0a_pro_extruder_0" - } + "preferred_variant_name": "Copper 0.4mm Nozzle", + "quality_definition": "xyzprinting_da_vinci_jr_1p0a_pro", + "supports_usb_connection": true, + "variants_name": "Nozzle Type" }, - - "overrides": { - "machine_name": { "default_value": "XYZprinting da Vinci Jr. 1.0A Pro" }, - "machine_shape": { "default_value": "rectangular"}, - "machine_heated_bed": { "default_value": false }, - "machine_width": { "default_value": 175.00 }, - "machine_depth": { "default_value": 175.00 }, - "machine_height": { "default_value":175.00 }, + "overrides": + { + "brim_line_count": { "value": 5 }, + "cool_fan_enabled": { "default_value": true }, + "cool_fan_speed_0": { "value": 100 }, "machine_center_is_zero": { "default_value": false }, - "machine_head_with_fans_polygon": { + "machine_depth": { "default_value": 175.0 }, + "machine_end_gcode": { "default_value": "M104 S0 ; turn off temperature\nM105 S0; \nG28 X0 ; home X axis\nM84 ; disable motors\n" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { "default_value": [ - [ -20, -10 ], - [ -20, 10 ], - [ 10, 10 ], - [ 10, -10 ] + [-20, -10], + [-20, 10], + [10, 10], + [10, -10] ] }, - "material_flow_layer_0": {"value": 120}, - "cool_fan_enabled": { "default_value": true }, - "cool_fan_speed_0": { "value": 100 }, - "brim_line_count": { "value" : 5 }, - "skirt_line_count": { "default_value" : 5 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "G28 ; home all axes\nG1 Z15 F5000 ; lift nozzle\nG92 E0\nG1 F200 E3\n" - }, - "machine_end_gcode": { - "default_value": "M104 S0 ; turn off temperature\nM105 S0; \nG28 X0 ; home X axis\nM84 ; disable motors\n" - } + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 175.0 }, + "machine_name": { "default_value": "XYZprinting da Vinci Jr. 1.0A Pro" }, + "machine_shape": { "default_value": "rectangular" }, + "machine_start_gcode": { "default_value": "G28 ; home all axes\nG1 Z15 F5000 ; lift nozzle\nG92 E0\nG1 F200 E3\n" }, + "machine_width": { "default_value": 175.0 }, + "material_flow_layer_0": { "value": 120 }, + "skirt_line_count": { "default_value": 5 } } -} +} \ No newline at end of file diff --git a/resources/definitions/xyzprinting_da_vinci_jr_pro_xeplus.def.json b/resources/definitions/xyzprinting_da_vinci_jr_pro_xeplus.def.json index eb4c4139d3..5946cf1e99 100644 --- a/resources/definitions/xyzprinting_da_vinci_jr_pro_xeplus.def.json +++ b/resources/definitions/xyzprinting_da_vinci_jr_pro_xeplus.def.json @@ -1,52 +1,48 @@ { - "version": 2, + "version": 2, "name": "XYZprinting da Vinci Jr. Pro Xe+", "inherits": "xyzprinting_base", - "metadata": { - "author": "XYZprinting Software", - "manufacturer": "XYZprinting", + "metadata": + { "visible": true, + "author": "XYZprinting Software", + "manufacturer": "XYZprinting", "file_formats": "text/x-gcode", - "has_machine_quality": true, + "has_machine_quality": true, "has_materials": true, "has_variants": true, - "supports_usb_connection": true, + "machine_extruder_trains": { "0": "xyzprinting_da_vinci_jr_pro_xeplus_extruder_0" }, "preferred_quality_type": "normal", - "quality_definition": "xyzprinting_da_vinci_jr_pro_xeplus", - "preferred_variant_name": "Copper 0.4mm Nozzle", - "variants_name": "Nozzle Type", - "machine_extruder_trains": { - "0": "xyzprinting_da_vinci_jr_pro_xeplus_extruder_0" - } + "preferred_variant_name": "Copper 0.4mm Nozzle", + "quality_definition": "xyzprinting_da_vinci_jr_pro_xeplus", + "supports_usb_connection": true, + "variants_name": "Nozzle Type" }, - - "overrides": { - "machine_name": { "default_value": "XYZprinting da Vinci Jr. Pro Xe+" }, - "machine_shape": { "default_value": "rectangular"}, - "machine_heated_bed": { "default_value": false }, - "machine_width": { "default_value": 175.00 }, - "machine_depth": { "default_value": 175.00 }, - "machine_height": { "default_value":175.00 }, + "overrides": + { + "brim_line_count": { "value": 5 }, + "cool_fan_enabled": { "default_value": true }, + "cool_fan_speed_0": { "value": 100 }, "machine_center_is_zero": { "default_value": false }, - "machine_head_with_fans_polygon": { + "machine_depth": { "default_value": 175.0 }, + "machine_end_gcode": { "default_value": "M104 S0 ; turn off temperature\nM105 S0; \nG28 X0 ; home X axis\nM84 ; disable motors\n" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { "default_value": [ - [ -20, -10 ], - [ -20, 10 ], - [ 10, 10 ], - [ 10, -10 ] + [-20, -10], + [-20, 10], + [10, 10], + [10, -10] ] }, - "material_flow_layer_0": {"value": 120}, - "cool_fan_enabled": { "default_value": true }, - "cool_fan_speed_0": { "value": 100 }, - "brim_line_count": { "value" : 5 }, - "skirt_line_count": { "default_value" : 5 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "G28 ; home all axes\nG1 Z15 F5000 ; lift nozzle\nG92 E0\nG1 F200 E3\n" - }, - "machine_end_gcode": { - "default_value": "M104 S0 ; turn off temperature\nM105 S0; \nG28 X0 ; home X axis\nM84 ; disable motors\n" - } + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 175.0 }, + "machine_name": { "default_value": "XYZprinting da Vinci Jr. Pro Xe+" }, + "machine_shape": { "default_value": "rectangular" }, + "machine_start_gcode": { "default_value": "G28 ; home all axes\nG1 Z15 F5000 ; lift nozzle\nG92 E0\nG1 F200 E3\n" }, + "machine_width": { "default_value": 175.0 }, + "material_flow_layer_0": { "value": 120 }, + "skirt_line_count": { "default_value": 5 } } -} +} \ No newline at end of file diff --git a/resources/definitions/xyzprinting_da_vinci_jr_pro_xplus.def.json b/resources/definitions/xyzprinting_da_vinci_jr_pro_xplus.def.json index 3216929029..03796edc35 100644 --- a/resources/definitions/xyzprinting_da_vinci_jr_pro_xplus.def.json +++ b/resources/definitions/xyzprinting_da_vinci_jr_pro_xplus.def.json @@ -1,52 +1,48 @@ { - "version": 2, + "version": 2, "name": "XYZprinting da Vinci Jr. Pro X+", "inherits": "xyzprinting_base", - "metadata": { - "author": "XYZprinting Software", - "manufacturer": "XYZprinting", + "metadata": + { "visible": true, + "author": "XYZprinting Software", + "manufacturer": "XYZprinting", "file_formats": "text/x-gcode", - "has_machine_quality": true, + "has_machine_quality": true, "has_materials": true, "has_variants": true, - "supports_usb_connection": true, + "machine_extruder_trains": { "0": "xyzprinting_da_vinci_jr_pro_xplus_extruder_0" }, "preferred_quality_type": "normal", - "quality_definition": "xyzprinting_da_vinci_jr_pro_xplus", - "preferred_variant_name": "Copper 0.4mm Nozzle", - "variants_name": "Nozzle Type", - "machine_extruder_trains": { - "0": "xyzprinting_da_vinci_jr_pro_xplus_extruder_0" - } + "preferred_variant_name": "Copper 0.4mm Nozzle", + "quality_definition": "xyzprinting_da_vinci_jr_pro_xplus", + "supports_usb_connection": true, + "variants_name": "Nozzle Type" }, - - "overrides": { - "machine_name": { "default_value": "XYZprinting da Vinci Jr. Pro X+" }, - "machine_shape": { "default_value": "rectangular"}, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 175.00 }, - "machine_depth": { "default_value": 175.00 }, - "machine_height": { "default_value":175.00 }, + "overrides": + { + "brim_line_count": { "value": 5 }, + "cool_fan_enabled": { "default_value": true }, + "cool_fan_speed_0": { "value": 100 }, "machine_center_is_zero": { "default_value": false }, - "machine_head_with_fans_polygon": { + "machine_depth": { "default_value": 175.0 }, + "machine_end_gcode": { "default_value": "M104 S0 ; turn off temperature\nM105 S0; \nG28 X0 ; home X axis\nM84 ; disable motors\n" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { "default_value": [ - [ -20, -10 ], - [ -20, 10 ], - [ 10, 10 ], - [ 10, -10 ] + [-20, -10], + [-20, 10], + [10, 10], + [10, -10] ] }, - "material_flow_layer_0": {"value": 120}, - "cool_fan_enabled": { "default_value": true }, - "cool_fan_speed_0": { "value": 100 }, - "brim_line_count": { "value" : 5 }, - "skirt_line_count": { "default_value" : 5 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "G28 ; home all axes\nG1 Z15 F5000 ; lift nozzle\nG92 E0\nG1 F200 E3\n" - }, - "machine_end_gcode": { - "default_value": "M104 S0 ; turn off temperature\nM105 S0; \nG28 X0 ; home X axis\nM84 ; disable motors\n" - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 175.0 }, + "machine_name": { "default_value": "XYZprinting da Vinci Jr. Pro X+" }, + "machine_shape": { "default_value": "rectangular" }, + "machine_start_gcode": { "default_value": "G28 ; home all axes\nG1 Z15 F5000 ; lift nozzle\nG92 E0\nG1 F200 E3\n" }, + "machine_width": { "default_value": 175.0 }, + "material_flow_layer_0": { "value": 120 }, + "skirt_line_count": { "default_value": 5 } } -} +} \ No newline at end of file diff --git a/resources/definitions/xyzprinting_da_vinci_jr_w_pro.def.json b/resources/definitions/xyzprinting_da_vinci_jr_w_pro.def.json index 923fec524e..686163c7af 100644 --- a/resources/definitions/xyzprinting_da_vinci_jr_w_pro.def.json +++ b/resources/definitions/xyzprinting_da_vinci_jr_w_pro.def.json @@ -1,52 +1,48 @@ { - "version": 2, + "version": 2, "name": "XYZprinting da Vinci Jr. WiFi Pro", "inherits": "xyzprinting_base", - "metadata": { - "author": "XYZprinting Software", - "manufacturer": "XYZprinting", + "metadata": + { "visible": true, + "author": "XYZprinting Software", + "manufacturer": "XYZprinting", "file_formats": "text/x-gcode", - "has_machine_quality": true, + "has_machine_quality": true, "has_materials": true, "has_variants": true, - "supports_usb_connection": true, + "machine_extruder_trains": { "0": "xyzprinting_da_vinci_jr_w_pro_extruder_0" }, "preferred_quality_type": "normal", - "quality_definition": "xyzprinting_da_vinci_jr_w_pro", - "preferred_variant_name": "Stainless Steel 0.4mm Nozzle", - "variants_name": "Nozzle Type", - "machine_extruder_trains": { - "0": "xyzprinting_da_vinci_jr_w_pro_extruder_0" - } + "preferred_variant_name": "Stainless Steel 0.4mm Nozzle", + "quality_definition": "xyzprinting_da_vinci_jr_w_pro", + "supports_usb_connection": true, + "variants_name": "Nozzle Type" }, - - "overrides": { - "machine_name": { "default_value": "XYZprinting da Vinci Jr. WiFi Pro" }, - "machine_shape": { "default_value": "rectangular"}, - "machine_heated_bed": { "default_value": false }, - "machine_width": { "default_value": 150.00 }, - "machine_depth": { "default_value": 150.00 }, - "machine_height": { "default_value":150.00 }, + "overrides": + { + "brim_line_count": { "value": 5 }, + "cool_fan_enabled": { "default_value": true }, + "cool_fan_speed_0": { "value": 100 }, "machine_center_is_zero": { "default_value": false }, - "machine_head_with_fans_polygon": { + "machine_depth": { "default_value": 150.0 }, + "machine_end_gcode": { "default_value": "M104 S0 ; turn off temperature\nM105 S0; \nG28 X0 ; home X axis\nM84 ; disable motors\n" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { "default_value": [ - [ -20, -10 ], - [ -20, 10 ], - [ 10, 10 ], - [ 10, -10 ] + [-20, -10], + [-20, 10], + [10, 10], + [10, -10] ] }, - "material_flow_layer_0": {"value": 120}, - "cool_fan_enabled": { "default_value": true }, - "cool_fan_speed_0": { "value": 100 }, - "brim_line_count": { "value" : 5 }, - "skirt_line_count": { "default_value" : 5 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "G28 ; home all axes\nG1 Z15 F5000 ; lift nozzle\nG92 E0\nG1 F200 E3\n" - }, - "machine_end_gcode": { - "default_value": "M104 S0 ; turn off temperature\nM105 S0; \nG28 X0 ; home X axis\nM84 ; disable motors\n" - } + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 150.0 }, + "machine_name": { "default_value": "XYZprinting da Vinci Jr. WiFi Pro" }, + "machine_shape": { "default_value": "rectangular" }, + "machine_start_gcode": { "default_value": "G28 ; home all axes\nG1 Z15 F5000 ; lift nozzle\nG92 E0\nG1 F200 E3\n" }, + "machine_width": { "default_value": 150.0 }, + "material_flow_layer_0": { "value": 120 }, + "skirt_line_count": { "default_value": 5 } } -} +} \ No newline at end of file diff --git a/resources/definitions/xyzprinting_da_vinci_pro_evo.def.json b/resources/definitions/xyzprinting_da_vinci_pro_evo.def.json index f00ab8b0c2..7bb05e9dc3 100644 --- a/resources/definitions/xyzprinting_da_vinci_pro_evo.def.json +++ b/resources/definitions/xyzprinting_da_vinci_pro_evo.def.json @@ -1,86 +1,80 @@ { - "version": 2, + "version": 2, "name": "XYZprinting da Vinci Pro EVO", "inherits": "xyzprinting_base", - "metadata": { - "author": "XYZprinting Software", - "manufacturer": "XYZprinting", + "metadata": + { "visible": true, + "author": "XYZprinting Software", + "manufacturer": "XYZprinting", "file_formats": "text/x-gcode", - "has_machine_quality": true, + "has_machine_quality": true, "has_materials": true, "has_variants": true, - "supports_usb_connection": true, + "machine_extruder_trains": { "0": "xyzprinting_da_vinci_pro_evo_extruder_0" }, "preferred_quality_type": "normal", - "quality_definition": "xyzprinting_da_vinci_pro_evo", - "preferred_variant_name": "Hardened Steel 0.4mm Nozzle", - "variants_name": "Nozzle Type", - "machine_extruder_trains": { - "0": "xyzprinting_da_vinci_pro_evo_extruder_0" - } + "preferred_variant_name": "Hardened Steel 0.4mm Nozzle", + "quality_definition": "xyzprinting_da_vinci_pro_evo", + "supports_usb_connection": true, + "variants_name": "Nozzle Type" }, - - "overrides": { - "machine_name": { "default_value": "XYZprinting da Vinci Pro EVO" }, - "machine_shape": { "default_value": "rectangular"}, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 220.00 }, - "machine_depth": { "default_value": 200.00 }, - "machine_height": { "default_value":200.00 }, - "machine_center_is_zero": { "default_value": false }, - "machine_head_with_fans_polygon": { - "default_value": [ - [ -20, -10 ], - [ -20, 10 ], - [ 10, 10 ], - [ 10, -10 ] - ] - }, - "retraction_extrusion_window": { "value": "1" }, - "retraction_count_max": { "value": "25" }, - "speed_layer_0" : {"value" : 10 }, - "speed_wall_x" : { "value": "speed_print" }, - "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 30)" }, - "skin_overlap": { "value": "15" }, - "skin_monotonic" : { "value": true }, - "skin_material_flow": { "value": "97" }, - "brim_width": { "value": "10" }, - "line_width" : { "value": "0.35" }, - "wall_line_width_x" : { "value": "0.35" }, - "infill_before_walls": { "value": false }, - "infill_line_width" : { "value": "0.4" }, - "infill_overlap": { "value": "0" }, - "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, - "infill_wipe_dist": { "value": "0" }, - "infill_wipe_dist": { "value": "0" }, - "wall_thickness" : { "value": "1" }, - "acceleration_enabled" : {"value" : true}, - "acceleration_layer_0": { "value": "acceleration_topbottom" }, + "overrides": + { + "acceleration_enabled": { "value": true }, + "acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 3000)" }, "acceleration_print": { "value": "3000" }, - "acceleration_travel": { "value": "3000" }, "acceleration_support": { "value": "math.ceil(acceleration_print * 2000 / 3000)" }, "acceleration_support_interface": { "value": "acceleration_topbottom" }, "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 500 / 3000)" }, + "acceleration_travel": { "value": "3000" }, "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 3000)" }, "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 500 / 1000)" }, - "jerk_enabled" : {"value" : true}, - "material_flow_layer_0": {"value": 120}, + "brim_line_count": { "value": 5 }, + "brim_width": { "value": "10" }, "cool_fan_enabled": { "default_value": true }, - "cool_fan_speed_0": { "value": 100 }, - "cool_min_speed" : {"value" : 5 }, - "brim_line_count": { "value" : 5 }, - "infill_before_walls": { "value": false }, - "optimize_wall_printing_order": { "value": "True" }, - "skirt_line_count": { "default_value" : 5 }, + "cool_fan_speed_0": { "value": 100 }, + "cool_min_speed": { "value": 5 }, + "infill_before_walls": { "value": false }, + "infill_line_width": { "value": "0.4" }, + "infill_overlap": { "value": "0" }, + "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, + "infill_wipe_dist": { "value": "0" }, + "jerk_enabled": { "value": true }, + "line_width": { "value": "0.35" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 200.0 }, + "machine_end_gcode": { "default_value": "M106 P1 S255 ; turn on fan\nG92 E0\nG28; home X,Y,Z axis\nM84 ; disable motors\n" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "M191\nG28 ; home all axes\nG1 Z15 F5000 ; lift nozzle\nG92 E0\nG1 F200 E3\n" - }, - "machine_end_gcode": { - "default_value": "M106 P1 S255 ; turn on fan\nG92 E0\nG28; home X,Y,Z axis\nM84 ; disable motors\n" + "machine_head_with_fans_polygon": + { + "default_value": [ + [-20, -10], + [-20, 10], + [10, 10], + [10, -10] + ] }, - "multiple_mesh_overlap": { "value": "0" }, - "wall_0_inset": { "value": "0" } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 200.0 }, + "machine_name": { "default_value": "XYZprinting da Vinci Pro EVO" }, + "machine_shape": { "default_value": "rectangular" }, + "machine_start_gcode": { "default_value": "M191\nG28 ; home all axes\nG1 Z15 F5000 ; lift nozzle\nG92 E0\nG1 F200 E3\n" }, + "machine_width": { "default_value": 220.0 }, + "material_flow_layer_0": { "value": 120 }, + "multiple_mesh_overlap": { "value": "0" }, + "optimize_wall_printing_order": { "value": "True" }, + "retraction_count_max": { "value": "25" }, + "retraction_extrusion_window": { "value": "1" }, + "skin_material_flow": { "value": "97" }, + "skin_monotonic": { "value": true }, + "skin_overlap": { "value": "15" }, + "skirt_line_count": { "default_value": 5 }, + "speed_layer_0": { "value": 10 }, + "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 30)" }, + "speed_wall_x": { "value": "speed_print" }, + "wall_0_inset": { "value": "0" }, + "wall_line_width_x": { "value": "0.35" }, + "wall_thickness": { "value": "1" } } -} +} \ No newline at end of file diff --git a/resources/definitions/xyzprinting_da_vinci_super.def.json b/resources/definitions/xyzprinting_da_vinci_super.def.json index 1fbc4ec9d0..b8c4768028 100644 --- a/resources/definitions/xyzprinting_da_vinci_super.def.json +++ b/resources/definitions/xyzprinting_da_vinci_super.def.json @@ -1,52 +1,48 @@ { - "version": 2, + "version": 2, "name": "XYZprinting da Vinci Super", "inherits": "xyzprinting_base", - "metadata": { - "author": "XYZprinting Software", - "manufacturer": "XYZprinting", + "metadata": + { "visible": true, + "author": "XYZprinting Software", + "manufacturer": "XYZprinting", "file_formats": "text/x-gcode", - "has_machine_quality": true, + "has_machine_quality": true, "has_materials": true, "has_variants": true, - "supports_usb_connection": true, + "machine_extruder_trains": { "0": "xyzprinting_da_vinci_super_extruder_0" }, "preferred_quality_type": "normal", - "quality_definition": "xyzprinting_da_vinci_super", - "preferred_variant_name": "Copper 0.4mm Nozzle", - "variants_name": "Nozzle Type", - "machine_extruder_trains": { - "0": "xyzprinting_da_vinci_super_extruder_0" - } + "preferred_variant_name": "Copper 0.4mm Nozzle", + "quality_definition": "xyzprinting_da_vinci_super", + "supports_usb_connection": true, + "variants_name": "Nozzle Type" }, - - "overrides": { - "machine_name": { "default_value": "XYZprinting da Vinci Super" }, - "machine_shape": { "default_value": "rectangular"}, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 300.00 }, - "machine_depth": { "default_value": 300.00 }, - "machine_height": { "default_value":300.00 }, + "overrides": + { + "brim_line_count": { "value": 5 }, + "cool_fan_enabled": { "default_value": true }, + "cool_fan_speed_0": { "value": 100 }, "machine_center_is_zero": { "default_value": false }, - "machine_head_with_fans_polygon": { + "machine_depth": { "default_value": 300.0 }, + "machine_end_gcode": { "default_value": "M104 S0 ; turn off temperature\nM105 S0; \nG28 X0 ; home X axis\nM84 ; disable motors\n" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { "default_value": [ - [ -20, -10 ], - [ -20, 10 ], - [ 10, 10 ], - [ 10, -10 ] + [-20, -10], + [-20, 10], + [10, 10], + [10, -10] ] }, - "material_flow_layer_0": {"value": 120}, - "cool_fan_enabled": { "default_value": true }, - "cool_fan_speed_0": { "value": 100 }, - "brim_line_count": { "value" : 5 }, - "skirt_line_count": { "default_value" : 5 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { - "default_value": "G28 ; home all axes\nG1 Z15 F5000 ; lift nozzle\nG92 E0\nG1 F200 E3\n" - }, - "machine_end_gcode": { - "default_value": "M104 S0 ; turn off temperature\nM105 S0; \nG28 X0 ; home X axis\nM84 ; disable motors\n" - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 300.0 }, + "machine_name": { "default_value": "XYZprinting da Vinci Super" }, + "machine_shape": { "default_value": "rectangular" }, + "machine_start_gcode": { "default_value": "G28 ; home all axes\nG1 Z15 F5000 ; lift nozzle\nG92 E0\nG1 F200 E3\n" }, + "machine_width": { "default_value": 300.0 }, + "material_flow_layer_0": { "value": 120 }, + "skirt_line_count": { "default_value": 5 } } -} +} \ No newline at end of file diff --git a/resources/definitions/z-bolt_classic.def.json b/resources/definitions/z-bolt_classic.def.json index 563d9f87ef..5b80597092 100644 --- a/resources/definitions/z-bolt_classic.def.json +++ b/resources/definitions/z-bolt_classic.def.json @@ -2,58 +2,36 @@ "version": 2, "name": "Z-Bolt Classic", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Z-Bolt", "manufacturer": "Z-Bolt Co.", "file_formats": "text/x-gcode", "platform": "z-bolt_classic_platform.3mf", - "machine_extruder_trains": - { - "0": "z-bolt_extruder_0" - } + "machine_extruder_trains": { "0": "z-bolt_extruder_0" } }, - - "overrides": { - "machine_name": { "default_value": "Z-Bolt Classic" }, - "machine_heated_bed": { - "default_value": true - }, - "machine_width": { - "default_value": 200 - }, - "machine_height": { - "default_value": 240 - }, - "machine_depth": { - "default_value": 200 - }, - "machine_center_is_zero": { - "default_value": false - }, + "overrides": + { + "gantry_height": { "value": "55" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "'M104 S0 ;extruder heater off' + ('\nM140 S0 ;heated bed heater off' if machine_heated_bed else '') + '\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 Z0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning'" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_head_with_fans_polygon": { "default_value": [ - [ -75, 35 ], - [ -75, -18 ], - [ 18, 35 ], - [ 18, -18 ] + [-75, 35], + [-75, -18], + [18, 35], + [18, -18] ] }, - "gantry_height": { - "value": "55" - }, - "machine_use_extruder_offset_to_offset_coords": { - "default_value": true - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." - }, - "machine_end_gcode": { - "default_value": "'M104 S0 ;extruder heater off' + ('\nM140 S0 ;heated bed heater off' if machine_heated_bed else '') + '\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 Z0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning'" - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 240 }, + "machine_name": { "default_value": "Z-Bolt Classic" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, + "machine_width": { "default_value": 200 } } } \ No newline at end of file diff --git a/resources/definitions/z-bolt_plus.def.json b/resources/definitions/z-bolt_plus.def.json index 3a33fa690b..fdee0f50c4 100644 --- a/resources/definitions/z-bolt_plus.def.json +++ b/resources/definitions/z-bolt_plus.def.json @@ -2,58 +2,36 @@ "version": 2, "name": "Z-Bolt Plus", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Z-Bolt", "manufacturer": "Z-Bolt Co.", "file_formats": "text/x-gcode", "platform": "z-bolt_plus_platform.3mf", - "machine_extruder_trains": - { - "0": "z-bolt_extruder_0" - } + "machine_extruder_trains": { "0": "z-bolt_extruder_0" } }, - - "overrides": { - "machine_name": { "default_value": "Z-Bolt Plus" }, - "machine_heated_bed": { - "default_value": true - }, - "machine_width": { - "default_value": 300 - }, - "machine_height": { - "default_value": 335 - }, - "machine_depth": { - "default_value": 200 - }, - "machine_center_is_zero": { - "default_value": false - }, + "overrides": + { + "gantry_height": { "value": "55" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "'M104 S0 ;extruder heater off' + ('\nM140 S0 ;heated bed heater off' if machine_heated_bed else '') + '\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 Z0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning'" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_head_with_fans_polygon": { "default_value": [ - [ -75, 35 ], - [ -75, -18 ], - [ 18, 35 ], - [ 18, -18 ] + [-75, 35], + [-75, -18], + [18, 35], + [18, -18] ] }, - "gantry_height": { - "value": "55" - }, - "machine_use_extruder_offset_to_offset_coords": { - "default_value": true - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." - }, - "machine_end_gcode": { - "default_value": "'M104 S0 ;extruder heater off' + ('\nM140 S0 ;heated bed heater off' if machine_heated_bed else '') + '\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 Z0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning'" - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 335 }, + "machine_name": { "default_value": "Z-Bolt Plus" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, + "machine_width": { "default_value": 300 } } } \ No newline at end of file diff --git a/resources/definitions/zav_base.def.json b/resources/definitions/zav_base.def.json index 5e20b849f5..2c9516aecf 100644 --- a/resources/definitions/zav_base.def.json +++ b/resources/definitions/zav_base.def.json @@ -1,151 +1,157 @@ { - "name": "Zav Base Printer", "version": 2, + "name": "Zav Base Printer", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": false, "author": "Kirill Nikolaev, Kim Evgeniy (C)", "manufacturer": "Zav Co., Ltd.", "file_formats": "text/x-gcode", - "first_start_actions": ["MachineSettingsAction"], - "machine_extruder_trains": { + "exclude_materials": [ + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_hips", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pva-m", + "emotiontech_pva-oks", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "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", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "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", + "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", + "zyyx_pro_flex", + "zyyx_pro_pla" + ], + "first_start_actions": [ "MachineSettingsAction" ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": + { "0": "zav_extruder_1", "1": "zav_extruder_2" }, - "has_materials": true, "preferred_material": "bestfilament_abs_skyblue", - "has_variants": true, - "variants_name": "Nozzle Size", - "preferred_variant_name": "0.40mm_ZAV_Nozzle", - "has_machine_quality": true, "preferred_quality_type": "ZAV_layer_020", - "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_hips", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pva-m", - "emotiontech_pva-oks", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "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", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "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", - "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", - "zyyx_pro_flex", - "zyyx_pro_pla"] + "preferred_variant_name": "0.40mm_ZAV_Nozzle", + "variants_name": "Nozzle Size" }, - "overrides": { - "machine_name": {"default_value": "ZAV Base Printer"}, - "machine_start_gcode": {"default_value": ";---- Starting Script Start ----\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 Z0 ;move Z to min endstops\nG28 X0 Y0 ;move X/Y to min endstops\nG92 E0 ;zero the extruded length\nG1 F5000 ;set speed\nG1 Y40 ;move to start position Y\nM117 Printing...\n;---- Starting Script End ----\n"}, - "machine_end_gcode": {"default_value": ";---- Ending Script Start ----\nM104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-4 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 F5000 ;move Z up a bit and retract filament even more\nG28 Z0 ;move bed down\nG28 X0 Y0 ;move X/Y to min endstops so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\nM107 ;switch off cooling fan\nM355 S0 P0 ;switch off case light\n;---- Ending Script End ----\n"}, - "machine_heated_bed": {"default_value": true}, - "material_diameter": {"default_value": 1.75}, - "machine_shape": {"default_value": "rectangular"}, - "machine_width": {"default_value": 300}, - "machine_depth": {"default_value": 200}, - "machine_height": {"default_value": 270}, - "machine_extruder_count": {"value": 1}, - "machine_buildplate_type": {"value": "glass"}, - "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] - ] - }, - "gantry_height": {"value": 999999}, - "layer_height_0": {"value": "layer_height"}, - "line_width": {"value": "machine_nozzle_size"}, - "skin_line_width": {"value": "round(line_width * 1.0, 2)"}, - "infill_line_width": {"value": "round(line_width * 1.1, 2)"}, - "skirt_brim_line_width": {"value": "round(line_width * 1.1, 2)"}, - "initial_layer_line_width_factor": {"value": "100"}, - "bottom_thickness": {"value": "layer_height*3 if layer_height > 0.15 else 0.8"}, - "top_bottom_pattern": {"value": "'zigzag'"}, - "top_bottom_pattern_0": {"value": "'zigzag'"}, - "optimize_wall_printing_order": {"value": "True" }, - "z_seam_type": {"value": "'shortest'"}, - "skin_outline_count": {"value": "0"}, - "infill_pattern": {"value": "'gyroid'"}, - "zig_zaggify_infill": {"value": "True"}, - "infill_before_walls": {"value": "False"}, - "infill_enable_travel_optimization": {"value": "True"}, - "expand_skins_expand_distance": {"value": "3"}, - "retraction_min_travel": {"value": "3"}, - "retraction_amount": {"value": "4"}, - "speed_print": {"value": "80"}, - "speed_topbottom": {"value": "50"}, - "speed_layer_0": {"value": "25"}, - "speed_travel_layer_0": {"value": "40"}, - "retraction_combing": {"value": "'all'"}, - "retraction_combing_max_distance": {"value": "10"}, - "travel_avoid_other_parts": {"value": "False"}, - "cool_min_layer_time_fan_speed_max": {"value": "20"}, - "cool_fan_full_at_height": {"value": "layer_height*2"}, - "cool_min_layer_time": {"value": "15"}, - "cool_min_speed": {"value": "15"}, - "cool_lift_head": {"value": "True"}, - "support_enable": {"value": "True"}, - "support_angle": {"value": "65"}, - "support_brim_enable": {"value": "True"}, - "support_infill_rate": {"value": "20"}, - "support_offset": {"value": "2"}, - "adhesion_type": {"value": "'brim'"}, - "brim_width": {"value": "5"}, - "bridge_settings_enabled": {"value": "True"} + "overrides": + { + "adhesion_type": { "value": "'brim'" }, + "bottom_thickness": { "value": "layer_height*3 if layer_height > 0.15 else 0.8" }, + "bridge_settings_enabled": { "value": "True" }, + "brim_width": { "value": "5" }, + "cool_fan_full_at_height": { "value": "layer_height*2" }, + "cool_lift_head": { "value": "True" }, + "cool_min_layer_time": { "value": "15" }, + "cool_min_layer_time_fan_speed_max": { "value": "20" }, + "cool_min_speed": { "value": "15" }, + "expand_skins_expand_distance": { "value": "3" }, + "gantry_height": { "value": 999999 }, + "infill_before_walls": { "value": "False" }, + "infill_enable_travel_optimization": { "value": "True" }, + "infill_line_width": { "value": "round(line_width * 1.1, 2)" }, + "infill_pattern": { "value": "'gyroid'" }, + "initial_layer_line_width_factor": { "value": "100" }, + "layer_height_0": { "value": "layer_height" }, + "line_width": { "value": "machine_nozzle_size" }, + "machine_buildplate_type": { "value": "glass" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": ";---- Ending Script Start ----\nM104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-4 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 F5000 ;move Z up a bit and retract filament even more\nG28 Z0 ;move bed down\nG28 X0 Y0 ;move X/Y to min endstops so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\nM107 ;switch off cooling fan\nM355 S0 P0 ;switch off case light\n;---- Ending Script End ----\n" }, + "machine_extruder_count": { "value": 1 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-26, 41], + [-26, -21], + [36, -21], + [36, 41] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 270 }, + "machine_name": { "default_value": "ZAV Base Printer" }, + "machine_shape": { "default_value": "rectangular" }, + "machine_start_gcode": { "default_value": ";---- Starting Script Start ----\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 Z0 ;move Z to min endstops\nG28 X0 Y0 ;move X/Y to min endstops\nG92 E0 ;zero the extruded length\nG1 F5000 ;set speed\nG1 Y40 ;move to start position Y\nM117 Printing...\n;---- Starting Script End ----\n" }, + "machine_width": { "default_value": 300 }, + "material_diameter": { "default_value": 1.75 }, + "optimize_wall_printing_order": { "value": "True" }, + "retraction_amount": { "value": "4" }, + "retraction_combing": { "value": "'all'" }, + "retraction_combing_max_distance": { "value": "10" }, + "retraction_min_travel": { "value": "3" }, + "skin_line_width": { "value": "round(line_width * 1.0, 2)" }, + "skin_outline_count": { "value": "0" }, + "skirt_brim_line_width": { "value": "round(line_width * 1.1, 2)" }, + "speed_layer_0": { "value": "25" }, + "speed_print": { "value": "80" }, + "speed_topbottom": { "value": "50" }, + "speed_travel_layer_0": { "value": "40" }, + "support_angle": { "value": "65" }, + "support_brim_enable": { "value": "True" }, + "support_enable": { "value": "True" }, + "support_infill_rate": { "value": "20" }, + "support_offset": { "value": "2" }, + "top_bottom_pattern": { "value": "'zigzag'" }, + "top_bottom_pattern_0": { "value": "'zigzag'" }, + "travel_avoid_other_parts": { "value": "False" }, + "z_seam_type": { "value": "'shortest'" }, + "zig_zaggify_infill": { "value": "True" } } -} +} \ No newline at end of file diff --git a/resources/definitions/zav_big.def.json b/resources/definitions/zav_big.def.json index 56d6f77111..8bcaa24e6e 100644 --- a/resources/definitions/zav_big.def.json +++ b/resources/definitions/zav_big.def.json @@ -1,17 +1,23 @@ { - "name": "Zav Big", - "version": 2, - "inherits": "zav_base", - "metadata": { - "author": "Kirill Nikolaev, Kim Evgeniy (C)", - "visible": true, - "quality_definition": "zav_base", - "platform": "zav_big.stl", - "platform_offset": [0, 0, 0] - }, - "overrides": { - "machine_name": {"default_value": "zav_big"}, - "machine_depth": {"default_value": 300}, - "machine_height": {"default_value": 340} - } -} + "version": 2, + "name": "Zav Big", + "inherits": "zav_base", + "metadata": + { + "visible": true, + "author": "Kirill Nikolaev, Kim Evgeniy (C)", + "platform": "zav_big.stl", + "platform_offset": [ + 0, + 0, + 0 + ], + "quality_definition": "zav_base" + }, + "overrides": + { + "machine_depth": { "default_value": 300 }, + "machine_height": { "default_value": 340 }, + "machine_name": { "default_value": "zav_big" } + } +} \ No newline at end of file diff --git a/resources/definitions/zav_bigplus.def.json b/resources/definitions/zav_bigplus.def.json index a8b24ae323..1631e73ff9 100644 --- a/resources/definitions/zav_bigplus.def.json +++ b/resources/definitions/zav_bigplus.def.json @@ -1,16 +1,18 @@ { - "name": "Zav Big+", - "version": 2, - "inherits": "zav_base", - "metadata": { - "author": "Kirill Nikolaev, Kim Evgeniy (C)", - "visible": true, - "quality_definition": "zav_base", - "platform": "zav_bigplus.stl" - }, - "overrides": { - "machine_name": {"default_value": "zav_bigplus"}, - "machine_depth": {"default_value": 300}, - "machine_height": {"default_value": 500} - } -} + "version": 2, + "name": "Zav Big+", + "inherits": "zav_base", + "metadata": + { + "visible": true, + "author": "Kirill Nikolaev, Kim Evgeniy (C)", + "platform": "zav_bigplus.stl", + "quality_definition": "zav_base" + }, + "overrides": + { + "machine_depth": { "default_value": 300 }, + "machine_height": { "default_value": 500 }, + "machine_name": { "default_value": "zav_bigplus" } + } +} \ No newline at end of file diff --git a/resources/definitions/zav_l.def.json b/resources/definitions/zav_l.def.json index 604cb49ddb..7c0d893705 100644 --- a/resources/definitions/zav_l.def.json +++ b/resources/definitions/zav_l.def.json @@ -1,16 +1,18 @@ { - "name": "Zav L Family Printer", - "version": 2, - "inherits": "zav_base", - "metadata": { - "author": "Kirill Nikolaev, Kim Evgeniy (C)", - "visible": true, - "quality_definition": "zav_base", - "platform": "zav_l.stl" - }, - "overrides": { - "machine_name": {"default_value": "zav_l"}, - "machine_width": {"default_value": 200}, - "machine_height": {"default_value": 200} - } -} + "version": 2, + "name": "Zav L Family Printer", + "inherits": "zav_base", + "metadata": + { + "visible": true, + "author": "Kirill Nikolaev, Kim Evgeniy (C)", + "platform": "zav_l.stl", + "quality_definition": "zav_base" + }, + "overrides": + { + "machine_height": { "default_value": 200 }, + "machine_name": { "default_value": "zav_l" }, + "machine_width": { "default_value": 200 } + } +} \ No newline at end of file diff --git a/resources/definitions/zav_max.def.json b/resources/definitions/zav_max.def.json index 3e5e987cc7..4324b6083d 100644 --- a/resources/definitions/zav_max.def.json +++ b/resources/definitions/zav_max.def.json @@ -1,16 +1,18 @@ { - "name": "Zav Max", - "version": 2, - "inherits": "zav_base", - "metadata": { - "author": "Kirill Nikolaev, Kim Evgeniy (C)", - "visible": true, - "quality_definition": "zav_base", - "platform": "zav_max.stl" - }, - "overrides": { - "machine_name": {"default_value": "zav_max"}, - "machine_width": {"default_value": 200}, - "machine_height": {"default_value": 240} - } -} + "version": 2, + "name": "Zav Max", + "inherits": "zav_base", + "metadata": + { + "visible": true, + "author": "Kirill Nikolaev, Kim Evgeniy (C)", + "platform": "zav_max.stl", + "quality_definition": "zav_base" + }, + "overrides": + { + "machine_height": { "default_value": 240 }, + "machine_name": { "default_value": "zav_max" }, + "machine_width": { "default_value": 200 } + } +} \ No newline at end of file diff --git a/resources/definitions/zav_maxpro.def.json b/resources/definitions/zav_maxpro.def.json index 97f8806f45..4de9e4dde5 100644 --- a/resources/definitions/zav_maxpro.def.json +++ b/resources/definitions/zav_maxpro.def.json @@ -1,13 +1,15 @@ { - "name": "Zav Pro", - "version": 2, - "inherits": "zav_base", - "metadata": { - "author": "Kirill Nikolaev, Kim Evgeniy (C)", - "visible": true, - "quality_definition": "zav_base" - }, - "overrides": { - "machine_name": {"default_value": "zav_maxpro"} - } -} + "version": 2, + "name": "Zav Pro", + "inherits": "zav_base", + "metadata": + { + "visible": true, + "author": "Kirill Nikolaev, Kim Evgeniy (C)", + "quality_definition": "zav_base" + }, + "overrides": + { + "machine_name": { "default_value": "zav_maxpro" } + } +} \ No newline at end of file diff --git a/resources/definitions/zav_mini.def.json b/resources/definitions/zav_mini.def.json index 8491ddd01c..c438a84d8d 100644 --- a/resources/definitions/zav_mini.def.json +++ b/resources/definitions/zav_mini.def.json @@ -1,17 +1,19 @@ { - "name": "Zav Mini", - "version": 2, - "inherits": "zav_base", - "metadata": { - "author": "Kirill Nikolaev, Kim Evgeniy (C)", - "visible": true, - "quality_definition": "zav_base", - "platform": "zav_mini.stl" - }, - "overrides": { - "machine_name": {"default_value": "zav_mini"}, - "machine_width": {"default_value": 100}, - "machine_depth": {"default_value": 100}, - "machine_height": {"default_value": 110} - } -} + "version": 2, + "name": "Zav Mini", + "inherits": "zav_base", + "metadata": + { + "visible": true, + "author": "Kirill Nikolaev, Kim Evgeniy (C)", + "platform": "zav_mini.stl", + "quality_definition": "zav_base" + }, + "overrides": + { + "machine_depth": { "default_value": 100 }, + "machine_height": { "default_value": 110 }, + "machine_name": { "default_value": "zav_mini" }, + "machine_width": { "default_value": 100 } + } +} \ No newline at end of file diff --git a/resources/definitions/zone3d_printer.def.json b/resources/definitions/zone3d_printer.def.json index 8939043e05..83e94e2133 100644 --- a/resources/definitions/zone3d_printer.def.json +++ b/resources/definitions/zone3d_printer.def.json @@ -1,28 +1,30 @@ { - "name": "Zone3d Printer", "version": 2, + "name": "Zone3d Printer", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "manufacturer": "Zone3D", "file_formats": "text/x-gcode", - "platform_offset": [ 0, 0, 0], - "machine_extruder_trains": - { - "0": "zone3d_printer_extruder_0" - } + "machine_extruder_trains": { "0": "zone3d_printer_extruder_0" }, + "platform_offset": [ + 0, + 0, + 0 + ] }, - - "overrides": { - "prime_tower_size": { "default_value": 10.350983390135314 }, + "overrides": + { "layer_height": { "default_value": 0.14 }, - "machine_extruder_count": { "default_value": 1 }, - "machine_heated_bed": { "default_value": true }, "machine_center_is_zero": { "default_value": false }, - "machine_height": { "default_value": 210 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_depth": { "default_value": 220 }, + "machine_extruder_count": { "default_value": 1 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 210 }, + "machine_name": { "default_value": "Zone3D Printer" }, "machine_width": { "default_value": 240 }, - "machine_name": { "default_value": "Zone3D Printer" } + "prime_tower_size": { "default_value": 10.350983390135314 } } -} +} \ No newline at end of file diff --git a/resources/definitions/zyyx_agile.def.json b/resources/definitions/zyyx_agile.def.json index 7294a1b10e..4f57045e40 100644 --- a/resources/definitions/zyyx_agile.def.json +++ b/resources/definitions/zyyx_agile.def.json @@ -1,61 +1,63 @@ { - "name": "Zyyx Agile", "version": 2, + "name": "Zyyx Agile", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Magicfirm Europe", "manufacturer": "Magicfirm Europe", "file_formats": "application/x3g", "platform": "zyyx_platform.3mf", "has_machine_quality": true, - "quality_definition": "zyyx_agile", + "machine_extruder_trains": { "0": "zyyx_agile_extruder_0" }, + "machine_x3g_variant": "z", "preferred_material": "zyyx_pro_pla", "preferred_quality_type": "normal", - "machine_x3g_variant": "z", - "machine_extruder_trains": - { - "0": "zyyx_agile_extruder_0" - } + "quality_definition": "zyyx_agile" }, - - "overrides": { - "machine_name": { "default_value": "ZYYX Agile" }, - "machine_start_gcode": { - "default_value": "; ZYYX 3D Printer start gcode\nM73 P0; enable build progress\nG21; set units to mm\nG90; set positioning to absolute\nG130 X80 Y80 A127 B127 ; Set Stepper Vref to default value\nG162 X Y F3000; home XY axes maximum\nM133 T0 ; stabilize extruder temperature\nG161 Z F450\nG161 Z F450; home Z axis minimum\nG92 X0 Y0 Z0 E0\nG1 X0 Y0 Z5 F200\nG161 Z F200; home Z axis minimum again\nG92 X0 Y0 Z0 E0\nM131 A; store surface calibration point 1\nG1 X0 Y0 Z5 F200\nG1 X-177 Y0 Z5 F3000; move to 2nd probing point\nG161 Z F200\nM131 B; store surface calibration point 2\nG92 X-177 Y0 Z0 E0\nG1 X-177 Y0 Z5 F200\nG1 X0 Y0 Z5 F3000; move to home point\nG161 Z F200; home Z axis minimum again\nG92 X0 Y0 Z0 E0; set reference again\nG1 X0 Y0 Z5 F200; clear Z\nG1 X0 Y-225 Z5 F3000; move to 3rd calibration point\nG161 Z F200\nM131 AB; store surface calibration point 3\nM132 AB; activate auto leveling\nG92 X0 Y-225 Z0 E0\nG1 X0 Y-225 Z5 F200\nG162 X Y F3000\nG161 Z F200\nG92 X135 Y115 Z0 E0\nM132 Z; Recall stored home offset for Z axis\nG1 X135 Y115 Z5 F450; clear nozzle from hole\nG1 X0 Y115 Z5 F3000; clear nozzle from hole\nG92 E0 ; Set E to 0" - }, - "machine_end_gcode": { - "default_value": "; ZYYX 3D Printer end gcode\nM73 P100 ; end build progress\nG0 Z195 F1000 ; send Z axis to bottom of machine\nM104 S0 T0 ; cool down extruder\nM127 ; stop blower fan\nG162 X Y F3000 ; home XY maximum\nM18 ; disable stepper\nM70 P5 (ZYYX Print Finished!)\nM72 P1 ; play Ta-Da song\n" - }, - "machine_width": { "default_value": 265 }, - "machine_depth": { "default_value": 225 }, - "machine_height": { "default_value": 195 }, - "machine_center_is_zero": { "default_value": true }, - "machine_gcode_flavor": { "default_value": "Makerbot" }, - "machine_head_with_fans_polygon": { "default_value": [ [ -37, 50 ], [ 25, 50 ], [ 25, -40 ], [ -37, -40 ] ] }, + "overrides": + { "gantry_height": { "value": "10" }, + "infill_overlap": { "value": "12 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0" }, + "machine_center_is_zero": { "default_value": true }, + "machine_depth": { "default_value": 225 }, + "machine_end_gcode": { "default_value": "; ZYYX 3D Printer end gcode\nM73 P100 ; end build progress\nG0 Z195 F1000 ; send Z axis to bottom of machine\nM104 S0 T0 ; cool down extruder\nM127 ; stop blower fan\nG162 X Y F3000 ; home XY maximum\nM18 ; disable stepper\nM70 P5 (ZYYX Print Finished!)\nM72 P1 ; play Ta-Da song\n" }, + "machine_gcode_flavor": { "default_value": "Makerbot" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-37, 50], + [25, 50], + [25, -40], + [-37, -40] + ] + }, + "machine_height": { "default_value": 195 }, + "machine_name": { "default_value": "ZYYX Agile" }, + "machine_start_gcode": { "default_value": "; ZYYX 3D Printer start gcode\nM73 P0; enable build progress\nG21; set units to mm\nG90; set positioning to absolute\nG130 X80 Y80 A127 B127 ; Set Stepper Vref to default value\nG162 X Y F3000; home XY axes maximum\nM133 T0 ; stabilize extruder temperature\nG161 Z F450\nG161 Z F450; home Z axis minimum\nG92 X0 Y0 Z0 E0\nG1 X0 Y0 Z5 F200\nG161 Z F200; home Z axis minimum again\nG92 X0 Y0 Z0 E0\nM131 A; store surface calibration point 1\nG1 X0 Y0 Z5 F200\nG1 X-177 Y0 Z5 F3000; move to 2nd probing point\nG161 Z F200\nM131 B; store surface calibration point 2\nG92 X-177 Y0 Z0 E0\nG1 X-177 Y0 Z5 F200\nG1 X0 Y0 Z5 F3000; move to home point\nG161 Z F200; home Z axis minimum again\nG92 X0 Y0 Z0 E0; set reference again\nG1 X0 Y0 Z5 F200; clear Z\nG1 X0 Y-225 Z5 F3000; move to 3rd calibration point\nG161 Z F200\nM131 AB; store surface calibration point 3\nM132 AB; activate auto leveling\nG92 X0 Y-225 Z0 E0\nG1 X0 Y-225 Z5 F200\nG162 X Y F3000\nG161 Z F200\nG92 X135 Y115 Z0 E0\nM132 Z; Recall stored home offset for Z axis\nG1 X135 Y115 Z5 F450; clear nozzle from hole\nG1 X0 Y115 Z5 F3000; clear nozzle from hole\nG92 E0 ; Set E to 0" }, + "machine_steps_per_mm_e": { "default_value": 96.27520187033366 }, "machine_steps_per_mm_x": { "default_value": 88.888889 }, "machine_steps_per_mm_y": { "default_value": 88.888889 }, "machine_steps_per_mm_z": { "default_value": 400 }, - "machine_steps_per_mm_e": { "default_value": 96.27520187033366 }, + "machine_width": { "default_value": 265 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "raft_airgap": { "default_value": 0.15 }, + "raft_margin": { "default_value": 6 }, + "retract_at_layer_change": { "default_value": true }, "retraction_amount": { "default_value": 0.7 }, "retraction_speed": { "default_value": 15 }, + "speed_layer_0": { "value": 15 }, "speed_print": { "default_value": 50 }, + "speed_travel": { "value": 80 }, "speed_wall": { "value": 25 }, "speed_wall_x": { "value": 35 }, - "speed_travel": { "value": 80 }, - "speed_layer_0": { "value": 15 }, + "support_interface_density": { "default_value": 80 }, "support_interface_enable": { "default_value": true }, "support_interface_height": { "default_value": 0.8 }, - "support_interface_density": { "default_value": 80 }, "support_interface_pattern": { "default_value": "grid" }, - "infill_overlap": { "value": "12 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0" }, - "retract_at_layer_change": { "default_value": true }, - "travel_retract_before_outer_wall": { "default_value": true }, - "material_initial_print_temperature": { "value": "material_print_temperature" }, - "material_final_print_temperature": { "value": "material_print_temperature" }, "travel_avoid_other_parts": { "default_value": false }, - "raft_airgap": { "default_value": 0.15 }, - "raft_margin": { "default_value": 6 } + "travel_retract_before_outer_wall": { "default_value": true } } -} +} \ No newline at end of file diff --git a/resources/extruders/101Hero_extruder_0.def.json b/resources/extruders/101Hero_extruder_0.def.json index 21c892133c..49e7a415d3 100644 --- a/resources/extruders/101Hero_extruder_0.def.json +++ b/resources/extruders/101Hero_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "101Hero", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/3dator_extruder_0.def.json b/resources/extruders/3dator_extruder_0.def.json index 97b03518f7..640d5c3f41 100644 --- a/resources/extruders/3dator_extruder_0.def.json +++ b/resources/extruders/3dator_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "3dator", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.5 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/3di_base_extruder_0.def.json b/resources/extruders/3di_base_extruder_0.def.json index 5fbb347ede..608093e270 100644 --- a/resources/extruders/3di_base_extruder_0.def.json +++ b/resources/extruders/3di_base_extruder_0.def.json @@ -1,15 +1,16 @@ -{ - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": { - "machine": "3di_base", - "position": "0" - }, - - "overrides": { - "extruder_nr": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - } +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "3di_base", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } } \ No newline at end of file diff --git a/resources/extruders/3dtech_semi_professional_extruder_0.def.json b/resources/extruders/3dtech_semi_professional_extruder_0.def.json index 4952d274d9..cb55b93eec 100644 --- a/resources/extruders/3dtech_semi_professional_extruder_0.def.json +++ b/resources/extruders/3dtech_semi_professional_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "3dtech_semi_professional", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/geeetech_A20M_1.def.json b/resources/extruders/Geeetech_Dual_Extruder_0.def.json similarity index 51% rename from resources/extruders/geeetech_A20M_1.def.json rename to resources/extruders/Geeetech_Dual_Extruder_0.def.json index b0c00f4144..c9ce9b40c5 100644 --- a/resources/extruders/geeetech_A20M_1.def.json +++ b/resources/extruders/Geeetech_Dual_Extruder_0.def.json @@ -1,19 +1,19 @@ -{ - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": { - "machine": "geeetech_A20M", - "position": "0" - }, - - "overrides": { - "extruder_nr": { - "default_value": 0, - "maximum_value": "1" - }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - - } -} +{ + "version": 2, + "name": "E0", + "inherits": "fdmextruder", + "metadata": + { + "machine": "Geeetech_Base_Dual_Extruder", + "position": "0" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 0, + "maximum_value": "1" + }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/geeetech_A10M_2.def.json b/resources/extruders/Geeetech_Dual_Extruder_1.def.json similarity index 51% rename from resources/extruders/geeetech_A10M_2.def.json rename to resources/extruders/Geeetech_Dual_Extruder_1.def.json index 59c8d36aab..39410d2815 100644 --- a/resources/extruders/geeetech_A10M_2.def.json +++ b/resources/extruders/Geeetech_Dual_Extruder_1.def.json @@ -1,19 +1,19 @@ -{ - "version": 2, - "name": "Extruder 2", - "inherits": "fdmextruder", - "metadata": { - "machine": "geeetech_A10M", - "position": "1" - }, - - "overrides": { - "extruder_nr": { - "default_value": 1, - "maximum_value": "1" - }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - - } -} +{ + "version": 2, + "name": "E1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "Geeetech_Base_Dual_Extruder", + "position": "1" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 1, + "maximum_value": "1" + }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/geeetech_A10T_1.def.json b/resources/extruders/Geeetech_Multi_Extruder_0.def.json similarity index 51% rename from resources/extruders/geeetech_A10T_1.def.json rename to resources/extruders/Geeetech_Multi_Extruder_0.def.json index 240a71ccc4..970e7f242b 100644 --- a/resources/extruders/geeetech_A10T_1.def.json +++ b/resources/extruders/Geeetech_Multi_Extruder_0.def.json @@ -1,19 +1,19 @@ -{ - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": { - "machine": "geeetech_A10T", - "position": "0" - }, - - "overrides": { - "extruder_nr": { - "default_value": 0, - "maximum_value": "2" - }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - - } -} +{ + "version": 2, + "name": "E0", + "inherits": "fdmextruder", + "metadata": + { + "machine": "Geeetech_Base_Multi_Extruder", + "position": "0" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 0, + "maximum_value": "2" + }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/geeetech_A10T_2.def.json b/resources/extruders/Geeetech_Multi_Extruder_1.def.json similarity index 51% rename from resources/extruders/geeetech_A10T_2.def.json rename to resources/extruders/Geeetech_Multi_Extruder_1.def.json index cc93fdd416..01910b03d9 100644 --- a/resources/extruders/geeetech_A10T_2.def.json +++ b/resources/extruders/Geeetech_Multi_Extruder_1.def.json @@ -1,19 +1,19 @@ -{ - "version": 2, - "name": "Extruder 2", - "inherits": "fdmextruder", - "metadata": { - "machine": "geeetech_A10T", - "position": "1" - }, - - "overrides": { - "extruder_nr": { - "default_value": 1, - "maximum_value": "2" - }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - - } -} +{ + "version": 2, + "name": "E1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "Geeetech_Base_Multi_Extruder", + "position": "1" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 1, + "maximum_value": "2" + }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/geeetech_A10T_3.def.json b/resources/extruders/Geeetech_Multi_Extruder_2.def.json similarity index 51% rename from resources/extruders/geeetech_A10T_3.def.json rename to resources/extruders/Geeetech_Multi_Extruder_2.def.json index ddee8fcd3b..a46a852925 100644 --- a/resources/extruders/geeetech_A10T_3.def.json +++ b/resources/extruders/Geeetech_Multi_Extruder_2.def.json @@ -1,19 +1,19 @@ -{ - "version": 2, - "name": "Extruder 3", - "inherits": "fdmextruder", - "metadata": { - "machine": "geeetech_A10T", - "position": "2" - }, - - "overrides": { - "extruder_nr": { - "default_value": 2, - "maximum_value": "2" - }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - - } -} +{ + "version": 2, + "name": "E2", + "inherits": "fdmextruder", + "metadata": + { + "machine": "Geeetech_Base_Multi_Extruder", + "position": "2" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 2, + "maximum_value": "2" + }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/geeetech_a30_extruder_0.def.json b/resources/extruders/Geeetech_Single_Extruder.def.json similarity index 62% rename from resources/extruders/geeetech_a30_extruder_0.def.json rename to resources/extruders/Geeetech_Single_Extruder.def.json index 90cb496877..784d852f09 100644 --- a/resources/extruders/geeetech_a30_extruder_0.def.json +++ b/resources/extruders/Geeetech_Single_Extruder.def.json @@ -2,14 +2,14 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { - "machine": "geeetech_a30", + "metadata": + { + "machine": "Geeetech_Base_Single_Extruder", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/I3MetalMotion_extruder_0.def.json b/resources/extruders/I3MetalMotion_extruder_0.def.json index 064e1360b6..abea14d3ed 100644 --- a/resources/extruders/I3MetalMotion_extruder_0.def.json +++ b/resources/extruders/I3MetalMotion_extruder_0.def.json @@ -1,17 +1,17 @@ { - "version": 2, "name": "I3MetalMotion extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "I3MetalMotion", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, - "material_diameter": { "default_value": 1.75 }, "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 } + "machine_nozzle_offset_y": { "default_value": 0 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/Mark2_extruder1.def.json b/resources/extruders/Mark2_extruder1.def.json index 27becf88ff..89992ad450 100644 --- a/resources/extruders/Mark2_extruder1.def.json +++ b/resources/extruders/Mark2_extruder1.def.json @@ -2,17 +2,19 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "Mark2_for_Ultimaker2", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 } } -} +} \ No newline at end of file diff --git a/resources/extruders/Mark2_extruder2.def.json b/resources/extruders/Mark2_extruder2.def.json index ac654d9c00..967e32d8b8 100644 --- a/resources/extruders/Mark2_extruder2.def.json +++ b/resources/extruders/Mark2_extruder2.def.json @@ -2,17 +2,19 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "Mark2_for_Ultimaker2", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 } } -} +} \ No newline at end of file diff --git a/resources/extruders/SV01_extruder_0.def.json b/resources/extruders/SV01_extruder_0.def.json index 1620eb0b1d..500c7540e4 100644 --- a/resources/extruders/SV01_extruder_0.def.json +++ b/resources/extruders/SV01_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "SV01", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/SV02_extruder_0.def.json b/resources/extruders/SV02_extruder_0.def.json index 073242f2bd..7804cbb135 100644 --- a/resources/extruders/SV02_extruder_0.def.json +++ b/resources/extruders/SV02_extruder_0.def.json @@ -1,26 +1,24 @@ -{ - "version": 2, - "name": "Left Extruder", - "inherits": "fdmextruder", - "metadata": { - "machine": "SV02", - "position": "0" - }, - - "overrides": { - "extruder_nr": { - "default_value": 0, - "maximum_value": "1" - }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "machine_extruder_start_code": { - "default_value": "\nT0 ;switch to extruder 1\nG92 E0 ;reset extruder distance\nG1 F2000 E93 ;load filament\nG92 E0 ;reset extruder distance\nM104 S{material_print_temperature}" - }, - "machine_extruder_end_code": { - "default_value": "\nG92 E0 ;reset extruder distance\nG1 F800 E-5 ;short retract\nG1 F2400 X250 Y220\nG1 F2000 E-93 ;long retract for filament removal\nG92 E0 ;reset extruder distance\nG90" - } - } -} +{ + "version": 2, + "name": "Left Extruder", + "inherits": "fdmextruder", + "metadata": + { + "machine": "SV02", + "position": "0" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 0, + "maximum_value": "1" + }, + "machine_extruder_end_code": { "default_value": "\nG92 E0 ;reset extruder distance\nG1 F800 E-5 ;short retract\nG1 F2400 X250 Y220\nG1 F2000 E-93 ;long retract for filament removal\nG92 E0 ;reset extruder distance\nG90" }, + "machine_extruder_start_code": { "default_value": "\nT0 ;switch to extruder 1\nG92 E0 ;reset extruder distance\nG1 F2000 E93 ;load filament\nG92 E0 ;reset extruder distance\nM104 S{material_print_temperature}" }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/SV02_extruder_1.def.json b/resources/extruders/SV02_extruder_1.def.json index 41ede774df..7d0819cb09 100644 --- a/resources/extruders/SV02_extruder_1.def.json +++ b/resources/extruders/SV02_extruder_1.def.json @@ -1,26 +1,24 @@ -{ - "version": 2, - "name": "Right Extruder", - "inherits": "fdmextruder", - "metadata": { - "machine": "SV02", - "position": "1" - }, - - "overrides": { - "extruder_nr": { - "default_value": 1, - "maximum_value": "1" - }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "machine_extruder_start_code": { - "default_value": "\nT1 ;switch to extruder 2\nG92 E0 ;reset extruder distance\nG1 F2000 E93 ;load filament\nG92 E0 ;reset extruder distance\nM104 S{material_print_temperature}" - }, - "machine_extruder_end_code": { - "default_value": "\nG92 E0 ;reset extruder distance\nG1 F800 E-5 ;short retract\nG1 F2400 X250 Y220\nG1 F2000 E-93 ;long retract for filament removal\nG92 E0 ;reset extruder distance\nG90" - } - } -} +{ + "version": 2, + "name": "Right Extruder", + "inherits": "fdmextruder", + "metadata": + { + "machine": "SV02", + "position": "1" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 1, + "maximum_value": "1" + }, + "machine_extruder_end_code": { "default_value": "\nG92 E0 ;reset extruder distance\nG1 F800 E-5 ;short retract\nG1 F2400 X250 Y220\nG1 F2000 E-93 ;long retract for filament removal\nG92 E0 ;reset extruder distance\nG90" }, + "machine_extruder_start_code": { "default_value": "\nT1 ;switch to extruder 2\nG92 E0 ;reset extruder distance\nG1 F2000 E93 ;load filament\nG92 E0 ;reset extruder distance\nM104 S{material_print_temperature}" }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/SV03_extruder_0.def.json b/resources/extruders/SV03_extruder_0.def.json index 9ceb468d64..f1838a1101 100644 --- a/resources/extruders/SV03_extruder_0.def.json +++ b/resources/extruders/SV03_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "SV03", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/abax_pri3_extruder_0.def.json b/resources/extruders/abax_pri3_extruder_0.def.json index 618ca7f596..e3b9f61187 100644 --- a/resources/extruders/abax_pri3_extruder_0.def.json +++ b/resources/extruders/abax_pri3_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "abax_pri3", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/abax_pri5_extruder_0.def.json b/resources/extruders/abax_pri5_extruder_0.def.json index 4a96b5e12e..16af44847d 100644 --- a/resources/extruders/abax_pri5_extruder_0.def.json +++ b/resources/extruders/abax_pri5_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "abax_pri5", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/abax_titan_extruder_0.def.json b/resources/extruders/abax_titan_extruder_0.def.json index 078b9f0470..671d165878 100644 --- a/resources/extruders/abax_titan_extruder_0.def.json +++ b/resources/extruders/abax_titan_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "abax_titan", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/alfawise_u20_extruder_0.def.json b/resources/extruders/alfawise_u20_extruder_0.def.json index 6bb2bde534..4672949e13 100644 --- a/resources/extruders/alfawise_u20_extruder_0.def.json +++ b/resources/extruders/alfawise_u20_extruder_0.def.json @@ -2,12 +2,13 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "alfawise_u20", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } diff --git a/resources/extruders/alfawise_u30_extruder_0.def.json b/resources/extruders/alfawise_u30_extruder_0.def.json index 4014b5ab62..047db171a6 100644 --- a/resources/extruders/alfawise_u30_extruder_0.def.json +++ b/resources/extruders/alfawise_u30_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "alfawise_u30", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/alya3dp_extruder_0.def.json b/resources/extruders/alya3dp_extruder_0.def.json index 5e05210e2c..929835fbdf 100644 --- a/resources/extruders/alya3dp_extruder_0.def.json +++ b/resources/extruders/alya3dp_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "alya3dp", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/anet3d_extruder_0.def.json b/resources/extruders/anet3d_extruder_0.def.json index 4a53178769..3c1f909d74 100644 --- a/resources/extruders/anet3d_extruder_0.def.json +++ b/resources/extruders/anet3d_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "anet3d", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/anycubic_4max_extruder_0.def.json b/resources/extruders/anycubic_4max_extruder_0.def.json index 9ea55928b8..962fbf35fd 100644 --- a/resources/extruders/anycubic_4max_extruder_0.def.json +++ b/resources/extruders/anycubic_4max_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "anycubic_4max", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/anycubic_chiron_extruder_0.def.json b/resources/extruders/anycubic_chiron_extruder_0.def.json index b4117c755a..73be0bd2e8 100644 --- a/resources/extruders/anycubic_chiron_extruder_0.def.json +++ b/resources/extruders/anycubic_chiron_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "anycubic_chiron", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/anycubic_i3_mega_extruder_0.def.json b/resources/extruders/anycubic_i3_mega_extruder_0.def.json index f15eab4829..330675e174 100644 --- a/resources/extruders/anycubic_i3_mega_extruder_0.def.json +++ b/resources/extruders/anycubic_i3_mega_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "anycubic_i3_mega", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/anycubic_i3_mega_s_extruder_0.def.json b/resources/extruders/anycubic_i3_mega_s_extruder_0.def.json index d59384f3e4..0f389ac185 100644 --- a/resources/extruders/anycubic_i3_mega_s_extruder_0.def.json +++ b/resources/extruders/anycubic_i3_mega_s_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "anycubic_i3_mega_s", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/anycubic_kobra_extruder_0.def.json b/resources/extruders/anycubic_kobra_extruder_0.def.json index c9053ffa2e..1c95af9fc0 100644 --- a/resources/extruders/anycubic_kobra_extruder_0.def.json +++ b/resources/extruders/anycubic_kobra_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "anycubic_kobra", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/anycubic_kobra_max_extruder_0.def.json b/resources/extruders/anycubic_kobra_max_extruder_0.def.json index 69cdddf370..31158aa59a 100644 --- a/resources/extruders/anycubic_kobra_max_extruder_0.def.json +++ b/resources/extruders/anycubic_kobra_max_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "anycubic_kobra_max", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/anycubic_kossel_extruder_0.def.json b/resources/extruders/anycubic_kossel_extruder_0.def.json index 5e1929568c..f8a1bd4808 100644 --- a/resources/extruders/anycubic_kossel_extruder_0.def.json +++ b/resources/extruders/anycubic_kossel_extruder_0.def.json @@ -1,15 +1,16 @@ { - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": { - "machine": "anycubic_kossel", - "position": "0" - }, - - "overrides": { - "extruder_nr": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - } -} + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "anycubic_kossel", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/anycubic_mega_zero_extruder_0.def.json b/resources/extruders/anycubic_mega_zero_extruder_0.def.json index 09b6307716..8d18c4956b 100644 --- a/resources/extruders/anycubic_mega_zero_extruder_0.def.json +++ b/resources/extruders/anycubic_mega_zero_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "anycubic_mega_zero", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/anycubic_vyper_extruder_0.def.json b/resources/extruders/anycubic_vyper_extruder_0.def.json index 539f886a75..da716304d1 100644 --- a/resources/extruders/anycubic_vyper_extruder_0.def.json +++ b/resources/extruders/anycubic_vyper_extruder_0.def.json @@ -1,20 +1,16 @@ { - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": { - "machine": "anycubic_vyper", - "position": "0" - }, - "overrides": { - "extruder_nr": { - "default_value": 0 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "material_diameter": { - "default_value": 1.75 - } - } + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "anycubic_vyper", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } } \ No newline at end of file diff --git a/resources/extruders/arjun_dm_extruder.def.json b/resources/extruders/arjun_dm_extruder.def.json index da3e4da203..138413c3ae 100644 --- a/resources/extruders/arjun_dm_extruder.def.json +++ b/resources/extruders/arjun_dm_extruder.def.json @@ -2,19 +2,21 @@ "version": 2, "name": "Duplication Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "arjun_duplication", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 } + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/arjun_extruder_0.def.json b/resources/extruders/arjun_extruder_0.def.json index c47c93a851..5ca58e234b 100644 --- a/resources/extruders/arjun_extruder_0.def.json +++ b/resources/extruders/arjun_extruder_0.def.json @@ -2,26 +2,28 @@ "version": 2, "name": "Left Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "arjun300", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_extruder_start_pos_abs": { "default_value": true }, - "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": -51 }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, - "machine_extruder_start_code": { "default_value": "T0" } + "machine_extruder_start_code": { "default_value": "T0" }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/arjun_extruder_1.def.json b/resources/extruders/arjun_extruder_1.def.json index b8ee27f33e..af62e14cc8 100644 --- a/resources/extruders/arjun_extruder_1.def.json +++ b/resources/extruders/arjun_extruder_1.def.json @@ -2,26 +2,28 @@ "version": 2, "name": "Right Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "arjun300", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_extruder_start_pos_abs": { "default_value": true }, - "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": 257 }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, - "machine_extruder_start_code": { "default_value": "T1" } + "machine_extruder_start_code": { "default_value": "T1" }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/arjun_mm_extruder.def.json b/resources/extruders/arjun_mm_extruder.def.json index a8364e95f1..c1d68ce7e1 100644 --- a/resources/extruders/arjun_mm_extruder.def.json +++ b/resources/extruders/arjun_mm_extruder.def.json @@ -2,19 +2,21 @@ "version": 2, "name": "Mirror Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "arjun_mirrored", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 } + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/arjunpro_dm_extruder.def.json b/resources/extruders/arjunpro_dm_extruder.def.json index 9ea7bbe27b..c33ba7fc9b 100644 --- a/resources/extruders/arjunpro_dm_extruder.def.json +++ b/resources/extruders/arjunpro_dm_extruder.def.json @@ -2,19 +2,21 @@ "version": 2, "name": "Duplication Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "arjunpro_duplication", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 } + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/arjunpro_extruder_0.def.json b/resources/extruders/arjunpro_extruder_0.def.json index b4ba094804..15b2abb414 100644 --- a/resources/extruders/arjunpro_extruder_0.def.json +++ b/resources/extruders/arjunpro_extruder_0.def.json @@ -2,26 +2,28 @@ "version": 2, "name": "Left Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "arjunpro300", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_extruder_start_pos_abs": { "default_value": true }, - "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": -51 }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, - "machine_extruder_start_code": { "default_value": "T0" } + "machine_extruder_start_code": { "default_value": "T0" }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/arjunpro_extruder_1.def.json b/resources/extruders/arjunpro_extruder_1.def.json index b5177807b8..2a6d71c220 100644 --- a/resources/extruders/arjunpro_extruder_1.def.json +++ b/resources/extruders/arjunpro_extruder_1.def.json @@ -2,26 +2,28 @@ "version": 2, "name": "Right Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "arjunpro300", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_extruder_start_pos_abs": { "default_value": true }, - "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": 257 }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, - "machine_extruder_start_code": { "default_value": "T1" } + "machine_extruder_start_code": { "default_value": "T1" }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/arjunpro_mm_extruder.def.json b/resources/extruders/arjunpro_mm_extruder.def.json index c101ede4ca..3d69ead29b 100644 --- a/resources/extruders/arjunpro_mm_extruder.def.json +++ b/resources/extruders/arjunpro_mm_extruder.def.json @@ -2,19 +2,21 @@ "version": 2, "name": "Mirror Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "arjunpro_mirrored", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 } + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/artillery_base_extruder_0.def.json b/resources/extruders/artillery_base_extruder_0.def.json index 4cf8af1a09..27885114a5 100644 --- a/resources/extruders/artillery_base_extruder_0.def.json +++ b/resources/extruders/artillery_base_extruder_0.def.json @@ -2,15 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "artillery_base", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } - } -} +} \ No newline at end of file diff --git a/resources/extruders/atmat_signal_pro_extruder_left.def.json b/resources/extruders/atmat_signal_pro_extruder_left.def.json index 1e379ec875..67202bc455 100644 --- a/resources/extruders/atmat_signal_pro_extruder_left.def.json +++ b/resources/extruders/atmat_signal_pro_extruder_left.def.json @@ -2,27 +2,29 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "atmat_signal_pro_base", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_extruder_start_pos_abs": { "default_value": true }, - "machine_extruder_start_pos_x": { "default_value": 270 }, - "machine_extruder_start_pos_y": { "default_value": 270 }, - "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "default_value": 270 }, - "machine_extruder_end_pos_y": { "default_value": 270 }, - "extruder_prime_pos_x": { "default_value": 0 }, - "extruder_prime_pos_y": { "default_value": 0 }, - "extruder_prime_pos_z": { "default_value": 0 }, - "material_diameter": { "default_value": 1.75 } + "extruder_prime_pos_x": { "default_value": 0 }, + "extruder_prime_pos_y": { "default_value": 0 }, + "extruder_prime_pos_z": { "default_value": 0 }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "default_value": 270 }, + "machine_extruder_end_pos_y": { "default_value": 270 }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "default_value": 270 }, + "machine_extruder_start_pos_y": { "default_value": 270 }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/atmat_signal_pro_extruder_right.def.json b/resources/extruders/atmat_signal_pro_extruder_right.def.json index 7eef618a1e..48ac898869 100644 --- a/resources/extruders/atmat_signal_pro_extruder_right.def.json +++ b/resources/extruders/atmat_signal_pro_extruder_right.def.json @@ -2,27 +2,29 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "atmat_signal_pro_base", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_extruder_start_pos_abs": { "default_value": true }, - "machine_extruder_start_pos_x": { "default_value": 270 }, - "machine_extruder_start_pos_y": { "default_value": 270 }, - "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "default_value": 270 }, - "machine_extruder_end_pos_y": { "default_value": 270 }, - "extruder_prime_pos_x": { "default_value": 0 }, - "extruder_prime_pos_y": { "default_value": 0 }, - "extruder_prime_pos_z": { "default_value": 0 }, - "material_diameter": { "default_value": 1.75 } + "extruder_prime_pos_x": { "default_value": 0 }, + "extruder_prime_pos_y": { "default_value": 0 }, + "extruder_prime_pos_z": { "default_value": 0 }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "default_value": 270 }, + "machine_extruder_end_pos_y": { "default_value": 270 }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "default_value": 270 }, + "machine_extruder_start_pos_y": { "default_value": 270 }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/atom2_extruder_0.def.json b/resources/extruders/atom2_extruder_0.def.json index be9d5782ff..3cc43399f0 100644 --- a/resources/extruders/atom2_extruder_0.def.json +++ b/resources/extruders/atom2_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "atom2", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/atom3_extruder_0.def.json b/resources/extruders/atom3_extruder_0.def.json index 7b8dffd963..ccc7a0bd6b 100644 --- a/resources/extruders/atom3_extruder_0.def.json +++ b/resources/extruders/atom3_extruder_0.def.json @@ -1,15 +1,16 @@ { - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": { - "machine": "atom3", - "position": "0" - }, - - "overrides": { - "extruder_nr": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - } + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "atom3", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } } \ No newline at end of file diff --git a/resources/extruders/atomstack_cambrianmaxe175_extruder_0.def.json b/resources/extruders/atomstack_cambrianmaxe175_extruder_0.def.json index 1132948e90..5431bae165 100644 --- a/resources/extruders/atomstack_cambrianmaxe175_extruder_0.def.json +++ b/resources/extruders/atomstack_cambrianmaxe175_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "atomstack_cambrianmaxe175", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/atomstack_cambrianmaxe285_extruder_0.def.json b/resources/extruders/atomstack_cambrianmaxe285_extruder_0.def.json index db5db9638a..ab05d3f05b 100644 --- a/resources/extruders/atomstack_cambrianmaxe285_extruder_0.def.json +++ b/resources/extruders/atomstack_cambrianmaxe285_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "atomstack_cambrianmaxe285", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.8 }, "material_diameter": { "default_value": 2.85 } } -} +} \ No newline at end of file diff --git a/resources/extruders/atomstack_cambrianproe175_extruder_0.def.json b/resources/extruders/atomstack_cambrianproe175_extruder_0.def.json index d55afde8a2..47e92a489e 100644 --- a/resources/extruders/atomstack_cambrianproe175_extruder_0.def.json +++ b/resources/extruders/atomstack_cambrianproe175_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "atomstack_cambrianproe175", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/atomstack_cambrianproe285_extruder_0.def.json b/resources/extruders/atomstack_cambrianproe285_extruder_0.def.json index db3dcda781..44c41164b6 100644 --- a/resources/extruders/atomstack_cambrianproe285_extruder_0.def.json +++ b/resources/extruders/atomstack_cambrianproe285_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "atomstack_cambrianproe285", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.8 }, "material_diameter": { "default_value": 2.85 } } -} +} \ No newline at end of file diff --git a/resources/extruders/beamup_l_extruder_0.def.json b/resources/extruders/beamup_l_extruder_0.def.json index b3ab9ed045..d7eb6030b5 100644 --- a/resources/extruders/beamup_l_extruder_0.def.json +++ b/resources/extruders/beamup_l_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "beamup_l", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.8 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/beamup_s_extruder_0.def.json b/resources/extruders/beamup_s_extruder_0.def.json index 1df9068198..f50d8aadcd 100644 --- a/resources/extruders/beamup_s_extruder_0.def.json +++ b/resources/extruders/beamup_s_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "beamup_s", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/bfb_extruder_0.def.json b/resources/extruders/bfb_extruder_0.def.json index 6dd995d098..8d3fc4dabe 100644 --- a/resources/extruders/bfb_extruder_0.def.json +++ b/resources/extruders/bfb_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "bfb", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.5 }, "material_diameter": { "default_value": 1.7 } } -} +} \ No newline at end of file diff --git a/resources/extruders/bibo2_dual_extruder_0.def.json b/resources/extruders/bibo2_dual_extruder_0.def.json index 91508ecc6d..5175c07add 100644 --- a/resources/extruders/bibo2_dual_extruder_0.def.json +++ b/resources/extruders/bibo2_dual_extruder_0.def.json @@ -1,45 +1,28 @@ -{ - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": { - "machine": "bibo2_dual", - "position": "0" - }, - "overrides": { - "extruder_nr": { - "default_value": 0, - "maximum_value": "1" - }, - "material_diameter": { - "default_value": 1.75 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "machine_nozzle_offset_x": { - "default_value": 0.0 - }, - "machine_nozzle_offset_y": { - "default_value": 0.0 - }, - "machine_extruder_start_pos_abs": { - "default_value": true - }, - "machine_extruder_start_pos_x": { - "value": "prime_tower_position_x" - }, - "machine_extruder_start_pos_y": { - "value": "prime_tower_position_y" - }, - "machine_extruder_end_pos_abs": { - "default_value": true - }, - "machine_extruder_end_pos_x": { - "value": "prime_tower_position_x" - }, - "machine_extruder_end_pos_y": { - "value": "prime_tower_position_y" - } - } -} +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "bibo2_dual", + "position": "0" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 0, + "maximum_value": "1" + }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/bibo2_dual_extruder_1.def.json b/resources/extruders/bibo2_dual_extruder_1.def.json index 129ad27273..23a908dfc4 100644 --- a/resources/extruders/bibo2_dual_extruder_1.def.json +++ b/resources/extruders/bibo2_dual_extruder_1.def.json @@ -1,45 +1,28 @@ -{ - "version": 2, - "name": "Extruder 2", - "inherits": "fdmextruder", - "metadata": { - "machine": "bibo2_dual", - "position": "1" - }, - "overrides": { - "extruder_nr": { - "default_value": 1, - "maximum_value": "1" - }, - "material_diameter": { - "default_value": 1.75 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "machine_nozzle_offset_x": { - "default_value": 0.0 - }, - "machine_nozzle_offset_y": { - "default_value": 0.0 - }, - "machine_extruder_start_pos_abs": { - "default_value": true - }, - "machine_extruder_start_pos_x": { - "value": "prime_tower_position_x" - }, - "machine_extruder_start_pos_y": { - "value": "prime_tower_position_y" - }, - "machine_extruder_end_pos_abs": { - "default_value": true - }, - "machine_extruder_end_pos_x": { - "value": "prime_tower_position_x" - }, - "machine_extruder_end_pos_y": { - "value": "prime_tower_position_y" - } - } -} +{ + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": + { + "machine": "bibo2_dual", + "position": "1" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 1, + "maximum_value": "1" + }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/biqu_base_extruder_0.def.json b/resources/extruders/biqu_base_extruder_0.def.json index 205bc87d8f..6a1f3ee710 100755 --- a/resources/extruders/biqu_base_extruder_0.def.json +++ b/resources/extruders/biqu_base_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "biqu_base", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/blocks_mkii_extruder_0.def.json b/resources/extruders/blocks_mkii_extruder_0.def.json new file mode 100644 index 0000000000..3eb79739ef --- /dev/null +++ b/resources/extruders/blocks_mkii_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "blocks_mkii", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/blocks_one_extruder_0.def.json b/resources/extruders/blocks_one_extruder_0.def.json new file mode 100644 index 0000000000..bcc4875fe1 --- /dev/null +++ b/resources/extruders/blocks_one_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "blocks_one", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/blocks_pros100_extruder_0.def.json b/resources/extruders/blocks_pros100_extruder_0.def.json new file mode 100644 index 0000000000..fa7392fd40 --- /dev/null +++ b/resources/extruders/blocks_pros100_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "blocks_pros100", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.8 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/blocks_pros30_extruder_0.def.json b/resources/extruders/blocks_pros30_extruder_0.def.json new file mode 100644 index 0000000000..414c7ae3cc --- /dev/null +++ b/resources/extruders/blocks_pros30_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "blocks_pros30", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/blocks_r21_extruder_0.def.json b/resources/extruders/blocks_r21_extruder_0.def.json new file mode 100644 index 0000000000..8f63c31b9e --- /dev/null +++ b/resources/extruders/blocks_r21_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "blocks_r21", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/blocks_rd50_extruder_0.def.json b/resources/extruders/blocks_rd50_extruder_0.def.json new file mode 100644 index 0000000000..48cb870acf --- /dev/null +++ b/resources/extruders/blocks_rd50_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "blocks_rd50", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/blocks_rd50_extruder_1.def.json b/resources/extruders/blocks_rd50_extruder_1.def.json new file mode 100644 index 0000000000..0490bc73f7 --- /dev/null +++ b/resources/extruders/blocks_rd50_extruder_1.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": + { + "machine": "blocks_rd50", + "position": "1" + }, + "overrides": + { + "extruder_nr": { "default_value": 1 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/blocks_zero_extruder_0.def.json b/resources/extruders/blocks_zero_extruder_0.def.json new file mode 100644 index 0000000000..e6d1776f80 --- /dev/null +++ b/resources/extruders/blocks_zero_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "blocks_zero", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/blv_mgn_cube_extruder_0.def.json b/resources/extruders/blv_mgn_cube_extruder_0.def.json index 4a5ed97f47..faf1664e52 100644 --- a/resources/extruders/blv_mgn_cube_extruder_0.def.json +++ b/resources/extruders/blv_mgn_cube_extruder_0.def.json @@ -1,20 +1,16 @@ -{ - "name": "Extruder 1", - "version": 2, - "inherits": "fdmextruder", - "metadata": { - "machine": "blv_mgn_cube_base", - "position": "0" - }, - "overrides": { - "extruder_nr": { - "default_value": 0 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "material_diameter": { - "default_value": 1.75 - } - } +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "blv_mgn_cube_base", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } } \ No newline at end of file diff --git a/resources/extruders/bq_hephestos_2_extruder_0.def.json b/resources/extruders/bq_hephestos_2_extruder_0.def.json index d58d8d755a..2457b451ad 100644 --- a/resources/extruders/bq_hephestos_2_extruder_0.def.json +++ b/resources/extruders/bq_hephestos_2_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "bq_hephestos_2", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/bq_hephestos_extruder_0.def.json b/resources/extruders/bq_hephestos_extruder_0.def.json index dc9b42d66d..74ed7845ea 100644 --- a/resources/extruders/bq_hephestos_extruder_0.def.json +++ b/resources/extruders/bq_hephestos_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "bq_hephestos", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/bq_hephestos_xl_extruder_0.def.json b/resources/extruders/bq_hephestos_xl_extruder_0.def.json index a52032f129..1cd713dfe6 100644 --- a/resources/extruders/bq_hephestos_xl_extruder_0.def.json +++ b/resources/extruders/bq_hephestos_xl_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "bq_hephestos_xl", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/bq_witbox_2_extruder_0.def.json b/resources/extruders/bq_witbox_2_extruder_0.def.json index 62fe62ad0b..484421cc46 100644 --- a/resources/extruders/bq_witbox_2_extruder_0.def.json +++ b/resources/extruders/bq_witbox_2_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "bq_witbox_2", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/bq_witbox_extruder_0.def.json b/resources/extruders/bq_witbox_extruder_0.def.json index 37b1492676..32562de5c6 100644 --- a/resources/extruders/bq_witbox_extruder_0.def.json +++ b/resources/extruders/bq_witbox_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "bq_witbox", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/builder_premium_large_front.def.json b/resources/extruders/builder_premium_large_front.def.json index dc1c557304..9903b1a20a 100644 --- a/resources/extruders/builder_premium_large_front.def.json +++ b/resources/extruders/builder_premium_large_front.def.json @@ -2,26 +2,27 @@ "version": 2, "name": "Front Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "builder_premium_large", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "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_pos_abs": { "default_value": true }, - "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "extruder_prime_pos_abs": { "default_value": true }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, - "extruder_prime_pos_abs": { "default_value": true } + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/builder_premium_large_rear.def.json b/resources/extruders/builder_premium_large_rear.def.json index 5dbe6d30c9..44bfcd21a6 100644 --- a/resources/extruders/builder_premium_large_rear.def.json +++ b/resources/extruders/builder_premium_large_rear.def.json @@ -2,26 +2,27 @@ "version": 2, "name": "Rear Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "builder_premium_large", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "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_pos_abs": { "default_value": true }, - "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "extruder_prime_pos_abs": { "default_value": true }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, - "extruder_prime_pos_abs": { "default_value": true } + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/builder_premium_medium_front.def.json b/resources/extruders/builder_premium_medium_front.def.json index 2d38e48aab..ee31efc309 100644 --- a/resources/extruders/builder_premium_medium_front.def.json +++ b/resources/extruders/builder_premium_medium_front.def.json @@ -2,26 +2,27 @@ "version": 2, "name": "Front Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "builder_premium_medium", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "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_pos_abs": { "default_value": true }, - "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "extruder_prime_pos_abs": { "default_value": true }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, - "extruder_prime_pos_abs": { "default_value": true } + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/builder_premium_medium_rear.def.json b/resources/extruders/builder_premium_medium_rear.def.json index 0a789c38f1..54ca3a60f8 100644 --- a/resources/extruders/builder_premium_medium_rear.def.json +++ b/resources/extruders/builder_premium_medium_rear.def.json @@ -2,26 +2,27 @@ "version": 2, "name": "Rear Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "builder_premium_medium", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "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_pos_abs": { "default_value": true }, - "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "extruder_prime_pos_abs": { "default_value": true }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, - "extruder_prime_pos_abs": { "default_value": true } + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/builder_premium_small_front.def.json b/resources/extruders/builder_premium_small_front.def.json index b36c535aeb..25420a0e52 100644 --- a/resources/extruders/builder_premium_small_front.def.json +++ b/resources/extruders/builder_premium_small_front.def.json @@ -2,26 +2,27 @@ "version": 2, "name": "Front Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "builder_premium_small", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "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_pos_abs": { "default_value": true }, - "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "extruder_prime_pos_abs": { "default_value": true }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, - "extruder_prime_pos_abs": { "default_value": true } + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/builder_premium_small_rear.def.json b/resources/extruders/builder_premium_small_rear.def.json index 8e00d0cc39..f544ec3fa3 100644 --- a/resources/extruders/builder_premium_small_rear.def.json +++ b/resources/extruders/builder_premium_small_rear.def.json @@ -2,26 +2,27 @@ "version": 2, "name": "Rear Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "builder_premium_small", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "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_pos_abs": { "default_value": true }, - "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "extruder_prime_pos_abs": { "default_value": true }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, - "extruder_prime_pos_abs": { "default_value": true } + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/cartesio_extruder_0.def.json b/resources/extruders/cartesio_extruder_0.def.json index ad27d4854c..f1ab23ed0e 100644 --- a/resources/extruders/cartesio_extruder_0.def.json +++ b/resources/extruders/cartesio_extruder_0.def.json @@ -2,24 +2,22 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "cartesio", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "3" }, + "machine_extruder_end_code": { "default_value": "\nM104 T0 S{material_standby_temperature}\nG1 X65 Y35 F9000 ; go to wipe position\nM109 T0 R{material_standby_temperature}; wait for temp\nG1 X45 Y15 F3000; wipe\nG1 X55 F9000\nG1 Y35 F6000; wipe again\n\n;end T0\n\n" }, + "machine_extruder_start_code": { "default_value": "\n;start T0\n\nM104 T0 S{material_print_temperature_layer_0}\nG1 X65 Y35 F9000 ; go to wipe position\nM109 T0 S{material_print_temperature_layer_0}; wait for temp\nG1 E10 F300; prime\nG92 E0\nG1 X45 Y15 F3000; wipe\nG1 X55 F9000\nG1 Y35 F6000; wipe again\n\nM117 printing...\n" }, "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": "\n;start T0\n\nM104 T0 S{material_print_temperature_layer_0}\nG1 X65 Y35 F9000 ; go to wipe position\nM109 T0 S{material_print_temperature_layer_0}; wait for temp\nG1 E10 F300; prime\nG92 E0\nG1 X45 Y15 F3000; wipe\nG1 X55 F9000\nG1 Y35 F6000; wipe again\n\nM117 printing...\n" - }, - "machine_extruder_end_code": { - "default_value": "\nM104 T0 S{material_standby_temperature}\nG1 X65 Y35 F9000 ; go to wipe position\nM109 T0 R{material_standby_temperature}; wait for temp\nG1 X45 Y15 F3000; wipe\nG1 X55 F9000\nG1 Y35 F6000; wipe again\n\n;end T0\n\n" - } + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/cartesio_extruder_1.def.json b/resources/extruders/cartesio_extruder_1.def.json index 1699a9c6a8..7a41f2d99c 100644 --- a/resources/extruders/cartesio_extruder_1.def.json +++ b/resources/extruders/cartesio_extruder_1.def.json @@ -2,24 +2,22 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "cartesio", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "3" }, + "machine_extruder_end_code": { "default_value": "\nM104 T1 S{material_standby_temperature}\nG1 X41 Y35 F9000 ; go to wipe position\nM109 T1 R{material_standby_temperature}; wait for temp\nG1 X21 Y15 F3000; wipe\nG1 X31 F9000\nG1 Y35 F6000; wipe again\n\n;end T1\n\n" }, + "machine_extruder_start_code": { "default_value": "\n;start T1\n\nM104 T1 S{material_print_temperature_layer_0}\nG1 X41 Y35 F9000 ; go to wipe position\nM109 T1 S{material_print_temperature_layer_0}; wait for temp\nG1 E10 F300; prime\nG92 E0\nG1 X21 Y15 F3000; wipe\nG1 X34 F9000\nG1 Y35 F6000; wipe again\n\nM117 printing...\n" }, "machine_nozzle_offset_x": { "default_value": 24.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, - "material_diameter": { "default_value": 1.75 }, - "machine_extruder_start_code": { - "default_value": "\n;start T1\n\nM104 T1 S{material_print_temperature_layer_0}\nG1 X41 Y35 F9000 ; go to wipe position\nM109 T1 S{material_print_temperature_layer_0}; wait for temp\nG1 E10 F300; prime\nG92 E0\nG1 X21 Y15 F3000; wipe\nG1 X34 F9000\nG1 Y35 F6000; wipe again\n\nM117 printing...\n" - }, - "machine_extruder_end_code": { - "default_value": "\nM104 T1 S{material_standby_temperature}\nG1 X41 Y35 F9000 ; go to wipe position\nM109 T1 R{material_standby_temperature}; wait for temp\nG1 X21 Y15 F3000; wipe\nG1 X31 F9000\nG1 Y35 F6000; wipe again\n\n;end T1\n\n" - } + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/cartesio_extruder_2.def.json b/resources/extruders/cartesio_extruder_2.def.json index 2521ada681..04e4a27011 100644 --- a/resources/extruders/cartesio_extruder_2.def.json +++ b/resources/extruders/cartesio_extruder_2.def.json @@ -2,24 +2,22 @@ "version": 2, "name": "Extruder 3", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "cartesio", "position": "2" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 2, "maximum_value": "3" }, + "machine_extruder_end_code": { "default_value": "\nM104 T2 S{material_standby_temperature}\nG1 X41 Y215 F9000 ; go to wipe position\nM109 T2 R{material_standby_temperature}; wait for temp\nG1 X21 Y235 F3000; wipe\nG1 X31 F9000\nG1 Y215 F6000; wipe again\n\n;end T2\n\n" }, + "machine_extruder_start_code": { "default_value": "\n;start T2\n\nM104 T2 S{material_print_temperature_layer_0}\nG1 X41 Y215 F9000 ; go to wipe position\nM109 T2 S{material_print_temperature_layer_0}; wait for temp\nG1 E10 F300; prime\nG92 E0\nG1 X21 Y235 F3000; wipe\nG1 X31 F9000\nG1 Y215 F6000; wipe again\n\nM117 printing...\n" }, "machine_nozzle_offset_x": { "default_value": 24.0 }, "machine_nozzle_offset_y": { "default_value": -100.0 }, - "material_diameter": { "default_value": 1.75 }, - "machine_extruder_start_code": { - "default_value": "\n;start T2\n\nM104 T2 S{material_print_temperature_layer_0}\nG1 X41 Y215 F9000 ; go to wipe position\nM109 T2 S{material_print_temperature_layer_0}; wait for temp\nG1 E10 F300; prime\nG92 E0\nG1 X21 Y235 F3000; wipe\nG1 X31 F9000\nG1 Y215 F6000; wipe again\n\nM117 printing...\n" - }, - "machine_extruder_end_code": { - "default_value": "\nM104 T2 S{material_standby_temperature}\nG1 X41 Y215 F9000 ; go to wipe position\nM109 T2 R{material_standby_temperature}; wait for temp\nG1 X21 Y235 F3000; wipe\nG1 X31 F9000\nG1 Y215 F6000; wipe again\n\n;end T2\n\n" - } + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/cartesio_extruder_3.def.json b/resources/extruders/cartesio_extruder_3.def.json index c844e7ce54..02ac2328ca 100644 --- a/resources/extruders/cartesio_extruder_3.def.json +++ b/resources/extruders/cartesio_extruder_3.def.json @@ -2,24 +2,22 @@ "version": 2, "name": "Extruder 4", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "cartesio", "position": "3" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 3, "maximum_value": "3" }, + "machine_extruder_end_code": { "default_value": "\nM104 T3 S{material_standby_temperature}\nG1 X65 Y215 F9000 ; go to wipe position\nM109 T3 R{material_standby_temperature}; wait for temp\nG1 X45 Y235 F3000; wipe\nG1 X55 F9000\nG1 Y215 F6000; wipe again\n\n;end T3\n\n" }, + "machine_extruder_start_code": { "default_value": "\n;start T3\n\nM104 T3 S{material_print_temperature_layer_0}\nG1 X65 Y215 F9000 ; go to wipe position\nM109 T3 S{material_print_temperature_layer_0}; wait for temp\nG1 E10 F300; prime\nG92 E0\nG1 X45 Y235 F3000; wipe\nG1 X55 F9000\nG1 Y215 F6000; wipe again\n\nM117 printing...\n" }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": -100.0 }, - "material_diameter": { "default_value": 1.75 }, - "machine_extruder_start_code": { - "default_value": "\n;start T3\n\nM104 T3 S{material_print_temperature_layer_0}\nG1 X65 Y215 F9000 ; go to wipe position\nM109 T3 S{material_print_temperature_layer_0}; wait for temp\nG1 E10 F300; prime\nG92 E0\nG1 X45 Y235 F3000; wipe\nG1 X55 F9000\nG1 Y215 F6000; wipe again\n\nM117 printing...\n" - }, - "machine_extruder_end_code": { - "default_value": "\nM104 T3 S{material_standby_temperature}\nG1 X65 Y215 F9000 ; go to wipe position\nM109 T3 R{material_standby_temperature}; wait for temp\nG1 X45 Y235 F3000; wipe\nG1 X55 F9000\nG1 Y215 F6000; wipe again\n\n;end T3\n\n" - } + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/cocoon_create_extruder_0.def.json b/resources/extruders/cocoon_create_extruder_0.def.json index edca4b33bb..9ffc2da638 100644 --- a/resources/extruders/cocoon_create_extruder_0.def.json +++ b/resources/extruders/cocoon_create_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "cocoon_create", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/cocoon_create_modelmaker_extruder_0.def.json b/resources/extruders/cocoon_create_modelmaker_extruder_0.def.json index dfa06c776a..a9115d7863 100644 --- a/resources/extruders/cocoon_create_modelmaker_extruder_0.def.json +++ b/resources/extruders/cocoon_create_modelmaker_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "cocoon_create_modelmaker", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/cocoon_create_touch_extruder_0.def.json b/resources/extruders/cocoon_create_touch_extruder_0.def.json index ca7c3e38af..083d6f5834 100644 --- a/resources/extruders/cocoon_create_touch_extruder_0.def.json +++ b/resources/extruders/cocoon_create_touch_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "cocoon_create_touch", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/cr-x_extruder_0.def.json b/resources/extruders/cr-x_extruder_0.def.json index d9b7b03021..e01e85e9da 100644 --- a/resources/extruders/cr-x_extruder_0.def.json +++ b/resources/extruders/cr-x_extruder_0.def.json @@ -2,25 +2,23 @@ "version": 2, "name": "Left Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "creality_cr-x", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, + "machine_extruder_end_code": { "default_value": "\nG92 E0 ;reset extruder distance\nG1 F800 E-5 ;short retract\nG1 F2400 X295 Y265 ;move near prime tower\nG1 F2000 E-93 ;long retract for filament removal\nG92 E0 ;reset extruder distance\nG90" }, + "machine_extruder_start_code": { "default_value": "\nT0 ;switch to extruder 1\nG92 E0 ;reset extruder distance\nG1 F2000 E93 ;load filament\nG92 E0 ;reset extruder distance\nM104 S{material_print_temperature}" }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, - "material_diameter": { "default_value": 1.75 }, "machine_nozzle_size": { "default_value": 0.4 }, - "machine_extruder_start_code": { - "default_value": "\nT0 ;switch to extruder 1\nG92 E0 ;reset extruder distance\nG1 F2000 E93 ;load filament\nG92 E0 ;reset extruder distance\nM104 S{material_print_temperature}" - }, - "machine_extruder_end_code": { - "default_value": "\nG92 E0 ;reset extruder distance\nG1 F800 E-5 ;short retract\nG1 F2400 X295 Y265 ;move near prime tower\nG1 F2000 E-93 ;long retract for filament removal\nG92 E0 ;reset extruder distance\nG90" - } + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/cr-x_extruder_1.def.json b/resources/extruders/cr-x_extruder_1.def.json index 8e763df64f..5ddb5aa1a0 100644 --- a/resources/extruders/cr-x_extruder_1.def.json +++ b/resources/extruders/cr-x_extruder_1.def.json @@ -2,25 +2,23 @@ "version": 2, "name": "Right Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "creality_cr-x", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, + "machine_extruder_end_code": { "default_value": "\nG92 E0 ;reset extruder distance\nG1 F800 E-5 ;short retract\nG1 F2400 X295 Y265 ;move near prime tower\nG1 F2000 E-93 ;long retract for filament removal\nG92 E0 ;reset extruder distance\nG90" }, + "machine_extruder_start_code": { "default_value": "\nT1 ;switch to extruder 2\nG92 E0 ;reset extruder distance\nG1 F2000 E93 ;load filament\nG92 E0 ;reset extruder distance\nM104 S{material_print_temperature}" }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, - "material_diameter": { "default_value": 1.75 }, "machine_nozzle_size": { "default_value": 0.4 }, - "machine_extruder_start_code": { - "default_value": "\nT1 ;switch to extruder 2\nG92 E0 ;reset extruder distance\nG1 F2000 E93 ;load filament\nG92 E0 ;reset extruder distance\nM104 S{material_print_temperature}" - }, - "machine_extruder_end_code": { - "default_value": "\nG92 E0 ;reset extruder distance\nG1 F800 E-5 ;short retract\nG1 F2400 X295 Y265 ;move near prime tower\nG1 F2000 E-93 ;long retract for filament removal\nG92 E0 ;reset extruder distance\nG90" - } + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/crazy3dprint_cz300_extruder_0.def.json b/resources/extruders/crazy3dprint_cz300_extruder_0.def.json index 72bbdbe17e..bc2354c8f8 100644 --- a/resources/extruders/crazy3dprint_cz300_extruder_0.def.json +++ b/resources/extruders/crazy3dprint_cz300_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "crazy3dprint_base", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/creality_base_extruder_0.def.json b/resources/extruders/creality_base_extruder_0.def.json index a173d1c2fa..68a5545fb4 100644 --- a/resources/extruders/creality_base_extruder_0.def.json +++ b/resources/extruders/creality_base_extruder_0.def.json @@ -2,15 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "creality_base", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } - } -} +} \ No newline at end of file diff --git a/resources/extruders/creasee_cs50spro_extruder.def.json b/resources/extruders/creasee_cs50spro_extruder.def.json index 8fdd42186a..793bb515fe 100644 --- a/resources/extruders/creasee_cs50spro_extruder.def.json +++ b/resources/extruders/creasee_cs50spro_extruder.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "creasee_cs50spro", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/creasee_extruder_0.def.json b/resources/extruders/creasee_extruder_0.def.json index abefa6b1c8..5495a691b0 100644 --- a/resources/extruders/creasee_extruder_0.def.json +++ b/resources/extruders/creasee_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "creasee_cs20", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/creasee_extruder_1.def.json b/resources/extruders/creasee_extruder_1.def.json index 747e1c48f8..805493a00e 100644 --- a/resources/extruders/creasee_extruder_1.def.json +++ b/resources/extruders/creasee_extruder_1.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "creasee_cs30", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/creasee_phoenix_extruder.def.json b/resources/extruders/creasee_phoenix_extruder.def.json index 9eed5943e4..3312f7406e 100644 --- a/resources/extruders/creasee_phoenix_extruder.def.json +++ b/resources/extruders/creasee_phoenix_extruder.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "creasee_phoenix", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/creasee_skywalker_extruder.def.json b/resources/extruders/creasee_skywalker_extruder.def.json index 0e240665ec..a1c1f5c1f5 100644 --- a/resources/extruders/creasee_skywalker_extruder.def.json +++ b/resources/extruders/creasee_skywalker_extruder.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "creasee_skywalker", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/creatable_d3_extruder_0.def.json b/resources/extruders/creatable_d3_extruder_0.def.json index 95883d0f69..66e8888b09 100644 --- a/resources/extruders/creatable_d3_extruder_0.def.json +++ b/resources/extruders/creatable_d3_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "creatable_d3", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/cremaker_extruder_0.def.json b/resources/extruders/cremaker_extruder_0.def.json index bf1dcce526..e7ed5300fe 100644 --- a/resources/extruders/cremaker_extruder_0.def.json +++ b/resources/extruders/cremaker_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "cremaker_common", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/cubicon_3dp_110f_extruder_0.def.json b/resources/extruders/cubicon_3dp_110f_extruder_0.def.json index 048c12b992..a0637bf552 100644 --- a/resources/extruders/cubicon_3dp_110f_extruder_0.def.json +++ b/resources/extruders/cubicon_3dp_110f_extruder_0.def.json @@ -2,25 +2,17 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "cubicon_3dp_110f", "position": "0" }, - "overrides": { - "extruder_nr": { - "default_value": 0 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "machine_nozzle_offset_x": { - "default_value": -15 - }, - "machine_nozzle_offset_y": { - "default_value": -5 - }, - "material_diameter": { - "default_value": 1.75 - } + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_offset_x": { "default_value": -15 }, + "machine_nozzle_offset_y": { "default_value": -5 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file diff --git a/resources/extruders/cubicon_3dp_210f_extruder_0.def.json b/resources/extruders/cubicon_3dp_210f_extruder_0.def.json index 07fe7f3769..97bbd009ed 100644 --- a/resources/extruders/cubicon_3dp_210f_extruder_0.def.json +++ b/resources/extruders/cubicon_3dp_210f_extruder_0.def.json @@ -2,25 +2,17 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "cubicon_3dp_210f", "position": "0" }, - "overrides": { - "extruder_nr": { - "default_value": 0 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "machine_nozzle_offset_x": { - "default_value": -7.25 - }, - "machine_nozzle_offset_y": { - "default_value": -5.82 - }, - "material_diameter": { - "default_value": 1.75 - } + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_offset_x": { "default_value": -7.25 }, + "machine_nozzle_offset_y": { "default_value": -5.82 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file diff --git a/resources/extruders/cubicon_3dp_310f_extruder_0.def.json b/resources/extruders/cubicon_3dp_310f_extruder_0.def.json index 8dc336877f..ee450c87b5 100644 --- a/resources/extruders/cubicon_3dp_310f_extruder_0.def.json +++ b/resources/extruders/cubicon_3dp_310f_extruder_0.def.json @@ -2,25 +2,17 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "cubicon_3dp_310f", "position": "0" }, - "overrides": { - "extruder_nr": { - "default_value": 0 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "machine_nozzle_offset_x": { - "default_value": -15 - }, - "machine_nozzle_offset_y": { - "default_value": -5 - }, - "material_diameter": { - "default_value": 1.75 - } + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_offset_x": { "default_value": -15 }, + "machine_nozzle_offset_y": { "default_value": -5 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file diff --git a/resources/extruders/cubicon_dual_pro_a30_extruder_0.def.json b/resources/extruders/cubicon_dual_pro_a30_extruder_0.def.json index 6c8993e799..4bd95152c0 100644 --- a/resources/extruders/cubicon_dual_pro_a30_extruder_0.def.json +++ b/resources/extruders/cubicon_dual_pro_a30_extruder_0.def.json @@ -2,25 +2,17 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "cubicon_dual_pro_a30", "position": "0" }, - "overrides": { - "extruder_nr": { - "default_value": 0 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "machine_nozzle_offset_x": { - "default_value": -27.3 - }, - "machine_nozzle_offset_y": { - "default_value": -19.9 - }, - "material_diameter": { - "default_value": 1.75 - } + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_offset_x": { "default_value": -27.3 }, + "machine_nozzle_offset_y": { "default_value": -19.9 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/cubicon_dual_pro_a30_extruder_1.def.json b/resources/extruders/cubicon_dual_pro_a30_extruder_1.def.json index ccdfdee1f7..687c6d464e 100644 --- a/resources/extruders/cubicon_dual_pro_a30_extruder_1.def.json +++ b/resources/extruders/cubicon_dual_pro_a30_extruder_1.def.json @@ -2,25 +2,17 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "cubicon_dual_pro_a30", "position": "1" }, - "overrides": { - "extruder_nr": { - "default_value": 1 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "machine_nozzle_offset_x": { - "default_value": -27.3 - }, - "machine_nozzle_offset_y": { - "default_value": -19.9 - }, - "material_diameter": { - "default_value": 1.75 - } + "overrides": + { + "extruder_nr": { "default_value": 1 }, + "machine_nozzle_offset_x": { "default_value": -27.3 }, + "machine_nozzle_offset_y": { "default_value": -19.9 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/cubicon_style_neo_a22_extruder_0.def.json b/resources/extruders/cubicon_style_neo_a22_extruder_0.def.json index 587d093a9e..6da644c38a 100644 --- a/resources/extruders/cubicon_style_neo_a22_extruder_0.def.json +++ b/resources/extruders/cubicon_style_neo_a22_extruder_0.def.json @@ -2,25 +2,17 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "cubicon_style_neo_a22", "position": "0" }, - "overrides": { - "extruder_nr": { - "default_value": 0 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "machine_nozzle_offset_x": { - "default_value": -3.20 - }, - "machine_nozzle_offset_y": { - "default_value": -4.70 - }, - "material_diameter": { - "default_value": 1.75 - } + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_offset_x": { "default_value": -3.2 }, + "machine_nozzle_offset_y": { "default_value": -4.7 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/cubicon_style_neo_a31_extruder_0.def.json b/resources/extruders/cubicon_style_neo_a31_extruder_0.def.json index 4f6ced9818..1467ee6845 100644 --- a/resources/extruders/cubicon_style_neo_a31_extruder_0.def.json +++ b/resources/extruders/cubicon_style_neo_a31_extruder_0.def.json @@ -2,25 +2,17 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "cubicon_style_neo_a31", "position": "0" }, - "overrides": { - "extruder_nr": { - "default_value": 0 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "machine_nozzle_offset_x": { - "default_value": -7.13 - }, - "machine_nozzle_offset_y": { - "default_value": -3.77 - }, - "material_diameter": { - "default_value": 1.75 - } + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_offset_x": { "default_value": -7.13 }, + "machine_nozzle_offset_y": { "default_value": -3.77 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/cubicon_style_plus_a15_extruder_0.def.json b/resources/extruders/cubicon_style_plus_a15_extruder_0.def.json index 12d022cd1e..7474413762 100644 --- a/resources/extruders/cubicon_style_plus_a15_extruder_0.def.json +++ b/resources/extruders/cubicon_style_plus_a15_extruder_0.def.json @@ -2,25 +2,17 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "cubicon_style_plus_a15", "position": "0" }, - "overrides": { - "extruder_nr": { - "default_value": 0 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "machine_nozzle_offset_x": { - "default_value": -4.00 - }, - "machine_nozzle_offset_y": { - "default_value": -7.00 - }, - "material_diameter": { - "default_value": 1.75 - } + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_offset_x": { "default_value": -4.0 }, + "machine_nozzle_offset_y": { "default_value": -7.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/custom_extruder_1.def.json b/resources/extruders/custom_extruder_1.def.json index 942f3e96b9..f15f98b3ec 100644 --- a/resources/extruders/custom_extruder_1.def.json +++ b/resources/extruders/custom_extruder_1.def.json @@ -2,15 +2,17 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "custom", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "7" } } -} +} \ No newline at end of file diff --git a/resources/extruders/custom_extruder_2.def.json b/resources/extruders/custom_extruder_2.def.json index cd43efa994..8812503dd4 100644 --- a/resources/extruders/custom_extruder_2.def.json +++ b/resources/extruders/custom_extruder_2.def.json @@ -2,15 +2,17 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "custom", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "7" } } -} +} \ No newline at end of file diff --git a/resources/extruders/custom_extruder_3.def.json b/resources/extruders/custom_extruder_3.def.json index be5bdd0e6a..734e0f81f7 100644 --- a/resources/extruders/custom_extruder_3.def.json +++ b/resources/extruders/custom_extruder_3.def.json @@ -2,15 +2,17 @@ "version": 2, "name": "Extruder 3", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "custom", "position": "2" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 2, "maximum_value": "7" } } -} +} \ No newline at end of file diff --git a/resources/extruders/custom_extruder_4.def.json b/resources/extruders/custom_extruder_4.def.json index ce1df0a5f5..21635bed58 100644 --- a/resources/extruders/custom_extruder_4.def.json +++ b/resources/extruders/custom_extruder_4.def.json @@ -2,15 +2,17 @@ "version": 2, "name": "Extruder 4", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "custom", "position": "3" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 3, "maximum_value": "7" } } -} +} \ No newline at end of file diff --git a/resources/extruders/custom_extruder_5.def.json b/resources/extruders/custom_extruder_5.def.json index beb4786505..2e8f9a8c6a 100644 --- a/resources/extruders/custom_extruder_5.def.json +++ b/resources/extruders/custom_extruder_5.def.json @@ -2,15 +2,17 @@ "version": 2, "name": "Extruder 5", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "custom", "position": "4" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 4, "maximum_value": "7" } } -} +} \ No newline at end of file diff --git a/resources/extruders/custom_extruder_6.def.json b/resources/extruders/custom_extruder_6.def.json index 7f1e1a1343..b6bd726e3a 100644 --- a/resources/extruders/custom_extruder_6.def.json +++ b/resources/extruders/custom_extruder_6.def.json @@ -2,15 +2,17 @@ "version": 2, "name": "Extruder 6", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "custom", "position": "5" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 5, "maximum_value": "7" } } -} +} \ No newline at end of file diff --git a/resources/extruders/custom_extruder_7.def.json b/resources/extruders/custom_extruder_7.def.json index e4239f35f0..2cebd0cf02 100644 --- a/resources/extruders/custom_extruder_7.def.json +++ b/resources/extruders/custom_extruder_7.def.json @@ -2,15 +2,17 @@ "version": 2, "name": "Extruder 7", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "custom", "position": "6" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 6, "maximum_value": "7" } } -} +} \ No newline at end of file diff --git a/resources/extruders/custom_extruder_8.def.json b/resources/extruders/custom_extruder_8.def.json index 7671825792..be70ff2226 100644 --- a/resources/extruders/custom_extruder_8.def.json +++ b/resources/extruders/custom_extruder_8.def.json @@ -2,15 +2,17 @@ "version": 2, "name": "Extruder 8", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "custom", "position": "7" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 7, "maximum_value": "7" } } -} +} \ No newline at end of file diff --git a/resources/extruders/dagoma_discoeasy200_extruder.def.json b/resources/extruders/dagoma_discoeasy200_extruder.def.json index 7bef0a7649..402630591b 100644 --- a/resources/extruders/dagoma_discoeasy200_extruder.def.json +++ b/resources/extruders/dagoma_discoeasy200_extruder.def.json @@ -2,20 +2,15 @@ "version": 2, "name": "Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "dagoma_discoeasy200", "position": "0" }, - - "overrides": { - "extruder_nr": { - "default_value": 0 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "material_diameter": { - "default_value": 1.75 - } + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/dagoma_discoeasy200_extruder_0.def.json b/resources/extruders/dagoma_discoeasy200_extruder_0.def.json index af1c2c42e9..158150dbb2 100644 --- a/resources/extruders/dagoma_discoeasy200_extruder_0.def.json +++ b/resources/extruders/dagoma_discoeasy200_extruder_0.def.json @@ -2,26 +2,17 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "dagoma_discoeasy200_bicolor", "position": "0" }, - - "overrides": { - "extruder_nr": { - "default_value": 0 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "material_diameter": { - "default_value": 1.75 - }, - "machine_extruder_start_code": { - "default_value": ";Start T0\nM83\nG1 E{retraction_amount} F3000\nG1 E60 F3000\nG1 E-{retraction_amount} F5000\nM82\nG92 E0" - }, - "machine_extruder_end_code": { - "default_value": "M83\nG1 E-{retraction_amount} F10000\nG1 E1.5 F3000\nG1 E-60 F10000\nM82\nG92 E0\n;End T0" - } + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_extruder_end_code": { "default_value": "M83\nG1 E-{retraction_amount} F10000\nG1 E1.5 F3000\nG1 E-60 F10000\nM82\nG92 E0\n;End T0" }, + "machine_extruder_start_code": { "default_value": ";Start T0\nM83\nG1 E{retraction_amount} F3000\nG1 E60 F3000\nG1 E-{retraction_amount} F5000\nM82\nG92 E0" }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/dagoma_discoeasy200_extruder_1.def.json b/resources/extruders/dagoma_discoeasy200_extruder_1.def.json index f01a805270..1705cb89c0 100644 --- a/resources/extruders/dagoma_discoeasy200_extruder_1.def.json +++ b/resources/extruders/dagoma_discoeasy200_extruder_1.def.json @@ -2,26 +2,17 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "dagoma_discoeasy200_bicolor", "position": "1" }, - - "overrides": { - "extruder_nr": { - "default_value": 1 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "material_diameter": { - "default_value": 1.75 - }, - "machine_extruder_start_code": { - "default_value": ";Start T1\nM83\nG1 E{retraction_amount} F3000\nG1 E60 F3000\nG1 E-{retraction_amount} F5000\nM82\nG92 E0" - }, - "machine_extruder_end_code": { - "default_value": "M83\nG1 E-{retraction_amount} F10000\nG1 E1.5 F3000\nG1 E-60 F10000\nM82\nG92 E0\n;End T1" - } + "overrides": + { + "extruder_nr": { "default_value": 1 }, + "machine_extruder_end_code": { "default_value": "M83\nG1 E-{retraction_amount} F10000\nG1 E1.5 F3000\nG1 E-60 F10000\nM82\nG92 E0\n;End T1" }, + "machine_extruder_start_code": { "default_value": ";Start T1\nM83\nG1 E{retraction_amount} F3000\nG1 E60 F3000\nG1 E-{retraction_amount} F5000\nM82\nG92 E0" }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/dagoma_discoultimate_extruder.def.json b/resources/extruders/dagoma_discoultimate_extruder.def.json index a53145f429..d9a454f345 100644 --- a/resources/extruders/dagoma_discoultimate_extruder.def.json +++ b/resources/extruders/dagoma_discoultimate_extruder.def.json @@ -2,20 +2,15 @@ "version": 2, "name": "Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "dagoma_discoultimate", "position": "0" }, - - "overrides": { - "extruder_nr": { - "default_value": 0 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "material_diameter": { - "default_value": 1.75 - } + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/dagoma_discoultimate_extruder_0.def.json b/resources/extruders/dagoma_discoultimate_extruder_0.def.json index 766d5b2902..56229f57c8 100644 --- a/resources/extruders/dagoma_discoultimate_extruder_0.def.json +++ b/resources/extruders/dagoma_discoultimate_extruder_0.def.json @@ -2,26 +2,17 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "dagoma_discoultimate_bicolor", "position": "0" }, - - "overrides": { - "extruder_nr": { - "default_value": 0 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "material_diameter": { - "default_value": 1.75 - }, - "machine_extruder_start_code": { - "default_value": ";Start T0\nM83\nG1 E{retraction_amount} F3000\nG1 E60 F3000\nG1 E-{retraction_amount} F5000\nM82\nG92 E0" - }, - "machine_extruder_end_code": { - "default_value": "M83\nG1 E-{retraction_amount} F10000\nG1 E1.5 F3000\nG1 E-60 F10000\nM82\nG92 E0\n;End T0" - } + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_extruder_end_code": { "default_value": "M83\nG1 E-{retraction_amount} F10000\nG1 E1.5 F3000\nG1 E-60 F10000\nM82\nG92 E0\n;End T0" }, + "machine_extruder_start_code": { "default_value": ";Start T0\nM83\nG1 E{retraction_amount} F3000\nG1 E60 F3000\nG1 E-{retraction_amount} F5000\nM82\nG92 E0" }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/dagoma_discoultimate_extruder_1.def.json b/resources/extruders/dagoma_discoultimate_extruder_1.def.json index f71b875261..518a7153f7 100644 --- a/resources/extruders/dagoma_discoultimate_extruder_1.def.json +++ b/resources/extruders/dagoma_discoultimate_extruder_1.def.json @@ -2,26 +2,17 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "dagoma_discoultimate_bicolor", "position": "1" }, - - "overrides": { - "extruder_nr": { - "default_value": 1 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "material_diameter": { - "default_value": 1.75 - }, - "machine_extruder_start_code": { - "default_value": ";Start T1\nM83\nG1 E{retraction_amount} F3000\nG1 E60 F3000\nG1 E-{retraction_amount} F5000\nM82\nG92 E0" - }, - "machine_extruder_end_code": { - "default_value": "M83\nG1 E-{retraction_amount} F10000\nG1 E1.5 F3000\nG1 E-60 F10000\nM82\nG92 E0\n;End T1" - } + "overrides": + { + "extruder_nr": { "default_value": 1 }, + "machine_extruder_end_code": { "default_value": "M83\nG1 E-{retraction_amount} F10000\nG1 E1.5 F3000\nG1 E-60 F10000\nM82\nG92 E0\n;End T1" }, + "machine_extruder_start_code": { "default_value": ";Start T1\nM83\nG1 E{retraction_amount} F3000\nG1 E60 F3000\nG1 E-{retraction_amount} F5000\nM82\nG92 E0" }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/dagoma_magis_extruder.def.json b/resources/extruders/dagoma_magis_extruder.def.json index 06cf6127ce..74b5d01115 100644 --- a/resources/extruders/dagoma_magis_extruder.def.json +++ b/resources/extruders/dagoma_magis_extruder.def.json @@ -2,20 +2,15 @@ "version": 2, "name": "Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "dagoma_magis", "position": "0" }, - - "overrides": { - "extruder_nr": { - "default_value": 0 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "material_diameter": { - "default_value": 1.75 - } + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/dagoma_neva_extruder.def.json b/resources/extruders/dagoma_neva_extruder.def.json index 3fa26ab5c9..56376a95fa 100644 --- a/resources/extruders/dagoma_neva_extruder.def.json +++ b/resources/extruders/dagoma_neva_extruder.def.json @@ -2,20 +2,15 @@ "version": 2, "name": "Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "dagoma_neva", "position": "0" }, - - "overrides": { - "extruder_nr": { - "default_value": 0 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "material_diameter": { - "default_value": 1.75 - } + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/delta_go_extruder_0.def.json b/resources/extruders/delta_go_extruder_0.def.json index 330cde08bf..072054dad7 100644 --- a/resources/extruders/delta_go_extruder_0.def.json +++ b/resources/extruders/delta_go_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "delta_go", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/deltabot_extruder_0.def.json b/resources/extruders/deltabot_extruder_0.def.json index d4773ccf9f..e89ee5a428 100644 --- a/resources/extruders/deltabot_extruder_0.def.json +++ b/resources/extruders/deltabot_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "deltabot", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.5 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/deltacomb_base_extruder_0.def.json b/resources/extruders/deltacomb_base_extruder_0.def.json index d3ad8aa06c..7d358186c5 100644 --- a/resources/extruders/deltacomb_base_extruder_0.def.json +++ b/resources/extruders/deltacomb_base_extruder_0.def.json @@ -1,19 +1,24 @@ { - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": { - "machine": "deltacomb_base", - "position": "0" + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "deltacomb_base", + "position": "0" }, - - "overrides": { - "extruder_nr": { "default_value": 0, "maximum_value": "3" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_extruder_start_code": { "default_value": ";Deltacomb Extruder 1\n;Put your custom code here"}, - "machine_extruder_end_code": { "default_value": ";Deltacomb Extruder 1\n;Put your custom code here"} + "overrides": + { + "extruder_nr": + { + "default_value": 0, + "maximum_value": "3" + }, + "machine_extruder_end_code": { "default_value": ";Deltacomb Extruder 1\n;Put your custom code here" }, + "machine_extruder_start_code": { "default_value": ";Deltacomb Extruder 1\n;Put your custom code here" }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/deltacomb_base_extruder_1.def.json b/resources/extruders/deltacomb_base_extruder_1.def.json index 2f2de6c747..99227302c0 100644 --- a/resources/extruders/deltacomb_base_extruder_1.def.json +++ b/resources/extruders/deltacomb_base_extruder_1.def.json @@ -1,19 +1,24 @@ { - "version": 2, - "name": "Extruder 2", - "inherits": "fdmextruder", - "metadata": { - "machine": "deltacomb_base", - "position": "1" + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": + { + "machine": "deltacomb_base", + "position": "1" }, - - "overrides": { - "extruder_nr": { "default_value": 1, "maximum_value": "3" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_extruder_start_code": { "default_value": ";Deltacomb Extruder 2\n;Put your custom code here"}, - "machine_extruder_end_code": { "default_value": ";Deltacomb Extruder 2\n;Put your custom code here"} + "overrides": + { + "extruder_nr": + { + "default_value": 1, + "maximum_value": "3" + }, + "machine_extruder_end_code": { "default_value": ";Deltacomb Extruder 2\n;Put your custom code here" }, + "machine_extruder_start_code": { "default_value": ";Deltacomb Extruder 2\n;Put your custom code here" }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/deltacomb_base_extruder_2.def.json b/resources/extruders/deltacomb_base_extruder_2.def.json index f4a898f0c7..6d507e1aa4 100644 --- a/resources/extruders/deltacomb_base_extruder_2.def.json +++ b/resources/extruders/deltacomb_base_extruder_2.def.json @@ -1,19 +1,24 @@ { - "version": 2, - "name": "Extruder 3", - "inherits": "fdmextruder", - "metadata": { - "machine": "deltacomb_base", - "position": "2" + "version": 2, + "name": "Extruder 3", + "inherits": "fdmextruder", + "metadata": + { + "machine": "deltacomb_base", + "position": "2" }, - - "overrides": { - "extruder_nr": { "default_value": 2, "maximum_value": "3" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_extruder_start_code": { "default_value": ";Deltacomb Extruder 3\n;Put your custom code here"}, - "machine_extruder_end_code": { "default_value": ";Deltacomb Extruder 3\n;Put your custom code here"} + "overrides": + { + "extruder_nr": + { + "default_value": 2, + "maximum_value": "3" + }, + "machine_extruder_end_code": { "default_value": ";Deltacomb Extruder 3\n;Put your custom code here" }, + "machine_extruder_start_code": { "default_value": ";Deltacomb Extruder 3\n;Put your custom code here" }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/deltacomb_base_extruder_3.def.json b/resources/extruders/deltacomb_base_extruder_3.def.json index 2d01c8e5aa..a4338723bc 100644 --- a/resources/extruders/deltacomb_base_extruder_3.def.json +++ b/resources/extruders/deltacomb_base_extruder_3.def.json @@ -1,19 +1,24 @@ { - "version": 2, - "name": "Extruder 4", - "inherits": "fdmextruder", - "metadata": { - "machine": "deltacomb_base", - "position": "3" + "version": 2, + "name": "Extruder 4", + "inherits": "fdmextruder", + "metadata": + { + "machine": "deltacomb_base", + "position": "3" }, - - "overrides": { - "extruder_nr": { "default_value": 3, "maximum_value": "3" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_extruder_start_code": { "default_value": ";Deltacomb Extruder 4\n;Put your custom code here"}, - "machine_extruder_end_code": { "default_value": ";Deltacomb Extruder 4\n;Put your custom code here"} + "overrides": + { + "extruder_nr": + { + "default_value": 3, + "maximum_value": "3" + }, + "machine_extruder_end_code": { "default_value": ";Deltacomb Extruder 4\n;Put your custom code here" }, + "machine_extruder_start_code": { "default_value": ";Deltacomb Extruder 4\n;Put your custom code here" }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/deltacomb_dc20dual_extruder_0.def.json b/resources/extruders/deltacomb_dc20dual_extruder_0.def.json index f01a416224..8b0dd18d1b 100644 --- a/resources/extruders/deltacomb_dc20dual_extruder_0.def.json +++ b/resources/extruders/deltacomb_dc20dual_extruder_0.def.json @@ -1,19 +1,20 @@ { - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": { - "machine": "deltacomb_dc20dual", - "position": "0" + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "deltacomb_dc20dual", + "position": "0" }, - - "overrides": { - "extruder_nr": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": -8.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_extruder_start_code": { "default_value": ";DC20 Dual Extruder 1\n;Put your custom code here"}, - "machine_extruder_end_code": { "default_value": ";DC20 Dual Extruder 1\n;Put your custom code here"} + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_extruder_end_code": { "default_value": ";DC20 Dual Extruder 1\n;Put your custom code here" }, + "machine_extruder_start_code": { "default_value": ";DC20 Dual Extruder 1\n;Put your custom code here" }, + "machine_nozzle_offset_x": { "default_value": -8.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/deltacomb_dc20dual_extruder_1.def.json b/resources/extruders/deltacomb_dc20dual_extruder_1.def.json index 2749254242..07dcc881c7 100644 --- a/resources/extruders/deltacomb_dc20dual_extruder_1.def.json +++ b/resources/extruders/deltacomb_dc20dual_extruder_1.def.json @@ -1,19 +1,20 @@ { - "version": 2, - "name": "Extruder 2", - "inherits": "fdmextruder", - "metadata": { - "machine": "deltacomb_dc20dual", - "position": "1" + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": + { + "machine": "deltacomb_dc20dual", + "position": "1" }, - - "overrides": { - "extruder_nr": { "default_value": 1 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": -8.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_extruder_start_code": { "default_value": ";DC20 Dual Extruder 2\n;Put your custom code here"}, - "machine_extruder_end_code": { "default_value": ";DC20 Dual Extruder 2\n;Put your custom code here"} + "overrides": + { + "extruder_nr": { "default_value": 1 }, + "machine_extruder_end_code": { "default_value": ";DC20 Dual Extruder 2\n;Put your custom code here" }, + "machine_extruder_start_code": { "default_value": ";DC20 Dual Extruder 2\n;Put your custom code here" }, + "machine_nozzle_offset_x": { "default_value": -8.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/deltacomb_dc20flux_extruder_0.def.json b/resources/extruders/deltacomb_dc20flux_extruder_0.def.json index b36879898c..9bcc5cf179 100644 --- a/resources/extruders/deltacomb_dc20flux_extruder_0.def.json +++ b/resources/extruders/deltacomb_dc20flux_extruder_0.def.json @@ -1,19 +1,20 @@ { - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": { - "machine": "deltacomb_dc20flux", - "position": "0" + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "deltacomb_dc20flux", + "position": "0" }, - - "overrides": { - "extruder_nr": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC2x Flux Extruder 1 Start\n;---------------------------------------\nG91 ;relative positioning\nG1 E57 F5000 ;fast insert\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, - "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC2x Flux Extruder 1 End\n;---------------------------------------\nG91 ;relative positioning\nG1 E-10 F6000 ;filament shaping\nG0 Z2\nG1 E9\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"} + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC2x Flux Extruder 1 End\n;---------------------------------------\nG91 ;relative positioning\nG1 E-10 F6000 ;filament shaping\nG0 Z2\nG1 E9\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------" }, + "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC2x Flux Extruder 1 Start\n;---------------------------------------\nG91 ;relative positioning\nG1 E57 F5000 ;fast insert\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------" }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/deltacomb_dc20flux_extruder_1.def.json b/resources/extruders/deltacomb_dc20flux_extruder_1.def.json index d1232c24a8..cf4472aa61 100644 --- a/resources/extruders/deltacomb_dc20flux_extruder_1.def.json +++ b/resources/extruders/deltacomb_dc20flux_extruder_1.def.json @@ -1,20 +1,21 @@ { - "version": 2, - "name": "Extruder 2", - "inherits": "fdmextruder", - "metadata": { - "machine": "deltacomb_dc20flux", - "position": "1" + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": + { + "machine": "deltacomb_dc20flux", + "position": "1" }, - - "overrides": { - "extruder_nr": { "default_value": 1 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC2x Flux Extruder 2 Start\n;---------------------------------------\nG91 ;relative positioning\nG1 E57 F5000 ;fast insert\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, - "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC2x Flux Extruder 2 End\n;---------------------------------------\nG91 ;relative positioning\nG1 E-10 F6000 ;filament shaping\nG0 Z2\nG1 E9\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, - "prime_tower_flow": { "value": "200" } + "overrides": + { + "extruder_nr": { "default_value": 1 }, + "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC2x Flux Extruder 2 End\n;---------------------------------------\nG91 ;relative positioning\nG1 E-10 F6000 ;filament shaping\nG0 Z2\nG1 E9\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------" }, + "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC2x Flux Extruder 2 Start\n;---------------------------------------\nG91 ;relative positioning\nG1 E57 F5000 ;fast insert\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------" }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "prime_tower_flow": { "value": "200" } } -} +} \ No newline at end of file diff --git a/resources/extruders/deltacomb_dc20flux_extruder_2.def.json b/resources/extruders/deltacomb_dc20flux_extruder_2.def.json index d64a0d8b66..b98bc7ac74 100644 --- a/resources/extruders/deltacomb_dc20flux_extruder_2.def.json +++ b/resources/extruders/deltacomb_dc20flux_extruder_2.def.json @@ -1,20 +1,21 @@ { - "version": 2, - "name": "Extruder 3", - "inherits": "fdmextruder", - "metadata": { - "machine": "deltacomb_dc20flux", - "position": "2" + "version": 2, + "name": "Extruder 3", + "inherits": "fdmextruder", + "metadata": + { + "machine": "deltacomb_dc20flux", + "position": "2" }, - - "overrides": { - "extruder_nr": { "default_value": 2 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC2x Flux Extruder 3 Start\n;---------------------------------------\nG91 ;relative positioning\nG1 E57 F5000 ;fast insert\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, - "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC2x Flux Extruder 3 End\n;---------------------------------------\nG91 ;relative positioning\nG1 E-10 F6000 ;filament shaping\nG0 Z2\nG1 E9\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, - "prime_tower_flow": { "value": "200" } + "overrides": + { + "extruder_nr": { "default_value": 2 }, + "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC2x Flux Extruder 3 End\n;---------------------------------------\nG91 ;relative positioning\nG1 E-10 F6000 ;filament shaping\nG0 Z2\nG1 E9\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------" }, + "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC2x Flux Extruder 3 Start\n;---------------------------------------\nG91 ;relative positioning\nG1 E57 F5000 ;fast insert\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------" }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "prime_tower_flow": { "value": "200" } } -} +} \ No newline at end of file diff --git a/resources/extruders/deltacomb_dc20flux_extruder_3.def.json b/resources/extruders/deltacomb_dc20flux_extruder_3.def.json index 061de645df..25b4b75a0c 100644 --- a/resources/extruders/deltacomb_dc20flux_extruder_3.def.json +++ b/resources/extruders/deltacomb_dc20flux_extruder_3.def.json @@ -1,24 +1,21 @@ { - "version": 2, - "name": "Extruder 4", - "inherits": "fdmextruder", - "metadata": { - "machine": "deltacomb_dc20flux", - "position": "3" + "version": 2, + "name": "Extruder 4", + "inherits": "fdmextruder", + "metadata": + { + "machine": "deltacomb_dc20flux", + "position": "3" }, - - "overrides": { - "extruder_nr": { "default_value": 3 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC2x Flux Extruder 4 Start\n;---------------------------------------\nG91 ;relative positioning\nG1 E57 F5000 ;fast insert\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, - "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC2x Flux Extruder 4 End\n;---------------------------------------\nG91 ;relative positioning\nG1 E-10 F6000 ;filament shaping\nG0 Z2\nG1 E9\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, - "prime_tower_flow": { "value": "200" } + "overrides": + { + "extruder_nr": { "default_value": 3 }, + "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC2x Flux Extruder 4 End\n;---------------------------------------\nG91 ;relative positioning\nG1 E-10 F6000 ;filament shaping\nG0 Z2\nG1 E9\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------" }, + "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC2x Flux Extruder 4 Start\n;---------------------------------------\nG91 ;relative positioning\nG1 E57 F5000 ;fast insert\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------" }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "prime_tower_flow": { "value": "200" } } -} - - - - +} \ No newline at end of file diff --git a/resources/extruders/deltacomb_dc30dual_extruder_0.def.json b/resources/extruders/deltacomb_dc30dual_extruder_0.def.json index 45cd65ea8a..5acc27dfc2 100644 --- a/resources/extruders/deltacomb_dc30dual_extruder_0.def.json +++ b/resources/extruders/deltacomb_dc30dual_extruder_0.def.json @@ -1,19 +1,20 @@ { - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": { - "machine": "deltacomb_dc30dual", - "position": "0" + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "deltacomb_dc30dual", + "position": "0" }, - - "overrides": { - "extruder_nr": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": -8.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_extruder_start_code": { "default_value": ";DC30 Dual Extruder 1\n;Put your custom code here"}, - "machine_extruder_end_code": { "default_value": ";DC30 Dual Extruder 1\n;Put your custom code here"} + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_extruder_end_code": { "default_value": ";DC30 Dual Extruder 1\n;Put your custom code here" }, + "machine_extruder_start_code": { "default_value": ";DC30 Dual Extruder 1\n;Put your custom code here" }, + "machine_nozzle_offset_x": { "default_value": -8.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/deltacomb_dc30dual_extruder_1.def.json b/resources/extruders/deltacomb_dc30dual_extruder_1.def.json index 74d2b3d39d..9f847d7d24 100644 --- a/resources/extruders/deltacomb_dc30dual_extruder_1.def.json +++ b/resources/extruders/deltacomb_dc30dual_extruder_1.def.json @@ -1,19 +1,20 @@ { - "version": 2, - "name": "Extruder 2", - "inherits": "fdmextruder", - "metadata": { - "machine": "deltacomb_dc30dual", - "position": "1" + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": + { + "machine": "deltacomb_dc30dual", + "position": "1" }, - - "overrides": { - "extruder_nr": { "default_value": 1 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": -8.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_extruder_start_code": { "default_value": ";DC30 Dual Extruder 2\n;Put your custom code here"}, - "machine_extruder_end_code": { "default_value": ";DC30 Dual Extruder 2\n;Put your custom code here"} + "overrides": + { + "extruder_nr": { "default_value": 1 }, + "machine_extruder_end_code": { "default_value": ";DC30 Dual Extruder 2\n;Put your custom code here" }, + "machine_extruder_start_code": { "default_value": ";DC30 Dual Extruder 2\n;Put your custom code here" }, + "machine_nozzle_offset_x": { "default_value": -8.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/deltacomb_dc30flux_extruder_0.def.json b/resources/extruders/deltacomb_dc30flux_extruder_0.def.json index 604affe3f2..405eb7554c 100644 --- a/resources/extruders/deltacomb_dc30flux_extruder_0.def.json +++ b/resources/extruders/deltacomb_dc30flux_extruder_0.def.json @@ -1,19 +1,20 @@ { - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": { - "machine": "deltacomb_dc30flux", - "position": "0" + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "deltacomb_dc30flux", + "position": "0" }, - - "overrides": { - "extruder_nr": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC3x Flux Extruder 1 Start\n;---------------------------------------\nG91 ;relative positioning\nG1 E57 F5000 ;fast insert\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, - "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC3x Flux Extruder 1 End\n;---------------------------------------\nG91 ;relative positioning\nG1 E-10 F6000 ;filament shaping\nG0 Z2\nG1 E9\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"} + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC3x Flux Extruder 1 End\n;---------------------------------------\nG91 ;relative positioning\nG1 E-10 F6000 ;filament shaping\nG0 Z2\nG1 E9\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------" }, + "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC3x Flux Extruder 1 Start\n;---------------------------------------\nG91 ;relative positioning\nG1 E57 F5000 ;fast insert\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------" }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/deltacomb_dc30flux_extruder_1.def.json b/resources/extruders/deltacomb_dc30flux_extruder_1.def.json index e0b0e1711f..df59e027da 100644 --- a/resources/extruders/deltacomb_dc30flux_extruder_1.def.json +++ b/resources/extruders/deltacomb_dc30flux_extruder_1.def.json @@ -1,20 +1,21 @@ { - "version": 2, - "name": "Extruder 2", - "inherits": "fdmextruder", - "metadata": { - "machine": "deltacomb_dc30flux", - "position": "1" + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": + { + "machine": "deltacomb_dc30flux", + "position": "1" }, - - "overrides": { - "extruder_nr": { "default_value": 1 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC3x Flux Extruder 2 Start\n;---------------------------------------\nG91 ;relative positioning\nG1 E57 F5000 ;fast insert\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, - "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC3x Flux Extruder 2 End\n;---------------------------------------\nG91 ;relative positioning\nG1 E-10 F6000 ;filament shaping\nG0 Z2\nG1 E9\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, - "prime_tower_flow": { "value": "200" } + "overrides": + { + "extruder_nr": { "default_value": 1 }, + "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC3x Flux Extruder 2 End\n;---------------------------------------\nG91 ;relative positioning\nG1 E-10 F6000 ;filament shaping\nG0 Z2\nG1 E9\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------" }, + "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC3x Flux Extruder 2 Start\n;---------------------------------------\nG91 ;relative positioning\nG1 E57 F5000 ;fast insert\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------" }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "prime_tower_flow": { "value": "200" } } -} +} \ No newline at end of file diff --git a/resources/extruders/deltacomb_dc30flux_extruder_2.def.json b/resources/extruders/deltacomb_dc30flux_extruder_2.def.json index 048499988d..ade9f58fb8 100644 --- a/resources/extruders/deltacomb_dc30flux_extruder_2.def.json +++ b/resources/extruders/deltacomb_dc30flux_extruder_2.def.json @@ -1,20 +1,21 @@ { - "version": 2, - "name": "Extruder 3", - "inherits": "fdmextruder", - "metadata": { - "machine": "deltacomb_dc30flux", - "position": "2" + "version": 2, + "name": "Extruder 3", + "inherits": "fdmextruder", + "metadata": + { + "machine": "deltacomb_dc30flux", + "position": "2" }, - - "overrides": { - "extruder_nr": { "default_value": 2 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC3x Flux Extruder 3 Start\n;---------------------------------------\nG91 ;relative positioning\nG1 E57 F5000 ;fast insert\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, - "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC3x Flux Extruder 3 End\n;---------------------------------------\nG91 ;relative positioning\nG1 E-10 F6000 ;filament shaping\nG0 Z2\nG1 E9\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, - "prime_tower_flow": { "value": "200" } + "overrides": + { + "extruder_nr": { "default_value": 2 }, + "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC3x Flux Extruder 3 End\n;---------------------------------------\nG91 ;relative positioning\nG1 E-10 F6000 ;filament shaping\nG0 Z2\nG1 E9\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------" }, + "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC3x Flux Extruder 3 Start\n;---------------------------------------\nG91 ;relative positioning\nG1 E57 F5000 ;fast insert\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------" }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "prime_tower_flow": { "value": "200" } } -} +} \ No newline at end of file diff --git a/resources/extruders/deltacomb_dc30flux_extruder_3.def.json b/resources/extruders/deltacomb_dc30flux_extruder_3.def.json index a18f2f1288..a94ca07d48 100644 --- a/resources/extruders/deltacomb_dc30flux_extruder_3.def.json +++ b/resources/extruders/deltacomb_dc30flux_extruder_3.def.json @@ -1,20 +1,21 @@ { - "version": 2, - "name": "Extruder 4", - "inherits": "fdmextruder", - "metadata": { - "machine": "deltacomb_dc30flux", - "position": "3" + "version": 2, + "name": "Extruder 4", + "inherits": "fdmextruder", + "metadata": + { + "machine": "deltacomb_dc30flux", + "position": "3" }, - - "overrides": { - "extruder_nr": { "default_value": 3 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC3x Flux Extruder 4 Start\n;---------------------------------------\nG91 ;relative positioning\nG1 E57 F5000 ;fast insert\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, - "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC3x Flux Extruder 4 End\n;---------------------------------------\nG91 ;relative positioning\nG1 E-10 F6000 ;filament shaping\nG0 Z2\nG1 E9\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, - "prime_tower_flow": { "value": "200" } + "overrides": + { + "extruder_nr": { "default_value": 3 }, + "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC3x Flux Extruder 4 End\n;---------------------------------------\nG91 ;relative positioning\nG1 E-10 F6000 ;filament shaping\nG0 Z2\nG1 E9\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------" }, + "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC3x Flux Extruder 4 Start\n;---------------------------------------\nG91 ;relative positioning\nG1 E57 F5000 ;fast insert\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------" }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "prime_tower_flow": { "value": "200" } } -} +} \ No newline at end of file diff --git a/resources/extruders/diy220_extruder_0.def.json b/resources/extruders/diy220_extruder_0.def.json index 8f7f0d12fa..4d802b4a8d 100644 --- a/resources/extruders/diy220_extruder_0.def.json +++ b/resources/extruders/diy220_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "diy220", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/dxu_extruder1.def.json b/resources/extruders/dxu_extruder1.def.json index 0a01881441..de974b8174 100644 --- a/resources/extruders/dxu_extruder1.def.json +++ b/resources/extruders/dxu_extruder1.def.json @@ -2,19 +2,21 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "dxu", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 } + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/dxu_extruder2.def.json b/resources/extruders/dxu_extruder2.def.json index 5e730c49f4..b4de471289 100644 --- a/resources/extruders/dxu_extruder2.def.json +++ b/resources/extruders/dxu_extruder2.def.json @@ -2,19 +2,21 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "dxu", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, "machine_nozzle_offset_x": { "default_value": 19.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 } + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/easyarts_ares_extruder_0.def.json b/resources/extruders/easyarts_ares_extruder_0.def.json index 4ddd476dbb..e9d34d6e20 100644 --- a/resources/extruders/easyarts_ares_extruder_0.def.json +++ b/resources/extruders/easyarts_ares_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "easyarts_ares", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/eazao_zero_extruder_0.def.json b/resources/extruders/eazao_zero_extruder_0.def.json index 00038a2ac9..5d34008337 100644 --- a/resources/extruders/eazao_zero_extruder_0.def.json +++ b/resources/extruders/eazao_zero_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "eazao_zero", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 1.5 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/elegoo_neptune2D_extruder_0.def.json b/resources/extruders/elegoo_neptune2D_extruder_0.def.json index ad8dee15e8..73fada60cc 100644 --- a/resources/extruders/elegoo_neptune2D_extruder_0.def.json +++ b/resources/extruders/elegoo_neptune2D_extruder_0.def.json @@ -2,16 +2,17 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "elegoo_neptune_2D", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, + "machine_extruder_end_code": { "default_value": "G1 F1600 E-80\nG92 E0" }, + "machine_extruder_start_code": { "default_value": "G1 F1200 E80\nG92 E0" }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_extruder_start_code": {"default_value": "G1 F1200 E80\nG92 E0"}, - "machine_extruder_end_code": {"default_value": "G1 F1600 E-80\nG92 E0"} + "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file diff --git a/resources/extruders/elegoo_neptune2D_extruder_1.def.json b/resources/extruders/elegoo_neptune2D_extruder_1.def.json index f4ec5194c4..567f2d8b33 100644 --- a/resources/extruders/elegoo_neptune2D_extruder_1.def.json +++ b/resources/extruders/elegoo_neptune2D_extruder_1.def.json @@ -2,16 +2,17 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "elegoo_neptune_2D", "position": "1" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 1 }, + "machine_extruder_end_code": { "default_value": "G1 F1600 E-80\nG92 E0" }, + "machine_extruder_start_code": { "default_value": "G1 F1200 E80\nG92 E0" }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_extruder_start_code": {"default_value": "G1 F1200 E80\nG92 E0"}, - "machine_extruder_end_code": {"default_value": "G1 F1600 E-80\nG92 E0"} + "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file diff --git a/resources/extruders/elegoo_neptune2_extruder_0.def.json b/resources/extruders/elegoo_neptune2_extruder_0.def.json index c182885b1f..ac9190c006 100644 --- a/resources/extruders/elegoo_neptune2_extruder_0.def.json +++ b/resources/extruders/elegoo_neptune2_extruder_0.def.json @@ -2,16 +2,17 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "elegoo_neptune_2", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, + "machine_extruder_end_code": { "default_value": "" }, + "machine_extruder_start_code": { "default_value": "" }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_extruder_start_code": {"default_value": ""}, - "machine_extruder_end_code": {"default_value": ""} + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/eryone_er20_extruder_0.def.json b/resources/extruders/eryone_er20_extruder_0.def.json index 4dcf363af9..30cbf76a01 100644 --- a/resources/extruders/eryone_er20_extruder_0.def.json +++ b/resources/extruders/eryone_er20_extruder_0.def.json @@ -2,26 +2,17 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "eryone_er20", "position": "0" }, - - "overrides": { - "extruder_nr": { - "default_value": 0 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "material_diameter": { - "default_value": 1.75 - }, - "machine_nozzle_offset_x": { - "default_value": 5 - }, - "machine_nozzle_offset_y": { - "default_value": 8.0 - } - } -} + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_offset_x": { "default_value": 5 }, + "machine_nozzle_offset_y": { "default_value": 8.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/eryone_thinker_extruder_0.def.json b/resources/extruders/eryone_thinker_extruder_0.def.json index 32889435a8..e87540573f 100644 --- a/resources/extruders/eryone_thinker_extruder_0.def.json +++ b/resources/extruders/eryone_thinker_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "eryone_thinker", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/erzay3d_extruder_0.def.json b/resources/extruders/erzay3d_extruder_0.def.json index a9cea62897..a4082a6224 100644 --- a/resources/extruders/erzay3d_extruder_0.def.json +++ b/resources/extruders/erzay3d_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "erzay3d", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/fabtotum_extruder_0.def.json b/resources/extruders/fabtotum_extruder_0.def.json index a763fbcc15..c56d57b5da 100644 --- a/resources/extruders/fabtotum_extruder_0.def.json +++ b/resources/extruders/fabtotum_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "fabtotum", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/fabxpro_extruder_0.def.json b/resources/extruders/fabxpro_extruder_0.def.json index 761aebe287..045d62a032 100644 --- a/resources/extruders/fabxpro_extruder_0.def.json +++ b/resources/extruders/fabxpro_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "fabxpro", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/farm2_ce_extruder_1.def.json b/resources/extruders/farm2_ce_extruder_1.def.json index 0c2e77f501..0967869eae 100644 --- a/resources/extruders/farm2_ce_extruder_1.def.json +++ b/resources/extruders/farm2_ce_extruder_1.def.json @@ -2,15 +2,14 @@ "version": 2, "name": "PrintHead", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "farm2_ce", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "material_diameter": { "default_value": 1.75 } - } -} - +} \ No newline at end of file diff --git a/resources/extruders/farm2_extruder_1.def.json b/resources/extruders/farm2_extruder_1.def.json index 8c86af9f93..6479fec990 100644 --- a/resources/extruders/farm2_extruder_1.def.json +++ b/resources/extruders/farm2_extruder_1.def.json @@ -2,15 +2,14 @@ "version": 2, "name": "PrintHead", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "farm2", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "material_diameter": { "default_value": 1.75 } - } -} - +} \ No newline at end of file diff --git a/resources/extruders/felixpro2_dual_extruder_0.def.json b/resources/extruders/felixpro2_dual_extruder_0.def.json index 4278a532f9..877efda85c 100644 --- a/resources/extruders/felixpro2_dual_extruder_0.def.json +++ b/resources/extruders/felixpro2_dual_extruder_0.def.json @@ -2,26 +2,27 @@ "version": 2, "name": "Left Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "felixpro2dual", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.35 }, - "material_diameter": { "default_value": 1.75 }, - + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" } + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.35 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/felixpro2_dual_extruder_1.def.json b/resources/extruders/felixpro2_dual_extruder_1.def.json index 195aad474d..8cd4f33209 100644 --- a/resources/extruders/felixpro2_dual_extruder_1.def.json +++ b/resources/extruders/felixpro2_dual_extruder_1.def.json @@ -2,26 +2,27 @@ "version": 2, "name": "Right Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "felixpro2dual", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "2" }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.35 }, - "material_diameter": { "default_value": 1.75 }, - + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" } + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.35 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/felixtec4_dual_extruder_0.def.json b/resources/extruders/felixtec4_dual_extruder_0.def.json index 1821b0e601..ceccbf714b 100644 --- a/resources/extruders/felixtec4_dual_extruder_0.def.json +++ b/resources/extruders/felixtec4_dual_extruder_0.def.json @@ -2,26 +2,27 @@ "version": 2, "name": "Left Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "felixtec4dual", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.35 }, - "material_diameter": { "default_value": 1.75 }, - + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" } + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.35 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/felixtec4_dual_extruder_1.def.json b/resources/extruders/felixtec4_dual_extruder_1.def.json index 37a99c5fb4..a4deac1f56 100644 --- a/resources/extruders/felixtec4_dual_extruder_1.def.json +++ b/resources/extruders/felixtec4_dual_extruder_1.def.json @@ -2,26 +2,27 @@ "version": 2, "name": "Right Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "felixtec4dual", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "2" }, - "machine_nozzle_offset_x": { "default_value": 13 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.35 }, - "material_diameter": { "default_value": 1.75 }, - + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" } + "machine_nozzle_offset_x": { "default_value": 13 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.35 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/flashforge_dreamernx_extruder_0.def.json b/resources/extruders/flashforge_dreamernx_extruder_0.def.json index b9f1df00dc..064a61bda9 100644 --- a/resources/extruders/flashforge_dreamernx_extruder_0.def.json +++ b/resources/extruders/flashforge_dreamernx_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "flashforge_base", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/flsun_q5_extruder.def.json b/resources/extruders/flsun_q5_extruder.def.json index ece222d70a..5282c3bebd 100644 --- a/resources/extruders/flsun_q5_extruder.def.json +++ b/resources/extruders/flsun_q5_extruder.def.json @@ -2,13 +2,15 @@ "version": 2, "name": "Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "flsun_q5", "position": "0" }, - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/flsun_qq_extruder.def.json b/resources/extruders/flsun_qq_extruder.def.json index c7ca0ed6eb..929b54db4b 100644 --- a/resources/extruders/flsun_qq_extruder.def.json +++ b/resources/extruders/flsun_qq_extruder.def.json @@ -2,13 +2,15 @@ "version": 2, "name": "Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "flsun_qq", "position": "0" }, - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/flsun_qq_s_extruder_0.def.json b/resources/extruders/flsun_qq_s_extruder_0.def.json index e61056fcd3..7ab5f7d7aa 100644 --- a/resources/extruders/flsun_qq_s_extruder_0.def.json +++ b/resources/extruders/flsun_qq_s_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "flsun_qq_s", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/flsun_sr_extruder_0.def.json b/resources/extruders/flsun_sr_extruder_0.def.json index 31880b5130..24234c39e7 100644 --- a/resources/extruders/flsun_sr_extruder_0.def.json +++ b/resources/extruders/flsun_sr_extruder_0.def.json @@ -2,19 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "flsun_sr", "position": "0" }, - "overrides": { - "extruder_nr": { - "default_value": 0 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "material_diameter": { - "default_value": 1.75 - } + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/flyingbear_base_extruder_0.def.json b/resources/extruders/flyingbear_base_extruder_0.def.json index a792b373ff..5bc4d80d46 100644 --- a/resources/extruders/flyingbear_base_extruder_0.def.json +++ b/resources/extruders/flyingbear_base_extruder_0.def.json @@ -2,15 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "flyingbear_base", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } - } -} +} \ No newline at end of file diff --git a/resources/extruders/folgertech_FT-5_extruder_0.def.json b/resources/extruders/folgertech_FT-5_extruder_0.def.json index 861b0e7a7e..ecbc98bd3f 100644 --- a/resources/extruders/folgertech_FT-5_extruder_0.def.json +++ b/resources/extruders/folgertech_FT-5_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "folgertech_FT-5", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/fusedform_base_extruder_0.def.json b/resources/extruders/fusedform_base_extruder_0.def.json index 19ecc0915d..5bb154ace5 100644 --- a/resources/extruders/fusedform_base_extruder_0.def.json +++ b/resources/extruders/fusedform_base_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "fusedform_base", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/fusedform_doppia_base_extruder_0.def.json b/resources/extruders/fusedform_doppia_base_extruder_0.def.json index 005647b736..f8627969a3 100644 --- a/resources/extruders/fusedform_doppia_base_extruder_0.def.json +++ b/resources/extruders/fusedform_doppia_base_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "fusedform_doppia_base", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/fusedform_doppia_base_extruder_1.def.json b/resources/extruders/fusedform_doppia_base_extruder_1.def.json index b0862c824c..a3dce50fa8 100644 --- a/resources/extruders/fusedform_doppia_base_extruder_1.def.json +++ b/resources/extruders/fusedform_doppia_base_extruder_1.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "fusedform_doppia_base", "position": "1" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 1 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/geeetech_A10_1.def.json b/resources/extruders/geeetech_A10_1.def.json deleted file mode 100644 index bcf889ab43..0000000000 --- a/resources/extruders/geeetech_A10_1.def.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": { - "machine": "geeetech_A10", - "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/geeetech_A20T_1.def.json b/resources/extruders/geeetech_A20T_1.def.json deleted file mode 100644 index 4880f2147b..0000000000 --- a/resources/extruders/geeetech_A20T_1.def.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": { - "machine": "geeetech_A20T", - "position": "0" - }, - - "overrides": { - "extruder_nr": { - "default_value": 0, - "maximum_value": "2" - }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - - } -} diff --git a/resources/extruders/geeetech_A20T_2.def.json b/resources/extruders/geeetech_A20T_2.def.json deleted file mode 100644 index d001cbc291..0000000000 --- a/resources/extruders/geeetech_A20T_2.def.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "version": 2, - "name": "Extruder 2", - "inherits": "fdmextruder", - "metadata": { - "machine": "geeetech_A20T", - "position": "1" - }, - - "overrides": { - "extruder_nr": { - "default_value": 1, - "maximum_value": "2" - }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - - } -} diff --git a/resources/extruders/geeetech_A20T_3.def.json b/resources/extruders/geeetech_A20T_3.def.json deleted file mode 100644 index db60908cb9..0000000000 --- a/resources/extruders/geeetech_A20T_3.def.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "version": 2, - "name": "Extruder 3", - "inherits": "fdmextruder", - "metadata": { - "machine": "geeetech_A20T", - "position": "2" - }, - - "overrides": { - "extruder_nr": { - "default_value": 2, - "maximum_value": "2" - }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - - } -} diff --git a/resources/extruders/geeetech_A20_1.def.json b/resources/extruders/geeetech_A20_1.def.json deleted file mode 100644 index ce47abb402..0000000000 --- a/resources/extruders/geeetech_A20_1.def.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": { - "machine": "geeetech_A20", - "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/geeetech_Mizar_S_1.def.json b/resources/extruders/geeetech_Mizar_S_1.def.json deleted file mode 100644 index da4440cd87..0000000000 --- a/resources/extruders/geeetech_Mizar_S_1.def.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - - "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/gmax15plus_dual_extruder_0.def.json b/resources/extruders/gmax15plus_dual_extruder_0.def.json index 45f35dee1f..d22b0e040e 100644 --- a/resources/extruders/gmax15plus_dual_extruder_0.def.json +++ b/resources/extruders/gmax15plus_dual_extruder_0.def.json @@ -2,27 +2,27 @@ "version": 2, "name": "Left Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "gmax15plus_dual", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_nozzle_size": { "default_value": 0.5 }, - "material_diameter": { "default_value": 1.75 }, - + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": 40 }, + "machine_extruder_end_pos_y": { "value": 210 }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": 40 }, "machine_extruder_start_pos_y": { "value": 210 }, - "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "value": 40 }, - "machine_extruder_end_pos_y": { "value": 210 } - + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.5 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/gmax15plus_dual_extruder_1.def.json b/resources/extruders/gmax15plus_dual_extruder_1.def.json index 6d0d5db06f..09924fcef5 100644 --- a/resources/extruders/gmax15plus_dual_extruder_1.def.json +++ b/resources/extruders/gmax15plus_dual_extruder_1.def.json @@ -2,29 +2,27 @@ "version": 2, "name": "Right Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "gmax15plus_dual", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_nozzle_size": { "default_value": 0.5 }, - "material_diameter": { "default_value": 1.75 }, - + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": 40 }, + "machine_extruder_end_pos_y": { "value": 210 }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": 40 }, "machine_extruder_start_pos_y": { "value": 210 }, - "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "value": 40 }, - "machine_extruder_end_pos_y": { "value": 210 } - + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.5 }, + "material_diameter": { "default_value": 1.75 } } -} - - +} \ No newline at end of file diff --git a/resources/extruders/gmax15plus_extruder_0.def.json b/resources/extruders/gmax15plus_extruder_0.def.json index 5b0889d46d..ecd0653169 100644 --- a/resources/extruders/gmax15plus_extruder_0.def.json +++ b/resources/extruders/gmax15plus_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "gmax15plus", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.5 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/goofoo_base_extruder.def.json b/resources/extruders/goofoo_base_extruder.def.json index 453989e961..4ce315f1d9 100644 --- a/resources/extruders/goofoo_base_extruder.def.json +++ b/resources/extruders/goofoo_base_extruder.def.json @@ -2,15 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "goofoo_base", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } - } -} +} \ No newline at end of file diff --git a/resources/extruders/goofoo_gemini_1st.def.json b/resources/extruders/goofoo_gemini_1st.def.json index 7eefc49579..c147efbbf2 100644 --- a/resources/extruders/goofoo_gemini_1st.def.json +++ b/resources/extruders/goofoo_gemini_1st.def.json @@ -2,18 +2,19 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "goofoo_gemini", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } - } -} +} \ No newline at end of file diff --git a/resources/extruders/goofoo_gemini_2st.def.json b/resources/extruders/goofoo_gemini_2st.def.json index 35bc765526..fa6758168e 100644 --- a/resources/extruders/goofoo_gemini_2st.def.json +++ b/resources/extruders/goofoo_gemini_2st.def.json @@ -2,18 +2,19 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "goofoo_gemini", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } - } -} +} \ No newline at end of file diff --git a/resources/extruders/goofoo_tone_1st.def.json b/resources/extruders/goofoo_tone_1st.def.json index e4594301a8..8de9b68940 100644 --- a/resources/extruders/goofoo_tone_1st.def.json +++ b/resources/extruders/goofoo_tone_1st.def.json @@ -2,18 +2,19 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "goofoo_t-one", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } - } -} +} \ No newline at end of file diff --git a/resources/extruders/goofoo_tone_2st.def.json b/resources/extruders/goofoo_tone_2st.def.json index 3f07ac5d33..bb30de00a0 100644 --- a/resources/extruders/goofoo_tone_2st.def.json +++ b/resources/extruders/goofoo_tone_2st.def.json @@ -2,18 +2,19 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "goofoo_t-one", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } - } -} +} \ No newline at end of file diff --git a/resources/extruders/grr_neo_extruder_0.def.json b/resources/extruders/grr_neo_extruder_0.def.json index a9f1fa4faa..3eca391625 100644 --- a/resources/extruders/grr_neo_extruder_0.def.json +++ b/resources/extruders/grr_neo_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "grr_neo", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.5 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hBp_extruder_left.def.json b/resources/extruders/hBp_extruder_left.def.json index ce23f27c29..f15ca227da 100644 --- a/resources/extruders/hBp_extruder_left.def.json +++ b/resources/extruders/hBp_extruder_left.def.json @@ -2,22 +2,23 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "helloBEEprusa", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - "material_diameter": { "default_value": 1.75 }, - "extruder_prime_pos_x": { "default_value": 0 }, "extruder_prime_pos_y": { "default_value": 0 }, - "extruder_prime_pos_z": { "default_value": 2 } + "extruder_prime_pos_z": { "default_value": 2 }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hBp_extruder_right.def.json b/resources/extruders/hBp_extruder_right.def.json index 170556a1fd..7a80f63f61 100644 --- a/resources/extruders/hBp_extruder_right.def.json +++ b/resources/extruders/hBp_extruder_right.def.json @@ -2,22 +2,23 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "helloBEEprusa", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - "material_diameter": { "default_value": 1.75 }, - "extruder_prime_pos_x": { "default_value": 185 }, "extruder_prime_pos_y": { "default_value": 0 }, - "extruder_prime_pos_z": { "default_value": 2 } + "extruder_prime_pos_z": { "default_value": 2 }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hardprint_hozo_extruder_0.def.json b/resources/extruders/hardprint_hozo_extruder_0.def.json index 1f37977e4c..87788f514a 100644 --- a/resources/extruders/hardprint_hozo_extruder_0.def.json +++ b/resources/extruders/hardprint_hozo_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "hardprint_hozo", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hardprint_hozo_ix_extruder_0.def.json b/resources/extruders/hardprint_hozo_ix_extruder_0.def.json index ba67cebe9a..cb0c700254 100644 --- a/resources/extruders/hardprint_hozo_ix_extruder_0.def.json +++ b/resources/extruders/hardprint_hozo_ix_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "hardprint_hozo_ix", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hctech_hc300-m1&m1h_extruder_0.def.json b/resources/extruders/hctech_hc300-m1&m1h_extruder_0.def.json index c950db18ec..a0394448b6 100644 --- a/resources/extruders/hctech_hc300-m1&m1h_extruder_0.def.json +++ b/resources/extruders/hctech_hc300-m1&m1h_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "hctech_hc300-m1&m1h", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_size": { "default_value": 0.4 } + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hctech_hc300-m2h_extruder_0.def.json b/resources/extruders/hctech_hc300-m2h_extruder_0.def.json index 1a718401cb..f04ffca54b 100644 --- a/resources/extruders/hctech_hc300-m2h_extruder_0.def.json +++ b/resources/extruders/hctech_hc300-m2h_extruder_0.def.json @@ -2,26 +2,24 @@ "version": 2, "name": "Left Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "hctech_hc300-m2h", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, + "machine_extruder_cooling_fan_number": { "default_value": 0 }, + "machine_extruder_end_code": { "default_value": "G92 E0 ;reset extruder distance\nG1 F800 E-1 ;retract\nG92 E0 ;reset extruder distance\nG1 X0 Y300 F4800 ;move to start position\nG1 X5 Y319 ;move to wait posiotion" }, + "machine_extruder_start_code": { "default_value": "G1 X5 Y319 ;move to wait posiotion\nT0 ;switch to extruder 1\nM109 S{material_print_temperature}\nG1 F5000\nG12 ;clean nozzle\nG1 X0 Y300 F4800 ;move to start point" }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, - "material_diameter": { "default_value": 1.75 }, "machine_nozzle_size": { "default_value": 0.4 }, - "machine_extruder_start_code": { - "default_value": "G1 X5 Y319 ;move to wait posiotion\nT0 ;switch to extruder 1\nM109 S{material_print_temperature}\nG1 F5000\nG12 ;clean nozzle\nG1 X0 Y300 F4800 ;move to start point" - }, - "machine_extruder_end_code": { - "default_value": "G92 E0 ;reset extruder distance\nG1 F800 E-1 ;retract\nG92 E0 ;reset extruder distance\nG1 X0 Y300 F4800 ;move to start position\nG1 X5 Y319 ;move to wait posiotion" - }, - "machine_extruder_cooling_fan_number": { "default_value": 0 } + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hctech_hc300-m2h_extruder_1.def.json b/resources/extruders/hctech_hc300-m2h_extruder_1.def.json index 616f2c2d27..f3a3ce030e 100644 --- a/resources/extruders/hctech_hc300-m2h_extruder_1.def.json +++ b/resources/extruders/hctech_hc300-m2h_extruder_1.def.json @@ -2,26 +2,24 @@ "version": 2, "name": "Right Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "hctech_hc300-m2h", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, + "machine_extruder_cooling_fan_number": { "default_value": 0 }, + "machine_extruder_end_code": { "default_value": "G92 E0 ;reset extruder distance\nG1 F800 E-1 ;retract\nG92 E0 ;reset extruder distance\nG1 X0 Y300 F4800 ;move to start position\nG1 X5 Y319 ;move to wait posiotion" }, + "machine_extruder_start_code": { "default_value": "G1 X5 Y319 ;move to wait posiotion\nT1 ;switch to extruder 2\nM109 S{material_print_temperature}\nG1 F5000\nG12 ;clean nozzle\nG1 X0 Y300 F4800 ;move to start point" }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, - "material_diameter": { "default_value": 1.75 }, "machine_nozzle_size": { "default_value": 0.4 }, - "machine_extruder_start_code": { - "default_value": "G1 X5 Y319 ;move to wait posiotion\nT1 ;switch to extruder 2\nM109 S{material_print_temperature}\nG1 F5000\nG12 ;clean nozzle\nG1 X0 Y300 F4800 ;move to start point" - }, - "machine_extruder_end_code": { - "default_value": "G92 E0 ;reset extruder distance\nG1 F800 E-1 ;retract\nG92 E0 ;reset extruder distance\nG1 X0 Y300 F4800 ;move to start position\nG1 X5 Y319 ;move to wait posiotion" - }, - "machine_extruder_cooling_fan_number": { "default_value": 0 } + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hctech_hc300-m3_extruder_0.def.json b/resources/extruders/hctech_hc300-m3_extruder_0.def.json index b7923672a5..d1e01c2ea5 100644 --- a/resources/extruders/hctech_hc300-m3_extruder_0.def.json +++ b/resources/extruders/hctech_hc300-m3_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "hctech_hc300-m3", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_size": { "default_value": 0.4 } + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hellbot_adonis_extruder.def.json b/resources/extruders/hellbot_adonis_extruder.def.json index 4201f6b393..c03e9d78b7 100644 --- a/resources/extruders/hellbot_adonis_extruder.def.json +++ b/resources/extruders/hellbot_adonis_extruder.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "hellbot_adonis", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hellbot_hidra_extruder_0.def.json b/resources/extruders/hellbot_hidra_extruder_0.def.json index aa8da12ea3..353930aebe 100644 --- a/resources/extruders/hellbot_hidra_extruder_0.def.json +++ b/resources/extruders/hellbot_hidra_extruder_0.def.json @@ -2,17 +2,19 @@ "version": 2, "name": "Extruder E1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "hellbot_hidra", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hellbot_hidra_extruder_1.def.json b/resources/extruders/hellbot_hidra_extruder_1.def.json index 8389b5e8d8..71aa078443 100644 --- a/resources/extruders/hellbot_hidra_extruder_1.def.json +++ b/resources/extruders/hellbot_hidra_extruder_1.def.json @@ -2,17 +2,19 @@ "version": 2, "name": "Extruder E2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "hellbot_hidra", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hellbot_hidra_plus_extruder_0.def.json b/resources/extruders/hellbot_hidra_plus_extruder_0.def.json index 2b023119eb..c2565e13f4 100644 --- a/resources/extruders/hellbot_hidra_plus_extruder_0.def.json +++ b/resources/extruders/hellbot_hidra_plus_extruder_0.def.json @@ -2,17 +2,19 @@ "version": 2, "name": "Extruder E1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "hellbot_hidra_plus", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hellbot_hidra_plus_extruder_1.def.json b/resources/extruders/hellbot_hidra_plus_extruder_1.def.json index ade40aafea..991b37ec12 100644 --- a/resources/extruders/hellbot_hidra_plus_extruder_1.def.json +++ b/resources/extruders/hellbot_hidra_plus_extruder_1.def.json @@ -2,17 +2,19 @@ "version": 2, "name": "Extruder E2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "hellbot_hidra_plus", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hellbot_magna_2_230_dual_extruder_0.def.json b/resources/extruders/hellbot_magna_2_230_dual_extruder_0.def.json index 2dc919ea68..36d982a2ee 100644 --- a/resources/extruders/hellbot_magna_2_230_dual_extruder_0.def.json +++ b/resources/extruders/hellbot_magna_2_230_dual_extruder_0.def.json @@ -2,23 +2,21 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "hellbot_magna_2_230_dual", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, + "machine_extruder_end_code": { "default_value": "G92 E0 \nG1 F2500 E-5 \nG1 F2400 X230 Y200 \nG1 F3000 E-100 \nG92 E0 \nG90" }, + "machine_extruder_start_code": { "default_value": "T0 \nG92 E0 \nG1 F1000 E100 \nG92 E0 \nM104 S{material_print_temperature}" }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_extruder_start_code": { - "default_value": "T0 \nG92 E0 \nG1 F1000 E100 \nG92 E0 \nM104 S{material_print_temperature}" - }, - "machine_extruder_end_code": { - "default_value": "G92 E0 \nG1 F2500 E-5 \nG1 F2400 X230 Y200 \nG1 F3000 E-100 \nG92 E0 \nG90" - } + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hellbot_magna_2_230_dual_extruder_1.def.json b/resources/extruders/hellbot_magna_2_230_dual_extruder_1.def.json index 6b5c6214cb..a7ee1201f7 100644 --- a/resources/extruders/hellbot_magna_2_230_dual_extruder_1.def.json +++ b/resources/extruders/hellbot_magna_2_230_dual_extruder_1.def.json @@ -2,23 +2,21 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "hellbot_magna_2_230_dual", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, + "machine_extruder_end_code": { "default_value": "G92 E0 \nG1 F2500 E-5 \nG1 F2400 X230 Y200 \nG1 F3000 E-100 \nG92 E0 \nG90" }, + "machine_extruder_start_code": { "default_value": "T1 \nG92 E0 \nG1 F1000 E100 \nG92 E0 \nM104 S{material_print_temperature}" }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_extruder_start_code": { - "default_value": "T1 \nG92 E0 \nG1 F1000 E100 \nG92 E0 \nM104 S{material_print_temperature}" - }, - "machine_extruder_end_code": { - "default_value": "G92 E0 \nG1 F2500 E-5 \nG1 F2400 X230 Y200 \nG1 F3000 E-100 \nG92 E0 \nG90" - } + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hellbot_magna_2_230_extruder_0.def.json b/resources/extruders/hellbot_magna_2_230_extruder_0.def.json index 83e76a2d31..a74d0bb090 100644 --- a/resources/extruders/hellbot_magna_2_230_extruder_0.def.json +++ b/resources/extruders/hellbot_magna_2_230_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "hellbot_magna_2_230", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hellbot_magna_2_300_dual_extruder_0.def.json b/resources/extruders/hellbot_magna_2_300_dual_extruder_0.def.json index 403001b86f..0b87f0159c 100644 --- a/resources/extruders/hellbot_magna_2_300_dual_extruder_0.def.json +++ b/resources/extruders/hellbot_magna_2_300_dual_extruder_0.def.json @@ -2,23 +2,21 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "hellbot_magna_2_300_dual", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, + "machine_extruder_end_code": { "default_value": "G92 E0 \nG1 F2500 E-5 \nG1 F2400 X300 Y250 \nG1 F3000 E-100 \nG92 E0 \nG90" }, + "machine_extruder_start_code": { "default_value": "T0 \nG92 E0 \nG1 F1000 E100 \nG92 E0 \nM104 S{material_print_temperature}" }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_extruder_start_code": { - "default_value": "T0 \nG92 E0 \nG1 F1000 E100 \nG92 E0 \nM104 S{material_print_temperature}" - }, - "machine_extruder_end_code": { - "default_value": "G92 E0 \nG1 F2500 E-5 \nG1 F2400 X300 Y250 \nG1 F3000 E-100 \nG92 E0 \nG90" - } + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hellbot_magna_2_300_dual_extruder_1.def.json b/resources/extruders/hellbot_magna_2_300_dual_extruder_1.def.json index ee3663f610..53aceeb01f 100644 --- a/resources/extruders/hellbot_magna_2_300_dual_extruder_1.def.json +++ b/resources/extruders/hellbot_magna_2_300_dual_extruder_1.def.json @@ -2,23 +2,21 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "hellbot_magna_2_300_dual", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, + "machine_extruder_end_code": { "default_value": "G92 E0 \nG1 F2500 E-5 \nG1 F2400 X300 Y250 \nG1 F3000 E-100 \nG92 E0 \nG90" }, + "machine_extruder_start_code": { "default_value": "T1 \nG92 E0 \nG1 F1000 E100 \nG92 E0 \nM104 S{material_print_temperature}" }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_extruder_start_code": { - "default_value": "T1 \nG92 E0 \nG1 F1000 E100 \nG92 E0 \nM104 S{material_print_temperature}" - }, - "machine_extruder_end_code": { - "default_value": "G92 E0 \nG1 F2500 E-5 \nG1 F2400 X300 Y250 \nG1 F3000 E-100 \nG92 E0 \nG90" - } + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hellbot_magna_2_300_extruder_0.def.json b/resources/extruders/hellbot_magna_2_300_extruder_0.def.json index db68460415..4f2078a791 100644 --- a/resources/extruders/hellbot_magna_2_300_extruder_0.def.json +++ b/resources/extruders/hellbot_magna_2_300_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "hellbot_magna_2_300", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hellbot_magna_2_400_dual_extruder_0.def.json b/resources/extruders/hellbot_magna_2_400_dual_extruder_0.def.json index f42dd7f986..fac8c63eb6 100644 --- a/resources/extruders/hellbot_magna_2_400_dual_extruder_0.def.json +++ b/resources/extruders/hellbot_magna_2_400_dual_extruder_0.def.json @@ -2,23 +2,21 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "hellbot_magna_2_400_dual", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, + "machine_extruder_end_code": { "default_value": "G92 E0 \nG1 F2500 E-5 \nG1 F2400 X395 Y350 \nG1 F3000 E-100 \nG92 E0 \nG90" }, + "machine_extruder_start_code": { "default_value": "T0 \nG92 E0 \nG1 F1000 E100 \nG92 E0 \nM104 S{material_print_temperature}" }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_extruder_start_code": { - "default_value": "T0 \nG92 E0 \nG1 F1000 E100 \nG92 E0 \nM104 S{material_print_temperature}" - }, - "machine_extruder_end_code": { - "default_value": "G92 E0 \nG1 F2500 E-5 \nG1 F2400 X395 Y350 \nG1 F3000 E-100 \nG92 E0 \nG90" - } + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hellbot_magna_2_400_dual_extruder_1.def.json b/resources/extruders/hellbot_magna_2_400_dual_extruder_1.def.json index f5ab430fc7..8622a75c13 100644 --- a/resources/extruders/hellbot_magna_2_400_dual_extruder_1.def.json +++ b/resources/extruders/hellbot_magna_2_400_dual_extruder_1.def.json @@ -2,23 +2,21 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "hellbot_magna_2_400_dual", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, + "machine_extruder_end_code": { "default_value": "G92 E0 \nG1 F2500 E-5 \nG1 F2400 X395 Y350 \nG1 F3000 E-100 \nG92 E0 \nG90" }, + "machine_extruder_start_code": { "default_value": "T1 \nG92 E0 \nG1 F1000 E100 \nG92 E0 \nM104 S{material_print_temperature}" }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_extruder_start_code": { - "default_value": "T1 \nG92 E0 \nG1 F1000 E100 \nG92 E0 \nM104 S{material_print_temperature}" - }, - "machine_extruder_end_code": { - "default_value": "G92 E0 \nG1 F2500 E-5 \nG1 F2400 X395 Y350 \nG1 F3000 E-100 \nG92 E0 \nG90" - } + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hellbot_magna_2_400_extruder_0.def.json b/resources/extruders/hellbot_magna_2_400_extruder_0.def.json index 59ee87321c..0c2c35006e 100644 --- a/resources/extruders/hellbot_magna_2_400_extruder_0.def.json +++ b/resources/extruders/hellbot_magna_2_400_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "hellbot_magna_2_400", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hellbot_magna_2_500_dual_extruder_0.def.json b/resources/extruders/hellbot_magna_2_500_dual_extruder_0.def.json index 033b62e0f9..09af39dd0d 100644 --- a/resources/extruders/hellbot_magna_2_500_dual_extruder_0.def.json +++ b/resources/extruders/hellbot_magna_2_500_dual_extruder_0.def.json @@ -2,23 +2,21 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "hellbot_magna_2_500_dual", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, + "machine_extruder_end_code": { "default_value": "G92 E0 \nG1 F2500 E-5 \nG1 F2400 X495 Y450 \nG1 F3000 E-100 \nG92 E0 \nG90" }, + "machine_extruder_start_code": { "default_value": "T0 \nG92 E0 \nG1 F1000 E100 \nG92 E0 \nM104 S{material_print_temperature}" }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_extruder_start_code": { - "default_value": "T0 \nG92 E0 \nG1 F1000 E100 \nG92 E0 \nM104 S{material_print_temperature}" - }, - "machine_extruder_end_code": { - "default_value": "G92 E0 \nG1 F2500 E-5 \nG1 F2400 X495 Y450 \nG1 F3000 E-100 \nG92 E0 \nG90" - } + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hellbot_magna_2_500_dual_extruder_1.def.json b/resources/extruders/hellbot_magna_2_500_dual_extruder_1.def.json index 62f6e1b7bc..1369bb374d 100644 --- a/resources/extruders/hellbot_magna_2_500_dual_extruder_1.def.json +++ b/resources/extruders/hellbot_magna_2_500_dual_extruder_1.def.json @@ -2,23 +2,21 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "hellbot_magna_2_500_dual", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, + "machine_extruder_end_code": { "default_value": "G92 E0 \nG1 F2500 E-5 \nG1 F2400 X495 Y450 \nG1 F3000 E-100 \nG92 E0 \nG90" }, + "machine_extruder_start_code": { "default_value": "T1 \nG92 E0 \nG1 F1000 E100 \nG92 E0 \nM104 S{material_print_temperature}" }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_extruder_start_code": { - "default_value": "T1 \nG92 E0 \nG1 F1000 E100 \nG92 E0 \nM104 S{material_print_temperature}" - }, - "machine_extruder_end_code": { - "default_value": "G92 E0 \nG1 F2500 E-5 \nG1 F2400 X495 Y450 \nG1 F3000 E-100 \nG92 E0 \nG90" - } + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hellbot_magna_2_500_extruder_0.def.json b/resources/extruders/hellbot_magna_2_500_extruder_0.def.json index 749e77cbe7..e311bb9779 100644 --- a/resources/extruders/hellbot_magna_2_500_extruder_0.def.json +++ b/resources/extruders/hellbot_magna_2_500_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "hellbot_magna_2_500", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hellbot_magna_SE_extruder.def.json b/resources/extruders/hellbot_magna_SE_extruder.def.json index 23c267b63b..194f10c7f5 100644 --- a/resources/extruders/hellbot_magna_SE_extruder.def.json +++ b/resources/extruders/hellbot_magna_SE_extruder.def.json @@ -1,18 +1,20 @@ -{ - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": { - "machine": "hellbot_magna_SE", - "position": "0" - }, - - "overrides": { - "extruder_nr": { - "default_value": 0, - "maximum_value": "1" - }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - } -} +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "hellbot_magna_SE", + "position": "0" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/hellbot_magna_dual_extruder_1.def.json b/resources/extruders/hellbot_magna_dual_extruder_1.def.json index a31a3fdd70..30bae4017d 100644 --- a/resources/extruders/hellbot_magna_dual_extruder_1.def.json +++ b/resources/extruders/hellbot_magna_dual_extruder_1.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "hellbot_magna_dual", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hellbot_magna_dual_extruder_2.def.json b/resources/extruders/hellbot_magna_dual_extruder_2.def.json index 651c39d53b..23a83bc002 100644 --- a/resources/extruders/hellbot_magna_dual_extruder_2.def.json +++ b/resources/extruders/hellbot_magna_dual_extruder_2.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "hellbot_magna_dual", "position": "1" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 1 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hellbot_magna_i_extruder.def.json b/resources/extruders/hellbot_magna_i_extruder.def.json index 70117c2aed..92ec439bb9 100644 --- a/resources/extruders/hellbot_magna_i_extruder.def.json +++ b/resources/extruders/hellbot_magna_i_extruder.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "hellbot_magna_I", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hms434_tool_1.def.json b/resources/extruders/hms434_tool_1.def.json index 17f4cbc6f0..14ee07cba0 100644 --- a/resources/extruders/hms434_tool_1.def.json +++ b/resources/extruders/hms434_tool_1.def.json @@ -2,24 +2,22 @@ "version": 2, "name": "Tool 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "hms434", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "8" }, + "machine_extruder_end_code": { "default_value": "\nG1 X10 Y40 F12000\nG1 X-25 F12000\nM109 T0 R{material_standby_temperature}\nG1 Y20 F3000\n; ending tool1\n\n" }, + "machine_extruder_start_code": { "default_value": "\n;changing to tool1\nT0\nM83\nM109 T0 S{material_print_temperature}\nM114\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E-{switch_extruder_retraction_amount} F2400\nG1 Y40 F3000\nG1 X10 F12000\n\n" }, "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": "\n;changing to tool1\nT0\nM83\nM109 T0 S{material_print_temperature}\nM114\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E-{switch_extruder_retraction_amount} F2400\nG1 Y40 F3000\nG1 X10 F12000\n\n" - }, - "machine_extruder_end_code": { - "default_value": "\nG1 X10 Y40 F12000\nG1 X-25 F12000\nM109 T0 R{material_standby_temperature}\nG1 Y20 F3000\n; ending tool1\n\n" - } + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hms434_tool_2.def.json b/resources/extruders/hms434_tool_2.def.json index 00e92613e4..7a35d828fd 100644 --- a/resources/extruders/hms434_tool_2.def.json +++ b/resources/extruders/hms434_tool_2.def.json @@ -2,24 +2,22 @@ "version": 2, "name": "Tool 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "hms434", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "8" }, + "machine_extruder_end_code": { "default_value": "\nG1 X10 Y40 F12000\nG1 X-25 F12000\nM109 T1 R{material_standby_temperature}\nG1 Y20 F3000\n; ending tool2\n\n" }, + "machine_extruder_start_code": { "default_value": "\n;changing to tool2\nT1\nM83\nM109 T1 S{material_print_temperature}\nM114\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E-{switch_extruder_retraction_amount} F2400\nG1 Y40 F3000\nG1 X10 F12000\n\n" }, "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": "\n;changing to tool2\nT1\nM83\nM109 T1 S{material_print_temperature}\nM114\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E{switch_extruder_retraction_amount} F300\nG1 E-{switch_extruder_retraction_amount} F2400\nG1 Y40 F3000\nG1 X10 F12000\n\n" - }, - "machine_extruder_end_code": { - "default_value": "\nG1 X10 Y40 F12000\nG1 X-25 F12000\nM109 T1 R{material_standby_temperature}\nG1 Y20 F3000\n; ending tool2\n\n" - } + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hms434_tool_3.def.json b/resources/extruders/hms434_tool_3.def.json index e1e237d332..0f215c30cb 100644 --- a/resources/extruders/hms434_tool_3.def.json +++ b/resources/extruders/hms434_tool_3.def.json @@ -2,24 +2,22 @@ "version": 2, "name": "Tool 3", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "hms434", "position": "2" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 2, "maximum_value": "8" }, + "machine_extruder_end_code": { "default_value": "\n;ending tool3" }, + "machine_extruder_start_code": { "default_value": "\n;changing to tool3" }, "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": "\n;changing to tool3" - }, - "machine_extruder_end_code": { - "default_value": "\n;ending tool3" - } + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hms434_tool_4.def.json b/resources/extruders/hms434_tool_4.def.json index 1a68d5aff5..af5c51dec3 100644 --- a/resources/extruders/hms434_tool_4.def.json +++ b/resources/extruders/hms434_tool_4.def.json @@ -2,24 +2,22 @@ "version": 2, "name": "Tool 4", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "hms434", "position": "3" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 3, "maximum_value": "8" }, + "machine_extruder_end_code": { "default_value": "\n;ending tool4" }, + "machine_extruder_start_code": { "default_value": "\n;changing to tool4" }, "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": "\n;changing to tool4" - }, - "machine_extruder_end_code": { - "default_value": "\n;ending tool4" - } + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hms434_tool_5.def.json b/resources/extruders/hms434_tool_5.def.json index b56e8be84e..c73ad63efb 100644 --- a/resources/extruders/hms434_tool_5.def.json +++ b/resources/extruders/hms434_tool_5.def.json @@ -2,24 +2,22 @@ "version": 2, "name": "Tool 5", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "hms434", "position": "4" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 4, "maximum_value": "8" }, + "machine_extruder_end_code": { "default_value": "\n;ending tool5" }, + "machine_extruder_start_code": { "default_value": "\n;changing to tool5" }, "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": "\n;changing to tool5" - }, - "machine_extruder_end_code": { - "default_value": "\n;ending tool5" - } + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hms434_tool_6.def.json b/resources/extruders/hms434_tool_6.def.json index b8c8cdf062..34e0044a95 100644 --- a/resources/extruders/hms434_tool_6.def.json +++ b/resources/extruders/hms434_tool_6.def.json @@ -2,24 +2,22 @@ "version": 2, "name": "Tool 6", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "hms434", "position": "5" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 5, "maximum_value": "8" }, + "machine_extruder_end_code": { "default_value": "\n;ending tool6" }, + "machine_extruder_start_code": { "default_value": "\n;changing to tool6" }, "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": "\n;changing to tool6" - }, - "machine_extruder_end_code": { - "default_value": "\n;ending tool6" - } + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hms434_tool_7.def.json b/resources/extruders/hms434_tool_7.def.json index 3fc04078fa..1933b370a5 100644 --- a/resources/extruders/hms434_tool_7.def.json +++ b/resources/extruders/hms434_tool_7.def.json @@ -2,24 +2,22 @@ "version": 2, "name": "Tool 7", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "hms434", "position": "6" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 6, "maximum_value": "8" }, + "machine_extruder_end_code": { "default_value": "\n;ending tool7" }, + "machine_extruder_start_code": { "default_value": "\n;changing to tool7" }, "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": "\n;changing to tool7" - }, - "machine_extruder_end_code": { - "default_value": "\n;ending tool7" - } + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/hms434_tool_8.def.json b/resources/extruders/hms434_tool_8.def.json index faa6f36871..fd4e580599 100644 --- a/resources/extruders/hms434_tool_8.def.json +++ b/resources/extruders/hms434_tool_8.def.json @@ -2,24 +2,22 @@ "version": 2, "name": "Tool 8", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "hms434", "position": "7" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 7, "maximum_value": "8" }, + "machine_extruder_end_code": { "default_value": "\n;ending tool8" }, + "machine_extruder_start_code": { "default_value": "\n;changing to tool8" }, "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": "\n;changing to tool8" - }, - "machine_extruder_end_code": { - "default_value": "\n;ending tool8" - } + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ideagen3D_sapphire_plus_0.def.json b/resources/extruders/ideagen3D_sapphire_plus_0.def.json index ab14b131b6..fe621bf670 100644 --- a/resources/extruders/ideagen3D_sapphire_plus_0.def.json +++ b/resources/extruders/ideagen3D_sapphire_plus_0.def.json @@ -2,12 +2,13 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ideagen3D_sapphire_plus", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } diff --git a/resources/extruders/imade3d_jellybox_2_extruder_0.def.json b/resources/extruders/imade3d_jellybox_2_extruder_0.def.json index ca25b62286..c15d0165d3 100644 --- a/resources/extruders/imade3d_jellybox_2_extruder_0.def.json +++ b/resources/extruders/imade3d_jellybox_2_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "imade3d_jellybox_2", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/imade3d_jellybox_extruder_0.def.json b/resources/extruders/imade3d_jellybox_extruder_0.def.json index 69c6d87d79..99e1f5577a 100644 --- a/resources/extruders/imade3d_jellybox_extruder_0.def.json +++ b/resources/extruders/imade3d_jellybox_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "imade3d_jellybox", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/inat_extruder_0.def.json b/resources/extruders/inat_extruder_0.def.json index 100b8c0bca..7876d08e7b 100644 --- a/resources/extruders/inat_extruder_0.def.json +++ b/resources/extruders/inat_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "inat_base", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/innovo_inventor_extruder_0.def.json b/resources/extruders/innovo_inventor_extruder_0.def.json index 8758f3d516..dd00bab22d 100644 --- a/resources/extruders/innovo_inventor_extruder_0.def.json +++ b/resources/extruders/innovo_inventor_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "innovo_inventor", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/jgaurora_a1_extruder_0.def.json b/resources/extruders/jgaurora_a1_extruder_0.def.json index f67d8d553e..2980e9e07a 100644 --- a/resources/extruders/jgaurora_a1_extruder_0.def.json +++ b/resources/extruders/jgaurora_a1_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "jgaurora_a1", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/jgaurora_a3s_extruder_0.def.json b/resources/extruders/jgaurora_a3s_extruder_0.def.json index 9a42d0da04..78601ea79a 100644 --- a/resources/extruders/jgaurora_a3s_extruder_0.def.json +++ b/resources/extruders/jgaurora_a3s_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "jgaurora_a3s", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/jgaurora_a5_extruder_0.def.json b/resources/extruders/jgaurora_a5_extruder_0.def.json index 5308c57934..bf3db0f2cf 100644 --- a/resources/extruders/jgaurora_a5_extruder_0.def.json +++ b/resources/extruders/jgaurora_a5_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "jgaurora_a5", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/jgaurora_a6_extruder_0.def.json b/resources/extruders/jgaurora_a6_extruder_0.def.json index dbe6248a7e..de8641c1fc 100644 --- a/resources/extruders/jgaurora_a6_extruder_0.def.json +++ b/resources/extruders/jgaurora_a6_extruder_0.def.json @@ -2,15 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - - "metadata": { + "metadata": + { "machine": "jgaurora_a6", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/jgaurora_jgmaker_magic_extruder_0.def.json b/resources/extruders/jgaurora_jgmaker_magic_extruder_0.def.json index 58beaa4cc8..94f6dff1ba 100644 --- a/resources/extruders/jgaurora_jgmaker_magic_extruder_0.def.json +++ b/resources/extruders/jgaurora_jgmaker_magic_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "jgaurora_jgmaker_magic", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/jgaurora_z_603s_extruder_0.def.json b/resources/extruders/jgaurora_z_603s_extruder_0.def.json index 647016d5ff..fa83087ac9 100644 --- a/resources/extruders/jgaurora_z_603s_extruder_0.def.json +++ b/resources/extruders/jgaurora_z_603s_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "jgaurora_z_603s", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/julia_extruder_0.def.json b/resources/extruders/julia_extruder_0.def.json index ef0ca83ac4..b094d4277e 100644 --- a/resources/extruders/julia_extruder_0.def.json +++ b/resources/extruders/julia_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "julia", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/kemiq_q2_beta_extruder_0.def.json b/resources/extruders/kemiq_q2_beta_extruder_0.def.json index 79d55223f3..42fda26ca4 100644 --- a/resources/extruders/kemiq_q2_beta_extruder_0.def.json +++ b/resources/extruders/kemiq_q2_beta_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "kemiq_q2_beta", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/kemiq_q2_gama_extruder_0.def.json b/resources/extruders/kemiq_q2_gama_extruder_0.def.json index ad6e6372ee..d8a409987b 100644 --- a/resources/extruders/kemiq_q2_gama_extruder_0.def.json +++ b/resources/extruders/kemiq_q2_gama_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "kemiq_q2_gama", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/key3d_tyro_extruder_0.def.json b/resources/extruders/key3d_tyro_extruder_0.def.json index f08ae351ab..09749e7cc6 100644 --- a/resources/extruders/key3d_tyro_extruder_0.def.json +++ b/resources/extruders/key3d_tyro_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "0.4mm Nozzle", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "key3d_tyro", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/kingroon_base_extruder_0.def.json b/resources/extruders/kingroon_base_extruder_0.def.json index bcb7e93260..5734723a73 100644 --- a/resources/extruders/kingroon_base_extruder_0.def.json +++ b/resources/extruders/kingroon_base_extruder_0.def.json @@ -2,15 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "kingroon_base", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } - } -} +} \ No newline at end of file diff --git a/resources/extruders/klema_180_m1_t1_extruder_1.def.json b/resources/extruders/klema_180_m1_t1_extruder_1.def.json new file mode 100644 index 0000000000..7bfdec8ddb --- /dev/null +++ b/resources/extruders/klema_180_m1_t1_extruder_1.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "klema_180", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/klema_250_m1_t1_extruder_1.def.json b/resources/extruders/klema_250_m1_t1_extruder_1.def.json new file mode 100644 index 0000000000..c81dc33ddc --- /dev/null +++ b/resources/extruders/klema_250_m1_t1_extruder_1.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "klema_250", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/klema_250_pro_m1_t2_extruder_1.def.json b/resources/extruders/klema_250_pro_m1_t2_extruder_1.def.json new file mode 100644 index 0000000000..941a822076 --- /dev/null +++ b/resources/extruders/klema_250_pro_m1_t2_extruder_1.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "klema_250_pro", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/klema_250_twin_m1_t1_extruder_1.def.json b/resources/extruders/klema_250_twin_m1_t1_extruder_1.def.json new file mode 100644 index 0000000000..570c4bc0ce --- /dev/null +++ b/resources/extruders/klema_250_twin_m1_t1_extruder_1.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "klema_250_twin", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/klema_250_twin_m1_t1_extruder_2.def.json b/resources/extruders/klema_250_twin_m1_t1_extruder_2.def.json new file mode 100644 index 0000000000..63c5c45d03 --- /dev/null +++ b/resources/extruders/klema_250_twin_m1_t1_extruder_2.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": + { + "machine": "klema_250_twin", + "position": "1" + }, + "overrides": + { + "extruder_nr": { "default_value": 1 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/klema_500_m1_t1_extruder_1.def.json b/resources/extruders/klema_500_m1_t1_extruder_1.def.json new file mode 100644 index 0000000000..5f5292b77c --- /dev/null +++ b/resources/extruders/klema_500_m1_t1_extruder_1.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "klema_500", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/koonovo_base_extruder_0.def.json b/resources/extruders/koonovo_base_extruder_0.def.json index 34e3e3bffb..798d24edcb 100644 --- a/resources/extruders/koonovo_base_extruder_0.def.json +++ b/resources/extruders/koonovo_base_extruder_0.def.json @@ -2,15 +2,15 @@ "version": 2, "name": "Extruder 0", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "koonovo_base", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } - } -} +} \ No newline at end of file diff --git a/resources/extruders/koonovo_kn3_extruder_0.def.json b/resources/extruders/koonovo_kn3_extruder_0.def.json index e507f9fdc5..bf41f5890d 100644 --- a/resources/extruders/koonovo_kn3_extruder_0.def.json +++ b/resources/extruders/koonovo_kn3_extruder_0.def.json @@ -1,21 +1,18 @@ -{ - "version": 2, - "name": "Left Extruder", - "inherits": "fdmextruder", - "metadata": { - "machine": "koonovo_kn3", - "position": "0" - }, - - "overrides": { - "extruder_nr": { - "default_value": 0 - - }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_nozzle_size": { "default_value": 0.4}, - "material_diameter": { "default_value": 1.75 } - - } -} +{ + "version": 2, + "name": "Left Extruder", + "inherits": "fdmextruder", + "metadata": + { + "machine": "koonovo_kn3", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/koonovo_kn3_extruder_1.def.json b/resources/extruders/koonovo_kn3_extruder_1.def.json index 0aebad348a..ba57b38a56 100644 --- a/resources/extruders/koonovo_kn3_extruder_1.def.json +++ b/resources/extruders/koonovo_kn3_extruder_1.def.json @@ -1,21 +1,18 @@ -{ - "version": 2, - "name": "Right Extruder", - "inherits": "fdmextruder", - "metadata": { - "machine": "koonovo_kn3", - "position": "1" - }, - - "overrides": { - "extruder_nr": { - "default_value": 1 - - }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - - } -} +{ + "version": 2, + "name": "Right Extruder", + "inherits": "fdmextruder", + "metadata": + { + "machine": "koonovo_kn3", + "position": "1" + }, + "overrides": + { + "extruder_nr": { "default_value": 1 }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/koonovo_kn5_extruder_0.def.json b/resources/extruders/koonovo_kn5_extruder_0.def.json index 53aa0a3ff1..a86604bf35 100644 --- a/resources/extruders/koonovo_kn5_extruder_0.def.json +++ b/resources/extruders/koonovo_kn5_extruder_0.def.json @@ -1,21 +1,18 @@ -{ - "version": 2, - "name": "Left Extruder", - "inherits": "fdmextruder", - "metadata": { - "machine": "koonovo_kn5", - "position": "0" - }, - - "overrides": { - "extruder_nr": { - "default_value": 0 - - }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_nozzle_size": { "default_value": 0.4}, - "material_diameter": { "default_value": 1.75 } - - } -} +{ + "version": 2, + "name": "Left Extruder", + "inherits": "fdmextruder", + "metadata": + { + "machine": "koonovo_kn5", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/koonovo_kn5_extruder_1.def.json b/resources/extruders/koonovo_kn5_extruder_1.def.json index d526c5715c..b3a94d48fe 100644 --- a/resources/extruders/koonovo_kn5_extruder_1.def.json +++ b/resources/extruders/koonovo_kn5_extruder_1.def.json @@ -1,22 +1,18 @@ -{ - "version": 2, - "name": "Right Extruder", - "inherits": "fdmextruder", - "metadata": { - "machine": "koonovo_kn5", - "position": "1" - }, - - "overrides": { - "extruder_nr": { - "default_value": 1 - - }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - - - } -} +{ + "version": 2, + "name": "Right Extruder", + "inherits": "fdmextruder", + "metadata": + { + "machine": "koonovo_kn5", + "position": "1" + }, + "overrides": + { + "extruder_nr": { "default_value": 1 }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/kosher_dm_extruder.def.json b/resources/extruders/kosher_dm_extruder.def.json index 50ce46b434..bd961bd31e 100644 --- a/resources/extruders/kosher_dm_extruder.def.json +++ b/resources/extruders/kosher_dm_extruder.def.json @@ -2,19 +2,21 @@ "version": 2, "name": "Duplication Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "kosher_duplication", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 } + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/kosher_extruder_0.def.json b/resources/extruders/kosher_extruder_0.def.json index 9b1fa4d934..2f581dea49 100644 --- a/resources/extruders/kosher_extruder_0.def.json +++ b/resources/extruders/kosher_extruder_0.def.json @@ -2,26 +2,28 @@ "version": 2, "name": "Left Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "kosher", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_extruder_start_pos_abs": { "default_value": true }, - "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": -51 }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, - "machine_extruder_start_code": { "default_value": "T0" } + "machine_extruder_start_code": { "default_value": "T0" }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/kosher_extruder_1.def.json b/resources/extruders/kosher_extruder_1.def.json index 353d6bcea4..13964b62d6 100644 --- a/resources/extruders/kosher_extruder_1.def.json +++ b/resources/extruders/kosher_extruder_1.def.json @@ -2,26 +2,28 @@ "version": 2, "name": "Right Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "kosher", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_extruder_start_pos_abs": { "default_value": true }, - "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": 257 }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, - "machine_extruder_start_code": { "default_value": "T1" } + "machine_extruder_start_code": { "default_value": "T1" }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/kosher_mm_extruder.def.json b/resources/extruders/kosher_mm_extruder.def.json index 8eacf54875..35ebfccb44 100644 --- a/resources/extruders/kosher_mm_extruder.def.json +++ b/resources/extruders/kosher_mm_extruder.def.json @@ -2,19 +2,21 @@ "version": 2, "name": "Mirror Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "kosher_mirror", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 } + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/kossel_mini_extruder_0.def.json b/resources/extruders/kossel_mini_extruder_0.def.json index 7da2cff3b1..ebdc0af8fb 100644 --- a/resources/extruders/kossel_mini_extruder_0.def.json +++ b/resources/extruders/kossel_mini_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "kossel_mini", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/kossel_pro_extruder_0.def.json b/resources/extruders/kossel_pro_extruder_0.def.json index 48c1180f84..1741393c59 100644 --- a/resources/extruders/kossel_pro_extruder_0.def.json +++ b/resources/extruders/kossel_pro_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "kossel_pro", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.35 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/kupido_extruder_0.def.json b/resources/extruders/kupido_extruder_0.def.json index 784e453bd1..758669b1c4 100644 --- a/resources/extruders/kupido_extruder_0.def.json +++ b/resources/extruders/kupido_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "kupido", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/leapfrog_bolt_pro_extruder_left.def.json b/resources/extruders/leapfrog_bolt_pro_extruder_left.def.json index 4ec859a60c..572299c750 100644 --- a/resources/extruders/leapfrog_bolt_pro_extruder_left.def.json +++ b/resources/extruders/leapfrog_bolt_pro_extruder_left.def.json @@ -2,20 +2,23 @@ "version": 2, "name": "Left extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "leapfrog_bolt_pro", "position": "1" }, - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, + "machine_extruder_start_code": { "default_value": "G1 Y-32 F12000\nG1 X6 F1000\nG1 X-32 F4000\nG1 X6" }, "machine_nozzle_head_distance": { "default_value": 22 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_extruder_start_code": { "default_value": "G1 Y-32 F12000\nG1 X6 F1000\nG1 X-32 F4000\nG1 X6" } + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/leapfrog_bolt_pro_extruder_right.def.json b/resources/extruders/leapfrog_bolt_pro_extruder_right.def.json index fe27106afd..0db13104c3 100644 --- a/resources/extruders/leapfrog_bolt_pro_extruder_right.def.json +++ b/resources/extruders/leapfrog_bolt_pro_extruder_right.def.json @@ -2,20 +2,23 @@ "version": 2, "name": "Right extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "leapfrog_bolt_pro", "position": "0" }, - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, + "machine_extruder_start_code": { "default_value": "G1 Y-32 F12000\nG1 X296 F1000\nG1 X334 F4000\nG1 X296" }, "machine_nozzle_head_distance": { "default_value": 22 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_extruder_start_code": { "default_value": "G1 Y-32 F12000\nG1 X296 F1000\nG1 X334 F4000\nG1 X296"} + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/leapfrog_creatr_hs_extruder_left.def.json b/resources/extruders/leapfrog_creatr_hs_extruder_left.def.json index 52f3848e47..348ca7cbd3 100644 --- a/resources/extruders/leapfrog_creatr_hs_extruder_left.def.json +++ b/resources/extruders/leapfrog_creatr_hs_extruder_left.def.json @@ -2,17 +2,17 @@ "version": 2, "name": "Left extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "leapfrog_creatr_hs", "position": "1" }, - "overrides": { - "extruder_nr": { - "default_value": 1 - }, - "machine_nozzle_size": { "default_value": 0.35 }, - "material_diameter": { "default_value": 1.75 }, + "overrides": + { + "extruder_nr": { "default_value": 1 }, "machine_nozzle_offset_x": { "default_value": 20 }, - "machine_nozzle_offset_y": { "default_value": 25 } + "machine_nozzle_offset_y": { "default_value": 25 }, + "machine_nozzle_size": { "default_value": 0.35 }, + "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file diff --git a/resources/extruders/leapfrog_creatr_hs_extruder_right.def.json b/resources/extruders/leapfrog_creatr_hs_extruder_right.def.json index 6be5456210..a3d33e2149 100644 --- a/resources/extruders/leapfrog_creatr_hs_extruder_right.def.json +++ b/resources/extruders/leapfrog_creatr_hs_extruder_right.def.json @@ -2,17 +2,17 @@ "version": 2, "name": "Right extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "leapfrog_creatr_hs", "position": "0" }, - "overrides": { - "extruder_nr": { - "default_value": 0 - }, - "machine_nozzle_size": { "default_value": 0.35 }, - "material_diameter": { "default_value": 1.75 }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, "machine_nozzle_offset_x": { "default_value": 35 }, - "machine_nozzle_offset_y": { "default_value": 25 } + "machine_nozzle_offset_y": { "default_value": 25 }, + "machine_nozzle_size": { "default_value": 0.35 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/leapfrog_creatr_hs_xl_extruder_left.def.json b/resources/extruders/leapfrog_creatr_hs_xl_extruder_left.def.json index 647fd12a2c..8b3473c661 100644 --- a/resources/extruders/leapfrog_creatr_hs_xl_extruder_left.def.json +++ b/resources/extruders/leapfrog_creatr_hs_xl_extruder_left.def.json @@ -2,17 +2,17 @@ "version": 2, "name": "Left extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "leapfrog_creatr_hs_xl", "position": "1" }, - "overrides": { - "extruder_nr": { - "default_value": 1 - }, - "machine_nozzle_size": { "default_value": 0.35 }, - "material_diameter": { "default_value": 1.75 }, + "overrides": + { + "extruder_nr": { "default_value": 1 }, "machine_nozzle_offset_x": { "default_value": 20 }, - "machine_nozzle_offset_y": { "default_value": 25 } + "machine_nozzle_offset_y": { "default_value": 25 }, + "machine_nozzle_size": { "default_value": 0.35 }, + "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file diff --git a/resources/extruders/leapfrog_creatr_hs_xl_extruder_right.def.json b/resources/extruders/leapfrog_creatr_hs_xl_extruder_right.def.json index b866b684b1..80df0f6620 100644 --- a/resources/extruders/leapfrog_creatr_hs_xl_extruder_right.def.json +++ b/resources/extruders/leapfrog_creatr_hs_xl_extruder_right.def.json @@ -2,17 +2,17 @@ "version": 2, "name": "Right extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "leapfrog_creatr_hs_xl", "position": "0" }, - "overrides": { - "extruder_nr": { - "default_value": 0 - }, - "machine_nozzle_size": { "default_value": 0.35 }, - "material_diameter": { "default_value": 1.75 }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, "machine_nozzle_offset_x": { "default_value": 35 }, - "machine_nozzle_offset_y": { "default_value": 25 } + "machine_nozzle_offset_y": { "default_value": 25 }, + "machine_nozzle_size": { "default_value": 0.35 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/liquid_extruder.def.json b/resources/extruders/liquid_extruder.def.json index d0fb0a4caf..9d56887b6e 100644 --- a/resources/extruders/liquid_extruder.def.json +++ b/resources/extruders/liquid_extruder.def.json @@ -2,13 +2,14 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "liquid", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/longer_base_extruder_0.def.json b/resources/extruders/longer_base_extruder_0.def.json index f4b144ec87..585e76320a 100644 --- a/resources/extruders/longer_base_extruder_0.def.json +++ b/resources/extruders/longer_base_extruder_0.def.json @@ -2,15 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "longer_base", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } - } -} +} \ No newline at end of file diff --git a/resources/extruders/lotmaxx_sc10_extruder_0.def.json b/resources/extruders/lotmaxx_sc10_extruder_0.def.json index 2477d35cba..cadcfb86f0 100644 --- a/resources/extruders/lotmaxx_sc10_extruder_0.def.json +++ b/resources/extruders/lotmaxx_sc10_extruder_0.def.json @@ -2,12 +2,13 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "lotmaxx_sc10", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } diff --git a/resources/extruders/lotmaxx_sc20_extruder_0.def.json b/resources/extruders/lotmaxx_sc20_extruder_0.def.json index d02af04a57..f080aa3452 100644 --- a/resources/extruders/lotmaxx_sc20_extruder_0.def.json +++ b/resources/extruders/lotmaxx_sc20_extruder_0.def.json @@ -2,12 +2,13 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "lotmaxx_sc20", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } diff --git a/resources/extruders/lotmaxx_sc60_extruder_left.def.json b/resources/extruders/lotmaxx_sc60_extruder_left.def.json index 430cea8106..d16d93d122 100644 --- a/resources/extruders/lotmaxx_sc60_extruder_left.def.json +++ b/resources/extruders/lotmaxx_sc60_extruder_left.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "lotmaxx_sc60", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/lotmaxx_sc60_extruder_right.def.json b/resources/extruders/lotmaxx_sc60_extruder_right.def.json index a5a96c993b..33360bea52 100644 --- a/resources/extruders/lotmaxx_sc60_extruder_right.def.json +++ b/resources/extruders/lotmaxx_sc60_extruder_right.def.json @@ -2,16 +2,19 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "lotmaxx_sc60", "position": "1" }, - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/lulzbot_mini_2_se_extruder.def.json b/resources/extruders/lulzbot_mini_2_se_extruder.def.json index 135b247b67..94f63d9688 100644 --- a/resources/extruders/lulzbot_mini_2_se_extruder.def.json +++ b/resources/extruders/lulzbot_mini_2_se_extruder.def.json @@ -2,24 +2,26 @@ "version": 2, "name": "Lulzbot Mini 2 | SE | 0.5mm", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "lulzbot_mini_2_se", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "0" }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.5 }, + "machine_extruder_end_pos_abs": { "default_value": false }, + "machine_extruder_end_pos_x": { "default_value": 0 }, + "machine_extruder_end_pos_y": { "default_value": 0 }, "machine_extruder_start_pos_abs": { "default_value": false }, "machine_extruder_start_pos_x": { "default_value": 0 }, "machine_extruder_start_pos_y": { "default_value": 0 }, - "machine_extruder_end_pos_abs": { "default_value": false }, - "machine_extruder_end_pos_x": { "default_value": 0 }, - "machine_extruder_end_pos_y": { "default_value": 0 } + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.5 } } -} +} \ No newline at end of file diff --git a/resources/extruders/lulzbot_mini_2_sl_extruder.def.json b/resources/extruders/lulzbot_mini_2_sl_extruder.def.json index 12faf247e5..3b27f79741 100644 --- a/resources/extruders/lulzbot_mini_2_sl_extruder.def.json +++ b/resources/extruders/lulzbot_mini_2_sl_extruder.def.json @@ -2,24 +2,26 @@ "version": 2, "name": "Lulzbot Mini 2 | SL | 0.25mm (Micro)", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "lulzbot_mini_2_sl", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "0" }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.25 }, + "machine_extruder_end_pos_abs": { "default_value": false }, + "machine_extruder_end_pos_x": { "default_value": 0 }, + "machine_extruder_end_pos_y": { "default_value": 0 }, "machine_extruder_start_pos_abs": { "default_value": false }, "machine_extruder_start_pos_x": { "default_value": 0 }, "machine_extruder_start_pos_y": { "default_value": 0 }, - "machine_extruder_end_pos_abs": { "default_value": false }, - "machine_extruder_end_pos_x": { "default_value": 0 }, - "machine_extruder_end_pos_y": { "default_value": 0 } + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.25 } } -} +} \ No newline at end of file diff --git a/resources/extruders/lulzbot_taz_pro_dual_extruder_0.def.json b/resources/extruders/lulzbot_taz_pro_dual_extruder_0.def.json index 1bc148c583..5134958293 100644 --- a/resources/extruders/lulzbot_taz_pro_dual_extruder_0.def.json +++ b/resources/extruders/lulzbot_taz_pro_dual_extruder_0.def.json @@ -2,24 +2,26 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "lulzbot_taz_pro_dual", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.5 }, + "machine_extruder_end_pos_abs": { "default_value": false }, + "machine_extruder_end_pos_x": { "default_value": 0 }, + "machine_extruder_end_pos_y": { "default_value": 0 }, "machine_extruder_start_pos_abs": { "default_value": false }, "machine_extruder_start_pos_x": { "default_value": 0 }, "machine_extruder_start_pos_y": { "default_value": 0 }, - "machine_extruder_end_pos_abs": { "default_value": false }, - "machine_extruder_end_pos_x": { "default_value": 0 }, - "machine_extruder_end_pos_y": { "default_value": 0 } + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.5 } } -} +} \ No newline at end of file diff --git a/resources/extruders/lulzbot_taz_pro_dual_extruder_1.def.json b/resources/extruders/lulzbot_taz_pro_dual_extruder_1.def.json index 3d193426cb..69ac843d1f 100644 --- a/resources/extruders/lulzbot_taz_pro_dual_extruder_1.def.json +++ b/resources/extruders/lulzbot_taz_pro_dual_extruder_1.def.json @@ -2,29 +2,37 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "lulzbot_taz_pro_dual", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.5 }, - "nozzle_disallowed_areas": { - "default_value": [ - [[-115, 140], [ -140, 140], [ -140, -140], [-115, -140]] - ] - }, + "machine_extruder_end_pos_abs": { "default_value": false }, + "machine_extruder_end_pos_x": { "default_value": 0 }, + "machine_extruder_end_pos_y": { "default_value": 0 }, "machine_extruder_start_pos_abs": { "default_value": false }, "machine_extruder_start_pos_x": { "default_value": 0 }, "machine_extruder_start_pos_y": { "default_value": 0 }, - "machine_extruder_end_pos_abs": { "default_value": false }, - "machine_extruder_end_pos_x": { "default_value": 0 }, - "machine_extruder_end_pos_y": { "default_value": 0 } + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.5 }, + "nozzle_disallowed_areas": + { + "default_value": [ + [ + [-115, 140], + [-140, 140], + [-140, -140], + [-115, -140] + ] + ] + } } -} +} \ No newline at end of file diff --git a/resources/extruders/makeR_pegasus_extruder_0.def.json b/resources/extruders/makeR_pegasus_extruder_0.def.json index c17c51d599..854aa80f32 100644 --- a/resources/extruders/makeR_pegasus_extruder_0.def.json +++ b/resources/extruders/makeR_pegasus_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "makeR_pegasus", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/makeR_prusa_tairona_i3_extruder_0.def.json b/resources/extruders/makeR_prusa_tairona_i3_extruder_0.def.json index 278981f355..6de907a802 100644 --- a/resources/extruders/makeR_prusa_tairona_i3_extruder_0.def.json +++ b/resources/extruders/makeR_prusa_tairona_i3_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "makeR_prusa_tairona_i3", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/makeblock_mcreate_extruder_0.def.json b/resources/extruders/makeblock_mcreate_extruder_0.def.json index 060ea634f8..1a6901a772 100644 --- a/resources/extruders/makeblock_mcreate_extruder_0.def.json +++ b/resources/extruders/makeblock_mcreate_extruder_0.def.json @@ -2,19 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "makeblock_mcreate", "position": "0" }, - "overrides": { - "extruder_nr": { - "default_value": 0 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "material_diameter": { - "default_value": 1.75 - } + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/makeit_dual_1st.def.json b/resources/extruders/makeit_dual_1st.def.json index 16374b40d1..61dd944335 100644 --- a/resources/extruders/makeit_dual_1st.def.json +++ b/resources/extruders/makeit_dual_1st.def.json @@ -2,26 +2,27 @@ "version": 2, "name": "1st Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "makeit_pro_m", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" } + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/makeit_dual_2nd.def.json b/resources/extruders/makeit_dual_2nd.def.json index 562cfcbc40..1147e1da96 100644 --- a/resources/extruders/makeit_dual_2nd.def.json +++ b/resources/extruders/makeit_dual_2nd.def.json @@ -2,26 +2,27 @@ "version": 2, "name": "2nd Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "makeit_pro_m", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" } + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/makeit_l_dual_1st.def.json b/resources/extruders/makeit_l_dual_1st.def.json index 8fbc2944b1..0e549945a2 100644 --- a/resources/extruders/makeit_l_dual_1st.def.json +++ b/resources/extruders/makeit_l_dual_1st.def.json @@ -2,26 +2,27 @@ "version": 2, "name": "1st Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "makeit_pro_l", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" } + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/makeit_l_dual_2nd.def.json b/resources/extruders/makeit_l_dual_2nd.def.json index e163e9565a..33c27fecbd 100644 --- a/resources/extruders/makeit_l_dual_2nd.def.json +++ b/resources/extruders/makeit_l_dual_2nd.def.json @@ -2,26 +2,27 @@ "version": 2, "name": "2nd Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "makeit_pro_l", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" } + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/makeit_mx_dual_1st.def.json b/resources/extruders/makeit_mx_dual_1st.def.json index 48a15bb4e7..1d1adf2ff6 100644 --- a/resources/extruders/makeit_mx_dual_1st.def.json +++ b/resources/extruders/makeit_mx_dual_1st.def.json @@ -2,26 +2,27 @@ "version": 2, "name": "1st Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "makeit_pro_mx", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" } + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file diff --git a/resources/extruders/makeit_mx_dual_2nd.def.json b/resources/extruders/makeit_mx_dual_2nd.def.json index b17b1b9051..9db1ea1732 100644 --- a/resources/extruders/makeit_mx_dual_2nd.def.json +++ b/resources/extruders/makeit_mx_dual_2nd.def.json @@ -2,26 +2,27 @@ "version": 2, "name": "2nd Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "makeit_pro_mx", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" } + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file diff --git a/resources/extruders/maker_made_300x_extruder_0.def.json b/resources/extruders/maker_made_300x_extruder_0.def.json index a35c47b395..632dd4fa79 100644 --- a/resources/extruders/maker_made_300x_extruder_0.def.json +++ b/resources/extruders/maker_made_300x_extruder_0.def.json @@ -1,15 +1,16 @@ -{ - "name": "Extruder 1", - "version": 2, - "inherits": "fdmextruder", - "metadata": { - "machine": "maker_made_300x", - "position": "0" - }, - - "overrides": { - "extruder_nr": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - } -} +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "maker_made_300x", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/maker_starter_extruder_0.def.json b/resources/extruders/maker_starter_extruder_0.def.json index 76e2f74a4c..1a8877f8ef 100644 --- a/resources/extruders/maker_starter_extruder_0.def.json +++ b/resources/extruders/maker_starter_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "maker_starter", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/makerbotreplicator_extruder_0.def.json b/resources/extruders/makerbotreplicator_extruder_0.def.json index 595134d788..dc0895e7b0 100644 --- a/resources/extruders/makerbotreplicator_extruder_0.def.json +++ b/resources/extruders/makerbotreplicator_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "makerbotreplicator", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/makergear_m2_v3b.def.json b/resources/extruders/makergear_m2_v3b.def.json index c9ccebdb27..125ea4dc82 100644 --- a/resources/extruders/makergear_m2_v3b.def.json +++ b/resources/extruders/makergear_m2_v3b.def.json @@ -2,12 +2,13 @@ "version": 2, "name": "MakerGear M2 V3B", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "makergear_m2", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } diff --git a/resources/extruders/malyan_m180_extruder_0.def.json b/resources/extruders/malyan_m180_extruder_0.def.json index 04bc70ce55..a8db6ff3a9 100644 --- a/resources/extruders/malyan_m180_extruder_0.def.json +++ b/resources/extruders/malyan_m180_extruder_0.def.json @@ -2,16 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "malyan_m180", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { - "default_value": 1.75 - } + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/malyan_m200_extruder_0.def.json b/resources/extruders/malyan_m200_extruder_0.def.json index 88d99fb426..c1f70bf9da 100644 --- a/resources/extruders/malyan_m200_extruder_0.def.json +++ b/resources/extruders/malyan_m200_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "malyan_m200", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/mankati_fullscale_xt_plus_extruder_0.def.json b/resources/extruders/mankati_fullscale_xt_plus_extruder_0.def.json index 4cb893336e..53a88d2641 100644 --- a/resources/extruders/mankati_fullscale_xt_plus_extruder_0.def.json +++ b/resources/extruders/mankati_fullscale_xt_plus_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "mankati_fullscale_xt_plus", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/mbot3d_grid2_extruder_0.def.json b/resources/extruders/mbot3d_grid2_extruder_0.def.json index 7bfd5ffa9e..525829a0d4 100644 --- a/resources/extruders/mbot3d_grid2_extruder_0.def.json +++ b/resources/extruders/mbot3d_grid2_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "mbot3d_grid2plus", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/mbot3d_grid2_extruder_left.def.json b/resources/extruders/mbot3d_grid2_extruder_left.def.json index e8368cd1bb..e06e1a1b45 100644 --- a/resources/extruders/mbot3d_grid2_extruder_left.def.json +++ b/resources/extruders/mbot3d_grid2_extruder_left.def.json @@ -2,26 +2,27 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "mbot3d_grid2plus_dual", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "default_value": 200 }, + "machine_extruder_end_pos_y": { "default_value": 200 }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "default_value": 200 }, "machine_extruder_start_pos_y": { "default_value": 200 }, - "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "default_value": 200 }, - "machine_extruder_end_pos_y": { "default_value": 200 } + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/mbot3d_grid2_extruder_right.def.json b/resources/extruders/mbot3d_grid2_extruder_right.def.json index fed6cc7333..67628face7 100644 --- a/resources/extruders/mbot3d_grid2_extruder_right.def.json +++ b/resources/extruders/mbot3d_grid2_extruder_right.def.json @@ -2,26 +2,27 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "mbot3d_grid2plus_dual", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "default_value": 200 }, + "machine_extruder_end_pos_y": { "default_value": 200 }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "default_value": 200 }, "machine_extruder_start_pos_y": { "default_value": 200 }, - "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "default_value": 200 }, - "machine_extruder_end_pos_y": { "default_value": 200 } + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/mbot3d_grid4_extruder_0.def.json b/resources/extruders/mbot3d_grid4_extruder_0.def.json index a75145fb74..7fbac0e9f2 100644 --- a/resources/extruders/mbot3d_grid4_extruder_0.def.json +++ b/resources/extruders/mbot3d_grid4_extruder_0.def.json @@ -2,16 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "mbot3d_grid4", "position": "0" }, - - "overrides": { - "extruder_nr": { - "default_value": 0 - }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/mbot3d_grid4_extruder_left.def.json b/resources/extruders/mbot3d_grid4_extruder_left.def.json index fb568c6eb6..657fd2533b 100644 --- a/resources/extruders/mbot3d_grid4_extruder_left.def.json +++ b/resources/extruders/mbot3d_grid4_extruder_left.def.json @@ -2,26 +2,27 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "mbot3d_grid4_dual", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "default_value": 200 }, + "machine_extruder_end_pos_y": { "default_value": 200 }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "default_value": 200 }, "machine_extruder_start_pos_y": { "default_value": 200 }, - "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "default_value": 200 }, - "machine_extruder_end_pos_y": { "default_value": 200 } + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/mbot3d_grid4_extruder_right.def.json b/resources/extruders/mbot3d_grid4_extruder_right.def.json index 7b36ff22e4..5c1646d18e 100644 --- a/resources/extruders/mbot3d_grid4_extruder_right.def.json +++ b/resources/extruders/mbot3d_grid4_extruder_right.def.json @@ -2,26 +2,27 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "mbot3d_grid4_dual", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "default_value": 200 }, + "machine_extruder_end_pos_y": { "default_value": 200 }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "default_value": 200 }, "machine_extruder_start_pos_y": { "default_value": 200 }, - "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "default_value": 200 }, - "machine_extruder_end_pos_y": { "default_value": 200 } + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/mendel90_extruder_0.def.json b/resources/extruders/mendel90_extruder_0.def.json index 2ea4d9a7de..0701164a65 100644 --- a/resources/extruders/mendel90_extruder_0.def.json +++ b/resources/extruders/mendel90_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "mendel90", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/mingda_base_extruder_0.def.json b/resources/extruders/mingda_base_extruder_0.def.json index 034f6ce45f..2a63d15eb6 100644 --- a/resources/extruders/mingda_base_extruder_0.def.json +++ b/resources/extruders/mingda_base_extruder_0.def.json @@ -2,15 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "mingda_base", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } - } -} +} \ No newline at end of file diff --git a/resources/extruders/mixware_hyper_s_extruder_0.def.json b/resources/extruders/mixware_hyper_s_extruder_0.def.json index 09971ee688..af1432991e 100644 --- a/resources/extruders/mixware_hyper_s_extruder_0.def.json +++ b/resources/extruders/mixware_hyper_s_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "mixware_hyper_s", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/geeetech_A10M_1.def.json b/resources/extruders/modix_v3_extruder_0.def.json similarity index 51% rename from resources/extruders/geeetech_A10M_1.def.json rename to resources/extruders/modix_v3_extruder_0.def.json index b3c87489e9..7b983e06b2 100644 --- a/resources/extruders/geeetech_A10M_1.def.json +++ b/resources/extruders/modix_v3_extruder_0.def.json @@ -1,19 +1,19 @@ -{ - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": { - "machine": "geeetech_A10M", - "position": "0" - }, - - "overrides": { - "extruder_nr": { - "default_value": 0, - "maximum_value": "1" - }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - - } -} +{ + "version": 2, + "name": "Left Extruder", + "inherits": "fdmextruder", + "metadata": + { + "machine": "modix_v3_base", + "position": "0" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 0, + "maximum_value": "1" + }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/geeetech_A20M_2.def.json b/resources/extruders/modix_v3_extruder_1.def.json similarity index 51% rename from resources/extruders/geeetech_A20M_2.def.json rename to resources/extruders/modix_v3_extruder_1.def.json index 51dd29723a..0d218e8168 100644 --- a/resources/extruders/geeetech_A20M_2.def.json +++ b/resources/extruders/modix_v3_extruder_1.def.json @@ -1,19 +1,19 @@ -{ - "version": 2, - "name": "Extruder 2", - "inherits": "fdmextruder", - "metadata": { - "machine": "geeetech_A20M", - "position": "1" - }, - - "overrides": { - "extruder_nr": { - "default_value": 1, - "maximum_value": "1" - }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - - } -} +{ + "version": 2, + "name": "Right Extruder", + "inherits": "fdmextruder", + "metadata": + { + "machine": "modix_v3_base", + "position": "1" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 1, + "maximum_value": "1" + }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/modix_v4_extruder_0.def.json b/resources/extruders/modix_v4_extruder_0.def.json new file mode 100644 index 0000000000..bce44abe0f --- /dev/null +++ b/resources/extruders/modix_v4_extruder_0.def.json @@ -0,0 +1,19 @@ +{ + "version": 2, + "name": "Left Extruder", + "inherits": "fdmextruder", + "metadata": + { + "machine": "modix_v4_base", + "position": "0" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 0, + "maximum_value": "1" + }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/modix_v4_extruder_1.def.json b/resources/extruders/modix_v4_extruder_1.def.json new file mode 100644 index 0000000000..bae7499c45 --- /dev/null +++ b/resources/extruders/modix_v4_extruder_1.def.json @@ -0,0 +1,19 @@ +{ + "version": 2, + "name": "Right Extruder", + "inherits": "fdmextruder", + "metadata": + { + "machine": "modix_v4_base", + "position": "1" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 1, + "maximum_value": "1" + }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/monoprice_select_mini_v1_extruder_0.def.json b/resources/extruders/monoprice_select_mini_v1_extruder_0.def.json index 023bd6b27c..35d7168f04 100644 --- a/resources/extruders/monoprice_select_mini_v1_extruder_0.def.json +++ b/resources/extruders/monoprice_select_mini_v1_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "monoprice_select_mini_v1", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/monoprice_select_mini_v2_extruder_0.def.json b/resources/extruders/monoprice_select_mini_v2_extruder_0.def.json index 79ba110701..a6c9fc26f9 100644 --- a/resources/extruders/monoprice_select_mini_v2_extruder_0.def.json +++ b/resources/extruders/monoprice_select_mini_v2_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "monoprice_select_mini_v2", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/mp_mini_delta_extruder_0.def.json b/resources/extruders/mp_mini_delta_extruder_0.def.json index b4eab5c7a2..9250ed44e7 100644 --- a/resources/extruders/mp_mini_delta_extruder_0.def.json +++ b/resources/extruders/mp_mini_delta_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 0", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "mp_mini_delta", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/mp_mini_delta_v2_extruder_0.def.json b/resources/extruders/mp_mini_delta_v2_extruder_0.def.json index 022ace632f..55d6c89b33 100644 --- a/resources/extruders/mp_mini_delta_v2_extruder_0.def.json +++ b/resources/extruders/mp_mini_delta_v2_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 0", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "mp_mini_delta_v2", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/nps_extruder_0.def.json b/resources/extruders/nps_extruder_0.def.json index 48865b1a2e..89039443ef 100644 --- a/resources/extruders/nps_extruder_0.def.json +++ b/resources/extruders/nps_extruder_0.def.json @@ -1,15 +1,16 @@ -{ - "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 } - } -} +{ + "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 } + } +} \ No newline at end of file diff --git a/resources/extruders/nwa3d_a31_extruder_0.def.json b/resources/extruders/nwa3d_a31_extruder_0.def.json index de1938956a..dea524c940 100644 --- a/resources/extruders/nwa3d_a31_extruder_0.def.json +++ b/resources/extruders/nwa3d_a31_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Standard 0.4mm", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "nwa3d_a31", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/nwa3d_a5_extruder_0.def.json b/resources/extruders/nwa3d_a5_extruder_0.def.json index 9131480732..d53fd941b3 100644 --- a/resources/extruders/nwa3d_a5_extruder_0.def.json +++ b/resources/extruders/nwa3d_a5_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Regular 0.4mm Nozzle", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "nwa3d_a5", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ord_extruder_0.def.json b/resources/extruders/ord_extruder_0.def.json index 61317c4a17..160e869fa4 100644 --- a/resources/extruders/ord_extruder_0.def.json +++ b/resources/extruders/ord_extruder_0.def.json @@ -2,13 +2,15 @@ "version": 2, "name": "0", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ord", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "4" }, @@ -17,4 +19,4 @@ "machine_nozzle_size": { "default_value": 0.35 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ord_extruder_1.def.json b/resources/extruders/ord_extruder_1.def.json index 43bc11fa71..f7d22fffc0 100644 --- a/resources/extruders/ord_extruder_1.def.json +++ b/resources/extruders/ord_extruder_1.def.json @@ -2,13 +2,15 @@ "version": 2, "name": "1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ord", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "4" }, @@ -17,4 +19,4 @@ "machine_nozzle_size": { "default_value": 0.35 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ord_extruder_2.def.json b/resources/extruders/ord_extruder_2.def.json index 84bcbd5332..a959ea1f49 100644 --- a/resources/extruders/ord_extruder_2.def.json +++ b/resources/extruders/ord_extruder_2.def.json @@ -2,13 +2,15 @@ "version": 2, "name": "2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ord", "position": "2" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 2, "maximum_value": "4" }, @@ -17,4 +19,4 @@ "machine_nozzle_size": { "default_value": 0.35 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ord_extruder_3.def.json b/resources/extruders/ord_extruder_3.def.json index db81f82b78..2cb1fc5454 100644 --- a/resources/extruders/ord_extruder_3.def.json +++ b/resources/extruders/ord_extruder_3.def.json @@ -2,13 +2,15 @@ "version": 2, "name": "3", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ord", "position": "3" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 3, "maximum_value": "4" }, @@ -17,4 +19,4 @@ "machine_nozzle_size": { "default_value": 0.35 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ord_extruder_4.def.json b/resources/extruders/ord_extruder_4.def.json index 2ca7609e06..f9f693e977 100644 --- a/resources/extruders/ord_extruder_4.def.json +++ b/resources/extruders/ord_extruder_4.def.json @@ -2,13 +2,15 @@ "version": 2, "name": "4", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ord", "position": "4" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 4, "maximum_value": "4" }, @@ -17,4 +19,4 @@ "machine_nozzle_size": { "default_value": 0.35 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/pbr3d_g1_extruder_0.def.json b/resources/extruders/pbr3d_g1_extruder_0.def.json index 3a79fe4f20..c52e61c87e 100644 --- a/resources/extruders/pbr3d_g1_extruder_0.def.json +++ b/resources/extruders/pbr3d_g1_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "pbr3d_g1", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/peopoly_moai_extruder_0.def.json b/resources/extruders/peopoly_moai_extruder_0.def.json index 1acf5b499f..f6a0f8dc29 100644 --- a/resources/extruders/peopoly_moai_extruder_0.def.json +++ b/resources/extruders/peopoly_moai_extruder_0.def.json @@ -2,17 +2,19 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "peopoly_moai", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.067 }, - "material_diameter": { - "enabled": false, - "default_value": 1.75 + "material_diameter": + { + "default_value": 1.75, + "enabled": false } } -} +} \ No newline at end of file diff --git a/resources/extruders/predator_extruder_0.def.json b/resources/extruders/predator_extruder_0.def.json index 59574ae69f..f78706952d 100644 --- a/resources/extruders/predator_extruder_0.def.json +++ b/resources/extruders/predator_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 0", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "predator", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/printrbot_play_extruder_0.def.json b/resources/extruders/printrbot_play_extruder_0.def.json index 682810c8d8..15fe9179fe 100644 --- a/resources/extruders/printrbot_play_extruder_0.def.json +++ b/resources/extruders/printrbot_play_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "printrbot_play", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/printrbot_play_heated_extruder_0.def.json b/resources/extruders/printrbot_play_heated_extruder_0.def.json index 72335e82d6..8949ac253a 100644 --- a/resources/extruders/printrbot_play_heated_extruder_0.def.json +++ b/resources/extruders/printrbot_play_heated_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "printrbot_play_heated", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/printrbot_simple_extended_extruder_0.def.json b/resources/extruders/printrbot_simple_extended_extruder_0.def.json index b50a142d2e..81a05a5974 100644 --- a/resources/extruders/printrbot_simple_extended_extruder_0.def.json +++ b/resources/extruders/printrbot_simple_extended_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "printrbot_simple_extended", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/printrbot_simple_extruder_0.def.json b/resources/extruders/printrbot_simple_extruder_0.def.json index 4fa5d7fbf2..fd414912dc 100644 --- a/resources/extruders/printrbot_simple_extruder_0.def.json +++ b/resources/extruders/printrbot_simple_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "printrbot_simple", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/printrbot_simple_makers_kit_extruder_0.def.json b/resources/extruders/printrbot_simple_makers_kit_extruder_0.def.json index a58195fdfb..cd0ca9b74b 100644 --- a/resources/extruders/printrbot_simple_makers_kit_extruder_0.def.json +++ b/resources/extruders/printrbot_simple_makers_kit_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "printrbot_simple_makers_kit", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/prusa_i3_extruder_0.def.json b/resources/extruders/prusa_i3_extruder_0.def.json index dbb01032b8..42e8f36461 100644 --- a/resources/extruders/prusa_i3_extruder_0.def.json +++ b/resources/extruders/prusa_i3_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "prusa_i3", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/prusa_i3_mk2_extruder_0.def.json b/resources/extruders/prusa_i3_mk2_extruder_0.def.json index e802687062..78251aa61d 100644 --- a/resources/extruders/prusa_i3_mk2_extruder_0.def.json +++ b/resources/extruders/prusa_i3_mk2_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "prusa_i3_mk2", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/prusa_i3_mk3_extruder_0.def.json b/resources/extruders/prusa_i3_mk3_extruder_0.def.json index 29156f0d70..cf489aaf3c 100644 --- a/resources/extruders/prusa_i3_mk3_extruder_0.def.json +++ b/resources/extruders/prusa_i3_mk3_extruder_0.def.json @@ -2,12 +2,13 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "prusa_i3_mk3", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } diff --git a/resources/extruders/prusa_i3_xl_extruder_0.def.json b/resources/extruders/prusa_i3_xl_extruder_0.def.json index c4125b36ee..4a28924f9b 100644 --- a/resources/extruders/prusa_i3_xl_extruder_0.def.json +++ b/resources/extruders/prusa_i3_xl_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "prusa_i3_xl", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/punchtec_connect_xl_extruder_0.def.json b/resources/extruders/punchtec_connect_xl_extruder_0.def.json index f286140167..3524ff6fba 100644 --- a/resources/extruders/punchtec_connect_xl_extruder_0.def.json +++ b/resources/extruders/punchtec_connect_xl_extruder_0.def.json @@ -2,13 +2,15 @@ "version": 2, "name": "0", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "punchtec_connect_xl", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, @@ -16,4 +18,4 @@ "machine_nozzle_offset_y": { "default_value": 0.0 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/punchtec_connect_xl_extruder_1.def.json b/resources/extruders/punchtec_connect_xl_extruder_1.def.json index 47d28882cf..0bfa950060 100644 --- a/resources/extruders/punchtec_connect_xl_extruder_1.def.json +++ b/resources/extruders/punchtec_connect_xl_extruder_1.def.json @@ -2,13 +2,15 @@ "version": 2, "name": "1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "punchtec_connect_xl", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, @@ -16,4 +18,4 @@ "machine_nozzle_offset_y": { "default_value": 0.0 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/raise3D_N2_dual_extruder_0.def.json b/resources/extruders/raise3D_N2_dual_extruder_0.def.json index 9294a73933..27cc06fea8 100644 --- a/resources/extruders/raise3D_N2_dual_extruder_0.def.json +++ b/resources/extruders/raise3D_N2_dual_extruder_0.def.json @@ -2,26 +2,27 @@ "version": 2, "name": "Left Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "raise3D_N2_dual", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" } + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/raise3D_N2_dual_extruder_1.def.json b/resources/extruders/raise3D_N2_dual_extruder_1.def.json index e09cb6b9fc..7397de74a2 100644 --- a/resources/extruders/raise3D_N2_dual_extruder_1.def.json +++ b/resources/extruders/raise3D_N2_dual_extruder_1.def.json @@ -2,28 +2,27 @@ "version": 2, "name": "Right Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "raise3D_N2_dual", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 24.8 }, - "machine_nozzle_offset_y": { "default_value": 0.6 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" } + "machine_nozzle_offset_x": { "default_value": 24.8 }, + "machine_nozzle_offset_y": { "default_value": 0.6 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} - - +} \ No newline at end of file diff --git a/resources/extruders/raise3D_N2_plus_dual_extruder_0.def.json b/resources/extruders/raise3D_N2_plus_dual_extruder_0.def.json index d8821204f0..e1f0a6ff27 100644 --- a/resources/extruders/raise3D_N2_plus_dual_extruder_0.def.json +++ b/resources/extruders/raise3D_N2_plus_dual_extruder_0.def.json @@ -2,26 +2,27 @@ "version": 2, "name": "Left Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "raise3D_N2_plus_dual", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" } + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/raise3D_N2_plus_dual_extruder_1.def.json b/resources/extruders/raise3D_N2_plus_dual_extruder_1.def.json index 0a6ded63a3..2b371c71e4 100644 --- a/resources/extruders/raise3D_N2_plus_dual_extruder_1.def.json +++ b/resources/extruders/raise3D_N2_plus_dual_extruder_1.def.json @@ -2,28 +2,27 @@ "version": 2, "name": "Right Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "raise3D_N2_plus_dual", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 24.8 }, - "machine_nozzle_offset_y": { "default_value": 0.6 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" } + "machine_nozzle_offset_x": { "default_value": 24.8 }, + "machine_nozzle_offset_y": { "default_value": 0.6 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} - - +} \ No newline at end of file diff --git a/resources/extruders/raise3D_N2_plus_single_extruder_0.def.json b/resources/extruders/raise3D_N2_plus_single_extruder_0.def.json index efb071cb8c..38bdbf4328 100644 --- a/resources/extruders/raise3D_N2_plus_single_extruder_0.def.json +++ b/resources/extruders/raise3D_N2_plus_single_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "raise3D_N2_plus_single", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/raise3D_N2_single_extruder_0.def.json b/resources/extruders/raise3D_N2_single_extruder_0.def.json index 399d577110..a96056bc85 100644 --- a/resources/extruders/raise3D_N2_single_extruder_0.def.json +++ b/resources/extruders/raise3D_N2_single_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "raise3D_N2_single", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/renkforce_pro7dual_1st.def.json b/resources/extruders/renkforce_pro7dual_1st.def.json index 23659aa672..78ff8d8583 100755 --- a/resources/extruders/renkforce_pro7dual_1st.def.json +++ b/resources/extruders/renkforce_pro7dual_1st.def.json @@ -2,18 +2,19 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "renkforce_pro7dual", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } - } -} +} \ No newline at end of file diff --git a/resources/extruders/renkforce_pro7dual_2nd.def.json b/resources/extruders/renkforce_pro7dual_2nd.def.json index 7b7a6a1743..2006806327 100755 --- a/resources/extruders/renkforce_pro7dual_2nd.def.json +++ b/resources/extruders/renkforce_pro7dual_2nd.def.json @@ -2,18 +2,19 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "renkforce_pro7dual", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } - } -} +} \ No newline at end of file diff --git a/resources/extruders/renkforce_rf100_extruder_0.def.json b/resources/extruders/renkforce_rf100_extruder_0.def.json index ff64e2f86a..84f9db7ce7 100644 --- a/resources/extruders/renkforce_rf100_extruder_0.def.json +++ b/resources/extruders/renkforce_rf100_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "renkforce_rf100", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/renkforce_rf100_xl_extruder_0.def.json b/resources/extruders/renkforce_rf100_xl_extruder_0.def.json index 718a3738c4..b962496430 100644 --- a/resources/extruders/renkforce_rf100_xl_extruder_0.def.json +++ b/resources/extruders/renkforce_rf100_xl_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "renkforce_rf100_xl", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/rigid3d_base_extruder_0.def.json b/resources/extruders/rigid3d_base_extruder_0.def.json index c4d34c304f..a584689699 100644 --- a/resources/extruders/rigid3d_base_extruder_0.def.json +++ b/resources/extruders/rigid3d_base_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "rigid3d_base", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/rigidbot_big_extruder_0.def.json b/resources/extruders/rigidbot_big_extruder_0.def.json index 9ef72d5203..72e643857e 100644 --- a/resources/extruders/rigidbot_big_extruder_0.def.json +++ b/resources/extruders/rigidbot_big_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "rigidbot_big", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/rigidbot_extruder_0.def.json b/resources/extruders/rigidbot_extruder_0.def.json index 9155be0ff1..6ca622b9fe 100644 --- a/resources/extruders/rigidbot_extruder_0.def.json +++ b/resources/extruders/rigidbot_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "rigidbot", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/robo_3d_r1_extruder_0.def.json b/resources/extruders/robo_3d_r1_extruder_0.def.json index 60811842ac..916b780aa2 100644 --- a/resources/extruders/robo_3d_r1_extruder_0.def.json +++ b/resources/extruders/robo_3d_r1_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "robo_3d_r1", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/seckit_skgo_extruder_0.def.json b/resources/extruders/seckit_skgo_extruder_0.def.json index 2c79e00c6d..8e1f8d3737 100644 --- a/resources/extruders/seckit_skgo_extruder_0.def.json +++ b/resources/extruders/seckit_skgo_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "seckit_skgo", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/seckit_sktank_extruder_0.def.json b/resources/extruders/seckit_sktank_extruder_0.def.json index 15e8b9f5c6..4db87cae82 100644 --- a/resources/extruders/seckit_sktank_extruder_0.def.json +++ b/resources/extruders/seckit_sktank_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "seckit_sktank", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/seemecnc_artemis_extruder_0.def.json b/resources/extruders/seemecnc_artemis_extruder_0.def.json index a86e5eb2bd..508a87e7f0 100644 --- a/resources/extruders/seemecnc_artemis_extruder_0.def.json +++ b/resources/extruders/seemecnc_artemis_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "seemecnc_artemis", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.5 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/seemecnc_v32_extruder_0.def.json b/resources/extruders/seemecnc_v32_extruder_0.def.json index b223116be3..603f2acf5f 100644 --- a/resources/extruders/seemecnc_v32_extruder_0.def.json +++ b/resources/extruders/seemecnc_v32_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "seemecnc_v32", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.5 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/sh65_extruder.def.json b/resources/extruders/sh65_extruder.def.json index f01011e281..5ca8cec8d8 100644 --- a/resources/extruders/sh65_extruder.def.json +++ b/resources/extruders/sh65_extruder.def.json @@ -1,21 +1,16 @@ -{ - "version": 2, - "name": "Extruder", - "inherits": "fdmextruder", - "metadata": { - "machine": "sh65", - "position": "0" - }, - - "overrides": { - "extruder_nr": { - "default_value": 0 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "material_diameter": { - "default_value": 1.75 - } - } -} +{ + "version": 2, + "name": "Extruder", + "inherits": "fdmextruder", + "metadata": + { + "machine": "sh65", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/skriware_2_extruder_0.def.json b/resources/extruders/skriware_2_extruder_0.def.json index 0569600094..d74044ff6a 100644 --- a/resources/extruders/skriware_2_extruder_0.def.json +++ b/resources/extruders/skriware_2_extruder_0.def.json @@ -2,17 +2,19 @@ "version": 2, "name": "Left Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "skriware_2", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/skriware_2_extruder_1.def.json b/resources/extruders/skriware_2_extruder_1.def.json index d6fa76e1a0..860185e88d 100644 --- a/resources/extruders/skriware_2_extruder_1.def.json +++ b/resources/extruders/skriware_2_extruder_1.def.json @@ -2,17 +2,19 @@ "version": 2, "name": "Right Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "skriware_2", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/snakeoil_standard_extruder_0.def.json b/resources/extruders/snakeoil_standard_extruder_0.def.json new file mode 100644 index 0000000000..11d6297f06 --- /dev/null +++ b/resources/extruders/snakeoil_standard_extruder_0.def.json @@ -0,0 +1,19 @@ +{ + "version": 2, + "name": "Toolhead", + "inherits": "fdmextruder", + "metadata": + { + "machine": "snakeoil_standard_base", + "position": "0" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 0, + "maximum_value": 1 + }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/snapmaker_extruder_0.def.json b/resources/extruders/snapmaker_extruder_0.def.json index c9b69703a7..d8c2173396 100644 --- a/resources/extruders/snapmaker_extruder_0.def.json +++ b/resources/extruders/snapmaker_extruder_0.def.json @@ -1,20 +1,16 @@ -{ - "name": "Extruder 1", - "version": 2, - "inherits": "fdmextruder", - "metadata": { - "machine": "snapmaker2", - "position": "0" - }, - "overrides": { - "extruder_nr": { - "default_value": 0 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "material_diameter": { - "default_value": 1.75 - } - } -} +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "snapmaker2", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/sovol_bowden_extruder_0.def.json b/resources/extruders/sovol_bowden_extruder_0.def.json new file mode 100644 index 0000000000..44f745f9eb --- /dev/null +++ b/resources/extruders/sovol_bowden_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "sovol_base_bowden", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/sovol_planetary_extruder_0.def.json b/resources/extruders/sovol_planetary_extruder_0.def.json new file mode 100644 index 0000000000..b3fcf33567 --- /dev/null +++ b/resources/extruders/sovol_planetary_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "sovol_base_planetary", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/sovol_titan_extruder_0.def.json b/resources/extruders/sovol_titan_extruder_0.def.json new file mode 100644 index 0000000000..8a1f76dd2e --- /dev/null +++ b/resources/extruders/sovol_titan_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "sovol_base_titan", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/stereotech_start_extruder_0.def.json b/resources/extruders/stereotech_start_extruder_0.def.json index b0a1e91d1c..91a60e02d8 100644 --- a/resources/extruders/stereotech_start_extruder_0.def.json +++ b/resources/extruders/stereotech_start_extruder_0.def.json @@ -2,12 +2,13 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "stereotech_start", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } diff --git a/resources/extruders/stereotech_ste320_1st.def.json b/resources/extruders/stereotech_ste320_1st.def.json index 8110775d33..d89ed900c3 100644 --- a/resources/extruders/stereotech_ste320_1st.def.json +++ b/resources/extruders/stereotech_ste320_1st.def.json @@ -2,44 +2,27 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "stereotech_ste320", "position": "0" }, - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_offset_x": { - "default_value": 0.0 - }, - "machine_nozzle_offset_y": { - "default_value": 0.0 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "material_diameter": { - "default_value": 1.75 - }, - "machine_extruder_start_pos_abs": { - "default_value": true - }, - "machine_extruder_start_pos_x": { - "value": "prime_tower_position_x" - }, - "machine_extruder_start_pos_y": { - "value": "prime_tower_position_y" - }, - "machine_extruder_end_pos_abs": { - "default_value": true - }, - "machine_extruder_end_pos_x": { - "value": "prime_tower_position_x" - }, - "machine_extruder_end_pos_y": { - "value": "prime_tower_position_y" - } + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file diff --git a/resources/extruders/stereotech_ste320_2nd.def.json b/resources/extruders/stereotech_ste320_2nd.def.json index 12a1479164..135adbb7c2 100644 --- a/resources/extruders/stereotech_ste320_2nd.def.json +++ b/resources/extruders/stereotech_ste320_2nd.def.json @@ -2,44 +2,27 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "stereotech_ste320", "position": "1" }, - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_offset_x": { - "default_value": 18.0 - }, - "machine_nozzle_offset_y": { - "default_value": 0.0 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "material_diameter": { - "default_value": 1.75 - }, - "machine_extruder_start_pos_abs": { - "default_value": true - }, - "machine_extruder_start_pos_x": { - "value": "prime_tower_position_x" - }, - "machine_extruder_start_pos_y": { - "value": "prime_tower_position_y" - }, - "machine_extruder_end_pos_abs": { - "default_value": true - }, - "machine_extruder_end_pos_x": { - "value": "prime_tower_position_x" - }, - "machine_extruder_end_pos_y": { - "value": "prime_tower_position_y" - } + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "machine_nozzle_offset_x": { "default_value": 18.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file diff --git a/resources/extruders/strateo3d_left_extruder.def.json b/resources/extruders/strateo3d_left_extruder.def.json index 096b265030..e707a74dc9 100644 --- a/resources/extruders/strateo3d_left_extruder.def.json +++ b/resources/extruders/strateo3d_left_extruder.def.json @@ -2,15 +2,20 @@ "version": 2, "name": "Left Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "strateo3d", "position": "1" }, - - "overrides": { - "extruder_nr": { "default_value": 1, "maximum_value": "1" }, - "material_diameter": { "default_value": 1.75 }, + "overrides": + { + "extruder_nr": + { + "default_value": 1, + "maximum_value": "1" + }, "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 } + "machine_nozzle_offset_y": { "default_value": 0 }, + "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file diff --git a/resources/extruders/strateo3d_right_extruder.def.json b/resources/extruders/strateo3d_right_extruder.def.json index 24acdef8b5..6f4122a3f6 100644 --- a/resources/extruders/strateo3d_right_extruder.def.json +++ b/resources/extruders/strateo3d_right_extruder.def.json @@ -2,15 +2,20 @@ "version": 2, "name": "Right Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "strateo3d", "position": "0" }, - - "overrides": { - "extruder_nr": { "default_value": 0, "maximum_value": "1" }, - "material_diameter": { "default_value": 1.75 }, + "overrides": + { + "extruder_nr": + { + "default_value": 0, + "maximum_value": "1" + }, "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 } + "machine_nozzle_offset_y": { "default_value": 0 }, + "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file diff --git a/resources/extruders/stream20_extruder.def.json b/resources/extruders/stream20_extruder.def.json index f7186c704f..0e07b22b0b 100644 --- a/resources/extruders/stream20_extruder.def.json +++ b/resources/extruders/stream20_extruder.def.json @@ -2,20 +2,15 @@ "version": 2, "name": "STREAM20MK2 Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "stream20pro_mk2", "position": "0" }, - - "overrides": { - "extruder_nr": { - "default_value": 0 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "material_diameter": { - "default_value": 1.75 - } + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/stream20dual_0.def.json b/resources/extruders/stream20dual_0.def.json index 9138d5df63..52e484660a 100644 --- a/resources/extruders/stream20dual_0.def.json +++ b/resources/extruders/stream20dual_0.def.json @@ -2,30 +2,27 @@ "version": 2, "name": "Left extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "stream20dual_mk2", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "material_diameter": { - "default_value": 1.75 - }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" } + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/stream20dual_1.def.json b/resources/extruders/stream20dual_1.def.json index d52ab86111..d9862c9393 100644 --- a/resources/extruders/stream20dual_1.def.json +++ b/resources/extruders/stream20dual_1.def.json @@ -2,32 +2,27 @@ "version": 2, "name": "Right extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "stream20dual_mk2", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "material_diameter": { - "default_value": 1.75 - }, - "machine_nozzle_offset_x": { "default_value": 35 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" } + "machine_nozzle_offset_x": { "default_value": 35 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} - - +} \ No newline at end of file diff --git a/resources/extruders/stream30_extruder.def.json b/resources/extruders/stream30_extruder.def.json index 182ef9b481..5331b74c75 100644 --- a/resources/extruders/stream30_extruder.def.json +++ b/resources/extruders/stream30_extruder.def.json @@ -2,20 +2,15 @@ "version": 2, "name": "STREAM30MK2 Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "stream30pro_mk2", "position": "0" }, - - "overrides": { - "extruder_nr": { - "default_value": 0 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "material_diameter": { - "default_value": 1.75 - } + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/stream30dual_0.def.json b/resources/extruders/stream30dual_0.def.json index 3955219154..2acf1d631c 100644 --- a/resources/extruders/stream30dual_0.def.json +++ b/resources/extruders/stream30dual_0.def.json @@ -2,30 +2,27 @@ "version": 2, "name": "Left extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "stream30dual_mk2", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "material_diameter": { - "default_value": 1.75 - }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" } + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/stream30dual_1.def.json b/resources/extruders/stream30dual_1.def.json index 8db42ecdc7..cd2233f162 100644 --- a/resources/extruders/stream30dual_1.def.json +++ b/resources/extruders/stream30dual_1.def.json @@ -2,32 +2,27 @@ "version": 2, "name": "Right extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "stream30dual_mk2", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "material_diameter": { - "default_value": 1.75 - }, - "machine_nozzle_offset_x": { "default_value": 35 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" } + "machine_nozzle_offset_x": { "default_value": 35 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} - - +} \ No newline at end of file diff --git a/resources/extruders/stream30mk3_extruder.def.json b/resources/extruders/stream30mk3_extruder.def.json index 8a9bbfa1f9..f786af4b78 100644 --- a/resources/extruders/stream30mk3_extruder.def.json +++ b/resources/extruders/stream30mk3_extruder.def.json @@ -1,21 +1,16 @@ -{ - "version": 2, - "name": "Extruder", - "inherits": "fdmextruder", - "metadata": { - "machine": "stream30mk3", - "position": "0" - }, - - "overrides": { - "extruder_nr": { - "default_value": 0 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "material_diameter": { - "default_value": 1.75 - } - } -} +{ + "version": 2, + "name": "Extruder", + "inherits": "fdmextruder", + "metadata": + { + "machine": "stream30mk3", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/stream30ultra_extruder.def.json b/resources/extruders/stream30ultra_extruder.def.json index a2564677ec..d18cce16a7 100644 --- a/resources/extruders/stream30ultra_extruder.def.json +++ b/resources/extruders/stream30ultra_extruder.def.json @@ -2,20 +2,15 @@ "version": 2, "name": "Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "stream30ultra", "position": "0" }, - - "overrides": { - "extruder_nr": { - "default_value": 0 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "material_diameter": { - "default_value": 1.75 - } + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/stream30ultrasc2_extruder.def.json b/resources/extruders/stream30ultrasc2_extruder.def.json index 56c34a34e1..62e5afea77 100644 --- a/resources/extruders/stream30ultrasc2_extruder.def.json +++ b/resources/extruders/stream30ultrasc2_extruder.def.json @@ -1,21 +1,16 @@ -{ - "version": 2, - "name": "Extruder", - "inherits": "fdmextruder", - "metadata": { - "machine": "stream30ultrasc2", - "position": "0" - }, - - "overrides": { - "extruder_nr": { - "default_value": 0 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "material_diameter": { - "default_value": 1.75 - } - } -} +{ + "version": 2, + "name": "Extruder", + "inherits": "fdmextruder", + "metadata": + { + "machine": "stream30ultrasc2", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/stream30ultrasc_extruder.def.json b/resources/extruders/stream30ultrasc_extruder.def.json index 1f76837e87..9820a970a8 100644 --- a/resources/extruders/stream30ultrasc_extruder.def.json +++ b/resources/extruders/stream30ultrasc_extruder.def.json @@ -2,20 +2,15 @@ "version": 2, "name": "Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "stream30ultrasc", "position": "0" }, - - "overrides": { - "extruder_nr": { - "default_value": 0 - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, - "material_diameter": { - "default_value": 1.75 - } + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/structur3d_discov3ry1_complete_um2plus_extruder_0.def.json b/resources/extruders/structur3d_discov3ry1_complete_um2plus_extruder_0.def.json index c63f740f11..0258f9da9c 100644 --- a/resources/extruders/structur3d_discov3ry1_complete_um2plus_extruder_0.def.json +++ b/resources/extruders/structur3d_discov3ry1_complete_um2plus_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Discov3ry Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "structur3d_discov3ry1_complete_um2plus", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.84 }, "material_diameter": { "default_value": 3.175 } } -} +} \ No newline at end of file diff --git a/resources/extruders/syndaveraxi2_extruder_0.def.json b/resources/extruders/syndaveraxi2_extruder_0.def.json index 62357f3227..5750e7fcc5 100644 --- a/resources/extruders/syndaveraxi2_extruder_0.def.json +++ b/resources/extruders/syndaveraxi2_extruder_0.def.json @@ -2,15 +2,16 @@ "version": 2, "name": "Hemera 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "syndaveraxi2", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_steps_per_mm_e": { "default_value": 400 } + "machine_steps_per_mm_e": { "default_value": 400 }, + "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file diff --git a/resources/extruders/syndaveraxi_extruder_0.def.json b/resources/extruders/syndaveraxi_extruder_0.def.json index 4d8d3e8ab4..ecd1e8c65b 100644 --- a/resources/extruders/syndaveraxi_extruder_0.def.json +++ b/resources/extruders/syndaveraxi_extruder_0.def.json @@ -2,15 +2,16 @@ "version": 2, "name": "Hemera 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "syndaveraxi", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_steps_per_mm_e": { "default_value": 400 } + "machine_steps_per_mm_e": { "default_value": 400 }, + "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file diff --git a/resources/extruders/tam_extruder_0.def.json b/resources/extruders/tam_extruder_0.def.json index f487a6ff90..b606474ff0 100644 --- a/resources/extruders/tam_extruder_0.def.json +++ b/resources/extruders/tam_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "tam", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/tank_m_base_extruder_0.def.json b/resources/extruders/tank_m_base_extruder_0.def.json index 64bafe97d2..59f58d1329 100644 --- a/resources/extruders/tank_m_base_extruder_0.def.json +++ b/resources/extruders/tank_m_base_extruder_0.def.json @@ -1,16 +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 } - - } -} +{ + "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 } + } +} \ No newline at end of file diff --git a/resources/extruders/tevo_blackwidow_extruder_0.def.json b/resources/extruders/tevo_blackwidow_extruder_0.def.json index 3450b36ac6..b65ecda212 100644 --- a/resources/extruders/tevo_blackwidow_extruder_0.def.json +++ b/resources/extruders/tevo_blackwidow_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "tevo_blackwidow", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/tevo_tarantula_extruder_0.def.json b/resources/extruders/tevo_tarantula_extruder_0.def.json index a2ac48c06d..da9cb76ee2 100644 --- a/resources/extruders/tevo_tarantula_extruder_0.def.json +++ b/resources/extruders/tevo_tarantula_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "tevo_tarantula", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/tevo_tarantula_extruder_1.def.json b/resources/extruders/tevo_tarantula_extruder_1.def.json index 20d4c7004a..e5083bdd31 100644 --- a/resources/extruders/tevo_tarantula_extruder_1.def.json +++ b/resources/extruders/tevo_tarantula_extruder_1.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "tevo_tarantula", "position": "1" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 1 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/tevo_tarantula_pro_extruder_0.def.json b/resources/extruders/tevo_tarantula_pro_extruder_0.def.json index d178242d36..2845819878 100644 --- a/resources/extruders/tevo_tarantula_pro_extruder_0.def.json +++ b/resources/extruders/tevo_tarantula_pro_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "tevo_tarantula_pro", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/tevo_tarantula_pro_extruder_1.def.json b/resources/extruders/tevo_tarantula_pro_extruder_1.def.json index f02e74efff..02d6f0111f 100644 --- a/resources/extruders/tevo_tarantula_pro_extruder_1.def.json +++ b/resources/extruders/tevo_tarantula_pro_extruder_1.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "tevo_tarantula_pro", "position": "1" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 1 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/tevo_tornado_extruder_0.def.json b/resources/extruders/tevo_tornado_extruder_0.def.json index 6c0c9f39b1..9dc4e5fec1 100644 --- a/resources/extruders/tevo_tornado_extruder_0.def.json +++ b/resources/extruders/tevo_tornado_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "tevo_tornado", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/tinyboy_extruder_0.def.json b/resources/extruders/tinyboy_extruder_0.def.json index 246d00135e..21a3b07b46 100644 --- a/resources/extruders/tinyboy_extruder_0.def.json +++ b/resources/extruders/tinyboy_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "tinyboy_e10", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.3 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/tinyboy_fabrikator15_extruder_0.def.json b/resources/extruders/tinyboy_fabrikator15_extruder_0.def.json index 81fa4bd140..f2a4166ed4 100644 --- a/resources/extruders/tinyboy_fabrikator15_extruder_0.def.json +++ b/resources/extruders/tinyboy_fabrikator15_extruder_0.def.json @@ -1,15 +1,16 @@ -{ - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": { - "machine": "tinyboy_fabrikator15", - "position": "0" - }, - - "overrides": { - "extruder_nr": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - } -} +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "tinyboy_fabrikator15", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/tizyx_k25_extruder_0.def.json b/resources/extruders/tizyx_k25_extruder_0.def.json index 626fedf434..dcf4764da9 100644 --- a/resources/extruders/tizyx_k25_extruder_0.def.json +++ b/resources/extruders/tizyx_k25_extruder_0.def.json @@ -1,15 +1,16 @@ -{ - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": { - "machine": "tizyx_k25", - "position": "0" - }, - - "overrides": { - "extruder_nr": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - } +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "tizyx_k25", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } } \ No newline at end of file diff --git a/resources/extruders/trex2_extruder_0.def.json b/resources/extruders/trex2_extruder_0.def.json index cd5e61530f..1de1cc21bf 100644 --- a/resources/extruders/trex2_extruder_0.def.json +++ b/resources/extruders/trex2_extruder_0.def.json @@ -1,25 +1,23 @@ { - "version": 2, - "name": "Left Extruder", + "version": 2, + "name": "Left Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "vivedino_trex2plus", - "position": "0" - }, - - "overrides": { - "extruder_nr": { + "position": "0" + }, + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "3" }, + "machine_extruder_end_code": { "default_value": "" }, + "machine_extruder_start_code": { "default_value": "G0 X-40" }, "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": "" - } + "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file diff --git a/resources/extruders/trex2_extruder_1.def.json b/resources/extruders/trex2_extruder_1.def.json index 73ffd7cada..be715f36bf 100644 --- a/resources/extruders/trex2_extruder_1.def.json +++ b/resources/extruders/trex2_extruder_1.def.json @@ -1,25 +1,23 @@ { - "version": 2, - "name": "Right Extruder", + "version": 2, + "name": "Right Extruder", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "vivedino_trex2plus", - "position": "1" - }, - - "overrides": { - "extruder_nr": { + "position": "1" + }, + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "3" }, + "machine_extruder_end_code": { "default_value": "" }, + "machine_extruder_start_code": { "default_value": "G0 X438.2" }, "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": "" - } + "material_diameter": { "default_value": 1.75 } } } \ 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 index 93feda7fa8..c1ce9ef655 100644 --- a/resources/extruders/trex_base_extruder_0.def.json +++ b/resources/extruders/trex_base_extruder_0.def.json @@ -2,15 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "vivedino_base", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } - } -} +} \ No newline at end of file diff --git a/resources/extruders/trex_extruder_0.def.json b/resources/extruders/trex_extruder_0.def.json index 7a3b5bfbdc..2f7a62c915 100644 --- a/resources/extruders/trex_extruder_0.def.json +++ b/resources/extruders/trex_extruder_0.def.json @@ -1,25 +1,23 @@ { - "version": 2, - "name": "Left Extruder", - "inherits": "fdmextruder", - "metadata": { + "version": 2, + "name": "Left Extruder", + "inherits": "fdmextruder", + "metadata": + { "machine": "vivedino_trex3", - "position": "0" - }, - - "overrides": { - "extruder_nr": { + "position": "0" + }, + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "3" }, + "machine_extruder_end_code": { "default_value": "M106 P0 S0" }, + "machine_extruder_start_code": { "default_value": "M106 P0 S[fan_speed_pwm]" }, "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" - } + "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file diff --git a/resources/extruders/trex_extruder_1.def.json b/resources/extruders/trex_extruder_1.def.json index e0500e98bf..39f1f53834 100644 --- a/resources/extruders/trex_extruder_1.def.json +++ b/resources/extruders/trex_extruder_1.def.json @@ -1,25 +1,23 @@ { - "version": 2, - "name": "Right Extruder", - "inherits": "fdmextruder", - "metadata": { + "version": 2, + "name": "Right Extruder", + "inherits": "fdmextruder", + "metadata": + { "machine": "vivedino_trex3", - "position": "1" - }, - - "overrides": { - "extruder_nr": { + "position": "1" + }, + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "3" }, + "machine_extruder_end_code": { "default_value": "M106 P1 S0" }, + "machine_extruder_start_code": { "default_value": "M106 P1 S[fan_speed_pwm]" }, "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" - } + "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file diff --git a/resources/extruders/trimaker_cosmosII_extruder.def.json b/resources/extruders/trimaker_cosmosII_extruder.def.json index 87c9394d96..c5a9debca7 100644 --- a/resources/extruders/trimaker_cosmosII_extruder.def.json +++ b/resources/extruders/trimaker_cosmosII_extruder.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "trimaker_cosmosII", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/trimaker_nebula_extruder.def.json b/resources/extruders/trimaker_nebula_extruder.def.json index 6dbd251edc..eca213de2f 100644 --- a/resources/extruders/trimaker_nebula_extruder.def.json +++ b/resources/extruders/trimaker_nebula_extruder.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "trimaker_nebula", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/tronxy_base_extruder_0.def.json b/resources/extruders/tronxy_base_extruder_0.def.json index 14acb5150a..c0089f2a57 100644 --- a/resources/extruders/tronxy_base_extruder_0.def.json +++ b/resources/extruders/tronxy_base_extruder_0.def.json @@ -2,18 +2,19 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "tronxy_x", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } - } -} +} \ No newline at end of file diff --git a/resources/extruders/tronxy_base_extruder_1.def.json b/resources/extruders/tronxy_base_extruder_1.def.json index 3a5a35cd01..f6175d8e69 100644 --- a/resources/extruders/tronxy_base_extruder_1.def.json +++ b/resources/extruders/tronxy_base_extruder_1.def.json @@ -2,18 +2,19 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "tronxy_x", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } - } -} +} \ No newline at end of file diff --git a/resources/extruders/two_trees_base_extruder_0.def.json b/resources/extruders/two_trees_base_extruder_0.def.json index d8a810dedc..81100bcf1c 100644 --- a/resources/extruders/two_trees_base_extruder_0.def.json +++ b/resources/extruders/two_trees_base_extruder_0.def.json @@ -2,15 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "two_trees_base", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } - } -} +} \ No newline at end of file diff --git a/resources/extruders/ubuild-3d_mr_bot_280_extruder_0.def.json b/resources/extruders/ubuild-3d_mr_bot_280_extruder_0.def.json index 749a5ed77d..8c4462d72f 100644 --- a/resources/extruders/ubuild-3d_mr_bot_280_extruder_0.def.json +++ b/resources/extruders/ubuild-3d_mr_bot_280_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ubuild-3d_mr_bot_280", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ultimaker2_extended_extruder_0.def.json b/resources/extruders/ultimaker2_extended_extruder_0.def.json index cc7306a393..d44449ee3a 100644 --- a/resources/extruders/ultimaker2_extended_extruder_0.def.json +++ b/resources/extruders/ultimaker2_extended_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker2_extended", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 2.85 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ultimaker2_extended_plus_extruder_0.def.json b/resources/extruders/ultimaker2_extended_plus_extruder_0.def.json index 337c120097..fa4a98ee5b 100644 --- a/resources/extruders/ultimaker2_extended_plus_extruder_0.def.json +++ b/resources/extruders/ultimaker2_extended_plus_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker2_extended_plus", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 2.85 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ultimaker2_extruder_0.def.json b/resources/extruders/ultimaker2_extruder_0.def.json index 64ac8698f1..17d0d425df 100644 --- a/resources/extruders/ultimaker2_extruder_0.def.json +++ b/resources/extruders/ultimaker2_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker2", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 2.85 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ultimaker2_go_extruder_0.def.json b/resources/extruders/ultimaker2_go_extruder_0.def.json index 5ddcfbd551..7f7726585f 100644 --- a/resources/extruders/ultimaker2_go_extruder_0.def.json +++ b/resources/extruders/ultimaker2_go_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker2_go", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 2.85 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ultimaker2_plus_connect_extruder_0.def.json b/resources/extruders/ultimaker2_plus_connect_extruder_0.def.json index 871fdd3645..0b74aae019 100644 --- a/resources/extruders/ultimaker2_plus_connect_extruder_0.def.json +++ b/resources/extruders/ultimaker2_plus_connect_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker2_plus_connect", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 2.85 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ultimaker2_plus_extruder_0.def.json b/resources/extruders/ultimaker2_plus_extruder_0.def.json index abf36c0b08..3fec85805e 100644 --- a/resources/extruders/ultimaker2_plus_extruder_0.def.json +++ b/resources/extruders/ultimaker2_plus_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker2_plus", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 2.85 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ultimaker3_extended_extruder_left.def.json b/resources/extruders/ultimaker3_extended_extruder_left.def.json index fbc49a1f32..2f1d8941a7 100644 --- a/resources/extruders/ultimaker3_extended_extruder_left.def.json +++ b/resources/extruders/ultimaker3_extended_extruder_left.def.json @@ -2,29 +2,30 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker3_extended", "position": "0", "quality_definition": "ultimaker3_extruder_left" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - - "machine_extruder_start_pos_abs": { "default_value": true }, - "machine_extruder_start_pos_x": { "default_value": 213 }, - "machine_extruder_start_pos_y": { "default_value": 207 }, + "extruder_prime_pos_x": { "default_value": 9 }, + "extruder_prime_pos_y": { "default_value": 6 }, + "extruder_prime_pos_z": { "default_value": 2 }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "default_value": 213 }, "machine_extruder_end_pos_y": { "default_value": 207 }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "default_value": 213 }, + "machine_extruder_start_pos_y": { "default_value": 207 }, "machine_nozzle_head_distance": { "default_value": 2.7 }, - "extruder_prime_pos_x": { "default_value": 9 }, - "extruder_prime_pos_y": { "default_value": 6 }, - "extruder_prime_pos_z": { "default_value": 2 } + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ultimaker3_extended_extruder_right.def.json b/resources/extruders/ultimaker3_extended_extruder_right.def.json index fbe6bcc878..9bff5cac63 100644 --- a/resources/extruders/ultimaker3_extended_extruder_right.def.json +++ b/resources/extruders/ultimaker3_extended_extruder_right.def.json @@ -2,29 +2,30 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker3_extended", "position": "1", "quality_definition": "ultimaker3_extruder_right" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 18 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - - "machine_extruder_start_pos_abs": { "default_value": true }, - "machine_extruder_start_pos_x": { "default_value": 213 }, - "machine_extruder_start_pos_y": { "default_value": 189 }, + "extruder_prime_pos_x": { "default_value": 222 }, + "extruder_prime_pos_y": { "default_value": 6 }, + "extruder_prime_pos_z": { "default_value": 2 }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "default_value": 213 }, "machine_extruder_end_pos_y": { "default_value": 189 }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "default_value": 213 }, + "machine_extruder_start_pos_y": { "default_value": 189 }, "machine_nozzle_head_distance": { "default_value": 4.2 }, - "extruder_prime_pos_x": { "default_value": 222 }, - "extruder_prime_pos_y": { "default_value": 6 }, - "extruder_prime_pos_z": { "default_value": 2 } + "machine_nozzle_offset_x": { "default_value": 18 }, + "machine_nozzle_offset_y": { "default_value": 0 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ultimaker3_extruder_left.def.json b/resources/extruders/ultimaker3_extruder_left.def.json index b18e2decfa..4699884c85 100644 --- a/resources/extruders/ultimaker3_extruder_left.def.json +++ b/resources/extruders/ultimaker3_extruder_left.def.json @@ -2,29 +2,30 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker3", "position": "0", "quality_definition": "ultimaker3_extruder_left" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - - "machine_extruder_start_pos_abs": { "default_value": true }, - "machine_extruder_start_pos_x": { "default_value": 213 }, - "machine_extruder_start_pos_y": { "default_value": 207 }, + "extruder_prime_pos_x": { "default_value": 9 }, + "extruder_prime_pos_y": { "default_value": 6 }, + "extruder_prime_pos_z": { "default_value": 2 }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "default_value": 213 }, "machine_extruder_end_pos_y": { "default_value": 207 }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "default_value": 213 }, + "machine_extruder_start_pos_y": { "default_value": 207 }, "machine_nozzle_head_distance": { "default_value": 2.7 }, - "extruder_prime_pos_x": { "default_value": 9 }, - "extruder_prime_pos_y": { "default_value": 6 }, - "extruder_prime_pos_z": { "default_value": 2 } + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ultimaker3_extruder_right.def.json b/resources/extruders/ultimaker3_extruder_right.def.json index 4753fde489..86afcf1529 100644 --- a/resources/extruders/ultimaker3_extruder_right.def.json +++ b/resources/extruders/ultimaker3_extruder_right.def.json @@ -2,29 +2,30 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker3", "position": "1", "quality_definition": "ultimaker3_extruder_right" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 18 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - - "machine_extruder_start_pos_abs": { "default_value": true }, - "machine_extruder_start_pos_x": { "default_value": 213 }, - "machine_extruder_start_pos_y": { "default_value": 189 }, + "extruder_prime_pos_x": { "default_value": 222 }, + "extruder_prime_pos_y": { "default_value": 6 }, + "extruder_prime_pos_z": { "default_value": 2 }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "default_value": 213 }, "machine_extruder_end_pos_y": { "default_value": 189 }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "default_value": 213 }, + "machine_extruder_start_pos_y": { "default_value": 189 }, "machine_nozzle_head_distance": { "default_value": 4.2 }, - "extruder_prime_pos_x": { "default_value": 222 }, - "extruder_prime_pos_y": { "default_value": 6 }, - "extruder_prime_pos_z": { "default_value": 2 } + "machine_nozzle_offset_x": { "default_value": 18 }, + "machine_nozzle_offset_y": { "default_value": 0 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ultimaker_original_dual_1st.def.json b/resources/extruders/ultimaker_original_dual_1st.def.json index acc8168d94..9c92b5bea5 100644 --- a/resources/extruders/ultimaker_original_dual_1st.def.json +++ b/resources/extruders/ultimaker_original_dual_1st.def.json @@ -2,25 +2,26 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker_original_dual", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" } + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ultimaker_original_dual_2nd.def.json b/resources/extruders/ultimaker_original_dual_2nd.def.json index 7907571e66..8596555e28 100644 --- a/resources/extruders/ultimaker_original_dual_2nd.def.json +++ b/resources/extruders/ultimaker_original_dual_2nd.def.json @@ -2,25 +2,26 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker_original_dual", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 21.6 }, - "machine_nozzle_size": { "default_value": 0.4 }, - + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" } + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 21.6 }, + "machine_nozzle_size": { "default_value": 0.4 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ultimaker_original_extruder_0.def.json b/resources/extruders/ultimaker_original_extruder_0.def.json index 30df96df58..5f71313557 100644 --- a/resources/extruders/ultimaker_original_extruder_0.def.json +++ b/resources/extruders/ultimaker_original_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker_original", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 2.85 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ultimaker_original_plus_extruder_0.def.json b/resources/extruders/ultimaker_original_plus_extruder_0.def.json index fec40e93a9..f195850658 100644 --- a/resources/extruders/ultimaker_original_plus_extruder_0.def.json +++ b/resources/extruders/ultimaker_original_plus_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker_original_plus", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 2.85 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ultimaker_s3_extruder_left.def.json b/resources/extruders/ultimaker_s3_extruder_left.def.json index 7af6f7d0dc..3926a260ff 100644 --- a/resources/extruders/ultimaker_s3_extruder_left.def.json +++ b/resources/extruders/ultimaker_s3_extruder_left.def.json @@ -2,28 +2,29 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker_s3", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - - "machine_extruder_start_pos_abs": { "default_value": true }, - "machine_extruder_start_pos_x": { "default_value": 180 }, - "machine_extruder_start_pos_y": { "default_value": 180 }, + "extruder_prime_pos_x": { "default_value": -3 }, + "extruder_prime_pos_y": { "default_value": 6 }, + "extruder_prime_pos_z": { "default_value": 2 }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "default_value": 180 }, "machine_extruder_end_pos_y": { "default_value": 180 }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "default_value": 180 }, + "machine_extruder_start_pos_y": { "default_value": 180 }, "machine_nozzle_head_distance": { "default_value": 2.7 }, - "extruder_prime_pos_x": { "default_value": -3 }, - "extruder_prime_pos_y": { "default_value": 6 }, - "extruder_prime_pos_z": { "default_value": 2 } + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ultimaker_s3_extruder_right.def.json b/resources/extruders/ultimaker_s3_extruder_right.def.json index 7199710327..3749e94bb9 100644 --- a/resources/extruders/ultimaker_s3_extruder_right.def.json +++ b/resources/extruders/ultimaker_s3_extruder_right.def.json @@ -2,28 +2,29 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker_s3", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 22 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - - "machine_extruder_start_pos_abs": { "default_value": true }, - "machine_extruder_start_pos_x": { "default_value": 180 }, - "machine_extruder_start_pos_y": { "default_value": 180 }, + "extruder_prime_pos_x": { "value": "machine_width + 3" }, + "extruder_prime_pos_y": { "default_value": 6 }, + "extruder_prime_pos_z": { "default_value": 2 }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "default_value": 180 }, "machine_extruder_end_pos_y": { "default_value": 180 }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "default_value": 180 }, + "machine_extruder_start_pos_y": { "default_value": 180 }, "machine_nozzle_head_distance": { "default_value": 4.2 }, - "extruder_prime_pos_x": { "value": "machine_width + 3" }, - "extruder_prime_pos_y": { "default_value": 6 }, - "extruder_prime_pos_z": { "default_value": 2 } + "machine_nozzle_offset_x": { "default_value": 22 }, + "machine_nozzle_offset_y": { "default_value": 0 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ultimaker_s5_extruder_left.def.json b/resources/extruders/ultimaker_s5_extruder_left.def.json index 24de85e9cc..00d7bbabb5 100644 --- a/resources/extruders/ultimaker_s5_extruder_left.def.json +++ b/resources/extruders/ultimaker_s5_extruder_left.def.json @@ -2,28 +2,29 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker_s5", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - - "machine_extruder_start_pos_abs": { "default_value": true }, - "machine_extruder_start_pos_x": { "default_value": 330 }, - "machine_extruder_start_pos_y": { "default_value": 237 }, + "extruder_prime_pos_x": { "default_value": -3 }, + "extruder_prime_pos_y": { "default_value": 6 }, + "extruder_prime_pos_z": { "default_value": 2 }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "default_value": 330 }, "machine_extruder_end_pos_y": { "default_value": 237 }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "default_value": 330 }, + "machine_extruder_start_pos_y": { "default_value": 237 }, "machine_nozzle_head_distance": { "default_value": 2.7 }, - "extruder_prime_pos_x": { "default_value": -3 }, - "extruder_prime_pos_y": { "default_value": 6 }, - "extruder_prime_pos_z": { "default_value": 2 } + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ultimaker_s5_extruder_right.def.json b/resources/extruders/ultimaker_s5_extruder_right.def.json index 1e0ac3eace..ba5ec99378 100644 --- a/resources/extruders/ultimaker_s5_extruder_right.def.json +++ b/resources/extruders/ultimaker_s5_extruder_right.def.json @@ -2,28 +2,29 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker_s5", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 22 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - - "machine_extruder_start_pos_abs": { "default_value": true }, - "machine_extruder_start_pos_x": { "default_value": 330 }, - "machine_extruder_start_pos_y": { "default_value": 219 }, + "extruder_prime_pos_x": { "default_value": 333 }, + "extruder_prime_pos_y": { "default_value": 6 }, + "extruder_prime_pos_z": { "default_value": 2 }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "default_value": 330 }, "machine_extruder_end_pos_y": { "default_value": 219 }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "default_value": 330 }, + "machine_extruder_start_pos_y": { "default_value": 219 }, "machine_nozzle_head_distance": { "default_value": 4.2 }, - "extruder_prime_pos_x": { "default_value": 333 }, - "extruder_prime_pos_y": { "default_value": 6 }, - "extruder_prime_pos_z": { "default_value": 2 } + "machine_nozzle_offset_x": { "default_value": 22 }, + "machine_nozzle_offset_y": { "default_value": 0 } } -} +} \ No newline at end of file diff --git a/resources/extruders/uni_extruder_1st.def.json b/resources/extruders/uni_extruder_1st.def.json index d11fc9d60d..51d7345d0c 100644 --- a/resources/extruders/uni_extruder_1st.def.json +++ b/resources/extruders/uni_extruder_1st.def.json @@ -2,24 +2,23 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { - "machine": "uni_base", + "metadata": + { + "machine": "uni_base", "position": "0" }, - - "overrides": { - "extruder_nr": { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, + "overrides": + { + "extruder_nr": + { + "default_value": 0, + "maximum_value": "1" + }, + "machine_extruder_end_code": { "default_value": ";G92 E0 ;reset extruder distance\n;G1 F800 E-5 ;short retract\n;G1 F2400 X5 Y5 ;move near prime tower\n;G1 F2000 E-93 ;long retract for filament removal\n;G92 E0 ;reset extruder distance\n;G90 ;absolute coordinate\n;\n" }, + "machine_extruder_start_code": { "default_value": ";T0 ;switch to extruder 1\n;G92 E0 ;reset extruder distance\n;G1 F2000 E93 ;load filament\n;G92 E0 ;reset extruder distance\n;M104 S{material_print_temperature}\n;\n" }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_extruder_start_code": - { - "default_value": ";T0 ;switch to extruder 1\n;G92 E0 ;reset extruder distance\n;G1 F2000 E93 ;load filament\n;G92 E0 ;reset extruder distance\n;M104 S{material_print_temperature}\n;\n" - }, - "machine_extruder_end_code": - { - "default_value": ";G92 E0 ;reset extruder distance\n;G1 F800 E-5 ;short retract\n;G1 F2400 X5 Y5 ;move near prime tower\n;G1 F2000 E-93 ;long retract for filament removal\n;G92 E0 ;reset extruder distance\n;G90 ;absolute coordinate\n;\n" - } + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/uni_extruder_2nd.def.json b/resources/extruders/uni_extruder_2nd.def.json index 2fc2f054ab..ce08041175 100644 --- a/resources/extruders/uni_extruder_2nd.def.json +++ b/resources/extruders/uni_extruder_2nd.def.json @@ -2,24 +2,23 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { - "machine": "uni_base", + "metadata": + { + "machine": "uni_base", "position": "1" }, - - "overrides": { - "extruder_nr": { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, + "overrides": + { + "extruder_nr": + { + "default_value": 1, + "maximum_value": "1" + }, + "machine_extruder_end_code": { "default_value": ";G92 E0 ;reset extruder distance\n;G1 F800 E-5 ;short retract\n;G1 F2400 X5 Y5 ;move near prime tower\n;G1 F2000 E-93 ;long retract for filament removal\n;G92 E0 ;reset extruder distance\n;G90 ;absolute coordinate\n;\n" }, + "machine_extruder_start_code": { "default_value": ";T1 ;switch to extruder 2\n;G92 E0 ;reset extruder distance\n;G1 F2000 E93 ;load filament\n;G92 E0 ;reset extruder distance\n;M104 S{material_print_temperature}\n;\n" }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_extruder_start_code": - { - "default_value": ";T1 ;switch to extruder 2\n;G92 E0 ;reset extruder distance\n;G1 F2000 E93 ;load filament\n;G92 E0 ;reset extruder distance\n;M104 S{material_print_temperature}\n;\n" - }, - "machine_extruder_end_code": - { - "default_value": ";G92 E0 ;reset extruder distance\n;G1 F800 E-5 ;short retract\n;G1 F2400 X5 Y5 ;move near prime tower\n;G1 F2000 E-93 ;long retract for filament removal\n;G92 E0 ;reset extruder distance\n;G90 ;absolute coordinate\n;\n" - } + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/uni_print_3d_extruder_0.def.json b/resources/extruders/uni_print_3d_extruder_0.def.json index 747fb9e020..9486782926 100644 --- a/resources/extruders/uni_print_3d_extruder_0.def.json +++ b/resources/extruders/uni_print_3d_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "uni_print_3d", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/uniqbot_one_extruder_0.def.json b/resources/extruders/uniqbot_one_extruder_0.def.json index 0a8982559d..772c0b648b 100644 --- a/resources/extruders/uniqbot_one_extruder_0.def.json +++ b/resources/extruders/uniqbot_one_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "uniqbot_one", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.5 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/vertex_delta_k8800_extruder_0.def.json b/resources/extruders/vertex_delta_k8800_extruder_0.def.json index 05a010222f..55f0c7881c 100644 --- a/resources/extruders/vertex_delta_k8800_extruder_0.def.json +++ b/resources/extruders/vertex_delta_k8800_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "vertex_delta_k8800", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.35 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/vertex_k8400_dual_1st.def.json b/resources/extruders/vertex_k8400_dual_1st.def.json index 947cfbc7d8..488f2477eb 100644 --- a/resources/extruders/vertex_k8400_dual_1st.def.json +++ b/resources/extruders/vertex_k8400_dual_1st.def.json @@ -2,26 +2,27 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "vertex_k8400_dual", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 23.7 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_nozzle_size": { "default_value": 0.35 }, - "material_diameter": { "default_value": 1.75 }, - + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" } + "machine_nozzle_offset_x": { "default_value": 23.7 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.35 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/vertex_k8400_dual_2nd.def.json b/resources/extruders/vertex_k8400_dual_2nd.def.json index e606e46337..44c7aa49ba 100644 --- a/resources/extruders/vertex_k8400_dual_2nd.def.json +++ b/resources/extruders/vertex_k8400_dual_2nd.def.json @@ -2,26 +2,27 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "vertex_k8400_dual", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_nozzle_size": { "default_value": 0.35 }, - "material_diameter": { "default_value": 1.75 }, - + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, - "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" } + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.35 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/vertex_k8400_extruder_0.def.json b/resources/extruders/vertex_k8400_extruder_0.def.json index e0304f57bd..62fd1a417c 100644 --- a/resources/extruders/vertex_k8400_extruder_0.def.json +++ b/resources/extruders/vertex_k8400_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "vertex_k8400", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.35 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/vertex_nano_k8600_extruder_0.def.json b/resources/extruders/vertex_nano_k8600_extruder_0.def.json index cfb2d11217..61c1bf1106 100644 --- a/resources/extruders/vertex_nano_k8600_extruder_0.def.json +++ b/resources/extruders/vertex_nano_k8600_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "vertex_nano_k8600", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.35 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/voron2_extruder_0.def.json b/resources/extruders/voron2_extruder_0.def.json index 5559cdf620..671c58665e 100644 --- a/resources/extruders/voron2_extruder_0.def.json +++ b/resources/extruders/voron2_extruder_0.def.json @@ -7,10 +7,13 @@ "machine": "voron2_base", "position": "0" }, - "overrides": { - "extruder_nr": { "default_value": 0, "maximum_value": 1 }, - "material_diameter": { "default_value": 1.75 } + "extruder_nr": + { + "default_value": 0, + "maximum_value": 1 + }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/vzbot_extruder_0.def.json b/resources/extruders/vzbot_extruder_0.def.json index 8b1f9abc74..2b8154733f 100644 --- a/resources/extruders/vzbot_extruder_0.def.json +++ b/resources/extruders/vzbot_extruder_0.def.json @@ -7,10 +7,10 @@ "machine": "vzbot_base", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/wanhao_d4s_extruder_0.def.json b/resources/extruders/wanhao_d4s_extruder_0.def.json index bd6023faf4..ce2f1298ef 100644 --- a/resources/extruders/wanhao_d4s_extruder_0.def.json +++ b/resources/extruders/wanhao_d4s_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "wanhao_d4s", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/wanhao_d6_extruder_0.def.json b/resources/extruders/wanhao_d6_extruder_0.def.json index 093546eabf..2f88be41a0 100644 --- a/resources/extruders/wanhao_d6_extruder_0.def.json +++ b/resources/extruders/wanhao_d6_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "wanhao_d6", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/wanhao_d6_plus_extruder_0.def.json b/resources/extruders/wanhao_d6_plus_extruder_0.def.json index acc5b66072..4f000afd9f 100644 --- a/resources/extruders/wanhao_d6_plus_extruder_0.def.json +++ b/resources/extruders/wanhao_d6_plus_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "wanhao_d6_plus", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/wanhao_d9_extruder_0.def.json b/resources/extruders/wanhao_d9_extruder_0.def.json index 40fcf422f5..de22cb6e4b 100644 --- a/resources/extruders/wanhao_d9_extruder_0.def.json +++ b/resources/extruders/wanhao_d9_extruder_0.def.json @@ -1,15 +1,16 @@ -{ - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": { - "machine": "wanhao_d9", - "position": "0" - }, - - "overrides": { - "extruder_nr": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - } -} +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "wanhao_d9", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/wanhao_duplicator5S_extruder_0.def.json b/resources/extruders/wanhao_duplicator5S_extruder_0.def.json index 7274d5117e..7a3165bac2 100644 --- a/resources/extruders/wanhao_duplicator5S_extruder_0.def.json +++ b/resources/extruders/wanhao_duplicator5S_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "wanhao_duplicator5S", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 3 } } -} +} \ No newline at end of file diff --git a/resources/extruders/wanhao_duplicator5Smini_extruder_0.def.json b/resources/extruders/wanhao_duplicator5Smini_extruder_0.def.json index 3479c94e35..0829af3301 100644 --- a/resources/extruders/wanhao_duplicator5Smini_extruder_0.def.json +++ b/resources/extruders/wanhao_duplicator5Smini_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "wanhao_duplicator5Smini", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 3 } } -} +} \ No newline at end of file diff --git a/resources/extruders/wanhao_i3_extruder_0.def.json b/resources/extruders/wanhao_i3_extruder_0.def.json index 387a456ff2..13cb72dc49 100644 --- a/resources/extruders/wanhao_i3_extruder_0.def.json +++ b/resources/extruders/wanhao_i3_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "wanhao_i3", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/wanhao_i3mini_extruder_0.def.json b/resources/extruders/wanhao_i3mini_extruder_0.def.json index 2d52f0d126..8e280610dd 100644 --- a/resources/extruders/wanhao_i3mini_extruder_0.def.json +++ b/resources/extruders/wanhao_i3mini_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "wanhao_i3mini", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/wanhao_i3plus_extruder_0.def.json b/resources/extruders/wanhao_i3plus_extruder_0.def.json index 103e3b9335..5ecec8b84e 100644 --- a/resources/extruders/wanhao_i3plus_extruder_0.def.json +++ b/resources/extruders/wanhao_i3plus_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "wanhao_i3plus", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/weedo_x40_extruder_left_0.def.json b/resources/extruders/weedo_x40_extruder_left_0.def.json index 955e98f0de..b28c4b1d84 100644 --- a/resources/extruders/weedo_x40_extruder_left_0.def.json +++ b/resources/extruders/weedo_x40_extruder_left_0.def.json @@ -2,21 +2,23 @@ "version": 2, "name": "Extruder Left", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "weedo_x40", "position": "0", "quality_definition": "weedo_x40_extruder_left_0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, + "machine_extruder_start_code": { "default_value": "; left extruder start code\n" }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_extruder_start_code": { "default_value": "; left extruder start code\n"} + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/weedo_x40_extruder_right_0.def.json b/resources/extruders/weedo_x40_extruder_right_0.def.json index 1a1f9e591d..537391c9c8 100644 --- a/resources/extruders/weedo_x40_extruder_right_0.def.json +++ b/resources/extruders/weedo_x40_extruder_right_0.def.json @@ -2,21 +2,23 @@ "version": 2, "name": "Extruder Right", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "weedo_x40", "position": "1", "quality_definition": "weedo_x40_extruder_right_0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, + "machine_extruder_start_code": { "default_value": "; right extruder start code\n" }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_extruder_start_code": { "default_value": "; right extruder start code\n"} + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/winbo_dragonl4_extruder.def.json b/resources/extruders/winbo_dragonl4_extruder.def.json index 37a08c8d08..2de6363c29 100644 --- a/resources/extruders/winbo_dragonl4_extruder.def.json +++ b/resources/extruders/winbo_dragonl4_extruder.def.json @@ -2,19 +2,21 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "winbo_dragonl4", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "2" }, - "material_diameter": { "default_value": 3.0 }, - "machine_nozzle_size": { "default_value": 0.8 }, "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 } + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.8 }, + "material_diameter": { "default_value": 3.0 } } -} +} \ No newline at end of file diff --git a/resources/extruders/winbo_mini2_extruder.def.json b/resources/extruders/winbo_mini2_extruder.def.json index a57ec28109..38511b454b 100644 --- a/resources/extruders/winbo_mini2_extruder.def.json +++ b/resources/extruders/winbo_mini2_extruder.def.json @@ -2,19 +2,21 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "winbo_mini2", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "2" }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_size": { "default_value": 0.4 }, "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 } + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/winbo_superhelper105_extruder.def.json b/resources/extruders/winbo_superhelper105_extruder.def.json index a974317937..0ad31e8ae8 100644 --- a/resources/extruders/winbo_superhelper105_extruder.def.json +++ b/resources/extruders/winbo_superhelper105_extruder.def.json @@ -2,19 +2,21 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "winbo_superhelper105", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "2" }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_size": { "default_value": 0.4 }, "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 } + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/winbo_superhelper155_extruder.def.json b/resources/extruders/winbo_superhelper155_extruder.def.json index 6d83689bf4..28ecef5fb4 100644 --- a/resources/extruders/winbo_superhelper155_extruder.def.json +++ b/resources/extruders/winbo_superhelper155_extruder.def.json @@ -2,19 +2,21 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "winbo_superhelper155", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "2" }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_size": { "default_value": 0.4 }, "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 } + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/xyzprinting_base_extruder_0.def.json b/resources/extruders/xyzprinting_base_extruder_0.def.json index 0a04c63103..1bfbf79680 100644 --- a/resources/extruders/xyzprinting_base_extruder_0.def.json +++ b/resources/extruders/xyzprinting_base_extruder_0.def.json @@ -2,15 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "xyzprinting_base", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } - } -} +} \ No newline at end of file diff --git a/resources/extruders/xyzprinting_da_vinci_1p0_pro_extruder_0.def.json b/resources/extruders/xyzprinting_da_vinci_1p0_pro_extruder_0.def.json index 22010de7d7..8e4c0b0679 100644 --- a/resources/extruders/xyzprinting_da_vinci_1p0_pro_extruder_0.def.json +++ b/resources/extruders/xyzprinting_da_vinci_1p0_pro_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "xyzprinting_da_vinci_1p0_pro", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/xyzprinting_da_vinci_jr_1p0a_pro_extruder_0.def.json b/resources/extruders/xyzprinting_da_vinci_jr_1p0a_pro_extruder_0.def.json index 4e9d0c8ad0..9190e6c019 100644 --- a/resources/extruders/xyzprinting_da_vinci_jr_1p0a_pro_extruder_0.def.json +++ b/resources/extruders/xyzprinting_da_vinci_jr_1p0a_pro_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "xyzprinting_da_vinci_jr_1p0a_pro", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/xyzprinting_da_vinci_jr_pro_xeplus_extruder_0.def.json b/resources/extruders/xyzprinting_da_vinci_jr_pro_xeplus_extruder_0.def.json index 9ac465dda4..847342825e 100644 --- a/resources/extruders/xyzprinting_da_vinci_jr_pro_xeplus_extruder_0.def.json +++ b/resources/extruders/xyzprinting_da_vinci_jr_pro_xeplus_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "xyzprinting_da_vinci_jr_pro_xeplus", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/xyzprinting_da_vinci_jr_pro_xplus_extruder_0.def.json b/resources/extruders/xyzprinting_da_vinci_jr_pro_xplus_extruder_0.def.json index ce653eeedd..225c2fa12a 100644 --- a/resources/extruders/xyzprinting_da_vinci_jr_pro_xplus_extruder_0.def.json +++ b/resources/extruders/xyzprinting_da_vinci_jr_pro_xplus_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "xyzprinting_da_vinci_jr_pro_xplus", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/xyzprinting_da_vinci_jr_w_pro_extruder_0.def.json b/resources/extruders/xyzprinting_da_vinci_jr_w_pro_extruder_0.def.json index 6b1a23da45..fe63ffbfa7 100644 --- a/resources/extruders/xyzprinting_da_vinci_jr_w_pro_extruder_0.def.json +++ b/resources/extruders/xyzprinting_da_vinci_jr_w_pro_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "xyzprinting_da_vinci_jr_w_pro", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/xyzprinting_da_vinci_pro_evo_extruder_0.def.json b/resources/extruders/xyzprinting_da_vinci_pro_evo_extruder_0.def.json index 268a911af2..78da1dcbad 100644 --- a/resources/extruders/xyzprinting_da_vinci_pro_evo_extruder_0.def.json +++ b/resources/extruders/xyzprinting_da_vinci_pro_evo_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "xyzprinting_da_vinci_pro_evo", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/xyzprinting_da_vinci_super_extruder_0.def.json b/resources/extruders/xyzprinting_da_vinci_super_extruder_0.def.json index e414746665..61598d6199 100644 --- a/resources/extruders/xyzprinting_da_vinci_super_extruder_0.def.json +++ b/resources/extruders/xyzprinting_da_vinci_super_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "xyzprinting_da_vinci_super", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/z-bolt_extruder_0.def.json b/resources/extruders/z-bolt_extruder_0.def.json index 04c8d10cbb..ff97e20ef9 100644 --- a/resources/extruders/z-bolt_extruder_0.def.json +++ b/resources/extruders/z-bolt_extruder_0.def.json @@ -2,11 +2,9 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { - "position": "0" - }, - - "overrides": { + "metadata": { "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/zav_extruder_1.def.json b/resources/extruders/zav_extruder_1.def.json index 88c302aaf0..f8f24f7a71 100644 --- a/resources/extruders/zav_extruder_1.def.json +++ b/resources/extruders/zav_extruder_1.def.json @@ -2,24 +2,19 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "zav_base", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_code": { "default_value": ";---- Starting End G-code Extruder 1 ----\n;G92 E0 ;reset extruder distance\n;G1 F800 E-5 ;short retract\n;G1 F2400 X5 Y5 ;move near prime tower\n;G1 F2000 E-93 ;long retract for filament removal\n;G92 E0 ;reset extruder distance\n;G90 ;absolute coordinate\n;---- Ending End G-code Extruder 1 ----" }, + "machine_extruder_start_code": { "default_value": ";---- Starting Start G-code Extruder 1 ----\n;T0 ;switch to extruder 1\n;G92 E0 ;reset extruder distance\n;G1 F2000 E93 ;load filament\n;G92 E0 ;reset extruder distance\n;M104 S{material_print_temperature}\n;---- Ending Start G-code Extruder 1 ----" }, "machine_nozzle_offset_x": { "default_value": 0.0 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_extruder_start_code": - { - "default_value": ";---- Starting Start G-code Extruder 1 ----\n;T0 ;switch to extruder 1\n;G92 E0 ;reset extruder distance\n;G1 F2000 E93 ;load filament\n;G92 E0 ;reset extruder distance\n;M104 S{material_print_temperature}\n;---- Ending Start G-code Extruder 1 ----" - }, - "machine_extruder_end_code": - { - "default_value": ";---- Starting End G-code Extruder 1 ----\n;G92 E0 ;reset extruder distance\n;G1 F800 E-5 ;short retract\n;G1 F2400 X5 Y5 ;move near prime tower\n;G1 F2000 E-93 ;long retract for filament removal\n;G92 E0 ;reset extruder distance\n;G90 ;absolute coordinate\n;---- Ending End G-code Extruder 1 ----" - } + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/zav_extruder_2.def.json b/resources/extruders/zav_extruder_2.def.json index f2b418f62c..1c848a7c2c 100644 --- a/resources/extruders/zav_extruder_2.def.json +++ b/resources/extruders/zav_extruder_2.def.json @@ -2,24 +2,19 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "zav_base", "position": "1" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 1 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_code": { "default_value": ";---- Starting End G-code Extruder 2 ----\nG92 E0 ;reset extruder distance\nG1 F800 E-5 ;short retract\nG1 F2400 X5 Y5 ;move near prime tower\nG1 F2000 E-93 ;long retract for filament removal\nG92 E0 ;reset extruder distance\nG90 ;absolute coordinate\n;---- Ending End G-code Extruder 2 ----" }, + "machine_extruder_start_code": { "default_value": ";---- Starting Start G-code Extruder 2 ----\nT1 ;switch to extruder 2\nG92 E0 ;reset extruder distance\nG1 F2000 E93 ;load filament\nG92 E0 ;reset extruder distance\nM104 S{material_print_temperature}\n;---- Ending Start G-code Extruder 2 ----" }, "machine_nozzle_offset_x": { "default_value": 17.7 }, "machine_nozzle_offset_y": { "default_value": 0.0 }, - "machine_extruder_start_code": - { - "default_value": ";---- Starting Start G-code Extruder 2 ----\nT1 ;switch to extruder 2\nG92 E0 ;reset extruder distance\nG1 F2000 E93 ;load filament\nG92 E0 ;reset extruder distance\nM104 S{material_print_temperature}\n;---- Ending Start G-code Extruder 2 ----" - }, - "machine_extruder_end_code": - { - "default_value": ";---- Starting End G-code Extruder 2 ----\nG92 E0 ;reset extruder distance\nG1 F800 E-5 ;short retract\nG1 F2400 X5 Y5 ;move near prime tower\nG1 F2000 E-93 ;long retract for filament removal\nG92 E0 ;reset extruder distance\nG90 ;absolute coordinate\n;---- Ending End G-code Extruder 2 ----" - } + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/zone3d_printer_extruder_0.def.json b/resources/extruders/zone3d_printer_extruder_0.def.json index fb8f40d3e2..36535d0ee7 100644 --- a/resources/extruders/zone3d_printer_extruder_0.def.json +++ b/resources/extruders/zone3d_printer_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "zone3d_printer", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/zyyx_agile_extruder_0.def.json b/resources/extruders/zyyx_agile_extruder_0.def.json index c01ffb59f3..a34d020faa 100644 --- a/resources/extruders/zyyx_agile_extruder_0.def.json +++ b/resources/extruders/zyyx_agile_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "zyyx_agile", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_accurate_B.inst.cfg b/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_accurate_B.inst.cfg index fc92d04fca..db9b5f5f2b 100644 --- a/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_accurate_B.inst.cfg +++ b/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_accurate_B.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Accurate definition = deltacomb_base +name = Accurate +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = D010 intent_category = engineering material = generic_abs +quality_type = D010 +setting_version = 20 +type = intent variant = DBE 0.40mm [values] jerk_wall = 5 jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -wall_thickness = =line_width * 3 top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file +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/deltacomb/ABS/deltacomb_DBE0.40_ABS_accurate_C.inst.cfg b/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_accurate_C.inst.cfg index 0d9be05d37..3b97f03969 100644 --- a/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_accurate_C.inst.cfg +++ b/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_accurate_C.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Accurate definition = deltacomb_base +name = Accurate +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = D015 intent_category = engineering material = generic_abs +quality_type = D015 +setting_version = 20 +type = intent variant = DBE 0.40mm [values] jerk_wall = 5 jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -wall_thickness = =line_width * 3 top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file +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/deltacomb/ABS/deltacomb_DBE0.40_ABS_accurate_D.inst.cfg b/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_accurate_D.inst.cfg index bf5a6e7d55..618f3401fa 100644 --- a/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_accurate_D.inst.cfg +++ b/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_accurate_D.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Accurate definition = deltacomb_base +name = Accurate +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = D020 intent_category = engineering material = generic_abs +quality_type = D020 +setting_version = 20 +type = intent variant = DBE 0.40mm [values] jerk_wall = 5 jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -wall_thickness = =line_width * 3 top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file +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/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_D.inst.cfg b/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_D.inst.cfg index 9ed2e3b18e..1b318522b0 100644 --- a/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_D.inst.cfg +++ b/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_D.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Quick definition = deltacomb_base +name = Quick +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = D020 intent_category = quick material = generic_abs +quality_type = D020 +setting_version = 20 +type = intent variant = DBE 0.40mm [values] -speed_infill = =speed_print -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 * 2 -infill_sparse_density = 15 infill_line_width = =line_width +infill_sparse_density = 15 jerk_print = 30 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall line_width = =machine_nozzle_size -wall_line_width_x = =line_width \ No newline at end of file +speed_infill = =speed_print +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_line_width_x = =line_width +wall_thickness = =line_width * 2 + diff --git a/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_E.inst.cfg b/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_E.inst.cfg index 3589432452..d333436c66 100644 --- a/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_E.inst.cfg +++ b/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_E.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Quick definition = deltacomb_base +name = Quick +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = D030 intent_category = quick material = generic_abs +quality_type = D030 +setting_version = 20 +type = intent variant = DBE 0.40mm [values] -speed_infill = =speed_print -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 * 2 -infill_sparse_density = 15 infill_line_width = =line_width +infill_sparse_density = 15 jerk_print = 30 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall line_width = =machine_nozzle_size -wall_line_width_x = =line_width \ No newline at end of file +speed_infill = =speed_print +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_line_width_x = =line_width +wall_thickness = =line_width * 2 + diff --git a/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_accurate_B.inst.cfg b/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_accurate_B.inst.cfg index 0588da5673..5960de9d7d 100644 --- a/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_accurate_B.inst.cfg +++ b/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_accurate_B.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Accurate definition = deltacomb_base +name = Accurate +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = D010 intent_category = engineering material = generic_abs +quality_type = D010 +setting_version = 20 +type = intent variant = FBE 0.40mm [values] jerk_wall = 5 jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -wall_thickness = =line_width * 3 top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file +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/deltacomb/ABS/deltacomb_FBE0.40_ABS_accurate_C.inst.cfg b/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_accurate_C.inst.cfg index 2185ffbfad..e6bb708433 100644 --- a/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_accurate_C.inst.cfg +++ b/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_accurate_C.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Accurate definition = deltacomb_base +name = Accurate +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = D015 intent_category = engineering material = generic_abs +quality_type = D015 +setting_version = 20 +type = intent variant = FBE 0.40mm [values] jerk_wall = 5 jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -wall_thickness = =line_width * 3 top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file +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/deltacomb/ABS/deltacomb_FBE0.40_ABS_accurate_D.inst.cfg b/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_accurate_D.inst.cfg index 2edfe7018a..d7430a3896 100644 --- a/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_accurate_D.inst.cfg +++ b/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_accurate_D.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Accurate definition = deltacomb_base +name = Accurate +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = D020 intent_category = engineering material = generic_abs +quality_type = D020 +setting_version = 20 +type = intent variant = FBE 0.40mm [values] jerk_wall = 5 jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -wall_thickness = =line_width * 3 top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file +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/deltacomb/ABS/deltacomb_FBE0.40_ABS_quick_D.inst.cfg b/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_quick_D.inst.cfg index 790f01fba7..e28678639f 100644 --- a/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_quick_D.inst.cfg +++ b/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_quick_D.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Quick definition = deltacomb_base +name = Quick +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = D020 intent_category = quick material = generic_abs +quality_type = D020 +setting_version = 20 +type = intent variant = FBE 0.40mm [values] -speed_infill = =speed_print -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 * 2 -infill_sparse_density = 15 infill_line_width = =line_width +infill_sparse_density = 15 jerk_print = 30 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall line_width = =machine_nozzle_size -wall_line_width_x = =line_width \ No newline at end of file +speed_infill = =speed_print +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_line_width_x = =line_width +wall_thickness = =line_width * 2 + diff --git a/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_quick_E.inst.cfg b/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_quick_E.inst.cfg index d5ff43e5c4..cf72ff11ae 100644 --- a/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_quick_E.inst.cfg +++ b/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_quick_E.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Quick definition = deltacomb_base +name = Quick +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = D030 intent_category = quick material = generic_abs +quality_type = D030 +setting_version = 20 +type = intent variant = FBE 0.40mm [values] -speed_infill = =speed_print -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 * 2 -infill_sparse_density = 15 infill_line_width = =line_width +infill_sparse_density = 15 jerk_print = 30 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall line_width = =machine_nozzle_size -wall_line_width_x = =line_width \ No newline at end of file +speed_infill = =speed_print +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_line_width_x = =line_width +wall_thickness = =line_width * 2 + diff --git a/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_accurate_B.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_accurate_B.inst.cfg index de228f760e..e0fa0bba51 100644 --- a/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_accurate_B.inst.cfg +++ b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_accurate_B.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Accurate definition = deltacomb_base +name = Accurate +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = D010 intent_category = engineering material = generic_petg +quality_type = D010 +setting_version = 20 +type = intent variant = DBE 0.40mm [values] jerk_wall = 5 jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -wall_thickness = =line_width * 3 top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file +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/deltacomb/PETG/deltacomb_DBE0.40_PETG_accurate_C.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_accurate_C.inst.cfg index 86529c093b..b65a777116 100644 --- a/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_accurate_C.inst.cfg +++ b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_accurate_C.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Accurate definition = deltacomb_base +name = Accurate +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = D015 intent_category = engineering material = generic_petg +quality_type = D015 +setting_version = 20 +type = intent variant = DBE 0.40mm [values] jerk_wall = 5 jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -wall_thickness = =line_width * 3 top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file +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/deltacomb/PETG/deltacomb_DBE0.40_PETG_accurate_D.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_accurate_D.inst.cfg index 482bfab89d..06118b94a6 100644 --- a/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_accurate_D.inst.cfg +++ b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_accurate_D.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Accurate definition = deltacomb_base +name = Accurate +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = D020 intent_category = engineering material = generic_petg +quality_type = D020 +setting_version = 20 +type = intent variant = DBE 0.40mm [values] jerk_wall = 5 jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -wall_thickness = =line_width * 3 top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file +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/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_C.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_C.inst.cfg index 97535eebee..8d25bb4ba7 100644 --- a/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_C.inst.cfg +++ b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_C.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Quick definition = deltacomb_base +name = Quick +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = D020 intent_category = quick material = generic_petg +quality_type = D020 +setting_version = 20 +type = intent variant = DBE 0.40mm [values] -speed_print = 75 -speed_infill = =speed_print -speed_topbottom = =speed_print -speed_wall = =speed_print -speed_wall_x = =speed_wall -top_bottom_thickness = =wall_thickness -wall_thickness = =line_width * 2 -infill_sparse_density = 15 infill_line_width = =line_width +infill_sparse_density = 15 jerk_print = 30 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall line_width = =machine_nozzle_size -wall_line_width_x = =line_width \ No newline at end of file +speed_infill = =speed_print +speed_print = 75 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_line_width_x = =line_width +wall_thickness = =line_width * 2 + diff --git a/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_D.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_D.inst.cfg index 97535eebee..8d25bb4ba7 100644 --- a/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_D.inst.cfg +++ b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_D.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Quick definition = deltacomb_base +name = Quick +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = D020 intent_category = quick material = generic_petg +quality_type = D020 +setting_version = 20 +type = intent variant = DBE 0.40mm [values] -speed_print = 75 -speed_infill = =speed_print -speed_topbottom = =speed_print -speed_wall = =speed_print -speed_wall_x = =speed_wall -top_bottom_thickness = =wall_thickness -wall_thickness = =line_width * 2 -infill_sparse_density = 15 infill_line_width = =line_width +infill_sparse_density = 15 jerk_print = 30 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall line_width = =machine_nozzle_size -wall_line_width_x = =line_width \ No newline at end of file +speed_infill = =speed_print +speed_print = 75 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_line_width_x = =line_width +wall_thickness = =line_width * 2 + diff --git a/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_E.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_E.inst.cfg index 73249ec65d..5ee1df6aa4 100644 --- a/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_E.inst.cfg +++ b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_E.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Quick definition = deltacomb_base +name = Quick +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = D030 intent_category = quick material = generic_petg +quality_type = D030 +setting_version = 20 +type = intent variant = DBE 0.40mm [values] -speed_print = 75 -speed_infill = =speed_print -speed_topbottom = =speed_print -speed_wall = =speed_print -speed_wall_x = =speed_wall -top_bottom_thickness = =wall_thickness -wall_thickness = =line_width * 2 -infill_sparse_density = 15 infill_line_width = =line_width +infill_sparse_density = 15 jerk_print = 30 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall line_width = =machine_nozzle_size -wall_line_width_x = =line_width \ No newline at end of file +speed_infill = =speed_print +speed_print = 75 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_line_width_x = =line_width +wall_thickness = =line_width * 2 + diff --git a/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_accurate_B.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_accurate_B.inst.cfg index 8526eb1bb2..eaff71cc97 100644 --- a/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_accurate_B.inst.cfg +++ b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_accurate_B.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Accurate definition = deltacomb_base +name = Accurate +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = D010 intent_category = engineering material = generic_petg +quality_type = D010 +setting_version = 20 +type = intent variant = FBE 0.40mm [values] jerk_wall = 5 jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -wall_thickness = =line_width * 3 top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file +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/deltacomb/PETG/deltacomb_FBE0.40_PETG_accurate_C.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_accurate_C.inst.cfg index b4224d74ad..d0eeafa922 100644 --- a/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_accurate_C.inst.cfg +++ b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_accurate_C.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Accurate definition = deltacomb_base +name = Accurate +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = D015 intent_category = engineering material = generic_petg +quality_type = D015 +setting_version = 20 +type = intent variant = FBE 0.40mm [values] jerk_wall = 5 jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -wall_thickness = =line_width * 3 top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file +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/deltacomb/PETG/deltacomb_FBE0.40_PETG_accurate_D.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_accurate_D.inst.cfg index 42d277ed91..1a173c93b2 100644 --- a/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_accurate_D.inst.cfg +++ b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_accurate_D.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Accurate definition = deltacomb_base +name = Accurate +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = D020 intent_category = engineering material = generic_petg +quality_type = D020 +setting_version = 20 +type = intent variant = FBE 0.40mm [values] jerk_wall = 5 jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -wall_thickness = =line_width * 3 top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file +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/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_C.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_C.inst.cfg index 050e16e423..b8333a72ab 100644 --- a/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_C.inst.cfg +++ b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_C.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Quick definition = deltacomb_base +name = Quick +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = D015 intent_category = quick material = generic_petg +quality_type = D015 +setting_version = 20 +type = intent variant = FBE 0.40mm [values] -speed_print = 75 -speed_infill = =speed_print -speed_topbottom = =speed_print -speed_wall = =speed_print -speed_wall_x = =speed_wall -top_bottom_thickness = =wall_thickness -wall_thickness = =line_width * 2 -infill_sparse_density = 15 infill_line_width = =line_width +infill_sparse_density = 15 jerk_print = 30 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall line_width = =machine_nozzle_size -wall_line_width_x = =line_width \ No newline at end of file +speed_infill = =speed_print +speed_print = 75 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_line_width_x = =line_width +wall_thickness = =line_width * 2 + diff --git a/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_D.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_D.inst.cfg index f9bee00b41..ffcaaae30a 100644 --- a/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_D.inst.cfg +++ b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_D.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Quick definition = deltacomb_base +name = Quick +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = D020 intent_category = quick material = generic_petg +quality_type = D020 +setting_version = 20 +type = intent variant = FBE 0.40mm [values] -speed_print = 75 -speed_infill = =speed_print -speed_topbottom = =speed_print -speed_wall = =speed_print -speed_wall_x = =speed_wall -top_bottom_thickness = =wall_thickness -wall_thickness = =line_width * 2 -infill_sparse_density = 15 infill_line_width = =line_width +infill_sparse_density = 15 jerk_print = 30 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall line_width = =machine_nozzle_size -wall_line_width_x = =line_width \ No newline at end of file +speed_infill = =speed_print +speed_print = 75 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_line_width_x = =line_width +wall_thickness = =line_width * 2 + diff --git a/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_E.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_E.inst.cfg index 75b57ff478..74dfd0026f 100644 --- a/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_E.inst.cfg +++ b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_E.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Quick definition = deltacomb_base +name = Quick +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = D030 intent_category = quick material = generic_petg +quality_type = D030 +setting_version = 20 +type = intent variant = FBE 0.40mm [values] -speed_print = 75 -speed_infill = =speed_print -speed_topbottom = =speed_print -speed_wall = =speed_print -speed_wall_x = =speed_wall -top_bottom_thickness = =wall_thickness -wall_thickness = =line_width * 2 -infill_sparse_density = 15 infill_line_width = =line_width +infill_sparse_density = 15 jerk_print = 30 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall line_width = =machine_nozzle_size -wall_line_width_x = =line_width \ No newline at end of file +speed_infill = =speed_print +speed_print = 75 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_line_width_x = =line_width +wall_thickness = =line_width * 2 + diff --git a/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_accurate_B.inst.cfg b/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_accurate_B.inst.cfg index 0273f3d075..1e807a6998 100644 --- a/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_accurate_B.inst.cfg +++ b/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_accurate_B.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Accurate definition = deltacomb_base +name = Accurate +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = D010 intent_category = engineering material = generic_pla +quality_type = D010 +setting_version = 20 +type = intent variant = DBE 0.40mm [values] jerk_wall = 5 jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -wall_thickness = =line_width * 3 top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file +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/deltacomb/PLA/deltacomb_DBE0.40_PLA_accurate_C.inst.cfg b/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_accurate_C.inst.cfg index 930f4f2006..d8dd05fa33 100644 --- a/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_accurate_C.inst.cfg +++ b/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_accurate_C.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Accurate definition = deltacomb_base +name = Accurate +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = D015 intent_category = engineering material = generic_pla +quality_type = D015 +setting_version = 20 +type = intent variant = DBE 0.40mm [values] jerk_wall = 5 jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -wall_thickness = =line_width * 3 top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file +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/deltacomb/PLA/deltacomb_DBE0.40_PLA_accurate_D.inst.cfg b/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_accurate_D.inst.cfg index 285d172974..25f206a944 100644 --- a/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_accurate_D.inst.cfg +++ b/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_accurate_D.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Accurate definition = deltacomb_base +name = Accurate +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = D020 intent_category = engineering material = generic_pla +quality_type = D020 +setting_version = 20 +type = intent variant = DBE 0.40mm [values] jerk_wall = 5 jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -wall_thickness = =line_width * 3 top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file +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/deltacomb/PLA/deltacomb_DBE0.40_PLA_quick_D.inst.cfg b/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_quick_D.inst.cfg index 5c998aed11..e86f7146c9 100644 --- a/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_quick_D.inst.cfg +++ b/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_quick_D.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Quick definition = deltacomb_base +name = Quick +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = D020 intent_category = quick material = generic_pla +quality_type = D020 +setting_version = 20 +type = intent variant = DBE 0.40mm [values] -speed_infill = =speed_print -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 * 2 -infill_sparse_density = 15 infill_line_width = =line_width +infill_sparse_density = 15 jerk_print = 30 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall line_width = =machine_nozzle_size -wall_line_width_x = =line_width \ No newline at end of file +speed_infill = =speed_print +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_line_width_x = =line_width +wall_thickness = =line_width * 2 + diff --git a/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_quick_E.inst.cfg b/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_quick_E.inst.cfg index 7bc35f2ddd..e9e5b9f905 100644 --- a/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_quick_E.inst.cfg +++ b/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_quick_E.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Quick definition = deltacomb_base +name = Quick +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = D030 intent_category = quick material = generic_pla +quality_type = D030 +setting_version = 20 +type = intent variant = DBE 0.40mm [values] -speed_infill = =speed_print -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 * 2 -infill_sparse_density = 15 infill_line_width = =line_width +infill_sparse_density = 15 jerk_print = 30 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall line_width = =machine_nozzle_size -wall_line_width_x = =line_width \ No newline at end of file +speed_infill = =speed_print +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_line_width_x = =line_width +wall_thickness = =line_width * 2 + diff --git a/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_accurate_B.inst.cfg b/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_accurate_B.inst.cfg index f671829c2b..d74c124079 100644 --- a/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_accurate_B.inst.cfg +++ b/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_accurate_B.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Accurate definition = deltacomb_base +name = Accurate +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = D010 intent_category = engineering material = generic_pla +quality_type = D010 +setting_version = 20 +type = intent variant = FBE 0.40mm [values] jerk_wall = 5 jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -wall_thickness = =line_width * 3 top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file +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/deltacomb/PLA/deltacomb_FBE0.40_PLA_accurate_C.inst.cfg b/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_accurate_C.inst.cfg index ac306939ff..dee3b8a93a 100644 --- a/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_accurate_C.inst.cfg +++ b/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_accurate_C.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Accurate definition = deltacomb_base +name = Accurate +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = D015 intent_category = engineering material = generic_pla +quality_type = D015 +setting_version = 20 +type = intent variant = FBE 0.40mm [values] jerk_wall = 5 jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -wall_thickness = =line_width * 3 top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file +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/deltacomb/PLA/deltacomb_FBE0.40_PLA_accurate_D.inst.cfg b/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_accurate_D.inst.cfg index e7509106b6..1010e33982 100644 --- a/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_accurate_D.inst.cfg +++ b/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_accurate_D.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Accurate definition = deltacomb_base +name = Accurate +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = D020 intent_category = engineering material = generic_pla +quality_type = D020 +setting_version = 20 +type = intent variant = FBE 0.40mm [values] jerk_wall = 5 jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -wall_thickness = =line_width * 3 top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file +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/deltacomb/PLA/deltacomb_FBE0.40_PLA_quick_D.inst.cfg b/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_quick_D.inst.cfg index b5fc8601fc..b1455948ab 100644 --- a/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_quick_D.inst.cfg +++ b/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_quick_D.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Quick definition = deltacomb_base +name = Quick +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = D020 intent_category = quick material = generic_pla +quality_type = D020 +setting_version = 20 +type = intent variant = FBE 0.40mm [values] -speed_infill = =speed_print -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 * 2 -infill_sparse_density = 15 infill_line_width = =line_width +infill_sparse_density = 15 jerk_print = 30 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall line_width = =machine_nozzle_size -wall_line_width_x = =line_width \ No newline at end of file +speed_infill = =speed_print +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_line_width_x = =line_width +wall_thickness = =line_width * 2 + diff --git a/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_quick_E.inst.cfg b/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_quick_E.inst.cfg index 054ce9211c..e5ef6bd194 100644 --- a/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_quick_E.inst.cfg +++ b/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_quick_E.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Quick definition = deltacomb_base +name = Quick +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = D030 intent_category = quick material = generic_pla +quality_type = D030 +setting_version = 20 +type = intent variant = FBE 0.40mm [values] -speed_infill = =speed_print -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 * 2 -infill_sparse_density = 15 infill_line_width = =line_width +infill_sparse_density = 15 jerk_print = 30 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall line_width = =machine_nozzle_size -wall_line_width_x = =line_width \ No newline at end of file +speed_infill = =speed_print +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_line_width_x = =line_width +wall_thickness = =line_width * 2 + diff --git a/resources/intent/liquid/liquid_vo0.4_ABS_Draft_Print_Quick.inst.cfg b/resources/intent/liquid/liquid_vo0.4_ABS_Draft_Print_Quick.inst.cfg index 7071bfd411..5101c41a0e 100644 --- a/resources/intent/liquid/liquid_vo0.4_ABS_Draft_Print_Quick.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_ABS_Draft_Print_Quick.inst.cfg @@ -1,33 +1,34 @@ [general] -version = 4 -name = Quick definition = liquid +name = Quick +version = 4 [metadata] +intent_category = quick +material = generic_abs +quality_type = draft setting_version = 20 type = intent -intent_category = quick -quality_type = draft -material = generic_abs variant = VO 0.4 [values] -speed_infill = =speed_print -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 = =wall_thickness -wall_thickness = =line_width * 2 -infill_sparse_density = 15 infill_line_width = =line_width -jerk_print = 10 +infill_sparse_density = 15 jerk_infill = =jerk_print +jerk_layer_0 = 5 +jerk_print = 10 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 line_width = =machine_nozzle_size +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 +top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width +wall_thickness = =line_width * 2 + diff --git a/resources/intent/liquid/liquid_vo0.4_ABS_Fast_Print_Accurate.inst.cfg b/resources/intent/liquid/liquid_vo0.4_ABS_Fast_Print_Accurate.inst.cfg index f220639229..67626abad0 100644 --- a/resources/intent/liquid/liquid_vo0.4_ABS_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_ABS_Fast_Print_Accurate.inst.cfg @@ -1,29 +1,29 @@ [general] -version = 4 -name = Accurate definition = liquid +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_abs +quality_type = fast setting_version = 20 type = intent -intent_category = engineering -quality_type = fast -material = generic_abs variant = VO 0.4 [values] infill_line_width = =line_width -jerk_print = 10 jerk_infill = =jerk_print +jerk_layer_0 = 5 +jerk_print = 10 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 line_width = =machine_nozzle_size -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall @@ -32,3 +32,4 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 + diff --git a/resources/intent/liquid/liquid_vo0.4_ABS_Fast_Visual.inst.cfg b/resources/intent/liquid/liquid_vo0.4_ABS_Fast_Visual.inst.cfg index b69b21b6e4..fe6a006aa3 100644 --- a/resources/intent/liquid/liquid_vo0.4_ABS_Fast_Visual.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_ABS_Fast_Visual.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Visual definition = liquid +name = Visual +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = fast intent_category = visual material = generic_abs +quality_type = fast +setting_version = 20 +type = intent variant = VO 0.4 [values] speed_infill = 50 -wall_thickness = =wall_line_width * 3 top_bottom_thickness = =wall_thickness +wall_thickness = =wall_line_width * 3 + diff --git a/resources/intent/liquid/liquid_vo0.4_ABS_High_Visual.inst.cfg b/resources/intent/liquid/liquid_vo0.4_ABS_High_Visual.inst.cfg index c28ab907f2..3c7554a9ca 100644 --- a/resources/intent/liquid/liquid_vo0.4_ABS_High_Visual.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_ABS_High_Visual.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Visual definition = liquid +name = Visual +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = high intent_category = visual material = generic_abs +quality_type = high +setting_version = 20 +type = intent variant = VO 0.4 [values] speed_infill = 50 -wall_thickness = =wall_line_width * 3 top_bottom_thickness = =wall_thickness +wall_thickness = =wall_line_width * 3 + diff --git a/resources/intent/liquid/liquid_vo0.4_ABS_Normal_Quality_Accurate.inst.cfg b/resources/intent/liquid/liquid_vo0.4_ABS_Normal_Quality_Accurate.inst.cfg index ca21d34368..aaf4fc4565 100644 --- a/resources/intent/liquid/liquid_vo0.4_ABS_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_ABS_Normal_Quality_Accurate.inst.cfg @@ -1,29 +1,29 @@ [general] -version = 4 -name = Accurate definition = liquid +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_abs +quality_type = normal setting_version = 20 type = intent -intent_category = engineering -quality_type = normal -material = generic_abs variant = VO 0.4 [values] infill_line_width = =line_width -jerk_print = 10 jerk_infill = =jerk_print +jerk_layer_0 = 5 +jerk_print = 10 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 line_width = =machine_nozzle_size -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall @@ -32,3 +32,4 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 + diff --git a/resources/intent/liquid/liquid_vo0.4_ABS_Normal_Visual.inst.cfg b/resources/intent/liquid/liquid_vo0.4_ABS_Normal_Visual.inst.cfg index 241a31f2ef..b2fc0624df 100644 --- a/resources/intent/liquid/liquid_vo0.4_ABS_Normal_Visual.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_ABS_Normal_Visual.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Visual definition = liquid +name = Visual +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = normal intent_category = visual material = generic_abs +quality_type = normal +setting_version = 20 +type = intent variant = VO 0.4 [values] speed_infill = 50 -wall_thickness = =wall_line_width * 3 top_bottom_thickness = =wall_thickness +wall_thickness = =wall_line_width * 3 + diff --git a/resources/intent/liquid/liquid_vo0.4_CPE_Fast_Print_Accurate.inst.cfg b/resources/intent/liquid/liquid_vo0.4_CPE_Fast_Print_Accurate.inst.cfg index 69fa6da2c4..1ea1fdf5d6 100644 --- a/resources/intent/liquid/liquid_vo0.4_CPE_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_CPE_Fast_Print_Accurate.inst.cfg @@ -1,29 +1,29 @@ [general] -version = 4 -name = Accurate definition = liquid +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_cpe +quality_type = fast setting_version = 20 type = intent -intent_category = engineering -quality_type = fast -material = generic_cpe variant = VO 0.4 [values] infill_line_width = =line_width -jerk_print = 10 jerk_infill = =jerk_print +jerk_layer_0 = 5 +jerk_print = 10 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 line_width = =machine_nozzle_size -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall diff --git a/resources/intent/liquid/liquid_vo0.4_CPE_Normal_Quality_Accurate.inst.cfg b/resources/intent/liquid/liquid_vo0.4_CPE_Normal_Quality_Accurate.inst.cfg index e38c8119d7..31fc8ade58 100644 --- a/resources/intent/liquid/liquid_vo0.4_CPE_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_CPE_Normal_Quality_Accurate.inst.cfg @@ -1,29 +1,29 @@ [general] -version = 4 -name = Accurate definition = liquid +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_cpe +quality_type = normal setting_version = 20 type = intent -intent_category = engineering -quality_type = normal -material = generic_cpe variant = VO 0.4 [values] infill_line_width = =line_width -jerk_print = 10 jerk_infill = =jerk_print +jerk_layer_0 = 5 +jerk_print = 10 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 line_width = =machine_nozzle_size -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall diff --git a/resources/intent/liquid/liquid_vo0.4_Nylon_Fast_Print_Accurate.inst.cfg b/resources/intent/liquid/liquid_vo0.4_Nylon_Fast_Print_Accurate.inst.cfg index 0562865621..1d2453ef4f 100644 --- a/resources/intent/liquid/liquid_vo0.4_Nylon_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_Nylon_Fast_Print_Accurate.inst.cfg @@ -1,29 +1,29 @@ [general] -version = 4 -name = Accurate definition = liquid +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_nylon +quality_type = fast setting_version = 20 type = intent -intent_category = engineering -quality_type = fast -material = generic_nylon variant = VO 0.4 [values] infill_line_width = =line_width -jerk_print = 10 jerk_infill = =jerk_print +jerk_layer_0 = 5 +jerk_print = 10 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 line_width = =machine_nozzle_size -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall diff --git a/resources/intent/liquid/liquid_vo0.4_Nylon_Normal_Quality_Accurate.inst.cfg b/resources/intent/liquid/liquid_vo0.4_Nylon_Normal_Quality_Accurate.inst.cfg index db469a979d..b2b48aca14 100644 --- a/resources/intent/liquid/liquid_vo0.4_Nylon_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_Nylon_Normal_Quality_Accurate.inst.cfg @@ -1,29 +1,29 @@ [general] -version = 4 -name = Accurate definition = liquid +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_nylon +quality_type = normal setting_version = 20 type = intent -intent_category = engineering -quality_type = normal -material = generic_nylon variant = VO 0.4 [values] infill_line_width = =line_width -jerk_print = 10 jerk_infill = =jerk_print +jerk_layer_0 = 5 +jerk_print = 10 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 line_width = =machine_nozzle_size -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall diff --git a/resources/intent/liquid/liquid_vo0.4_PC_Fast_Print_Accurate.inst.cfg b/resources/intent/liquid/liquid_vo0.4_PC_Fast_Print_Accurate.inst.cfg index 54a2db84af..3af1132195 100644 --- a/resources/intent/liquid/liquid_vo0.4_PC_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_PC_Fast_Print_Accurate.inst.cfg @@ -1,29 +1,29 @@ [general] -version = 4 -name = Accurate definition = liquid +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_pc +quality_type = fast setting_version = 20 type = intent -intent_category = engineering -quality_type = fast -material = generic_pc variant = VO 0.4 [values] infill_line_width = =line_width -jerk_print = 10 jerk_infill = =jerk_print +jerk_layer_0 = 5 +jerk_print = 10 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 line_width = =machine_nozzle_size -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall diff --git a/resources/intent/liquid/liquid_vo0.4_PC_Normal_Quality_Accurate.inst.cfg b/resources/intent/liquid/liquid_vo0.4_PC_Normal_Quality_Accurate.inst.cfg index f9c7ea533e..77165417ad 100644 --- a/resources/intent/liquid/liquid_vo0.4_PC_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_PC_Normal_Quality_Accurate.inst.cfg @@ -1,29 +1,29 @@ [general] -version = 4 -name = Accurate definition = liquid +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_pc +quality_type = normal setting_version = 20 type = intent -intent_category = engineering -quality_type = normal -material = generic_pc variant = VO 0.4 [values] infill_line_width = =line_width -jerk_print = 10 jerk_infill = =jerk_print +jerk_layer_0 = 5 +jerk_print = 10 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 line_width = =machine_nozzle_size -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall diff --git a/resources/intent/liquid/liquid_vo0.4_PETG_Draft_Print_Quick.inst.cfg b/resources/intent/liquid/liquid_vo0.4_PETG_Draft_Print_Quick.inst.cfg index c88d77adc2..5ace6e18ac 100644 --- a/resources/intent/liquid/liquid_vo0.4_PETG_Draft_Print_Quick.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_PETG_Draft_Print_Quick.inst.cfg @@ -1,33 +1,34 @@ [general] -version = 4 -name = Quick definition = liquid +name = Quick +version = 4 [metadata] +intent_category = quick +material = generic_petg +quality_type = draft setting_version = 20 type = intent -intent_category = quick -quality_type = draft -material = generic_petg variant = VO 0.4 [values] -speed_infill = =speed_print -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 = =wall_thickness -wall_thickness = =line_width * 2 -infill_sparse_density = 15 infill_line_width = =line_width -jerk_print = 15 +infill_sparse_density = 15 jerk_infill = =jerk_print +jerk_layer_0 = 5 +jerk_print = 15 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 line_width = =machine_nozzle_size +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 +top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width +wall_thickness = =line_width * 2 + diff --git a/resources/intent/liquid/liquid_vo0.4_PETG_Fast_Print_Accurate.inst.cfg b/resources/intent/liquid/liquid_vo0.4_PETG_Fast_Print_Accurate.inst.cfg index 1c7dae2d6c..9fc7e0be9b 100644 --- a/resources/intent/liquid/liquid_vo0.4_PETG_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_PETG_Fast_Print_Accurate.inst.cfg @@ -1,29 +1,29 @@ [general] -version = 4 -name = Accurate definition = liquid +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_petg +quality_type = fast setting_version = 20 type = intent -intent_category = engineering -quality_type = fast -material = generic_petg variant = VO 0.4 [values] infill_line_width = =line_width -jerk_print = 15 jerk_infill = =jerk_print +jerk_layer_0 = 5 +jerk_print = 15 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 line_width = =machine_nozzle_size -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall @@ -32,3 +32,4 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 + diff --git a/resources/intent/liquid/liquid_vo0.4_PETG_Fast_Visual.inst.cfg b/resources/intent/liquid/liquid_vo0.4_PETG_Fast_Visual.inst.cfg index c8b476a0a3..5ba635bb02 100644 --- a/resources/intent/liquid/liquid_vo0.4_PETG_Fast_Visual.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_PETG_Fast_Visual.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Visual definition = liquid +name = Visual +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = fast intent_category = visual material = generic_petg +quality_type = fast +setting_version = 20 +type = intent variant = VO 0.4 [values] speed_infill = 50 -wall_thickness = =wall_line_width * 3 top_bottom_thickness = =wall_thickness +wall_thickness = =wall_line_width * 3 + diff --git a/resources/intent/liquid/liquid_vo0.4_PETG_High_Visual.inst.cfg b/resources/intent/liquid/liquid_vo0.4_PETG_High_Visual.inst.cfg index 31c6deddaf..6157a2b73f 100644 --- a/resources/intent/liquid/liquid_vo0.4_PETG_High_Visual.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_PETG_High_Visual.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Visual definition = liquid +name = Visual +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = high intent_category = visual material = generic_petg +quality_type = high +setting_version = 20 +type = intent variant = VO 0.4 [values] speed_infill = 50 -wall_thickness = =wall_line_width * 3 top_bottom_thickness = =wall_thickness +wall_thickness = =wall_line_width * 3 + diff --git a/resources/intent/liquid/liquid_vo0.4_PETG_Normal_Quality_Accurate.inst.cfg b/resources/intent/liquid/liquid_vo0.4_PETG_Normal_Quality_Accurate.inst.cfg index 2fd49160a1..d843bbf241 100644 --- a/resources/intent/liquid/liquid_vo0.4_PETG_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_PETG_Normal_Quality_Accurate.inst.cfg @@ -1,29 +1,29 @@ [general] -version = 4 -name = Accurate definition = liquid +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_petg +quality_type = normal setting_version = 20 type = intent -intent_category = engineering -quality_type = normal -material = generic_petg variant = VO 0.4 [values] infill_line_width = =line_width -jerk_print = 15 jerk_infill = =jerk_print +jerk_layer_0 = 5 +jerk_print = 15 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 line_width = =machine_nozzle_size -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall @@ -32,3 +32,4 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 + diff --git a/resources/intent/liquid/liquid_vo0.4_PETG_Normal_Visual.inst.cfg b/resources/intent/liquid/liquid_vo0.4_PETG_Normal_Visual.inst.cfg index a0465c8d05..c674a20122 100644 --- a/resources/intent/liquid/liquid_vo0.4_PETG_Normal_Visual.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_PETG_Normal_Visual.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Visual definition = liquid +name = Visual +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = normal intent_category = visual material = generic_petg +quality_type = normal +setting_version = 20 +type = intent variant = VO 0.4 [values] speed_infill = 50 -wall_thickness = =wall_line_width * 3 top_bottom_thickness = =wall_thickness +wall_thickness = =wall_line_width * 3 + diff --git a/resources/intent/liquid/liquid_vo0.4_PLA_Draft_Print_Quick.inst.cfg b/resources/intent/liquid/liquid_vo0.4_PLA_Draft_Print_Quick.inst.cfg index 15139c3832..dba3ccec58 100644 --- a/resources/intent/liquid/liquid_vo0.4_PLA_Draft_Print_Quick.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_PLA_Draft_Print_Quick.inst.cfg @@ -1,33 +1,34 @@ [general] -version = 4 -name = Quick definition = liquid +name = Quick +version = 4 [metadata] +intent_category = quick +material = generic_pla +quality_type = draft setting_version = 20 type = intent -intent_category = quick -quality_type = draft -material = generic_pla variant = VO 0.4 [values] -speed_infill = =speed_print -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 = =wall_thickness -wall_thickness = =line_width * 2 -infill_sparse_density = 15 infill_line_width = =line_width -jerk_print = 15 +infill_sparse_density = 15 jerk_infill = =jerk_print +jerk_layer_0 = 5 +jerk_print = 15 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 line_width = =machine_nozzle_size +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 +top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width +wall_thickness = =line_width * 2 + diff --git a/resources/intent/liquid/liquid_vo0.4_PLA_Fast_Print_Accurate.inst.cfg b/resources/intent/liquid/liquid_vo0.4_PLA_Fast_Print_Accurate.inst.cfg index b782010c52..8c3adb8532 100644 --- a/resources/intent/liquid/liquid_vo0.4_PLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_PLA_Fast_Print_Accurate.inst.cfg @@ -1,29 +1,29 @@ [general] -version = 4 -name = Accurate definition = liquid +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_pla +quality_type = fast setting_version = 20 type = intent -intent_category = engineering -quality_type = fast -material = generic_pla variant = VO 0.4 [values] infill_line_width = =line_width -jerk_print = 15 jerk_infill = =jerk_print +jerk_layer_0 = 5 +jerk_print = 15 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 line_width = =machine_nozzle_size -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall @@ -32,3 +32,4 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 + diff --git a/resources/intent/liquid/liquid_vo0.4_PLA_Fast_Visual.inst.cfg b/resources/intent/liquid/liquid_vo0.4_PLA_Fast_Visual.inst.cfg index 5c2a41924a..9d28e82998 100644 --- a/resources/intent/liquid/liquid_vo0.4_PLA_Fast_Visual.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_PLA_Fast_Visual.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Visual definition = liquid +name = Visual +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = fast intent_category = visual material = generic_pla +quality_type = fast +setting_version = 20 +type = intent variant = VO 0.4 [values] speed_infill = 50 -wall_thickness = =wall_line_width * 3 top_bottom_thickness = =wall_thickness +wall_thickness = =wall_line_width * 3 + diff --git a/resources/intent/liquid/liquid_vo0.4_PLA_High_Visual.inst.cfg b/resources/intent/liquid/liquid_vo0.4_PLA_High_Visual.inst.cfg index 9168accf94..195f49e3f3 100644 --- a/resources/intent/liquid/liquid_vo0.4_PLA_High_Visual.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_PLA_High_Visual.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Visual definition = liquid +name = Visual +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = high intent_category = visual material = generic_pla +quality_type = high +setting_version = 20 +type = intent variant = VO 0.4 [values] speed_infill = 50 -wall_thickness = =wall_line_width * 3 top_bottom_thickness = =wall_thickness +wall_thickness = =wall_line_width * 3 + diff --git a/resources/intent/liquid/liquid_vo0.4_PLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/liquid/liquid_vo0.4_PLA_Normal_Quality_Accurate.inst.cfg index 110fa95a18..76ab89f5a0 100644 --- a/resources/intent/liquid/liquid_vo0.4_PLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_PLA_Normal_Quality_Accurate.inst.cfg @@ -1,29 +1,29 @@ [general] -version = 4 -name = Accurate definition = liquid +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_pla +quality_type = normal setting_version = 20 type = intent -intent_category = engineering -quality_type = normal -material = generic_pla variant = VO 0.4 [values] infill_line_width = =line_width -jerk_print = 15 jerk_infill = =jerk_print +jerk_layer_0 = 5 +jerk_print = 15 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 line_width = =machine_nozzle_size -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall @@ -32,3 +32,4 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 + diff --git a/resources/intent/liquid/liquid_vo0.4_PLA_Normal_Visual.inst.cfg b/resources/intent/liquid/liquid_vo0.4_PLA_Normal_Visual.inst.cfg index af184eff8a..d29635ca36 100644 --- a/resources/intent/liquid/liquid_vo0.4_PLA_Normal_Visual.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_PLA_Normal_Visual.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Visual definition = liquid +name = Visual +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = normal intent_category = visual material = generic_pla +quality_type = normal +setting_version = 20 +type = intent variant = VO 0.4 [values] speed_infill = 50 -wall_thickness = =wall_line_width * 3 top_bottom_thickness = =wall_thickness +wall_thickness = =wall_line_width * 3 + 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 e14dbda7cb..6db2def991 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Quick definition = ultimaker_s3 +name = Quick +version = 4 [metadata] +intent_category = quick +material = generic_abs +quality_type = draft setting_version = 20 type = intent -intent_category = quick -quality_type = draft -material = generic_abs variant = AA 0.4 [values] @@ -20,3 +20,4 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = 0.8 + 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 5cff46039c..525dd9abc6 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Accurate definition = ultimaker_s3 +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_abs +quality_type = fast setting_version = 20 type = intent -intent_category = engineering -quality_type = fast -material = generic_abs variant = AA 0.4 [values] @@ -21,3 +21,4 @@ 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 21b37abac1..4c5d661042 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 @@ -1,16 +1,17 @@ [general] -version = 4 -name = Visual definition = ultimaker_s3 +name = Visual +version = 4 [metadata] +intent_category = visual +material = generic_abs +quality_type = fast setting_version = 20 type = intent -intent_category = visual -quality_type = fast -material = generic_abs variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 + 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 898c8e3112..1e99be7d3c 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 @@ -1,16 +1,17 @@ [general] -version = 4 -name = Visual definition = ultimaker_s3 +name = Visual +version = 4 [metadata] +intent_category = visual +material = generic_abs +quality_type = high setting_version = 20 type = intent -intent_category = visual -quality_type = high -material = generic_abs variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 + 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 179307814c..4d137c0181 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Accurate definition = ultimaker_s3 +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_abs +quality_type = normal setting_version = 20 type = intent -intent_category = engineering -quality_type = normal -material = generic_abs variant = AA 0.4 [values] @@ -21,3 +21,4 @@ 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 fd4cda4565..8c90174263 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 @@ -1,16 +1,17 @@ [general] -version = 4 -name = Visual definition = ultimaker_s3 +name = Visual +version = 4 [metadata] +intent_category = visual +material = generic_abs +quality_type = normal setting_version = 20 type = intent -intent_category = visual -quality_type = normal -material = generic_abs variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 + 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 82a4d92982..73ff6c2e95 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Accurate definition = ultimaker_s3 +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_cpe_plus +quality_type = fast setting_version = 20 type = intent -intent_category = engineering -quality_type = fast -material = generic_cpe_plus variant = AA 0.4 [values] @@ -21,3 +21,4 @@ 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 8d5a8b850c..0022d6b5ae 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Accurate definition = ultimaker_s3 +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_cpe_plus +quality_type = normal setting_version = 20 type = intent -intent_category = engineering -quality_type = normal -material = generic_cpe_plus variant = AA 0.4 [values] @@ -21,3 +21,4 @@ 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 a0dfd8446d..1e103c8605 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Accurate definition = ultimaker_s3 +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_cpe +quality_type = fast setting_version = 20 type = intent -intent_category = engineering -quality_type = fast -material = generic_cpe variant = AA 0.4 [values] @@ -21,3 +21,4 @@ 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 98c5c03d31..b9c55cfc98 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Accurate definition = ultimaker_s3 +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_cpe +quality_type = normal setting_version = 20 type = intent -intent_category = engineering -quality_type = normal -material = generic_cpe variant = AA 0.4 [values] @@ -21,3 +21,4 @@ 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 933a1244f9..ea4b49f883 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Accurate definition = ultimaker_s3 +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_nylon +quality_type = fast setting_version = 20 type = intent -intent_category = engineering -quality_type = fast -material = generic_nylon variant = AA 0.4 [values] @@ -21,3 +21,4 @@ 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 510abc623c..343cdb027b 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Accurate definition = ultimaker_s3 +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_nylon +quality_type = normal setting_version = 20 type = intent -intent_category = engineering -quality_type = normal -material = generic_nylon variant = AA 0.4 [values] @@ -21,3 +21,4 @@ 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 a4927b5ea3..8fb09d6976 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Accurate definition = ultimaker_s3 +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_pc +quality_type = fast setting_version = 20 type = intent -intent_category = engineering -quality_type = fast -material = generic_pc variant = AA 0.4 [values] @@ -21,3 +21,4 @@ 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 01540dc391..5a1f33422f 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Accurate definition = ultimaker_s3 +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_pc +quality_type = normal setting_version = 20 type = intent -intent_category = engineering -quality_type = normal -material = generic_pc variant = AA 0.4 [values] @@ -21,3 +21,4 @@ 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 a7e16320c0..c2cbede163 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Accurate definition = ultimaker_s3 +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_petg +quality_type = fast setting_version = 20 type = intent -intent_category = engineering -quality_type = fast -material = generic_petg variant = AA 0.4 [values] @@ -21,3 +21,4 @@ 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 58d731c741..f92420baa7 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Accurate definition = ultimaker_s3 +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_petg +quality_type = normal setting_version = 20 type = intent -intent_category = engineering -quality_type = normal -material = generic_petg variant = AA 0.4 [values] @@ -21,3 +21,4 @@ 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 9b188ea20b..1760163114 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Quick definition = ultimaker_s3 +name = Quick +version = 4 [metadata] +intent_category = quick +material = generic_pla +quality_type = draft setting_version = 20 type = intent -intent_category = quick -quality_type = draft -material = generic_pla variant = AA 0.4 [values] @@ -20,3 +20,4 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = 0.8 + 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 b2d6255ffc..18b23312a6 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Accurate definition = ultimaker_s3 +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_pla +quality_type = fast setting_version = 20 type = intent -intent_category = engineering -quality_type = fast -material = generic_pla variant = AA 0.4 [values] @@ -21,3 +21,4 @@ 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 e465f40ed2..7a86813b6f 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 @@ -1,16 +1,17 @@ [general] -version = 4 -name = Visual definition = ultimaker_s3 +name = Visual +version = 4 [metadata] +intent_category = visual +material = generic_pla +quality_type = fast setting_version = 20 type = intent -intent_category = visual -quality_type = fast -material = generic_pla variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 + 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 c50fa33475..691e39c2c4 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 @@ -1,16 +1,17 @@ [general] -version = 4 -name = Visual definition = ultimaker_s3 +name = Visual +version = 4 [metadata] +intent_category = visual +material = generic_pla +quality_type = high setting_version = 20 type = intent -intent_category = visual -quality_type = high -material = generic_pla variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 + 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 b6d424ed18..1c876b0816 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Accurate definition = ultimaker_s3 +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_pla +quality_type = normal setting_version = 20 type = intent -intent_category = engineering -quality_type = normal -material = generic_pla variant = AA 0.4 [values] @@ -21,3 +21,4 @@ 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 15f4d17fad..fbf144c7b3 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 @@ -1,16 +1,17 @@ [general] -version = 4 -name = Visual definition = ultimaker_s3 +name = Visual +version = 4 [metadata] +intent_category = visual +material = generic_pla +quality_type = normal setting_version = 20 type = intent -intent_category = visual -quality_type = normal -material = generic_pla variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 + 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 9ca6820656..1b12fd01a0 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Quick definition = ultimaker_s3 +name = Quick +version = 4 [metadata] +intent_category = quick +is_experimental = True +material = generic_pla +quality_type = verydraft setting_version = 20 type = intent -intent_category = quick -quality_type = verydraft -material = generic_pla variant = AA 0.4 -is_experimental = True [values] acceleration_print = 4000 @@ -25,3 +25,4 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall 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 16fe2834fd..4926bde9ea 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Quick definition = ultimaker_s3 +name = Quick +version = 4 [metadata] +intent_category = quick +material = generic_tough_pla +quality_type = draft setting_version = 20 type = intent -intent_category = quick -quality_type = draft -material = generic_tough_pla variant = AA 0.4 [values] @@ -20,3 +20,4 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = 0.8 + 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 fcd34957cf..dd964247ce 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Accurate definition = ultimaker_s3 +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_tough_pla +quality_type = fast setting_version = 20 type = intent -intent_category = engineering -quality_type = fast -material = generic_tough_pla variant = AA 0.4 [values] @@ -21,3 +21,4 @@ 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 3afd626d8e..b9124117cc 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 @@ -1,16 +1,17 @@ [general] -version = 4 -name = Visual definition = ultimaker_s3 +name = Visual +version = 4 [metadata] +intent_category = visual +material = generic_tough_pla +quality_type = fast setting_version = 20 type = intent -intent_category = visual -quality_type = fast -material = generic_tough_pla variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 + 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 2ef6dc756a..8b9bea2770 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 @@ -1,16 +1,17 @@ [general] -version = 4 -name = Visual definition = ultimaker_s3 +name = Visual +version = 4 [metadata] +intent_category = visual +material = generic_tough_pla +quality_type = high setting_version = 20 type = intent -intent_category = visual -quality_type = high -material = generic_tough_pla variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 + 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 b4aedc079f..3273c5d050 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Accurate definition = ultimaker_s3 +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_tough_pla +quality_type = normal setting_version = 20 type = intent -intent_category = engineering -quality_type = normal -material = generic_tough_pla variant = AA 0.4 [values] @@ -21,3 +21,4 @@ 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 fd0e3499e5..d275ce276c 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 @@ -1,16 +1,17 @@ [general] -version = 4 -name = Visual definition = ultimaker_s3 +name = Visual +version = 4 [metadata] +intent_category = visual +material = generic_tough_pla +quality_type = normal setting_version = 20 type = intent -intent_category = visual -quality_type = normal -material = generic_tough_pla variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 + 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 7107d528c5..1cdff54647 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Quick definition = ultimaker_s3 +name = Quick +version = 4 [metadata] +intent_category = quick +is_experimental = True +material = generic_tough_pla +quality_type = verydraft setting_version = 20 type = intent -intent_category = quick -quality_type = verydraft -material = generic_tough_pla variant = AA 0.4 -is_experimental = True [values] acceleration_print = 4000 @@ -25,3 +25,4 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall 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 9610a74f65..9f960caad7 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Quick definition = ultimaker_s5 +name = Quick +version = 4 [metadata] +intent_category = quick +material = generic_abs +quality_type = draft setting_version = 20 type = intent -intent_category = quick -quality_type = draft -material = generic_abs variant = AA 0.4 [values] @@ -20,3 +20,4 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = 0.8 + 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 aba6ae5d6c..7af2585a32 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Accurate definition = ultimaker_s5 +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_abs +quality_type = fast setting_version = 20 type = intent -intent_category = engineering -quality_type = fast -material = generic_abs variant = AA 0.4 [values] @@ -21,3 +21,4 @@ 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_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 dec4e9a252..9aa460da9c 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 @@ -1,16 +1,17 @@ [general] -version = 4 -name = Visual definition = ultimaker_s5 +name = Visual +version = 4 [metadata] +intent_category = visual +material = generic_abs +quality_type = fast setting_version = 20 type = intent -intent_category = visual -quality_type = fast -material = generic_abs variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 + 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 9df38c762d..932ec1d89b 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 @@ -1,16 +1,17 @@ [general] -version = 4 -name = Visual definition = ultimaker_s5 +name = Visual +version = 4 [metadata] +intent_category = visual +material = generic_abs +quality_type = high setting_version = 20 type = intent -intent_category = visual -quality_type = high -material = generic_abs variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 + 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 85e5aca055..bec12144ac 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Accurate definition = ultimaker_s5 +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_abs +quality_type = normal setting_version = 20 type = intent -intent_category = engineering -quality_type = normal -material = generic_abs variant = AA 0.4 [values] @@ -21,3 +21,4 @@ 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_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 a9578315ff..8ac4d5a3b0 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 @@ -1,16 +1,17 @@ [general] -version = 4 -name = Visual definition = ultimaker_s5 +name = Visual +version = 4 [metadata] +intent_category = visual +material = generic_abs +quality_type = normal setting_version = 20 type = intent -intent_category = visual -quality_type = normal -material = generic_abs variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 + 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 2ba9053896..15cce9d925 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Accurate definition = ultimaker_s5 +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_cpe_plus +quality_type = fast setting_version = 20 type = intent -intent_category = engineering -quality_type = fast -material = generic_cpe_plus variant = AA 0.4 [values] @@ -21,3 +21,4 @@ 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_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 a821280b7c..0c959fd6d7 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Accurate definition = ultimaker_s5 +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_cpe_plus +quality_type = normal setting_version = 20 type = intent -intent_category = engineering -quality_type = normal -material = generic_cpe_plus variant = AA 0.4 [values] @@ -21,3 +21,4 @@ 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_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 b6edb15aa5..4b2963fefe 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Accurate definition = ultimaker_s5 +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_cpe +quality_type = fast setting_version = 20 type = intent -intent_category = engineering -quality_type = fast -material = generic_cpe variant = AA 0.4 [values] @@ -21,3 +21,4 @@ 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_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 9212ed1114..fd8d60e421 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Accurate definition = ultimaker_s5 +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_cpe +quality_type = normal setting_version = 20 type = intent -intent_category = engineering -quality_type = normal -material = generic_cpe variant = AA 0.4 [values] @@ -21,3 +21,4 @@ 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_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 2630ec0620..33f7ed0e80 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Accurate definition = ultimaker_s5 +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_nylon +quality_type = fast setting_version = 20 type = intent -intent_category = engineering -quality_type = fast -material = generic_nylon variant = AA 0.4 [values] @@ -21,3 +21,4 @@ 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_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 13c3824e70..e030342913 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Accurate definition = ultimaker_s5 +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_nylon +quality_type = normal setting_version = 20 type = intent -intent_category = engineering -quality_type = normal -material = generic_nylon variant = AA 0.4 [values] @@ -21,3 +21,4 @@ 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_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 4bfae56534..7362abcc07 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Accurate definition = ultimaker_s5 +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_pc +quality_type = fast setting_version = 20 type = intent -intent_category = engineering -quality_type = fast -material = generic_pc variant = AA 0.4 [values] @@ -21,3 +21,4 @@ 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_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 3f5b69eb4b..443490d679 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Accurate definition = ultimaker_s5 +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_pc +quality_type = normal setting_version = 20 type = intent -intent_category = engineering -quality_type = normal -material = generic_pc variant = AA 0.4 [values] @@ -21,3 +21,4 @@ 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_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 be2122599a..354ece6c57 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Accurate definition = ultimaker_s5 +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_petg +quality_type = fast setting_version = 20 type = intent -intent_category = engineering -quality_type = fast -material = generic_petg variant = AA 0.4 [values] @@ -21,3 +21,4 @@ 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_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 c1a3e4b79a..58d9097eed 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Accurate definition = ultimaker_s5 +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_petg +quality_type = normal setting_version = 20 type = intent -intent_category = engineering -quality_type = normal -material = generic_petg variant = AA 0.4 [values] @@ -21,3 +21,4 @@ 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_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 eabaac92be..60c4e60cbf 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Quick definition = ultimaker_s5 +name = Quick +version = 4 [metadata] +intent_category = quick +material = generic_pla +quality_type = draft setting_version = 20 type = intent -intent_category = quick -quality_type = draft -material = generic_pla variant = AA 0.4 [values] @@ -20,3 +20,4 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = 0.8 + 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 af9f56b138..52fcb664cc 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Accurate definition = ultimaker_s5 +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_pla +quality_type = fast setting_version = 20 type = intent -intent_category = engineering -quality_type = fast -material = generic_pla variant = AA 0.4 [values] @@ -21,3 +21,4 @@ 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_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 db38a543f4..f85868d772 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 @@ -1,16 +1,17 @@ [general] -version = 4 -name = Visual definition = ultimaker_s5 +name = Visual +version = 4 [metadata] +intent_category = visual +material = generic_pla +quality_type = fast setting_version = 20 type = intent -intent_category = visual -quality_type = fast -material = generic_pla variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 + 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 e0e9dab04d..ad99897d03 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 @@ -1,16 +1,17 @@ [general] -version = 4 -name = Visual definition = ultimaker_s5 +name = Visual +version = 4 [metadata] +intent_category = visual +material = generic_pla +quality_type = high setting_version = 20 type = intent -intent_category = visual -quality_type = high -material = generic_pla variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 + 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 210bef3cb9..63d0c9e48a 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Accurate definition = ultimaker_s5 +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_pla +quality_type = normal setting_version = 20 type = intent -intent_category = engineering -quality_type = normal -material = generic_pla variant = AA 0.4 [values] @@ -21,3 +21,4 @@ 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_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 1874a846e4..6bdad59f56 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 @@ -1,16 +1,17 @@ [general] -version = 4 -name = Visual definition = ultimaker_s5 +name = Visual +version = 4 [metadata] +intent_category = visual +material = generic_pla +quality_type = normal setting_version = 20 type = intent -intent_category = visual -quality_type = normal -material = generic_pla variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 + 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 4e2a91e473..7491228ece 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Quick definition = ultimaker_s5 +name = Quick +version = 4 [metadata] +intent_category = quick +is_experimental = True +material = generic_pla +quality_type = verydraft setting_version = 20 type = intent -intent_category = quick -quality_type = verydraft -material = generic_pla variant = AA 0.4 -is_experimental = True [values] acceleration_print = 4000 @@ -25,3 +25,4 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall 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 d6388d296f..de9c8e46b8 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Quick definition = ultimaker_s5 +name = Quick +version = 4 [metadata] +intent_category = quick +material = generic_tough_pla +quality_type = draft setting_version = 20 type = intent -intent_category = quick -quality_type = draft -material = generic_tough_pla variant = AA 0.4 [values] @@ -20,3 +20,4 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = 0.8 + 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 d1d32cdfbb..39a372ab50 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Accurate definition = ultimaker_s5 +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_tough_pla +quality_type = fast setting_version = 20 type = intent -intent_category = engineering -quality_type = fast -material = generic_tough_pla variant = AA 0.4 [values] @@ -21,3 +21,4 @@ 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_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 31a8fa8ef7..ec1657af0d 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 @@ -1,16 +1,17 @@ [general] -version = 4 -name = Visual definition = ultimaker_s5 +name = Visual +version = 4 [metadata] +intent_category = visual +material = generic_tough_pla +quality_type = fast setting_version = 20 type = intent -intent_category = visual -quality_type = fast -material = generic_tough_pla variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 + 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 99b390a03a..7bf7744587 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 @@ -1,16 +1,17 @@ [general] -version = 4 -name = Visual definition = ultimaker_s5 +name = Visual +version = 4 [metadata] +intent_category = visual +material = generic_tough_pla +quality_type = high setting_version = 20 type = intent -intent_category = visual -quality_type = high -material = generic_tough_pla variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 + 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 76f4172ca5..48484462ba 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 @@ -1,14 +1,14 @@ [general] -version = 4 -name = Accurate definition = ultimaker_s5 +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_tough_pla +quality_type = normal setting_version = 20 type = intent -intent_category = engineering -quality_type = normal -material = generic_tough_pla variant = AA 0.4 [values] @@ -21,3 +21,4 @@ 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_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 e5022cfad4..753a032970 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 @@ -1,16 +1,17 @@ [general] -version = 4 -name = Visual definition = ultimaker_s5 +name = Visual +version = 4 [metadata] +intent_category = visual +material = generic_tough_pla +quality_type = normal setting_version = 20 type = intent -intent_category = visual -quality_type = normal -material = generic_tough_pla variant = AA 0.4 [values] speed_infill = 50 top_bottom_thickness = 1.05 + 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 cdfabcbc00..a3471fee9f 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Quick definition = ultimaker_s5 +name = Quick +version = 4 [metadata] +intent_category = quick +is_experimental = True +material = generic_tough_pla +quality_type = verydraft setting_version = 20 type = intent -intent_category = quick -quality_type = verydraft -material = generic_tough_pla variant = AA 0.4 -is_experimental = True [values] acceleration_print = 4000 @@ -25,3 +25,4 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = 0.8 + diff --git a/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.10_visual.inst.inst.cfg b/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.10_visual.inst.inst.cfg index 2579528ee4..43ceaa23b9 100644 --- a/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.10_visual.inst.inst.cfg +++ b/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.10_visual.inst.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Visual definition = uni_base +name = Visual +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = q010 intent_category = visual material = generic_abs -variant = 0.40mm Nozzle +quality_type = q010 +setting_version = 20 +type = intent +variant = 0.40mm Nozzle [values] -speed_print = 50 +adaptive_layer_height_enabled = true speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 50 speed_topbottom = 35 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall -adaptive_layer_height_enabled = true +speed_wall_x = =speed_wall + diff --git a/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.15_eng.inst.inst.cfg b/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.15_eng.inst.inst.cfg index 360ad2b935..b737f9f809 100644 --- a/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.15_eng.inst.inst.cfg +++ b/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.15_eng.inst.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Accurate definition = uni_base +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_abs +quality_type = q015 setting_version = 20 type = intent -intent_category = engineering -quality_type = q015 -material = generic_abs variant = 0.40mm Nozzle [values] -speed_print = 70 speed_infill = =speed_print speed_layer_0 = 25 +speed_print = 70 speed_topbottom = 40 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall +speed_wall_x = =speed_wall + diff --git a/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.15_visual.inst.inst.cfg b/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.15_visual.inst.inst.cfg index 3ef89a8ba5..b1b3558aa9 100644 --- a/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.15_visual.inst.inst.cfg +++ b/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.15_visual.inst.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Visual definition = uni_base +name = Visual +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = q015 intent_category = visual material = generic_abs -variant = 0.40mm Nozzle +quality_type = q015 +setting_version = 20 +type = intent +variant = 0.40mm Nozzle [values] -speed_print = 50 +adaptive_layer_height_enabled = true speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 50 speed_topbottom = 35 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall -adaptive_layer_height_enabled = true +speed_wall_x = =speed_wall + diff --git a/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.20_eng.inst.inst.cfg b/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.20_eng.inst.inst.cfg index 4249a6656c..023368948b 100644 --- a/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.20_eng.inst.inst.cfg +++ b/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.20_eng.inst.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Accurate definition = uni_base +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_abs +quality_type = q020 setting_version = 20 type = intent -intent_category = engineering -quality_type = q020 -material = generic_abs variant = 0.40mm Nozzle [values] -speed_print = 70 speed_infill = =speed_print speed_layer_0 = 25 +speed_print = 70 speed_topbottom = 40 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall +speed_wall_x = =speed_wall + diff --git a/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.20_quick.inst.cfg b/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.20_quick.inst.cfg index aca65ed75b..3c92716ae5 100644 --- a/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.20_quick.inst.cfg +++ b/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.20_quick.inst.cfg @@ -1,28 +1,29 @@ [general] -version = 4 -name = Quick definition = uni_base +name = Quick +version = 4 [metadata] +intent_category = quick +material = generic_abs +quality_type = q020 setting_version = 20 type = intent -intent_category = quick -quality_type = q020 -material = generic_abs variant = 0.40mm Nozzle [values] -jerk_print = 30 jerk_infill = =jerk_print +jerk_layer_0 = 5 +jerk_print = 30 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 -speed_print = 100 speed_infill = =speed_print speed_layer_0 = 25 +speed_print = 100 speed_topbottom = 65 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall +speed_wall_x = =speed_wall + diff --git a/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.20_visual.inst.inst.cfg b/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.20_visual.inst.inst.cfg index b0e0bf3f33..81896122ef 100644 --- a/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.20_visual.inst.inst.cfg +++ b/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.20_visual.inst.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Visual definition = uni_base +name = Visual +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = q020 intent_category = visual material = generic_abs -variant = 0.40mm Nozzle +quality_type = q020 +setting_version = 20 +type = intent +variant = 0.40mm Nozzle [values] -speed_print = 50 +adaptive_layer_height_enabled = true speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 50 speed_topbottom = 35 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall -adaptive_layer_height_enabled = true +speed_wall_x = =speed_wall + diff --git a/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.25_quick.inst.cfg b/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.25_quick.inst.cfg index f32098879a..dd108093db 100644 --- a/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.25_quick.inst.cfg +++ b/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.25_quick.inst.cfg @@ -1,28 +1,29 @@ [general] -version = 4 -name = Quick definition = uni_base +name = Quick +version = 4 [metadata] +intent_category = quick +material = generic_abs +quality_type = q025 setting_version = 20 type = intent -intent_category = quick -quality_type = q025 -material = generic_abs variant = 0.40mm Nozzle [values] -jerk_print = 30 jerk_infill = =jerk_print +jerk_layer_0 = 5 +jerk_print = 30 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 -speed_print = 100 speed_infill = =speed_print speed_layer_0 = 25 +speed_print = 100 speed_topbottom = 65 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall +speed_wall_x = =speed_wall + diff --git a/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.30_quick.inst.cfg b/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.30_quick.inst.cfg index ba0b7ef2b0..fb77cce5ca 100644 --- a/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.30_quick.inst.cfg +++ b/resources/intent/uni_base/abs/abs_nozzle_0.40_layer_0.30_quick.inst.cfg @@ -1,28 +1,29 @@ [general] -version = 4 -name = Quick definition = uni_base +name = Quick +version = 4 [metadata] +intent_category = quick +material = generic_abs +quality_type = q030 setting_version = 20 type = intent -intent_category = quick -quality_type = q030 -material = generic_abs variant = 0.40mm Nozzle [values] -jerk_print = 30 jerk_infill = =jerk_print +jerk_layer_0 = 5 +jerk_print = 30 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 -speed_print = 100 speed_infill = =speed_print speed_layer_0 = 25 +speed_print = 100 speed_topbottom = 65 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall +speed_wall_x = =speed_wall + diff --git a/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.10_visual.inst.inst.cfg b/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.10_visual.inst.inst.cfg index 3aec48f51a..9aaa509f4a 100644 --- a/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.10_visual.inst.inst.cfg +++ b/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.10_visual.inst.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Visual definition = uni_base +name = Visual +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = q010 intent_category = visual material = generic_petg -variant = 0.40mm Nozzle +quality_type = q010 +setting_version = 20 +type = intent +variant = 0.40mm Nozzle [values] -speed_print = 50 +adaptive_layer_height_enabled = true speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 50 speed_topbottom = 35 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall -adaptive_layer_height_enabled = true +speed_wall_x = =speed_wall + diff --git a/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.15_eng.inst.inst.cfg b/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.15_eng.inst.inst.cfg index f6210c6d17..552d115b3b 100644 --- a/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.15_eng.inst.inst.cfg +++ b/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.15_eng.inst.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Accurate definition = uni_base +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_petg +quality_type = q015 setting_version = 20 type = intent -intent_category = engineering -quality_type = q015 -material = generic_petg variant = 0.40mm Nozzle [values] -speed_print = 70 speed_infill = =speed_print speed_layer_0 = 25 +speed_print = 70 speed_topbottom = 40 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall +speed_wall_x = =speed_wall + diff --git a/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.15_visual.inst.inst.cfg b/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.15_visual.inst.inst.cfg index c0447585ba..537de9342a 100644 --- a/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.15_visual.inst.inst.cfg +++ b/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.15_visual.inst.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Visual definition = uni_base +name = Visual +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = q015 intent_category = visual material = generic_petg -variant = 0.40mm Nozzle +quality_type = q015 +setting_version = 20 +type = intent +variant = 0.40mm Nozzle [values] -speed_print = 50 +adaptive_layer_height_enabled = true speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 50 speed_topbottom = 35 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall -adaptive_layer_height_enabled = true +speed_wall_x = =speed_wall + diff --git a/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.20_eng.inst.inst.cfg b/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.20_eng.inst.inst.cfg index aef6e96dc8..ecc22ffa01 100644 --- a/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.20_eng.inst.inst.cfg +++ b/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.20_eng.inst.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Accurate definition = uni_base +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_petg +quality_type = q020 setting_version = 20 type = intent -intent_category = engineering -quality_type = q020 -material = generic_petg variant = 0.40mm Nozzle [values] -speed_print = 70 speed_infill = =speed_print speed_layer_0 = 25 +speed_print = 70 speed_topbottom = 40 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall +speed_wall_x = =speed_wall + diff --git a/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.20_quick.inst.cfg b/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.20_quick.inst.cfg index 9921be1922..f90769567b 100644 --- a/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.20_quick.inst.cfg +++ b/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.20_quick.inst.cfg @@ -1,28 +1,29 @@ [general] -version = 4 -name = Quick definition = uni_base +name = Quick +version = 4 [metadata] +intent_category = quick +material = generic_petg +quality_type = q020 setting_version = 20 type = intent -intent_category = quick -quality_type = q020 -material = generic_petg variant = 0.40mm Nozzle [values] -jerk_print = 30 jerk_infill = =jerk_print +jerk_layer_0 = 5 +jerk_print = 30 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 -speed_print = 100 speed_infill = =speed_print speed_layer_0 = 25 +speed_print = 100 speed_topbottom = 65 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall +speed_wall_x = =speed_wall + diff --git a/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.20_visual.inst.inst.cfg b/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.20_visual.inst.inst.cfg index 8f795be154..7f38e8fd6f 100644 --- a/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.20_visual.inst.inst.cfg +++ b/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.20_visual.inst.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Visual definition = uni_base +name = Visual +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = q020 intent_category = visual material = generic_petg -variant = 0.40mm Nozzle +quality_type = q020 +setting_version = 20 +type = intent +variant = 0.40mm Nozzle [values] -speed_print = 50 +adaptive_layer_height_enabled = true speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 50 speed_topbottom = 35 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall -adaptive_layer_height_enabled = true +speed_wall_x = =speed_wall + diff --git a/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.25_quick.inst.cfg b/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.25_quick.inst.cfg index 658fe25b1f..16e6dfeea3 100644 --- a/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.25_quick.inst.cfg +++ b/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.25_quick.inst.cfg @@ -1,28 +1,29 @@ [general] -version = 4 -name = Quick definition = uni_base +name = Quick +version = 4 [metadata] +intent_category = quick +material = generic_petg +quality_type = q025 setting_version = 20 type = intent -intent_category = quick -quality_type = q025 -material = generic_petg variant = 0.40mm Nozzle [values] -jerk_print = 30 jerk_infill = =jerk_print +jerk_layer_0 = 5 +jerk_print = 30 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 -speed_print = 100 speed_infill = =speed_print speed_layer_0 = 25 +speed_print = 100 speed_topbottom = 65 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall +speed_wall_x = =speed_wall + diff --git a/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.30_quick.inst.cfg b/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.30_quick.inst.cfg index fccccc14fd..0473873159 100644 --- a/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.30_quick.inst.cfg +++ b/resources/intent/uni_base/petg/petg_nozzle_0.40_layer_0.30_quick.inst.cfg @@ -1,28 +1,29 @@ [general] -version = 4 -name = Quick definition = uni_base +name = Quick +version = 4 [metadata] +intent_category = quick +material = generic_petg +quality_type = q030 setting_version = 20 type = intent -intent_category = quick -quality_type = q030 -material = generic_petg variant = 0.40mm Nozzle [values] -jerk_print = 30 jerk_infill = =jerk_print +jerk_layer_0 = 5 +jerk_print = 30 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 -speed_print = 100 speed_infill = =speed_print speed_layer_0 = 25 +speed_print = 100 speed_topbottom = 65 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall +speed_wall_x = =speed_wall + diff --git a/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.10_visual.inst.inst.cfg b/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.10_visual.inst.inst.cfg index d60a340613..b54a762ec5 100644 --- a/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.10_visual.inst.inst.cfg +++ b/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.10_visual.inst.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Visual definition = uni_base +name = Visual +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = q010 intent_category = visual material = generic_pla -variant = 0.40mm Nozzle +quality_type = q010 +setting_version = 20 +type = intent +variant = 0.40mm Nozzle [values] -speed_print = 50 +adaptive_layer_height_enabled = true speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 50 speed_topbottom = 35 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall -adaptive_layer_height_enabled = true +speed_wall_x = =speed_wall + diff --git a/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.15_eng.inst.inst.cfg b/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.15_eng.inst.inst.cfg index 716e001ba1..8494b4001a 100644 --- a/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.15_eng.inst.inst.cfg +++ b/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.15_eng.inst.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Accurate definition = uni_base +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_pla +quality_type = q015 setting_version = 20 type = intent -intent_category = engineering -quality_type = q015 -material = generic_pla variant = 0.40mm Nozzle [values] -speed_print = 70 speed_infill = =speed_print speed_layer_0 = 25 +speed_print = 70 speed_topbottom = 40 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall +speed_wall_x = =speed_wall + diff --git a/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.15_visual.inst.inst.cfg b/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.15_visual.inst.inst.cfg index bc58af6119..1606d75eae 100644 --- a/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.15_visual.inst.inst.cfg +++ b/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.15_visual.inst.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Visual definition = uni_base +name = Visual +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = q015 intent_category = visual material = generic_pla -variant = 0.40mm Nozzle +quality_type = q015 +setting_version = 20 +type = intent +variant = 0.40mm Nozzle [values] -speed_print = 50 +adaptive_layer_height_enabled = true speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 50 speed_topbottom = 35 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall -adaptive_layer_height_enabled = true +speed_wall_x = =speed_wall + diff --git a/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.20_eng.inst.inst.cfg b/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.20_eng.inst.inst.cfg index 9c7a50ae4b..e8d78915b0 100644 --- a/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.20_eng.inst.inst.cfg +++ b/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.20_eng.inst.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Accurate definition = uni_base +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_pla +quality_type = q020 setting_version = 20 type = intent -intent_category = engineering -quality_type = q020 -material = generic_pla variant = 0.40mm Nozzle [values] -speed_print = 70 speed_infill = =speed_print speed_layer_0 = 25 +speed_print = 70 speed_topbottom = 40 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall +speed_wall_x = =speed_wall + diff --git a/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.20_quick.inst.cfg b/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.20_quick.inst.cfg index 7a2de6b69d..954507d445 100644 --- a/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.20_quick.inst.cfg +++ b/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.20_quick.inst.cfg @@ -1,28 +1,29 @@ [general] -version = 4 -name = Quick definition = uni_base +name = Quick +version = 4 [metadata] +intent_category = quick +material = generic_pla +quality_type = q020 setting_version = 20 type = intent -intent_category = quick -quality_type = q020 -material = generic_pla variant = 0.40mm Nozzle [values] -jerk_print = 30 jerk_infill = =jerk_print +jerk_layer_0 = 5 +jerk_print = 30 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 -speed_print = 100 speed_infill = =speed_print speed_layer_0 = 25 +speed_print = 100 speed_topbottom = 65 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall +speed_wall_x = =speed_wall + diff --git a/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.20_visual.inst.inst.cfg b/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.20_visual.inst.inst.cfg index 53678cbe83..2338161325 100644 --- a/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.20_visual.inst.inst.cfg +++ b/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.20_visual.inst.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Visual definition = uni_base +name = Visual +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = q020 intent_category = visual material = generic_pla -variant = 0.40mm Nozzle +quality_type = q020 +setting_version = 20 +type = intent +variant = 0.40mm Nozzle [values] -speed_print = 50 +adaptive_layer_height_enabled = true speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 50 speed_topbottom = 35 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall -adaptive_layer_height_enabled = true +speed_wall_x = =speed_wall + diff --git a/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.25_quick.inst.cfg b/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.25_quick.inst.cfg index 6f6891abd6..2c2fbad6f5 100644 --- a/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.25_quick.inst.cfg +++ b/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.25_quick.inst.cfg @@ -1,28 +1,29 @@ [general] -version = 4 -name = Quick definition = uni_base +name = Quick +version = 4 [metadata] +intent_category = quick +material = generic_pla +quality_type = q025 setting_version = 20 type = intent -intent_category = quick -quality_type = q025 -material = generic_pla variant = 0.40mm Nozzle [values] -jerk_print = 30 jerk_infill = =jerk_print +jerk_layer_0 = 5 +jerk_print = 30 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 -speed_print = 100 speed_infill = =speed_print speed_layer_0 = 25 +speed_print = 100 speed_topbottom = 65 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall +speed_wall_x = =speed_wall + diff --git a/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.30_quick.inst.cfg b/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.30_quick.inst.cfg index 51334e88ea..5ef30a98ed 100644 --- a/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.30_quick.inst.cfg +++ b/resources/intent/uni_base/pla/pla_nozzle_0.40_layer_0.30_quick.inst.cfg @@ -1,28 +1,29 @@ [general] -version = 4 -name = Quick definition = uni_base +name = Quick +version = 4 [metadata] +intent_category = quick +material = generic_pla +quality_type = q030 setting_version = 20 type = intent -intent_category = quick -quality_type = q030 -material = generic_pla variant = 0.40mm Nozzle [values] -jerk_print = 30 jerk_infill = =jerk_print +jerk_layer_0 = 5 +jerk_print = 30 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 -speed_print = 100 speed_infill = =speed_print speed_layer_0 = 25 +speed_print = 100 speed_topbottom = 65 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall +speed_wall_x = =speed_wall + diff --git a/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.10_visual.inst.inst.cfg b/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.10_visual.inst.inst.cfg index eacc67af42..c6bf5e7127 100644 --- a/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.10_visual.inst.inst.cfg +++ b/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.10_visual.inst.inst.cfg @@ -1,23 +1,23 @@ [general] -version = 4 -name = Visual definition = zav_base +name = Visual +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = ZAV_layer_010 intent_category = visual material = generic_abs -variant = 0.40mm_ZAV_Nozzle +quality_type = ZAV_layer_010 +setting_version = 20 +type = intent +variant = 0.40mm_ZAV_Nozzle [values] -speed_print = 50 +adaptive_layer_height_enabled = true speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 50 speed_topbottom = 35 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall -adaptive_layer_height_enabled = true +speed_wall_x = =speed_wall diff --git a/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.15_eng.inst.inst.cfg b/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.15_eng.inst.inst.cfg index 6cc10ca8b1..d7698db2d3 100644 --- a/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.15_eng.inst.inst.cfg +++ b/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.15_eng.inst.inst.cfg @@ -1,22 +1,22 @@ [general] -version = 4 -name = Accurate definition = zav_base +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_abs +quality_type = ZAV_layer_015 setting_version = 20 type = intent -intent_category = engineering -quality_type = ZAV_layer_015 -material = generic_abs -variant = 0.40mm_ZAV_Nozzle +variant = 0.40mm_ZAV_Nozzle [values] -speed_print = 70 speed_infill = =speed_print speed_layer_0 = 25 +speed_print = 70 speed_topbottom = 40 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall +speed_wall_x = =speed_wall diff --git a/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.15_visual.inst.inst.cfg b/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.15_visual.inst.inst.cfg index 711074863e..4d99025c39 100644 --- a/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.15_visual.inst.inst.cfg +++ b/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.15_visual.inst.inst.cfg @@ -1,23 +1,23 @@ [general] -version = 4 -name = Visual definition = zav_base +name = Visual +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = ZAV_layer_015 intent_category = visual material = generic_abs -variant = 0.40mm_ZAV_Nozzle +quality_type = ZAV_layer_015 +setting_version = 20 +type = intent +variant = 0.40mm_ZAV_Nozzle [values] -speed_print = 50 +adaptive_layer_height_enabled = true speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 50 speed_topbottom = 35 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall -adaptive_layer_height_enabled = true +speed_wall_x = =speed_wall diff --git a/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.20_eng.inst.inst.cfg b/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.20_eng.inst.inst.cfg index daf37e9202..1bdf3e41d7 100644 --- a/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.20_eng.inst.inst.cfg +++ b/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.20_eng.inst.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Accurate definition = zav_base +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_abs +quality_type = ZAV_layer_020 setting_version = 20 type = intent -intent_category = engineering -quality_type = ZAV_layer_020 -material = generic_abs -variant = 0.40mm_ZAV_Nozzle +variant = 0.40mm_ZAV_Nozzle [values] -speed_print = 70 speed_infill = =speed_print speed_layer_0 = 25 +speed_print = 70 speed_topbottom = 40 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall +speed_wall_x = =speed_wall + diff --git a/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.20_quick.inst.cfg b/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.20_quick.inst.cfg index bebe2fe8bc..2ae99b08c7 100644 --- a/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.20_quick.inst.cfg +++ b/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.20_quick.inst.cfg @@ -1,29 +1,29 @@ [general] -version = 4 -name = Quick definition = zav_base +name = Quick +version = 4 [metadata] +intent_category = quick +material = generic_abs +quality_type = ZAV_layer_020 setting_version = 20 type = intent -intent_category = quick -quality_type = ZAV_layer_020 -material = generic_abs -variant = 0.40mm_ZAV_Nozzle +variant = 0.40mm_ZAV_Nozzle [values] -jerk_print = 30 jerk_infill = =jerk_print +jerk_layer_0 = 5 +jerk_print = 30 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 -speed_print = 100 speed_infill = =speed_print speed_layer_0 = 25 +speed_print = 100 speed_topbottom = 65 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall +speed_wall_x = =speed_wall diff --git a/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.20_visual.inst.inst.cfg b/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.20_visual.inst.inst.cfg index 55af55c502..ae322b076b 100644 --- a/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.20_visual.inst.inst.cfg +++ b/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.20_visual.inst.inst.cfg @@ -1,23 +1,23 @@ [general] -version = 4 -name = Visual definition = zav_base +name = Visual +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = ZAV_layer_020 intent_category = visual material = generic_abs -variant = 0.40mm_ZAV_Nozzle +quality_type = ZAV_layer_020 +setting_version = 20 +type = intent +variant = 0.40mm_ZAV_Nozzle [values] -speed_print = 50 +adaptive_layer_height_enabled = true speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 50 speed_topbottom = 35 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall -adaptive_layer_height_enabled = true +speed_wall_x = =speed_wall diff --git a/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.25_quick.inst.cfg b/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.25_quick.inst.cfg index 0b7a66b02d..2e2f2b49c5 100644 --- a/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.25_quick.inst.cfg +++ b/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.25_quick.inst.cfg @@ -1,29 +1,29 @@ [general] -version = 4 -name = Quick definition = zav_base +name = Quick +version = 4 [metadata] +intent_category = quick +material = generic_abs +quality_type = ZAV_layer_025 setting_version = 20 type = intent -intent_category = quick -quality_type = ZAV_layer_025 -material = generic_abs -variant = 0.40mm_ZAV_Nozzle +variant = 0.40mm_ZAV_Nozzle [values] -jerk_print = 30 jerk_infill = =jerk_print +jerk_layer_0 = 5 +jerk_print = 30 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 -speed_print = 100 speed_infill = =speed_print speed_layer_0 = 25 +speed_print = 100 speed_topbottom = 65 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall +speed_wall_x = =speed_wall diff --git a/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.30_quick.inst.cfg b/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.30_quick.inst.cfg index 31b2268489..b38db87bea 100644 --- a/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.30_quick.inst.cfg +++ b/resources/intent/zav_base/abs/zav_abs_nozzle_0.40_layer_0.30_quick.inst.cfg @@ -1,29 +1,29 @@ [general] -version = 4 -name = Quick definition = zav_base +name = Quick +version = 4 [metadata] +intent_category = quick +material = generic_abs +quality_type = ZAV_layer_030 setting_version = 20 type = intent -intent_category = quick -quality_type = ZAV_layer_030 -material = generic_abs -variant = 0.40mm_ZAV_Nozzle +variant = 0.40mm_ZAV_Nozzle [values] -jerk_print = 30 jerk_infill = =jerk_print +jerk_layer_0 = 5 +jerk_print = 30 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 -speed_print = 100 speed_infill = =speed_print speed_layer_0 = 25 +speed_print = 100 speed_topbottom = 65 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall +speed_wall_x = =speed_wall diff --git a/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.10_visual.inst.inst.cfg b/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.10_visual.inst.inst.cfg index 26404954b4..1343a3762e 100644 --- a/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.10_visual.inst.inst.cfg +++ b/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.10_visual.inst.inst.cfg @@ -1,23 +1,23 @@ [general] -version = 4 -name = Visual definition = zav_base +name = Visual +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = ZAV_layer_010 intent_category = visual material = generic_petg -variant = 0.40mm_ZAV_Nozzle +quality_type = ZAV_layer_010 +setting_version = 20 +type = intent +variant = 0.40mm_ZAV_Nozzle [values] -speed_print = 50 +adaptive_layer_height_enabled = true speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 50 speed_topbottom = 35 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall -adaptive_layer_height_enabled = true +speed_wall_x = =speed_wall diff --git a/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.15_eng.inst.inst.cfg b/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.15_eng.inst.inst.cfg index 59175befc3..217d81f9af 100644 --- a/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.15_eng.inst.inst.cfg +++ b/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.15_eng.inst.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Accurate definition = zav_base +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_petg +quality_type = ZAV_layer_015 setting_version = 20 type = intent -intent_category = engineering -quality_type = ZAV_layer_015 -material = generic_petg -variant = 0.40mm_ZAV_Nozzle +variant = 0.40mm_ZAV_Nozzle [values] -speed_print = 70 speed_infill = =speed_print speed_layer_0 = 25 +speed_print = 70 speed_topbottom = 40 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall +speed_wall_x = =speed_wall + diff --git a/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.15_visual.inst.inst.cfg b/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.15_visual.inst.inst.cfg index 54226ebd41..4bed4bfa98 100644 --- a/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.15_visual.inst.inst.cfg +++ b/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.15_visual.inst.inst.cfg @@ -1,23 +1,23 @@ [general] -version = 4 -name = Visual definition = zav_base +name = Visual +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = ZAV_layer_015 intent_category = visual material = generic_petg -variant = 0.40mm_ZAV_Nozzle +quality_type = ZAV_layer_015 +setting_version = 20 +type = intent +variant = 0.40mm_ZAV_Nozzle [values] -speed_print = 50 +adaptive_layer_height_enabled = true speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 50 speed_topbottom = 35 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall -adaptive_layer_height_enabled = true +speed_wall_x = =speed_wall diff --git a/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.20_eng.inst.inst.cfg b/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.20_eng.inst.inst.cfg index 59e5cd1082..4a117f0cd6 100644 --- a/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.20_eng.inst.inst.cfg +++ b/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.20_eng.inst.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Accurate definition = zav_base +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_petg +quality_type = ZAV_layer_020 setting_version = 20 type = intent -intent_category = engineering -quality_type = ZAV_layer_020 -material = generic_petg -variant = 0.40mm_ZAV_Nozzle +variant = 0.40mm_ZAV_Nozzle [values] -speed_print = 70 speed_infill = =speed_print speed_layer_0 = 25 +speed_print = 70 speed_topbottom = 40 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall +speed_wall_x = =speed_wall + diff --git a/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.20_quick.inst.cfg b/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.20_quick.inst.cfg index 9d91773da6..f2c2de0e88 100644 --- a/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.20_quick.inst.cfg +++ b/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.20_quick.inst.cfg @@ -1,29 +1,29 @@ [general] -version = 4 -name = Quick definition = zav_base +name = Quick +version = 4 [metadata] +intent_category = quick +material = generic_petg +quality_type = ZAV_layer_020 setting_version = 20 type = intent -intent_category = quick -quality_type = ZAV_layer_020 -material = generic_petg -variant = 0.40mm_ZAV_Nozzle +variant = 0.40mm_ZAV_Nozzle [values] -jerk_print = 30 jerk_infill = =jerk_print +jerk_layer_0 = 5 +jerk_print = 30 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 -speed_print = 100 speed_infill = =speed_print speed_layer_0 = 25 +speed_print = 100 speed_topbottom = 65 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall +speed_wall_x = =speed_wall diff --git a/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.20_visual.inst.inst.cfg b/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.20_visual.inst.inst.cfg index 4a1b28bb53..e111d89694 100644 --- a/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.20_visual.inst.inst.cfg +++ b/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.20_visual.inst.inst.cfg @@ -1,23 +1,23 @@ [general] -version = 4 -name = Visual definition = zav_base +name = Visual +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = ZAV_layer_020 intent_category = visual material = generic_petg -variant = 0.40mm_ZAV_Nozzle +quality_type = ZAV_layer_020 +setting_version = 20 +type = intent +variant = 0.40mm_ZAV_Nozzle [values] -speed_print = 50 +adaptive_layer_height_enabled = true speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 50 speed_topbottom = 35 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall -adaptive_layer_height_enabled = true +speed_wall_x = =speed_wall diff --git a/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.25_quick.inst.cfg b/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.25_quick.inst.cfg index 00c54879a9..8e1683d349 100644 --- a/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.25_quick.inst.cfg +++ b/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.25_quick.inst.cfg @@ -1,29 +1,29 @@ [general] -version = 4 -name = Quick definition = zav_base +name = Quick +version = 4 [metadata] +intent_category = quick +material = generic_petg +quality_type = ZAV_layer_025 setting_version = 20 type = intent -intent_category = quick -quality_type = ZAV_layer_025 -material = generic_petg -variant = 0.40mm_ZAV_Nozzle +variant = 0.40mm_ZAV_Nozzle [values] -jerk_print = 30 jerk_infill = =jerk_print +jerk_layer_0 = 5 +jerk_print = 30 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 -speed_print = 100 speed_infill = =speed_print speed_layer_0 = 25 +speed_print = 100 speed_topbottom = 65 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall +speed_wall_x = =speed_wall diff --git a/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.30_quick.inst.cfg b/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.30_quick.inst.cfg index 445228fa7d..7a1e1df485 100644 --- a/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.30_quick.inst.cfg +++ b/resources/intent/zav_base/petg/zav_petg_nozzle_0.40_layer_0.30_quick.inst.cfg @@ -1,29 +1,29 @@ [general] -version = 4 -name = Quick definition = zav_base +name = Quick +version = 4 [metadata] +intent_category = quick +material = generic_petg +quality_type = ZAV_layer_030 setting_version = 20 type = intent -intent_category = quick -quality_type = ZAV_layer_030 -material = generic_petg -variant = 0.40mm_ZAV_Nozzle +variant = 0.40mm_ZAV_Nozzle [values] -jerk_print = 30 jerk_infill = =jerk_print +jerk_layer_0 = 5 +jerk_print = 30 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 -speed_print = 100 speed_infill = =speed_print speed_layer_0 = 25 +speed_print = 100 speed_topbottom = 65 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall +speed_wall_x = =speed_wall diff --git a/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.10_visual.inst.inst.cfg b/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.10_visual.inst.inst.cfg index d547381aef..5a5cf67b45 100644 --- a/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.10_visual.inst.inst.cfg +++ b/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.10_visual.inst.inst.cfg @@ -1,23 +1,23 @@ [general] -version = 4 -name = Visual definition = zav_base +name = Visual +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = ZAV_layer_010 intent_category = visual material = generic_pla -variant = 0.40mm_ZAV_Nozzle +quality_type = ZAV_layer_010 +setting_version = 20 +type = intent +variant = 0.40mm_ZAV_Nozzle [values] -speed_print = 50 +adaptive_layer_height_enabled = true speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 50 speed_topbottom = 35 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall -adaptive_layer_height_enabled = true +speed_wall_x = =speed_wall diff --git a/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.15_eng.inst.inst.cfg b/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.15_eng.inst.inst.cfg index e310858197..676241b57a 100644 --- a/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.15_eng.inst.inst.cfg +++ b/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.15_eng.inst.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Accurate definition = zav_base +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_pla +quality_type = ZAV_layer_015 setting_version = 20 type = intent -intent_category = engineering -quality_type = ZAV_layer_015 -material = generic_pla -variant = 0.40mm_ZAV_Nozzle +variant = 0.40mm_ZAV_Nozzle [values] -speed_print = 70 speed_infill = =speed_print speed_layer_0 = 25 +speed_print = 70 speed_topbottom = 40 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall +speed_wall_x = =speed_wall + diff --git a/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.15_visual.inst.inst.cfg b/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.15_visual.inst.inst.cfg index 42f0a3f9e5..c0b7029297 100644 --- a/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.15_visual.inst.inst.cfg +++ b/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.15_visual.inst.inst.cfg @@ -1,23 +1,23 @@ [general] -version = 4 -name = Visual definition = zav_base +name = Visual +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = ZAV_layer_015 intent_category = visual material = generic_pla -variant = 0.40mm_ZAV_Nozzle +quality_type = ZAV_layer_015 +setting_version = 20 +type = intent +variant = 0.40mm_ZAV_Nozzle [values] -speed_print = 50 +adaptive_layer_height_enabled = true speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 50 speed_topbottom = 35 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall -adaptive_layer_height_enabled = true +speed_wall_x = =speed_wall diff --git a/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.20_eng.inst.inst.cfg b/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.20_eng.inst.inst.cfg index 435d5e7d0a..c0a489cf55 100644 --- a/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.20_eng.inst.inst.cfg +++ b/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.20_eng.inst.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Accurate definition = zav_base +name = Accurate +version = 4 [metadata] +intent_category = engineering +material = generic_pla +quality_type = ZAV_layer_020 setting_version = 20 type = intent -intent_category = engineering -quality_type = ZAV_layer_020 -material = generic_pla -variant = 0.40mm_ZAV_Nozzle +variant = 0.40mm_ZAV_Nozzle [values] -speed_print = 70 speed_infill = =speed_print speed_layer_0 = 25 +speed_print = 70 speed_topbottom = 40 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall +speed_wall_x = =speed_wall + diff --git a/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.20_quick.inst.cfg b/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.20_quick.inst.cfg index a1b78a2a82..79dc08a926 100644 --- a/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.20_quick.inst.cfg +++ b/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.20_quick.inst.cfg @@ -1,29 +1,29 @@ [general] -version = 4 -name = Quick definition = zav_base +name = Quick +version = 4 [metadata] +intent_category = quick +material = generic_pla +quality_type = ZAV_layer_020 setting_version = 20 type = intent -intent_category = quick -quality_type = ZAV_layer_020 -material = generic_pla -variant = 0.40mm_ZAV_Nozzle +variant = 0.40mm_ZAV_Nozzle [values] -jerk_print = 30 jerk_infill = =jerk_print +jerk_layer_0 = 5 +jerk_print = 30 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 -speed_print = 100 speed_infill = =speed_print speed_layer_0 = 25 +speed_print = 100 speed_topbottom = 65 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall +speed_wall_x = =speed_wall diff --git a/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.20_visual.inst.inst.cfg b/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.20_visual.inst.inst.cfg index 75310d58b5..d574d3efe9 100644 --- a/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.20_visual.inst.inst.cfg +++ b/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.20_visual.inst.inst.cfg @@ -1,23 +1,23 @@ [general] -version = 4 -name = Visual definition = zav_base +name = Visual +version = 4 [metadata] -setting_version = 20 -type = intent -quality_type = ZAV_layer_020 intent_category = visual material = generic_pla -variant = 0.40mm_ZAV_Nozzle +quality_type = ZAV_layer_020 +setting_version = 20 +type = intent +variant = 0.40mm_ZAV_Nozzle [values] -speed_print = 50 +adaptive_layer_height_enabled = true speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 50 speed_topbottom = 35 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall -adaptive_layer_height_enabled = true +speed_wall_x = =speed_wall diff --git a/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.25_quick.inst.cfg b/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.25_quick.inst.cfg index f3c38d26d8..6a331bbbc2 100644 --- a/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.25_quick.inst.cfg +++ b/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.25_quick.inst.cfg @@ -1,29 +1,29 @@ [general] -version = 4 -name = Quick definition = zav_base +name = Quick +version = 4 [metadata] +intent_category = quick +material = generic_pla +quality_type = ZAV_layer_025 setting_version = 20 type = intent -intent_category = quick -quality_type = ZAV_layer_025 -material = generic_pla -variant = 0.40mm_ZAV_Nozzle +variant = 0.40mm_ZAV_Nozzle [values] -jerk_print = 30 jerk_infill = =jerk_print +jerk_layer_0 = 5 +jerk_print = 30 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 -speed_print = 100 speed_infill = =speed_print speed_layer_0 = 25 +speed_print = 100 speed_topbottom = 65 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall +speed_wall_x = =speed_wall diff --git a/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.30_quick.inst.cfg b/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.30_quick.inst.cfg index cbdb7bdc91..f560001200 100644 --- a/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.30_quick.inst.cfg +++ b/resources/intent/zav_base/pla/zav_pla_nozzle_0.40_layer_0.30_quick.inst.cfg @@ -1,29 +1,29 @@ [general] -version = 4 -name = Quick definition = zav_base +name = Quick +version = 4 [metadata] +intent_category = quick +material = generic_pla +quality_type = ZAV_layer_030 setting_version = 20 type = intent -intent_category = quick -quality_type = ZAV_layer_030 -material = generic_pla -variant = 0.40mm_ZAV_Nozzle +variant = 0.40mm_ZAV_Nozzle [values] -jerk_print = 30 jerk_infill = =jerk_print +jerk_layer_0 = 5 +jerk_print = 30 jerk_topbottom = =jerk_print jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 -speed_print = 100 speed_infill = =speed_print speed_layer_0 = 25 +speed_print = 100 speed_topbottom = 65 speed_wall = =speed_topbottom speed_wall_0 = =speed_wall -speed_wall_x = =speed_wall +speed_wall_x = =speed_wall diff --git a/resources/meshes/blocks_mk2_platform.stl b/resources/meshes/blocks_mk2_platform.stl new file mode 100644 index 0000000000..d6bb991076 Binary files /dev/null and b/resources/meshes/blocks_mk2_platform.stl differ diff --git a/resources/meshes/blocks_pros100_platform.stl b/resources/meshes/blocks_pros100_platform.stl new file mode 100644 index 0000000000..701c2a1d6c Binary files /dev/null and b/resources/meshes/blocks_pros100_platform.stl differ diff --git a/resources/meshes/blocks_pros30_platform.stl b/resources/meshes/blocks_pros30_platform.stl new file mode 100644 index 0000000000..1467a26489 Binary files /dev/null and b/resources/meshes/blocks_pros30_platform.stl differ diff --git a/resources/meshes/blocks_r21_platform.stl b/resources/meshes/blocks_r21_platform.stl new file mode 100644 index 0000000000..2269ea0fe7 Binary files /dev/null and b/resources/meshes/blocks_r21_platform.stl differ diff --git a/resources/meshes/blocks_rd50_platform.stl b/resources/meshes/blocks_rd50_platform.stl new file mode 100644 index 0000000000..1e08e064d5 Binary files /dev/null and b/resources/meshes/blocks_rd50_platform.stl differ diff --git a/resources/meshes/blocks_zero_platform.stl b/resources/meshes/blocks_zero_platform.stl new file mode 100644 index 0000000000..800fe6050f Binary files /dev/null and b/resources/meshes/blocks_zero_platform.stl differ diff --git a/resources/meshes/dagoma_sigma.obj b/resources/meshes/dagoma_sigma.obj deleted file mode 100644 index f0c81c2648..0000000000 --- a/resources/meshes/dagoma_sigma.obj +++ /dev/null @@ -1,32787 +0,0 @@ -# Blender v3.0.0 OBJ File: '' -# www.blender.org -mtllib dagoma_sigma.mtl -o dagoma_sigma -v 116.269547 -100.295242 -6.158583 -v 116.269547 -100.295235 -51.158585 -v 127.206375 -91.693550 -51.158585 -v 127.206375 -91.693558 -6.158583 -v 135.604782 -80.599861 -51.158581 -v 135.604782 -80.599869 -6.158581 -v 140.915863 -67.739258 -51.158577 -v 140.915863 -67.739265 -6.158579 -v 142.792480 -53.952209 -51.158577 -v 142.792480 -53.952217 -6.158579 -v 22.584963 150.662720 -6.158533 -v 22.584959 150.662720 -51.158531 -v 13.292356 155.945740 -51.158531 -v 13.292360 155.945740 -6.158533 -v 2.958069 158.678040 -51.158531 -v 2.958073 158.678040 -6.158529 -v -7.731308 158.678040 -51.158531 -v -7.731304 158.678040 -6.158529 -v -18.065584 155.945740 -51.158531 -v -18.065580 155.945740 -6.158529 -v -27.358202 150.662720 -51.158531 -v -27.358198 150.662720 -6.158529 -v -147.565720 -53.952217 -6.158552 -v -147.565720 -53.952209 -51.158554 -v -149.330643 -63.792114 -51.158554 -v -149.330643 -63.792122 -6.158552 -v -148.318283 -73.737671 -51.158554 -v -148.318283 -73.737679 -6.158554 -v -144.606918 -83.020149 -51.158554 -v -144.606918 -83.020157 -6.158556 -v -138.483353 -90.922066 -51.158562 -v -138.483353 -90.922073 -6.158560 -v -130.420914 -96.832710 -51.158562 -v -130.420914 -96.832718 -6.158560 -v -121.042770 -100.295235 -51.158562 -v -121.042770 -100.295242 -6.158562 -v -123.082687 -102.095230 -5.358574 -v -102.770126 -102.095230 -5.358576 -v -123.082687 -102.095230 -0.358574 -v -102.770126 -102.095230 -0.358576 -v -127.645279 -101.838089 -0.358574 -v -127.645279 -101.838089 -5.358574 -v -132.115952 -100.891068 -0.358574 -v -132.115952 -100.891068 -5.358574 -v -136.390945 -99.276138 -0.358572 -v -136.390945 -99.276138 -5.358572 -v -140.371140 -97.030777 -0.358572 -v -140.371140 -97.030777 -5.358572 -v -143.964188 -94.206985 -0.358570 -v -143.964188 -94.206985 -5.358570 -v -147.086746 -90.870316 -0.358570 -v -147.086746 -90.870316 -5.358570 -v -149.666397 -87.098221 -0.358568 -v -149.666397 -87.098221 -5.358568 -v -151.643326 -82.978104 -0.358568 -v -151.643326 -82.978104 -5.358568 -v -152.971664 -78.605545 -0.358568 -v -152.971664 -78.605545 -5.358568 -v -153.620590 -74.081978 -0.358566 -v -153.620590 -74.081978 -5.358566 -v -153.575058 -69.512337 -0.358566 -v -153.575058 -69.512337 -5.358566 -v -152.836136 -65.002632 -0.358566 -v -152.836136 -65.002632 -5.358566 -v -151.420975 -60.657417 -0.358564 -v -151.420975 -60.657417 -5.358564 -v -149.362350 -56.577522 -0.358564 -v -149.362350 -56.577522 -5.358564 -v -139.206070 -38.986336 -5.358562 -v -139.206070 -38.986336 -0.358562 -v -37.077950 137.904785 -5.358541 -v 35.793922 137.904785 -5.358549 -v -37.077950 137.904785 -0.358541 -v 35.793922 137.904785 -0.358549 -v -26.921675 155.495972 -5.358541 -v -26.921675 155.495972 -0.358541 -v -24.417677 159.318787 -0.358540 -v -24.417677 159.318787 -5.358540 -v -21.362196 162.716919 -0.358540 -v -21.362196 162.716919 -5.358540 -v -17.826139 165.611694 -0.358540 -v -17.826139 165.611694 -5.358540 -v -13.891476 167.935913 -0.358540 -v -13.891477 167.935913 -5.358540 -v -9.649502 169.635742 -0.358541 -v -9.649503 169.635742 -5.358541 -v -5.198589 170.671631 -0.358540 -v -5.198589 170.671631 -5.358540 -v -0.642009 171.019653 -0.358540 -v -0.642009 171.019653 -5.358540 -v 3.914586 170.671631 -0.358540 -v 3.914585 170.671631 -5.358540 -v 8.365481 169.635742 -0.358541 -v 8.365481 169.635742 -5.358541 -v 12.607455 167.935913 -0.358543 -v 12.607454 167.935913 -5.358543 -v 16.542101 165.611694 -0.358543 -v 16.542101 165.611694 -5.358543 -v 20.078203 162.716919 -0.358543 -v 20.078203 162.716919 -5.358543 -v 23.133654 159.318787 -0.358543 -v 23.133654 159.318787 -5.358543 -v 25.637667 155.495972 -0.358545 -v 25.637667 155.495972 -5.358545 -v 137.922058 -38.986336 -5.358585 -v 101.486130 -102.095230 -5.358595 -v 137.922058 -38.986336 -0.358585 -v 101.486130 -102.095230 -0.358595 -v 148.078308 -56.577522 -5.358591 -v 148.078308 -56.577522 -0.358591 -v 150.136932 -60.657417 -0.358591 -v 150.136932 -60.657417 -5.358591 -v 151.552124 -65.002632 -0.358593 -v 151.552124 -65.002632 -5.358593 -v 152.291046 -69.512337 -0.358593 -v 152.291046 -69.512337 -5.358593 -v 152.336578 -74.081978 -0.358593 -v 152.336578 -74.081978 -5.358593 -v 151.687637 -78.605545 -0.358595 -v 151.687637 -78.605545 -5.358595 -v 150.359314 -82.978104 -0.358595 -v 150.359314 -82.978104 -5.358595 -v 148.382385 -87.098221 -0.358595 -v 148.382385 -87.098221 -5.358595 -v 145.802719 -90.870316 -0.358597 -v 145.802719 -90.870316 -5.358597 -v 142.680145 -94.206985 -0.358597 -v 142.680145 -94.206985 -5.358597 -v 139.087097 -97.030777 -0.358595 -v 139.087097 -97.030777 -5.358595 -v 135.106934 -99.276138 -0.358595 -v 135.106934 -99.276138 -5.358595 -v 130.831940 -100.891068 -0.358597 -v 130.831940 -100.891068 -5.358597 -v 126.361267 -101.838089 -0.358597 -v 126.361267 -101.838089 -5.358597 -v 121.798645 -102.095230 -0.358597 -v 121.798645 -102.095230 -5.358597 -v -75.468079 71.011162 -41.438019 -v -78.622284 65.547905 -19.437988 -v -75.641296 71.111076 -41.438019 -v -78.795486 65.647881 -19.437988 -v -75.257874 71.375175 -10.508545 -v -75.431061 71.475212 -10.508545 -v -76.992767 68.770317 -11.243986 -v -76.819550 68.670280 -11.243986 -v -78.226288 66.633781 -13.295835 -v -78.053085 66.533745 -13.295835 -v -78.872452 65.514580 -16.232910 -v -78.699249 65.414543 -16.232910 -v -31.470793 147.216614 -10.508535 -v -31.643980 147.316650 -10.508535 -v -149.488052 -57.195259 -6.664930 -v -149.488052 -57.195255 -19.516094 -v -150.046494 -58.207344 -9.063002 -v -150.565262 -59.240303 -11.461103 -v -150.625809 -59.367683 -10.019728 -v -150.460129 -59.022713 -8.623335 -v -150.074387 -58.260445 -7.454725 -v -149.650925 -57.077396 -19.588024 -v -149.477737 -57.177372 -19.588024 -v -148.941330 -55.848270 -22.220165 -v -148.768112 -55.948246 -22.220165 -v -147.747208 -53.780033 -24.019817 -v -147.573990 -53.880009 -24.019817 -v -146.286514 -51.250004 -24.658550 -v -146.113327 -51.350040 -24.658550 -v 2.122208 -101.895210 -44.258575 -v 72.093765 -101.895210 -44.258583 -v 2.122208 -102.095222 -44.258575 -v 72.093765 -102.095222 -44.258583 -v -0.799163 -102.095222 -43.619843 -v -0.799163 -101.895210 -43.619843 -v -3.187392 -102.095222 -41.820160 -v -3.187392 -101.895210 -41.820160 -v -4.606627 -102.095222 -39.188049 -v -4.606627 -101.895210 -39.188049 -v -9.975752 -101.895210 -20.463654 -v -9.975752 -102.095222 -20.463654 -v -10.151701 -102.095222 -16.800690 -v -10.151701 -101.895210 -16.800690 -v -8.674741 -102.095222 -13.444065 -v -8.674741 -101.895210 -13.444065 -v -5.855251 -102.095222 -11.099094 -v -5.855251 -101.895210 -11.099094 -v -2.285656 -102.095222 -10.258579 -v -2.285656 -101.895210 -10.258579 -v 76.501617 -101.895210 -10.258587 -v 76.501617 -102.095222 -10.258587 -v -8.959608 -101.808235 -20.172302 -v -8.917891 -101.720222 -20.160339 -v -9.069654 -101.720222 -17.001221 -v -8.803328 -101.564888 -20.127502 -v -8.654005 -101.445747 -20.084686 -v -8.799711 -101.445747 -17.051270 -v -8.569441 -101.402351 -20.060425 -v -8.293531 -101.345222 -19.981323 -v -8.430998 -101.345222 -17.119598 -v -2.285656 -101.345222 -12.008579 -v -2.285656 -101.445747 -11.633579 -v -5.074398 -101.345222 -12.665226 -v -5.241726 -101.445747 -12.329624 -v -7.277127 -101.345222 -14.497254 -v -7.576611 -101.445747 -14.271546 -v -2.285656 -101.720222 -11.359074 -v -5.364209 -101.720222 -12.083988 -v -7.795849 -101.720222 -14.106327 -v -2.285656 -102.095222 -11.258579 -v -5.409039 -102.095222 -11.994022 -v -7.876111 -102.095222 -14.045872 -v -9.168440 -102.095222 -16.982941 -v -9.014494 -102.095222 -20.188019 -v 76.501617 -102.095222 -11.258587 -v 76.501617 -101.720222 -11.359081 -v 76.501617 -101.445747 -11.633587 -v 76.501617 -101.345222 -12.008587 -v 82.509521 -101.345222 -19.981335 -v 82.869980 -101.445747 -20.084696 -v 82.646973 -101.345222 -17.119608 -v 83.015686 -101.445747 -17.051279 -v 81.493088 -101.345222 -14.497262 -v 81.792603 -101.445747 -14.271554 -v 79.290375 -101.345222 -12.665234 -v 79.457687 -101.445747 -12.329632 -v 83.133881 -101.720222 -20.160349 -v 83.285614 -101.720222 -17.001230 -v 82.011826 -101.720222 -14.106335 -v 79.580170 -101.720222 -12.083996 -v 83.230469 -102.095222 -20.188028 -v 83.384399 -102.095222 -16.982950 -v 82.092087 -102.095222 -14.045879 -v 79.625015 -102.095222 -11.994030 -v 72.093765 -101.345222 -42.508583 -v 72.093765 -101.445747 -42.883583 -v 74.284805 -101.345222 -42.029518 -v 74.441299 -101.445747 -42.370308 -v 76.075958 -101.345222 -40.679787 -v 76.360413 -101.445747 -40.924171 -v 77.140396 -101.345222 -38.705666 -v 77.500854 -101.445747 -38.809029 -v 72.093765 -101.720222 -43.158119 -v 74.555847 -101.720222 -42.619759 -v 76.568649 -101.720222 -41.103035 -v 77.764755 -101.720222 -38.884712 -v 72.093765 -102.095222 -43.258583 -v 74.597794 -102.095222 -42.711067 -v 76.644852 -102.095222 -41.168526 -v 77.861343 -102.095222 -38.912422 -v 36.723389 -101.921944 -29.008581 -v 36.890938 -100.037117 -29.008581 -v 8.374664 -100.595222 -29.008579 -v 37.019089 -98.595222 -29.008579 -v 8.196871 -98.595222 -29.008577 -v 8.595413 -102.330269 -29.008579 -v 8.812927 -102.595284 -29.008579 -v 36.403046 -102.595284 -29.008581 -v 8.501022 -102.016853 -29.008579 -v 36.668793 -102.239815 -29.008581 -v 36.403046 -103.595222 -30.008581 -v 8.812927 -103.595222 -30.008579 -v 8.196871 -98.595222 -25.508579 -v 37.019089 -98.595222 -25.508579 -v 8.325058 -100.037117 -25.508579 -v 36.841316 -100.595222 -25.508579 -v 8.492584 -101.921944 -25.508579 -v 36.620575 -102.330269 -25.508581 -v 36.403046 -102.595284 -25.508581 -v 8.812927 -102.595284 -25.508579 -v 36.714958 -102.016853 -25.508581 -v 8.547165 -102.239815 -25.508579 -v 36.876366 -102.351631 -25.587194 -v 36.748367 -102.398628 -25.537848 -v 36.906044 -101.190559 -25.531012 -v 36.963211 -102.339668 -25.652807 -v 37.068230 -102.382149 -25.830816 -v 37.032204 -102.352974 -25.745367 -v 37.085548 -101.190559 -25.710516 -v 36.990448 -102.341255 -25.682959 -v 36.986275 -99.761909 -25.522100 -v 36.663994 -102.441841 -25.522131 -v 37.014381 -101.190559 -25.602179 -v 37.051575 -99.761909 -25.565006 -v 37.094460 -99.761909 -25.630285 -v 37.048531 -98.595222 -25.513584 -v 37.074638 -98.595222 -25.528082 -v 37.094460 -98.595222 -25.550360 -v 37.101761 -98.595222 -25.564762 -v 37.105812 -98.595222 -25.577948 -v 37.107986 -98.595222 -25.597479 -v 37.107986 -100.037117 -25.725620 -v 37.107986 -101.921944 -25.893194 -v 37.107986 -102.239815 -25.947790 -v 37.107986 -102.595284 -26.213537 -v 37.107986 -98.595222 -28.919683 -v 37.107986 -100.595222 -28.741919 -v 37.107986 -102.330269 -28.521154 -v 37.107986 -102.595284 -28.303656 -v 37.107986 -102.016853 -28.615545 -v 38.107979 -103.595222 -28.303656 -v 38.107979 -103.595222 -26.213537 -v 37.607979 -103.095222 -26.213537 -v 37.358002 -102.845222 -26.213537 -v 36.828415 -102.697762 -25.306158 -v 37.444099 -102.974129 -25.489050 -v 37.303703 -102.967415 -25.309668 -v 37.309181 -102.696724 -25.783972 -v 37.540421 -102.996223 -25.702856 -v 36.908432 -102.996956 -25.074469 -v 36.403046 -103.095222 -25.008581 -v 36.403046 -102.845222 -25.258581 -v 37.122772 -102.974373 -25.169653 -v 36.403046 -103.595222 -24.508581 -v 37.068497 -103.595222 -24.611090 -v 37.327003 -103.595222 -24.726995 -v 37.644730 -103.595222 -24.967077 -v 37.839455 -103.595222 -25.206854 -v 38.002892 -103.595222 -25.540655 -v 38.086159 -103.595222 -25.888159 -v 8.812928 -103.595222 -24.508579 -v 37.107986 -103.595222 -23.508581 -v 8.107989 -103.595222 -23.508579 -v 38.107979 -103.595222 -23.776525 -v 6.107988 -103.595222 -29.008579 -v 7.107988 -103.595222 -28.303654 -v 6.107989 -103.595222 -25.508579 -v 7.107989 -103.595222 -26.213535 -v 6.375933 -103.595222 -24.508579 -v 7.287982 -103.595222 -25.362276 -v 7.107989 -103.595222 -23.776524 -v 7.669802 -103.595222 -24.877506 -v 8.313142 -103.595222 -24.563145 -v 38.840042 -103.595222 -24.508581 -v 39.107994 -103.595222 -25.508581 -v 37.107986 -103.595222 -31.008581 -v 8.107988 -103.595222 -31.008579 -v 7.107988 -103.595222 -30.740604 -v 7.961687 -103.595222 -29.828617 -v 6.375933 -103.595222 -30.008579 -v 7.476915 -103.595222 -29.446751 -v 7.162539 -103.595222 -28.803410 -v 39.107994 -103.595222 -29.008581 -v 38.840042 -103.595222 -30.008581 -v 37.928001 -103.595222 -29.154852 -v 38.107979 -103.595222 -30.740606 -v 37.546173 -103.595222 -29.639654 -v 36.902832 -103.595222 -29.954046 -v 37.107986 -102.095222 -32.508579 -v 8.107988 -102.095222 -32.508579 -v 4.607988 -102.095222 -29.008577 -v 5.076906 -102.095222 -30.758577 -v 6.357988 -102.095222 -32.039677 -v 4.607989 -102.095222 -25.508579 -v 8.107989 -102.095222 -22.008579 -v 6.357989 -102.095222 -22.477482 -v 5.076907 -102.095222 -23.758579 -v 37.107986 -102.095222 -22.008579 -v 40.607971 -102.095222 -25.508581 -v 40.139061 -102.095222 -23.758581 -v 38.857979 -102.095222 -22.477484 -v 40.607971 -102.095222 -29.008581 -v 38.857979 -102.095222 -32.039680 -v 40.139061 -102.095222 -30.758581 -v 53.036140 -103.345222 -27.258583 -v 53.036140 -104.095222 -27.258583 -v 54.318535 -103.345222 -32.044502 -v 54.318535 -104.095222 -32.044502 -v 57.822060 -103.345222 -35.548073 -v 57.822060 -104.095222 -35.548073 -v 62.607986 -103.345222 -36.830421 -v 62.607986 -104.095222 -36.830421 -v 67.393906 -103.345222 -35.548073 -v 67.393906 -104.095222 -35.548073 -v 70.897446 -103.345222 -32.044502 -v 70.897446 -104.095222 -32.044502 -v 72.179840 -103.345222 -27.258583 -v 72.179840 -104.095222 -27.258583 -v 70.897446 -103.345222 -22.472664 -v 70.897446 -104.095222 -22.472666 -v 67.393906 -103.345222 -18.969124 -v 67.393906 -104.095222 -18.969124 -v 62.607986 -103.345222 -17.686714 -v 62.607986 -104.095222 -17.686714 -v 57.822060 -103.345222 -18.969124 -v 57.822060 -104.095222 -18.969124 -v 54.318535 -103.345222 -22.472664 -v 54.318535 -104.095222 -22.472664 -v 52.036148 -104.095222 -27.258583 -v 53.452507 -104.095222 -32.544502 -v 57.322067 -104.095222 -36.414101 -v 62.607986 -104.095222 -37.830452 -v 67.893906 -104.095222 -36.414101 -v 71.763474 -104.095222 -32.544502 -v 73.179825 -104.095222 -27.258585 -v 71.763474 -104.095222 -21.972666 -v 67.893906 -104.095222 -18.103096 -v 62.607986 -104.095222 -16.686745 -v 57.322067 -104.095222 -18.103096 -v 53.452507 -104.095222 -21.972664 -v 74.607971 -103.095222 -27.258585 -v 73.000290 -103.095222 -33.258583 -v 68.608002 -103.095222 -37.650887 -v 62.607986 -103.095222 -39.258583 -v 56.607979 -103.095222 -37.650887 -v 52.215683 -103.095222 -33.258583 -v 50.607994 -103.095222 -27.258583 -v 52.215683 -103.095222 -21.258583 -v 56.607979 -103.095222 -16.866280 -v 62.607986 -103.095222 -15.258584 -v 68.608002 -103.095222 -16.866280 -v 73.000290 -103.095222 -21.258585 -v 74.607971 -102.095222 -27.258585 -v 73.000290 -102.095222 -33.258583 -v 68.608002 -102.095222 -37.650887 -v 62.607986 -102.095222 -39.258583 -v 56.607979 -102.095222 -37.650887 -v 52.215683 -102.095222 -33.258583 -v 50.607994 -102.095222 -27.258583 -v 52.215683 -102.095222 -21.258583 -v 56.607979 -102.095222 -16.866280 -v 62.607986 -102.095222 -15.258583 -v 68.608002 -102.095222 -16.866280 -v 73.000290 -102.095222 -21.258583 -v 81.417892 -102.095222 -17.347389 -v 81.307922 -102.095222 -19.636787 -v 76.146530 -102.095222 -37.636757 -v 75.132767 -102.095222 -39.516853 -v 2.875764 -102.095222 -41.258575 -v 71.340210 -102.095222 -41.258583 -v 73.426910 -102.095222 -40.802345 -v -7.201932 -102.095222 -17.347382 -v -7.091962 -102.095222 -19.636780 -v -1.930556 -102.095222 -37.636753 -v -0.916808 -102.095222 -39.516846 -v 0.789064 -102.095222 -40.802338 -v -2.285656 -102.095222 -13.258579 -v -4.516644 -102.095222 -13.783909 -v -6.278836 -102.095222 -15.249513 -v 80.494797 -102.095222 -15.249520 -v 78.732620 -102.095222 -13.783916 -v 76.501617 -102.095222 -13.258587 -v 76.501617 -101.445747 -12.883587 -v 76.501617 -101.564888 -13.038921 -v 78.830643 -101.564888 -13.587322 -v 76.501617 -101.720222 -13.158123 -v 76.501617 -101.808235 -13.201519 -v 78.758102 -101.808235 -13.732830 -v 81.362823 -101.808235 -19.652504 -v 81.474045 -101.808235 -17.336983 -v 80.540405 -101.808235 -15.215158 -v 81.519104 -101.564888 -19.697304 -v 81.633911 -101.564888 -17.307381 -v 80.670242 -101.564888 -15.117318 -v 81.752991 -101.402351 -19.764381 -v 81.873123 -101.402351 -17.263041 -v 80.864563 -101.402351 -14.970864 -v 78.939209 -101.402351 -13.369579 -v 76.501617 -101.402351 -12.795605 -v 82.028870 -101.345222 -19.843485 -v 82.155350 -101.345222 -17.210733 -v 81.093796 -101.345222 -14.798135 -v 79.067276 -101.345222 -13.112713 -v 76.501617 -101.345222 -12.508587 -v 76.243118 -101.720222 -37.664467 -v 76.357666 -101.564888 -37.697304 -v 76.506989 -101.445747 -37.740150 -v 76.867477 -101.345222 -37.843483 -v 75.209000 -101.720222 -39.582344 -v 71.340210 -101.720222 -41.359077 -v 73.468842 -101.720222 -40.893654 -v 71.340210 -101.445747 -41.633583 -v 73.583405 -101.445747 -41.143135 -v 75.417236 -101.445747 -39.761238 -v 71.340210 -101.345222 -42.008583 -v 73.739899 -101.345222 -41.483925 -v 75.701660 -101.345222 -40.005623 -v 2.875764 -101.808235 -41.315674 -v 2.875764 -101.720222 -41.359070 -v 2.875764 -101.564888 -41.478241 -v 2.875764 -101.445747 -41.633575 -v 2.875764 -101.402351 -41.721588 -v 2.875764 -101.345222 -42.008575 -v -2.291030 -101.445747 -37.740143 -v -2.375609 -101.402351 -37.764374 -v -1.267989 -101.402351 -39.818573 -v 0.765229 -101.808235 -40.854218 -v -0.960112 -101.808235 -39.554047 -v -1.083434 -101.564888 -39.660004 -v -1.985426 -101.808235 -37.652500 -v 0.697389 -101.564888 -41.001984 -v -2.027144 -101.720222 -37.664463 -v -2.141707 -101.564888 -37.697300 -v 0.595842 -101.402351 -41.223083 -v -2.651503 -101.345222 -37.843479 -v -1.485686 -101.345222 -40.005615 -v 0.476060 -101.345222 -41.483917 -v -7.812910 -101.345222 -19.843475 -v -7.537015 -101.402351 -19.764374 -v -7.452435 -101.445747 -19.740143 -v -7.303128 -101.564888 -19.697296 -v -7.188550 -101.720222 -19.664459 -v -7.146848 -101.808235 -19.652496 -v -2.285656 -101.445747 -12.883579 -v -2.285656 -101.402351 -12.795597 -v -4.723233 -101.402351 -13.369572 -v -7.417920 -101.564888 -17.307373 -v -2.285656 -101.808235 -13.201511 -v -7.258069 -101.808235 -17.336975 -v -6.324429 -101.808235 -15.215150 -v -4.542126 -101.808235 -13.732822 -v -4.614666 -101.564888 -13.587315 -v -6.454266 -101.564888 -15.117311 -v -2.285656 -101.720222 -13.158115 -v -2.285656 -101.564888 -13.038914 -v -7.657163 -101.402351 -17.263031 -v -6.648602 -101.402351 -14.970857 -v -2.285656 -101.345222 -12.508579 -v -4.851300 -101.345222 -13.112705 -v -6.877804 -101.345222 -14.798127 -v -7.939375 -101.345222 -17.210724 -v -2.924407 -101.345222 -38.705658 -v -1.860000 -101.345222 -40.679779 -v -0.068831 -101.345222 -42.029510 -v 2.122208 -101.345222 -42.508575 -v -3.645354 -102.095222 -38.912415 -v -3.590483 -101.808235 -38.896667 -v -3.548766 -101.720222 -38.884705 -v -3.434218 -101.564888 -38.851837 -v -3.284880 -101.445747 -38.809021 -v -3.200301 -101.402351 -38.784790 -v -2.428878 -102.095222 -41.168518 -v -2.352660 -101.720222 -41.103027 -v -2.144439 -101.445747 -40.924164 -v -0.225326 -101.445747 -42.370300 -v 2.122208 -101.445747 -42.883575 -v -0.339889 -101.720222 -42.619751 -v 2.122208 -101.720222 -43.158112 -v -0.381835 -102.095222 -42.711060 -v 2.122208 -102.095222 -43.258575 -v 75.015137 -102.095222 -43.619850 -v 77.403381 -102.095222 -41.820168 -v 78.822586 -102.095222 -39.188057 -v 84.191727 -102.095222 -20.463663 -v 84.367676 -102.095222 -16.800699 -v 82.890732 -102.095222 -13.444073 -v 80.071228 -102.095222 -11.099102 -v 78.822586 -101.895210 -39.188057 -v 77.403381 -101.895210 -41.820168 -v 75.015137 -101.895210 -43.619850 -v -126.494156 -101.762093 -8.171410 -v -127.100357 -101.698311 -9.762108 -v -126.990128 -101.710823 -11.461113 -v -123.680496 -101.895218 -6.394554 -v -125.282639 -101.852119 -6.977623 -v -125.337875 -101.849129 -8.927849 -v -123.680496 -101.895210 -23.003197 -v -112.370438 -101.645210 -36.508568 -v -112.370438 -102.095222 -36.508568 -v -106.969559 -101.645210 -36.508568 -v -106.969559 -102.095222 -36.508568 -v -112.616531 -101.645210 -35.524193 -v -112.616531 -102.095222 -35.524193 -v -112.912888 -102.095222 -35.541618 -v -112.912888 -101.645210 -35.541618 -v -113.887833 -102.095222 -35.893272 -v -113.887833 -101.645210 -35.893272 -v -114.571915 -102.095222 -36.618797 -v -114.571915 -101.645210 -36.618797 -v -114.844559 -102.095222 -37.666527 -v -114.844559 -101.645210 -37.666527 -v -109.228348 -101.645210 -42.274193 -v -109.228348 -102.095222 -42.274193 -v -114.844559 -101.645210 -42.274193 -v -114.844559 -102.095222 -42.274193 -v -114.544540 -101.345222 -42.574181 -v -109.219894 -101.345222 -42.574181 -v -114.659348 -101.368050 -42.459373 -v -109.220291 -101.345589 -42.559624 -v -109.223129 -101.368050 -42.459373 -v -109.224380 -101.390877 -42.415062 -v -114.756668 -101.433113 -42.362053 -v -109.226486 -101.457893 -42.339867 -v -109.227859 -101.545967 -42.291100 -v -114.821732 -101.530403 -42.297020 -v -114.838791 -101.586678 -42.279930 -v -112.603348 -101.645210 -39.883568 -v -109.228348 -101.645210 -39.883568 -v -112.603104 -101.545906 -39.866661 -v -109.227921 -101.545967 -39.866661 -v -112.602798 -101.495247 -39.843376 -v -109.227341 -101.495247 -39.843376 -v -112.602463 -101.457832 -39.817833 -v -109.226700 -101.457893 -39.817863 -v -112.601456 -101.390816 -39.742607 -v -112.601334 -101.385384 -39.733574 -v -109.224869 -101.390877 -39.742668 -v -109.224625 -101.385384 -39.733574 -v -112.599625 -101.346016 -39.604790 -v -109.221298 -101.345650 -39.599144 -v -112.599350 -101.345222 -39.583580 -v -109.220932 -101.345222 -39.583580 -v -106.969559 -101.645210 -35.524193 -v -106.975327 -101.586678 -35.529961 -v -112.616287 -101.545906 -35.541100 -v -106.992386 -101.530403 -35.547020 -v -112.615616 -101.457832 -35.589928 -v -107.057419 -101.433113 -35.612053 -v -112.614548 -101.390877 -35.665154 -v -107.154739 -101.368050 -35.709404 -v -112.612350 -101.345222 -35.824181 -v -107.269547 -101.345222 -35.824181 -v -112.612625 -101.345955 -35.803459 -v -112.613937 -101.368050 -35.709404 -v -107.269547 -101.345222 -36.208549 -v -112.299606 -101.345222 -36.208549 -v -112.464005 -101.345222 -36.126396 -v -113.846970 -101.345222 -36.906487 -v -113.597153 -101.345222 -36.586327 -v -113.999435 -101.345222 -36.364494 -v -107.923447 -101.345222 -41.686272 -v -107.275894 -101.345222 -41.174492 -v -107.794174 -101.345222 -41.041679 -v -107.269730 -101.345222 -41.040794 -v -107.936020 -101.345222 -40.384087 -v -107.442581 -101.345222 -40.299706 -v -108.229691 -101.345222 -39.983543 -v -113.457504 -101.345222 -35.998650 -v -113.302048 -101.345222 -36.375389 -v -112.745590 -101.345222 -36.175163 -v -114.261551 -101.345222 -36.685020 -v -114.496262 -101.345222 -37.238976 -v -114.019730 -101.345222 -37.666496 -v -114.544418 -101.345222 -37.666740 -v -114.003922 -101.345222 -37.924889 -v -114.495499 -101.345222 -38.106163 -v -113.872299 -101.345222 -38.395927 -v -114.261032 -101.345222 -38.673332 -v -113.609573 -101.345222 -38.776421 -v -113.994003 -101.345222 -39.004662 -v -113.250137 -101.345222 -39.048729 -v -113.433121 -101.345222 -39.400139 -v -112.659012 -101.345222 -39.199181 -v -107.817947 -101.345222 -39.782463 -v -108.175674 -101.345222 -39.504906 -v -108.668045 -101.345222 -39.694542 -v -108.809464 -101.345222 -39.248589 -v -109.280075 -101.345222 -39.199181 -v -112.765793 -101.345222 -39.577263 -v -114.544540 -101.345222 -42.958580 -v -109.268753 -101.345222 -42.958580 -v -109.066544 -101.345222 -42.563133 -v -108.767746 -101.345222 -42.900322 -v -108.623734 -101.345222 -42.431053 -v -108.134659 -101.345222 -42.606804 -v -108.220749 -101.345222 -42.125847 -v -107.813126 -101.345222 -42.339775 -v -107.439926 -101.345222 -41.806358 -v -109.268448 -101.345833 -42.977043 -v -114.659348 -101.368050 -43.073357 -v -114.844559 -101.645210 -43.258568 -v -109.263504 -101.645210 -43.258568 -v -114.838791 -101.586678 -43.252800 -v -109.263779 -101.545906 -43.241661 -v -114.821732 -101.530403 -43.235741 -v -109.264664 -101.457832 -43.192863 -v -114.756668 -101.433113 -43.170708 -v -109.265976 -101.390877 -43.117638 -v -109.266739 -101.368050 -43.073357 -v -114.844559 -102.095222 -43.258568 -v -109.263504 -102.095222 -43.258568 -v -109.100357 -102.095222 -43.251610 -v -109.100357 -101.645210 -43.251610 -v -108.018600 -102.095222 -42.889824 -v -108.018600 -101.645210 -42.889824 -v -107.267929 -102.095222 -42.125298 -v -107.267929 -101.645210 -42.125298 -v -106.969559 -102.095222 -41.041527 -v -106.969559 -101.645210 -41.041527 -v -109.276688 -101.645210 -38.899193 -v -109.276688 -102.095222 -38.899193 -v -112.651688 -101.645210 -38.899193 -v -112.651688 -102.095222 -38.899193 -v -106.125809 -101.645210 -34.117943 -v -106.125809 -102.095222 -34.117943 -v -106.125809 -101.645210 -35.146263 -v -106.125809 -102.095222 -35.146263 -v -82.078918 -101.645210 -39.367210 -v -82.078918 -102.095222 -39.367210 -v -82.078918 -101.645210 -43.258568 -v -82.078918 -102.095222 -43.258568 -v -91.950684 -101.645210 -35.534630 -v -91.687561 -101.645210 -35.524193 -v -92.043228 -102.095222 -35.541069 -v -91.687561 -102.095222 -35.524193 -v -93.291580 -101.645210 -35.876366 -v -93.868393 -102.095222 -36.200218 -v -93.868393 -101.645210 -36.200218 -v -95.090256 -102.095222 -37.513054 -v -95.090256 -101.645210 -37.513054 -v -94.951004 -101.645210 -37.285271 -v -94.420975 -101.645210 -36.644798 -v -95.463348 -101.645210 -38.439720 -v -95.578918 -102.095222 -39.391380 -v -95.578918 -101.645210 -39.391380 -v -84.960663 -101.345528 -36.222347 -v -84.961060 -101.368050 -36.323299 -v -84.718567 -101.368050 -36.334469 -v -84.961227 -101.390877 -36.367638 -v -84.961487 -101.457893 -36.442867 -v -84.725311 -101.433113 -36.431576 -v -81.937988 -101.390877 -39.364799 -v -81.893723 -101.368050 -39.364067 -v -81.940247 -101.368050 -38.837730 -v -81.797684 -101.345833 -39.362423 -v -81.778931 -101.345222 -39.362087 -v -81.827225 -101.345222 -38.817558 -v -82.013199 -101.457832 -39.366081 -v -84.729813 -101.530403 -36.496456 -v -84.961670 -101.545967 -36.491665 -v -84.961746 -101.645210 -36.508568 -v -84.710617 -101.345222 -36.219936 -v -84.960632 -101.345222 -36.208431 -v -84.731384 -101.645210 -36.519222 -v -83.757248 -101.645210 -36.779171 -v -83.747437 -101.530403 -36.758572 -v -82.931458 -101.645210 -37.354519 -v -82.915421 -101.530403 -37.338253 -v -82.453247 -101.645210 -37.978939 -v -82.433426 -101.530403 -37.967587 -v -82.122559 -101.645210 -38.870232 -v -82.100082 -101.530403 -38.866203 -v -82.036057 -101.433113 -38.854790 -v -82.376984 -101.433113 -37.935268 -v -82.869751 -101.433113 -37.291958 -v -83.719452 -101.433113 -36.699856 -v -83.677582 -101.368050 -36.611996 -v -82.801407 -101.368050 -37.222683 -v -82.292511 -101.368050 -37.886929 -v -82.062027 -101.545906 -39.366905 -v -83.628189 -101.345222 -36.508358 -v -82.720795 -101.345222 -37.140957 -v -82.192886 -101.345222 -37.829922 -v -87.844879 -101.390877 -39.365074 -v -87.769653 -101.457832 -39.366203 -v -87.783752 -101.433113 -39.161156 -v -85.181534 -101.368050 -36.332268 -v -85.189316 -101.345222 -36.217705 -v -85.168976 -101.645210 -36.517025 -v -87.718826 -101.530403 -39.164848 -v -87.720825 -101.545906 -39.366936 -v -87.703934 -101.645210 -39.367210 -v -87.995544 -101.345222 -39.149040 -v -88.003922 -101.345222 -39.362663 -v -87.984039 -101.345894 -39.362938 -v -86.208008 -101.345222 -36.490963 -v -86.158661 -101.368050 -36.594662 -v -87.064789 -101.345222 -37.097500 -v -86.983963 -101.368050 -37.179043 -v -87.229858 -101.345222 -37.275017 -v -87.142700 -101.368050 -37.349758 -v -87.767288 -101.345222 -38.148037 -v -87.661270 -101.368050 -38.192074 -v -87.880920 -101.368050 -39.155602 -v -87.889114 -101.368050 -39.364403 -v -87.571396 -101.433113 -38.229424 -v -87.068832 -101.433113 -37.413082 -v -86.915451 -101.433113 -37.248165 -v -86.116837 -101.433113 -36.682491 -v -85.174927 -101.433113 -36.429375 -v -87.511353 -101.530403 -38.254356 -v -87.019455 -101.530403 -37.455437 -v -86.869659 -101.530403 -37.294338 -v -86.088882 -101.530403 -36.741234 -v -85.170517 -101.530403 -36.494259 -v -87.696030 -101.645210 -39.166161 -v -87.490250 -101.645210 -38.263115 -v -87.002136 -101.645210 -37.470299 -v -86.853577 -101.645210 -37.310570 -v -86.079056 -101.645210 -36.761864 -v -87.889114 -101.368050 -43.073357 -v -88.003922 -101.345222 -42.958580 -v -87.703934 -101.645210 -43.258568 -v -87.709702 -101.586678 -43.252800 -v -87.726761 -101.530403 -43.235741 -v -87.791794 -101.433113 -43.170708 -v -93.752121 -101.645210 -37.470299 -v -94.029663 -101.645210 -37.853935 -v -94.029663 -102.095222 -37.853935 -v -94.240250 -101.645210 -38.263115 -v -94.453934 -102.095222 -39.367210 -v -94.446030 -101.645210 -39.166161 -v -94.453934 -101.645210 -39.367210 -v -91.711746 -101.645210 -36.508568 -v -91.918976 -101.645210 -36.517021 -v -91.711746 -102.095222 -36.508568 -v -92.829071 -101.645210 -36.761864 -v -93.041412 -102.095222 -36.875542 -v -93.041412 -101.645210 -36.875542 -v -93.603577 -101.645210 -37.310570 -v -93.892715 -101.368050 -37.349754 -v -94.411270 -101.368050 -38.192070 -v -94.321396 -101.433113 -38.229424 -v -93.733963 -101.368050 -37.179039 -v -93.818832 -101.433113 -37.413078 -v -92.866821 -101.433113 -36.682491 -v -93.665436 -101.433113 -37.248161 -v -93.619659 -101.530403 -37.294338 -v -91.711212 -101.390877 -36.367638 -v -91.711044 -101.368050 -36.323299 -v -91.931534 -101.368050 -36.332268 -v -91.710678 -101.345528 -36.222347 -v -91.710632 -101.345222 -36.208431 -v -91.939316 -101.345222 -36.217705 -v -94.470825 -101.545906 -39.366936 -v -94.468826 -101.530403 -39.164848 -v -94.533752 -101.433113 -39.161156 -v -94.734024 -101.345894 -39.362938 -v -94.639130 -101.368050 -39.364403 -v -94.630920 -101.368050 -39.155602 -v -94.594879 -101.390877 -39.365074 -v -94.519653 -101.457832 -39.366203 -v -91.711487 -101.457893 -36.442867 -v -91.924942 -101.433113 -36.429375 -v -91.920532 -101.530403 -36.494255 -v -91.711670 -101.545967 -36.491661 -v -92.838882 -101.530403 -36.741234 -v -92.908646 -101.368050 -36.594658 -v -93.769455 -101.530403 -37.455437 -v -94.261337 -101.530403 -38.254356 -v -94.745529 -101.345222 -39.149040 -v -94.517288 -101.345222 -38.148033 -v -93.979874 -101.345222 -37.275017 -v -93.814774 -101.345222 -37.097496 -v -92.958008 -101.345222 -36.490959 -v -94.753922 -101.345222 -39.362663 -v -94.453934 -101.645210 -43.258568 -v -94.459686 -101.586678 -43.252800 -v -94.476761 -101.530403 -43.235741 -v -94.541794 -101.433113 -43.170708 -v -94.639130 -101.368050 -43.073357 -v -94.753922 -101.345222 -42.958580 -v -80.953934 -101.645210 -43.258572 -v -80.953934 -102.095222 -43.258572 -v -80.953934 -101.645210 -39.391384 -v -80.953934 -102.095222 -39.391384 -v -81.253937 -101.345222 -39.394833 -v -81.253937 -101.345222 -42.958584 -v -81.231155 -101.346077 -39.394619 -v -81.139114 -101.368050 -43.073360 -v -80.959686 -101.586678 -43.252804 -v -80.970840 -101.545906 -39.391567 -v -80.976761 -101.530403 -43.235744 -v -81.019653 -101.457832 -39.392147 -v -81.041794 -101.433113 -43.170712 -v -81.094894 -101.390816 -39.393032 -v -81.139114 -101.368050 -39.393520 -v -88.297836 -101.345222 -39.492912 -v -88.528931 -101.345222 -42.958580 -v -88.696121 -101.345222 -37.274071 -v -89.044434 -101.345222 -36.883083 -v -89.470795 -101.345222 -37.140957 -v -89.848282 -101.345222 -36.294491 -v -90.283493 -101.345222 -36.555321 -v -95.278915 -101.345222 -39.395775 -v -95.278915 -101.345222 -42.958580 -v -88.569733 -101.345222 -37.524956 -v -88.830490 -101.345222 -38.044308 -v -88.414795 -101.345222 -38.633293 -v -88.542603 -101.345222 -39.086327 -v -88.528931 -101.345222 -39.362083 -v -87.975250 -101.345222 -37.768822 -v -87.860214 -101.345222 -37.359978 -v -87.615387 -101.345222 -37.020748 -v -86.865265 -101.345222 -36.396355 -v -90.161072 -101.345222 -36.139980 -v -91.388489 -101.345222 -35.835625 -v -91.686066 -101.345222 -35.824272 -v -91.933167 -101.345222 -35.834129 -v -93.165283 -101.345222 -36.148491 -v -94.213379 -101.345222 -36.861385 -v -81.778931 -101.345222 -42.958584 -v -81.343979 -101.345222 -38.603512 -v -81.799820 -101.345222 -37.513638 -v -82.288376 -101.345222 -36.899166 -v -83.310196 -101.345222 -36.191921 -v -84.501877 -101.345222 -35.849056 -v -84.959564 -101.345222 -35.824303 -v -85.460083 -101.345222 -35.859795 -v -86.593597 -101.345222 -36.236965 -v -95.172516 -101.345222 -38.513237 -v -94.700394 -101.345222 -37.450188 -v -95.578918 -101.645210 -43.258568 -v -95.573151 -101.586678 -43.252800 -v -95.562012 -101.545906 -39.391624 -v -95.556091 -101.530403 -43.235741 -v -95.538742 -101.495247 -39.391991 -v -95.491058 -101.433113 -43.170708 -v -95.513199 -101.457832 -39.392326 -v -95.393738 -101.368050 -43.073357 -v -95.299179 -101.345894 -39.395470 -v -95.428925 -101.385384 -39.393547 -v -95.437973 -101.390877 -39.393456 -v -91.687485 -101.545967 -35.541103 -v -91.687241 -101.457893 -35.589928 -v -91.687363 -101.495247 -35.564415 -v -91.948334 -101.495247 -35.574764 -v -91.686630 -101.368050 -35.709465 -v -91.686813 -101.385384 -35.674217 -v -91.941925 -101.385384 -35.684349 -v -91.686859 -101.390877 -35.665157 -v -91.686142 -101.345650 -35.808891 -v -95.317932 -101.385384 -38.476463 -v -95.424377 -101.495247 -38.449547 -v -93.274673 -101.495247 -35.912834 -v -94.393143 -101.495247 -36.673790 -v -94.917435 -101.495247 -37.307369 -v -94.825699 -101.385384 -37.367729 -v -94.317169 -101.385384 -36.753105 -v -93.228424 -101.385384 -36.012413 -v -91.372833 -101.433113 -35.624077 -v -88.256409 -101.505867 -37.826931 -v -88.252182 -101.579231 -37.657711 -v -88.300888 -101.530403 -37.457607 -v -88.251419 -101.607674 -37.626427 -v -88.251129 -101.627693 -37.614803 -v -88.363968 -101.433113 -37.473415 -v -88.266602 -101.421883 -38.236839 -v -88.259750 -101.470894 -37.961880 -v -88.297668 -101.345222 -39.486748 -v -88.274734 -101.384346 -38.564445 -v -88.301041 -101.368050 -38.617821 -v -88.271622 -101.396736 -38.439171 -v -88.458374 -101.368050 -37.497063 -v -91.380020 -101.368050 -35.721153 -v -91.366348 -101.645210 -35.536461 -v -91.368042 -101.530403 -35.559227 -v -90.050797 -101.530403 -35.885677 -v -90.041733 -101.645210 -35.864742 -v -89.714462 -101.530403 -36.051781 -v -89.703445 -101.645210 -36.031765 -v -88.853882 -101.530403 -36.681789 -v -88.838196 -101.645210 -36.665218 -v -88.468353 -101.530403 -37.116112 -v -88.449585 -101.645210 -37.103142 -v -88.278732 -101.645210 -37.452053 -v -88.251038 -101.645210 -37.611599 -v -90.076691 -101.433113 -35.945339 -v -89.745865 -101.433113 -36.108730 -v -88.898605 -101.433113 -36.729027 -v -88.521790 -101.433113 -37.153191 -v -90.115402 -101.368050 -36.034630 -v -89.792847 -101.368050 -36.193966 -v -88.965500 -101.368050 -36.799679 -v -88.601776 -101.368050 -37.208675 -v -84.959549 -101.457893 -35.589928 -v -84.959549 -101.495247 -35.564419 -v -85.497406 -101.495247 -35.602688 -v -84.959534 -101.545967 -35.541103 -v -85.481628 -101.385384 -35.711361 -v -84.959549 -101.385384 -35.674248 -v -84.959549 -101.390877 -35.665157 -v -84.959564 -101.345589 -35.809441 -v -84.959564 -101.368050 -35.709469 -v -88.122696 -101.385384 -37.741234 -v -88.090729 -101.495247 -37.240166 -v -88.230621 -101.495247 -37.721035 -v -87.993301 -101.385384 -37.290798 -v -87.726669 -101.385384 -36.920193 -v -86.946213 -101.385384 -36.270107 -v -86.663681 -101.385384 -36.104336 -v -86.714981 -101.495247 -36.007259 -v -87.005478 -101.495247 -36.177666 -v -87.808136 -101.495247 -36.846523 -v -88.126389 -101.645210 -37.221615 -v -87.837952 -101.645210 -36.819607 -v -87.027161 -101.645210 -36.143822 -v -86.733765 -101.645210 -35.971706 -v -85.503174 -101.645210 -35.562920 -v -84.959534 -101.645210 -35.524193 -v -82.207382 -101.368050 -36.817806 -v -81.702896 -101.368050 -37.452114 -v -81.620712 -101.433113 -37.399990 -v -83.218826 -101.433113 -36.000484 -v -82.138718 -101.433113 -36.748806 -v -82.092834 -101.530403 -36.702755 -v -81.073883 -101.530403 -38.541348 -v -81.137253 -101.433113 -38.555935 -v -81.051636 -101.645210 -38.536221 -v -81.546509 -101.645210 -37.352901 -v -81.232101 -101.368050 -38.577755 -v -84.489655 -101.368050 -35.734921 -v -84.479309 -101.433113 -35.638119 -v -84.472382 -101.530403 -35.573483 -v -84.469955 -101.645210 -35.550777 -v -83.180984 -101.645210 -35.921169 -v -83.190826 -101.530403 -35.941799 -v -83.260757 -101.368050 -36.088345 -v -82.076736 -101.645210 -36.686550 -v -81.565796 -101.530403 -37.365170 -v -81.585159 -101.645210 -37.293179 -v -80.968079 -102.095222 -39.053005 -v -81.585159 -102.095222 -37.293179 -v -82.955811 -102.095222 -36.036495 -v -84.959534 -102.095222 -35.524193 -v -76.218811 -101.645210 -43.258572 -v -76.218811 -102.095222 -43.258572 -v -74.822662 -102.095222 -43.016689 -v -74.822662 -101.645210 -43.016689 -v -73.676682 -102.095222 -42.326839 -v -73.676682 -101.645210 -42.326839 -v -73.360168 -102.095222 -41.768826 -v -73.360168 -101.645210 -41.768826 -v -104.297684 -101.645210 -39.391380 -v -104.297684 -102.095222 -39.391380 -v -104.289993 -102.095222 -39.621544 -v -104.289993 -101.645210 -39.621544 -v -103.728653 -102.095222 -41.410271 -v -103.728653 -101.645210 -41.410271 -v -102.349014 -102.095222 -42.731926 -v -102.349014 -101.645210 -42.731926 -v -100.406326 -102.095222 -43.258568 -v -100.406326 -101.645210 -43.258568 -v -106.125809 -101.645210 -35.524193 -v -106.125809 -102.095222 -35.524193 -v -106.125809 -101.645210 -43.258568 -v -106.125809 -102.095222 -43.258568 -v 109.908417 -101.895210 -48.158585 -v -53.975952 -101.895210 -48.158569 -v 109.908417 -102.095222 -48.158585 -v -53.975952 -102.095222 -48.158569 -v -149.741653 -57.235413 -43.174480 -v -148.946793 -59.693176 -43.616985 -v -152.858292 -65.119812 -11.948074 -v -151.407669 -67.258362 -12.385818 -v -153.037125 -65.915649 -10.193192 -v -151.534927 -67.772278 -11.175552 -v -153.289993 -67.270630 -8.783127 -v -151.703506 -68.649780 -10.203110 -v -153.525192 -69.046814 -7.872299 -v -151.834885 -69.804993 -9.574936 -v -153.662430 -71.054932 -7.558548 -v -151.863541 -71.117310 -9.358566 -v -136.925125 -96.991402 -9.358572 -v -137.770523 -98.580513 -7.558554 -v -138.420120 -96.136482 -9.358572 -v -139.451004 -97.615669 -7.558554 -v -153.667068 -72.992676 -7.558548 -v -151.870651 -72.839600 -9.358566 -v -151.667831 -75.551880 -9.358566 -v -152.979874 -78.540840 -7.558550 -v -146.852982 -91.148750 -7.558552 -v -146.548752 -88.596199 -9.358570 -v -144.769669 -90.816475 -9.358570 -v -143.912277 -94.246407 -7.558552 -v -142.797134 -92.826729 -9.358570 -v -142.698349 -92.917366 -9.358570 -v -140.667648 -94.604744 -9.358572 -v -151.221909 -78.154121 -9.358568 -v -151.192764 -78.285164 -9.358568 -v -151.767532 -82.636482 -7.558550 -v -150.438156 -80.998482 -9.358568 -v -149.404861 -83.649300 -9.358568 -v -149.661240 -87.095222 -7.558550 -v -148.102371 -86.195259 -9.358568 -v -135.965378 -99.464607 -7.871389 -v -135.775894 -97.621956 -9.574301 -v -134.308823 -100.149422 -8.781731 -v -134.709396 -98.086128 -10.202108 -v -133.007980 -100.608345 -10.191856 -v -133.864456 -98.379158 -11.174643 -v -132.228500 -100.851631 -11.948082 -v -133.355209 -98.526131 -12.385824 -v -123.842087 -102.094795 -43.174492 -v -125.573196 -100.177437 -43.616997 -v -125.561874 -99.935616 -43.597221 -v -133.327133 -98.451302 -12.388418 -v 25.257566 156.153381 -43.174461 -v 22.731581 156.693909 -43.616966 -v 19.987780 162.794678 -11.948051 -v 17.410463 162.607605 -12.385796 -v 19.388018 163.347412 -10.193169 -v 17.029024 162.974792 -11.175529 -v 18.340990 164.243896 -8.783104 -v 16.353289 163.559631 -10.203087 -v 16.920351 165.335754 -7.872276 -v 15.418581 164.250916 -9.574913 -v 15.249910 166.458679 -7.558525 -v 14.296404 164.931946 -9.358543 -v -21.271788 162.794678 -11.948048 -v -18.694471 162.607605 -12.385792 -v -26.541613 156.153381 -43.174458 -v -24.015610 156.693909 -43.616962 -v -16.533934 166.458679 -7.558521 -v -15.580411 164.931946 -9.358540 -v -18.202147 165.337402 -7.871357 -v -16.701109 164.252014 -9.574268 -v -19.623503 164.245178 -8.781696 -v -17.636335 163.560486 -10.202076 -v -20.671354 163.348022 -10.191822 -v -18.312605 162.975281 -11.174610 -v 10.358080 166.979736 -9.358541 -v 8.573946 169.562988 -7.558523 -v 12.808443 165.799194 -9.358543 -v 13.574053 167.431580 -7.558525 -v -14.858060 167.431580 -7.558521 -v -9.666501 169.624146 -7.558523 -v -9.125028 167.907532 -9.358541 -v -14.092557 165.799194 -9.358540 -v -11.642194 166.979736 -9.358540 -v -5.556545 170.608337 -7.558521 -v -0.541515 171.013550 -7.558521 -v -0.642071 169.213623 -9.358541 -v -3.498165 169.068665 -9.358541 -v -6.310528 168.638062 -9.358541 -v -9.037656 167.934875 -9.358541 -v 8.020985 167.850098 -9.358541 -v 7.753529 167.934998 -9.358541 -v 4.272526 170.608337 -7.558521 -v 5.026402 168.638062 -9.358541 -v 2.214024 169.068665 -9.358541 -v -0.547543 169.213501 -9.358541 -v 25.165545 155.913696 -6.664911 -v 25.165543 155.913696 -19.516075 -v 24.568270 156.903320 -9.062983 -v 23.933046 157.869202 -11.461084 -v 23.852983 157.985291 -10.019709 -v 24.068941 157.669250 -8.623316 -v 24.536242 156.953979 -7.454706 -v 29.288849 148.771912 -34.758537 -v 29.462051 148.871948 -34.758537 -v 30.896408 146.387512 -37.339138 -v 30.723198 146.287537 -37.339138 -v 32.965134 142.804382 -39.066036 -v 32.791924 142.704407 -39.066036 -v 36.343437 136.953003 -40.258541 -v 36.170227 136.853027 -40.258541 -v 29.288849 148.771912 -19.758541 -v 29.462051 148.871948 -19.758541 -v 39.613976 130.888245 -9.958557 -v 39.787155 130.988281 -9.958557 -v 34.992325 139.293152 -11.766752 -v 34.819138 139.193176 -11.766752 -v 31.819895 144.787964 -14.712153 -v 31.646685 144.687988 -14.712153 -v 30.256021 147.496704 -17.152401 -v 30.082834 147.396729 -17.152401 -v 45.710609 120.728569 -9.958559 -v 45.537399 120.628532 -9.958559 -v 45.308014 121.025864 -6.358553 -v 25.933199 154.583984 -6.358545 -v 45.481224 121.125900 -6.358553 -v 26.106401 154.684021 -6.358545 -v 50.946190 111.260246 -43.056004 -v 50.990181 111.184074 -44.887486 -v 48.189949 116.034233 -40.258545 -v 49.170570 114.335747 -30.671358 -v 48.189949 116.034233 -30.946993 -v 49.053619 114.538261 -30.260744 -v 28.545118 150.060059 -43.088005 -v 29.254744 148.830994 -45.720150 -v 50.620956 111.823601 -46.565796 -v 49.916069 113.044487 -47.738281 -v 49.023674 114.590202 -48.158539 -v 48.620354 115.288750 -29.956728 -v 48.855469 114.881523 -30.003359 -v 48.400772 115.669060 -30.131197 -v 48.245773 115.937553 -30.487825 -v 45.516693 120.664474 -6.449770 -v 45.687279 120.369003 -6.706881 -v 45.788635 120.193413 -7.082918 -v 31.909536 144.232788 -48.158535 -v 30.448835 146.762756 -47.519798 -v 46.018021 119.796135 -8.682894 -v 46.029015 119.777031 -9.140779 -v 45.936714 119.936943 -9.560366 -v 45.760498 120.242119 -9.853487 -v 49.343781 114.435722 -30.671358 -v 51.119400 111.360283 -43.056004 -v 29.962044 148.005859 -34.758537 -v 30.632362 146.651917 -35.060909 -v 31.368599 145.569641 -36.779324 -v 31.412285 144.600403 -35.453915 -v 32.147186 144.221130 -37.529232 -v 31.522583 144.269836 -35.509487 -v 32.319145 141.587769 -35.885891 -v 33.849075 141.273376 -38.650112 -v 32.745613 139.937134 -36.054043 -v 34.538849 140.078613 -38.936825 -v 33.089058 138.496460 -36.161404 -v 36.344154 136.951782 -39.258541 -v 33.746078 135.451782 -36.258541 -v 47.863136 117.000237 -39.258545 -v 47.298027 117.788872 -39.163422 -v 46.589928 118.452080 -38.881805 -v 42.740059 119.873711 -36.258545 -v 44.857994 119.306206 -37.808990 -v 44.857994 119.306206 -33.858521 -v 45.387131 119.131950 -33.858521 -v 44.857994 119.306206 -20.658539 -v 44.857994 119.306206 -12.408205 -v 45.387131 119.131950 -20.658539 -v 46.589928 118.452080 -11.335268 -v 47.863136 117.000237 -10.958559 -v 47.863136 117.000237 -16.716249 -v 47.298027 117.788872 -11.053652 -v 44.813141 119.318230 -12.440950 -v 41.829483 120.117607 -14.407318 -v 44.104469 119.821159 -12.803225 -v 40.789436 121.978813 -14.552490 -v 40.610420 122.299187 -14.590088 -v 41.829453 120.117668 -36.258545 -v 45.395241 119.162224 -33.858521 -v 45.395241 119.162224 -20.658539 -v 33.755676 134.566284 -36.258541 -v 32.889412 136.116516 -36.000149 -v 32.991302 135.934204 -36.060696 -v 32.158539 140.343872 -35.508541 -v 30.570045 146.726562 -34.758541 -v 31.312332 144.284363 -34.758541 -v 32.457481 136.889465 -35.591640 -v 31.958710 140.322510 -34.758541 -v 32.182915 137.380859 -34.758541 -v 32.204132 137.342896 -34.998867 -v 32.278191 137.210327 -35.262508 -v 32.405540 136.982483 -35.514645 -v 31.313049 144.281433 -19.758541 -v 31.958710 140.322510 -19.758541 -v 32.182915 137.380859 -19.758541 -v 29.962044 148.005859 -19.758541 -v 30.570045 146.726562 -19.758541 -v 31.147430 144.945496 -19.758541 -v 34.286278 133.616760 -16.284298 -v 33.975792 134.172363 -16.656002 -v 35.400497 138.586243 -12.302610 -v 32.818871 136.242737 -18.565029 -v 34.316612 140.463562 -13.062223 -v 35.107063 133.944397 -14.926145 -v 36.738586 129.228149 -14.478758 -v 35.980980 130.583984 -14.859373 -v 39.787155 130.988281 -10.958557 -v 31.907839 142.070251 -19.060421 -v 30.884163 145.907898 -19.518673 -v 30.330553 147.367615 -18.412533 -v 31.391336 145.530273 -16.328152 -v 31.996683 144.481812 -15.452785 -v 32.199989 140.547852 -18.908169 -v 32.726868 137.011292 -18.617123 -v 30.380470 147.183350 -19.682247 -v 30.103310 147.750366 -19.742519 -v 32.115623 140.339294 -19.088863 -v 32.184494 137.377991 -19.692562 -v 32.314850 137.144775 -19.168636 -v 32.228661 137.298950 -19.406887 -v 47.188889 118.168144 -10.958559 -v 151.574265 -65.119812 -11.948101 -v 150.123642 -67.258362 -12.385845 -v 148.457626 -57.235413 -43.174507 -v 147.662781 -59.693176 -43.617012 -v 152.378418 -71.054932 -7.558575 -v 150.579254 -71.117310 -9.358593 -v 152.241364 -69.048706 -7.871685 -v 150.550949 -69.806213 -9.574535 -v 152.006134 -67.271606 -8.782421 -v 150.419601 -68.650513 -10.202587 -v 151.753174 -65.915894 -10.192699 -v 150.250961 -67.772461 -11.175213 -v 47.303452 117.969719 -12.812380 -v 63.757912 127.469719 -12.812380 -v 63.833366 127.665642 -10.065126 -v 47.237473 118.083977 -10.065126 -v 47.791321 117.124687 -7.547640 -v 64.495956 126.769096 -7.547640 -v 65.063217 125.680710 -6.332918 -v 48.848648 115.293320 -5.788942 -v 65.444534 124.874985 -5.788942 -v 50.187225 112.974838 -5.158541 -v 66.641693 122.474838 -5.158543 -v 83.641724 93.029953 8.841452 -v 83.275681 91.663986 8.841452 -v 83.641724 93.029953 -5.158548 -v 83.275681 91.663986 -5.158548 -v 73.747818 114.166679 -47.358524 -v 110.341202 50.785091 -47.358540 -v 71.262222 114.471855 -49.358555 -v 109.362701 48.479858 -49.358570 -v 113.983231 40.476921 -5.158560 -v 97.528732 30.976921 -5.158558 -v 98.867340 28.658379 -5.788963 -v 115.463272 38.240105 -5.788961 -v 99.924667 26.827080 -7.547661 -v 116.629288 36.471489 -7.547659 -v 116.998260 35.726494 -9.061239 -v 100.478516 25.867790 -10.065147 -v 117.074448 35.449455 -10.065145 -v 100.412537 25.982050 -12.812401 -v 116.867020 35.482048 -12.812399 -v 116.865112 35.485344 -12.825644 -v 117.270126 38.783867 -14.825643 -v 117.452179 38.468498 -12.686087 -v 117.352768 38.640678 -10.805471 -v 114.381332 43.787346 -7.158558 -v 113.976318 40.488823 -5.158560 -v 115.459869 41.919304 -7.398273 -v 116.336334 40.401237 -8.107779 -v 116.975800 39.293571 -9.258810 -v 95.795944 33.978271 -45.012409 -v 112.250427 43.478271 -45.012409 -v 112.251495 43.476379 -45.004871 -v 113.230011 45.781555 -43.004841 -v 112.816650 46.497559 -44.838886 -v 109.366638 48.473083 -49.358570 -v 111.336639 49.060974 -47.069416 -v 110.663391 46.330383 -48.811054 -v 112.175232 47.608459 -46.215809 -v 111.686920 44.557617 -47.268482 -v 111.228745 45.378723 -48.150379 -v 95.187683 35.031738 -47.268482 -v 94.164169 36.804565 -48.811054 -v 92.912155 38.973083 -49.358570 -v 145.120987 -55.113464 -50.079720 -v 144.283783 -55.865295 -51.158577 -v 144.063309 -54.389648 -51.158577 -v 145.937668 -56.619568 -49.025246 -v 145.736267 -52.520996 -48.959541 -v 144.469955 -50.327637 -49.358589 -v 143.068420 -51.519165 -51.158577 -v 142.911087 -51.227600 -51.158577 -v 146.880051 -54.502075 -47.800240 -v 147.789612 -56.077454 -45.991768 -v 146.871399 -58.282837 -47.052742 -v 148.377228 -57.095215 -43.698372 -v 147.572495 -59.531616 -44.255898 -v 118.592422 -5.906436 -24.658566 -v 118.765640 -5.806401 -24.658566 -v 117.304932 -3.276431 -25.297298 -v 117.131729 -3.376468 -25.297298 -v 116.110809 -1.208194 -27.096981 -v 115.937607 -1.308170 -27.096981 -v 115.401184 0.020932 -29.729122 -v 115.228012 -0.079105 -29.729122 -v 144.829285 -51.350040 -24.658577 -v 145.002502 -51.250004 -24.658577 -v 148.993591 -58.655220 -7.951334 -v 149.319183 -59.320015 -9.629648 -v 149.281250 -59.240303 -11.461130 -v 148.762482 -58.207344 -9.063028 -v 148.327835 -57.411751 -6.778849 -v 148.204010 -57.195259 -6.664957 -v 148.204010 -57.195255 -19.516121 -v 103.365112 20.868095 -6.358574 -v 147.609573 -55.765633 -6.358591 -v 103.191895 20.768059 -6.358574 -v 147.436371 -55.865608 -6.358591 -v 101.269379 24.098015 -9.256035 -v 96.423370 32.491516 -43.056019 -v 101.442551 24.197929 -9.256035 -v 96.596588 32.591492 -43.056019 -v 110.121475 9.165649 -48.158562 -v 98.519104 29.261597 -48.158562 -v 109.948288 9.065674 -48.158562 -v 98.345886 29.161621 -48.158562 -v 111.582169 6.635681 -47.519829 -v 111.408966 6.535644 -47.519829 -v 112.776291 4.567383 -45.720177 -v 112.603088 4.467468 -45.720177 -v 113.485886 3.338318 -43.088036 -v 113.312714 3.238342 -43.088036 -v 148.193695 -57.177372 -19.588051 -v 146.289993 -53.880009 -24.019844 -v 147.484070 -55.948246 -22.220192 -v 102.357224 22.213799 -6.723564 -v 101.674866 23.395622 -7.751915 -v 97.453491 30.707273 -47.738300 -v 96.748627 31.928160 -46.565815 -v 96.379379 32.567688 -44.887501 -v 148.377228 -57.095222 -6.664957 -v 148.501053 -57.311836 -6.778849 -v 149.167068 -58.555122 -7.951334 -v 149.492966 -59.219734 -9.629648 -v 149.454971 -59.140022 -11.461130 -v 126.366211 -18.971012 -34.115295 -v 125.434296 -17.356936 -40.615326 -v 123.143661 -20.831547 -34.115295 -v 122.189560 -19.230227 -40.615326 -v 121.278091 -17.700380 -40.929504 -v 121.181763 -17.538698 -40.589996 -v 121.448441 -17.986269 -41.129517 -v 121.185226 -17.544558 -40.201843 -v 121.554260 -18.163881 -41.158569 -v 121.820526 -18.610842 -41.158569 -v 122.217163 -19.276493 -33.419830 -v 122.348145 -19.496342 -33.227020 -v 122.139313 -19.145878 -33.701874 -v 122.508362 -19.765324 -33.158569 -v 123.050797 -20.675724 -33.387634 -v 123.147141 -20.837406 -33.727173 -v 122.880447 -20.389835 -33.187653 -v 122.774612 -20.212162 -33.158569 -v 122.012512 -18.933046 -41.058075 -v 122.153030 -19.168886 -40.783539 -v 125.385178 -17.271854 -33.701874 -v 125.461243 -17.403507 -33.419830 -v 125.589172 -17.625126 -33.227020 -v 125.745667 -17.896244 -33.158569 -v 120.493988 -8.800051 -34.115295 -v 119.562073 -7.185914 -40.615322 -v 117.131805 -10.741213 -34.115292 -v 116.177719 -9.139894 -40.615326 -v 119.201584 -6.561586 -41.158566 -v 118.941528 -6.111084 -41.158566 -v 115.808685 -8.520448 -41.158566 -v 115.542419 -8.073548 -41.158566 -v 115.235825 -7.558900 -40.859921 -v 115.164948 -7.439943 -40.545254 -v 115.371124 -7.786012 -41.079769 -v 115.173386 -7.454164 -40.201839 -v 117.038940 -10.585329 -33.387630 -v 117.135269 -10.747072 -33.727169 -v 116.868591 -10.299440 -33.187649 -v 116.762772 -10.121828 -33.158566 -v 116.496521 -9.674868 -33.158566 -v 116.000671 -8.842713 -41.058075 -v 116.141190 -9.078492 -40.783539 -v 116.304535 -9.352663 -33.259060 -v 116.164017 -9.116884 -33.533596 -v 116.127472 -9.055483 -33.701870 -v 118.774185 -5.821290 -41.079769 -v 118.642044 -5.592408 -40.859921 -v 118.572815 -5.472474 -40.545254 -v 118.581039 -5.486696 -40.201839 -v 132.240067 -29.144779 -34.115295 -v 131.308121 -27.530703 -40.615326 -v 129.157166 -30.924747 -34.115295 -v 128.203079 -29.323366 -40.615326 -v 129.064301 -30.768864 -33.387634 -v 129.160629 -30.930546 -33.727177 -v 128.893951 -30.482975 -33.187653 -v 128.788132 -30.305302 -33.158569 -v 128.521881 -29.858463 -33.158569 -v 128.125229 -29.192751 -40.897308 -v 127.994247 -28.972902 -41.090118 -v 127.834030 -28.703981 -41.158569 -v 127.291595 -27.793520 -40.929504 -v 127.195251 -27.631838 -40.589996 -v 127.461960 -28.079409 -41.129517 -v 127.198746 -27.637697 -40.201843 -v 127.567780 -28.257143 -41.158569 -v 128.152832 -29.239017 -33.701878 -v 128.329895 -29.536259 -33.259068 -v 128.189362 -29.300358 -33.533600 -v 131.232101 -27.398989 -40.897308 -v 131.104156 -27.177370 -41.090118 -v 130.947662 -26.906374 -41.158569 -v 121.516357 -10.570802 -40.201843 -v 122.448273 -12.184938 -33.701874 -v 118.178467 -12.497926 -40.201843 -v 119.132568 -14.099306 -33.701874 -v 119.182800 -14.183656 -40.615326 -v 122.497360 -12.270020 -40.615326 -v 122.421341 -12.138307 -40.897308 -v 119.104996 -14.053041 -40.897308 -v 122.293396 -11.916749 -41.090118 -v 118.974014 -13.833131 -41.090118 -v 122.136902 -11.645631 -41.158569 -v 118.813766 -13.564271 -41.158569 -v 123.429291 -13.884095 -34.115295 -v 120.136902 -15.785034 -34.115295 -v 120.044037 -15.629152 -33.387634 -v 120.140381 -15.790772 -33.727173 -v 119.873688 -15.343203 -33.187653 -v 119.767853 -15.165590 -33.158569 -v 119.501602 -14.718691 -33.158569 -v 118.271332 -12.653810 -40.929504 -v 118.175018 -12.492127 -40.589996 -v 118.441681 -12.939759 -41.129517 -v 118.547516 -13.117372 -41.158569 -v 119.309616 -14.396486 -33.259064 -v 119.169098 -14.160585 -33.533600 -v 122.808746 -12.809328 -33.158569 -v 123.068817 -13.259768 -33.158569 -v 129.303146 -24.057926 -34.115295 -v 128.371216 -22.443789 -40.615326 -v 126.150421 -25.878178 -34.115295 -v 125.196320 -24.276857 -40.615326 -v 126.057556 -25.722294 -33.387634 -v 126.153870 -25.883976 -33.727173 -v 125.887207 -25.436405 -33.187653 -v 125.781372 -25.258793 -33.158569 -v 125.515121 -24.811832 -33.158569 -v 124.284851 -22.746950 -40.929504 -v 124.188492 -22.585268 -40.589996 -v 124.455200 -23.032900 -41.129517 -v 124.191986 -22.591066 -40.201843 -v 124.561035 -23.210512 -41.158569 -v 124.827271 -23.657412 -41.158569 -v 125.323135 -24.489628 -33.259064 -v 125.182617 -24.253849 -33.533600 -v 125.146072 -24.192448 -33.701874 -v 125.019257 -23.979616 -41.058075 -v 125.159790 -24.215456 -40.783539 -v 127.390198 -20.744631 -40.201843 -v 128.322113 -22.358768 -33.701874 -v 126.878220 -19.857792 -32.408600 -v 120.433014 -8.694399 -33.457211 -v 120.300842 -8.465517 -33.237362 -v 118.515564 -5.373353 -42.658566 -v 124.445038 -15.643434 -40.545258 -v 124.514267 -15.763306 -40.859924 -v 123.437531 -13.898439 -33.771881 -v 123.368301 -13.778505 -33.457214 -v 123.236130 -13.549623 -33.237366 -v 120.133530 -8.175722 -33.158566 -v 119.873444 -7.725222 -33.158566 -v 118.760651 -5.797854 -32.355282 -v 119.716949 -7.454165 -33.227016 -v 119.589020 -7.232546 -33.419827 -v 118.557922 -5.446658 -33.107296 -v 119.512955 -7.100832 -33.701870 -v 117.554291 -3.708314 -40.107296 -v 117.532318 -3.670228 -41.023037 -v 117.716919 -3.990053 -41.862209 -v 121.508102 -10.556581 -40.545258 -v 121.577332 -10.676454 -40.859924 -v 121.709503 -10.905396 -41.079773 -v 126.878220 -19.857790 -42.658569 -v 125.230331 -17.003603 -41.090118 -v 125.358276 -17.225161 -40.897308 -v 120.502243 -8.814333 -33.771877 -v 118.069366 -4.600465 -42.448452 -v 124.646408 -15.992249 -41.079773 -v 124.813751 -16.282045 -41.158569 -v 125.073807 -16.732546 -41.158569 -v 126.305237 -18.865360 -33.457214 -v 126.173065 -18.636478 -33.237366 -v 126.005753 -18.346622 -33.158569 -v 122.652252 -12.538210 -33.227020 -v 122.524307 -12.316652 -33.419830 -v 119.486053 -7.054200 -40.897305 -v 119.358109 -6.832643 -41.090115 -v 126.374466 -18.985294 -33.771881 -v 121.876816 -11.195191 -41.158569 -v 124.453262 -15.657716 -40.201843 -v 132.751740 -30.031071 -31.868715 -v 129.242142 -23.952274 -33.457214 -v 129.109985 -23.723392 -33.237366 -v 128.942657 -23.433537 -33.158569 -v 128.682602 -22.983097 -33.158569 -v 128.526077 -22.712040 -33.227020 -v 128.398132 -22.490421 -33.419830 -v 127.451172 -20.850222 -40.859924 -v 127.583344 -21.079165 -41.079773 -v 127.750671 -21.368959 -41.158569 -v 128.010742 -21.819460 -41.158569 -v 129.311401 -24.072208 -33.771881 -v 131.619492 -28.070011 -33.158569 -v 131.879578 -28.520451 -33.158569 -v 132.046921 -28.810307 -33.237370 -v 127.381927 -20.730349 -40.545258 -v 130.687576 -26.455873 -41.158569 -v 131.301926 -27.519899 -42.658569 -v 130.520264 -26.166079 -41.079773 -v 130.388092 -25.937136 -40.859924 -v 130.318863 -25.817202 -40.545258 -v 131.719269 -28.242800 -42.476074 -v 132.179062 -29.039188 -33.457214 -v 133.104187 -30.641544 -32.454929 -v 132.248291 -29.159122 -33.771881 -v 133.288788 -30.961308 -33.294102 -v 133.266785 -30.923222 -34.209843 -v 132.263199 -29.184938 -41.209839 -v 132.060455 -28.833742 -41.961914 -v 128.167252 -22.090456 -41.090118 -v 128.295197 -22.312075 -40.897308 -v 130.327118 -25.831484 -40.201843 -v 131.259033 -27.445683 -33.701874 -v 131.335068 -27.577335 -33.419830 -v 131.463013 -27.798954 -33.227020 -v 132.305542 -29.258244 -31.658571 -v 119.519196 -7.111576 -31.658566 -v 119.101837 -6.388796 -31.841061 -v 117.915497 -5.719789 -43.121578 -v 117.866058 -5.748291 -43.408566 -v 117.252518 -4.685670 -43.119625 -v 117.352051 -4.108033 -41.922665 -v 117.722198 -4.749146 -42.538357 -v 117.423218 -4.780336 -42.784023 -v 117.158157 -3.772157 -41.041378 -v 117.181259 -3.812257 -40.079617 -v 116.811554 -3.720949 -40.003933 -v 116.785446 -3.675660 -41.091366 -v 117.004669 -4.055421 -42.087887 -v 118.267014 -5.516786 -42.715664 -v 118.190811 -5.560791 -42.759060 -v 118.056274 -5.638490 -42.878231 -v 117.953079 -5.698060 -43.033566 -v 116.544312 -3.459047 -39.900570 -v 116.514069 -3.406617 -41.159695 -v 116.767929 -3.846315 -42.313564 -v 131.053375 -27.663454 -42.715668 -v 130.977173 -27.707460 -42.759064 -v 130.842636 -27.785097 -42.878235 -v 130.739441 -27.844728 -43.033569 -v 130.701859 -27.866396 -43.121582 -v 130.652405 -27.894960 -43.408569 -v 131.885635 -29.916811 -41.337463 -v 131.974152 -30.184267 -41.416565 -v 131.695374 -29.701418 -42.450623 -v 131.909500 -29.632936 -41.270386 -v 131.880920 -29.821840 -41.313232 -v 131.640182 -29.404787 -42.206238 -v 131.773788 -29.087221 -42.027374 -v 131.415466 -28.466616 -42.567383 -v 132.042068 -29.375978 -41.225586 -v 131.986725 -29.456057 -41.237549 -v 131.235016 -28.703066 -42.816864 -v 131.226257 -28.888857 -43.157623 -v 133.045685 -31.114262 -34.225590 -v 132.990341 -31.194401 -34.237553 -v 132.913101 -31.371220 -34.270390 -v 132.884552 -31.560184 -34.313232 -v 132.889252 -31.655033 -34.337463 -v 132.977768 -31.922550 -34.416569 -v 131.705444 -29.604740 -31.195589 -v 131.656036 -29.633244 -30.908571 -v 132.269547 -30.695927 -31.197512 -v 132.910645 -31.605350 -33.225773 -v 132.819550 -30.898502 -32.394474 -v 132.449402 -30.257389 -31.778780 -v 132.272919 -30.500736 -31.533113 -v 133.013443 -31.234379 -33.275822 -v 132.691422 -31.225651 -32.229282 -v 132.056961 -29.401737 -31.601473 -v 131.980789 -29.445744 -31.558077 -v 131.846268 -29.523441 -31.438906 -v 131.743027 -29.583012 -31.283571 -v 133.007996 -31.974979 -33.157444 -v 132.754135 -31.535282 -32.003574 -v 119.270599 -7.255130 -31.601469 -v 119.194397 -7.299137 -31.558073 -v 119.059906 -7.376772 -31.438902 -v 118.956665 -7.436405 -31.283566 -v 118.919098 -7.458072 -31.195583 -v 118.869644 -7.486637 -30.908566 -v 118.461090 -6.578006 -31.500301 -v 118.756104 -6.539919 -31.749754 -v 118.184845 -5.550478 -33.079617 -v 118.397781 -5.919314 -32.289761 -v 117.815186 -5.459231 -33.003933 -v 118.055954 -5.876284 -32.110897 -v 117.547913 -5.197329 -32.900570 -v 117.826721 -5.680178 -31.866512 -v 118.295807 -6.492740 -31.159512 -v 133.400955 -32.655582 -33.278751 -v 133.425690 -32.698429 -32.248539 -v 132.319550 -30.782475 -30.408571 -v 132.821518 -31.651981 -30.644991 -v 133.218002 -32.338688 -31.304508 -v 116.121094 -2.726014 -41.038387 -v 116.096359 -2.683168 -42.068600 -v 117.202530 -4.599060 -43.908566 -v 116.700546 -3.729615 -43.672176 -v 116.304047 -3.042847 -43.012661 -v 118.492889 -6.833988 -30.408566 -v 118.023376 -6.020815 -30.613890 -v 117.639557 -5.356020 -31.192348 -v 117.411453 -4.960940 -32.038387 -v 131.029205 -28.547548 -43.908569 -v 131.498703 -29.360781 -43.703247 -v 131.882507 -30.025515 -43.124786 -v 132.110611 -30.420656 -42.278748 -v 119.142395 -6.459049 -29.658566 -v 132.969070 -30.407536 -29.658571 -v 132.720520 -30.551029 -29.715639 -v 118.817642 -6.646488 -29.759029 -v 132.509781 -30.672672 -29.878267 -v 118.683105 -6.724185 -29.878262 -v 132.368988 -30.753971 -30.121553 -v 118.579910 -6.783756 -30.033566 -v 118.032135 -5.835025 -30.273100 -v 117.318253 -4.598513 -31.935024 -v 117.584366 -5.059452 -30.947964 -v 117.424057 -4.232729 -31.859371 -v 117.717957 -4.741825 -30.769070 -v 118.212585 -5.598575 -30.023619 -v 117.700500 -3.961611 -31.831661 -v 118.004639 -4.488346 -30.703579 -v 118.516403 -5.374698 -29.932308 -v 116.410156 -1.726625 -40.831631 -v 116.133667 -1.997743 -40.859371 -v 116.027878 -2.363527 -40.935024 -v 117.289551 -4.548828 -44.283566 -v 116.703918 -3.534485 -44.007778 -v 116.241348 -2.733278 -43.238338 -v 115.999023 -2.313600 -42.136929 -v 117.527283 -4.411560 -44.558102 -v 116.880402 -3.291138 -44.253445 -v 116.369476 -2.406189 -43.403561 -v 116.101807 -1.942567 -42.186977 -v 117.852051 -4.224060 -44.658566 -v 117.182739 -3.064820 -44.343380 -v 116.654083 -2.149170 -43.464016 -v 116.377167 -1.669496 -42.205257 -v 131.678711 -28.172548 -44.658569 -v 131.353958 -28.360048 -44.558105 -v 131.116196 -28.497316 -44.283569 -v 132.377869 -30.682558 -42.382111 -v 132.111740 -30.221621 -43.369171 -v 131.663956 -29.446047 -44.044037 -v 132.747543 -30.773806 -42.457794 -v 132.453598 -30.264711 -43.548065 -v 131.958969 -29.408022 -44.293518 -v 133.120605 -30.669985 -42.485504 -v 132.816483 -30.143251 -43.613556 -v 132.304718 -29.256777 -44.384827 -v 134.410965 -32.904911 -33.485508 -v 134.037903 -33.008793 -33.457798 -v 133.668228 -32.917545 -33.382114 -v 67.687225 82.663986 -5.158548 -v 67.687225 82.663986 -0.358561 -v 146.463165 -53.780033 -24.019844 -v 102.530396 22.313774 -6.723564 -v 101.848083 23.495598 -7.751915 -v 96.552597 32.667664 -44.887501 -v 96.921814 32.028137 -46.565815 -v 97.626694 30.807249 -47.738300 -v 137.922058 -38.986336 -3.358555 -v 148.377228 -57.095222 -3.358561 -v 147.657288 -55.848270 -22.220192 -v 148.366913 -57.077396 -19.588051 -v 148.377228 -57.095219 -19.516121 -v 133.638367 -31.566776 -29.973757 -v 134.167023 -32.482426 -30.853121 -v 134.443954 -32.962040 -32.111881 -v 69.044891 83.447800 -0.358561 -v 72.760178 85.592819 8.841452 -v 72.534241 85.488998 8.864492 -v 68.560425 83.273544 -0.358561 -v 72.312576 85.439865 8.932791 -v 68.180634 83.263779 -0.358561 -v 72.103683 85.447311 9.043692 -v 68.073135 83.292587 -0.321970 -v 71.915573 85.511032 9.192923 -v 67.954224 83.324448 -0.321939 -v 71.646103 85.767441 9.549704 -v 67.825363 83.358994 -0.358561 -v 67.615128 83.477707 -0.358561 -v 71.137558 86.041611 9.148581 -v 67.298248 83.824997 -0.358561 -v 60.998253 94.736923 -0.358559 -v 64.837555 96.953598 9.148584 -v 60.892754 95.555283 -0.321938 -v 60.858208 95.426437 -0.358559 -v 60.855919 95.185043 -0.358559 -v 60.924614 95.674240 -0.321968 -v 64.854370 97.531113 9.549707 -v 64.767044 97.892624 9.192926 -v 64.805908 98.087448 9.043695 -v 60.953430 95.781662 -0.358559 -v 64.903931 98.272018 8.932795 -v 61.151764 96.105759 -0.358559 -v 61.544914 96.438156 -0.358559 -v 65.057312 98.439438 8.864496 -v 65.260178 98.583237 8.841455 -v 65.679413 97.670578 9.841452 -v 76.275681 103.788315 9.841452 -v 75.775665 104.654343 8.841452 -v 65.253326 97.522446 9.756647 -v 72.179413 86.412216 9.841452 -v 82.775696 92.529953 9.841452 -v 71.838120 86.117294 9.756643 -v 69.707703 121.164421 -7.158543 -v 77.141708 104.288315 -5.158546 -v 66.648605 122.462875 -5.158543 -v 77.141708 104.288315 8.841452 -v 75.775665 104.654343 -5.158545 -v 60.187241 95.654343 -5.158546 -v 68.629181 123.032463 -7.398256 -v 67.752701 124.550529 -8.107759 -v 66.818909 126.167900 -14.825624 -v 63.759819 127.466423 -12.825624 -v 66.636841 126.483269 -12.686068 -v 66.736267 126.311089 -10.805452 -v 67.113235 125.658195 -9.258791 -v 70.859055 119.170219 -43.004826 -v 68.373459 119.475395 -45.004856 -v 72.752396 115.890800 -47.069401 -v 71.913818 117.343315 -46.215794 -v 71.272415 118.454216 -44.838871 -v 68.374527 119.473503 -45.012394 -v 69.027527 118.445854 -47.268467 -v 71.258316 114.478630 -49.358555 -v 70.051025 116.673088 -48.811039 -v 69.509552 117.638481 -48.150364 -v 51.920044 109.973503 -45.012394 -v 54.803833 104.978630 -49.358559 -v 53.551804 107.147209 -48.811039 -v 52.528275 108.919975 -47.268467 -v 29.246016 149.246033 -49.358543 -v 27.687178 148.346069 -51.158531 -v -146.984146 -58.146606 -51.158554 -v -145.539597 -55.604065 -51.158554 -v 142.139267 -90.800911 -51.158585 -v 141.944717 -90.860909 -51.158585 -v 145.952332 -85.695198 -51.158585 -v 148.422104 -79.641853 -51.158585 -v 148.467499 -79.840157 -51.158585 -v -27.114000 150.645813 -51.158531 -v -26.676043 151.041016 -51.158531 -v -25.853350 151.698669 -51.158531 -v -148.962997 -82.123909 -51.158554 -v 147.251831 -61.396851 -51.158577 -v 148.750885 -65.894470 -51.158581 -v -120.328262 -99.271370 -51.158562 -v -126.771957 -99.078804 -51.158562 -v -22.468981 157.177063 -51.158531 -v 23.083189 154.232117 -51.158531 -v 24.569319 151.698669 -51.158531 -v 149.438278 -70.571777 -51.158581 -v 149.267990 -75.551392 -51.158581 -v 138.169067 -94.122383 -51.158585 -v 133.852081 -96.636116 -51.158585 -v 129.157730 -98.308479 -51.158585 -v -150.865860 -72.346558 -51.158554 -v -150.435043 -67.327820 -51.158554 -v -149.171768 -62.709839 -51.158554 -v 124.197205 -99.090767 -51.158585 -v 119.284607 -99.165169 -51.158581 -v 117.904358 -99.709358 -51.158585 -v 114.581894 -100.295235 -51.158585 -v -115.865921 -100.295235 -51.158562 -v -19.323793 160.744873 -51.158527 -v -15.632768 163.689331 -51.158527 -v 20.234770 158.393250 -51.158531 -v 116.395599 -100.108894 -51.158585 -v 114.913635 -100.285713 -51.158585 -v -118.786179 -99.836678 -51.158562 -v -119.347397 -99.655037 -51.158562 -v -150.369705 -77.312195 -51.158554 -v -144.195114 -51.227600 -51.158550 -v -28.971209 148.346069 -51.158531 -v -145.099625 -53.388794 -51.158554 -v -131.432205 -98.138313 -51.158562 -v -135.822128 -96.415718 -51.158562 -v -146.802383 -86.420601 -51.158554 -v -140.063858 -93.797188 -51.158562 -v -143.792313 -90.404305 -51.158558 -v 3.327255 167.921387 -51.158531 -v 8.187057 166.734802 -51.158531 -v -1.469497 168.201050 -51.158531 -v -11.239778 166.055176 -51.158527 -v -6.434494 167.587219 -51.158531 -v 12.758192 164.668274 -51.158531 -v 16.872679 161.792725 -51.158531 -v -106.547684 -102.095222 -49.358574 -v -115.865921 -102.095222 -49.358574 -v -104.649246 -102.095222 -49.358574 -v 114.581894 -102.095222 -49.358597 -v -80.532043 -102.095222 -49.358578 -v -96.000809 -102.095222 -49.358578 -v 117.127045 -102.095222 -48.955521 -v 119.052124 -100.266121 -50.079727 -v 119.413239 -102.095222 -47.792191 -v 120.764740 -100.220345 -49.025253 -v 122.681580 -100.197273 -47.039688 -v 121.229065 -102.095222 -45.981091 -v 124.104065 -100.180122 -44.255901 -v 122.396454 -102.095222 -43.698376 -v 149.253922 -63.604126 -50.074928 -v 148.741821 -62.141602 -50.070564 -v 149.646774 -66.421265 -29.855295 -v 123.186310 -100.074776 -46.262100 -v 122.937042 -100.096687 -46.661911 -v 125.450836 -100.087288 -50.066025 -v 124.277847 -99.935616 -43.597240 -v 121.026352 -100.210091 -48.812637 -v 133.388626 -98.025154 -10.212721 -v 132.547028 -98.317635 -11.190351 -v 132.043106 -98.451302 -12.388441 -v 134.465439 -97.572456 -9.577009 -v 133.896820 -97.779243 -10.873518 -v 131.107849 -98.531624 -29.855299 -v 135.640961 -96.991219 -9.358595 -v 137.647705 -95.815315 -9.358595 -v 149.929688 -66.117188 -50.081738 -v 150.355286 -68.692749 -10.179089 -v 150.500076 -69.864136 -9.558331 -v 146.858582 -58.439941 -46.862556 -v 145.972412 -56.685364 -48.966286 -v 147.246109 -58.866638 -50.059303 -v 146.970322 -58.676941 -46.465401 -v 147.447632 -59.804382 -43.597237 -v 150.044846 -67.271362 -12.388439 -v 150.389648 -69.212830 -10.873516 -v 150.185303 -67.793579 -11.160625 -v 149.044739 -81.320686 -9.358595 -v 150.540848 -73.698059 -50.097118 -v 149.968964 -78.011055 -9.358595 -v 150.360840 -68.612793 -50.087597 -v 150.308746 -76.113342 -9.358595 -v 150.564240 -73.443176 -9.358593 -v 146.865479 -86.113411 -9.358595 -v 148.147034 -83.589241 -50.106949 -v 149.795807 -78.751900 -50.103622 -v 143.710083 -90.560616 -9.358597 -v 145.659882 -88.033699 -50.107193 -v 146.818527 -86.195320 -50.107498 -v 130.220306 -99.159798 -50.079727 -v 134.773453 -97.415779 -50.090836 -v 139.832397 -94.258919 -9.358595 -v 138.509888 -95.227364 -50.098312 -v 141.445679 -92.888618 -9.358595 -v 141.661545 -92.683479 -50.103317 -v 142.413803 -91.954353 -50.104294 -v 152.383041 -72.992676 -7.558575 -v 151.728912 -78.388680 -7.558577 -v 136.486450 -98.580513 -7.558577 -v 138.166977 -97.615669 -7.558577 -v 142.661591 -94.215889 -7.558578 -v 145.568985 -91.148750 -7.558578 -v 148.427322 -87.008125 -7.558577 -v 150.483505 -82.636482 -7.558577 -v 130.944473 -100.851631 -11.948105 -v 132.071182 -98.526131 -12.385847 -v 131.723419 -100.608528 -10.192703 -v 132.580078 -98.379280 -11.175215 -v 133.023926 -100.149727 -8.782425 -v 133.424805 -98.086372 -10.202589 -v 134.680527 -99.464912 -7.871717 -v 134.491333 -97.622200 -9.574537 -v 122.558044 -102.094795 -43.174511 -v 124.289169 -100.177498 -43.617020 -v 122.396454 -101.895218 -6.394577 -v 122.396454 -101.895210 -23.003216 -v 124.053848 -101.849129 -8.927872 -v 125.706085 -101.710823 -11.461136 -v 125.815887 -101.698372 -9.759201 -v 125.208725 -101.762215 -8.169235 -v 123.995911 -101.852303 -6.975937 -v 125.706085 -101.912117 -11.461136 -v 122.396454 -102.095222 -23.003216 -v 120.802917 -102.095222 -28.560591 -v 116.637238 -101.895210 -43.088055 -v 116.637238 -102.095222 -43.088055 -v 151.063629 -63.252571 -3.358561 -v 152.383041 -72.992683 -3.358562 -v 150.483505 -82.636490 -3.358564 -v 145.568985 -91.148758 -3.358566 -v 138.166977 -97.615677 -3.358564 -v 129.072083 -101.343094 -3.358566 -v 122.396454 -102.095230 -3.358566 -v 122.396454 -102.095230 -6.394577 -v 123.673569 -102.068062 -6.792801 -v 125.844971 -101.896370 -10.000137 -v 125.500809 -101.934212 -8.699570 -v 124.746811 -102.002998 -7.588699 -v 101.486130 -102.095230 -3.358564 -v 60.187241 95.654343 -0.358559 -v 49.028679 114.981499 -30.003359 -v 48.793571 115.388786 -29.956728 -v 48.573982 115.769035 -30.131197 -v 29.427931 148.930969 -45.720150 -v 30.622046 146.862732 -47.519798 -v 50.794136 111.923637 -46.565796 -v 51.163391 111.284111 -44.887486 -v 48.418983 116.037590 -30.487825 -v 48.363159 116.134209 -30.946993 -v 48.363159 116.134209 -40.258545 -v 49.226837 114.638298 -30.260744 -v 25.338762 156.013672 -6.664911 -v 25.338762 156.013672 -3.358515 -v 35.793922 137.904785 -3.358519 -v 45.689873 120.764450 -6.449770 -v 45.860458 120.468979 -6.706881 -v 45.961845 120.293388 -7.082918 -v 25.338758 156.013672 -43.698326 -v 25.338760 156.013672 -19.516075 -v 25.922453 155.002686 -45.981041 -v 28.718306 150.160034 -43.088005 -v 26.830351 153.430054 -47.792137 -v 27.973448 151.450256 -48.955467 -v 32.082748 144.332703 -48.158535 -v 49.196884 114.690178 -48.158539 -v 50.089287 113.144524 -47.738281 -v 45.933708 120.342155 -9.853487 -v 46.109932 120.036919 -9.560366 -v 46.202225 119.877068 -9.140779 -v 46.191231 119.896049 -8.682894 -v 22.826414 156.534973 -44.255852 -v 23.552488 155.311523 -47.039635 -v 24.456724 153.788025 -48.909111 -v 25.495893 152.095032 -50.137749 -v -18.643736 162.546021 -12.388386 -v -18.261366 162.928284 -11.160572 -v -17.567579 163.524841 -10.179035 -v 18.464264 161.182861 -29.598625 -v 22.043333 157.696228 -50.119560 -v 18.861311 161.342224 -50.130943 -v 23.195311 155.688232 -46.262199 -v 23.339277 155.483459 -46.662071 -v 15.387056 164.204346 -9.576866 -v 16.316942 163.497742 -10.212273 -v 16.991503 162.915161 -11.190086 -v 22.527769 156.563232 -43.597191 -v 17.359713 162.546021 -12.388390 -v -21.575319 159.858765 -50.126209 -v -23.179811 157.896118 -50.120171 -v -19.748398 161.182739 -29.598652 -v -24.671556 155.413940 -46.788292 -v -25.740755 153.788025 -48.909111 -v -24.635225 155.741394 -50.113914 -v -26.779985 152.094910 -50.137779 -v -24.551088 155.586670 -46.466026 -v -23.811798 156.563232 -43.597187 -v -16.625639 164.236633 -9.558155 -v -17.803469 163.363525 -50.137653 -v -13.514009 166.091492 -50.147114 -v -8.799897 168.003174 -50.154076 -v -4.573028 168.937256 -50.157494 -v -0.642105 169.213623 -50.158531 -v 0.531678 169.189148 -50.158470 -v 5.603272 168.510742 -50.155937 -v 10.445463 166.933350 -50.150169 -v 14.956648 164.485779 -50.141533 -v -29.263735 151.439392 -48.959496 -v -30.530046 149.246033 -49.358543 -v -28.119951 153.420532 -47.800194 -v -27.210390 154.995850 -45.991718 -v -24.841372 155.303467 -47.052696 -v -26.622774 156.013672 -43.698322 -v -24.110443 156.534973 -44.255848 -v -145.753983 -50.327637 -49.358562 -v -149.661240 -57.095215 -43.698345 -v -149.077530 -56.084167 -45.981060 -v -148.856522 -59.531616 -44.255871 -v -148.160080 -58.291138 -47.039658 -v -147.292831 -56.746277 -48.909134 -v -148.169632 -54.511658 -47.792160 -v -147.083206 -56.351318 -49.239914 -v -146.346207 -54.999817 -50.137772 -v -147.026535 -52.531738 -48.955486 -v -148.081192 -58.054932 -50.114120 -v -148.202347 -58.561646 -46.662094 -v -148.323837 -58.484497 -50.113358 -v -148.332718 -58.500427 -50.113419 -v -148.345047 -58.522766 -50.113480 -v -149.570114 -61.018250 -50.120193 -v -148.307693 -58.788757 -46.262222 -v -148.731674 -59.804382 -43.597210 -v -150.700607 -65.633301 -29.598646 -v -151.328873 -67.271362 -12.388412 -v -151.778732 -69.809021 -9.576889 -v -151.671005 -69.199280 -10.837906 -v -151.631729 -68.650391 -10.212296 -v -151.464523 -67.774902 -11.190109 -v -132.405502 -98.883736 -50.133018 -v -127.381119 -100.011665 -50.121056 -v -131.594223 -98.726387 -29.598684 -v -134.712906 -98.008736 -10.179068 -v -135.800369 -97.548958 -9.558187 -v -124.136734 -100.105598 -46.788322 -v -122.194077 -100.218575 -48.909142 -v -121.185745 -100.264961 -50.131004 -v -120.208176 -100.271980 -50.137810 -v -124.346542 -100.087593 -46.466057 -v -135.167831 -97.783699 -10.837912 -v -133.849411 -98.311348 -11.160604 -v -140.755875 -94.527596 -50.150505 -v -136.411819 -97.238777 -50.141991 -v -144.517838 -91.092781 -50.156116 -v -147.600082 -87.031441 -50.158524 -v -149.899124 -82.475960 -50.157394 -v -151.184006 -78.302254 -50.153824 -v -151.846298 -73.212646 -50.146713 -v -151.582230 -68.159119 -50.137161 -v -150.404343 -63.198730 -50.125748 -v -150.854385 -64.671631 -50.129318 -v -118.398575 -102.095222 -48.959526 -v -120.686111 -102.095222 -47.800224 -v -122.505264 -102.095222 -45.991753 -v -123.956070 -100.197334 -47.052727 -v -123.680496 -102.095222 -43.698357 -v -125.388107 -100.180122 -44.255882 -v -80.532043 -102.095222 -30.158566 -v -96.000809 -102.095222 -30.158564 -v -96.000809 -102.095222 -35.335228 -v -123.082687 -102.095222 -25.088036 -v -123.680496 -102.095222 -23.003197 -v -56.897324 -102.095222 -47.519836 -v -59.285553 -102.095222 -45.720181 -v -80.532043 -102.095222 -45.086697 -v -102.348526 -102.095222 -46.393517 -v -103.730698 -102.095222 -45.061333 -v -104.649246 -102.095222 -45.086693 -v -100.430496 -102.095222 -45.930443 -v -98.996964 -102.095222 -45.567223 -v -97.978638 -102.095222 -44.622643 -v -104.288406 -102.095222 -43.259575 -v -104.297684 -102.095222 -42.977318 -v -104.649246 -102.095222 -35.335228 -v -100.430496 -102.095222 -35.524193 -v -98.427170 -102.095222 -36.033867 -v -96.422668 -102.095222 -39.367210 -v -96.422668 -102.095222 -43.071800 -v -96.000809 -102.095222 -45.086693 -v -103.172684 -102.095222 -42.977318 -v -102.836533 -102.095222 -44.454185 -v -101.930008 -102.095222 -45.466820 -v -98.844772 -102.095222 -42.968834 -v -97.053604 -102.095222 -37.282616 -v -96.436554 -102.095222 -39.062370 -v -103.805283 -102.095222 -37.504601 -v -102.577164 -102.095222 -36.185570 -v -100.779465 -102.095222 -35.540794 -v -100.692154 -102.095222 -45.917839 -v -97.554977 -102.095222 -43.320000 -v -97.868835 -102.095222 -42.341087 -v -97.547684 -102.095222 -43.117943 -v -97.547684 -102.095222 -41.768822 -v -100.430496 -102.095222 -46.914818 -v -100.188034 -102.095222 -46.907127 -v -98.275116 -102.095222 -46.305382 -v -96.939972 -102.095222 -44.938805 -v -78.161407 -102.095222 -42.755367 -v -79.509537 -102.095222 -41.480465 -v -73.360168 -102.095222 -43.258572 -v -72.235184 -102.095222 -43.258572 -v -72.235184 -102.095222 -39.391384 -v -60.704788 -102.095222 -43.088039 -v -72.249695 -102.095222 -39.073208 -v -62.958298 -102.095222 -35.229092 -v -72.870300 -102.095222 -37.288296 -v -74.239182 -102.095222 -36.035275 -v -80.099991 -102.095222 -39.662533 -v -80.110184 -102.095222 -39.391384 -v -80.532043 -102.095222 -35.335232 -v -79.615997 -102.095222 -37.480923 -v -78.396255 -102.095222 -36.162960 -v -76.564056 -102.095222 -35.537563 -v -76.242981 -102.095222 -35.524197 -v 112.829758 -102.095222 -47.519852 -v 115.218002 -102.095222 -45.720196 -v -119.262527 -102.095222 -45.086693 -v -119.262527 -102.095222 -35.335228 -v -121.663437 -102.095222 -27.720177 -v -106.547684 -102.095222 -30.158564 -v -116.353836 -102.095222 -30.158562 -v -119.275223 -102.095222 -29.519798 -v -106.547684 -102.095222 -35.335228 -v -104.649246 -102.095222 -30.158564 -v -66.765762 -102.095222 -30.797329 -v -69.687134 -102.095222 -30.158566 -v -64.377533 -102.095222 -32.596951 -v -88.828918 -102.095222 -43.258568 -v -87.703934 -102.095222 -43.258568 -v -87.703934 -102.095222 -39.367210 -v -82.460678 -102.095222 -37.966030 -v -83.413895 -102.095222 -36.968655 -v -86.291397 -102.095222 -36.875542 -v -87.279663 -102.095222 -37.853939 -v -84.961746 -102.095222 -36.508568 -v -84.783035 -102.095222 -36.515987 -v -88.291855 -102.095222 -37.406307 -v -88.251038 -102.095222 -37.611599 -v -87.915848 -102.095222 -36.909508 -v -88.828918 -102.095222 -39.367210 -v -89.210678 -102.095222 -37.966030 -v -90.163910 -102.095222 -36.968651 -v -91.533035 -102.095222 -36.515987 -v -94.453934 -102.095222 -43.258568 -v -95.578918 -102.095222 -43.258568 -v -86.406769 -102.095222 -35.818386 -v -89.640808 -102.095222 -36.066952 -v -88.688751 -102.095222 -36.814934 -v -105.141434 -102.095222 -35.075951 -v -105.000809 -102.095222 -35.524193 -v -105.000809 -102.095222 -43.117943 -v -105.141434 -102.095222 -43.188255 -v -106.547684 -102.095222 -45.086693 -v -106.969559 -102.095222 -35.524193 -v -113.263351 -102.095222 -36.704094 -v -113.599533 -102.095222 -37.081718 -v -113.719559 -102.095222 -37.666527 -v -108.119888 -102.095222 -39.190514 -v -107.323685 -102.095222 -39.907616 -v -106.980179 -102.095222 -40.840874 -v -112.603348 -102.095222 -39.883568 -v -109.228348 -102.095222 -39.883568 -v -109.059402 -102.095222 -39.895927 -v -108.565201 -102.095222 -40.096184 -v -113.718430 -102.095222 -39.587914 -v -114.518875 -102.095222 -38.826805 -v -114.839828 -102.095222 -37.794182 -v -105.000809 -102.095222 -34.117943 -v -105.000809 -102.095222 -35.005638 -v -113.273666 -102.095222 -38.676292 -v -112.863846 -102.095222 -38.877342 -v -112.511063 -102.095222 -36.438255 -v -113.585068 -102.095222 -38.301353 -v -108.232834 -102.095222 -40.462242 -v -108.094559 -102.095222 -41.041527 -v -108.240372 -102.095222 -41.651756 -v -108.663589 -102.095222 -42.107475 -v -69.687134 -101.895210 -30.158566 -v -116.353836 -101.895210 -30.158562 -v -123.145096 -101.895218 -6.358574 -v 121.861053 -101.895218 -6.358597 -v 80.071228 -101.895210 -11.099102 -v 82.890732 -101.895210 -13.444073 -v 84.367676 -101.895210 -16.800699 -v -123.082687 -101.895210 -25.088036 -v -121.663437 -101.895210 -27.720177 -v -119.275223 -101.895210 -29.519798 -v 112.829758 -101.895210 -47.519852 -v 84.191727 -101.895210 -20.463663 -v 115.218002 -101.895210 -45.720196 -v -66.765762 -101.895210 -30.797329 -v -64.377533 -101.895210 -32.596951 -v -62.958298 -101.895210 -35.229092 -v -60.704788 -101.895210 -43.088039 -v -56.897324 -101.895210 -47.519836 -v -59.285553 -101.895210 -45.720181 -v 121.861053 -102.095230 -6.358597 -v -123.145096 -102.095230 -6.358574 -v -102.770126 -102.095230 -3.358545 -v -123.680496 -102.095230 -3.358543 -v -123.680496 -102.095230 -6.394554 -v -139.206070 -38.986336 -3.358532 -v -149.661240 -57.095222 -3.358534 -v -146.852982 -91.148758 -3.358540 -v -139.451004 -97.615677 -3.358541 -v -130.356125 -101.343094 -3.358543 -v -152.347672 -63.252571 -3.358534 -v -153.667068 -72.992683 -3.358536 -v -151.767532 -82.636490 -3.358538 -v -126.990128 -101.912117 -11.461113 -v -127.138779 -101.895271 -10.134178 -v -126.842545 -101.928108 -8.832512 -v -125.085770 -102.062263 -6.860893 -v -126.134262 -101.994759 -7.700584 -v -149.661240 -57.095222 -6.664930 -v -150.209763 -58.088142 -7.379683 -v -150.589371 -58.832039 -8.428389 -v -150.782150 -59.230537 -9.697676 -v -150.780685 -59.227425 -11.039625 -v -150.738998 -59.140022 -11.461103 -v -149.661240 -57.095219 -19.516094 -v -27.217222 154.583984 -6.358541 -v -148.720383 -55.865608 -6.358564 -v -27.390440 154.684021 -6.358541 -v -148.893600 -55.765633 -6.358564 -v -37.077950 137.904785 -3.358511 -v -26.622770 156.013672 -3.358511 -v -26.622770 156.013672 -6.664907 -v 21.349535 161.418884 -3.358513 -v -22.633574 161.418884 -3.358509 -v -5.556545 170.608337 -3.358509 -v -14.858060 167.431580 -3.358509 -v 4.272526 170.608337 -3.358509 -v 13.574053 167.431580 -3.358513 -v -26.622772 156.013672 -19.516071 -v -25.390791 157.969421 -11.461081 -v -25.306334 158.092102 -10.130054 -v -25.475935 157.844482 -8.824820 -v -26.423643 156.353455 -6.854452 -v -25.869886 157.247986 -7.691092 -v 24.753084 156.985229 -7.379663 -v 24.298677 157.685852 -8.428370 -v 24.049959 158.052063 -9.697655 -v 24.051897 158.049194 -11.039604 -v 24.106752 157.969421 -11.461084 -v -25.353270 157.668762 -8.622152 -v -25.137114 157.985168 -10.018026 -v -25.217070 157.869202 -11.461081 -v -26.449568 155.913696 -6.664907 -v -25.820906 156.953064 -7.453573 -v -25.852293 156.903320 -9.062979 -v -26.449570 155.913696 -19.516071 -v -29.829149 150.060059 -43.088001 -v -30.002337 150.160034 -43.088001 -v -30.538759 148.830994 -45.720142 -v -30.711962 148.930969 -45.720142 -v -31.732882 146.762756 -47.519798 -v -31.906084 146.862732 -47.519798 -v -33.193558 144.232788 -48.158531 -v -33.366760 144.332703 -48.158531 -v -111.232315 9.065674 -48.158546 -v -111.405502 9.165649 -48.158546 -v -132.023453 -27.844728 -43.033550 -v -131.985886 -27.866396 -43.121559 -v -132.499832 -28.756594 -42.896797 -v -133.117569 -29.014772 -41.999062 -v -132.766647 -28.406984 -42.527931 -v -132.589859 -28.587404 -42.675667 -v -133.003281 -28.242800 -42.476051 -v -132.585953 -27.519899 -42.658550 -v -132.337387 -27.663454 -42.715645 -v -133.326096 -29.375978 -41.225563 -v -133.547226 -29.184938 -41.209816 -v -133.344467 -28.833742 -41.961891 -v -132.968491 -29.243227 -42.105019 -v -133.193527 -29.632936 -41.270363 -v -132.261185 -27.707460 -42.759041 -v -132.126663 -27.785097 -42.878212 -v -133.169662 -29.916811 -41.337440 -v -132.919998 -29.484316 -42.263561 -v -131.936447 -27.894960 -43.408550 -v -132.510269 -28.888857 -43.157600 -v -132.979385 -29.701418 -42.450600 -v -133.258163 -30.184267 -41.416542 -v -123.757645 -12.228883 -42.658546 -v -119.799606 -5.373353 -42.658546 -v -119.474838 -5.560791 -42.759041 -v -119.237076 -5.698060 -43.033546 -v -119.150070 -5.748291 -43.408546 -v -119.384445 -4.654298 -39.926186 -v -118.999039 -5.986757 -40.201820 -v -120.316360 -6.268374 -33.426186 -v -119.930954 -7.600893 -33.701851 -v -116.457413 -7.454164 -40.201820 -v -118.990799 -5.972413 -40.545235 -v -116.448959 -7.439943 -40.545235 -v -119.060043 -6.092347 -40.859901 -v -116.519852 -7.558900 -40.859901 -v -119.192184 -6.321290 -41.079750 -v -116.655136 -7.786012 -41.079750 -v -119.359512 -6.611084 -41.158546 -v -116.826431 -8.073548 -41.158546 -v -117.411484 -9.055483 -33.701851 -v -117.185593 -8.676332 -41.136269 -v -117.461746 -9.139894 -40.615303 -v -117.359390 -8.968080 -40.948036 -v -117.092697 -8.520448 -41.158546 -v -117.513840 -9.227236 -33.369057 -v -117.687637 -9.519045 -33.180824 -v -117.780533 -9.674868 -33.158546 -v -118.415848 -10.741213 -34.115273 -v -118.046799 -10.121828 -33.158546 -v -118.430710 -10.766176 -33.908546 -v -118.238754 -10.444033 -33.259041 -v -118.379288 -10.679811 -33.533577 -v -119.980057 -7.685853 -40.615303 -v -120.912003 -9.300051 -34.115273 -v -122.258652 -9.632509 -34.390938 -v -121.326736 -8.018434 -40.890907 -v -120.920242 -9.314333 -33.771858 -v -122.277908 -9.665834 -33.589638 -v -120.850998 -9.194399 -33.457191 -v -122.116348 -9.386050 -32.855354 -v -120.718857 -8.965456 -33.237343 -v -121.807968 -8.851932 -32.342415 -v -120.551529 -8.675661 -33.158546 -v -121.417557 -8.175723 -32.158546 -v -122.319748 -9.738343 -39.926186 -v -121.934341 -11.070802 -40.201820 -v -123.251663 -11.352480 -33.426186 -v -122.866287 -12.684999 -33.701851 -v -121.926102 -11.056520 -40.545235 -v -122.300491 -9.705018 -40.727455 -v -121.995346 -11.176454 -40.859901 -v -122.462051 -9.984804 -41.461739 -v -122.127487 -11.405396 -41.079750 -v -122.770432 -10.518922 -41.974709 -v -122.294815 -11.695191 -41.158546 -v -123.160843 -11.195191 -42.158546 -v -119.499039 -12.559266 -40.783516 -v -119.639572 -12.795106 -41.058052 -v -119.447617 -12.472962 -40.408546 -v -119.831528 -13.117372 -41.158546 -v -119.462509 -12.497926 -40.201820 -v -120.097794 -13.564271 -41.158546 -v -120.416580 -14.099306 -33.701851 -v -120.190689 -13.720155 -41.136269 -v -120.466843 -14.183656 -40.615303 -v -120.364487 -14.011903 -40.948036 -v -120.518936 -14.271059 -33.369057 -v -120.692734 -14.562807 -33.180824 -v -120.785629 -14.718691 -33.158546 -v -121.420914 -15.785034 -34.115273 -v -121.051895 -15.165590 -33.158546 -v -121.435806 -15.809937 -33.908546 -v -121.243851 -15.487795 -33.259041 -v -121.384384 -15.723635 -33.533577 -v -122.915359 -12.769959 -40.615303 -v -123.847305 -14.384157 -34.115273 -v -124.262039 -13.102479 -40.890907 -v -124.084610 -12.795167 -41.548927 -v -122.839340 -12.638307 -40.897285 -v -123.786087 -12.278138 -41.998878 -v -122.711411 -12.416688 -41.090096 -v -123.758896 -12.231019 -42.022743 -v -122.554886 -12.145631 -41.158546 -v -123.420914 -11.645631 -42.158546 -v -125.193954 -14.716616 -34.390938 -v -123.855545 -14.398439 -33.771858 -v -125.213181 -14.749941 -33.589638 -v -123.786301 -14.278505 -33.457191 -v -125.051651 -14.470157 -32.855354 -v -123.654129 -14.049562 -33.237343 -v -124.743271 -13.936038 -32.342415 -v -123.486832 -13.759768 -33.158546 -v -124.352829 -13.259768 -32.158546 -v -125.256668 -14.825257 -39.926186 -v -124.871262 -16.157717 -40.201820 -v -126.188583 -16.439335 -33.426186 -v -125.803177 -17.771854 -33.701851 -v -128.130875 -19.803532 -34.390938 -v -126.784225 -19.471012 -34.115273 -v -127.198959 -18.189333 -40.890907 -v -125.852280 -17.856874 -40.615303 -v -123.473587 -19.230227 -40.615303 -v -124.427689 -20.831547 -34.115273 -v -124.058640 -20.212162 -33.158546 -v -124.436111 -20.845768 -33.771858 -v -124.365250 -20.726810 -33.457191 -v -124.229935 -20.499699 -33.237343 -v -123.792374 -19.765324 -33.158546 -v -123.699509 -19.609379 -33.180824 -v -123.423325 -19.145878 -33.701851 -v -123.525681 -19.317692 -33.369057 -v -123.371262 -19.058474 -40.948036 -v -123.197433 -18.766665 -41.136269 -v -123.104568 -18.610842 -41.158546 -v -122.469254 -17.544558 -40.201820 -v -122.838303 -18.163881 -41.158546 -v -122.454391 -17.519594 -40.408546 -v -122.646317 -17.841738 -41.058052 -v -122.505814 -17.605898 -40.783516 -v -126.792465 -19.485355 -33.771858 -v -126.723221 -19.365421 -33.457191 -v -126.591080 -19.136478 -33.237343 -v -126.423752 -18.846684 -33.158546 -v -127.289780 -18.346622 -32.158546 -v -126.163651 -18.396244 -33.158546 -v -127.029678 -17.896244 -32.158546 -v -128.150101 -19.836857 -33.589638 -v -127.988571 -19.557072 -32.855354 -v -127.680191 -19.022953 -32.342415 -v -128.193588 -19.912172 -39.926186 -v -127.808182 -21.244631 -40.201820 -v -129.125504 -21.526249 -33.426186 -v -128.740097 -22.858768 -33.701851 -v -127.799942 -21.230349 -40.545235 -v -128.174332 -19.878786 -40.727455 -v -127.869186 -21.350222 -40.859901 -v -128.335892 -20.158632 -41.461739 -v -128.001328 -21.579103 -41.079750 -v -128.644272 -20.692751 -41.974709 -v -128.168655 -21.868959 -41.158546 -v -129.034683 -21.368959 -42.158546 -v -127.065384 -25.258793 -33.158546 -v -129.360672 -23.933598 -33.158546 -v -126.799118 -24.811832 -33.158546 -v -129.100571 -23.483097 -33.158546 -v -126.271530 -23.926271 -41.090096 -v -126.402512 -24.146181 -40.897285 -v -126.480362 -24.276857 -40.615303 -v -127.397873 -25.816776 -33.533577 -v -127.257370 -25.580997 -33.259041 -v -127.449326 -25.903080 -33.908546 -v -127.434433 -25.878178 -34.115273 -v -126.706253 -24.656010 -33.180824 -v -126.532425 -24.364201 -33.369057 -v -126.430099 -24.192448 -33.701851 -v -125.475998 -22.591066 -40.201820 -v -125.512558 -22.652407 -40.783516 -v -125.653091 -22.888308 -41.058052 -v -125.461136 -22.566103 -40.408546 -v -125.845047 -23.210512 -41.158546 -v -126.111313 -23.657412 -41.158546 -v -128.428726 -22.319399 -41.158546 -v -128.585251 -22.590517 -41.090096 -v -128.713181 -22.812136 -40.897285 -v -128.789200 -22.943789 -40.615303 -v -129.294754 -21.819460 -42.158546 -v -129.659927 -22.451906 -41.998878 -v -129.958481 -22.968996 -41.548927 -v -130.135880 -23.276247 -40.890907 -v -131.067795 -24.890385 -34.390938 -v -129.721146 -24.557926 -34.115273 -v -132.037521 -28.569950 -33.158550 -v -132.903519 -28.070011 -32.158546 -v -131.880997 -28.298954 -33.226997 -v -132.538376 -27.437504 -32.318245 -v -131.753067 -28.077335 -33.419811 -v -132.239822 -26.920414 -32.768166 -v -131.677048 -27.945621 -33.701851 -v -132.062424 -26.613163 -33.426186 -v -131.130508 -24.999086 -39.926186 -v -130.745102 -26.331545 -40.201820 -v -130.736862 -26.317202 -40.545235 -v -131.111252 -24.965700 -40.727455 -v -130.806107 -26.437136 -40.859905 -v -131.272812 -25.245546 -41.461739 -v -130.938248 -26.666018 -41.079750 -v -131.581192 -25.779665 -41.974709 -v -131.105576 -26.955873 -41.158550 -v -131.971603 -26.455873 -42.158550 -v -132.231674 -26.906374 -42.158550 -v -131.365646 -27.406313 -41.158550 -v -128.519333 -27.699038 -40.783516 -v -128.659836 -27.934877 -41.058052 -v -128.467880 -27.612734 -40.408550 -v -128.851822 -28.257143 -41.158550 -v -128.482773 -27.637697 -40.201820 -v -129.118057 -28.703981 -41.158550 -v -129.436844 -29.239017 -33.701851 -v -129.210953 -28.859865 -41.136269 -v -129.487106 -29.323366 -40.615303 -v -129.384750 -29.151613 -40.948036 -v -129.539200 -29.410831 -33.369061 -v -129.713028 -29.702518 -33.180824 -v -129.805893 -29.858463 -33.158550 -v -130.441177 -30.924747 -34.115276 -v -130.072159 -30.305302 -33.158550 -v -130.456070 -30.949711 -33.908550 -v -130.264114 -30.627506 -33.259045 -v -130.404648 -30.863407 -33.533581 -v -131.726120 -28.030703 -40.615303 -v -132.658066 -29.644840 -34.115273 -v -134.004715 -29.977299 -34.390938 -v -133.072800 -28.363161 -40.890907 -v -132.666306 -29.659122 -33.771858 -v -134.023972 -30.010624 -33.589642 -v -132.597061 -29.539188 -33.457191 -v -133.862411 -29.730839 -32.855354 -v -132.464920 -29.310246 -33.237343 -v -133.554031 -29.196720 -32.342415 -v -132.297592 -29.020451 -33.158546 -v -133.163620 -28.520451 -32.158546 -v -120.385849 -6.388796 -31.841042 -v -123.757645 -12.228885 -31.908546 -v -120.803207 -7.111576 -31.658545 -v -133.589554 -29.258244 -31.658548 -v -129.601456 -22.350590 -32.318245 -v -129.966599 -22.983097 -32.158546 -v -132.895401 -28.055910 -41.548927 -v -132.596848 -27.538820 -41.998878 -v -126.357834 -16.732546 -42.158546 -v -126.097763 -16.282045 -42.158546 -v -125.707352 -15.605836 -41.974709 -v -125.398972 -15.071717 -41.461739 -v -131.087021 -24.923710 -33.589638 -v -126.365982 -16.746647 -32.768166 -v -126.664536 -17.263676 -32.318245 -v -134.550827 -30.923222 -34.209820 -v -134.572830 -30.961308 -33.294079 -v -134.388199 -30.641544 -32.454903 -v -134.035751 -30.031071 -31.868692 -v -126.723007 -17.364992 -41.998878 -v -127.021530 -17.882082 -41.548927 -v -130.925491 -24.643925 -32.855354 -v -125.237411 -14.791871 -40.727455 -v -123.756332 -12.226626 -32.293068 -v -124.092758 -12.809329 -32.158546 -v -129.302902 -21.833500 -32.768166 -v -130.617111 -24.109806 -32.342415 -v -130.226700 -23.433537 -32.158546 -v -119.835129 -5.434877 -41.974709 -v -119.353378 -4.600465 -42.448433 -v -119.526749 -4.900758 -41.461739 -v -120.850784 -7.194032 -41.998878 -v -120.485611 -6.561586 -42.158546 -v -120.225540 -6.111084 -42.158546 -v -121.149338 -7.711122 -41.548927 -v -120.792313 -7.092776 -32.318245 -v -121.157455 -7.725222 -32.158546 -v -123.429062 -11.659793 -32.768166 -v -123.727585 -12.176822 -32.318245 -v -120.493759 -6.575686 -32.768166 -v -120.044693 -5.797854 -32.355263 -v -119.841934 -5.446658 -33.107277 -v -118.838333 -3.708314 -40.107277 -v -119.365189 -4.620973 -40.727455 -v -118.816330 -3.670228 -41.023018 -v -119.000961 -3.990053 -41.862190 -v -118.465286 -3.812257 -40.079597 -v -119.468887 -5.550478 -33.079597 -v -118.095596 -3.720949 -40.003914 -v -119.099197 -5.459231 -33.003914 -v -117.828354 -3.459047 -39.900551 -v -118.831955 -5.197329 -32.900551 -v -120.478439 -7.299137 -31.558052 -v -120.040146 -6.539919 -31.749733 -v -119.681808 -5.919314 -32.289742 -v -120.240707 -7.436405 -31.283545 -v -119.745102 -6.578006 -31.500280 -v -119.339981 -5.876284 -32.110878 -v -120.153671 -7.486637 -30.908545 -v -119.579849 -6.492740 -31.159492 -v -119.110733 -5.680178 -31.866491 -v -133.340988 -29.401737 -31.601450 -v -133.264816 -29.445744 -31.558054 -v -133.130295 -29.523441 -31.438883 -v -133.027054 -29.583012 -31.283548 -v -132.989487 -29.604740 -31.195566 -v -132.940048 -29.633244 -30.908548 -v -133.625504 -30.381107 -31.672098 -v -133.799942 -30.196659 -31.817575 -v -134.329697 -31.114262 -34.225567 -v -134.352341 -31.153446 -33.283669 -v -134.162430 -30.824528 -32.420570 -v -134.197128 -31.371220 -34.270363 -v -134.221542 -31.413517 -33.254066 -v -134.016647 -31.058598 -32.322735 -v -134.173264 -31.655033 -34.337440 -v -134.200363 -31.701969 -33.209724 -v -133.973007 -31.308231 -32.176281 -v -133.538986 -30.556400 -31.454325 -v -134.261795 -31.922550 -34.416546 -v -134.292007 -31.974979 -33.157417 -v -134.038162 -31.535282 -32.003551 -v -133.553574 -30.695927 -31.197489 -v -119.136063 -4.224060 -44.658546 -v -132.962723 -28.172548 -44.658550 -v -118.811325 -4.411560 -44.558083 -v -132.637985 -28.360048 -44.558083 -v -118.573563 -4.548828 -44.283546 -v -132.400223 -28.497316 -44.283550 -v -118.486557 -4.599060 -43.908546 -v -132.313217 -28.547548 -43.908550 -v -117.405136 -2.726014 -41.038368 -v -117.311905 -2.363527 -40.935005 -v -117.380386 -2.683168 -42.068581 -v -117.283035 -2.313600 -42.136909 -v -117.588089 -3.042847 -43.012642 -v -117.525375 -2.733278 -43.238319 -v -117.984573 -3.729615 -43.672157 -v -117.987930 -3.534485 -44.007759 -v -117.417709 -1.997743 -40.859352 -v -117.385818 -1.942567 -42.186958 -v -117.653488 -2.406189 -43.403542 -v -118.164413 -3.291138 -44.253426 -v -117.694168 -1.726625 -40.831612 -v -117.661179 -1.669496 -42.205238 -v -117.938126 -2.149170 -43.463997 -v -118.466782 -3.064820 -44.343361 -v -118.536545 -4.685670 -43.119606 -v -118.051956 -3.846315 -42.313545 -v -134.684982 -32.655582 -33.278728 -v -134.709732 -32.698429 -32.248516 -v -133.603561 -30.782475 -30.408548 -v -134.105545 -31.651981 -30.644968 -v -134.502029 -32.338688 -31.304483 -v -133.394638 -30.420656 -42.278725 -v -133.166550 -30.025515 -43.124763 -v -132.782730 -29.360781 -43.703224 -v -117.798111 -3.406617 -41.159676 -v -118.695480 -4.960940 -32.038368 -v -118.923569 -5.356020 -31.192329 -v -119.307388 -6.020815 -30.613869 -v -119.776901 -6.833988 -30.408545 -v -134.404617 -30.669985 -42.485481 -v -135.694992 -32.904911 -33.485485 -v -135.321915 -33.008793 -33.457775 -v -134.128616 -30.765932 -42.469734 -v -135.130112 -32.987247 -33.424904 -v -133.839767 -30.752260 -42.424904 -v -134.952255 -32.917545 -33.382092 -v -133.582016 -30.630983 -42.357826 -v -135.353806 -33.063969 -32.130169 -v -134.981125 -32.967472 -32.180187 -v -134.738785 -32.547794 -31.078775 -v -134.276230 -31.746586 -30.309366 -v -133.690598 -30.732243 -30.033548 -v -135.086166 -32.600468 -30.913584 -v -134.575211 -31.715458 -30.063669 -v -133.928329 -30.594975 -29.759012 -v -135.727951 -32.962040 -32.111855 -v -135.451035 -32.482426 -30.853098 -v -134.922379 -31.566776 -29.973734 -v -134.253098 -30.407536 -29.658548 -v -120.426437 -6.459049 -29.658545 -v -120.101669 -6.646488 -29.759008 -v -119.863907 -6.783756 -30.033545 -v -119.316177 -5.835025 -30.273079 -v -118.868362 -5.059452 -30.947945 -v -118.602280 -4.598513 -31.935003 -v -119.496628 -5.598575 -30.023598 -v -119.001999 -4.741825 -30.769051 -v -118.708054 -4.232729 -31.859350 -v -119.800400 -5.374698 -29.932287 -v -119.288651 -4.488346 -30.703558 -v -118.984543 -3.961611 -31.831640 -v -112.866196 6.635681 -47.519814 -v -114.060318 4.567383 -45.720161 -v -114.769943 3.338318 -43.088017 -v -120.049637 -5.806401 -24.658545 -v -134.100510 -30.143251 -43.613533 -v -133.588730 -29.256777 -44.384804 -v -116.685226 0.020932 -29.729101 -v -117.394852 -1.208194 -27.096960 -v -118.588974 -3.276431 -25.297277 -v -119.876450 -5.906436 -24.658545 -v -29.909086 149.921631 -11.243979 -v -28.675550 152.058105 -13.295828 -v -28.029402 153.177368 -16.232899 -v -28.106384 153.043945 -19.437977 -v -33.164307 144.283447 -45.869770 -v -31.970186 146.351685 -44.070148 -v -74.758453 72.240166 -44.070160 -v -31.260561 147.580750 -41.438007 -v -73.564346 74.308464 -45.869778 -v -72.103668 76.838432 -46.508545 -v -34.624985 141.753479 -46.508537 -v -117.221634 -1.308170 -27.096960 -v -116.512039 -0.079105 -29.729101 -v -114.596725 3.238342 -43.088017 -v -118.415756 -3.376468 -25.297277 -v -112.692978 6.535644 -47.519814 -v -113.887100 4.467468 -45.720161 -v -34.798187 141.853394 -46.508537 -v -72.276855 76.938469 -46.508545 -v -31.914415 146.848267 -41.162342 -v -31.433779 147.680786 -41.438007 -v -32.522644 145.794739 -43.418476 -v -32.143402 146.451660 -44.070148 -v -33.546173 144.022034 -44.961048 -v -33.337509 144.383362 -45.869770 -v -34.798187 141.853394 -45.508537 -v -72.276855 76.938469 -45.508541 -v -73.528885 74.769951 -44.961056 -v -73.737549 74.408501 -45.869778 -v -74.552399 72.997124 -43.418488 -v -74.931671 72.340202 -44.070160 -v -75.160660 71.943596 -41.162354 -v -78.314850 66.480339 -19.162384 -v -78.380844 66.366081 -16.415131 -v -77.826981 67.325371 -13.897642 -v -76.769669 69.156731 -12.138914 -v -75.431061 71.475212 -11.508545 -v -31.643980 147.316650 -11.508535 -v -30.305403 149.635132 -12.138906 -v -30.082304 150.021545 -11.243979 -v -29.248091 151.466431 -13.897635 -v -28.848768 152.158081 -13.295828 -v -28.694227 152.425842 -16.415119 -v -28.202589 153.277344 -16.232899 -v -28.760206 152.311523 -19.162373 -v -28.279572 153.143982 -19.437977 -v -74.830994 71.128716 -11.971527 -v -74.781555 71.100273 -12.258545 -v -75.952820 69.071526 -12.810120 -v -74.971786 71.210014 -11.728210 -v -74.868561 71.150444 -11.883545 -v -76.123489 68.976860 -12.474518 -v -75.182510 71.331718 -11.565643 -v -75.106308 71.287712 -11.609009 -v -76.422485 69.008049 -12.228880 -v -77.462097 67.207390 -13.958128 -v -78.006668 66.264153 -16.433441 -v -77.941788 66.376518 -19.134674 -v -77.114731 67.260002 -14.123350 -v -77.633972 66.360649 -16.483490 -v -77.572113 66.467766 -19.058990 -v -76.877960 67.469109 -14.348996 -v -77.362595 66.629692 -16.551819 -v -77.304855 66.729729 -18.955627 -v -30.994474 146.941711 -12.258535 -v -31.043913 146.970215 -11.971518 -v -31.081495 146.991943 -11.883535 -v -31.184721 147.051453 -11.728201 -v -31.319227 147.129150 -11.608999 -v -31.395430 147.173157 -11.565634 -v -29.826567 149.165527 -12.474508 -v -28.406507 151.863525 -19.101795 -v -28.377943 151.674561 -19.058979 -v -28.316084 151.781738 -16.483479 -v -30.003050 149.408813 -12.228872 -v -28.483747 152.040344 -19.134663 -v -28.418867 152.152710 -16.433430 -v -28.963453 151.209534 -13.958120 -v -28.835325 150.882324 -14.123343 -v -28.471159 151.312195 -18.955616 -v -28.413435 151.412231 -16.551807 -v -28.898054 150.572754 -14.348988 -v -29.823195 148.970398 -12.810110 -v -31.625366 145.848938 -40.955616 -v -31.536850 146.116394 -41.034748 -v -31.560699 146.400208 -41.101795 -v -31.693285 146.657227 -41.146626 -v -32.295746 145.613770 -43.381275 -v -33.309540 143.857849 -44.909168 -v -33.132736 143.677429 -44.761402 -v -34.549622 141.709961 -45.451439 -v -32.146683 145.385315 -43.275349 -v -32.098160 145.144165 -43.116749 -v -33.042709 143.508240 -44.540302 -v -34.473434 141.665955 -45.408043 -v -34.338913 141.588318 -45.288872 -v -34.235687 141.528687 -45.133537 -v -34.198120 141.507019 -45.045525 -v -34.148682 141.478455 -44.758537 -v -33.053162 143.375916 -44.279472 -v -32.157578 144.927124 -42.929707 -v -71.627350 76.563408 -44.758541 -v -71.714371 76.613701 -45.133541 -v -71.952103 76.750969 -45.408047 -v -74.787598 71.839775 -41.134674 -v -74.189545 72.875603 -43.353027 -v -73.183151 74.618706 -44.869747 -v -74.417923 71.931023 -41.059021 -v -73.847687 72.918694 -43.174103 -v -72.888138 74.580681 -44.620266 -v -74.150665 72.192924 -40.955627 -v -73.618439 73.114738 -42.929714 -v -72.722870 74.665947 -44.279476 -v -71.627350 76.563408 -44.258541 -v -72.618530 74.846672 -43.825100 -v -73.428833 73.443230 -42.603909 -v -73.910339 72.609184 -40.817810 -v -77.064545 67.145927 -18.817841 -v -77.116776 67.055473 -16.642914 -v -76.678314 67.814934 -14.649931 -v -75.841263 69.264702 -13.257629 -v -74.781555 71.100273 -12.758545 -v -30.994474 146.941711 -12.758535 -v -29.934752 148.777161 -13.257620 -v -29.097700 150.226929 -14.649921 -v -28.659239 150.986389 -16.642902 -v -28.711485 150.895935 -18.817829 -v -31.865677 145.432678 -40.817799 -v -32.347198 144.598694 -42.603901 -v -33.157501 143.195251 -43.825096 -v -34.148682 141.478455 -44.258537 -v -32.505493 144.438721 -42.416889 -v -33.266830 143.119995 -43.564262 -v -33.458405 143.113342 -43.343163 -v -34.198120 141.507019 -43.971519 -v -32.053070 145.222351 -40.738728 -v -32.738571 144.360168 -42.258289 -v -32.310822 145.101013 -40.671619 -v -32.599670 145.087402 -40.626820 -v -33.010941 144.375000 -42.152363 -v -33.703049 143.176270 -43.195396 -v -34.235687 141.528687 -43.883537 -v -34.338913 141.588318 -43.728203 -v -34.473434 141.665955 -43.609001 -v -34.549622 141.709961 -43.565605 -v -34.798187 141.853394 -43.508537 -v -33.963516 143.299133 -43.143547 -v -33.281158 144.481018 -42.115162 -v -32.875671 145.183350 -40.611073 -v -71.714371 76.613701 -43.883541 -v -71.952103 76.750969 -43.609005 -v -72.276855 76.938469 -43.508541 -v -73.817139 72.971611 -40.714478 -v -73.373611 73.739799 -42.359554 -v -72.627289 75.032463 -43.484310 -v -73.922928 73.337395 -40.638790 -v -73.507248 74.057365 -42.180660 -v -72.807739 75.268913 -43.234829 -v -74.199402 73.608513 -40.611080 -v -73.793884 74.310905 -42.115170 -v -73.111557 75.492729 -43.143551 -v -76.971329 67.508354 -18.714443 -v -77.077118 67.874138 -18.638792 -v -77.353592 68.145317 -18.611082 -v -74.868561 71.150444 -13.133545 -v -75.844635 69.459892 -13.593231 -v -76.615585 68.124565 -14.875608 -v -77.019440 67.425041 -16.711241 -v -75.106308 71.287712 -13.408051 -v -76.021118 69.703239 -13.838867 -v -76.743713 68.451653 -15.040800 -v -77.122208 67.796074 -16.761290 -v -75.431061 71.475212 -13.508545 -v -76.323471 69.929558 -13.928802 -v -77.028336 68.708672 -15.101286 -v -77.397568 68.069084 -16.779600 -v -31.081495 146.991943 -13.133535 -v -31.319227 147.129150 -13.408041 -v -31.643980 147.316650 -13.508535 -v -29.156614 150.564270 -18.671650 -v -29.348417 150.542725 -18.638783 -v -29.303328 150.620789 -16.761280 -v -28.978727 150.634033 -18.714436 -v -28.930616 150.717346 -16.711231 -v -29.334471 150.017822 -14.875599 -v -30.105421 148.682495 -13.593222 -v -29.681837 149.965210 -15.040791 -v -30.404417 148.713684 -13.838858 -v -29.721464 150.646545 -18.611073 -v -29.677473 150.722717 -16.779591 -v -30.046721 150.083252 -15.101276 -v -30.751600 148.862305 -13.928793 -v -36.936691 134.185913 -29.941397 -v -37.548065 133.789124 -29.719017 -v -36.939133 133.795105 -29.723837 -v -37.504944 133.485901 -29.388906 -v -36.886398 133.398743 -29.251303 -v -37.455414 133.300232 -29.063101 -v -36.811508 133.148376 -28.662132 -v -37.400742 133.151001 -28.671225 -v -36.721207 132.982422 -27.158226 -v -37.302811 132.983948 -27.337210 -v -37.303360 132.982422 -27.158224 -v -36.878860 134.721741 -30.044088 -v -36.858917 134.838745 -30.047049 -v -37.464569 134.838867 -30.047049 -v -37.549316 134.182800 -29.940268 -v -45.169571 122.429802 -35.098717 -v -44.988266 123.889641 -35.586876 -v -47.820755 123.889641 -33.210136 -v -45.169571 122.429802 -19.418388 -v -45.169571 119.418816 -20.111412 -v -48.891022 119.418816 -23.242790 -v -45.169571 119.418816 -34.405632 -v -44.988266 123.889641 -18.930168 -v -49.427155 123.889641 -22.664818 -v -50.803070 123.889641 -24.520470 -v -50.094147 119.418816 -24.865288 -v -51.412827 123.889641 -26.754723 -v -50.627060 119.418816 -26.818596 -v -51.173447 123.889641 -29.042229 -v -50.417664 119.418816 -28.818077 -v -50.116180 123.889641 -31.099815 -v -49.493591 119.418816 -30.616234 -v -47.314026 119.418816 -32.606255 -v -37.969025 129.324036 -28.470116 -v -37.934280 129.386230 -28.213707 -v -37.382645 130.373413 -28.213707 -v -37.540253 130.091370 -25.745750 -v -38.091888 129.104187 -25.745750 -v -37.569336 130.039368 -25.471031 -v -38.153412 128.994080 -25.526176 -v -37.776047 129.669373 -24.776207 -v -37.943008 129.370605 -24.523857 -v -38.248901 128.823181 -25.364098 -v -38.455109 128.454163 -24.264977 -v -38.739166 127.945793 -29.970329 -v -37.483154 130.193542 -29.020042 -v -45.169571 116.438164 -20.208702 -v -43.503998 119.418816 -21.509026 -v -43.503998 119.418816 -33.008049 -v -40.494034 124.805351 -22.852440 -v -37.502365 130.159180 -29.092947 -v -37.595169 129.993103 -29.365074 -v -38.405258 128.543396 -30.047050 -v -37.896515 129.453796 -29.833946 -v -38.758987 127.910332 -30.001030 -v -38.258682 128.805664 -29.012291 -v -38.169403 128.965454 -28.937279 -v -38.040253 129.196594 -28.723717 -v -39.027328 127.430107 -30.375511 -v -39.982819 125.720207 -31.316734 -v -38.192917 128.923401 -25.690636 -v -41.150482 123.630608 -32.002586 -v -38.300201 128.731384 -25.397942 -v -38.350555 128.641296 -25.277184 -v -40.270325 125.205681 -22.994438 -v -38.955963 127.557854 -24.234398 -v -38.833282 127.777397 -24.405113 -v -38.542831 128.297180 -24.271385 -v -45.169571 116.438164 -34.308372 -v -46.527374 114.008232 -33.089745 -v -47.641129 112.015129 -22.426903 -v -47.840729 111.657951 -31.911005 -v -49.140656 109.331596 -23.866693 -v -49.329651 108.993340 -30.401728 -v -49.980331 107.828972 -29.193964 -v -38.230148 128.856750 -28.934471 -v -38.022858 129.227722 -26.347954 -v -37.990845 129.284973 -27.979698 -v -37.938995 129.377808 -27.158318 -v -49.981781 107.826347 -25.326899 -v -50.238831 107.366325 -26.225336 -v -50.339050 107.187065 -27.254908 -v -50.259628 107.329155 -28.178827 -v -38.315903 128.757202 -25.323967 -v -40.847839 129.915283 -21.321739 -v -40.379730 130.726074 -21.527916 -v -37.758667 136.077881 -23.276968 -v -39.031006 133.501099 -22.194691 -v -38.820892 128.079834 -24.303978 -v -38.604980 128.788574 -30.034569 -v -38.657257 128.543396 -30.047050 -v -38.210999 129.862976 -29.519096 -v -38.004044 130.199463 -29.006615 -v -37.867050 131.127502 -29.133232 -v -37.942322 131.078552 -29.374960 -v -37.980789 131.092651 -29.510765 -v -38.027420 131.169739 -29.697256 -v -38.052826 131.289124 -29.833212 -v -38.058594 131.472107 -29.942039 -v -38.430283 129.369751 -29.876211 -v -38.032852 131.677856 -29.976524 -v -37.875031 135.843262 -31.365377 -v -37.972641 131.908997 -29.932121 -v -37.893784 132.092346 -29.808676 -v -37.805267 132.227539 -29.619316 -v -37.646317 132.085083 -28.936729 -v -37.659744 132.205627 -29.087912 -v -37.695084 132.268799 -29.270651 -v -37.722366 132.277283 -29.374960 -v -37.654724 131.894775 -28.816519 -v -37.685822 131.677856 -28.777792 -v -37.691055 131.650513 -28.779257 -v -37.824738 130.373413 -28.213705 -v -37.737320 131.444214 -28.823296 -v -37.793793 131.269348 -28.936941 -v -38.000320 129.386230 -28.213707 -v -38.088272 129.261719 -28.616844 -v -38.163483 129.098755 -28.836510 -v -37.383163 135.475098 -24.366142 -v -37.176468 135.990906 -24.685417 -v -37.385910 136.826416 -23.733297 -v -37.027756 136.267883 -25.013083 -v -36.716248 138.163269 -24.885733 -v -36.675323 136.696899 -26.575705 -v -37.536392 134.867493 -24.264975 -v -37.567078 134.691406 -24.271811 -v -37.616867 134.216919 -24.375021 -v -37.970169 130.091370 -25.745750 -v -38.044785 130.037598 -25.464531 -v -37.529831 133.376770 -25.110312 -v -38.323166 129.669373 -24.776207 -v -38.363205 129.597107 -24.704369 -v -38.584656 129.109131 -24.386589 -v -37.609344 133.790161 -24.614981 -v -38.766281 128.454163 -24.264977 -v -36.338654 138.912781 -26.057516 -v -36.252243 139.083984 -26.587118 -v -36.643875 136.719543 -27.209984 -v -36.234802 139.118591 -27.760733 -v -36.810516 136.532654 -28.758169 -v -36.438980 138.713684 -28.864492 -v -36.990036 136.246948 -29.347250 -v -36.979691 137.638794 -30.157278 -v -37.205521 135.782532 -29.801870 -v -37.371811 135.258179 -30.007040 -v -37.431412 133.135986 -25.700462 -v -43.814301 124.777214 -34.501793 -v -39.767258 131.990479 -32.733696 -v -40.361267 130.759766 -32.981407 -v -40.379990 130.725647 -32.989281 -v -40.792404 130.011292 -33.170921 -v -38.209702 135.168213 -31.691793 -v -40.360504 130.761353 -21.535912 -v -38.148132 129.104187 -25.745750 -v -38.232635 128.966675 -25.491936 -v -45.161484 123.889641 -36.230156 -v -44.206192 125.174980 -35.176262 -v -44.280304 125.429863 -36.010643 -v -45.169571 123.889641 -36.402275 -v -41.239746 130.312988 -20.647301 -v -45.052856 123.889641 -18.770470 -v -41.184296 130.409058 -33.845360 -v -40.080414 132.376892 -33.372124 -v -38.334229 135.529846 -32.193596 -v -37.961594 136.200256 -31.827017 -v -36.968201 137.984314 -30.476065 -v -36.371658 139.052917 -29.039755 -v -36.146744 139.455505 -27.815054 -v -36.165939 139.421204 -26.514120 -v -36.261093 139.250916 -25.926840 -v -36.677277 138.505737 -24.626181 -v -37.418091 137.177002 -23.341696 -v -37.832016 136.433350 -22.830801 -v -39.252151 133.875061 -21.612326 -v -41.258408 130.664001 -34.679710 -v -40.115738 132.643188 -34.135521 -v -38.281067 135.820862 -32.750816 -v -37.891327 136.495972 -32.332630 -v -36.854691 138.291504 -30.813559 -v -36.234100 139.366333 -29.221884 -v -36.000320 139.771240 -27.871145 -v -36.020264 139.736755 -26.438742 -v -36.119141 139.565491 -25.791494 -v -36.551849 138.816040 -24.353933 -v -37.323685 137.479126 -22.920919 -v -37.755859 136.730591 -22.344381 -v -39.243591 134.153748 -20.941458 -v -41.313858 130.567993 -19.812920 -v -45.169571 123.889641 -18.114799 -v -52.941650 123.889641 -30.882711 -v -52.019348 123.889641 -32.084709 -v -52.019348 113.798882 -32.084709 -v -53.235092 110.489861 -29.893730 -v -53.269577 110.395927 -29.403559 -v -53.105209 110.843315 -30.463526 -v -53.269577 123.889641 -29.403557 -v -52.901611 111.397514 -30.965721 -v -52.296997 113.043144 -31.824762 -v -53.269577 110.395927 -25.113518 -v -53.269577 123.889641 -25.113518 -v -52.019348 113.798882 -22.432365 -v -52.019348 123.889641 -22.432364 -v -52.941650 123.889641 -23.634359 -v -53.249695 110.450127 -24.740931 -v -53.190247 110.611870 -24.372551 -v -53.041245 111.017448 -23.870079 -v -46.193405 123.889641 -17.543846 -v -51.594696 113.232109 -21.768578 -v -45.441559 123.889641 -16.605492 -v -51.572861 112.798820 -20.900261 -v -45.169571 123.889641 -15.527306 -v -53.337723 109.878288 -25.113518 -v -53.537537 109.395927 -25.113520 -v -53.506271 109.450066 -24.528009 -v -53.309814 109.931755 -24.638359 -v -53.412872 109.611870 -23.949152 -v -53.226410 110.091484 -24.169487 -v -53.178726 110.017387 -23.159510 -v -53.017593 110.491753 -23.533043 -v -53.337723 109.878288 -29.403559 -v -53.537537 109.395927 -29.403559 -v -51.594696 113.232109 -32.748497 -v -51.572861 112.798820 -33.616783 -v -52.009186 112.043144 -33.208305 -v -51.979538 112.488457 -32.440910 -v -53.279236 109.843315 -31.069267 -v -53.107193 110.319939 -30.752253 -v -53.483322 109.489799 -30.173853 -v -53.289307 109.971001 -30.028526 -v -45.169571 123.889641 -38.989799 -v -45.441559 123.889641 -37.911583 -v -46.193405 123.889641 -36.973259 -v -63.972305 91.322380 -37.261349 -v -63.126465 92.787407 -21.239285 -v -62.892014 93.193474 -22.989313 -v -63.404572 92.305717 -36.502651 -v -72.657562 76.279045 -35.777767 -v -72.017014 77.388542 -37.058834 -v -71.142014 78.904106 -37.527767 -v -64.642014 90.162407 -37.527767 -v -72.758789 76.103691 -21.649929 -v -72.379456 76.760796 -20.514462 -v -71.811707 77.744133 -19.755733 -v -72.892014 75.872978 -22.989317 -v -72.892014 75.872978 -34.027767 -v -62.892014 93.193474 -34.027767 -v -63.025223 92.962761 -35.367153 -v -63.767014 91.677971 -19.958218 -v -64.642014 90.162407 -19.489315 -v -71.142014 78.904106 -19.489315 -v -72.441055 79.654106 -36.027767 -v -72.941055 78.788078 -35.759823 -v -73.307083 78.154106 -35.027767 -v -73.441040 77.922050 -34.027767 -v -73.441040 77.922050 -22.989315 -v -73.364929 78.053886 -22.223934 -v -73.148163 78.429375 -21.575069 -v -72.823730 78.991264 -21.141537 -v -72.441055 79.654106 -20.989315 -v -65.941055 90.912407 -20.989315 -v -65.441040 91.778435 -21.257259 -v -65.075027 92.412407 -21.989315 -v -64.941055 92.644463 -22.989313 -v -64.941055 92.644463 -34.027767 -v -65.017166 92.512627 -34.793118 -v -65.233948 92.137199 -35.441982 -v -65.558365 91.575188 -35.875515 -v -65.941055 90.912407 -36.027767 -v -61.677597 88.296989 -22.758541 -v -68.044266 77.269585 -22.758543 -v -69.642975 78.500481 -22.758541 -v -70.767609 80.552544 -22.758541 -v -65.882431 89.013969 -22.758541 -v -63.542984 89.065971 -22.758541 -v -68.044266 77.269585 -34.258541 -v -61.677597 88.296989 -34.258541 -v -63.542984 89.065971 -34.258541 -v -65.882431 89.013969 -34.258541 -v -70.767609 80.552544 -34.258541 -v -69.642975 78.500481 -34.258541 -v -71.633636 81.052544 -35.258541 -v -66.748459 89.513969 -35.258541 -v -66.239822 90.394951 -35.076107 -v -65.379074 89.479607 -34.166286 -v -66.078857 90.673759 -34.927151 -v -65.064133 89.846794 -33.913631 -v -65.807617 91.143547 -34.519680 -v -65.024841 89.910027 -33.845150 -v -65.657364 91.403801 -34.150509 -v -64.941498 90.142632 -33.492672 -v -65.531372 91.622002 -33.656307 -v -64.944443 90.226677 -33.309261 -v -65.455017 91.754204 -33.053310 -v -65.075027 90.412407 -32.643734 -v -65.441040 91.778435 -32.643734 -v -65.441040 91.778435 -24.373348 -v -65.075027 90.412407 -24.373348 -v -61.610916 88.412407 -34.125210 -v -61.610916 88.412407 -22.891872 -v -63.342972 89.412407 -23.158535 -v -63.342972 89.412407 -33.858517 -v -68.097855 77.176689 -22.812620 -v -68.081726 77.204643 -22.781614 -v -68.107971 77.159233 -22.852568 -v -68.061371 77.239922 -22.762999 -v -68.110931 77.154045 -22.891874 -v -68.110931 77.154045 -34.125210 -v -68.108688 77.157951 -34.159420 -v -68.063904 77.235527 -34.252590 -v -68.099396 77.174004 -34.200161 -v -68.083878 77.200920 -34.232418 -v -61.623978 88.389763 -34.204464 -v -61.640121 88.361809 -34.235500 -v -61.613892 88.407280 -34.164516 -v -61.660492 88.326591 -34.254055 -v -61.613159 88.408562 -22.857662 -v -61.657944 88.330986 -22.764462 -v -61.622452 88.392448 -22.816952 -v -61.637955 88.365593 -22.784664 -v -69.842987 78.154106 -33.858517 -v -71.575027 79.154106 -32.643734 -v -71.575027 79.154106 -24.373348 -v -69.842987 78.154106 -23.158535 -v -72.941055 78.788078 -32.643734 -v -72.941055 78.788078 -24.373348 -v -72.849838 78.946037 -33.661037 -v -71.353012 79.132378 -33.298672 -v -72.775345 79.075066 -33.982906 -v -71.149475 79.306694 -33.774136 -v -72.571640 79.427910 -34.525417 -v -71.113159 79.364738 -33.848537 -v -72.387024 79.747612 -34.825924 -v -70.975128 79.692070 -34.091671 -v -72.139938 80.175652 -35.077908 -v -70.922012 79.873161 -34.162960 -v -71.838425 80.697868 -35.230587 -v -72.261734 79.964653 -22.046169 -v -72.660355 79.274223 -22.689543 -v -72.913849 78.835136 -23.805233 -v -65.532272 91.620476 -23.356075 -v -65.606750 91.491447 -23.034145 -v -66.242172 90.390862 -21.939175 -v -65.995071 90.818840 -22.191158 -v -65.810471 91.138603 -22.491665 -v -66.543671 89.868645 -21.786465 -v -66.748459 89.513969 -21.758541 -v -71.633636 81.052544 -21.758541 -v -64.945251 90.230949 -23.718441 -v -64.994400 89.967583 -23.242947 -v -65.026535 89.907036 -23.168514 -v -65.240997 89.623894 -22.925381 -v -65.371277 89.487297 -22.854153 -v 8.107988 -98.595222 -28.919680 -v 8.107988 -98.595222 -25.597475 -v 8.107988 -100.595222 -25.775240 -v 8.107988 -99.564278 -28.833529 -v 8.107988 -100.796761 -25.793154 -v 8.107988 -101.564339 -28.655766 -v 8.107988 -100.989998 -25.810335 -v 8.107988 -101.175117 -25.826784 -v 8.107988 -101.352303 -25.842531 -v 8.107988 -101.521797 -25.857609 -v 8.107988 -101.684090 -25.872011 -v 8.107988 -102.595284 -26.213535 -v 8.107988 -102.595284 -28.303654 -v 8.107988 -102.465523 -26.095280 -v 8.107988 -102.422249 -28.456789 -v 8.107988 -102.287727 -28.545872 -v 8.107988 -101.834602 -25.885410 -v 8.107988 -101.972664 -25.897678 -v 8.107988 -102.056282 -28.612032 -v 8.107988 -102.101692 -25.909212 -v 8.107988 -102.215279 -25.937626 -v 8.107988 -102.332039 -25.997105 -v 8.107988 -102.170784 -28.594425 -v -104.012192 -101.345589 -39.391899 -v -103.997574 -101.345222 -39.391930 -v -103.992386 -101.345222 -39.237236 -v -100.430099 -101.390877 -35.665154 -v -100.430313 -101.457893 -35.589928 -v -100.708115 -101.433113 -35.623894 -v -100.712173 -101.530403 -35.558983 -v -100.430435 -101.545967 -35.541100 -v -100.430496 -101.645210 -35.524193 -v -100.429672 -101.345222 -35.824303 -v -100.429703 -101.345589 -35.810081 -v -100.694870 -101.345222 -35.835625 -v -100.429855 -101.352547 -35.758293 -v -104.063553 -101.352547 -39.391808 -v -104.156723 -101.390877 -39.391624 -v -104.112411 -101.368050 -39.391716 -v -104.107071 -101.368050 -39.232628 -v -104.292130 -101.645210 -39.225121 -v -104.280777 -101.545967 -39.391411 -v -103.968002 -101.345222 -38.919945 -v -104.081924 -101.368050 -38.905663 -v -103.918564 -101.345222 -38.632164 -v -104.030746 -101.368050 -38.607780 -v -103.845291 -101.345222 -38.351738 -v -103.955093 -101.368050 -38.318230 -v -103.748306 -101.345222 -38.075249 -v -103.854904 -101.368050 -38.032677 -v -103.625443 -101.345222 -37.804100 -v -103.727829 -101.368050 -37.752220 -v -103.492508 -101.345222 -37.563499 -v -103.590988 -101.368050 -37.504448 -v -103.327042 -101.345222 -37.312340 -v -103.420029 -101.368050 -37.245018 -v -103.139755 -101.345222 -37.075432 -v -103.226822 -101.368050 -37.000603 -v -102.937820 -101.345222 -36.860497 -v -103.017593 -101.368050 -36.777946 -v -102.895767 -101.345222 -36.820671 -v -102.973923 -101.368050 -36.736565 -v -102.670090 -101.345222 -36.627342 -v -102.741837 -101.368050 -36.537682 -v -102.421432 -101.345222 -36.442406 -v -102.485977 -101.368050 -36.347466 -v -102.389328 -101.345222 -36.420860 -v -102.452682 -101.368050 -36.325157 -v -102.137222 -101.345222 -36.269127 -v -102.192581 -101.368050 -36.168571 -v -101.866287 -101.345222 -36.132408 -v -101.914017 -101.368050 -36.028008 -v -101.582626 -101.345222 -36.017387 -v -101.621017 -101.368050 -35.909203 -v -101.293747 -101.345222 -35.929192 -v -101.322250 -101.368050 -35.817986 -v -101.262527 -101.345222 -35.921379 -v -101.289902 -101.368050 -35.809868 -v -100.985031 -101.345222 -35.866203 -v -101.002304 -101.368050 -35.752739 -v -100.702042 -101.368050 -35.721031 -v -100.429977 -101.368050 -35.709465 -v -101.016983 -101.433113 -35.656517 -v -101.313126 -101.433113 -35.715355 -v -101.346390 -101.433113 -35.723717 -v -101.653580 -101.433113 -35.817467 -v -101.954483 -101.433113 -35.939507 -v -102.239548 -101.433113 -36.083305 -v -102.506424 -101.433113 -36.243980 -v -102.540726 -101.433113 -36.266991 -v -102.802628 -101.433113 -36.461723 -v -103.040176 -101.433113 -36.665276 -v -103.085251 -101.433113 -36.707970 -v -103.300644 -101.433113 -36.937157 -v -103.498886 -101.433113 -37.187950 -v -103.674454 -101.433113 -37.454399 -v -103.814651 -101.433113 -37.708244 -v -103.945297 -101.433113 -37.996544 -v -104.048203 -101.433113 -38.289818 -v -104.125839 -101.433113 -38.587120 -v -104.178482 -101.433113 -38.893578 -v -104.204330 -101.433113 -39.228661 -v -104.231949 -101.457893 -39.391502 -v -101.026749 -101.530403 -35.592216 -v -101.328598 -101.530403 -35.652214 -v -101.362503 -101.530403 -35.660698 -v -101.675339 -101.530403 -35.756157 -v -101.981522 -101.530403 -35.880333 -v -102.270889 -101.530403 -36.026360 -v -102.542282 -101.530403 -36.189751 -v -102.577286 -101.530403 -36.213219 -v -102.843277 -101.530403 -36.410942 -v -103.084457 -101.530403 -36.617638 -v -103.130417 -101.530403 -36.661217 -v -103.349960 -101.530403 -36.894798 -v -103.551559 -101.530403 -37.149834 -v -103.730209 -101.530403 -37.420982 -v -103.872665 -101.530403 -37.678856 -v -104.005692 -101.530403 -37.972404 -v -104.110397 -101.530403 -38.270836 -v -104.189407 -101.530403 -38.573296 -v -104.242996 -101.530403 -38.885490 -v -104.269302 -101.530403 -39.226036 -v -100.713608 -101.645210 -35.536186 -v -101.030197 -101.645210 -35.569664 -v -101.334061 -101.645210 -35.630028 -v -101.368179 -101.645210 -35.638573 -v -101.682968 -101.645210 -35.734642 -v -101.991013 -101.645210 -35.859581 -v -102.281906 -101.645210 -36.006310 -v -102.554916 -101.645210 -36.170708 -v -102.590134 -101.645210 -36.194328 -v -102.857559 -101.645210 -36.393120 -v -103.099991 -101.645210 -36.600945 -v -103.146317 -101.645210 -36.644798 -v -103.367264 -101.645210 -36.879875 -v -103.570053 -101.645210 -37.136406 -v -103.749802 -101.645210 -37.409233 -v -103.893051 -101.645210 -37.668510 -v -104.026871 -101.645210 -37.963921 -v -104.132248 -101.645210 -38.264214 -v -104.211716 -101.645210 -38.568443 -v -104.265671 -101.645210 -38.882622 -v -100.429398 -101.345589 -46.629295 -v -100.429337 -101.345222 -46.614677 -v -100.720627 -101.345222 -46.601952 -v -100.429581 -101.352547 -46.680717 -v -100.429947 -101.390877 -46.773857 -v -100.429794 -101.368050 -46.729546 -v -100.728317 -101.368050 -46.716484 -v -100.740677 -101.645210 -46.901268 -v -100.430496 -101.645210 -46.914818 -v -100.430435 -101.545967 -46.897911 -v -104.198624 -101.424812 -43.073814 -v -104.250931 -101.486275 -43.022881 -v -104.264847 -101.530403 -43.273521 -v -104.258713 -101.499153 -43.015282 -v -104.287125 -101.567329 -42.987602 -v -104.094528 -101.363350 -43.174644 -v -104.171005 -101.402718 -43.100639 -v -104.199905 -101.433113 -43.270226 -v -104.075119 -101.368050 -43.579430 -v -103.989639 -101.345222 -43.274925 -v -104.102707 -101.368050 -43.265312 -v -104.081924 -101.359261 -43.186760 -v -100.841507 -101.345222 -46.591789 -v -100.853226 -101.368050 -46.706017 -v -101.112808 -101.345222 -46.551567 -v -101.134933 -101.368050 -46.664207 -v -101.384933 -101.345222 -46.484612 -v -101.417160 -101.368050 -46.594810 -v -101.654800 -101.345222 -46.394432 -v -101.695358 -101.368050 -46.501793 -v -101.922195 -101.345222 -46.280235 -v -101.971725 -101.368050 -46.383781 -v -102.197800 -101.345222 -46.134148 -v -102.255508 -101.368050 -46.233391 -v -102.460892 -101.345222 -45.966515 -v -102.526596 -101.368050 -46.060692 -v -102.706436 -101.345222 -45.779289 -v -102.779892 -101.368050 -45.867546 -v -102.938126 -101.345222 -45.569359 -v -103.018631 -101.368050 -45.651207 -v -103.017319 -101.345222 -45.489159 -v -103.100204 -101.368050 -45.568596 -v -103.218063 -101.345222 -45.261345 -v -103.307358 -101.368050 -45.333458 -v -103.402451 -101.345222 -45.013573 -v -103.496994 -101.368050 -45.078636 -v -103.563339 -101.345222 -44.758598 -v -103.663040 -101.368050 -44.815483 -v -103.695175 -101.345222 -44.501244 -v -103.799545 -101.368050 -44.549065 -v -103.803787 -101.345222 -44.234734 -v -103.911942 -101.368050 -44.273247 -v -103.886398 -101.345222 -43.961449 -v -103.997757 -101.368050 -43.989403 -v -103.911118 -101.345222 -43.855492 -v -104.023331 -101.368050 -43.879753 -v -103.961288 -101.345222 -43.564598 -v -103.987106 -101.345222 -43.277306 -v -104.171646 -101.433113 -43.591972 -v -104.118484 -101.433113 -43.900291 -v -104.092148 -101.433113 -44.013115 -v -104.003647 -101.433113 -44.305901 -v -103.888016 -101.433113 -44.589622 -v -103.747574 -101.433113 -44.863731 -v -103.577194 -101.433113 -45.133812 -v -103.383072 -101.433113 -45.394615 -v -103.170456 -101.433113 -45.635918 -v -103.086899 -101.433113 -45.720604 -v -102.842148 -101.433113 -45.942345 -v -102.582291 -101.433113 -46.140495 -v -102.304428 -101.433113 -46.317558 -v -102.013748 -101.433113 -46.471581 -v -101.729752 -101.433113 -46.592888 -v -101.444504 -101.433113 -46.688225 -v -101.153702 -101.433113 -46.759697 -v -100.863144 -101.433113 -46.802849 -v -100.734818 -101.433113 -46.813591 -v -100.430222 -101.457893 -46.849083 -v -104.236130 -101.530403 -43.600334 -v -104.182022 -101.530403 -43.914024 -v -104.155228 -101.530403 -44.028954 -v -104.064896 -101.530403 -44.327721 -v -103.947128 -101.530403 -44.616722 -v -103.804031 -101.530403 -44.895958 -v -103.630753 -101.530403 -45.170708 -v -103.433670 -101.530403 -45.435478 -v -103.217422 -101.530403 -45.680931 -v -103.132492 -101.530403 -45.766930 -v -102.883743 -101.530403 -45.992332 -v -102.619461 -101.530403 -46.193840 -v -102.337112 -101.530403 -46.373772 -v -102.041794 -101.530403 -46.530235 -v -101.752701 -101.530403 -46.653709 -v -101.462753 -101.530403 -46.750633 -v -101.166245 -101.530403 -46.823509 -v -100.869766 -101.530403 -46.867516 -v -100.739182 -101.530403 -46.878502 -v -100.872116 -101.645210 -46.890251 -v -101.170639 -101.645210 -46.845940 -v -101.469162 -101.645210 -46.772545 -v -101.760788 -101.645210 -46.675072 -v -102.051651 -101.645210 -46.550835 -v -102.348587 -101.645210 -46.393486 -v -102.632553 -101.645210 -46.212608 -v -102.898361 -101.645210 -46.009880 -v -103.148514 -101.645210 -45.783226 -v -103.233902 -101.645210 -45.696739 -v -103.451462 -101.645210 -45.449852 -v -103.649551 -101.645210 -45.183647 -v -103.823868 -101.645210 -44.907280 -v -103.967880 -101.645210 -44.626213 -v -104.086411 -101.645210 -44.335381 -v -104.177383 -101.645210 -44.034538 -v -104.204361 -101.645210 -43.918877 -v -104.258774 -101.645210 -43.603294 -v -104.287674 -101.645210 -43.274651 -v -104.297684 -101.645210 -42.977318 -v -100.430984 -101.390877 -46.071404 -v -100.430740 -101.457893 -45.996178 -v -100.673264 -101.433113 -46.007622 -v -103.218674 -101.483894 -43.024437 -v -103.269577 -101.422249 -43.076653 -v -103.255020 -101.433113 -43.169884 -v -103.459824 -101.345222 -43.274803 -v -103.462204 -101.345222 -43.277306 -v -103.454971 -101.345222 -43.378166 -v -103.340561 -101.368050 -43.368370 -v -103.368179 -101.361946 -43.178581 -v -103.352280 -101.368050 -43.173698 -v -103.295090 -101.401131 -43.102928 -v -103.167221 -101.645210 -43.166405 -v -103.172684 -101.645210 -42.977318 -v -103.183029 -101.566170 -42.987938 -v -100.668198 -101.530403 -45.942772 -v -100.430557 -101.545967 -45.947350 -v -100.430496 -101.645210 -45.930443 -v -100.431351 -101.352547 -46.164543 -v -100.689804 -101.345222 -46.219109 -v -100.431503 -101.345650 -46.214592 -v -100.431564 -101.345222 -46.230522 -v -103.415634 -101.345222 -43.682854 -v -103.302475 -101.368050 -43.663475 -v -103.354568 -101.345222 -43.968102 -v -103.243546 -101.368050 -43.938805 -v -103.269760 -101.345222 -44.231163 -v -103.162521 -101.368050 -44.190147 -v -103.184067 -101.345222 -44.431664 -v -103.080215 -101.368050 -44.382683 -v -103.055862 -101.345222 -44.677177 -v -102.956100 -101.368050 -44.620384 -v -102.906052 -101.345222 -44.917473 -v -102.811386 -101.368050 -44.852501 -v -102.734360 -101.345222 -45.143486 -v -102.646469 -101.368050 -45.069633 -v -102.583511 -101.345222 -45.309380 -v -102.501602 -101.368050 -45.228905 -v -102.383316 -101.345222 -45.495750 -v -102.308640 -101.368050 -45.408562 -v -102.166031 -101.345222 -45.667656 -v -102.098709 -101.368050 -45.574669 -v -101.983414 -101.345222 -45.788811 -v -101.923874 -101.368050 -45.690636 -v -101.749283 -101.345222 -45.917931 -v -101.697708 -101.368050 -45.815361 -v -101.501328 -101.345222 -46.029747 -v -101.458847 -101.368050 -45.923088 -v -101.242599 -101.345222 -46.118004 -v -101.211258 -101.368050 -46.007561 -v -100.955307 -101.345222 -46.184074 -v -100.934799 -101.368050 -46.071129 -v -100.680862 -101.368050 -46.104637 -v -100.431168 -101.368050 -46.115685 -v -100.917404 -101.433113 -45.975365 -v -101.184708 -101.433113 -45.913933 -v -101.422806 -101.433113 -45.832664 -v -101.654007 -101.433113 -45.728386 -v -101.873398 -101.433113 -45.607445 -v -102.041641 -101.433113 -45.495842 -v -102.245346 -101.433113 -45.334618 -v -102.432175 -101.433113 -45.160698 -v -102.571976 -101.433113 -45.007011 -v -102.731155 -101.433113 -44.797478 -v -102.871536 -101.433113 -44.572227 -v -102.992203 -101.433113 -44.341118 -v -103.071609 -101.433113 -44.155418 -v -103.149460 -101.433113 -43.913963 -v -103.206528 -101.433113 -43.647057 -v -103.243607 -101.433113 -43.360039 -v -100.905777 -101.530403 -45.911400 -v -101.166977 -101.530403 -45.851372 -v -101.398758 -101.530403 -45.772270 -v -101.624802 -101.530403 -45.670311 -v -101.839676 -101.530403 -45.551811 -v -102.003494 -101.530403 -45.443169 -v -102.203049 -101.530403 -45.285210 -v -102.385788 -101.530403 -45.115135 -v -102.522202 -101.530403 -44.965172 -v -102.677536 -101.530403 -44.760674 -v -102.815018 -101.530403 -44.540062 -v -102.933395 -101.530403 -44.313377 -v -103.010880 -101.530403 -44.132195 -v -103.086563 -101.530403 -43.897362 -v -103.142441 -101.530403 -43.636101 -v -103.178818 -101.530403 -43.354454 -v -103.190048 -101.530403 -43.167320 -v -103.211044 -101.496834 -43.016594 -v -100.666428 -101.645210 -45.920006 -v -100.901688 -101.645210 -45.888908 -v -101.160721 -101.645210 -45.829399 -v -101.390305 -101.645210 -45.751060 -v -101.614548 -101.645210 -45.649895 -v -101.827835 -101.645210 -45.532310 -v -101.990097 -101.645210 -45.424644 -v -102.188187 -101.645210 -45.267876 -v -102.369492 -101.645210 -45.099113 -v -102.504715 -101.645210 -44.950462 -v -102.658707 -101.645210 -44.747765 -v -102.795151 -101.645210 -44.528740 -v -102.912766 -101.645210 -44.303642 -v -102.989548 -101.645210 -44.124016 -v -103.064499 -101.645210 -43.891533 -v -103.119919 -101.645210 -43.632225 -v -103.156052 -101.645210 -43.352531 -v -97.406738 -101.390877 -39.391197 -v -97.362427 -101.368050 -39.391136 -v -97.372726 -101.368050 -39.132957 -v -97.313538 -101.352547 -39.391075 -v -97.258179 -101.345222 -39.125175 -v -97.263184 -101.345650 -39.390984 -v -97.247589 -101.345222 -39.390984 -v -97.481949 -101.457893 -39.391289 -v -97.557495 -101.645210 -39.145531 -v -97.547684 -101.645210 -39.391380 -v -97.530762 -101.545967 -39.391350 -v -100.430344 -101.457893 -36.442863 -v -100.430405 -101.495247 -36.468346 -v -100.182266 -101.530403 -36.496758 -v -100.430466 -101.545967 -36.491661 -v -100.430496 -101.645210 -36.508568 -v -100.430008 -101.352547 -36.274437 -v -100.163193 -101.345222 -36.220238 -v -100.429886 -101.345589 -36.222527 -v -100.429855 -101.345222 -36.208427 -v -97.279251 -101.345222 -38.921867 -v -97.392944 -101.368050 -38.937798 -v -97.329041 -101.345222 -38.654930 -v -97.440857 -101.368050 -38.680962 -v -97.402725 -101.345222 -38.390160 -v -97.511932 -101.368050 -38.425529 -v -97.500000 -101.345222 -38.128441 -v -97.605774 -101.368050 -38.173027 -v -97.529114 -101.345222 -38.061516 -v -97.633850 -101.368050 -38.108543 -v -97.655304 -101.345222 -37.810814 -v -97.755432 -101.368050 -37.866966 -v -97.800827 -101.345222 -37.577202 -v -97.895309 -101.368050 -37.642418 -v -97.969269 -101.345222 -37.355370 -v -98.057571 -101.368050 -37.428764 -v -98.157684 -101.345222 -37.148613 -v -98.238739 -101.368050 -37.229912 -v -98.284271 -101.345222 -37.029686 -v -98.360550 -101.368050 -37.115471 -v -98.422409 -101.345222 -36.912773 -v -98.494522 -101.368050 -37.002098 -v -98.649918 -101.345222 -36.744499 -v -98.713699 -101.368050 -36.839958 -v -98.893936 -101.345222 -36.597435 -v -98.948868 -101.368050 -36.698265 -v -99.155075 -101.345222 -36.468956 -v -99.201279 -101.368050 -36.574089 -v -99.351364 -101.345222 -36.390221 -v -99.390488 -101.368050 -36.498161 -v -99.611526 -101.345222 -36.309349 -v -99.640488 -101.368050 -36.420464 -v -99.878708 -101.345222 -36.252922 -v -99.897202 -101.368050 -36.366234 -v -100.171097 -101.368050 -36.334770 -v -100.430191 -101.385384 -36.358482 -v -100.430191 -101.390877 -36.367638 -v -100.177811 -101.433113 -36.431877 -v -99.912888 -101.433113 -36.462303 -v -99.664993 -101.433113 -36.514641 -v -99.423660 -101.433113 -36.589684 -v -99.240463 -101.433113 -36.663170 -v -98.995468 -101.433113 -36.783714 -v -98.767807 -101.433113 -36.920860 -v -98.555679 -101.433113 -37.077843 -v -98.425217 -101.433113 -37.188225 -v -98.307434 -101.433113 -37.298882 -v -98.132416 -101.433113 -37.490959 -v -97.975433 -101.433113 -37.697685 -v -97.840317 -101.433113 -37.914604 -v -97.722656 -101.433113 -38.148399 -v -97.695450 -101.433113 -38.210869 -v -97.604523 -101.433113 -38.455498 -v -97.535645 -101.433113 -38.703026 -v -97.489334 -101.433113 -38.951256 -v -97.469833 -101.433113 -39.139580 -v -99.923355 -101.530403 -36.526482 -v -99.681381 -101.530403 -36.577568 -v -99.445816 -101.530403 -36.650810 -v -99.266647 -101.530403 -36.722710 -v -99.026596 -101.530403 -36.840813 -v -98.803940 -101.530403 -36.974937 -v -98.596542 -101.530403 -37.128410 -v -98.468430 -101.530403 -37.236839 -v -98.353317 -101.530403 -37.344933 -v -98.182434 -101.530403 -37.532494 -v -98.028961 -101.530403 -37.734612 -v -97.897034 -101.530403 -37.946404 -v -97.781967 -101.530403 -38.175041 -v -97.755386 -101.530403 -38.236137 -v -97.666397 -101.530403 -38.475517 -v -97.598984 -101.530403 -38.717796 -v -97.553741 -101.530403 -38.960258 -v -97.534714 -101.530403 -39.144005 -v -100.183823 -101.645210 -36.519554 -v -99.927048 -101.645210 -36.549004 -v -99.687119 -101.645210 -36.599693 -v -99.453598 -101.645210 -36.672295 -v -99.275833 -101.645210 -36.743584 -v -99.037521 -101.645210 -36.860863 -v -98.816635 -101.645210 -36.993919 -v -98.610886 -101.645210 -37.146202 -v -98.483597 -101.645210 -37.253899 -v -98.369461 -101.645210 -37.361107 -v -98.200012 -101.645210 -37.547112 -v -98.047745 -101.645210 -37.747581 -v -97.916946 -101.645210 -37.957573 -v -97.802811 -101.645210 -38.184349 -v -97.776428 -101.645210 -38.245018 -v -97.688126 -101.645210 -38.482567 -v -97.621216 -101.645210 -38.722954 -v -97.576355 -101.645210 -38.963432 -v -100.691818 -101.495247 -36.481163 -v -100.701767 -101.385384 -36.371819 -v -103.313614 -101.390877 -39.391380 -v -103.238388 -101.457893 -39.391380 -v -103.208908 -101.495247 -39.271599 -v -103.212906 -101.495247 -39.391380 -v -103.189590 -101.545967 -39.391380 -v -103.406815 -101.352547 -39.391380 -v -103.468521 -101.345222 -39.261436 -v -103.458725 -101.345589 -39.391411 -v -103.472824 -101.345222 -39.391411 -v -100.715408 -101.345222 -36.222435 -v -100.959671 -101.345222 -36.257103 -v -100.931747 -101.385384 -36.404472 -v -101.208817 -101.345222 -36.315575 -v -101.168137 -101.385384 -36.459953 -v -101.456345 -101.345222 -36.398155 -v -101.402390 -101.385384 -36.538139 -v -101.697708 -101.345222 -36.502922 -v -101.632095 -101.385384 -36.637810 -v -101.892624 -101.345222 -36.608421 -v -101.815414 -101.385384 -36.737022 -v -102.111832 -101.345222 -36.751945 -v -102.025986 -101.385384 -36.874962 -v -102.329666 -101.345222 -36.916985 -v -102.233322 -101.385384 -37.031975 -v -102.534042 -101.345222 -37.106834 -v -102.427109 -101.385384 -37.211998 -v -102.710892 -101.345222 -37.300804 -v -102.596268 -101.385384 -37.397545 -v -102.841568 -101.345222 -37.466057 -v -102.720932 -101.385384 -37.555229 -v -103.000687 -101.345222 -37.703270 -v -102.872513 -101.385384 -37.781212 -v -103.140060 -101.345222 -37.954430 -v -103.006088 -101.385384 -38.021904 -v -103.257370 -101.345222 -38.216881 -v -103.117630 -101.385384 -38.271385 -v -103.329239 -101.345222 -38.422997 -v -103.185898 -101.385384 -38.467278 -v -103.399368 -101.345222 -38.691521 -v -103.252731 -101.385384 -38.723106 -v -103.446426 -101.345222 -38.968834 -v -103.297562 -101.385384 -38.987114 -v -103.318649 -101.385384 -39.267326 -v -103.322739 -101.385384 -39.391380 -v -103.188583 -101.495247 -39.000542 -v -103.145401 -101.495247 -38.746208 -v -103.081009 -101.495247 -38.499657 -v -103.015305 -101.495247 -38.311302 -v -102.908035 -101.495247 -38.071312 -v -102.778702 -101.495247 -37.838280 -v -102.632614 -101.495247 -37.620506 -v -102.512344 -101.495247 -37.468346 -v -102.348801 -101.495247 -37.288994 -v -102.162796 -101.495247 -37.116112 -v -101.963150 -101.495247 -36.964989 -v -101.758865 -101.495247 -36.831139 -v -101.584061 -101.495247 -36.736565 -v -101.362900 -101.495247 -36.640587 -v -101.138351 -101.495247 -36.565605 -v -100.911270 -101.495247 -36.512352 -v -100.688187 -101.645210 -36.521172 -v -100.903793 -101.645210 -36.551842 -v -101.127457 -101.645210 -36.604332 -v -101.348465 -101.645210 -36.678093 -v -101.566483 -101.645210 -36.772697 -v -101.738174 -101.645210 -36.865593 -v -101.940140 -101.645210 -36.997948 -v -102.137009 -101.645210 -37.146935 -v -102.320145 -101.645210 -37.317162 -v -102.481613 -101.645210 -37.494286 -v -102.600296 -101.645210 -37.644371 -v -102.744370 -101.645210 -37.859154 -v -102.872147 -101.645210 -38.089409 -v -102.977859 -101.645210 -38.325890 -v -103.042618 -101.645210 -38.511559 -v -103.106094 -101.645210 -38.754692 -v -103.148666 -101.645210 -39.005424 -v -103.168747 -101.645210 -39.273186 -v -103.172684 -101.645210 -39.391380 -v -97.247681 -101.345222 -39.607964 -v -97.256821 -101.345222 -39.640282 -v -97.248581 -101.345222 -39.614525 -v -97.258118 -101.345222 -39.647758 -v -97.323181 -101.354866 -40.151848 -v -97.340775 -101.346565 -40.039726 -v -97.391296 -101.346931 -40.233604 -v -97.393616 -101.383125 -40.659172 -v -97.517822 -101.345955 -40.638206 -v -97.578156 -101.345345 -40.804466 -v -97.507477 -101.495186 -41.479301 -v -97.477982 -101.453011 -41.266869 -v -97.633545 -101.385384 -41.521446 -v -97.609009 -101.345222 -40.884209 -v -97.444534 -101.418831 -41.025902 -v -97.552231 -101.645210 -41.784874 -v -97.547684 -101.645210 -41.768822 -v -97.547272 -101.629829 -41.765984 -v -97.545883 -101.612373 -41.755852 -v -97.590897 -101.495247 -41.773888 -v -97.542068 -101.587471 -41.728416 -v -97.538940 -101.573311 -41.705803 -v -97.526215 -101.533821 -41.614220 -v -97.527878 -101.495247 -41.551353 -v -100.406357 -101.457893 -43.192863 -v -100.406326 -101.495247 -43.218346 -v -100.014603 -101.495247 -43.200310 -v -100.406326 -101.545967 -43.241661 -v -100.022476 -101.385384 -43.090782 -v -100.406418 -101.385384 -43.108482 -v -100.406387 -101.390938 -43.117638 -v -100.406509 -101.345222 -42.958397 -v -100.406479 -101.345528 -42.971947 -v -100.033249 -101.345222 -42.941124 -v -100.406448 -101.352547 -43.024437 -v -97.777863 -101.345222 -41.480583 -v -97.840805 -101.345222 -41.702873 -v -97.696518 -101.385384 -41.743889 -v -97.885590 -101.345222 -41.837730 -v -97.747696 -101.385384 -41.896751 -v -97.945160 -101.345222 -41.950768 -v -97.817703 -101.385384 -42.029869 -v -98.035065 -101.345222 -42.076073 -v -97.919006 -101.385384 -42.171074 -v -98.150726 -101.345222 -42.198143 -v -98.048462 -101.385384 -42.307884 -v -98.282166 -101.345222 -42.311211 -v -98.189377 -101.385384 -42.429070 -v -98.398483 -101.345222 -42.394341 -v -98.316238 -101.385384 -42.519798 -v -98.592453 -101.345222 -42.513359 -v -98.517502 -101.385384 -42.643303 -v -98.811996 -101.345222 -42.627495 -v -98.748703 -101.385384 -42.763481 -v -99.050674 -101.345222 -42.727257 -v -98.997910 -101.385384 -42.867668 -v -99.085983 -101.345222 -42.740318 -v -99.034592 -101.385384 -42.881248 -v -99.369797 -101.345222 -42.830864 -v -99.330368 -101.385384 -42.975578 -v -99.653976 -101.345222 -42.894707 -v -99.627670 -101.385384 -43.042381 -v -99.950821 -101.345222 -42.934471 -v -99.937149 -101.385384 -43.083824 -v -99.927170 -101.495247 -43.193169 -v -99.608383 -101.495247 -43.150505 -v -99.301529 -101.495247 -43.081535 -v -98.996964 -101.495247 -42.984398 -v -98.959274 -101.495247 -42.970451 -v -98.702377 -101.495247 -42.863060 -v -98.462631 -101.495247 -42.738396 -v -98.256027 -101.495247 -42.611626 -v -98.121460 -101.495247 -42.515343 -v -97.973618 -101.495247 -42.388206 -v -97.834030 -101.495247 -42.240623 -v -97.724411 -101.495247 -42.087791 -v -97.646744 -101.495247 -41.939964 -v -97.609787 -101.645210 -41.955772 -v -97.690262 -101.645210 -42.109001 -v -97.802917 -101.645210 -42.266106 -v -97.946213 -101.645210 -42.417625 -v -98.096588 -101.645210 -42.546928 -v -98.233978 -101.645210 -42.645226 -v -98.442551 -101.645210 -42.773216 -v -98.685440 -101.645210 -42.899467 -v -98.945145 -101.645210 -43.008080 -v -98.983170 -101.645210 -43.022179 -v -99.290939 -101.645210 -43.120323 -v -99.601303 -101.645210 -43.190056 -v -99.923508 -101.645210 -43.233208 -v -100.011703 -101.645210 -43.240379 -v -98.385056 -101.345222 -41.842003 -v -98.621017 -101.345222 -42.021629 -v -99.336197 -101.345222 -42.390068 -v -99.069565 -101.345222 -42.276237 -v -98.872147 -101.345222 -42.174370 -v -97.754410 -101.345222 -41.134880 -v -97.913483 -101.345222 -41.359550 -v -98.097275 -101.345222 -41.574272 -v -98.160141 -101.345222 -41.638817 -v -99.071335 -101.345222 -36.067711 -v -99.371078 -101.345222 -35.969109 -v -99.671616 -101.345222 -35.895744 -v -99.961319 -101.345222 -35.850395 -v -100.301865 -101.345222 -35.828026 -v -97.033340 -101.345222 -37.942589 -v -97.261414 -101.345222 -43.422874 -v -96.729752 -101.345222 -43.285759 -v -97.247681 -101.345222 -43.121849 -v -96.722672 -101.345222 -43.068291 -v -96.722672 -101.345222 -39.372154 -v -98.775925 -101.345222 -36.192741 -v -98.527359 -101.345222 -36.321220 -v -98.245178 -101.345222 -36.494865 -v -97.989532 -101.345222 -36.684990 -v -97.756958 -101.345222 -36.894920 -v -97.686523 -101.345222 -36.967094 -v -97.483414 -101.345222 -37.201134 -v -97.301590 -101.345222 -37.451500 -v -97.171860 -101.345222 -37.666344 -v -96.736969 -101.345222 -39.067772 -v -96.772751 -101.345222 -38.776665 -v -96.823639 -101.345222 -38.536430 -v -96.915558 -101.345222 -38.234062 -v -99.885391 -101.345222 -42.531822 -v -99.606888 -101.345222 -42.473747 -v -100.159317 -101.345222 -46.220818 -v -100.103012 -101.345222 -46.601860 -v -99.938278 -101.345222 -46.196770 -v -99.801315 -101.345222 -46.566154 -v -99.660294 -101.345222 -46.143364 -v -99.537430 -101.345222 -46.513237 -v -99.382645 -101.345222 -46.064140 -v -99.229599 -101.345222 -46.425835 -v -99.110458 -101.345222 -45.957176 -v -98.925308 -101.345222 -46.307365 -v -98.879807 -101.345222 -45.845055 -v -98.629807 -101.345222 -46.163719 -v -98.624710 -101.345222 -45.691399 -v -98.402145 -101.345222 -46.031059 -v -98.382889 -101.345222 -45.515038 -v -98.144653 -101.345222 -45.853935 -v -98.157745 -101.345222 -45.314598 -v -97.907837 -101.345222 -45.658348 -v -98.055679 -101.345222 -45.210625 -v -97.759369 -101.345222 -45.515739 -v -97.875381 -101.345222 -44.998253 -v -97.542450 -101.345222 -45.275566 -v -97.711777 -101.345222 -44.761955 -v -97.348007 -101.345222 -45.020866 -v -97.570480 -101.345222 -44.509911 -v -97.180054 -101.345222 -44.754723 -v -97.509674 -101.345222 -44.380211 -v -97.044800 -101.345222 -44.495750 -v -97.403030 -101.345222 -44.105034 -v -96.929153 -101.345222 -44.223503 -v -97.324738 -101.345222 -43.825981 -v -96.839951 -101.345222 -43.947380 -v -97.273819 -101.345222 -43.540245 -v -96.776123 -101.345222 -43.670128 -v -96.737137 -101.345222 -43.395317 -v -100.706863 -101.345222 -42.561241 -v -100.643692 -101.345222 -42.948906 -v -100.431900 -101.345222 -42.574272 -v -100.154343 -101.345222 -42.564293 -v -103.467636 -101.345222 -39.542900 -v -103.984146 -101.345222 -39.710594 -v -103.441696 -101.345222 -39.851067 -v -103.947586 -101.345222 -40.005363 -v -103.403763 -101.345222 -40.070427 -v -103.894394 -101.345222 -40.261986 -v -103.330551 -101.345222 -40.353416 -v -103.807877 -101.345222 -40.555656 -v -103.230698 -101.345222 -40.629417 -v -103.690506 -101.345222 -40.845787 -v -103.104507 -101.345222 -40.898094 -v -103.548904 -101.345222 -41.125023 -v -103.070358 -101.345222 -40.961662 -v -103.432022 -101.345222 -41.317711 -v -102.916397 -101.345222 -41.214195 -v -103.253067 -101.345222 -41.568443 -v -102.738541 -101.345222 -41.451408 -v -103.054306 -101.345222 -41.800133 -v -102.535965 -101.345222 -41.676201 -v -102.931931 -101.345222 -41.923790 -v -102.327072 -101.345222 -41.869713 -v -102.686844 -101.345222 -42.138878 -v -102.096481 -101.345222 -42.044609 -v -102.425491 -101.345222 -42.331993 -v -101.964859 -101.345222 -42.130577 -v -102.147781 -101.345222 -42.500908 -v -101.708084 -101.345222 -42.273827 -v -101.879898 -101.345222 -42.637138 -v -101.445786 -101.345222 -42.388084 -v -101.595078 -101.345222 -42.754143 -v -101.168045 -101.345222 -42.478294 -v -101.305130 -101.345222 -42.845482 -v -100.968063 -101.345222 -42.525047 -v -101.018997 -101.345222 -42.908287 -v -100.725204 -101.345222 -42.943657 -v -36.196396 135.744568 -25.788870 -v -36.228577 135.698975 -25.660543 -v -36.130966 136.300903 -25.607077 -v -36.502335 134.749390 -29.307058 -v -36.491913 134.809753 -29.309288 -v -36.429932 135.684753 -29.660849 -v -36.534576 134.490051 -29.248497 -v -36.525208 134.587891 -29.281729 -v -36.741379 133.782715 -29.531607 -v -36.512299 134.686768 -29.301506 -v -36.470062 134.919312 -29.301901 -v -36.446625 135.021790 -29.283194 -v -36.386749 135.788391 -29.578817 -v -36.439514 135.050293 -29.275534 -v -36.333908 135.903931 -29.465902 -v -36.531677 134.112610 -28.942678 -v -36.538010 134.184143 -29.030386 -v -36.710876 133.600769 -29.303915 -v -36.541351 134.262024 -29.106407 -v -36.541504 134.345459 -29.170401 -v -36.695358 133.536926 -29.198812 -v -36.671097 133.451965 -29.033621 -v -36.523102 134.048035 -28.845327 -v -36.646515 133.378784 -28.859915 -v -36.521027 134.033508 -28.821951 -v -36.727783 133.688660 -29.424614 -v -36.538269 134.434265 -29.222860 -v -36.505997 133.956787 -28.669180 -v -36.623291 133.318726 -28.685507 -v -36.492538 133.905762 -28.536644 -v -36.617584 133.305786 -28.641075 -v -36.478119 133.862183 -28.391136 -v -36.594299 133.259338 -28.450096 -v -36.463791 133.825806 -28.235098 -v -36.567963 133.214233 -28.198387 -v -36.450394 133.796326 -28.069632 -v -36.444061 133.783386 -27.980185 -v -36.546448 133.182251 -27.934654 -v -36.430344 133.756226 -27.733452 -v -36.531097 133.160278 -27.651175 -v -36.422058 133.741211 -27.483574 -v -36.523972 133.149780 -27.369560 -v -36.523666 133.149231 -27.337120 -v -36.420685 133.734863 -27.156273 -v -36.524231 133.147705 -27.155539 -v -36.532928 133.151733 -26.862022 -v -36.429321 133.738892 -26.860800 -v -36.541351 133.158203 -26.704033 -v -36.446075 133.754578 -26.573996 -v -36.557663 133.172424 -26.482260 -v -36.467041 133.778076 -26.327293 -v -36.578018 133.193542 -26.268698 -v -36.490875 133.812317 -26.100456 -v -36.601654 133.221619 -26.063986 -v -36.515274 133.857483 -25.896780 -v -36.627594 133.257874 -25.868521 -v -36.533081 133.899597 -25.757223 -v -36.578293 134.095947 -25.381735 -v -36.565506 134.018555 -25.497427 -v -36.699112 133.396851 -25.406485 -v -36.550430 133.953613 -25.621391 -v -36.673660 133.338928 -25.563255 -v -36.654846 133.302551 -25.683647 -v -36.594757 134.311951 -25.161764 -v -36.591141 134.222778 -25.237295 -v -36.768036 133.613708 -25.000265 -v -36.583649 134.138672 -25.327751 -v -36.747787 133.537476 -25.119741 -v -36.724075 133.463013 -25.258415 -v -36.501587 135.661499 -24.642265 -v -36.453186 135.771362 -24.728964 -v -36.511322 134.988586 -25.015402 -v -36.403702 135.873962 -24.827566 -v -36.358765 135.959534 -24.926199 -v -36.534714 134.882080 -25.001852 -v -36.549255 134.809265 -24.997641 -v -36.566589 134.704468 -25.004202 -v -36.579712 134.605713 -25.021658 -v -36.794617 133.749695 -24.831594 -v -36.581543 134.589111 -25.025932 -v -36.786850 133.704712 -24.882742 -v -36.590210 134.490601 -25.059103 -v -36.594437 134.398926 -25.104391 -v -36.271698 136.108459 -25.144552 -v -36.226715 136.177002 -25.274343 -v -36.329758 135.521057 -25.340660 -v -36.425690 135.283020 -25.131186 -v -36.455505 135.191833 -25.082327 -v -36.485718 135.088379 -25.041374 -v -36.298508 136.066101 -25.072256 -v -36.360565 135.452881 -25.264517 -v -36.394562 135.368835 -25.190329 -v -36.181946 136.237671 -25.419668 -v -36.262222 135.645996 -25.541769 -v -36.298676 135.581848 -25.427574 -v -36.166397 135.783081 -25.924459 -v -36.084976 136.352966 -25.802908 -v -36.138779 135.814819 -26.068077 -v -36.043945 136.394775 -26.009970 -v -36.125168 135.829102 -26.147512 -v -36.027222 136.410522 -26.106955 -v -36.096344 135.856323 -26.343649 -v -35.990448 136.442993 -26.360708 -v -36.072632 135.875732 -26.551443 -v -35.962799 136.466064 -26.618521 -v -36.054871 135.888306 -26.767385 -v -35.944855 136.479492 -26.874962 -v -36.043381 135.895020 -26.993399 -v -35.943085 136.480591 -26.910971 -v -36.038742 135.897644 -27.220327 -v -35.935272 136.484802 -27.208975 -v -36.038849 135.896851 -27.287863 -v -36.045746 135.890259 -27.569998 -v -35.938431 136.481628 -27.473989 -v -36.049255 135.886963 -27.640921 -v -35.950897 136.470093 -27.731710 -v -36.066528 135.869019 -27.876854 -v -35.959839 136.461426 -27.849539 -v -35.979340 136.443176 -28.048239 -v -36.091599 135.841370 -28.105795 -v -36.003876 136.418579 -28.239737 -v -36.118149 135.808228 -28.288412 -v -36.033325 136.385864 -28.423910 -v -36.152725 135.759338 -28.478018 -v -36.066925 136.345642 -28.599661 -v -36.163742 135.742554 -28.531179 -v -36.161865 136.210815 -28.982107 -v -36.291351 135.492493 -28.982229 -v -36.260925 135.560791 -28.894522 -v -36.225632 135.633850 -28.780050 -v -36.193756 135.693542 -28.661583 -v -36.117264 136.277832 -28.818228 -v -36.104782 136.295471 -28.767965 -v -36.289368 135.992737 -29.359152 -v -36.411972 135.151978 -29.239340 -v -36.383179 135.246765 -29.191763 -v -36.360626 135.313660 -29.147879 -v -36.325836 135.407593 -29.070211 -v -36.244568 136.074341 -29.239462 -v -36.201126 136.148254 -29.110891 -v -36.510727 135.459473 -29.787466 -v -36.527145 135.407349 -29.808554 -v -36.472229 135.572388 -29.731527 -v -36.562347 135.287903 -29.848654 -v -36.599792 135.144348 -29.881124 -v -36.632858 135.003601 -29.901510 -v -36.714737 134.238953 -29.718895 -v -36.640213 134.969360 -29.904440 -v -36.673141 134.804077 -29.910727 -v -36.750900 133.885681 -29.626030 -v -36.755005 134.107361 -29.768118 -v -36.755722 134.002625 -29.710289 -v -36.752090 133.904114 -29.640831 -v -36.692520 134.695251 -29.908072 -v -36.714233 134.558167 -29.896843 -v -36.731293 134.425415 -29.874321 -v -36.744141 134.299500 -29.842978 -v -36.749817 134.220276 -29.815908 -v -36.819229 134.049988 -24.590872 -v -36.819443 134.112854 -24.556938 -v -36.815231 133.943542 -24.659842 -v -36.806870 133.843018 -24.740438 -v -36.816147 134.238770 -24.500389 -v -36.807938 134.366272 -24.457266 -v -36.794144 134.501282 -24.425865 -v -36.606689 135.317810 -24.521414 -v -36.789307 134.540710 -24.418997 -v -36.767883 134.690247 -24.400961 -v -36.521576 135.612610 -24.609518 -v -36.565903 135.495850 -24.543112 -v -36.743134 134.830933 -24.396292 -v -36.713699 134.974060 -24.403036 -v -36.682526 135.109863 -24.418417 -v -36.646790 135.244507 -24.447256 -v -36.607864 135.373047 -24.488729 -v -36.614487 134.820557 -25.207298 -v -36.578888 134.814087 -25.168846 -v -36.568680 134.876587 -25.175253 -v -36.549896 134.808960 -25.108541 -v -36.546371 134.808411 -25.094473 -v -36.531891 134.875000 -25.092276 -v -36.155975 135.748962 -27.220694 -v -36.169495 135.743652 -27.220724 -v -36.171860 135.741821 -27.000357 -v -36.235718 135.732361 -27.220999 -v -36.240234 135.729797 -27.002951 -v -36.221176 135.732910 -27.220938 -v -36.110764 135.776245 -27.220510 -v -36.042999 135.878906 -27.220297 -v -36.542130 134.807800 -25.041830 -v -36.543365 134.808105 -25.027304 -v -36.546967 134.808777 -25.006767 -v -36.571014 134.812744 -25.156790 -v -36.736893 134.842957 -25.252159 -v -36.685516 134.833557 -25.244711 -v -36.724075 134.902527 -25.255453 -v -36.671936 134.831055 -25.240318 -v -36.637451 134.886414 -25.233664 -v -36.649887 134.826965 -25.230644 -v -36.625870 134.822632 -25.216026 -v -36.510590 134.971924 -25.103323 -v -36.487442 135.062256 -25.125235 -v -36.459808 135.157349 -25.161093 -v -36.432419 135.241760 -25.204489 -v -36.403763 135.321594 -25.257315 -v -36.372391 135.399963 -25.323874 -v -36.343872 135.463989 -25.392599 -v -36.314865 135.521545 -25.471884 -v -36.280243 135.583496 -25.578848 -v -36.247910 135.635254 -25.692221 -v -36.216980 135.679932 -25.814383 -v -36.187790 135.718079 -25.945761 -v -36.160889 135.749512 -26.084953 -v -36.147614 135.763733 -26.162344 -v -36.119324 135.790955 -26.354513 -v -36.096008 135.810364 -26.558340 -v -36.078445 135.822998 -26.772207 -v -36.067093 135.829773 -26.995291 -v -36.066116 135.826355 -27.220358 -v -36.099762 135.785706 -27.220449 -v -36.111725 135.776550 -26.997702 -v -36.122986 135.769775 -26.777855 -v -36.140427 135.757141 -26.566458 -v -36.163574 135.737854 -26.366659 -v -36.191620 135.710938 -26.178610 -v -36.204788 135.696838 -26.103231 -v -36.231415 135.665833 -25.968405 -v -36.260315 135.628296 -25.841116 -v -36.290848 135.584961 -25.724693 -v -36.322784 135.534546 -25.616415 -v -36.356888 135.475098 -25.516075 -v -36.385300 135.421021 -25.443533 -v -36.413208 135.361206 -25.381308 -v -36.443848 135.288269 -25.321249 -v -36.471817 135.214111 -25.273796 -v -36.498550 135.135681 -25.234886 -v -36.525467 135.047791 -25.203146 -v -36.547928 134.965576 -25.184378 -v -36.183090 135.735168 -26.783590 -v -36.200500 135.722656 -26.574759 -v -36.223633 135.703613 -26.378653 -v -36.251709 135.677124 -26.194267 -v -36.264908 135.663330 -26.120657 -v -36.291672 135.633179 -25.989433 -v -36.320724 135.596619 -25.865561 -v -36.351608 135.554810 -25.753561 -v -36.383881 135.506165 -25.649191 -v -36.418549 135.449463 -25.553642 -v -36.447693 135.398743 -25.485649 -v -36.476410 135.342896 -25.427513 -v -36.508011 135.274597 -25.371298 -v -36.536896 135.204834 -25.326681 -v -36.564514 135.130859 -25.290030 -v -36.592438 135.047913 -25.260031 -v -36.615860 134.970764 -25.242361 -v -36.700821 134.986450 -25.265676 -v -36.675430 135.062561 -25.284964 -v -36.645508 135.143799 -25.316244 -v -36.616043 135.215637 -25.353813 -v -36.585297 135.282837 -25.398886 -v -36.551773 135.347961 -25.454977 -v -36.521423 135.400757 -25.512411 -v -36.490814 135.448425 -25.579031 -v -36.454941 135.502319 -25.672630 -v -36.421890 135.549011 -25.774954 -v -36.390289 135.588867 -25.884481 -v -36.360825 135.624268 -26.006155 -v -36.333725 135.653320 -26.134970 -v -36.320389 135.666687 -26.207327 -v -36.292130 135.692505 -26.389000 -v -36.268875 135.710999 -26.582266 -v -36.251465 135.723267 -26.788809 -v -37.094772 135.183350 -28.971457 -v -37.089569 135.200256 -28.961355 -v -36.619522 135.063904 -29.024618 -v -36.836044 135.712830 -27.755636 -v -36.825333 135.724121 -27.577261 -v -36.242569 135.725159 -27.554525 -v -36.822586 135.726746 -27.510824 -v -36.240005 135.727417 -27.491690 -v -36.817886 135.732361 -27.220999 -v -36.254013 135.714172 -27.739431 -v -36.270554 135.696655 -27.916830 -v -36.853485 135.692749 -27.949972 -v -36.274246 135.692749 -27.949972 -v -36.858170 135.687256 -27.993246 -v -36.291840 135.673584 -28.086172 -v -36.881378 135.657776 -28.173544 -v -36.318832 135.641174 -28.249411 -v -36.429855 135.477600 -28.673239 -v -36.984406 135.477600 -28.673178 -v -36.967926 135.512817 -28.613150 -v -36.409332 135.512634 -28.613546 -v -36.942612 135.561646 -28.508963 -v -36.376541 135.562073 -28.507895 -v -36.937820 135.570068 -28.487175 -v -36.370926 135.570068 -28.487204 -v -36.913284 135.610474 -28.365194 -v -36.347549 135.602905 -28.390127 -v -36.894363 135.639282 -28.257376 -v -36.885727 135.651672 -28.202688 -v -36.446655 135.447327 -28.718956 -v -36.454025 135.433838 -28.737999 -v -36.990677 135.463745 -28.694815 -v -36.490234 135.364868 -28.822805 -v -37.021454 135.391357 -28.792471 -v -36.527618 135.287659 -28.896811 -v -37.051651 135.312500 -28.874960 -v -36.552383 135.232544 -28.939871 -v -37.069168 135.262634 -28.917257 -v -36.566849 135.200317 -28.961355 -v -36.586960 135.152527 -28.987936 -v -36.659012 134.938232 -29.053337 -v -36.681274 134.843018 -29.059866 -v -36.683838 134.843262 -29.059835 -v -37.119415 135.096130 -29.012930 -v -36.623550 135.052063 -29.028463 -v -37.130783 135.052063 -29.028463 -v -36.630463 135.031250 -29.034628 -v -37.135590 135.032532 -29.034262 -v -37.156235 134.941223 -29.052999 -v -37.175491 134.843262 -29.059835 -v -36.865341 135.697327 -26.431173 -v -36.846146 135.713257 -26.615774 -v -37.172195 134.014099 -26.352896 -v -37.132172 133.979431 -27.550222 -v -37.129807 133.974792 -27.441977 -v -37.141235 133.998840 -27.793022 -v -37.149216 134.017029 -27.940512 -v -37.160004 134.042908 -28.101675 -v -37.172028 134.075867 -28.256430 -v -37.184631 134.118164 -28.405815 -v -37.205780 134.229370 -28.661398 -v -37.196030 134.167542 -28.538168 -v -37.207443 134.240601 -28.681938 -v -37.205093 134.435547 -28.853659 -v -37.192932 134.737854 -29.052633 -v -37.204544 134.648193 -29.032125 -v -37.206436 134.630493 -29.026358 -v -37.218033 134.429138 -28.911398 -v -37.216965 134.359253 -28.844442 -v -37.213120 134.297302 -28.767752 -v -37.213577 134.548035 -28.991049 -v -37.217316 134.470215 -28.943197 -v -37.129272 133.969543 -27.158224 -v -37.138275 133.974487 -26.850027 -v -36.824600 135.728638 -26.940725 -v -37.142273 133.978394 -26.766745 -v -36.840332 135.717529 -26.684713 -v -37.147415 133.983826 -26.675955 -v -37.154465 133.991516 -26.570333 -v -37.166626 134.006348 -26.416159 -v -36.889084 135.674255 -26.253988 -v -37.187180 134.037842 -26.197195 -v -36.917145 135.642700 -26.083914 -v -37.207611 134.078918 -26.006462 -v -37.207993 134.079834 -26.002920 -v -36.949142 135.600891 -25.923300 -v -36.959045 135.586914 -25.878561 -v -37.223328 134.120605 -25.867270 -v -37.231796 134.149353 -25.791739 -v -36.988312 135.541870 -25.758047 -v -37.237091 134.171143 -25.742729 -v -37.018906 135.489075 -25.647331 -v -37.248291 134.232849 -25.630392 -v -37.250580 134.249451 -25.604881 -v -37.253311 134.271729 -25.572989 -v -37.259964 134.346863 -25.480551 -v -37.262222 134.390686 -25.435812 -v -37.263153 134.426453 -25.403921 -v -37.263306 134.459351 -25.378105 -v -37.261841 134.524048 -25.335257 -v -37.261139 134.539856 -25.326345 -v -37.224442 134.843262 -25.252159 -v -37.218811 134.872192 -25.253622 -v -37.116486 135.180603 -25.448477 -v -37.239639 134.750977 -25.258476 -v -37.255219 134.623047 -25.289175 -v -37.250992 134.664124 -25.276114 -v -37.250397 134.669373 -25.274681 -v -37.160110 135.122559 -25.307028 -v -37.133041 135.212463 -25.351889 -v -37.104752 135.295471 -25.408682 -v -37.088120 135.339539 -25.446890 -v -37.060822 135.404907 -25.517569 -v -37.033707 135.460938 -25.598928 -v -37.196976 134.977844 -25.264120 -v -37.173752 135.072754 -25.288260 -v -36.617645 133.969543 -27.158226 -v -36.625839 133.973389 -26.881704 -v -36.631714 133.978394 -26.766745 -v -36.642319 133.988708 -26.605919 -v -36.659225 134.007141 -26.409719 -v -36.664902 134.014099 -26.352896 -v -36.678986 134.033325 -26.223471 -v -36.700623 134.068542 -26.048056 -v -36.706146 134.078918 -26.006462 -v -36.709366 134.085205 -25.982687 -v -36.726242 134.122192 -25.862663 -v -36.736618 134.149353 -25.791708 -v -36.742813 134.167847 -25.749687 -v -36.757843 134.224792 -25.643454 -v -36.762939 134.249451 -25.604881 -v -36.778000 134.618469 -25.290792 -v -36.784027 134.539917 -25.326315 -v -36.784607 134.524048 -25.335257 -v -36.785004 134.464355 -25.374411 -v -36.783905 134.427917 -25.402700 -v -36.781601 134.390686 -25.435812 -v -36.778442 134.356018 -25.470663 -v -36.769852 134.289429 -25.549246 -v -36.772797 134.661438 -25.276846 -v -36.771729 134.669373 -25.274681 -v -36.770981 134.674561 -25.273277 -v -36.754898 134.765625 -25.256828 -v -36.740112 134.843201 -25.252188 -v 53.286148 -104.095222 -27.258583 -v 53.406845 -103.345222 -28.753914 -v 53.406845 -104.095222 -28.753914 -v 53.765877 -103.345222 -30.210518 -v 53.765877 -104.095222 -30.210518 -v 54.353905 -103.345222 -31.590675 -v 54.353905 -104.095222 -31.590675 -v 55.155708 -103.345222 -32.858620 -v 55.155708 -104.095222 -32.858620 -v 56.150513 -103.345222 -33.981544 -v 56.150513 -104.095222 -33.981544 -v 57.312561 -103.345222 -34.930305 -v 57.312561 -104.095222 -34.930305 -v 58.611763 -103.345222 -35.680428 -v 58.611763 -104.095222 -35.680428 -v 60.014503 -103.345222 -36.212379 -v 60.014503 -104.095222 -36.212379 -v 61.484352 -103.345222 -36.512459 -v 61.484352 -104.095222 -36.512459 -v 62.983345 -103.345222 -36.572884 -v 62.983345 -104.095222 -36.572884 -v 64.472595 -103.345222 -36.392036 -v 64.472595 -104.095222 -36.392036 -v 65.913574 -103.345222 -35.974648 -v 65.913574 -104.095222 -35.974648 -v 67.268921 -103.345222 -35.331551 -v 67.268921 -104.095222 -35.331551 -v 68.503540 -103.345222 -34.479317 -v 68.503540 -104.095222 -34.479317 -v 69.585480 -103.345222 -33.440102 -v 69.585480 -104.095222 -33.440102 -v 70.486740 -103.345222 -32.240791 -v 70.486740 -104.095222 -32.240791 -v 71.183899 -103.345222 -30.912422 -v 71.183899 -104.095222 -30.912422 -v 71.658951 -103.345222 -29.489450 -v 71.658951 -104.095222 -29.489450 -v 71.899597 -103.345222 -28.008677 -v 71.899597 -104.095222 -28.008677 -v 71.899597 -103.345222 -26.508493 -v 71.899597 -104.095222 -26.508493 -v 71.658951 -103.345222 -25.027718 -v 71.658951 -104.095222 -25.027719 -v 71.183899 -103.345222 -23.604715 -v 71.183899 -104.095222 -23.604715 -v 70.486740 -103.345222 -22.276375 -v 70.486740 -104.095222 -22.276377 -v 69.585480 -103.345222 -21.077034 -v 69.585480 -104.095222 -21.077034 -v 68.503540 -103.345222 -20.037819 -v 68.503540 -104.095222 -20.037819 -v 67.268921 -103.345222 -19.185646 -v 67.268921 -104.095222 -19.185646 -v 65.913574 -103.345222 -18.542488 -v 65.913574 -104.095222 -18.542488 -v 64.472595 -103.345222 -18.125130 -v 64.472595 -104.095222 -18.125130 -v 62.983345 -103.345222 -17.944283 -v 62.983345 -104.095222 -17.944283 -v 61.484352 -103.345222 -18.004677 -v 61.484352 -104.095222 -18.004677 -v 60.014503 -103.345222 -18.304756 -v 60.014503 -104.095222 -18.304756 -v 58.611763 -103.345222 -18.836739 -v 58.611763 -104.095222 -18.836739 -v 57.312561 -103.345222 -19.586861 -v 57.312561 -104.095222 -19.586861 -v 56.150513 -103.345222 -20.535652 -v 56.150513 -104.095222 -20.535652 -v 55.155708 -103.345222 -21.658546 -v 55.155708 -104.095222 -21.658546 -v 54.353905 -103.345222 -22.926521 -v 54.353905 -104.095222 -22.926521 -v 53.765877 -103.345222 -24.306648 -v 53.765877 -104.095222 -24.306648 -v 53.406845 -103.345222 -25.763252 -v 53.406845 -104.095222 -25.763252 -v 53.286148 -103.345222 -27.258583 -v 62.607986 -104.095222 -27.258583 -v -77.829849 -102.095222 -37.053249 -v -78.162964 -102.095222 -37.348446 -v -74.134705 -102.095222 -41.340420 -v -78.301971 -102.095222 -37.503628 -v -78.575974 -102.095222 -37.891018 -v -78.976685 -102.095222 -39.178738 -v -74.239731 -102.095222 -41.448452 -v -78.985168 -102.095222 -39.391384 -v -74.598038 -102.095222 -41.747158 -v -78.781464 -102.095222 -38.303371 -v -78.914734 -102.095222 -38.736996 -v -73.393311 -102.095222 -38.954708 -v -73.486374 -102.095222 -38.556149 -v -73.647980 -102.095222 -38.156002 -v -78.847275 -102.095222 -40.293758 -v -78.675659 -102.095222 -40.711361 -v -74.975098 -102.095222 -41.972775 -v -73.871506 -102.095222 -41.014889 -v -73.646637 -102.095222 -40.625790 -v -76.052567 -102.095222 -36.516628 -v -73.479752 -102.095222 -40.207668 -v -74.140488 -102.095222 -37.435238 -v -74.444473 -102.095222 -37.153988 -v -73.360168 -102.095222 -39.391384 -v -74.824661 -102.095222 -36.892208 -v -75.227921 -102.095222 -36.698147 -v -73.384583 -102.095222 -39.765682 -v -75.620651 -102.095222 -36.576229 -v -73.877808 -102.095222 -37.762905 -v -76.669891 -102.095222 -36.543514 -v -77.079575 -102.095222 -36.648220 -v -77.470169 -102.095222 -36.819546 -v -78.953751 -102.095222 -39.833397 -v -76.242981 -102.095222 -36.508572 -v -75.804398 -102.095222 -42.242367 -v -78.143951 -102.095222 -41.456295 -v -76.242981 -102.095222 -42.274197 -v -77.832260 -102.095222 -41.730587 -v -77.465302 -102.095222 -41.964687 -v -77.086975 -102.095222 -42.131161 -v -76.665039 -102.095222 -42.240963 -v -78.441315 -102.095222 -41.102291 -v -75.383224 -102.095222 -42.143032 -v -73.360168 -101.645210 -39.391384 -v -73.371063 -101.645210 -39.625698 -v -73.382843 -101.645210 -39.751247 -v -73.384583 -101.645210 -39.765682 -v -73.541962 -101.645210 -40.386562 -v -73.479752 -101.645210 -40.207668 -v -73.470215 -101.645210 -40.176144 -v -73.417450 -101.645210 -39.965633 -v -73.633942 -101.645210 -40.599514 -v -73.646637 -101.645210 -40.625790 -v -73.777176 -101.645210 -40.867580 -v -73.663483 -101.645210 -40.659817 -v -74.134705 -101.645210 -41.340420 -v -74.038727 -101.645210 -41.232082 -v -73.898117 -101.645210 -41.052639 -v -73.871506 -101.645210 -41.014889 -v -74.214905 -101.645210 -41.423855 -v -74.385880 -101.645210 -41.582485 -v -74.565247 -101.645210 -41.723812 -v -74.598038 -101.645210 -41.747158 -v -74.967529 -101.645210 -41.968899 -v -74.757935 -101.645210 -41.851803 -v -75.383224 -101.645210 -42.143032 -v -75.271484 -101.645210 -42.103970 -v -75.069214 -101.645210 -42.018581 -v -74.975098 -101.645210 -41.972775 -v -75.473236 -101.645210 -42.170132 -v -75.679550 -101.645210 -42.219601 -v -76.242981 -101.645210 -42.274197 -v -76.031097 -101.645210 -42.267056 -v -75.882935 -101.645210 -42.253567 -v -75.804398 -101.645210 -42.242367 -v -73.627594 -101.495247 -40.677853 -v -73.201797 -101.380806 -39.391415 -v -73.210098 -101.385384 -39.391415 -v -73.221451 -101.385384 -39.636318 -v -73.359512 -101.625069 -39.391384 -v -73.335983 -101.527229 -39.391384 -v -73.343262 -101.545967 -39.391384 -v -73.330978 -101.495247 -39.628536 -v -73.219254 -101.390938 -39.391415 -v -73.281357 -101.442635 -39.391384 -v -73.294464 -101.457893 -39.391384 -v -73.319962 -101.495247 -39.391384 -v -73.071823 -101.345222 -39.646908 -v -73.060013 -101.345222 -39.391445 -v -73.073288 -101.345528 -39.391445 -v -73.126068 -101.352547 -39.391445 -v -73.073196 -101.345222 -39.665524 -v -73.074570 -101.345222 -39.673153 -v -73.233871 -101.385384 -39.768856 -v -73.270538 -101.385384 -39.995876 -v -73.147263 -101.346321 -40.016964 -v -73.326370 -101.385384 -40.218685 -v -73.211807 -101.346687 -40.258083 -v -73.402039 -101.385384 -40.440609 -v -73.302887 -101.345894 -40.544033 -v -73.498581 -101.385384 -40.664116 -v -73.352905 -101.345406 -40.683681 -v -73.393661 -101.345222 -40.790951 -v -73.529480 -101.385384 -40.727200 -v -76.243546 -101.385384 -42.424252 -v -76.243805 -101.357674 -42.488796 -v -76.013474 -101.345222 -42.566525 -v -76.243881 -101.352547 -42.508327 -v -76.244064 -101.345650 -42.558773 -v -76.244110 -101.345222 -42.574276 -v -76.243240 -101.457893 -42.339901 -v -76.243454 -101.402168 -42.398403 -v -76.022278 -101.385384 -42.416805 -v -76.243515 -101.390877 -42.415127 -v -76.243027 -101.565193 -42.285061 -v -76.243057 -101.545967 -42.291103 -v -76.028748 -101.495247 -42.307156 -v -76.243134 -101.495247 -42.314388 -v -76.243195 -101.474007 -42.327877 -v -75.877914 -101.495247 -42.293453 -v -75.671524 -101.495247 -42.258968 -v -75.462387 -101.495247 -42.208797 -v -75.257339 -101.495247 -42.141567 -v -75.052231 -101.495247 -42.054989 -v -74.737030 -101.495247 -41.886135 -v -74.949249 -101.495247 -42.004696 -v -74.186462 -101.495247 -41.452236 -v -74.359741 -101.495247 -41.613033 -v -74.541687 -101.495247 -41.756344 -v -74.008041 -101.495247 -41.258053 -v -73.865494 -101.495247 -41.076107 -v -75.845551 -101.345222 -42.551235 -v -75.864243 -101.385384 -42.402401 -v -75.619568 -101.345222 -42.513546 -v -75.649567 -101.385384 -42.366543 -v -75.392319 -101.345222 -42.459011 -v -75.432785 -101.385384 -42.314541 -v -75.165787 -101.345222 -42.384731 -v -75.218643 -101.385384 -42.244320 -v -74.942429 -101.345222 -42.290462 -v -75.005814 -101.385384 -42.154537 -v -74.831039 -101.345222 -42.236050 -v -74.899292 -101.385384 -42.102474 -v -74.601837 -101.345222 -42.107998 -v -74.679886 -101.385384 -41.979885 -v -74.389328 -101.345222 -41.966793 -v -74.477280 -101.385384 -41.845303 -v -74.190781 -101.345222 -41.810390 -v -74.288330 -101.385384 -41.696438 -v -74.002518 -101.345222 -41.635708 -v -74.108719 -101.385384 -41.529781 -v -73.809753 -101.345222 -41.425900 -v -73.924240 -101.385384 -41.328976 -v -73.654541 -101.345222 -41.227749 -v -73.776321 -101.385384 -41.140194 -v -73.519409 -101.345222 -41.021053 -v -73.648285 -101.385384 -40.944332 -v -73.395477 -101.345222 -40.794613 -v -73.742645 -101.495247 -40.888149 -v -73.597672 -101.495247 -40.616817 -v -73.504471 -101.495247 -40.401058 -v -73.431671 -101.495247 -40.187557 -v -73.378082 -101.495247 -39.973721 -v -73.342941 -101.495247 -39.755947 -v -73.060165 -101.345222 -42.958584 -v -72.535172 -101.345222 -42.958584 -v -73.060165 -101.345222 -39.619808 -v -72.535172 -101.345222 -39.396175 -v -72.546982 -101.345222 -39.122799 -v -72.574997 -101.345222 -38.860744 -v -72.625519 -101.345222 -38.598293 -v -72.632706 -101.345222 -38.568233 -v -72.710266 -101.345222 -38.300198 -v -72.808609 -101.345222 -38.040920 -v -73.250824 -101.345222 -38.320065 -v -73.172546 -101.345222 -38.558346 -v -73.115326 -101.345222 -38.800716 -v -73.079453 -101.345222 -39.046535 -v -73.433334 -101.345222 -40.930294 -v -73.586899 -101.345222 -41.469601 -v -77.016663 -101.345222 -42.877285 -v -76.951920 -101.345222 -42.485989 -v -76.980545 -101.345222 -42.478298 -v -73.072083 -101.345222 -39.131771 -v -73.986160 -101.345222 -42.208065 -v -77.272324 -101.345222 -42.810146 -v -77.226898 -101.345222 -42.399746 -v -77.526077 -101.345222 -42.723812 -v -77.461151 -101.345222 -42.302517 -v -77.776413 -101.345222 -42.617031 -v -77.689484 -101.345222 -42.183193 -v -77.860336 -101.345222 -42.575985 -v -75.666199 -101.345222 -42.920498 -v -75.395233 -101.345222 -42.872799 -v -76.720291 -101.345222 -42.535885 -v -76.761826 -101.345222 -42.922207 -v -76.487595 -101.345222 -42.563717 -v -76.602203 -101.345222 -42.939693 -v -79.222672 -101.345222 -38.743679 -v -79.162537 -101.345222 -38.493282 -v -79.651550 -101.345222 -38.317287 -v -74.001785 -101.345222 -37.147793 -v -73.778214 -101.345222 -36.710842 -v -74.221695 -101.345222 -36.948818 -v -74.001038 -101.345222 -36.536800 -v -74.435852 -101.345222 -36.783871 -v -74.233109 -101.345222 -36.384090 -v -74.656921 -101.345222 -36.642605 -v -74.497223 -101.345222 -36.238461 -v -74.895203 -101.345222 -36.516506 -v -74.500839 -101.345222 -42.548702 -v -74.314545 -101.345222 -42.444637 -v -74.142944 -101.345222 -42.334988 -v -75.124069 -101.345222 -42.801632 -v -74.862122 -101.345222 -42.711025 -v -74.612808 -101.345222 -42.604366 -v -73.677170 -101.345222 -41.781918 -v -73.728973 -101.345222 -41.901730 -v -73.927124 -101.345222 -42.153500 -v -73.827850 -101.345222 -42.044125 -v -73.747833 -101.345222 -41.933651 -v -75.935394 -101.345222 -42.945858 -v -76.219528 -101.345222 -42.958397 -v -76.263947 -101.345222 -42.957027 -v -74.591873 -101.345222 -36.191769 -v -74.851486 -101.345222 -36.079647 -v -75.151672 -101.345222 -36.405941 -v -75.115280 -101.345222 -35.988674 -v -75.396347 -101.345222 -36.324154 -v -75.380554 -101.345222 -35.917568 -v -75.642792 -101.345222 -36.265133 -v -75.646393 -101.345222 -35.866879 -v -75.893967 -101.345222 -36.228268 -v -75.782364 -101.345222 -35.849209 -v -75.950974 -101.345222 -36.223019 -v -76.085815 -101.345222 -35.829006 -v -76.242050 -101.345222 -36.208431 -v -76.242706 -101.345222 -35.824306 -v -76.527893 -101.345222 -36.222439 -v -76.485413 -101.345222 -35.833309 -v -76.594101 -101.345222 -36.229427 -v -76.752899 -101.345222 -35.858089 -v -76.823822 -101.345222 -36.267391 -v -77.014618 -101.345222 -35.903866 -v -77.055527 -101.345222 -36.325436 -v -77.102005 -101.345222 -35.923428 -v -77.284424 -101.345222 -36.404202 -v -77.359695 -101.345222 -35.994991 -v -77.510208 -101.345222 -36.502926 -v -77.609314 -101.345222 -36.086239 -v -77.549362 -101.345222 -36.522335 -v -77.856689 -101.345222 -36.199276 -v -77.753906 -101.345222 -36.638393 -v -78.095901 -101.345222 -36.329464 -v -77.957352 -101.345222 -36.775234 -v -78.192154 -101.345222 -36.388332 -v -78.158600 -101.345222 -36.930874 -v -78.407562 -101.345222 -36.537594 -v -78.346558 -101.345222 -37.106838 -v -79.565414 -101.345222 -38.072079 -v -78.611130 -101.345222 -36.702572 -v -78.779938 -101.345222 -36.859432 -v -78.523407 -101.345222 -37.300808 -v -78.957779 -101.345222 -37.052212 -v -78.690750 -101.345222 -37.516750 -v -79.121262 -101.345222 -37.261227 -v -78.834381 -101.345222 -37.738613 -v -79.272675 -101.345222 -37.488461 -v -78.961807 -101.345222 -37.972958 -v -73.349243 -101.345222 -38.085567 -v -72.922913 -101.345222 -37.793056 -v -73.384125 -101.345222 -38.012691 -v -73.054230 -101.345222 -37.557858 -v -73.512772 -101.345222 -37.776455 -v -73.104553 -101.345222 -37.478146 -v -73.660339 -101.345222 -37.550320 -v -73.262344 -101.345222 -37.254513 -v -73.822495 -101.345222 -37.341091 -v -73.432571 -101.345222 -37.047176 -v -73.571838 -101.345222 -36.899166 -v -78.112015 -101.345222 -42.437069 -v -77.908966 -101.345222 -42.044613 -v -78.343918 -101.345222 -42.284512 -v -78.113953 -101.345222 -41.890957 -v -78.565430 -101.345222 -42.112118 -v -78.300949 -101.345222 -41.723446 -v -78.774841 -101.345222 -41.921841 -v -78.348495 -101.345222 -41.676205 -v -78.947632 -101.345222 -41.738552 -v -78.528839 -101.345222 -41.478115 -v -79.109436 -101.345222 -41.535122 -v -78.690247 -101.345222 -41.269894 -v -79.259125 -101.345222 -41.315182 -v -78.831207 -101.345222 -41.052273 -v -79.294067 -101.345222 -41.259151 -v -78.916992 -101.345222 -40.898098 -v -79.427383 -101.345222 -41.021175 -v -79.543488 -101.345222 -40.768887 -v -79.029968 -101.345222 -40.660763 -v -79.639328 -101.345222 -40.509975 -v -79.122360 -101.345222 -40.417721 -v -79.713242 -101.345222 -40.244595 -v -79.193924 -101.345222 -40.169094 -v -79.771042 -101.345222 -39.941982 -v -79.082611 -101.345222 -38.250179 -v -79.069855 -101.345222 -38.216885 -v -79.459869 -101.345222 -37.830624 -v -79.408356 -101.345222 -37.727749 -v -79.718857 -101.345222 -38.565731 -v -79.767014 -101.345222 -38.817196 -v -79.262604 -101.345222 -39.000088 -v -79.786438 -101.345222 -38.968899 -v -79.281036 -101.345222 -39.261440 -v -79.806030 -101.345222 -39.271816 -v -79.285309 -101.345222 -39.391415 -v -79.810043 -101.345222 -39.391811 -v -79.278503 -101.345222 -39.578457 -v -79.798782 -101.345222 -39.673824 -v -79.254181 -101.345222 -39.851070 -v -79.244644 -101.345222 -39.916073 -v -76.242950 -101.495247 -35.564419 -v -76.242966 -101.545967 -35.541103 -v -76.499466 -101.495247 -35.573879 -v -76.242981 -101.565193 -35.535091 -v -76.493530 -101.385384 -35.683529 -v -76.242844 -101.385384 -35.674252 -v -76.242844 -101.390877 -35.665157 -v -76.242859 -101.402168 -35.648434 -v -76.242920 -101.457893 -35.589931 -v -76.242935 -101.474007 -35.577847 -v -76.242722 -101.345589 -35.809505 -v -76.242767 -101.352547 -35.758327 -v -76.242798 -101.357674 -35.738827 -v -79.895569 -101.357674 -39.391689 -v -79.876053 -101.352547 -39.391720 -v -79.824219 -101.345589 -39.391811 -v -79.985947 -101.402168 -39.391567 -v -79.969238 -101.390877 -39.391598 -v -79.955917 -101.385384 -39.266232 -v -79.960114 -101.385384 -39.391598 -v -80.065659 -101.495247 -39.262112 -v -80.056503 -101.474007 -39.391445 -v -80.044464 -101.457893 -39.391476 -v -80.099304 -101.565193 -39.391384 -v -80.093262 -101.545967 -39.391415 -v -80.069962 -101.495247 -39.391445 -v -80.105820 -101.645210 -39.260616 -v -80.110184 -101.645210 -39.391384 -v -79.935638 -101.385384 -38.953365 -v -79.915314 -101.385384 -38.794643 -v -79.864990 -101.385384 -38.531948 -v -79.794800 -101.385384 -38.272793 -v -79.705017 -101.385384 -38.017178 -v -79.595016 -101.385384 -37.765530 -v -79.541412 -101.385384 -37.658535 -v -79.400421 -101.385384 -37.409817 -v -79.242920 -101.385384 -37.173489 -v -79.072113 -101.385384 -36.955105 -v -78.885849 -101.385384 -36.753231 -v -78.709534 -101.385384 -36.589352 -v -78.497818 -101.385384 -36.417812 -v -78.272491 -101.385384 -36.261623 -v -78.172089 -101.385384 -36.200283 -v -77.923965 -101.385384 -36.065212 -v -77.666336 -101.385384 -35.947506 -v -77.405548 -101.385384 -35.852169 -v -77.136581 -101.385384 -35.777493 -v -77.045700 -101.385384 -35.757107 -v -76.773087 -101.385384 -35.709469 -v -76.787857 -101.495247 -35.600643 -v -77.068436 -101.495247 -35.649685 -v -77.161896 -101.495247 -35.670620 -v -77.439102 -101.495247 -35.747616 -v -77.708084 -101.495247 -35.845943 -v -77.973221 -101.495247 -35.967068 -v -78.227859 -101.495247 -36.105679 -v -78.331314 -101.495247 -36.168911 -v -78.563904 -101.495247 -36.330105 -v -78.781555 -101.495247 -36.506466 -v -78.963379 -101.495247 -36.675472 -v -79.155823 -101.495247 -36.884029 -v -79.331985 -101.495247 -37.109249 -v -79.493942 -101.495247 -37.352291 -v -79.638809 -101.495247 -37.607845 -v -79.693939 -101.495247 -37.717831 -v -79.807205 -101.495247 -37.976986 -v -79.899658 -101.495247 -38.240200 -v -79.971985 -101.495247 -38.507168 -v -80.023880 -101.495247 -38.778164 -v -80.044846 -101.495247 -38.941952 -v -80.084839 -101.645210 -38.937771 -v -80.063614 -101.645210 -38.772152 -v -80.011139 -101.645210 -38.498135 -v -79.938034 -101.645210 -38.228298 -v -79.844604 -101.645210 -37.962307 -v -79.730148 -101.645210 -37.700405 -v -79.674469 -101.645210 -37.589260 -v -79.528168 -101.645210 -37.331234 -v -79.364578 -101.645210 -37.085720 -v -79.186462 -101.645210 -36.857998 -v -78.991776 -101.645210 -36.646999 -v -78.807922 -101.645210 -36.476131 -v -78.588089 -101.645210 -36.298000 -v -78.352829 -101.645210 -36.134975 -v -78.248276 -101.645210 -36.071041 -v -77.991241 -101.645210 -35.931118 -v -77.723358 -101.645210 -35.808773 -v -77.451401 -101.645210 -35.709347 -v -77.171158 -101.645210 -35.631527 -v -77.076767 -101.645210 -35.610378 -v -76.793274 -101.645210 -35.560848 -v -76.501633 -101.645210 -35.533749 -v -76.242981 -101.645210 -35.524197 -v -98.443069 -102.095222 -37.290581 -v -102.339340 -102.095222 -37.336845 -v -102.520096 -102.095222 -37.540794 -v -98.724960 -102.095222 -37.058189 -v -99.022964 -102.095222 -36.868858 -v -102.090958 -102.095222 -37.109428 -v -98.477921 -102.095222 -41.526085 -v -103.172684 -102.095222 -39.391380 -v -98.758743 -102.095222 -41.751976 -v -99.049515 -102.095222 -41.929344 -v -97.822281 -102.095222 -40.637383 -v -97.686493 -102.095222 -40.288261 -v -102.592148 -102.095222 -41.152367 -v -102.334915 -102.095222 -41.452751 -v -100.430496 -102.095222 -42.274193 -v -100.057358 -102.095222 -42.253807 -v -99.680862 -102.095222 -42.183037 -v -99.365372 -102.095222 -42.079552 -v -97.547684 -102.095222 -39.391380 -v -103.169388 -102.095222 -39.290123 -v -97.552719 -102.095222 -39.556755 -v -97.591125 -102.095222 -39.902428 -v -97.568298 -102.095222 -39.026726 -v -97.631729 -102.095222 -38.679405 -v -97.743973 -102.095222 -38.325310 -v -99.689682 -102.095222 -36.599022 -v -100.053421 -102.095222 -36.531425 -v -101.803757 -102.095222 -36.906334 -v -100.430496 -102.095222 -36.508568 -v -102.749832 -102.095222 -37.868217 -v -102.930130 -102.095222 -38.211510 -v -103.051956 -102.095222 -38.542473 -v -103.134415 -102.095222 -38.904961 -v -98.365189 -102.095222 -37.365349 -v -99.357193 -102.095222 -36.709251 -v -103.150131 -102.095222 -39.765404 -v -103.085098 -102.095222 -40.117699 -v -101.775131 -102.095222 -41.894951 -v -101.434433 -102.095222 -42.069603 -v -101.086563 -102.095222 -42.189598 -v -98.222015 -102.095222 -41.263847 -v -98.003815 -102.095222 -40.968071 -v -97.910248 -102.095222 -37.969597 -v -98.120209 -102.095222 -37.647545 -v -100.791885 -102.095222 -36.533287 -v -101.145340 -102.095222 -36.609428 -v -101.484329 -102.095222 -36.734520 -v -102.969009 -102.095222 -40.476555 -v -102.804794 -102.095222 -40.821953 -v -102.077042 -102.095222 -41.686516 -v -100.771133 -102.095222 -42.252861 -v -151.500290 -68.551811 -83.181229 -v -151.824356 -68.390434 -83.214767 -v -151.498917 -73.217453 -110.775375 -v -151.959366 -75.129562 -110.415512 -v -152.349106 -70.286552 -82.856308 -v -151.850113 -75.145309 -110.411484 -v -152.200882 -70.311028 -82.850388 -v -151.667130 -75.145126 -110.409744 -v -152.017899 -70.311028 -82.848892 -v -151.594131 -75.135788 -110.410782 -v -151.647751 -70.204216 -82.866287 -v -151.328049 -69.946465 -82.912979 -v -151.212509 -74.989487 -110.434982 -v -151.297043 -75.038071 -110.426559 -v -151.230759 -68.859978 -83.120041 -v -150.787827 -73.926193 -110.633438 -v -151.114090 -69.223076 -83.049606 -v -150.763931 -74.056320 -110.608444 -v -151.143021 -69.588982 -82.979843 -v -150.792679 -74.422348 -110.538956 -v -150.977493 -74.779892 -110.472641 -v -151.150528 -73.385178 -110.740036 -v -150.971176 -73.558823 -110.705246 -v -150.880814 -73.693161 -110.678726 -v -152.140366 -63.551514 -55.655746 -v -151.831589 -63.708435 -55.623428 -v -151.562119 -64.016655 -55.562363 -v -151.445572 -64.379814 -55.491806 -v -151.474625 -64.745781 -55.421829 -v -151.659775 -65.103020 -55.354630 -v -151.979568 -65.360649 -55.307510 -v -152.349747 -65.467278 -55.289749 -v -152.532730 -65.467216 -55.291061 -v -152.705032 -65.436516 -55.298203 -v -140.383499 -93.451469 -110.607346 -v -140.703659 -93.272209 -110.538040 -v -140.956223 -93.116570 -111.627548 -v -151.020523 -74.103867 -112.071274 -v -150.947495 -75.089523 -111.483871 -v -150.809464 -74.758469 -111.693619 -v -150.944809 -75.763046 -112.788834 -v -140.197983 -94.464775 -111.242477 -v -140.093735 -94.527641 -110.774796 -v -140.040085 -94.144890 -110.739090 -v -141.891983 -93.749016 -110.411789 -v -141.940384 -93.850395 -110.416061 -v -142.229355 -93.680107 -111.208206 -v -150.890579 -84.643242 -112.870377 -v -150.765274 -84.305412 -112.899704 -v -150.075211 -85.839653 -112.899734 -v -151.962143 -75.248825 -110.798965 -v -151.625168 -75.463486 -111.206894 -v -151.977798 -75.450729 -111.187546 -v -151.730728 -76.248093 -112.049576 -v -152.026016 -75.960495 -111.791672 -v -152.006332 -75.754013 -111.583786 -v -152.134964 -77.608871 -112.698624 -v -152.077011 -76.549789 -112.234726 -v -152.050766 -76.232712 -112.018814 -v -152.083237 -79.697746 -112.870529 -v -152.139572 -78.634819 -112.866867 -v -151.862198 -79.097404 -112.899612 -v -151.853104 -77.567551 -112.714951 -v -152.019028 -80.317680 -112.870499 -v -151.655563 -81.065788 -112.899704 -v -151.847336 -81.417412 -112.870407 -v -151.293839 -82.708611 -112.899704 -v -151.598801 -82.520195 -112.870377 -v -151.440964 -83.084526 -112.870377 -v -149.326981 -87.588188 -112.870377 -v -149.917984 -86.633049 -112.870377 -v -150.173874 -86.170036 -112.870377 -v -148.322159 -88.944023 -112.870377 -v -148.690231 -88.479912 -112.870377 -v -148.240524 -88.656914 -112.899734 -v -149.230850 -87.295036 -112.899734 -v -147.224106 -90.154472 -112.870407 -v -147.115433 -89.909538 -112.899734 -v -145.871628 -91.367973 -112.870529 -v -145.023972 -91.683342 -112.899918 -v -145.550430 -91.619804 -112.870529 -v -143.800766 -92.469536 -112.673569 -v -144.477402 -92.378105 -112.801620 -v -145.177139 -91.897148 -112.870773 -v -142.768387 -93.389397 -111.890244 -v -143.555832 -92.947563 -112.459579 -v -143.952835 -92.710258 -112.643082 -v -142.004837 -93.398369 -111.158279 -v -141.741989 -93.541924 -110.410904 -v -141.790115 -93.597221 -110.409927 -v -140.629654 -94.259697 -112.258560 -v -144.923843 -91.581169 -114.794724 -v -144.388565 -92.367790 -114.814041 -v -144.068161 -92.157402 -114.715988 -v -143.302628 -93.002068 -114.512863 -v -143.200546 -92.684502 -114.463516 -v -142.291733 -93.515923 -113.986984 -v -142.329788 -93.165092 -114.026810 -v -141.340042 -93.949760 -113.198624 -v -141.513931 -93.580803 -113.407028 -v -140.505051 -94.073723 -112.109787 -v -147.171890 -90.178764 -114.870316 -v -146.044174 -91.184441 -114.870255 -v -145.490982 -91.614250 -114.870071 -v -147.006210 -89.818718 -114.794479 -v -148.125290 -88.574394 -114.794479 -v -148.644852 -88.528740 -114.870346 -v -149.110092 -87.220940 -114.794479 -v -149.872177 -86.711723 -114.870346 -v -149.949478 -85.774345 -114.794449 -v -150.635056 -84.249138 -114.794449 -v -151.546280 -82.675713 -114.870346 -v -151.089523 -84.123100 -114.870346 -v -150.843735 -84.751701 -114.870346 -v -151.159653 -82.661797 -114.794418 -v -151.517929 -81.028496 -114.794418 -v -151.936813 -80.738762 -114.870285 -v -151.721176 -79.072380 -114.794296 -v -152.092606 -78.632561 -114.867355 -v -151.736496 -78.049187 -114.747208 -v -151.701553 -77.002304 -114.522781 -v -152.060989 -77.366684 -114.700211 -v -151.625046 -76.011520 -114.123154 -v -151.954514 -76.178818 -114.290817 -v -151.522202 -75.095139 -113.545792 -v -151.790237 -75.028854 -113.594650 -v -151.433090 -74.426498 -112.935196 -v -151.645798 -74.204819 -112.801834 -v -151.355820 -73.860825 -112.191757 -v -151.537430 -73.584396 -111.850632 -v -141.103500 -93.227226 -110.472031 -v -141.408188 -93.306084 -110.434677 -v -141.694229 -93.149529 -111.254288 -v -141.495468 -93.349297 -110.426346 -v -142.639603 -93.088371 -111.957260 -v -143.332047 -92.002739 -113.161575 -v -142.447372 -92.373711 -113.182846 -v -142.668839 -92.369255 -112.831345 -v -141.776047 -92.715996 -112.674973 -v -142.052078 -92.683952 -112.366074 -v -141.311966 -93.045464 -111.425034 -v -143.564560 -92.183098 -112.846115 -v -142.940781 -92.528008 -112.536453 -v -142.367050 -92.820854 -112.104935 -v -144.575058 -91.073235 -113.808426 -v -143.873398 -91.546501 -113.745804 -v -143.164017 -91.977898 -113.540726 -v -144.643570 -91.161186 -113.408188 -v -146.654953 -89.456352 -113.407974 -v -146.574112 -89.379692 -113.808182 -v -147.736710 -88.252495 -113.407944 -v -147.648972 -88.183769 -113.808151 -v -148.688797 -86.943413 -113.407913 -v -148.594955 -86.883354 -113.808121 -v -149.500473 -85.544426 -113.407883 -v -149.401413 -85.493401 -113.808090 -v -150.163681 -84.069572 -113.407852 -v -150.060257 -84.028130 -113.808029 -v -150.671555 -82.534660 -113.407822 -v -150.564621 -82.503105 -113.808029 -v -151.018875 -80.955376 -113.407791 -v -150.909409 -80.934013 -113.807999 -v -151.216873 -79.063347 -113.407669 -v -151.029190 -76.517197 -113.262009 -v -151.091751 -77.331650 -113.588974 -v -151.205154 -77.446884 -113.206253 -v -151.119888 -78.185661 -113.770706 -v -151.105667 -79.054375 -113.807877 -v -151.069931 -75.998581 -112.470230 -v -144.807907 -91.384514 -113.077713 -v -146.853104 -89.650322 -113.077499 -v -147.953232 -88.425713 -113.077469 -v -148.921555 -87.094170 -113.077469 -v -149.747116 -85.671196 -113.077438 -v -150.421768 -84.171074 -113.077408 -v -150.938492 -82.609856 -113.077377 -v -151.292007 -81.003593 -113.077377 -v -151.493790 -79.079094 -113.077286 -v -151.483841 -77.532639 -112.888290 -v -151.357559 -76.174850 -112.201218 -v -151.245956 -75.345810 -111.306808 -v -140.522659 -93.658989 -111.992905 -v -140.692368 -93.321281 -111.817276 -v -141.586716 -92.884392 -112.963730 -v -141.485855 -93.188408 -113.230362 -v -142.311752 -92.514763 -113.513382 -v -142.263321 -92.792229 -113.820633 -v -143.083176 -92.088860 -113.899460 -v -143.090469 -92.335625 -114.235214 -v -143.847092 -91.624504 -114.120987 -v -143.911545 -91.836723 -114.473892 -v -144.600632 -91.116692 -114.189224 -v -144.720627 -91.291740 -114.547928 -v -146.607895 -89.416924 -114.188980 -v -146.756668 -89.568169 -114.547684 -v -147.686966 -88.216606 -114.188950 -v -147.850998 -88.351250 -114.547653 -v -148.636581 -86.911369 -114.188919 -v -148.814011 -87.027641 -114.547623 -v -149.446091 -85.516167 -114.188889 -v -149.634903 -85.612968 -114.547592 -v -150.107346 -84.045403 -114.188858 -v -150.305374 -84.121452 -114.547592 -v -150.613449 -82.514580 -114.188828 -v -150.818436 -82.569145 -114.547531 -v -150.959305 -80.939507 -114.188797 -v -151.168930 -80.971916 -114.547531 -v -151.155869 -79.052910 -114.188675 -v -151.367905 -79.058891 -114.547409 -v -151.170334 -78.134392 -114.148026 -v -151.382736 -78.084831 -114.503189 -v -151.139816 -77.214035 -113.951462 -v -151.349747 -77.094894 -114.291214 -v -151.072281 -76.337448 -113.598709 -v -151.277206 -76.154526 -113.912186 -v -150.981094 -75.523666 -113.087021 -v -151.179337 -75.281906 -113.362717 -v -150.833633 -74.429184 -111.889877 -v -151.094315 -74.643906 -112.780563 -v -140.084671 -93.900566 -110.704269 -v -140.146561 -93.749992 -110.677597 -v -140.288132 -93.544060 -110.632462 -v -137.304550 -96.224548 -82.912560 -v -136.904831 -96.269653 -82.979057 -v -133.094193 -99.256958 -55.420219 -v -136.287857 -97.502563 -83.214104 -v -132.469162 -100.477356 -55.655174 -v -136.241653 -97.142639 -83.180351 -v -132.427719 -100.123474 -55.621422 -v -136.347977 -96.747620 -83.119011 -v -134.348801 -99.894531 -55.298790 -v -138.093063 -96.746155 -82.850914 -v -134.176987 -99.583496 -55.290062 -v -137.991165 -96.594299 -82.849236 -v -133.883591 -99.336121 -55.307274 -v -137.696487 -96.346558 -82.866264 -v -133.493179 -99.213440 -55.353661 -v -132.773972 -99.434570 -55.489799 -v -136.584793 -96.448975 -83.048637 -v -132.536545 -99.730530 -55.560051 -v -134.307938 -99.926025 -55.014305 -v -134.276779 -99.964417 -54.554497 -v -132.886795 -100.606758 -51.799065 -v -132.834793 -100.358467 -51.796684 -v -132.755508 -100.624458 -52.169243 -v -132.831711 -100.223274 -51.804283 -v -132.582840 -100.637947 -52.774040 -v -132.417831 -100.625000 -53.702385 -v -132.376297 -100.263367 -53.674065 -v -132.486465 -99.866028 -53.675102 -v -132.892868 -99.912422 -51.845757 -v -132.725845 -99.563965 -53.692772 -v -133.115311 -99.559029 -51.946739 -v -133.048233 -99.379395 -53.722618 -v -133.438370 -99.347908 -52.073997 -v -133.449600 -99.328247 -53.764671 -v -133.854141 -99.295235 -52.223747 -v -133.842056 -99.444519 -53.810326 -v -134.257217 -99.441109 -52.356285 -v -134.136642 -99.687988 -53.848869 -v -134.542923 -99.725594 -52.438622 -v -134.308792 -99.993408 -53.862511 -v -134.653366 -99.943733 -52.463524 -v -138.379929 -97.178108 -28.473621 -v -138.700546 -96.904549 -28.580097 -v -137.129837 -97.787971 -36.128803 -v -139.652786 -96.791451 -20.805012 -v -139.664169 -96.666267 -20.825092 -v -138.200089 -97.607857 -28.380056 -v -136.896408 -99.027351 -43.410328 -v -135.051834 -99.856575 -51.158562 -v -134.857224 -99.651558 -51.422020 -v -135.014359 -99.864326 -51.298882 -v -134.976791 -99.872017 -51.439140 -v -137.744583 -98.594246 -31.134085 -v -138.214584 -98.339363 -28.870474 -v -138.239487 -98.084358 -28.330618 -v -139.822983 -97.382027 -20.756580 -v -139.705399 -97.141609 -20.766285 -v -140.426346 -95.872810 -21.095051 -v -140.608536 -95.856148 -21.135059 -v -139.143356 -96.798042 -28.693897 -v -140.881241 -95.896126 -21.185810 -v -139.603439 -96.917061 -28.783957 -v -141.070908 -95.973763 -21.214008 -v -139.938187 -97.208626 -28.824362 -v -141.408005 -96.263924 -21.242634 -v -141.423782 -96.285652 -21.242847 -v -139.769669 -96.352425 -20.891346 -v -139.843277 -96.237129 -20.922901 -v -140.040604 -96.040596 -20.991505 -v -140.164291 -95.963448 -21.028034 -v -138.472794 -98.194832 -36.236225 -v -138.362045 -98.094490 -36.396534 -v -138.029099 -97.802071 -36.348225 -v -137.571060 -97.682137 -36.249378 -v -135.475388 -99.679268 -41.435295 -v -136.668716 -98.967903 -35.880146 -v -136.630203 -98.490852 -35.925407 -v -134.529953 -99.356941 -51.351433 -v -134.077255 -99.235115 -51.231987 -v -133.740829 -99.294319 -51.131798 -v -133.639267 -99.339851 -51.099449 -v -133.412125 -99.506477 -51.022087 -v -136.810043 -98.061104 -36.018852 -v -133.320084 -99.612862 -50.987785 -v -133.181595 -100.550911 -50.876762 -v -133.172165 -100.522408 -50.876274 -v -133.138199 -100.043587 -50.903191 -v -133.186508 -99.860359 -50.930901 -v -132.991928 -100.593330 -51.478935 -v -133.096237 -100.579292 -51.158562 -v -133.138962 -100.565193 -51.017693 -v -132.981735 -100.333076 -51.341576 -v -133.594254 -99.320992 -51.591423 -v -133.267258 -99.532845 -51.476311 -v -134.014542 -99.267525 -51.727196 -v -134.421524 -99.412727 -51.847710 -v -134.709549 -99.696846 -51.922905 -v -133.041550 -99.886665 -51.385338 -v -146.853165 -55.961731 -48.818680 -v -146.160263 -54.851135 -49.723892 -v -148.108658 -54.573547 -51.158554 -v -148.661911 -55.460327 -50.446548 -v -149.132950 -56.215332 -49.670486 -v -147.493759 -56.988403 -47.604630 -v -149.164871 -56.266724 -49.611801 -v -147.605789 -57.168213 -47.343307 -v -149.984268 -57.669128 -47.676041 -v -150.542099 -58.736572 -45.454967 -v -148.102005 -57.994446 -45.875744 -v -148.003769 -57.825745 -46.219620 -v -151.859207 -61.801456 -33.251720 -v -148.727554 -59.138123 -42.017559 -v -150.865280 -59.407104 -43.038525 -v -148.496597 -58.701050 -43.932171 -v -148.430283 -58.578918 -44.362194 -v -152.524094 -63.846195 -25.207441 -v -150.716110 -64.075439 -21.214552 -v -149.908340 -61.734623 -30.874434 -v -152.648331 -64.293518 -23.470564 -v -153.214920 -66.830505 -13.685593 -v -151.265579 -66.238403 -12.385818 -v -151.832809 -70.455872 -9.358566 -v -151.809433 -70.094482 -9.359085 -v -153.651627 -70.779846 -11.158554 -v -136.587845 -97.167915 -9.612143 -v -137.717361 -96.553474 -9.359335 -v -139.062668 -97.851570 -11.158560 -v -138.210312 -98.341805 -11.184439 -v -138.197586 -98.348885 -11.185965 -v -136.220505 -97.353645 -9.791464 -v -137.391922 -98.778450 -11.381613 -v -135.559067 -97.671394 -10.251913 -v -136.975540 -98.988411 -11.580191 -v -134.984695 -97.930367 -10.846457 -v -136.571182 -99.184578 -11.875204 -v -134.731583 -98.039680 -11.200918 -v -139.937180 -95.137764 -9.358572 -v -140.236557 -97.113167 -11.158560 -v -139.359268 -97.672066 -11.158560 -v -145.675583 -89.743416 -9.358570 -v -146.981796 -90.991096 -11.158558 -v -144.982864 -90.573616 -9.358570 -v -145.535110 -92.646980 -11.158558 -v -142.015457 -93.521187 -9.358570 -v -144.268845 -93.915474 -11.158558 -v -141.394150 -94.037605 -9.358572 -v -142.948166 -95.089973 -11.158558 -v -141.564041 -96.182137 -11.158560 -v -153.232803 -66.931824 -13.295303 -v -151.873428 -72.726501 -9.358566 -v -151.376480 -66.787476 -11.200912 -v -153.280869 -67.214844 -12.416855 -v -151.435623 -67.106018 -10.791794 -v -153.302109 -67.345459 -12.217697 -v -151.532639 -67.679688 -10.251907 -v -153.424637 -68.185425 -11.546738 -v -151.673538 -68.685120 -9.663376 -v -153.563919 -69.453247 -11.190109 -v -153.602310 -69.930725 -11.159409 -v -153.650314 -73.440796 -11.158554 -v -153.531998 -75.076233 -11.158554 -v -151.681168 -75.442322 -9.358566 -v -153.365921 -76.428528 -11.158556 -v -151.265701 -77.951424 -9.358568 -v -135.805557 -99.535774 -13.634422 -v -134.214035 -98.254097 -12.385824 -v -136.173355 -99.370308 -12.371298 -v -136.222488 -99.347725 -12.288260 -v -152.942123 -78.710091 -11.158556 -v -152.363571 -80.886299 -11.158556 -v -150.652878 -80.325264 -9.358568 -v -152.188248 -81.439217 -11.158556 -v -149.698257 -82.972542 -9.358568 -v -151.314896 -83.771614 -11.158556 -v -148.780258 -84.949959 -9.358568 -v -150.171616 -86.174446 -11.158556 -v -147.902664 -86.535652 -9.358568 -v -148.819778 -88.466377 -11.158558 -v -147.695267 -90.075569 -11.158558 -v -131.894516 -99.072456 -22.108328 -v -122.772690 -102.143867 -51.158562 -v -121.885818 -100.373116 -49.740532 -v -123.825516 -102.107796 -50.440147 -v -122.926041 -100.337532 -49.060356 -v -124.706650 -102.077644 -49.670494 -v -123.863022 -100.305489 -48.229362 -v -124.775558 -102.075203 -49.603508 -v -126.396317 -101.972054 -47.663994 -v -124.645096 -100.278694 -47.343285 -v -125.393448 -100.243111 -46.252220 -v -127.591751 -101.839180 -45.438988 -v -126.404190 -100.163399 -43.965965 -v -128.326981 -101.733223 -43.019096 -v -127.026840 -100.095955 -41.538353 -v -130.871292 -101.220711 -33.221699 -v -129.480972 -99.692268 -31.822744 -v -132.931259 -100.633369 -25.207479 -v -133.382034 -100.483284 -23.429983 -v -141.303574 -47.104492 -51.158554 -v -143.219803 -47.100159 -52.958538 -v -144.942276 -49.858948 -52.948742 -v -121.378281 -102.113411 -51.886436 -v -120.432327 -100.422920 -50.416100 -v -119.403763 -102.106697 -52.578148 -v -119.442886 -100.456734 -50.748863 -v -118.204941 -100.499153 -51.034508 -v -117.951523 -102.125008 -52.869652 -v -117.364243 -100.527901 -51.138329 -v -117.421585 -102.136971 -52.927513 -v -116.835098 -100.546028 -51.158592 -v -113.857895 -102.255623 -52.958549 -v -112.873917 -100.668098 -51.158562 -v -112.807602 -102.229622 -52.958549 -v -111.675034 -102.058968 -52.958549 -v -110.936295 -100.341072 -51.158562 -v -106.986008 -99.002144 -52.958549 -v -107.279465 -97.213203 -51.158562 -v -107.707352 -99.844490 -52.958549 -v -108.285049 -98.599434 -51.158562 -v -108.145126 -100.265388 -52.958549 -v -108.679123 -99.000862 -51.158562 -v -108.364120 -100.454414 -52.958549 -v -109.493149 -99.649971 -51.158562 -v -109.256332 -101.096382 -52.958549 -v -110.483963 -100.174812 -51.158562 -v -110.678696 -101.773933 -52.958549 -v -111.122116 -101.917610 -52.958549 -v -106.594681 -98.447762 -52.958549 -v -106.117355 -97.653206 -52.958549 -v -106.610397 -95.878304 -51.158562 -v -106.064407 -97.555611 -52.958549 -v -105.924820 -97.288216 -52.958549 -v -106.214798 -94.847664 -51.158562 -v -104.927994 -94.800728 -52.958549 -v -106.059189 -94.371773 -51.158562 -v -104.312820 -92.723396 -52.958549 -v -105.172714 -91.286934 -51.158562 -v -104.005722 -91.586800 -52.958549 -v -104.678421 -89.273750 -51.158562 -v -103.049637 -87.321175 -52.958549 -v -102.823318 -86.022346 -52.958549 -v -103.869095 -85.004280 -51.158562 -v -102.728439 -85.414986 -52.958549 -v -103.542099 -82.323189 -51.158562 -v -102.282639 -81.348213 -52.958549 -v -102.198563 -79.593452 -52.958549 -v -103.346909 -78.610909 -51.158562 -v -103.374588 -76.708435 -51.158562 -v -102.261887 -75.822815 -52.958546 -v -103.448044 -75.403748 -51.158558 -v -102.648605 -72.346130 -52.958546 -v -103.942581 -71.586731 -51.158558 -v -102.789139 -71.536072 -52.958546 -v -102.968460 -70.640076 -52.958546 -v -104.519943 -69.084412 -51.158558 -v -103.367630 -68.989563 -52.958546 -v -105.212296 -66.897095 -51.158558 -v -104.106522 -66.627441 -52.958546 -v -105.535782 -66.041016 -51.158558 -v -104.444778 -65.725769 -52.958546 -v -105.879593 -62.613220 -52.958542 -v -107.313950 -62.351318 -51.158554 -v -106.159531 -62.099976 -52.958542 -v -106.723495 -61.132812 -52.958542 -v -108.550491 -60.388733 -51.158554 -v -107.460159 -59.982117 -52.958542 -v -110.175461 -58.246948 -51.158554 -v -108.942764 -57.963013 -52.958542 -v -110.511978 -57.849915 -51.158554 -v -109.944351 -56.770996 -52.958542 -v -112.153366 -54.500793 -52.958542 -v -112.729813 -55.531250 -51.158554 -v -113.698715 -54.650208 -51.158554 -v -112.451248 -54.225464 -52.958542 -v -115.162247 -53.438721 -51.158554 -v -123.368179 -47.121521 -52.958542 -v -123.367935 -48.436951 -51.158554 -v -122.833328 -48.694580 -51.158554 -v -113.610458 -53.211853 -52.958542 -v -116.679184 -50.895203 -52.958542 -v -117.768936 -51.567322 -51.158554 -v -117.575577 -50.300842 -52.958542 -v -117.894974 -51.484680 -51.158554 -v -118.058243 -49.993958 -52.958542 -v -120.514389 -49.905151 -51.158554 -v -120.529739 -48.551208 -52.958542 -v -121.618698 -47.976501 -52.958542 -v -123.599777 -47.014221 -52.958542 -v -126.760513 -45.672913 -52.958542 -v -126.964066 -46.883606 -51.158554 -v -127.265640 -45.478210 -52.958542 -v -129.310501 -46.016113 -51.158554 -v -129.991287 -44.510376 -52.958542 -v -130.341415 -44.395630 -52.958542 -v -131.830368 -45.193359 -51.158554 -v -133.341568 -43.530396 -52.958542 -v -133.923904 -44.651978 -51.158554 -v -134.001694 -43.401489 -52.958542 -v -134.978775 -43.267944 -52.958542 -v -136.126907 -43.209656 -52.958542 -v -135.285751 -44.474121 -51.158554 -v -136.689651 -43.225342 -52.958542 -v -137.526749 -43.310059 -52.958542 -v -137.116776 -44.534485 -51.158554 -v -138.388504 -43.482422 -52.958542 -v -137.605667 -44.625549 -51.158554 -v -139.293137 -43.770203 -52.958542 -v -138.660385 -44.958923 -51.158554 -v -140.184616 -44.185364 -52.958542 -v -139.603958 -45.466309 -51.158554 -v -140.034409 -45.778809 -51.158554 -v -141.393631 -45.008545 -52.958542 -v -142.356888 -45.942505 -52.958538 -v -142.620163 -46.255676 -52.958538 -v -143.743729 -50.977844 -51.139233 -v -143.469345 -50.538086 -51.158550 -v -142.894455 -49.616699 -51.158550 -v -145.403671 -50.582581 -52.869549 -v -146.466965 -52.200378 -52.440258 -v -144.859238 -52.765869 -50.744003 -v -147.231369 -53.325439 -51.943192 -v -145.498795 -53.790894 -50.323044 -v -145.910599 -54.450989 -49.972733 -v -137.167755 -68.289047 -121.158546 -v -135.183136 -69.655319 -121.158546 -v -145.581421 -68.021591 -121.158546 -v -132.527374 -92.488457 -121.158554 -v -133.731598 -92.447197 -121.158554 -v -133.285736 -71.140121 -121.158554 -v -148.132690 -72.110886 -121.158554 -v -141.524567 -66.282211 -121.158546 -v -140.371674 -66.628586 -121.158546 -v -139.265289 -67.105270 -121.158546 -v -131.629425 -72.886398 -121.158554 -v -130.272919 -74.875534 -121.158569 -v -129.216125 -77.039108 -121.158569 -v -128.070343 -84.128288 -121.158569 -v -132.055603 -92.504509 -121.158554 -v -128.135742 -86.536430 -121.158569 -v -128.482117 -88.918938 -121.158569 -v -128.492859 -79.335381 -121.158569 -v -128.172882 -81.720879 -121.158569 -v -149.215240 -74.260117 -121.158554 -v -148.283722 -85.859612 -121.158554 -v -149.319031 -83.687126 -121.158554 -v -144.886963 -67.040146 -121.158546 -v -143.897430 -66.369003 -121.158546 -v -142.719513 -66.149399 -121.158546 -v -130.220490 -91.999138 -121.158569 -v -131.325775 -92.454948 -121.158554 -v -129.386841 -91.138237 -121.158569 -v -128.834961 -90.070000 -121.158569 -v -136.140106 -92.364738 -121.158554 -v -137.367859 -92.322807 -121.158554 -v -138.545227 -92.229668 -121.158554 -v -140.896515 -91.716972 -121.158554 -v -143.115997 -90.786430 -121.158554 -v -145.129944 -89.469109 -121.158554 -v -146.871857 -87.808342 -121.158554 -v -149.943390 -81.362846 -121.158554 -v -150.136047 -78.964043 -121.158554 -v -149.890717 -76.570053 -121.158554 -v -149.637268 -70.517685 -118.158554 -v -146.672363 -65.765671 -118.158546 -v -146.581512 -65.626633 -118.158546 -v -146.230713 -65.165024 -118.158546 -v -145.621155 -64.557358 -118.158546 -v -145.114166 -64.182358 -118.158546 -v -144.397583 -63.805775 -118.158546 -v -143.766907 -63.596668 -118.158546 -v -143.002655 -63.461292 -118.158546 -v -141.563568 -63.473072 -118.158546 -v -140.859039 -63.583607 -118.158546 -v -140.151337 -63.754810 -118.158546 -v -138.790375 -64.228683 -118.158546 -v -137.309753 -64.928452 -118.158546 -v -136.225677 -65.540878 -118.158546 -v -136.015106 -65.667953 -118.158546 -v -133.806061 -67.108566 -118.158546 -v -132.329956 -68.188828 -118.158546 -v -131.514404 -68.856613 -118.158546 -v -131.195160 -69.137253 -118.158546 -v -129.485352 -70.900803 -118.158569 -v -128.305023 -72.465378 -118.158569 -v -127.809685 -73.243881 -118.158569 -v -127.533562 -73.719101 -118.158569 -v -126.525749 -75.822433 -118.158569 -v -126.307274 -76.395676 -118.158569 -v -125.680656 -78.575737 -118.158569 -v -125.551903 -79.242180 -118.158569 -v -125.306877 -81.432243 -118.158569 -v -125.263298 -82.187370 -118.158569 -v -125.204033 -84.313652 -118.158569 -v -125.214012 -85.159904 -118.158569 -v -125.883476 -90.021355 -118.158569 -v -125.471611 -88.138176 -118.158569 -v -125.346062 -87.192131 -118.158569 -v -126.238274 -91.046989 -118.158569 -v -126.379143 -91.374077 -118.158569 -v -126.884026 -92.307121 -118.158569 -v -127.099297 -92.620049 -118.158569 -v -127.302208 -92.879143 -118.158569 -v -128.101135 -93.650444 -118.158569 -v -128.964783 -94.178093 -118.158569 -v -129.359314 -94.343193 -118.158569 -v -129.625183 -94.432549 -118.158569 -v -130.764557 -94.643181 -118.158569 -v -132.205536 -94.622734 -118.158554 -v -135.087372 -94.524162 -118.158554 -v -135.712738 -94.502800 -118.158554 -v -137.966980 -94.388054 -118.158554 -v -138.417877 -94.334526 -118.158554 -v -139.795349 -94.087822 -118.158554 -v -140.791718 -93.828423 -118.158554 -v -143.466095 -92.761223 -118.158554 -v -145.056366 -91.828056 -118.158554 -v -145.900024 -91.222527 -118.158554 -v -148.011169 -89.264091 -118.158554 -v -149.727966 -86.952568 -118.158554 -v -150.992737 -84.365593 -118.158554 -v -151.762482 -81.591057 -118.158554 -v -152.011353 -78.722099 -118.158554 -v -151.730865 -75.856613 -118.158554 -v -150.310425 -71.710129 -118.158554 -v -150.930206 -73.090500 -118.158554 -v -149.132950 -56.215332 -51.158554 -v -152.144669 -63.483154 -55.268692 -v -151.527328 -60.934814 -51.158554 -v -152.166489 -63.418579 -54.643570 -v -152.232620 -63.425781 -53.703079 -v -152.422806 -63.499939 -51.158554 -v -152.477737 -63.824402 -51.799515 -v -152.524063 -63.846130 -51.158554 -v -152.525009 -63.919067 -51.479172 -v -152.571396 -64.013428 -51.158554 -v -130.282516 -101.359749 -51.158562 -v -132.582840 -100.637886 -52.774040 -v -132.907364 -100.641060 -51.158562 -v -132.931198 -100.633369 -51.158562 -v -150.420151 -58.494080 -51.158554 -v -150.422684 -58.499084 -51.158554 -v -127.644241 -101.832222 -51.158562 -v -127.315903 -101.874153 -51.158562 -v -124.706650 -102.077644 -51.158562 -v -152.878311 -65.569092 -52.735001 -v -152.913773 -65.660522 -52.463058 -v -152.583694 -65.687317 -52.424820 -v -152.826645 -65.451477 -53.179428 -v -152.763718 -65.347466 -53.862076 -v -152.414688 -65.375053 -53.848679 -v -151.909195 -63.593201 -53.675003 -v -151.640976 -63.906433 -53.676132 -v -151.523941 -64.273552 -53.693710 -v -151.550827 -64.644279 -53.723404 -v -151.732590 -65.005913 -53.765152 -v -152.048203 -65.266655 -53.810471 -v -152.128647 -63.992737 -51.804947 -v -151.853775 -64.294373 -51.864578 -v -151.727737 -64.645874 -51.961716 -v -151.744583 -64.999268 -52.079880 -v -151.915634 -65.342346 -52.216629 -v -152.222366 -65.587769 -52.340714 -v -153.561996 -69.431641 -51.158554 -v -138.145309 -98.377693 -51.158562 -v -142.359116 -93.622368 -111.153152 -v -134.498337 -99.922180 -53.881157 -v -139.948135 -97.301643 -51.158562 -v -142.912399 -95.119881 -51.158558 -v -144.790298 -93.411324 -51.158558 -v -146.967056 -91.009102 -51.158558 -v -148.649887 -88.724434 -51.158558 -v -150.159134 -86.197762 -51.158554 -v -151.419357 -83.521370 -51.158554 -v -152.370346 -80.864021 -51.158554 -v -153.151962 -77.701721 -51.158554 -v -153.674820 -71.512207 -51.158554 -v -153.518845 -75.205444 -51.158554 -v -153.062912 -66.039368 -51.158554 -v -153.048538 -66.003906 -51.298782 -v -153.034042 -65.968445 -51.438950 -v -151.984726 -75.443100 -110.999649 -v -153.116440 -66.304993 -42.181015 -v -152.595444 -64.099854 -50.876968 -v -152.445145 -64.152283 -50.877304 -v -153.674973 -71.520569 -29.046249 -v -153.655502 -73.319580 -21.242844 -v -153.513443 -73.306335 -21.239792 -v -153.590347 -69.771362 -36.376450 -v -153.333298 -69.764404 -36.363815 -v -153.592972 -69.805420 -36.236191 -v -152.668808 -65.982666 -51.408218 -v -153.485519 -68.681335 -32.387711 -v -153.378830 -67.852112 -35.853683 -v -153.106430 -67.925903 -35.862045 -v -153.569321 -69.515808 -28.847885 -v -152.282639 -65.843201 -51.332687 -v -152.945755 -69.619568 -36.308823 -v -151.979752 -65.541443 -51.219925 -v -152.641495 -69.313171 -36.214035 -v -151.845749 -65.155212 -51.099625 -v -152.506577 -68.924072 -36.104202 -v -151.881760 -64.776245 -50.997543 -v -152.749313 -68.179932 -35.915115 -v -152.088760 -64.410156 -50.915237 -v -152.542191 -68.544495 -36.004044 -v -153.413284 -73.284790 -21.234604 -v -153.125504 -73.157166 -21.203262 -v -153.018692 -73.077637 -21.183517 -v -152.820724 -72.846497 -21.126053 -v -152.751633 -72.711182 -21.092270 -v -152.685318 -72.454468 -21.028091 -v -152.680740 -72.299316 -20.989212 -v -152.720566 -72.073669 -20.932571 -v -152.792007 -71.901978 -20.889389 -v -152.927475 -71.709656 -20.840927 -v -153.093094 -71.563416 -20.803909 -v -153.284622 -71.458008 -20.777084 -v -153.510117 -71.393372 -20.760391 -v -153.671951 -71.379456 -20.756577 -v -153.484177 -75.521667 -19.138931 -v -153.569595 -74.669312 -19.537491 -v -153.651657 -73.411621 -21.055618 -v -153.621780 -73.975342 -20.127914 -v -153.354507 -76.508972 -18.976089 -v -152.845566 -79.123604 -18.975876 -v -152.370377 -80.864021 -18.974747 -v -151.985031 -82.037666 -18.973312 -v -151.538864 -83.226631 -18.975235 -v -143.104996 -94.957466 -19.161854 -v -143.776199 -94.370613 -18.984821 -v -144.323654 -93.863777 -18.977009 -v -145.300461 -92.893684 -18.976978 -v -147.243759 -90.663277 -18.974934 -v -148.748123 -88.575935 -18.978716 -v -150.159134 -86.197762 -18.946062 -v -150.946396 -84.607918 -18.980637 -v -141.475723 -96.247261 -21.129749 -v -141.638809 -96.126411 -20.741444 -v -141.575424 -96.173714 -20.859791 -v -141.533127 -96.204964 -20.962177 -v -141.674759 -96.099739 -20.589832 -v -141.801010 -96.004402 -20.353107 -v -142.389694 -95.546577 -19.629932 -v -141.469589 -96.251778 -21.145954 -v -153.107925 -71.695190 -20.323196 -v -152.815475 -72.058716 -20.374680 -v -152.707596 -72.466064 -20.488235 -v -149.898819 -86.059151 -18.901598 -v -153.672195 -71.389221 -20.695267 -v -153.513199 -71.491394 -20.355667 -v -153.678055 -71.713135 -19.808975 -v -153.679489 -72.339600 -18.873276 -v -153.502609 -72.042053 -19.295914 -v -153.482071 -72.652405 -18.552902 -v -153.443985 -73.377625 -17.947006 -v -153.661148 -73.167114 -18.080978 -v -153.379135 -74.248901 -17.448746 -v -153.609238 -74.161499 -17.469406 -v -153.285538 -75.189026 -17.116806 -v -153.509354 -75.295227 -17.067764 -v -153.148941 -76.257568 -16.953384 -v -153.407761 -76.130493 -16.934677 -v -153.000809 -77.197266 -16.946426 -v -153.087692 -78.029427 -16.916672 -v -152.484451 -79.583321 -16.945969 -v -152.366043 -80.878181 -16.917465 -v -151.307480 -83.165169 -16.946823 -v -151.362534 -83.658333 -16.914536 -v -149.739853 -85.974434 -17.066088 -v -150.159134 -86.197762 -16.946062 -v -151.350052 -83.199287 -18.955215 -v -152.529404 -79.624458 -18.955704 -v -153.048019 -77.246826 -18.955063 -v -153.270248 -75.735962 -19.050980 -v -153.420578 -73.395874 -20.991165 -v -149.535019 -85.865364 -18.653154 -v -149.371811 -85.778389 -18.398027 -v -149.998428 -84.588509 -18.399734 -v -149.337112 -85.759956 -18.310257 -v -149.897934 -84.567207 -17.967148 -v -149.276962 -85.727913 -17.978472 -v -149.283005 -85.731148 -17.824846 -v -149.344772 -85.764046 -17.560503 -v -149.979263 -84.574715 -17.536301 -v -149.427322 -85.808052 -17.386980 -v -153.036819 -73.219666 -20.832657 -v -153.413132 -73.728149 -20.379013 -v -153.027206 -73.593201 -20.192886 -v -152.776840 -72.873474 -20.646805 -v -150.290359 -84.639290 -18.769424 -v -149.636887 -85.919624 -18.752214 -v -150.945602 -83.138680 -18.765366 -v -152.119949 -79.616463 -18.765427 -v -152.639847 -77.269592 -18.764481 -v -152.870651 -75.732300 -18.841537 -v -153.332016 -75.130432 -19.254684 -v -152.765335 -73.301575 -19.935410 -v -153.013229 -74.014954 -19.721664 -v -153.400162 -74.112671 -19.933456 -v -152.717300 -74.321106 -19.005417 -v -152.642044 -74.076294 -18.644577 -v -152.694992 -72.945740 -19.684250 -v -153.374893 -74.570862 -19.563004 -v -152.937515 -75.097900 -19.038132 -v -152.590530 -75.666016 -18.468491 -v -152.346359 -77.279907 -18.396042 -v -151.825821 -79.606026 -18.397079 -v -150.655289 -83.092049 -18.397476 -v -152.984634 -74.505981 -19.346420 -v -152.596024 -75.432129 -17.640945 -v -152.683823 -74.595337 -17.902237 -v -152.745834 -73.810791 -18.313919 -v -150.555283 -83.071663 -17.967026 -v -151.724228 -79.596321 -17.966232 -v -152.244614 -77.275513 -17.965347 -v -152.502762 -75.559631 -18.047867 -v -152.802597 -72.580322 -19.471848 -v -152.783798 -73.151306 -18.820602 -v -150.253281 -84.613228 -17.153824 -v -150.908401 -83.110909 -17.157700 -v -150.636032 -83.077217 -17.538315 -v -152.080826 -79.583504 -17.156662 -v -151.805557 -79.588448 -17.537277 -v -152.598923 -77.230225 -17.156601 -v -152.325119 -77.258728 -17.536728 -v -149.584885 -85.891975 -17.186663 -v -153.095779 -72.243713 -19.325272 -v -153.075729 -72.846313 -18.615952 -v -153.036819 -73.551147 -18.052383 -v -152.972153 -74.392639 -17.592148 -v -152.879776 -75.294861 -17.293076 -v -152.746445 -76.314636 -17.157425 -v -143.045090 -95.007515 -17.047016 -v -142.818863 -94.907051 -17.105579 -v -142.066147 -95.531380 -17.441425 -v -149.427353 -87.123299 -18.963366 -v -148.222977 -89.020699 -18.961351 -v -144.230637 -93.695503 -18.962605 -v -141.432999 -96.240730 -21.189991 -v -141.458237 -96.217232 -21.121906 -v -141.515884 -96.173775 -20.953632 -v -141.858597 -95.687752 -20.046009 -v -141.551407 -95.909554 -20.530781 -v -141.233932 -95.657906 -20.340656 -v -145.519852 -92.663216 -16.915119 -v -146.981766 -90.991035 -16.916340 -v -146.910721 -90.716988 -16.951374 -v -147.373154 -90.497810 -16.917345 -v -144.007095 -94.159126 -16.915119 -v -144.213150 -93.967781 -16.915150 -v -144.266373 -93.603157 -16.949940 -v -144.222427 -93.959053 -16.915150 -v -144.227036 -93.954781 -16.915150 -v -144.280563 -93.904305 -16.915180 -v -142.151627 -95.734505 -17.435413 -v -141.356094 -96.089851 -17.954700 -v -141.277664 -96.392159 -18.101704 -v -140.742538 -96.550484 -18.604023 -v -140.616959 -96.858406 -18.885487 -v -140.225235 -96.921333 -19.411549 -v -140.063705 -97.227364 -19.895496 -v -139.960281 -97.113167 -19.978870 -v -141.403152 -96.011299 -20.886555 -v -146.878433 -90.822029 -18.961384 -v -146.636215 -90.489204 -18.783619 -v -147.956528 -88.706429 -18.783831 -v -146.468216 -90.240913 -18.422657 -v -147.770981 -88.470222 -18.423052 -v -146.419083 -90.144417 -17.991932 -v -147.715775 -88.376350 -17.992449 -v -146.481125 -90.194649 -17.560535 -v -147.782608 -88.420418 -17.561052 -v -146.659378 -90.401436 -17.172169 -v -147.977158 -88.612068 -17.172625 -v -148.252426 -88.907295 -16.951616 -v -148.874527 -88.381905 -16.912859 -v -149.142258 -86.823433 -18.786119 -v -141.574936 -95.411934 -19.831654 -v -142.235519 -95.405891 -19.633656 -v -143.162491 -94.658760 -19.076008 -v -142.451614 -94.734077 -19.086964 -v -142.952011 -94.317024 -18.873859 -v -141.694687 -94.975349 -19.066975 -v -142.762558 -94.103584 -18.500233 -v -140.853745 -95.597603 -20.075031 -v -141.979233 -95.107185 -19.416920 -v -142.682877 -95.055183 -19.299824 -v -148.943649 -86.595833 -18.425127 -v -148.884445 -86.502449 -17.993914 -v -144.035782 -93.332039 -18.784290 -v -143.901779 -93.063423 -18.422626 -v -143.864182 -92.962349 -17.991261 -v -142.647720 -94.073555 -18.071644 -v -143.916367 -93.022469 -17.559376 -v -140.523788 -95.736397 -19.814350 -v -140.961899 -95.421516 -19.182240 -v -141.465408 -95.039742 -18.691578 -v -142.042923 -94.580940 -18.309528 -v -148.955826 -86.539803 -17.561663 -v -144.062271 -93.254097 -17.170704 -v -142.614487 -94.208687 -17.654987 -v -141.950333 -94.764839 -17.921589 -v -141.316818 -95.267281 -18.346546 -v -140.763962 -95.685921 -18.892262 -v -140.284195 -96.030281 -19.594654 -v -149.163834 -86.717598 -17.172136 -v -142.674515 -94.511971 -17.293842 -v -141.955215 -95.111824 -17.596546 -v -141.272202 -95.651558 -18.070087 -v -140.678146 -96.099800 -18.674610 -v -140.168503 -96.465218 -19.442371 -v -139.913773 -96.653267 -19.957203 -v -149.458237 -86.995308 -16.950243 -v -153.448990 -68.375549 -12.422562 -v -152.583450 -64.056641 -51.017776 -v -137.014786 -98.968941 -12.410177 -v 126.434456 -85.511650 -121.158585 -v 126.519859 -83.103752 -121.158585 -v 130.731140 -92.750420 -121.158585 -v 144.347015 -68.591782 -121.158577 -v 144.959503 -69.629440 -121.158577 -v 126.752144 -80.705620 -121.158585 -v 135.550735 -92.703972 -121.158585 -v 127.083839 -90.264275 -121.158585 -v 126.756248 -89.105888 -121.158585 -v 126.563591 -87.916679 -121.158585 -v 127.334480 -78.370354 -121.158585 -v 128.282822 -76.157211 -121.158585 -v 129.539246 -74.103256 -121.158585 -v 134.901550 -69.326706 -121.158577 -v 144.107071 -68.185287 -121.158577 -v 136.967453 -68.087570 -121.158577 -v 139.162750 -67.099045 -121.158577 -v 131.086914 -72.259140 -121.158585 -v 132.926529 -70.707138 -121.158585 -v 137.945023 -92.461662 -121.158585 -v 147.225891 -85.441643 -121.158585 -v 145.950317 -87.482353 -121.158585 -v 129.530197 -92.692375 -121.158585 -v 128.432388 -92.218620 -121.158585 -v 127.614052 -91.343376 -121.158585 -v 142.694534 -66.909409 -121.158577 -v 143.672974 -67.596542 -121.158577 -v 141.520401 -66.669174 -121.158577 -v 140.323013 -66.777939 -121.158577 -v 146.184525 -71.704758 -121.158585 -v 146.809067 -72.762680 -121.158585 -v 147.363327 -73.805588 -121.158585 -v 148.194733 -76.063950 -121.158585 -v 148.602997 -78.435661 -121.158585 -v 148.574554 -80.842033 -121.158585 -v 148.110352 -83.203606 -121.158585 -v 144.325912 -89.258110 -121.158585 -v 142.406586 -90.709892 -121.158585 -v 140.255951 -91.789665 -121.158585 -v 135.015900 -94.829033 -118.158585 -v 129.415085 -94.882927 -118.158585 -v 129.249008 -94.881035 -118.158585 -v 128.671173 -94.833366 -118.158585 -v 127.831139 -94.645927 -118.158585 -v 127.242424 -94.419975 -118.158585 -v 126.539711 -94.018059 -118.158585 -v 126.024406 -93.598625 -118.158585 -v 125.499458 -93.026970 -118.158585 -v 124.735893 -91.807060 -118.158585 -v 124.450417 -91.153557 -118.158585 -v 124.214470 -90.464714 -118.158585 -v 123.882561 -89.062309 -118.158585 -v 123.676842 -87.437675 -118.158585 -v 123.610588 -86.194328 -118.158585 -v 123.604607 -85.948418 -118.158585 -v 123.632103 -83.311272 -118.158585 -v 123.749687 -81.485954 -118.158585 -v 123.874458 -80.439323 -118.158585 -v 123.939552 -80.019218 -118.158585 -v 124.507729 -77.629501 -118.158585 -v 125.192680 -75.793259 -118.158585 -v 125.582909 -74.957077 -118.158585 -v 125.835274 -74.468796 -118.158585 -v 127.067238 -72.488449 -118.158585 -v 127.433250 -71.996140 -118.158585 -v 128.934860 -70.295944 -118.158585 -v 129.427643 -69.829208 -118.158577 -v 131.142761 -68.445480 -118.158577 -v 131.756119 -68.002853 -118.158577 -v 133.517258 -66.810043 -118.158577 -v 134.236313 -66.363571 -118.158577 -v 138.695633 -64.315170 -118.158577 -v 136.886261 -64.980026 -118.158577 -v 136.020950 -65.382614 -118.158577 -v 140.704971 -94.012383 -111.583817 -v 140.889633 -93.918022 -111.791702 -v 136.209564 -98.722420 -51.158585 -v 150.554886 -75.797592 -110.416092 -v 151.776596 -66.377563 -52.463543 -v 151.889999 -66.688843 -51.439159 -v 152.332886 -70.163940 -51.158581 -v 150.587601 -76.272690 -111.152756 -v 151.903671 -66.724609 -51.298901 -v 151.917267 -66.760376 -51.158581 -v 151.675095 -66.258415 -53.881176 -v 151.571381 -66.147209 -55.298809 -v 151.576019 -66.095757 -55.014324 -v 151.591644 -66.048820 -54.554516 -v 151.633270 -66.060295 -53.862530 -v 150.677002 -78.725334 -112.801102 -v 150.675110 -78.108330 -112.643387 -v 152.394424 -72.262573 -51.158581 -v 150.661743 -77.642929 -112.458633 -v 150.611145 -76.742477 -111.889359 -v 150.566589 -76.132370 -111.207687 -v 150.647476 -79.576775 -112.870804 -v 152.147842 -75.934937 -51.158581 -v 150.614807 -80.034111 -112.870560 -v 150.574524 -80.446953 -112.870560 -v 151.716400 -78.436836 -51.158585 -v 150.279922 -82.231621 -112.870438 -v 150.860657 -81.563606 -51.158585 -v 149.847580 -83.816277 -112.870407 -v 149.657379 -84.366753 -112.870407 -v 149.838486 -84.210640 -51.158585 -v 149.244293 -85.392265 -112.870407 -v 148.761826 -86.393913 -112.870407 -v 148.519058 -86.841377 -51.158585 -v 148.503616 -86.868706 -112.870407 -v 146.939407 -89.342659 -51.158585 -v 147.608795 -88.283012 -112.870407 -v 145.209717 -91.572884 -51.158585 -v 146.582703 -89.595573 -112.870407 -v 142.963120 -93.931587 -51.158585 -v 145.395294 -90.834343 -112.870438 -v 146.201660 -90.021233 -112.870407 -v 141.416412 -93.642998 -112.236404 -v 142.339874 -93.122917 -112.699203 -v 138.024704 -97.699348 -51.158585 -v 143.206787 -92.575737 -112.866959 -v 141.055237 -95.582710 -51.158585 -v 144.071915 -91.957512 -112.870560 -v 144.572815 -91.559807 -112.870529 -v 141.132431 -93.792595 -112.018814 -v 133.080673 -100.124886 -51.158585 -v 133.043091 -100.131783 -51.298813 -v 133.005402 -100.138618 -51.438980 -v 132.681091 -100.202705 -52.463089 -v 132.584915 -100.221992 -52.735031 -v 140.433868 -94.151360 -111.187515 -v 140.431183 -94.161247 -110.999680 -v 140.255371 -94.246513 -110.799606 -v 140.153091 -94.308403 -110.415543 -v 136.278610 -97.240112 -82.856339 -v 132.457962 -100.241585 -53.179459 -v 132.379959 -100.147034 -55.298233 -v 132.336426 -100.244446 -53.862106 -v 151.446533 -73.433777 -21.095074 -v 151.530457 -73.596375 -21.135082 -v 151.438156 -70.059387 -36.225079 -v 152.337769 -70.243042 -28.870220 -v 152.394897 -72.113831 -20.756603 -v 152.128983 -72.143921 -20.766308 -v 152.354645 -70.538391 -36.236248 -v 152.352859 -70.504150 -36.377026 -v 152.211090 -70.504822 -36.372173 -v 152.209442 -68.761597 -43.410351 -v 151.639771 -66.706482 -51.422039 -v 152.330795 -74.053040 -21.242870 -v 151.995132 -67.211182 -41.442116 -v 152.188553 -68.580383 -35.853920 -v 152.037430 -68.607422 -35.855873 -v 152.299774 -69.706116 -31.148966 -v 151.785507 -70.381226 -36.323895 -v 151.710709 -73.804810 -21.185833 -v 151.878159 -73.923035 -21.214031 -v 152.304001 -74.051392 -21.242657 -v 151.382126 -73.164062 -21.028057 -v 151.290222 -69.630493 -36.104534 -v 151.380737 -73.018372 -20.991528 -v 151.348694 -69.213989 -35.994579 -v 151.440369 -72.746338 -20.922924 -v 151.498093 -72.622192 -20.891369 -v 151.614441 -68.831360 -35.901104 -v 151.705994 -72.364624 -20.825115 -v 151.805481 -72.287720 -20.805035 -v 150.869385 -66.272583 -51.232006 -v 151.215454 -66.588867 -51.351452 -v 150.738495 -65.957031 -51.131817 -v 150.722244 -65.846985 -51.099468 -v 150.740753 -65.565857 -51.022106 -v 150.780991 -65.431030 -50.987804 -v 151.497620 -64.810059 -50.876781 -v 151.468445 -64.817444 -50.876293 -v 151.046402 -65.046143 -50.903210 -v 150.917847 -65.185425 -50.930920 -v 151.431396 -64.627319 -51.478954 -v 151.475647 -64.722839 -51.158581 -v 151.486679 -64.766418 -51.017712 -v 151.206451 -64.758667 -51.341595 -v 151.148895 -64.621094 -51.796703 -v 151.386246 -64.531433 -51.799084 -v 150.682159 -65.819153 -51.591442 -v 150.685089 -65.429565 -51.476330 -v 150.863037 -66.202271 -51.727215 -v 151.204178 -66.467468 -51.847729 -v 151.598587 -66.557617 -51.922924 -v 150.862137 -65.049011 -51.385357 -v 151.533295 -66.401611 -52.438641 -v 151.139816 -66.313660 -52.356304 -v 150.800186 -66.052124 -52.223766 -v 150.621094 -65.673218 -52.074017 -v 150.625565 -65.287292 -51.946758 -v 150.803909 -64.909790 -51.845776 -v 151.033234 -64.691101 -51.804302 -v 151.216797 -66.169426 -55.290081 -v 151.330551 -64.411255 -52.169262 -v 151.249130 -64.258362 -52.774055 -v 151.149521 -64.126152 -53.702400 -v 150.822235 -64.285576 -53.674080 -v 150.546417 -64.591972 -53.675121 -v 150.420319 -64.956230 -53.692791 -v 150.437988 -65.327263 -53.722637 -v 150.610611 -65.693230 -53.764690 -v 150.919540 -65.961662 -53.810345 -v 151.283218 -66.079216 -53.848888 -v 151.052643 -64.248833 -55.655190 -v 150.731934 -64.404106 -55.621441 -v 150.459061 -64.707024 -55.560070 -v 150.337112 -65.066338 -55.489819 -v 150.359467 -65.431816 -55.420238 -v 150.537201 -65.791618 -55.353680 -v 150.850494 -66.054985 -55.307293 -v 150.065262 -70.612236 -82.912575 -v 149.888443 -70.250908 -82.979073 -v 150.596542 -69.067924 -83.214119 -v 150.268188 -69.222404 -83.180367 -v 149.992218 -69.524467 -83.119026 -v 150.928925 -70.996819 -82.850929 -v 150.746124 -70.992424 -82.849251 -v 150.378784 -70.877190 -82.866280 -v 149.867691 -69.884636 -83.048653 -v 150.443390 -75.811203 -110.411819 -v 150.260605 -75.806931 -110.409958 -v 150.188156 -75.796005 -110.410934 -v 149.893204 -75.691635 -110.426376 -v 149.381683 -74.699081 -110.607376 -v 149.402603 -75.065414 -110.538071 -v 149.579575 -75.426804 -110.472061 -v 149.809845 -75.641281 -110.434708 -v 149.408478 -74.568893 -110.632492 -v 150.133438 -73.876266 -110.774826 -v 149.781860 -74.036728 -110.739120 -v 149.599808 -74.205673 -110.704300 -v 149.506042 -74.338791 -110.677628 -v 149.407013 -75.361496 -111.626724 -v 150.136490 -73.998520 -111.244064 -v 147.252426 -88.364983 -112.899734 -v 148.174240 -86.959160 -112.899765 -v 140.107681 -94.207878 -110.411514 -v 140.255051 -93.847099 -111.206894 -v 139.962067 -93.997124 -110.410812 -v 140.009186 -94.053581 -110.409775 -v 140.973404 -93.514458 -112.049545 -v 143.444672 -92.095329 -112.899643 -v 142.150955 -92.908928 -112.714676 -v 145.001694 -90.856255 -112.899734 -v 146.191254 -89.668510 -112.899734 -v 149.562317 -83.899651 -112.899765 -v 148.946777 -85.465752 -112.899765 -v 150.013367 -82.278679 -112.899765 -v 150.384888 -79.562492 -112.899948 -v 150.390396 -78.109489 -112.673874 -v 150.208344 -76.094467 -111.157700 -v 150.195679 -74.472763 -112.259415 -v 150.244873 -79.533012 -114.794754 -v 150.620499 -78.658928 -114.814072 -v 150.270859 -78.502434 -114.716110 -v 150.571747 -77.403000 -114.513138 -v 150.249084 -77.488144 -114.464005 -v 150.461807 -76.274887 -113.987778 -v 150.186279 -76.494247 -114.026840 -v 150.316010 -75.237900 -113.198654 -v 150.098251 -75.581772 -113.406143 -v 149.971710 -74.466476 -112.108719 -v 150.269287 -82.188652 -114.870346 -v 150.512436 -80.691093 -114.870285 -v 150.577057 -80.001335 -114.870102 -v 149.878067 -82.235405 -114.794510 -v 149.430710 -83.846855 -114.794510 -v 149.669250 -84.315910 -114.870377 -v 148.819397 -85.403801 -114.794510 -v 148.796844 -86.325859 -114.870377 -v 148.051544 -86.888298 -114.794479 -v 147.134979 -88.285454 -114.794479 -v 146.294601 -89.904167 -114.870377 -v 147.269623 -88.741020 -114.870377 -v 147.666702 -88.197136 -114.870377 -v 146.079620 -89.580498 -114.794449 -v 144.896225 -90.760246 -114.794449 -v 144.864456 -91.280205 -114.870316 -v 143.347809 -91.989922 -114.794327 -v 143.175430 -92.540092 -114.867264 -v 142.493439 -92.552483 -114.746933 -v 141.592453 -93.085136 -114.522354 -v 142.092056 -93.192924 -114.699661 -v 140.716446 -93.552788 -114.122818 -v 141.033966 -93.741020 -114.290146 -v 139.889069 -93.958305 -113.545761 -v 139.975204 -94.220818 -113.592941 -v 139.277328 -94.242485 -112.935135 -v 139.203598 -94.541496 -112.800339 -v 138.758820 -94.481377 -112.191727 -v 138.623016 -94.783195 -111.849899 -v 138.247406 -94.563896 -110.740067 -v 138.293213 -94.947868 -110.775406 -v 149.831512 -75.966293 -111.253616 -v 150.288025 -76.796005 -111.956680 -v 149.744858 -77.965202 -113.161972 -v 149.582138 -77.018784 -113.182877 -v 149.697403 -77.207870 -112.831375 -v 149.509888 -76.267746 -112.674240 -v 149.631180 -76.517868 -112.365433 -v 149.538300 -75.699753 -111.424271 -v 150.021896 -78.064262 -112.846451 -v 149.977463 -77.351913 -112.536484 -v 149.915985 -76.709885 -112.104324 -v 149.629105 -79.511833 -113.808456 -v 149.651031 -78.666435 -113.745926 -v 149.633545 -77.836906 -113.541092 -v 149.740051 -79.522392 -113.408218 -v 149.383713 -82.134026 -113.408005 -v 149.275589 -82.107109 -113.808212 -v 148.950409 -83.692253 -113.407974 -v 148.845337 -83.655205 -113.808182 -v 148.358902 -85.197807 -113.407944 -v 148.257782 -85.150993 -113.808151 -v 147.616318 -86.633293 -113.407913 -v 147.520020 -86.577202 -113.808121 -v 146.730103 -87.984673 -113.407883 -v 146.639511 -87.919731 -113.808060 -v 145.709885 -89.237419 -113.407852 -v 145.625809 -89.164238 -113.808060 -v 144.566101 -90.378838 -113.407822 -v 144.489243 -90.298088 -113.808029 -v 143.069199 -91.569389 -113.407700 -v 140.822784 -92.778496 -113.261734 -v 141.542664 -92.393791 -113.588608 -v 141.700882 -92.427483 -113.205917 -v 142.277435 -91.958916 -113.770493 -v 143.001892 -91.480461 -113.807907 -v 140.141983 -93.112358 -112.788834 -v 140.407837 -93.091362 -112.470200 -v 139.641571 -93.345024 -112.291641 -v 139.575470 -93.476677 -111.483841 -v 139.222137 -93.538200 -111.693588 -v 150.016739 -79.540947 -113.077744 -v 149.653778 -82.196892 -113.077530 -v 149.212845 -83.781731 -113.077499 -v 148.611115 -85.312981 -113.077499 -v 147.855804 -86.773125 -113.077469 -v 146.954468 -88.147697 -113.077438 -v 145.916870 -89.421989 -113.077408 -v 144.753677 -90.583183 -113.077408 -v 143.231262 -91.794548 -113.077316 -v 141.922989 -92.616325 -112.887985 -v 140.711090 -93.239128 -112.201218 -v 139.951996 -93.590569 -111.306778 -v 149.631454 -74.704269 -111.991898 -v 149.437881 -75.028915 -111.816360 -v 149.550095 -76.017563 -112.962967 -v 138.957397 -93.735527 -111.889877 -v 138.508667 -93.967278 -110.633469 -v 138.362152 -94.170891 -110.678757 -v 149.752274 -75.768967 -113.229507 -v 149.628204 -76.828537 -113.513412 -v 149.836136 -76.638596 -113.820663 -v 149.683701 -77.709160 -113.899857 -v 149.895737 -77.582748 -114.235641 -v 149.702713 -78.602348 -114.121109 -v 149.916275 -78.542656 -114.474014 -v 149.679474 -79.510124 -114.189255 -v 149.891602 -79.517143 -114.547958 -v 149.325119 -82.115593 -114.189011 -v 149.532684 -82.159660 -114.547714 -v 148.893433 -83.669548 -114.188980 -v 149.095108 -83.735527 -114.547684 -v 148.303757 -85.171013 -114.188950 -v 148.497238 -85.258110 -114.547653 -v 147.563232 -86.602654 -114.188919 -v 147.746338 -86.709831 -114.547623 -v 146.679352 -87.950127 -114.188889 -v 146.850006 -88.076225 -114.547623 -v 145.661728 -89.199211 -114.188858 -v 145.817978 -89.342705 -114.547562 -v 144.520721 -90.337212 -114.188828 -v 144.660782 -90.496452 -114.547562 -v 143.027618 -91.523552 -114.188705 -v 143.146622 -91.699150 -114.547440 -v 142.261139 -92.029106 -114.147781 -v 142.333405 -92.234917 -114.502914 -v 141.469223 -92.497551 -113.951096 -v 141.481506 -92.738701 -114.290787 -v 140.694305 -92.911430 -113.598404 -v 140.650116 -93.182610 -113.911819 -v 139.959595 -93.271721 -113.087051 -v 139.862259 -93.568779 -113.362686 -v 139.416382 -93.524101 -112.546097 -v 139.278610 -93.839958 -112.780533 -v 138.783493 -94.068108 -112.071243 -v 138.297455 -94.319328 -110.705276 -v 139.719940 -93.799065 -110.426590 -v 139.633545 -93.753899 -110.435013 -v 139.330521 -93.668388 -110.472672 -v 138.929626 -93.704704 -110.538986 -v 138.605545 -93.877190 -110.608475 -v 134.359497 -97.456726 -83.181259 -v 134.397644 -97.816772 -83.214798 -v 136.219604 -97.101990 -82.850418 -v 136.121231 -96.947632 -82.848923 -v 135.832199 -96.692932 -82.866318 -v 135.442993 -96.561890 -82.913010 -v 134.474472 -97.063843 -83.120071 -v 134.718018 -96.770264 -83.049637 -v 135.042114 -96.597961 -82.979874 -v 130.486923 -100.684021 -55.655777 -v 130.453308 -100.339355 -55.623459 -v 130.568405 -99.946411 -55.562393 -v 130.812012 -99.652954 -55.491837 -v 131.136139 -99.480774 -55.421860 -v 131.536942 -99.444824 -55.354660 -v 131.926102 -99.576050 -55.307541 -v 132.214981 -99.830933 -55.289780 -v 132.313263 -99.985291 -55.291092 -v 130.431610 -100.724426 -55.268723 -v 132.526291 -99.909920 -52.424850 -v 132.172119 -99.935303 -53.848709 -v 130.388840 -100.777527 -54.643600 -v 130.430481 -100.829407 -53.703110 -v 130.397781 -100.466736 -53.675034 -v 130.517761 -100.072205 -53.676163 -v 130.764496 -99.776123 -53.693741 -v 131.091522 -99.599609 -53.723434 -v 131.494232 -99.558472 -53.765182 -v 131.883728 -99.684509 -53.810501 -v 130.898346 -100.821907 -51.799545 -v 130.852692 -100.437019 -51.804977 -v 130.959290 -100.043098 -51.864609 -v 131.187988 -99.747871 -51.961746 -v 131.495010 -99.572151 -52.079910 -v 131.876312 -99.531990 -52.216660 -v 132.248123 -99.658760 -52.340744 -v 132.742981 -99.956978 -51.922440 -v 131.157288 -100.618172 -50.877335 -v 131.193893 -100.773079 -50.876999 -v 131.151001 -100.786201 -51.017807 -v 130.999786 -100.550362 -51.341721 -v 131.108063 -100.799324 -51.158585 -v 131.003601 -100.810860 -51.479202 -v 132.462036 -99.665901 -51.847488 -v 131.070602 -100.105598 -51.385605 -v 131.304932 -99.757454 -51.476639 -v 131.637115 -99.553780 -51.591660 -v 132.058716 -99.510689 -51.727280 -v 132.616943 -99.641365 -51.362534 -v 132.902222 -99.931770 -51.423843 -v 132.495895 -99.572334 -51.332718 -v 132.209076 -99.486946 -51.256668 -v 132.078629 -99.479073 -51.219955 -v 131.783981 -99.530525 -51.132126 -v 131.450073 -99.734505 -51.022507 -v 131.215790 -100.082649 -50.931320 -v 131.147125 -100.527046 -50.880783 -v 134.913315 -98.339302 -36.004074 -v 134.717239 -98.709846 -35.915146 -v 136.511337 -98.563728 -36.376480 -v 136.480942 -98.508186 -36.374954 -v 138.031799 -97.694954 -29.046278 -v 139.538452 -96.711555 -21.242874 -v 139.450958 -96.598885 -21.239822 -v 136.541443 -98.547615 -36.236221 -v 136.367279 -98.350716 -36.363846 -v 136.284424 -98.683418 -28.848066 -v 135.537399 -99.060432 -32.380112 -v 134.694946 -99.147591 -35.862076 -v 134.779175 -99.416878 -35.853714 -v 133.336472 -100.026070 -42.168503 -v 136.036865 -98.101753 -36.308853 -v 135.614883 -98.009895 -36.214066 -v 135.214279 -98.105232 -36.104233 -v 139.378891 -96.526009 -21.234632 -v 139.116623 -96.351936 -21.203291 -v 138.992142 -96.304634 -21.183546 -v 138.690811 -96.261909 -21.126081 -v 138.539566 -96.276314 -21.092299 -v 138.287506 -96.358406 -21.028120 -v 138.154160 -96.437935 -20.989241 -v 137.985275 -96.592842 -20.932602 -v 137.878876 -96.745369 -20.889420 -v 137.789536 -96.962959 -20.840958 -v 137.755203 -97.181221 -20.803940 -v 137.769287 -97.399361 -20.777115 -v 137.835938 -97.624275 -20.760422 -v 137.911179 -97.768257 -20.756607 -v 141.303314 -95.383492 -19.138960 -v 140.630432 -95.913704 -19.537519 -v 139.614441 -96.658516 -21.054367 -v 140.072693 -96.331184 -20.128767 -v 142.065567 -94.744087 -18.976118 -v 143.994705 -92.911934 -18.975904 -v 145.209747 -91.572884 -18.974775 -v 145.988708 -90.621712 -18.973339 -v 146.756454 -89.599983 -18.975262 -v 152.114197 -76.186096 -19.161388 -v 151.980209 -77.066467 -18.984844 -v 151.847351 -77.799019 -18.977032 -v 151.554367 -79.144295 -18.976971 -v 150.718582 -81.980354 -18.974987 -v 149.765274 -84.375130 -18.978771 -v 148.519058 -86.841377 -18.946089 -v 147.597061 -88.366646 -18.980696 -v 152.317902 -74.240967 -20.859997 -v 152.312057 -74.320923 -20.740185 -v 152.326324 -74.117432 -21.129864 -v 152.326752 -74.111023 -21.143475 -v 152.321564 -74.188538 -20.962353 -v 152.308929 -74.364441 -20.590099 -v 152.296234 -74.524292 -20.350506 -v 152.226517 -75.266785 -19.628551 -v 152.332855 -70.163940 -51.158581 -v 137.875092 -97.122505 -20.320541 -v 138.024521 -96.680428 -20.372025 -v 138.310089 -96.370491 -20.485701 -v 148.262222 -86.696358 -18.901625 -v 137.919769 -97.763069 -20.694168 -v 137.920959 -97.573799 -20.353195 -v 138.196243 -97.593819 -19.808243 -v 138.724884 -97.258553 -18.873306 -v 138.379700 -97.268806 -19.294571 -v 138.883728 -96.923103 -18.551529 -v 139.475204 -96.500862 -17.945723 -v 139.412354 -96.798653 -18.081558 -v 140.175232 -95.977791 -17.447767 -v 140.224167 -96.219612 -17.469069 -v 140.917877 -95.393318 -17.116224 -v 141.125900 -95.526436 -17.067793 -v 141.745041 -94.704109 -16.953321 -v 141.775650 -94.991829 -16.934706 -v 142.457230 -94.074654 -16.946455 -v 143.212067 -93.694466 -16.916700 -v 144.194824 -92.353401 -16.945997 -v 145.221954 -91.558479 -16.917492 -v 146.580231 -89.437874 -16.946850 -v 147.025238 -89.219917 -16.914532 -v 148.105362 -86.607857 -17.066114 -v 148.519058 -86.841377 -16.946089 -v 146.631912 -89.455452 -18.955242 -v 144.253632 -92.369209 -18.955732 -v 142.524353 -94.087837 -18.955091 -v 141.370224 -95.086983 -19.050673 -v 139.477051 -96.472115 -20.989729 -v 147.903275 -86.493782 -18.653181 -v 147.742249 -86.402840 -18.398054 -v 147.076202 -87.569954 -18.399761 -v 147.708038 -86.383492 -18.310286 -v 147.004196 -87.496651 -17.967175 -v 147.648712 -86.349983 -17.978498 -v 147.654663 -86.353401 -17.824873 -v 147.715576 -86.387825 -17.560530 -v 147.054214 -87.561165 -17.536327 -v 147.797028 -86.433784 -17.387037 -v 139.122314 -96.243172 -20.830824 -v 139.753143 -96.287300 -20.378248 -v 139.431961 -96.034309 -20.192091 -v 138.690750 -96.209969 -20.644545 -v 147.275940 -87.788765 -18.769453 -v 148.003769 -86.550484 -18.752241 -v 146.363449 -89.146980 -18.765392 -v 144.026764 -92.028267 -18.765455 -v 142.324158 -93.731453 -18.764509 -v 141.152390 -94.751961 -18.841230 -v 140.892700 -95.464607 -19.254133 -v 139.045395 -95.970222 -19.934523 -v 139.780380 -95.795662 -19.720839 -v 140.070694 -96.069527 -19.932661 -v 139.879898 -95.381233 -19.004560 -v 139.633041 -95.449287 -18.643629 -v 138.707596 -96.102119 -19.683241 -v 140.443787 -95.801704 -19.562208 -v 140.653290 -95.149422 -19.037550 -v 140.946014 -94.551277 -18.468184 -v 142.175095 -93.478401 -18.396070 -v 143.859848 -91.785835 -18.397108 -v 146.167999 -88.927254 -18.397503 -v 140.179321 -95.507454 -19.345655 -v 140.752029 -94.681343 -17.640547 -v 140.093460 -95.205330 -17.901472 -v 139.465073 -95.679451 -18.312880 -v 146.097107 -88.853828 -17.967052 -v 143.797028 -91.705452 -17.966261 -v 142.116714 -93.394966 -17.965376 -v 140.809311 -94.534309 -18.047529 -v 138.457336 -96.389168 -19.470686 -v 138.929047 -96.066231 -18.819471 -v 147.234039 -87.771553 -17.153851 -v 146.320023 -89.130501 -17.157726 -v 146.145203 -88.918892 -17.538311 -v 143.977982 -92.013008 -17.156691 -v 143.834122 -91.778206 -17.537308 -v 142.268936 -93.718086 -17.156630 -v 142.145889 -93.471870 -17.536757 -v 147.952484 -86.521553 -17.186689 -v 138.331100 -96.817329 -19.323990 -v 138.828857 -96.476265 -18.614668 -v 139.402679 -96.064339 -18.051191 -v 140.077667 -95.557320 -17.591261 -v 140.788925 -94.994331 -17.292555 -v 141.576752 -94.334114 -17.157393 -v 151.383926 -73.589111 -19.814648 -v 148.910187 -85.719124 -18.963514 -v 149.861679 -83.684883 -18.961346 -v 151.655487 -77.810982 -18.962627 -v 152.297897 -74.084900 -21.190014 -v 152.291611 -74.118835 -21.121990 -v 152.285919 -74.190796 -20.953777 -v 152.060349 -74.740601 -20.046520 -v 152.082306 -74.362610 -20.531017 -v 151.699402 -74.230164 -20.340893 -v 151.477646 -79.454170 -16.915142 -v 150.853287 -81.585701 -16.916363 -v 150.585785 -81.667976 -16.951397 -v 150.648422 -82.178963 -16.917370 -v 151.858170 -77.742012 -16.915203 -v 151.596802 -77.890816 -16.949963 -v 151.871933 -77.669739 -16.915173 -v 151.873093 -77.663513 -16.915173 -v 151.926117 -77.373962 -16.915142 -v 151.918304 -75.968933 -17.105968 -v 152.124390 -76.107544 -17.046978 -v 152.040192 -74.998657 -17.442150 -v 152.257187 -74.963989 -17.434978 -v 152.129395 -74.099731 -17.955700 -v 152.341949 -73.874084 -18.100506 -v 152.188049 -73.335449 -18.604839 -v 152.380188 -73.063660 -18.886913 -v 152.222641 -72.700439 -19.411938 -v 152.393921 -72.399597 -19.896221 -v 152.242050 -72.374023 -19.979107 -v 152.088364 -74.183044 -20.886700 -v 150.656952 -81.584297 -18.961407 -v 150.246094 -81.559029 -18.783672 -v 149.453415 -83.629158 -18.783825 -v 149.946411 -81.550911 -18.422680 -v 149.154526 -83.599678 -18.423046 -v 149.838638 -81.561287 -17.991955 -v 149.045685 -83.603523 -17.992474 -v 149.914337 -81.586678 -17.560558 -v 149.118790 -83.636238 -17.561077 -v 150.184555 -81.625740 -17.172192 -v 149.385025 -83.697212 -17.172649 -v 149.781860 -83.770638 -16.951641 -v 149.672607 -84.579353 -16.912914 -v 148.503906 -85.640327 -18.786268 -v 151.675323 -74.649597 -19.832165 -v 152.025299 -75.209534 -19.634350 -v 151.893570 -76.392700 -19.076275 -v 151.574921 -75.752686 -19.087414 -v 151.492218 -76.398865 -18.874126 -v 151.371521 -74.984680 -19.067638 -v 151.210434 -76.353699 -18.500469 -v 151.444244 -73.942017 -20.075298 -v 151.635696 -75.153870 -19.417553 -v 151.970047 -75.775208 -19.300243 -v 148.205048 -85.595589 -18.425245 -v 148.094406 -85.596077 -17.994001 -v 151.244202 -77.842110 -18.784313 -v 150.945679 -77.873482 -18.422649 -v 150.840271 -77.896065 -17.991283 -v 151.123444 -76.272888 -18.071880 -v 150.919006 -77.907784 -17.559399 -v 151.353943 -74.127319 -19.182873 -v 151.302643 -74.756592 -18.692364 -v 151.226181 -75.490234 -18.310040 -v 148.164352 -85.636116 -17.561689 -v 151.502945 -73.229065 -19.594982 -v 151.470459 -73.818237 -18.892986 -v 151.414673 -74.508911 -18.347424 -v 151.331497 -75.313110 -17.922131 -v 151.219498 -76.172180 -17.655285 -v 151.192703 -77.906319 -17.170727 -v 148.426163 -85.715767 -17.172132 -v 151.829163 -72.581970 -19.957409 -v 151.807556 -72.897705 -19.442699 -v 148.818680 -85.814339 -16.950178 -v 151.773315 -73.523376 -18.675396 -v 151.714752 -74.264648 -18.071026 -v 151.626755 -75.130676 -17.597210 -v 151.507568 -76.059631 -17.294201 -v 151.762207 -76.984985 -16.956158 -v 151.875458 -77.651001 -16.915173 -v 130.595245 -100.949959 -51.158585 -v 130.941589 -100.849312 -51.158585 -v 126.306702 -101.836372 -43.038559 -v 145.224884 -91.555183 -11.158585 -v 145.599197 -91.107368 -11.158585 -v 147.094330 -89.120003 -11.158585 -v 136.636276 -98.496712 -11.159712 -v 143.700668 -93.212715 -11.158585 -v 142.009933 -94.791695 -11.158585 -v 140.936447 -95.676582 -11.158583 -v 137.394684 -98.073372 -11.158583 -v 139.637848 -96.642036 -11.158583 -v 136.228790 -98.712471 -11.190138 -v 135.084824 -99.276436 -11.546766 -v 135.250168 -99.198616 -12.422743 -v 134.312073 -99.623909 -12.215714 -v 134.189087 -99.676826 -12.416885 -v 130.941650 -100.849251 -25.207472 -v 133.925125 -99.788216 -13.293320 -v 133.829575 -99.827827 -13.685623 -v 131.385635 -100.713570 -23.470594 -v 122.684052 -102.091072 -49.670517 -v 122.684052 -102.091072 -51.158585 -v 122.744537 -102.090340 -49.611832 -v 125.297501 -101.951729 -51.158585 -v 124.367584 -102.027534 -47.676071 -v 128.860046 -101.387581 -33.251751 -v 125.567535 -101.924202 -45.455002 -v 125.303101 -101.951180 -51.158585 -v 127.950836 -101.573494 -51.158585 -v 148.506088 -86.864449 -11.158583 -v 149.712250 -84.492622 -11.158583 -v 150.470963 -82.663094 -11.158583 -v 150.853348 -81.585701 -11.158583 -v 151.472198 -79.475716 -11.158583 -v 151.863831 -77.712593 -11.158583 -v 152.141830 -75.981201 -11.158581 -v 152.318909 -74.226868 -11.158581 -v 152.390671 -72.596863 -11.158581 -v 152.336639 -70.223572 -11.185986 -v 152.337570 -70.238037 -11.184460 -v 152.382324 -71.223694 -11.158581 -v 152.390320 -71.566833 -11.158581 -v 151.432526 -64.554688 -25.207499 -v 151.432495 -64.554626 -51.158581 -v 152.117294 -68.020508 -12.289104 -v 152.167191 -68.402832 -11.875225 -v 152.223816 -68.892822 -12.410198 -v 152.218979 -68.848206 -11.580730 -v 152.266220 -69.316467 -11.380505 -v 151.548279 -65.015503 -23.430002 -v 152.051849 -67.568420 -13.634441 -v 152.110001 -67.967529 -12.371319 -v 149.885315 -60.080872 -43.019112 -v 149.579483 -59.403870 -45.439003 -v 151.426208 -64.530334 -51.158581 -v 150.621460 -61.930664 -51.158577 -v 149.601837 -59.451843 -51.158577 -v 149.460724 -59.152466 -51.158577 -v 149.048996 -58.324402 -47.664009 -v 150.820633 -62.501835 -33.221718 -v 148.229904 -56.842773 -51.158577 -v 148.229904 -56.842773 -49.670509 -v 148.264862 -56.902222 -49.603523 -v 121.244049 -100.304878 -48.819382 -v 119.935913 -100.317451 -49.723923 -v 120.749039 -102.109749 -51.158585 -v 121.794205 -102.099617 -50.446579 -v 122.453491 -100.293282 -47.606400 -v 122.666763 -100.291084 -47.343338 -v 123.629639 -100.265450 -45.876873 -v 123.435120 -100.273323 -46.219650 -v 124.930252 -100.178291 -42.020031 -v 124.438171 -100.218391 -43.932201 -v 124.299561 -100.228096 -44.362225 -v 130.163239 -99.201424 -21.214582 -v 127.751007 -99.779182 -30.890547 -v 132.282501 -98.502266 -12.385847 -v 136.140564 -96.715584 -9.358595 -v 135.826538 -96.888313 -9.359114 -v 150.475571 -69.500793 -9.612164 -v 150.564529 -70.783508 -9.359356 -v 150.434860 -69.092285 -9.790966 -v 150.347183 -68.362610 -10.251934 -v 150.256744 -67.738281 -10.847393 -v 150.212982 -67.466919 -11.200939 -v 150.563812 -73.416382 -9.358593 -v 149.099182 -81.154793 -9.358595 -v 149.438126 -80.086617 -9.358595 -v 150.317596 -76.037781 -9.358593 -v 150.423096 -75.200745 -9.358593 -v 138.080490 -95.527534 -9.358595 -v 132.805145 -98.300606 -11.200941 -v 133.104691 -98.179634 -10.792799 -v 133.641434 -97.952766 -10.251936 -v 134.562775 -97.532234 -9.664412 -v 140.261658 -93.910408 -9.358595 -v 142.159897 -92.206795 -9.358597 -v 150.115601 -66.915222 -12.385845 -v 143.825302 -90.422310 -9.358597 -v 145.551544 -88.186226 -9.358597 -v 146.718460 -86.361641 -9.358595 -v 147.610382 -84.718697 -9.358595 -v 149.559036 -64.519409 -22.108347 -v 147.246262 -55.176331 -51.158577 -v 145.276382 -55.380127 -49.740547 -v 147.781738 -56.083496 -50.440163 -v 145.805466 -56.276489 -49.060371 -v 146.282028 -57.083862 -48.229378 -v 146.679810 -57.757751 -47.343300 -v 147.052063 -58.407959 -46.252235 -v 147.528030 -59.303162 -43.965981 -v 147.805847 -59.864445 -41.538368 -v 148.784470 -62.150944 -31.822763 -v 110.800079 -100.386055 -51.158585 -v 111.814453 -102.003914 -52.958572 -v 115.075150 -101.973579 -52.948593 -v 146.459808 -53.999634 -51.895515 -v 144.537109 -54.127747 -50.416115 -v 145.407990 -52.361511 -52.576241 -v 144.033859 -53.275146 -50.748878 -v 143.404236 -52.208435 -51.034523 -v 144.639084 -51.120850 -52.869667 -v 142.976624 -51.484070 -51.138344 -v 144.363037 -50.665405 -52.927742 -v 142.707504 -51.028137 -51.158607 -v 142.548965 -47.598633 -52.958565 -v 140.682953 -47.624390 -51.158577 -v 141.962540 -46.726929 -52.958565 -v 141.216507 -45.870239 -52.958565 -v 139.364166 -46.163940 -51.158577 -v 136.111893 -43.552429 -52.958565 -v 134.768463 -44.761169 -51.158577 -v 137.206024 -43.707153 -52.958565 -v 136.470474 -44.864319 -51.158577 -v 137.800110 -43.850952 -52.958565 -v 137.026535 -44.982361 -51.158577 -v 138.077209 -43.933960 -52.958565 -v 138.005692 -45.318481 -51.158577 -v 139.108795 -44.346558 -52.958565 -v 138.984451 -45.874390 -51.158577 -v 140.433945 -45.176636 -52.958565 -v 140.793457 -45.473328 -52.958565 -v 135.434082 -43.520386 -52.958565 -v 134.505280 -43.545105 -52.958565 -v 133.275726 -44.914673 -51.158577 -v 134.396683 -43.552734 -52.958565 -v 134.096222 -43.578735 -52.958565 -v 132.172272 -45.140320 -51.158577 -v 131.462738 -44.075195 -52.958565 -v 131.709045 -45.259644 -51.158577 -v 129.380356 -44.672913 -52.958565 -v 128.631226 -46.170166 -51.158577 -v 128.256866 -45.024841 -52.958565 -v 126.596558 -46.860840 -51.158577 -v 124.103271 -46.528503 -52.958565 -v 122.928986 -47.018555 -52.958565 -v 122.632523 -48.447571 -51.158577 -v 122.365784 -47.264954 -52.958565 -v 120.135986 -49.643677 -51.158577 -v 118.663147 -49.093262 -52.958561 -v 117.171844 -49.947144 -52.958561 -v 116.960480 -51.443604 -51.158573 -v 115.323944 -52.522217 -51.158573 -v 114.000122 -52.046204 -52.958561 -v 114.310333 -53.252686 -51.158577 -v 111.302277 -54.221924 -52.958565 -v 111.320953 -55.755493 -51.158577 -v 110.694687 -54.775818 -52.958565 -v 110.015884 -55.427979 -52.958565 -v 109.557495 -57.553162 -51.158577 -v 108.858215 -56.632385 -52.958565 -v 108.057983 -59.347778 -51.158577 -v 107.263367 -58.525085 -52.958565 -v 107.537109 -60.045532 -51.158577 -v 105.362610 -63.564148 -51.158577 -v 105.805939 -62.746582 -51.158577 -v 104.831360 -62.177795 -52.958565 -v 106.670746 -59.314331 -52.958565 -v 104.548950 -62.689758 -52.958565 -v 104.027435 -63.703552 -52.958565 -v 104.391052 -65.625793 -51.158577 -v 103.462082 -64.924866 -52.958565 -v 103.447098 -68.182312 -51.158577 -v 102.556274 -67.260376 -52.958565 -v 103.304337 -68.644409 -51.158577 -v 102.084534 -68.762817 -52.958565 -v 101.362335 -71.828613 -52.958565 -v 102.541138 -71.760864 -51.158577 -v 102.313828 -73.085266 -51.158577 -v 101.290298 -72.227844 -52.958565 -v 102.083939 -74.936768 -51.158577 -v 101.168640 -85.261787 -52.958565 -v 102.276520 -84.544746 -51.158577 -v 102.209991 -83.987312 -51.158577 -v 101.056595 -73.765320 -52.958565 -v 100.754395 -77.583069 -52.958565 -v 101.906845 -78.140755 -51.158577 -v 100.734955 -78.658455 -52.958565 -v 101.904617 -78.324165 -51.158577 -v 100.735703 -79.243172 -52.958565 -v 101.980881 -81.349373 -51.158577 -v 100.847382 -82.090034 -52.958565 -v 100.948013 -83.317207 -52.958565 -v 101.201340 -85.505013 -52.958565 -v 101.769104 -88.891304 -52.958569 -v 102.881088 -88.318062 -51.158581 -v 101.876389 -89.421944 -52.958569 -v 103.429092 -90.857185 -51.158581 -v 102.525269 -92.240547 -52.958569 -v 102.618103 -92.603035 -52.958569 -v 104.094635 -93.442390 -51.158581 -v 103.499542 -95.592476 -52.958569 -v 104.758362 -95.480782 -51.158581 -v 103.746628 -96.220833 -52.958569 -v 104.045853 -96.886543 -52.958569 -v 105.042297 -98.580391 -52.958569 -v 105.346405 -96.735909 -51.158581 -v 105.563263 -99.240181 -52.958569 -v 106.375381 -98.236397 -51.158581 -v 106.171738 -99.874275 -52.958572 -v 106.721893 -98.606514 -51.158581 -v 106.899811 -100.481880 -52.958572 -v 107.563004 -99.309883 -51.158581 -v 107.729919 -101.011055 -52.958572 -v 108.505707 -99.836311 -51.158585 -v 108.992889 -100.027901 -51.158585 -v 109.071274 -101.587288 -52.958572 -v 110.379242 -101.898445 -52.958572 -v 110.784851 -101.952095 -52.958572 -v 115.370850 -100.361458 -51.139267 -v 114.852509 -100.366463 -51.158585 -v 113.766510 -100.376961 -51.158585 -v 115.929642 -101.973763 -52.869583 -v 117.867630 -102.000923 -52.439651 -v 117.478180 -100.341194 -50.744034 -v 119.225037 -102.040779 -51.943222 -v 118.686310 -100.329536 -50.323074 -v 119.464264 -100.322029 -49.972763 -v 145.216583 -65.947067 -118.158577 -v 145.973892 -67.173203 -118.158577 -v 137.880447 -94.536491 -118.158585 -v 130.431580 -100.724426 -55.268723 -v 131.003571 -100.810860 -51.479202 -v 140.643326 -93.724968 -118.158585 -v 143.210526 -92.421318 -118.158585 -v 145.496063 -90.669426 -118.158585 -v 147.422012 -88.529106 -118.158585 -v 148.923782 -86.072075 -118.158585 -v 149.950272 -83.381950 -118.158585 -v 150.467041 -80.549065 -118.158585 -v 150.524323 -79.512077 -118.158585 -v 150.456451 -77.669540 -118.158585 -v 149.918945 -74.840683 -118.158585 -v 149.602173 -73.861008 -118.158585 -v 148.872589 -72.157883 -118.158585 -v 147.757736 -70.195297 -118.158577 -v 147.439651 -69.656418 -118.158577 -v 144.426590 -65.099472 -118.158577 -v 144.208344 -64.923386 -118.158577 -v 142.947876 -64.234726 -118.158577 -v 143.857086 -64.679367 -118.158577 -v 141.868118 -63.975513 -118.158577 -v 141.540527 -63.943714 -118.158577 -v 139.751190 -64.063095 -118.158577 -v 140.102768 -64.006088 -118.158577 -v 141.160934 -63.930347 -118.158577 -v 136.383286 -94.755791 -118.158585 -v 149.069839 -72.566879 -118.158585 -v -16.591721 166.422424 -22.097095 -v -16.332687 166.583252 -20.756550 -v -16.167831 166.372375 -20.766254 -v -19.091509 164.669861 -43.410297 -v -20.643435 163.373047 -51.158527 -v -20.544039 163.108398 -51.421986 -v -20.666796 163.342773 -51.298847 -v -20.690126 163.312378 -51.439106 -v -21.517687 162.559204 -47.866413 -v -20.288042 163.685974 -41.378315 -v -19.132767 164.442627 -35.855824 -v -19.234955 164.557190 -35.853870 -v -18.307526 165.260864 -31.010151 -v -14.647001 167.544067 -21.242817 -v -17.653793 165.723999 -36.236195 -v -14.634382 167.520386 -21.242603 -v -17.607239 165.584045 -36.372120 -v -14.520735 167.090393 -21.213978 -v -17.489685 165.156799 -36.323841 -v -14.533766 166.885803 -21.185780 -v -14.616987 166.623047 -21.135029 -v -17.581985 164.692383 -36.225025 -v -14.711561 166.466431 -21.095020 -v -17.869934 164.341797 -36.104481 -v -14.907621 166.270325 -21.028004 -v -15.031050 166.192871 -20.991474 -v -18.255402 164.173462 -35.994526 -v -15.294035 166.101196 -20.922871 -v -15.429976 166.085449 -20.891315 -v -18.720520 164.199524 -35.901051 -v -15.758299 166.127625 -20.825062 -v -15.875898 166.172119 -20.804981 -v -22.085268 161.994324 -50.876728 -v -22.063677 161.973328 -50.876240 -v -21.647844 161.733582 -50.903156 -v -21.180971 161.708923 -50.987751 -v -20.795870 161.876770 -51.099415 -v -20.510286 162.224976 -51.231953 -v -20.422091 162.685364 -51.351398 -v -16.392124 163.812271 -82.912529 -v -16.607349 163.472366 -82.979027 -v -20.959581 161.350220 -55.420185 -v -17.985966 163.456192 -83.214073 -v -22.330400 161.321350 -55.655140 -v -17.682362 163.257339 -83.180321 -v -22.030184 161.129456 -55.621387 -v -17.280598 163.180313 -83.118980 -v -20.984743 162.757263 -55.298756 -v -16.516727 164.749344 -82.850883 -v -20.780107 162.466858 -55.290028 -v -16.424671 164.591385 -82.849205 -v -20.685793 162.094910 -55.307240 -v -16.330570 164.218033 -82.866234 -v -20.746080 161.690063 -55.353626 -v -21.259264 161.139832 -55.489765 -v -16.908543 163.262955 -83.048607 -v -21.629198 161.055542 -55.560017 -v -12.230871 166.944595 -110.416031 -v -12.160864 166.856766 -110.411758 -v -12.068792 166.698807 -110.409897 -v -12.040153 166.631302 -110.410873 -v -11.974600 166.325455 -110.426315 -v -12.552374 165.369827 -110.607315 -v -12.251242 165.579544 -110.538010 -v -12.036062 165.919510 -110.472000 -v -11.973867 166.228043 -110.434647 -v -12.677328 165.324539 -110.632431 -v -13.646978 165.579544 -110.774765 -v -13.326193 165.364029 -110.739059 -v -13.086966 165.297379 -110.704239 -v -12.924414 165.287247 -110.677567 -v -11.997412 165.741287 -111.634811 -v 9.806710 166.177872 -110.678696 -v 9.967034 166.200394 -110.705215 -v 9.498161 166.483170 -112.071793 -v 8.579705 166.848160 -111.484238 -v 8.817117 166.579361 -111.694016 -v 7.972468 167.140213 -112.789200 -v -13.646231 165.579910 -110.778915 -v -11.948965 167.131851 -111.212814 -v 0.070445 170.964310 -112.870346 -v 0.258112 170.707291 -112.899673 -v -1.433157 170.761795 -112.899704 -v 8.881890 167.829239 -110.793777 -v 8.986077 167.775589 -110.415482 -v 8.924157 167.684280 -110.411453 -v 8.539498 167.621109 -111.207199 -v 8.705026 167.932755 -111.187820 -v 8.820855 167.449783 -110.410751 -v 8.844354 167.519547 -110.409714 -v 7.879725 168.058975 -112.049850 -v 8.267800 168.198685 -111.791641 -v 8.444894 168.090775 -111.583755 -v 6.882594 168.990799 -112.681931 -v 7.711680 168.530350 -112.268234 -v 8.033426 168.340042 -112.019058 -v 4.931300 169.883255 -112.870499 -v 5.954722 169.449783 -112.864578 -v 5.354197 169.430923 -112.899582 -v 6.738947 168.749771 -112.717606 -v 4.452708 170.059280 -112.870468 -v 3.578028 170.077286 -112.899673 -v 3.281367 170.422501 -112.870377 -v 1.934290 170.478409 -112.899673 -v 2.301432 170.656387 -112.870346 -v 1.604289 170.785538 -112.870346 -v -3.370412 170.852066 -112.870346 -v -2.157567 170.972549 -112.870346 -v -1.724752 170.994156 -112.870346 -v -5.029012 170.540787 -112.870346 -v -4.369466 170.685257 -112.870346 -v -4.789083 170.345901 -112.899704 -v -3.121251 170.640945 -112.899704 -v -6.532339 170.104507 -112.870377 -v -6.417211 169.879898 -112.899704 -v -8.280128 169.395767 -112.870499 -v -8.933661 168.771500 -112.899887 -v -8.597404 169.241776 -112.870499 -v -10.182212 168.010208 -112.670975 -v -9.776862 168.595779 -112.805954 -v -9.058997 169.002762 -112.870743 -v -11.447225 167.493057 -111.897659 -v -10.698203 168.012955 -112.467728 -v -10.332419 168.252335 -112.640457 -v -11.793615 166.806900 -111.163528 -v -11.235113 167.244156 -111.962173 -v -13.361303 165.787430 -111.818130 -v -13.054694 165.754410 -112.118881 -v -13.224709 165.900101 -112.145981 -v -12.852592 166.217056 -112.824326 -v -12.167518 166.448807 -113.414536 -v -12.359351 166.636917 -113.458481 -v -11.444312 166.995377 -114.026779 -v -11.236670 167.531937 -114.335892 -v -12.135886 166.822891 -113.683548 -v -10.640511 167.562454 -114.459824 -v -9.782737 168.115860 -114.715103 -v -10.209769 168.254349 -114.736130 -v -8.885428 168.636795 -114.794693 -v -8.995246 168.986160 -114.870132 -v -6.383291 169.741959 -114.794449 -v -6.977178 169.921463 -114.870255 -v -4.765280 170.206192 -114.794449 -v -4.850866 170.574539 -114.870316 -v -3.107534 170.499893 -114.794449 -v -2.669912 170.931778 -114.870316 -v -1.429540 170.620193 -114.794418 -v -2.351156 170.959000 -114.870316 -v 0.251566 170.565689 -114.794418 -v -0.471990 170.992447 -114.870316 -v 1.917445 170.337296 -114.794388 -v 1.720057 170.757034 -114.870316 -v 3.551051 169.937210 -114.794388 -v 3.863123 170.228348 -114.870255 -v 5.315149 169.293167 -114.794266 -v 5.863321 169.440506 -114.868240 -v 6.245005 168.859695 -114.749588 -v 7.177821 168.368301 -114.526596 -v 7.000392 168.854691 -114.705002 -v 8.041315 167.863602 -114.126328 -v 8.029657 168.236465 -114.296494 -v 8.825447 167.367813 -113.546219 -v 8.987038 167.590591 -113.609268 -v 9.388054 166.995255 -112.935684 -v 9.672188 167.095901 -112.814407 -v 9.863182 166.678543 -112.192245 -v 10.188974 166.722610 -111.856735 -v 10.201592 166.285843 -110.740005 -v 10.504708 166.525955 -110.775345 -v -11.705282 166.419022 -111.259964 -v -11.127433 166.539505 -112.371658 -v -11.778402 166.029922 -111.431442 -v -9.967673 167.384232 -113.158768 -v -10.681083 166.755264 -113.182816 -v -11.276435 166.305618 -112.681107 -v -8.581061 168.101151 -113.808395 -v -9.317542 167.674271 -113.745102 -v -10.019263 167.221878 -113.537674 -v -8.630179 168.201187 -113.408157 -v -6.211080 169.267532 -113.407944 -v -6.177511 169.161270 -113.808151 -v -4.646123 169.715836 -113.407913 -v -4.622808 169.606888 -113.808121 -v -3.042944 169.999588 -113.407883 -v -3.030035 169.888931 -113.808090 -v -1.420232 170.115799 -113.407852 -v -1.417867 170.004471 -113.808060 -v 0.205515 170.063370 -113.407822 -v 0.197321 169.952225 -113.807999 -v 1.816676 169.843033 -113.407761 -v 1.797968 169.733170 -113.807999 -v 3.396647 169.457047 -113.407761 -v 3.367609 169.349380 -113.807968 -v 5.103617 168.835281 -113.407639 -v 7.327006 167.548050 -113.264603 -v 6.617152 167.962540 -113.592056 -v 6.563716 168.114517 -113.209122 -v 5.856120 168.363052 -113.772598 -v 5.063181 168.731277 -113.807846 -v 7.815333 167.355606 -112.470535 -v -11.113410 166.882401 -112.110092 -v -10.027930 167.672501 -112.843460 -v -8.759284 168.446487 -113.077682 -v -6.298833 169.530594 -113.077469 -v -4.707021 169.986343 -113.077438 -v -3.076314 170.274857 -113.077438 -v -1.425817 170.393082 -113.077408 -v 0.227778 170.339798 -113.077377 -v 1.866587 170.115799 -113.077347 -v 3.473689 169.723465 -113.077347 -v 5.210154 169.091446 -113.077255 -v 6.608851 168.402420 -112.891006 -v 7.782496 167.691299 -112.201523 -v 8.479623 167.228531 -111.307083 -v -12.674170 165.588821 -112.001572 -v -12.296545 165.593704 -111.825302 -v -11.510077 166.209305 -112.970413 -v -11.827201 166.251846 -113.237534 -v -10.867255 166.694962 -113.513351 -v -11.137992 166.772598 -113.820602 -v -10.155005 167.197342 -113.896164 -v -10.374381 167.311295 -114.231644 -v -9.399497 167.684525 -114.120224 -v -9.562537 167.834976 -114.473038 -v -8.608924 168.143143 -114.189194 -v -8.713981 168.327530 -114.547897 -v -6.196157 169.208023 -114.188950 -v -6.267171 169.407913 -114.547653 -v -4.635671 169.655411 -114.188919 -v -4.684820 169.861893 -114.547623 -v -3.036932 169.938675 -114.188889 -v -3.063665 170.149063 -114.547592 -v -1.418691 170.054520 -114.188858 -v -1.422689 170.266617 -114.547562 -v 0.202555 170.002090 -114.188828 -v 0.221308 170.213455 -114.547531 -v 1.809199 169.781998 -114.188797 -v 1.850443 169.990067 -114.547501 -v 3.384699 169.396622 -114.188766 -v 3.448023 169.599014 -114.547501 -v 5.086390 168.775894 -114.188644 -v 5.173335 168.969376 -114.547379 -v 5.923213 168.386551 -114.150101 -v 6.059397 168.556656 -114.505417 -v 6.743235 167.954788 -113.954819 -v 6.941432 168.091995 -114.294815 -v 7.507197 167.508438 -113.601517 -v 7.760951 167.612991 -113.915146 -v 8.203667 167.068192 -113.087418 -v 8.507668 167.140945 -113.363113 -v 9.556512 166.195938 -110.633408 -v 9.123849 166.457169 -111.890335 -v 9.044456 166.785599 -112.780991 -v 8.778985 167.139847 -110.426529 -v 8.785730 167.042618 -110.434952 -v 8.871499 166.739700 -110.472610 -v 9.112390 166.417191 -110.538925 -v 9.429025 166.231339 -110.608414 -v 14.701976 164.488419 -83.181206 -v 14.988704 164.709305 -83.214745 -v 13.512507 166.009903 -82.856285 -v 13.425700 165.887344 -82.850365 -v 13.345758 165.722733 -82.848869 -v 13.280086 165.343033 -82.866264 -v 13.372264 164.942825 -82.912956 -v 14.307002 164.380508 -83.120018 -v 13.929378 164.434280 -83.049583 -v 13.612895 164.620255 -82.979820 -v 19.479277 162.879089 -55.655724 -v 19.203184 162.669861 -55.623405 -v 18.808180 162.562195 -55.562340 -v 18.430571 162.616089 -55.491783 -v 18.114180 162.802063 -55.421806 -v 17.873716 163.124756 -55.354607 -v 17.781721 163.524963 -55.307487 -v 17.847578 163.904480 -55.289726 -v 17.927595 164.069031 -55.291039 -v 18.030531 164.210632 -55.298180 -v 19.542616 162.852966 -55.268669 -v 17.987013 164.424377 -52.734978 -v 17.920240 164.496277 -52.463036 -v 17.751875 164.211121 -52.424797 -v 18.070189 164.326538 -53.179405 -v 18.136259 164.224487 -53.862053 -v 17.958906 163.922607 -53.848656 -v 19.610273 162.844360 -54.643547 -v 19.632673 162.907104 -53.703056 -v 19.340788 162.689270 -53.674980 -v 18.941847 162.584839 -53.676109 -v 18.560438 162.640076 -53.693687 -v 18.238752 162.826233 -53.723381 -v 17.992872 163.147766 -53.765129 -v 17.896284 163.545593 -53.810448 -v 19.381269 163.301636 -51.799492 -v 19.077269 163.061218 -51.804924 -v 18.685881 162.945801 -51.864555 -v 18.314619 162.986145 -51.961693 -v 18.004148 163.155640 -52.079857 -v 17.770262 163.459473 -52.216606 -v 17.683561 163.842651 -52.340691 -v 14.811522 166.727295 -51.158531 -v -20.895952 163.052734 -52.463490 -v -17.961428 165.509277 -51.158527 -v -11.839193 167.224258 -111.156815 -v -20.944307 162.903870 -53.881123 -v -21.030947 162.734375 -55.014271 -v -21.079119 162.723022 -54.554462 -v -21.091188 162.764526 -53.862476 -v -16.205751 166.660767 -51.158527 -v -12.947968 168.373535 -51.158527 -v -10.590577 169.316162 -51.158531 -v -7.478653 170.224243 -51.158527 -v -4.688263 170.739502 -51.158527 -v -1.756103 170.992920 -51.158527 -v 1.201950 170.956909 -51.158527 -v 4.007721 170.651184 -51.158527 -v 7.193649 169.972290 -51.158527 -v 12.989408 167.737915 -51.158531 -v 9.599318 169.211487 -51.158531 -v 17.644682 164.795959 -51.158531 -v 17.670271 164.767578 -51.298759 -v 17.695829 164.738953 -51.438927 -v 8.715081 167.935440 -110.999619 -v -22.337526 161.643127 -52.169209 -v -22.264315 161.753479 -51.799030 -v -21.943422 161.536438 -51.804249 -v -21.030962 162.734375 -55.014271 -v -22.425127 161.493713 -52.774006 -v -22.485613 161.339722 -53.702351 -v -22.178469 161.144348 -53.674030 -v -21.772951 161.069702 -53.675068 -v -21.544588 161.450256 -51.863728 -v -21.396654 161.153015 -53.692738 -v -21.177279 161.517822 -51.960957 -v -21.089754 161.362366 -53.722584 -v -20.880327 161.709717 -52.079151 -v -20.868395 161.701050 -53.764637 -v -20.669588 162.029724 -52.216084 -v -20.801424 162.104797 -53.810291 -v -20.611345 162.418091 -52.340504 -v -20.891710 162.476257 -53.848835 -v -20.706652 162.780457 -52.424915 -v 23.992170 154.812317 -48.813133 -v 24.691771 153.698181 -49.723869 -v 25.792875 155.329407 -51.158531 -v 25.237043 156.214539 -50.446526 -v 24.763777 156.968201 -49.670464 -v 23.345716 155.841675 -47.590263 -v 24.731504 157.019348 -49.611778 -v 23.239332 156.010925 -47.343285 -v 23.828108 158.369141 -47.676018 -v 23.111769 159.337341 -45.454948 -v 22.710218 156.822388 -45.866692 -v 22.821821 156.656250 -46.219597 -v 16.999468 165.278381 -13.685570 -v 16.680254 163.266235 -12.385796 -v 18.588211 164.039673 -21.277824 -v 18.385635 161.826904 -21.214531 -v 19.033813 163.660156 -23.470541 -v 20.114792 160.102783 -30.740013 -v 20.930511 161.861389 -33.251701 -v 21.954512 157.884888 -41.996971 -v 22.649839 159.921021 -43.038506 -v 22.249830 157.481995 -43.932152 -v 22.330717 157.368958 -44.362175 -v 13.106691 165.635071 -9.358543 -v 13.449465 165.440491 -9.359062 -v 13.637987 167.396973 -11.158531 -v -7.004818 170.331177 -11.158527 -v -6.904537 168.509583 -9.358541 -v -4.883694 170.712341 -11.158527 -v -2.690365 169.139221 -9.358541 -v -17.900770 165.552124 -11.184406 -v -17.101301 163.911987 -9.445698 -v -17.520903 165.814941 -11.158863 -v -16.305555 164.463501 -9.358570 -v -16.796263 166.292847 -11.158527 -v -19.149107 162.291016 -11.200886 -v -18.832762 162.562073 -10.691730 -v -19.375013 164.446045 -11.875172 -v -18.545530 162.801331 -10.344105 -v -18.931990 164.793457 -11.523670 -v -18.425917 162.899109 -10.222004 -v -17.553846 163.579773 -9.612110 -v -16.596495 166.419495 -11.158527 -v -14.264188 165.705261 -9.358540 -v -14.543439 167.598450 -11.158527 -v -10.965695 169.181396 -11.158527 -v -11.901929 166.868164 -9.358540 -v -9.767957 169.591858 -11.158529 -v -9.441602 167.805603 -9.358541 -v -7.636196 168.332520 -9.358541 -v 16.918398 165.337158 -13.305779 -v 16.234819 163.606018 -11.200890 -v 16.682604 165.505615 -12.416832 -v 15.968294 163.802673 -10.783653 -v 16.580965 165.577271 -12.228294 -v 15.500582 164.136353 -10.251884 -v 15.872423 166.059082 -11.546715 -v 14.640230 164.713684 -9.654808 -v 14.792971 166.738342 -11.190086 -v 14.270739 167.044617 -11.158379 -v 8.525789 167.681885 -9.358541 -v 7.562549 169.869995 -11.158527 -v 6.144779 168.384766 -9.358541 -v 5.585849 170.360046 -11.158527 -v 3.653324 168.884705 -9.358541 -v 13.425234 167.511047 -11.158531 -v 13.382813 167.533569 -11.158531 -v 11.109957 166.648254 -9.358543 -v 10.534822 168.853943 -11.158529 -v 8.756411 169.503540 -11.158529 -v -19.670485 164.206726 -12.281391 -v -19.715925 164.169373 -12.371265 -v -19.445280 162.029846 -11.913502 -v -20.025496 163.910828 -13.634388 -v -19.568113 161.919189 -12.385792 -v 3.579761 170.715149 -11.158527 -v 1.383701 170.945251 -11.158527 -v 0.943531 169.169006 -9.358541 -v 0.448322 170.993896 -11.158527 -v -1.355190 169.204651 -9.358541 -v -1.729656 170.994019 -11.158527 -v -4.719052 170.735291 -11.158527 -v -28.066545 153.327881 -51.158531 -v -26.861406 151.756348 -49.740501 -v -27.574083 154.259155 -50.440117 -v -26.374819 152.676514 -49.060326 -v -27.161898 155.038452 -49.670464 -v -25.936525 153.505310 -48.229332 -v -27.129580 155.099365 -49.603477 -v -26.328539 156.512085 -47.663963 -v -25.570696 154.197083 -47.343254 -v -25.211702 154.854614 -46.252190 -v -25.686632 157.529297 -45.438953 -v -24.698275 155.728882 -43.965931 -v -25.270052 158.144287 -43.019062 -v -24.365541 156.259521 -41.538319 -v -23.697264 160.208923 -33.221668 -v -22.929977 158.290466 -31.822712 -v -21.936783 162.144958 -23.429951 -v -21.317825 160.190552 -22.108295 -v -21.528244 162.548889 -21.277943 -v -28.576036 152.214966 -51.809441 -v -27.541292 150.470825 -50.416069 -v -28.004122 149.595581 -50.748833 -v -29.531984 150.227173 -52.593895 -v -28.583208 148.500610 -51.034477 -v -30.389147 148.530090 -52.925743 -v -28.976458 147.757019 -51.138298 -v -30.948717 147.464478 -52.958519 -v -29.223970 147.289001 -51.158562 -v -32.062668 145.358093 -52.958519 -v -31.074236 143.758423 -51.158531 -v -32.498306 144.402039 -52.958519 -v -32.857468 143.233337 -52.958519 -v -31.617311 141.893555 -51.158531 -v -32.954132 142.749634 -52.958519 -v -33.018631 142.287964 -52.958519 -v -31.667543 141.377563 -51.158531 -v -33.055481 141.039246 -52.958519 -v -31.626268 140.293579 -51.158531 -v -32.139206 137.755371 -52.958519 -v -30.367266 137.186035 -51.158531 -v -32.592804 138.803162 -52.958519 -v -31.209291 138.747803 -51.158531 -v -32.768890 139.349976 -52.958519 -v -31.383318 139.230713 -51.158531 -v -32.843231 139.629517 -52.958519 -v -33.020477 140.614563 -52.958519 -v -31.811571 137.161072 -52.958519 -v -31.315844 136.399231 -52.958519 -v -29.493532 136.052429 -51.158531 -v -31.240801 136.294250 -52.958519 -v -31.061312 136.051941 -52.958519 -v -28.870623 135.378479 -51.158531 -v -29.259417 134.068298 -52.958519 -v -28.379305 134.898315 -51.158531 -v -27.659777 132.607178 -52.958519 -v -25.991945 132.752991 -51.158531 -v -26.771654 131.834290 -52.958519 -v -24.846544 131.792969 -51.158531 -v -23.654312 129.334839 -52.958519 -v -22.283297 128.339233 -52.958519 -v -20.910570 128.834900 -51.158531 -v -21.778414 127.988396 -52.958519 -v -19.077150 127.636894 -51.158531 -v -18.586855 125.966850 -52.958519 -v -16.773653 124.967949 -52.958519 -v -15.388108 125.571465 -51.158531 -v -14.059632 124.940849 -51.158531 -v -13.597322 123.477592 -52.958519 -v -12.459168 124.260979 -51.158531 -v -11.768433 122.769035 -52.958523 -v -9.168809 123.137932 -51.158535 -v -10.058305 122.205803 -52.958527 -v -8.600922 121.802055 -52.958527 -v -6.306671 122.463676 -51.158539 -v -6.724945 121.385735 -52.958527 -v -4.363037 122.167412 -51.158539 -v -4.277359 121.018120 -52.958527 -v -3.125366 122.047417 -51.158539 -v -3.511673 120.943962 -52.958527 -v 0.692047 120.886345 -52.958527 -v 0.065125 121.986259 -51.158539 -v 1.643890 120.955864 -52.958527 -v 3.276062 122.289177 -51.158539 -v 3.165390 121.130730 -52.958527 -v 5.064850 122.618340 -51.158539 -v 5.629395 121.581963 -52.958527 -v 6.416809 122.944023 -51.158535 -v 7.001923 121.924187 -52.958527 -v 10.146482 122.956902 -52.958523 -v 9.890776 124.087212 -51.158535 -v 10.524290 123.104546 -52.958523 -v 11.832640 123.655144 -52.958527 -v 12.416639 125.199211 -51.158539 -v 13.288038 124.340080 -52.958527 -v 15.367308 125.452202 -52.958527 -v 14.608122 126.358391 -51.158539 -v 16.696836 126.246513 -52.958527 -v 19.158293 127.891289 -52.958527 -v 17.933744 128.469177 -51.158539 -v 21.627317 129.773132 -52.958527 -v 20.501265 130.394287 -51.158539 -v 19.297590 129.459290 -51.158539 -v 20.151091 128.619690 -52.958527 -v 21.882338 129.981140 -52.958527 -v 24.469954 132.237976 -52.958527 -v 24.477736 133.899780 -51.158539 -v 24.865843 132.607178 -52.958527 -v 25.275572 134.681580 -51.158535 -v 26.927397 134.635925 -52.958523 -v 27.157499 134.873596 -52.958523 -v 27.357862 136.848755 -51.158535 -v 29.272932 137.221191 -52.958523 -v 29.669737 137.747986 -52.958523 -v 28.518568 138.235107 -51.158535 -v 30.778540 139.586365 -52.958523 -v 29.241331 139.326416 -51.158535 -v 31.010786 140.100403 -52.958523 -v 30.019476 141.055603 -51.158535 -v 31.299902 140.889343 -52.958523 -v 31.521513 141.739746 -52.958523 -v 30.142439 141.498657 -51.158535 -v 31.659231 142.694275 -52.958523 -v 30.312223 142.629517 -51.158535 -v 31.674040 143.662476 -52.958523 -v 30.271482 143.675171 -51.158535 -v 30.175161 144.223694 -51.158535 -v 30.876173 146.757935 -52.958519 -v 29.542967 145.933899 -51.158535 -v 31.042830 146.384216 -52.958519 -v 31.454962 145.138367 -52.958523 -v 25.998899 151.616760 -50.743980 -v 26.277967 151.172363 -50.883720 -v 27.219343 152.799927 -52.445854 -v 27.395353 149.393066 -51.158531 -v 28.200636 151.152344 -52.869530 -v 27.972914 148.473267 -51.158531 -v 28.670652 150.387695 -52.950493 -v 30.353590 147.706299 -52.958519 -v 25.356367 152.639954 -50.323021 -v 26.532148 153.994873 -51.943169 -v 24.942625 153.298706 -49.972710 -v 8.675194 151.481827 -121.158531 -v 6.579034 150.293777 -121.158531 -v 12.592354 158.932755 -121.158531 -v -15.119163 157.882645 -121.158531 -v -14.555869 158.947830 -121.158531 -v 4.414377 149.235916 -121.158531 -v 10.029106 163.014481 -121.158531 -v 12.384117 154.523697 -121.158531 -v 11.568779 153.638077 -121.158531 -v 10.656548 152.851212 -121.158531 -v 2.119898 148.509232 -121.158531 -v -0.262106 148.158340 -121.158531 -v -2.669943 148.153214 -121.158531 -v -9.547111 150.220474 -121.158531 -v -15.339835 157.465408 -121.158531 -v -11.684623 151.331619 -121.158531 -v -13.676246 152.684280 -121.158531 -v -5.051382 148.506058 -121.158531 -v -7.336890 149.260696 -121.158531 -v 8.568932 164.927444 -121.158524 -v -2.271490 169.158340 -121.158524 -v 0.135034 169.140213 -121.158524 -v 13.171715 157.879227 -121.158531 -v 13.342979 156.695938 -121.158531 -v 13.025810 155.540421 -121.158531 -v -15.687156 155.593826 -121.158531 -v -15.614127 156.787247 -121.158531 -v -15.277030 154.467789 -121.158531 -v -14.557364 153.504593 -121.158531 -v -13.429236 161.078201 -121.158531 -v -12.855002 162.164200 -121.158531 -v -12.256736 163.182449 -121.158531 -v -10.768088 165.073380 -121.158524 -v -8.961234 166.663040 -121.158524 -v -6.896262 167.898880 -121.158524 -v -4.641287 168.740005 -121.158524 -v 2.498438 168.686111 -121.158524 -v 4.740335 167.811234 -121.158524 -v 6.786417 166.544388 -121.158524 -v 12.119591 163.671585 -118.158531 -v 15.098259 158.928238 -118.158531 -v 15.183601 158.785782 -118.158531 -v 15.445534 158.268570 -118.158531 -v 15.725731 157.454727 -118.158531 -v 15.841499 156.834793 -118.158531 -v 15.867058 156.025772 -118.158531 -v 15.779564 155.367081 -118.158531 -v 15.567406 154.620499 -118.158531 -v 14.927940 153.331253 -118.158531 -v 14.520683 152.745804 -118.158531 -v 14.057366 152.184097 -118.158531 -v 13.036415 151.167007 -118.158531 -v 11.760033 150.141006 -118.158531 -v 10.735451 149.433548 -118.158531 -v 10.529091 149.299637 -118.158531 -v 8.267998 147.942215 -118.158531 -v 7.968302 147.774796 -118.158531 -v 5.694300 146.644791 -118.158531 -v 5.302363 146.480301 -118.158531 -v 2.968897 145.713089 -118.158531 -v 1.045847 145.335037 -118.158531 -v 0.129175 145.229752 -118.158531 -v -0.418966 145.189041 -118.158531 -v -2.751196 145.201675 -118.158531 -v -3.362310 145.255630 -118.158531 -v -5.597067 145.644730 -118.158531 -v -6.252752 145.820084 -118.158531 -v -8.329718 146.556717 -118.158531 -v -9.027976 146.847549 -118.158531 -v -15.803397 150.828568 -118.158531 -v -13.493430 149.108902 -118.158531 -v -11.723212 148.102066 -118.158531 -v -10.966361 147.723282 -118.158531 -v -16.570824 151.595901 -118.158531 -v -16.803520 151.865555 -118.158531 -v -17.422127 152.727432 -118.158531 -v -17.609550 153.057816 -118.158531 -v -17.753960 153.353531 -118.158531 -v -18.098564 154.409134 -118.158531 -v -18.195808 155.416580 -118.158531 -v -18.171867 155.843582 -118.158531 -v -18.136055 156.121841 -118.158531 -v -17.827644 157.238724 -118.158531 -v -17.179588 158.525772 -118.158531 -v -15.831565 161.074844 -118.158531 -v -15.539023 161.628128 -118.158531 -v -14.450767 163.605545 -118.158531 -v -13.381812 165.118912 -118.158524 -v -12.713050 165.901749 -118.158524 -v -11.403937 167.177505 -118.158524 -v -10.584510 167.840958 -118.158524 -v -8.136863 169.357742 -118.158524 -v -5.452810 170.400833 -118.158524 -v -3.694876 170.795914 -118.158524 -v -2.623449 170.935013 -118.158524 -v 0.256144 170.942154 -118.158524 -v 3.088129 170.422073 -118.158524 -v 5.777384 169.392349 -118.158524 -v 8.232277 167.887772 -118.158524 -v 11.341179 164.798233 -118.158524 -v 10.370415 165.958878 -118.158524 -v 24.763777 156.968201 -51.158531 -v -22.206270 161.842163 -51.478901 -v -22.286135 161.786987 -51.158527 -v -22.148073 161.929932 -51.158527 -v 19.316755 163.385620 -51.479149 -v 19.252180 163.468567 -51.158531 -v 19.649076 163.110596 -51.158531 -v 21.565001 161.184143 -51.158531 -v -24.079590 159.740173 -51.158527 -v 22.956923 159.536316 -51.158531 -v -27.161898 155.038452 -51.158531 -v -25.550615 157.733765 -51.158531 -v 17.678495 164.420349 -51.922386 -v 19.072111 163.415649 -50.877281 -v 19.184935 163.527954 -50.876945 -v 19.218550 163.498230 -51.017754 -v 19.096769 163.245850 -51.341667 -v 19.316740 163.385620 -51.479149 -v 17.577620 164.028625 -51.847435 -v 18.680784 163.073364 -51.385551 -v 18.261518 163.090759 -51.476585 -v 17.914015 163.267090 -51.591606 -v 17.656599 163.603760 -51.727226 -v 17.475584 164.147705 -51.362480 -v 17.573622 164.542725 -51.423790 -v 17.480177 164.008484 -51.332664 -v 17.557600 163.719360 -51.256615 -v 17.619215 163.604126 -51.219902 -v 17.817335 163.380005 -51.132072 -v 18.165968 163.202393 -51.022453 -v 18.585188 163.185059 -50.931267 -v 18.999784 163.359253 -50.880730 -v 15.163863 165.422302 -36.004021 -v 15.582244 165.449219 -35.915092 -v 18.578688 164.047668 -47.875084 -v 12.981995 167.741760 -29.046225 -v 11.355256 168.510254 -21.242817 -v 11.305100 168.376770 -21.239765 -v 14.488814 166.918457 -36.236168 -v 14.486861 166.846252 -36.374901 -v 14.412246 166.666931 -36.363792 -v 17.670256 164.767578 -51.298759 -v 15.966811 165.659485 -35.862022 -v 16.152191 165.872314 -35.853661 -v 17.450132 164.944397 -42.285271 -v 15.465759 166.322449 -32.451134 -v 14.373168 166.255066 -36.308800 -v 14.515868 165.847473 -36.214008 -v 14.806853 165.556152 -36.104179 -v 11.280732 168.277222 -21.234577 -v 11.269746 167.962646 -21.203236 -v 11.294633 167.831848 -21.183491 -v 11.416032 167.552673 -21.126026 -v 11.507524 167.431458 -21.092243 -v 11.709443 167.259644 -21.028065 -v 11.846986 167.187744 -20.989185 -v 12.067399 167.124939 -20.932545 -v 12.253068 167.114075 -20.889362 -v 13.107576 167.677246 -20.756550 -v 13.376969 167.536682 -22.092793 -v 13.024354 167.537781 -20.760365 -v 12.867631 167.363220 -20.777058 -v 12.689180 167.237000 -20.803883 -v 12.485215 167.151978 -20.840900 -v -0.049390 171.007812 -18.980488 -v 10.744798 168.768982 -20.120777 -v 11.275529 168.545105 -21.066883 -v 10.103715 169.022888 -19.537464 -v 8.348603 169.635254 -18.975941 -v 9.299714 169.318542 -19.138905 -v 1.538150 170.934265 -18.975117 -v 2.736133 170.822815 -18.973255 -v 4.007724 170.651184 -18.974720 -v 5.749362 170.324890 -18.975880 -v -12.729185 168.470825 -19.166065 -v -11.899565 168.821899 -18.985004 -v -11.192488 169.097412 -18.976978 -v -9.894392 169.551208 -18.976948 -v -7.025494 170.326660 -18.974873 -v -4.528729 170.760803 -18.978596 -v -1.756101 170.992920 -18.946033 -v -14.589476 167.574097 -21.128954 -v -14.416975 167.664246 -20.752003 -v -14.479383 167.631836 -20.858356 -v -14.526182 167.607361 -20.960804 -v -14.369062 167.689026 -20.587757 -v -14.243818 167.753052 -20.375019 -v -13.575088 168.082764 -19.641712 -v -14.605207 167.565918 -21.165821 -v 12.584199 167.304016 -20.347187 -v 12.129853 167.199341 -20.398945 -v 11.716279 167.280273 -20.511219 -v 1.480228 170.752625 -18.955097 -v -1.745145 170.698242 -18.901569 -v 13.100236 167.681030 -20.704426 -v 12.943757 167.580322 -20.377735 -v 12.813127 167.827087 -19.815296 -v 12.247285 168.103638 -18.873249 -v 12.445253 167.811096 -19.308277 -v 11.891221 168.057739 -18.565601 -v 11.226457 168.338867 -17.958942 -v 11.489549 168.451172 -18.076527 -v 10.416856 168.660828 -17.457630 -v 10.584001 168.834045 -17.472584 -v 9.532289 168.987366 -17.122211 -v 9.514390 169.242249 -17.067738 -v 8.507615 169.333313 -16.954273 -v 8.718720 169.515808 -16.934650 -v 7.590808 169.613220 -16.946400 -v 7.562564 169.869873 -16.916859 -v 6.949588 170.037231 -16.916676 -v 5.254275 170.185059 -16.945911 -v 4.026446 170.648193 -16.917377 -v 1.492359 170.699341 -16.946888 -v 1.383701 170.945251 -16.916157 -v -1.738461 170.518250 -17.066059 -v -1.756100 170.992920 -16.946033 -v 1.066028 170.965027 -16.914570 -v 5.236911 170.243591 -18.955677 -v 7.566836 169.677307 -18.955036 -v 9.026460 169.215149 -19.054279 -v 11.189180 168.329529 -21.004139 -v -1.729840 170.286377 -18.653126 -v -1.722974 170.101624 -18.397999 -v -0.369885 170.145142 -18.399708 -v -1.721509 170.062256 -18.310200 -v -0.394681 170.045471 -17.967121 -v -1.718976 169.994202 -17.978443 -v -1.719235 170.000977 -17.824787 -v -1.721829 170.070984 -17.560474 -v -0.365811 170.121887 -17.536274 -v -1.725308 170.164429 -17.386921 -v 11.181062 167.906494 -20.849354 -v 10.886659 168.468689 -20.386280 -v 10.839890 168.062378 -20.200520 -v 11.379701 167.520752 -20.667164 -v -0.287869 170.429932 -18.769428 -v -1.734128 170.401672 -18.752186 -v 1.357974 170.362305 -18.765278 -v 5.064578 169.872009 -18.765400 -v 7.367877 169.320190 -18.764454 -v 8.855744 168.853943 -18.844624 -v 9.596864 169.006165 -19.260212 -v 10.988450 167.699036 -19.943897 -v 10.457093 168.232971 -19.729603 -v 10.537675 168.624023 -19.941151 -v 10.056352 168.099243 -19.013386 -v 10.244996 167.924011 -18.653431 -v 11.278443 167.480042 -19.693806 -v 10.117265 168.800537 -19.570362 -v 9.454362 168.637024 -19.043537 -v 8.794236 168.572632 -18.471638 -v 7.230304 169.060791 -18.396015 -v 4.945026 169.603210 -18.397022 -v 1.273120 170.080872 -18.397419 -v 10.005784 168.421021 -19.353840 -v 9.010072 168.474304 -17.645039 -v 9.799562 168.187561 -17.909473 -v 10.530305 167.900879 -18.323841 -v 1.247714 169.982056 -17.966999 -v 4.909259 169.507568 -17.966206 -v 7.189761 168.967346 -17.965321 -v 8.853059 168.446594 -18.051411 -v 11.654710 167.416870 -19.482502 -v 11.136430 167.648010 -18.831470 -v -0.280606 170.385193 -17.153767 -v 1.366718 170.316772 -17.157734 -v 1.278003 170.057007 -17.538319 -v 5.077136 169.822388 -17.156605 -v 4.952014 169.577209 -17.537251 -v 7.385501 169.266174 -17.156574 -v 7.240024 169.032410 -17.536701 -v -1.731930 170.342773 -17.186634 -v 12.085984 167.533264 -19.336964 -v 11.538957 167.777161 -18.627888 -v 10.891999 168.048828 -18.063465 -v 10.109040 168.357910 -17.600300 -v 9.258973 168.668945 -17.297871 -v 8.279618 168.996521 -17.157917 -v -12.791990 168.442444 -17.047749 -v -12.786070 168.201416 -17.102589 -v -13.676741 167.797546 -17.435871 -v -4.883634 170.711975 -16.915791 -v -4.237668 170.797302 -16.912617 -v -3.197339 170.679626 -16.947193 -v -7.304898 170.072998 -18.961262 -v -11.081846 168.940125 -18.962574 -v -14.602522 167.532776 -21.189777 -v -14.570250 167.545166 -21.121449 -v -14.505751 167.578186 -20.952595 -v -13.915785 167.675720 -20.041889 -v -14.252012 167.495117 -20.528797 -v -14.164228 167.099548 -20.338703 -v -9.598845 169.645386 -16.915089 -v -7.300748 170.265381 -16.916584 -v -7.196561 170.055969 -16.951435 -v -6.825284 170.369446 -16.917347 -v -11.343305 169.040161 -16.915119 -v -11.331404 169.044678 -16.915119 -v -10.983122 168.931946 -16.949909 -v -11.601759 168.939819 -16.915089 -v -11.325514 169.046936 -16.915119 -v -11.256727 169.073059 -16.915150 -v -10.965696 169.181396 -16.915272 -v -13.840773 167.954163 -17.439259 -v -14.489897 167.402832 -17.946430 -v -14.818159 167.453003 -18.111835 -v -15.177290 167.049988 -18.597370 -v -15.506269 167.073425 -18.873554 -v -15.740736 166.744690 -19.408375 -v -16.085999 166.733704 -19.889912 -v -16.030212 166.589722 -19.977100 -v -14.408888 167.405823 -20.885517 -v -3.175855 170.319153 -18.789783 -v -3.339139 170.702393 -18.967030 -v -13.791380 167.300171 -19.827412 -v -13.494429 167.893005 -19.628315 -v -12.416731 168.400269 -19.073933 -v -12.794828 167.793945 -19.083393 -v -12.200956 168.061584 -18.871967 -v -13.342268 167.218994 -19.061359 -v -12.091063 167.798218 -18.498341 -v -14.275953 166.731323 -20.072926 -v -13.337339 167.532166 -19.411610 -v -12.983015 168.142151 -19.296131 -v -2.978619 169.952576 -17.995502 -v -3.043469 170.044617 -18.428028 -v -10.840147 168.606018 -18.784260 -v -10.657194 168.368042 -18.422596 -v -10.582762 168.290100 -17.991230 -v -12.113386 167.682251 -18.069599 -v -10.613966 168.363281 -17.559345 -v -14.544767 166.495300 -19.812000 -v -14.066923 166.753479 -19.177082 -v -13.499510 167.041260 -18.685413 -v -12.834028 167.360291 -18.305439 -v -2.982098 170.033386 -17.561695 -v -10.758421 168.595764 -17.170673 -v -12.248549 167.711670 -17.652699 -v -13.039045 167.357666 -17.917011 -v -13.768293 167.007507 -18.339710 -v -14.390745 166.691162 -18.886555 -v -14.913650 166.408264 -19.591999 -v -3.060498 170.296631 -17.170460 -v -12.494307 167.898621 -17.291187 -v -13.348249 167.514160 -17.591450 -v -14.132704 167.135681 -18.062458 -v -14.800123 166.795105 -18.668324 -v -15.355330 166.494324 -19.439411 -v -15.636824 166.346863 -19.955524 -v -7.112210 169.709290 -18.783527 -v -6.962872 169.449402 -18.422565 -v -6.897794 169.362976 -17.991871 -v -6.915738 169.440735 -17.560505 -v -7.023312 169.691650 -17.172169 -v 15.231234 166.470276 -12.422050 -v -22.116686 161.962097 -51.017658 -vn 0.6182 -0.7860 0.0000 -vn 0.7973 -0.6036 -0.0000 -vn 0.9243 -0.3817 -0.0000 -vn 0.9909 -0.1349 -0.0000 -vn 0.8622 0.5065 -0.0000 -vn 0.4942 0.8693 0.0000 -vn 0.2556 0.9668 -0.0000 -vn 0.0000 1.0000 0.0000 -vn -0.2556 0.9668 0.0000 -vn -0.4942 0.8693 -0.0000 -vn -0.8622 0.5065 0.0000 -vn -0.9843 0.1765 0.0000 -vn -0.9949 -0.1013 -0.0000 -vn -0.9285 -0.3712 -0.0000 -vn -0.9285 -0.3713 -0.0000 -vn -0.7904 -0.6125 -0.0000 -vn -0.5912 -0.8065 -0.0000 -vn -0.3464 -0.9381 -0.0000 -vn -0.0000 -1.0000 0.0000 -vn 0.0000 -0.0000 1.0000 -vn 0.0000 0.0000 -1.0000 -vn -0.0563 -0.9984 0.0000 -vn -0.2072 -0.9783 0.0000 -vn -0.3534 -0.9355 0.0000 -vn -0.4913 -0.8710 0.0000 -vn -0.6179 -0.7862 0.0000 -vn -0.7301 -0.6833 0.0000 -vn -0.8254 -0.5645 0.0000 -vn -0.9016 -0.4326 0.0000 -vn -0.9568 -0.2907 0.0000 -vn -0.9899 -0.1420 0.0000 -vn -1.0000 0.0100 0.0000 -vn -0.9868 0.1617 0.0000 -vn -0.9508 0.3097 0.0000 -vn -0.8928 0.4505 0.0000 -vn -0.8660 0.5000 0.0000 -vn 0.8660 0.5000 0.0000 -vn -0.8365 0.5479 0.0000 -vn -0.7436 0.6686 0.0000 -vn -0.6335 0.7738 0.0000 -vn -0.5086 0.8610 -0.0000 -vn -0.3720 0.9282 -0.0000 -vn -0.2267 0.9740 0.0000 -vn -0.0762 0.9971 0.0000 -vn 0.0762 0.9971 -0.0000 -vn 0.2267 0.9740 0.0000 -vn 0.3720 0.9282 0.0000 -vn 0.5086 0.8610 0.0000 -vn 0.6334 0.7738 0.0000 -vn 0.7436 0.6686 0.0000 -vn 0.8365 0.5479 0.0000 -vn 0.8928 0.4505 0.0000 -vn 0.9508 0.3097 0.0000 -vn 0.9868 0.1617 0.0000 -vn 1.0000 0.0100 0.0000 -vn 0.9899 -0.1420 0.0000 -vn 0.9568 -0.2907 0.0000 -vn 0.9016 -0.4326 0.0000 -vn 0.8254 -0.5645 0.0000 -vn 0.7301 -0.6833 0.0000 -vn 0.6179 -0.7862 0.0000 -vn 0.4913 -0.8710 0.0000 -vn 0.3534 -0.9355 0.0000 -vn 0.2072 -0.9783 0.0000 -vn 0.0563 -0.9984 0.0000 -vn -0.4803 -0.8327 -0.2756 -vn -0.4805 -0.8325 -0.2756 -vn -0.4806 -0.8325 -0.2755 -vn -0.1146 -0.1985 0.9734 -vn -0.3198 -0.5537 0.7688 -vn -0.4578 -0.7926 0.4027 -vn -0.4578 -0.7926 0.4028 -vn -0.4995 -0.8650 -0.0480 -vn -0.4996 -0.8650 -0.0480 -vn -0.4994 -0.8651 -0.0480 -vn -0.4993 -0.8651 -0.0480 -vn -0.8756 0.4831 0.0000 -vn -0.8932 0.4496 0.0022 -vn -0.8903 0.4553 -0.0035 -vn -0.8942 0.4477 0.0006 -vn -0.8934 0.4492 -0.0039 -vn -0.8929 0.4501 -0.0053 -vn -0.8887 0.4582 0.0136 -vn -0.8595 0.5089 -0.0482 -vn 0.4400 0.7623 0.4746 -vn 0.3008 0.5213 0.7986 -vn 0.3008 0.5212 0.7987 -vn 0.1068 0.1850 0.9769 -vn -0.2136 0.0000 -0.9769 -vn -0.6018 0.0000 -0.7986 -vn -0.8802 0.0000 -0.4746 -vn -0.9613 0.0000 -0.2756 -vn -0.9988 0.0000 -0.0480 -vn -0.9153 0.0000 0.4027 -vn -0.6394 0.0000 0.7689 -vn -0.6395 0.0000 0.7688 -vn -0.2292 0.0000 0.9734 -vn 0.9005 -0.4327 0.0433 -vn 0.6182 -0.7855 0.0297 -vn 0.2001 -0.9797 0.0096 -vn 0.0609 -0.9641 -0.2585 -vn 0.1698 -0.9641 -0.2041 -vn 0.2430 -0.9641 -0.1069 -vn 0.2641 -0.9645 0.0063 -vn 0.4515 -0.8920 0.0217 -vn 0.1642 -0.6976 -0.6975 -vn 0.1642 -0.6975 -0.6975 -vn 0.4582 -0.6975 -0.5509 -vn 0.4582 -0.6976 -0.5509 -vn 0.6558 -0.6976 -0.2886 -vn 0.7151 -0.6985 0.0262 -vn 0.8003 -0.5984 0.0384 -vn 0.2218 -0.2524 -0.9419 -vn 0.2218 -0.2525 -0.9418 -vn 0.6187 -0.2524 -0.7440 -vn 0.8857 -0.2524 -0.3897 -vn 0.8857 -0.2523 -0.3897 -vn 0.9667 -0.2527 0.0406 -vn 0.9806 -0.1901 0.0471 -vn -0.0000 -0.2588 -0.9659 -vn -0.0000 -0.2589 -0.9659 -vn -0.0000 -0.7071 -0.7071 -vn -0.0000 -0.9659 -0.2589 -vn -0.2652 -0.9641 0.0127 -vn -0.2430 -0.9641 -0.1069 -vn -0.1698 -0.9641 -0.2041 -vn -0.1698 -0.9641 -0.2042 -vn -0.0609 -0.9641 -0.2584 -vn -0.0609 -0.9641 -0.2585 -vn -0.7157 -0.6976 0.0344 -vn -0.6558 -0.6976 -0.2886 -vn -0.6559 -0.6976 -0.2886 -vn -0.4582 -0.6976 -0.5509 -vn -0.4582 -0.6975 -0.5510 -vn -0.1642 -0.6975 -0.6975 -vn -0.9665 -0.2524 0.0464 -vn -0.9665 -0.2523 0.0464 -vn -0.8857 -0.2523 -0.3897 -vn -0.8857 -0.2524 -0.3897 -vn -0.6187 -0.2524 -0.7440 -vn -0.6187 -0.2525 -0.7439 -vn -0.2218 -0.2525 -0.9418 -vn -0.2218 -0.2524 -0.9419 -vn -0.0565 -0.9644 0.2585 -vn -0.1593 -0.9644 0.2113 -vn -0.1592 -0.9644 0.2113 -vn -0.2329 -0.9644 0.1256 -vn -0.1528 -0.6989 0.6987 -vn -0.1528 -0.6988 0.6988 -vn -0.4305 -0.6988 0.5712 -vn -0.6296 -0.6989 0.3395 -vn -0.6295 -0.6989 0.3395 -vn -0.2067 -0.2532 0.9451 -vn -0.2066 -0.2532 0.9451 -vn -0.5822 -0.2532 0.7726 -vn -0.8515 -0.2532 0.4591 -vn -0.8515 -0.2533 0.4591 -vn -0.9285 -0.2588 0.2662 -vn -0.6796 -0.7072 0.1949 -vn -0.2489 -0.9659 0.0714 -vn 0.0000 -0.7071 0.7071 -vn -0.3765 0.0544 -0.9248 -vn -0.6067 0.0539 -0.7931 -vn -0.9134 0.0540 -0.4035 -vn -0.8251 0.0547 -0.5623 -vn -0.1873 0.0167 -0.9822 -vn -0.1873 0.0166 -0.9822 -vn -0.3093 0.0457 -0.9498 -vn -0.1932 0.0582 -0.9794 -vn -0.2027 0.0399 -0.9784 -vn -0.0995 0.0817 -0.9917 -vn -0.8345 0.0558 -0.5482 -vn -0.8353 0.0360 -0.5487 -vn -0.8352 0.0362 -0.5487 -vn -0.8352 0.0368 -0.5487 -vn -0.4851 0.0372 -0.8737 -vn -0.7466 0.0358 -0.6643 -vn -0.8352 0.0376 -0.5487 -vn -0.8915 0.0310 -0.4519 -vn -0.9557 0.0225 -0.2936 -vn -0.9938 0.0146 -0.1106 -vn -0.9821 0.0167 -0.1874 -vn -0.9822 0.0167 -0.1873 -vn -0.9559 0.0432 -0.2904 -vn -0.9616 0.0464 -0.2703 -vn -0.9762 0.1299 -0.1737 -vn -0.1676 0.0161 -0.9857 -vn -0.5488 0.0357 -0.8352 -vn -0.5488 0.0354 -0.8352 -vn -0.5487 0.0360 -0.8353 -vn -0.5480 0.0612 -0.8342 -vn -0.7390 0.0625 -0.6709 -vn -1.0000 0.0000 0.0000 -vn -0.7071 -0.7071 0.0000 -vn -0.7070 -0.7072 0.0000 -vn -0.0717 -0.6227 -0.7792 -vn -0.6385 -0.6039 -0.4771 -vn -0.7281 -0.6332 -0.2625 -vn -0.7281 -0.6332 -0.2626 -vn -0.8010 -0.5880 0.1122 -vn -0.7065 -0.7064 0.0435 -vn 0.0152 -0.6097 -0.7925 -vn 0.0152 -0.6096 -0.7925 -vn 0.1638 -0.6976 -0.6975 -vn 0.2625 -0.5183 -0.8139 -vn 0.1482 -0.5805 -0.8007 -vn -0.7045 -0.6141 -0.3559 -vn -0.7987 -0.5860 -0.1367 -vn -0.7555 -0.6131 -0.2310 -vn -0.7882 -0.5688 0.2349 -vn -0.6977 -0.6979 0.1620 -vn -0.2572 -0.6337 -0.7295 -vn -0.2048 -0.5997 -0.7736 -vn -0.4767 -0.6083 -0.6347 -vn -0.4690 -0.6123 -0.6365 -vn -0.4689 -0.6121 -0.6368 -vn -0.4275 -0.6010 -0.6753 -vn -0.6044 -0.6088 -0.5139 -vn -0.1083 -0.7030 -0.7029 -vn -0.3169 -0.6323 -0.7069 -vn -0.2646 -0.6160 -0.7420 -vn -0.4783 -0.6087 -0.6330 -vn -0.4735 -0.6065 -0.6387 -vn -0.6164 -0.6080 -0.5005 -vn -0.6314 -0.6159 -0.4711 -vn -0.7111 -0.6108 -0.3482 -vn -0.7542 -0.6313 -0.1807 -vn -0.7334 -0.6789 0.0346 -vn -0.7063 -0.7063 -0.0474 -vn -0.0000 -0.7072 -0.7070 -vn -0.6947 -0.6947 -0.1862 -vn -0.6948 -0.6947 -0.1861 -vn -0.5086 -0.6948 -0.5086 -vn -0.5086 -0.6947 -0.5086 -vn -0.1862 -0.6947 -0.6947 -vn -0.1862 -0.6948 -0.6947 -vn -0.1862 -0.6947 0.6947 -vn -0.5086 -0.6947 0.5086 -vn -0.6947 -0.6947 0.1862 -vn 0.6948 -0.6947 0.1862 -vn 0.5086 -0.6947 0.5086 -vn 0.5086 -0.6948 0.5086 -vn 0.1862 -0.6947 0.6947 -vn 0.7071 -0.7071 0.0000 -vn 0.1862 -0.6948 -0.6947 -vn 0.1862 -0.6947 -0.6947 -vn 0.5086 -0.6947 -0.5086 -vn 0.5086 -0.6948 -0.5086 -vn 0.6948 -0.6947 -0.1862 -vn 0.9659 0.0000 0.2588 -vn 0.7071 0.0000 0.7071 -vn 0.2588 0.0000 0.9659 -vn -0.2588 0.0000 0.9659 -vn -0.7071 0.0000 0.7071 -vn -0.9659 0.0000 0.2588 -vn -0.9659 0.0000 -0.2588 -vn -0.7071 0.0000 -0.7071 -vn -0.2588 0.0000 -0.9659 -vn 0.2588 0.0000 -0.9659 -vn 0.7071 0.0000 -0.7071 -vn 0.9659 0.0000 -0.2588 -vn 0.5669 -0.8096 -0.1519 -vn 0.4150 -0.8096 -0.4150 -vn 0.1519 -0.8096 -0.5669 -vn -0.1519 -0.8096 -0.5669 -vn -0.4150 -0.8096 -0.4150 -vn -0.5669 -0.8096 -0.1519 -vn -0.5669 -0.8096 0.1519 -vn -0.4150 -0.8096 0.4150 -vn -0.1519 -0.8096 0.5669 -vn 0.1519 -0.8096 0.5669 -vn 0.1519 -0.8097 0.5669 -vn 0.4150 -0.8096 0.4150 -vn 0.5669 -0.8096 0.1519 -vn 0.1419 -0.7854 0.6025 -vn 0.2066 -0.4327 0.8776 -vn 0.9806 -0.1902 -0.0471 -vn 0.9806 -0.1901 -0.0471 -vn 0.8986 -0.1902 0.3954 -vn 0.8986 -0.1901 0.3954 -vn 0.6278 -0.1901 0.7548 -vn 0.2250 -0.1901 0.9556 -vn 0.2250 -0.1900 0.9556 -vn 0.8374 -0.5452 -0.0402 -vn 0.8373 -0.5452 -0.0402 -vn 0.7673 -0.5452 0.3376 -vn 0.5361 -0.5452 0.6445 -vn 0.1870 -0.5446 0.8176 -vn 0.1836 -0.5985 0.7798 -vn 0.5652 -0.8245 -0.0272 -vn 0.5652 -0.8245 -0.0271 -vn 0.5179 -0.8245 0.2279 -vn 0.3618 -0.8245 0.4350 -vn 0.1249 -0.8239 0.5528 -vn 0.1036 -0.8920 0.4400 -vn 0.2001 -0.9797 -0.0096 -vn 0.1834 -0.9797 0.0807 -vn 0.1281 -0.9797 0.1540 -vn 0.0459 -0.9797 0.1950 -vn 0.9285 -0.2588 -0.2662 -vn 0.9431 -0.1952 -0.2690 -vn 0.7624 -0.6086 -0.2197 -vn 0.7993 -0.5555 -0.2292 -vn 0.5850 -0.7935 -0.1677 -vn 0.5338 -0.8315 -0.1538 -vn 0.2492 -0.9659 -0.0704 -vn 0.1877 -0.9808 -0.0538 -vn 0.7044 -0.5997 -0.3798 -vn 0.2066 -0.2533 -0.9451 -vn 0.2066 -0.2532 -0.9451 -vn 0.5822 -0.2532 -0.7726 -vn 0.5822 -0.2533 -0.7726 -vn 0.8515 -0.2533 -0.4591 -vn 0.8515 -0.2532 -0.4591 -vn 0.1528 -0.6989 -0.6987 -vn 0.4304 -0.6989 -0.5712 -vn 0.6360 -0.6976 -0.3301 -vn 0.5435 -0.7866 -0.2930 -vn 0.0565 -0.9644 -0.2585 -vn 0.1592 -0.9644 -0.2113 -vn 0.1593 -0.9644 -0.2113 -vn 0.2329 -0.9644 -0.1256 -vn -0.0000 -0.1951 -0.9808 -vn -0.0003 -0.2588 -0.9659 -vn -0.0000 -0.4423 -0.8969 -vn -0.0000 -0.6087 -0.7934 -vn -0.0004 -0.7071 -0.7071 -vn -0.0000 -0.7935 -0.6086 -vn -0.0011 -0.8969 -0.4422 -vn -0.0000 -0.9807 -0.1953 -vn -0.3967 -0.8927 -0.2139 -vn -0.5040 -0.5466 -0.6688 -vn -0.1925 -0.4340 -0.8801 -vn -0.8640 -0.1908 -0.4659 -vn -0.8641 -0.1908 -0.4659 -vn -0.2097 -0.1908 -0.9590 -vn -0.5908 -0.1908 -0.7839 -vn -0.5907 -0.1908 -0.7840 -vn -0.1319 -0.7866 -0.6033 -vn -0.1709 -0.5997 -0.7817 -vn -0.7371 -0.5466 -0.3974 -vn -0.8003 -0.4354 -0.4123 -vn -0.7043 -0.5997 -0.3798 -vn -0.0962 -0.8927 -0.4402 -vn -0.1153 -0.8249 -0.5534 -vn -0.3397 -0.8255 -0.4508 -vn -0.1733 -0.5460 -0.8196 -vn -0.4968 -0.8255 -0.2679 -vn -0.5464 -0.7874 -0.2854 -vn -0.1757 -0.9799 -0.0947 -vn -0.1757 -0.9799 -0.0948 -vn -0.1202 -0.9799 -0.1594 -vn -0.1201 -0.9799 -0.1594 -vn -0.1201 -0.9799 -0.1595 -vn -0.0426 -0.9799 -0.1950 -vn -0.1877 -0.9808 -0.0538 -vn -0.4252 -0.8968 -0.1219 -vn -0.5850 -0.7935 -0.1678 -vn -0.5850 -0.7935 -0.1677 -vn -0.7626 -0.6088 -0.2187 -vn -0.7627 -0.6087 -0.2187 -vn -0.8622 -0.4421 -0.2473 -vn -0.8622 -0.4423 -0.2472 -vn -0.9428 -0.1951 -0.2704 -vn -0.9428 -0.1951 -0.2703 -vn -0.1036 -0.8920 0.4400 -vn -0.6182 -0.7854 -0.0297 -vn -0.2250 -0.1901 0.9556 -vn -0.2250 -0.1900 0.9556 -vn -0.9006 -0.4326 -0.0433 -vn -0.9806 -0.1901 -0.0471 -vn -0.8986 -0.1901 0.3954 -vn -0.6278 -0.1901 0.7548 -vn -0.5361 -0.5452 0.6445 -vn -0.8003 -0.5984 -0.0384 -vn -0.8375 -0.5446 -0.0456 -vn -0.7673 -0.5451 0.3377 -vn -0.7673 -0.5452 0.3376 -vn -0.1921 -0.5452 0.8160 -vn -0.1912 -0.4341 0.8804 -vn -0.1836 -0.5984 0.7798 -vn -0.4515 -0.8920 -0.0217 -vn -0.5658 -0.8239 -0.0323 -vn -0.5179 -0.8245 0.2279 -vn -0.3618 -0.8246 0.4350 -vn -0.3618 -0.8245 0.4350 -vn -0.1297 -0.8245 0.5508 -vn -0.1342 -0.7863 0.6031 -vn -0.0459 -0.9797 0.1950 -vn -0.1281 -0.9797 0.1541 -vn -0.1834 -0.9797 0.0807 -vn -0.2001 -0.9797 -0.0096 -vn 0.0000 -0.1950 0.9808 -vn 0.0000 -0.4422 0.8969 -vn 0.0000 -0.6088 0.7933 -vn 0.0000 -0.7935 0.6086 -vn 0.0000 -0.8968 0.4423 -vn 0.0000 -0.9808 0.1952 -vn 0.9428 -0.1951 0.2703 -vn 0.8622 -0.4423 0.2472 -vn 0.8621 -0.4422 0.2472 -vn 0.7627 -0.6087 0.2187 -vn 0.5850 -0.7935 0.1677 -vn 0.4252 -0.8968 0.1219 -vn 0.4252 -0.8968 0.1220 -vn 0.1876 -0.9808 0.0538 -vn 0.1877 -0.9808 0.0538 -vn 0.8640 -0.1908 0.4659 -vn 0.7043 -0.5997 0.3798 -vn 0.3967 -0.8927 0.2139 -vn 0.1757 -0.9799 0.0948 -vn 0.2276 -0.9648 0.1319 -vn 0.1592 -0.9644 0.2113 -vn 0.1592 -0.9643 0.2114 -vn 0.0565 -0.9644 0.2585 -vn 0.5435 -0.7866 0.2930 -vn 0.6237 -0.6999 0.3480 -vn 0.4305 -0.6988 0.5712 -vn 0.4305 -0.6988 0.5713 -vn 0.1528 -0.6988 0.6988 -vn 0.1528 -0.6989 0.6987 -vn 0.7930 -0.4340 0.4276 -vn 0.8479 -0.2536 0.4656 -vn 0.5822 -0.2533 0.7726 -vn 0.5822 -0.2532 0.7726 -vn 0.2066 -0.2532 0.9451 -vn 0.2067 -0.2532 0.9451 -vn 0.0000 -0.2588 0.9659 -vn 0.0000 -0.7072 0.7070 -vn 0.0000 -0.9659 0.2589 -vn 0.8802 0.0000 -0.4746 -vn 0.6018 0.0000 -0.7986 -vn 0.2136 0.0000 -0.9769 -vn -0.1058 -0.9944 0.0005 -vn -0.0272 -0.9996 -0.0004 -vn -0.0266 -0.9996 -0.0008 -vn -0.0269 -0.9996 -0.0006 -vn -0.0747 -0.9972 0.0006 -vn -0.0776 -0.9970 -0.0038 -vn -0.0770 -0.9970 -0.0042 -vn -0.0753 -0.9971 -0.0053 -vn -0.0749 -0.9972 -0.0056 -vn -0.0278 -0.9996 -0.0000 -vn 0.0587 0.0000 -0.9983 -vn 0.3393 0.0000 -0.9407 -vn 0.7276 0.0000 -0.6860 -vn 0.9678 0.0000 -0.2518 -vn 0.0000 -0.9808 -0.1949 -vn 0.0037 -0.9997 -0.0258 -vn 0.0000 -0.9758 -0.2186 -vn 0.0000 -0.8890 -0.4579 -vn 0.0010 -0.8317 -0.5552 -vn -0.0007 -0.7466 -0.6653 -vn 0.0013 -0.4844 -0.8749 -vn -0.0007 -0.5555 -0.8315 -vn 0.0002 -0.2907 -0.9568 -vn -0.0007 -0.1679 -0.9858 -vn 0.0000 -0.0976 -0.9952 -vn 0.0000 -0.1678 0.9858 -vn -0.0000 -0.1679 0.9858 -vn -0.0000 -0.4177 0.9086 -vn 0.0000 -0.4172 0.9088 -vn 0.0000 -0.5637 0.8260 -vn -0.0000 -0.5640 0.8258 -vn -0.0000 -0.7467 0.6651 -vn -0.0055 -0.8573 0.5148 -vn 0.0006 -0.7466 0.6653 -vn 0.0000 -0.8558 0.5173 -vn 0.0000 -0.9563 0.2925 -vn -0.0002 -0.9571 0.2899 -vn -0.0003 -0.9582 0.2860 -vn -0.0004 -0.9590 0.2834 -vn 0.0000 -0.9993 0.0375 -vn -0.0000 -0.9994 0.0336 -vn -0.0000 -0.9995 0.0308 -vn 0.0000 -0.9996 0.0269 -vn 0.0000 -0.0981 -0.9952 -vn 0.0007 -0.1679 -0.9858 -vn -0.0002 -0.2902 -0.9570 -vn 0.0004 -0.4849 -0.8746 -vn -0.0008 -0.5561 -0.8311 -vn 0.0007 -0.7469 -0.6649 -vn -0.0010 -0.8319 -0.5549 -vn 0.0000 -0.9994 -0.0353 -vn -0.0006 -0.9809 -0.1945 -vn 0.0000 -0.9735 -0.2287 -vn 0.0000 -0.8887 -0.4585 -vn 0.0000 -0.9995 0.0326 -vn 0.0006 -0.9809 0.1945 -vn 0.0000 -0.0981 0.9952 -vn -0.0007 -0.1679 0.9858 -vn 0.0002 -0.2902 0.9570 -vn -0.0004 -0.4846 0.8747 -vn 0.0009 -0.5561 0.8311 -vn -0.0007 -0.7470 0.6649 -vn 0.0010 -0.8319 0.5550 -vn 0.0000 -0.8890 0.4580 -vn 0.0000 -0.9744 0.2249 -vn -0.0426 0.0000 0.9991 -vn -0.3172 0.0000 0.9484 -vn -0.7135 0.0000 0.7006 -vn -0.7136 0.0000 0.7006 -vn -0.9641 0.0000 0.2654 -vn 1.0000 0.0000 0.0000 -vn 0.0396 0.0061 -0.9992 -vn 0.0467 0.0003 -0.9989 -vn 0.0406 0.0052 -0.9992 -vn 0.0474 0.0000 -0.9989 -vn 0.2468 -0.0369 -0.9684 -vn 0.3302 0.2347 -0.9143 -vn 0.4896 0.0000 -0.8720 -vn 0.8532 0.0000 -0.5216 -vn 0.7269 0.1175 -0.6766 -vn 0.7346 0.3014 -0.6079 -vn 0.6269 0.0000 -0.7791 -vn 0.9276 0.0000 -0.3735 -vn 0.9310 0.2731 -0.2422 -vn 0.9927 0.0000 -0.1206 -vn 0.0095 -0.9760 0.2174 -vn 0.0037 -0.9761 0.2175 -vn 0.0100 -0.9760 0.2177 -vn 0.0465 -0.7460 0.6643 -vn 0.4575 -0.8883 0.0404 -vn 0.0325 -0.9995 0.0029 -vn 0.6642 -0.7467 0.0352 -vn 0.0316 -0.1679 0.9853 -vn 0.0010 -0.9998 0.0213 -vn 0.0001 -0.9998 0.0221 -vn 0.0453 -0.1949 0.9798 -vn 0.2530 -0.1915 0.9483 -vn 0.2530 -0.1918 0.9483 -vn 0.5610 -0.1924 0.8051 -vn 0.5610 -0.1925 0.8051 -vn 0.7789 -0.1934 0.5966 -vn 0.9200 -0.1926 0.3413 -vn 0.9201 -0.1922 0.3413 -vn 0.7833 -0.5496 0.2906 -vn 0.7830 -0.5500 0.2904 -vn 0.7831 -0.5499 0.2905 -vn 0.7828 -0.5504 0.2903 -vn 0.6618 -0.5524 0.5068 -vn 0.6618 -0.5523 0.5069 -vn 0.6620 -0.5520 0.5070 -vn 0.4773 -0.5501 0.6852 -vn 0.4774 -0.5503 0.6850 -vn 0.4773 -0.5506 0.6848 -vn 0.2154 -0.5492 0.8074 -vn 0.2155 -0.5487 0.8078 -vn 0.2155 -0.5487 0.8077 -vn 0.0544 -0.5557 0.8296 -vn 0.0090 -0.4846 0.8747 -vn 0.0211 -0.8888 0.4578 -vn 0.0021 -0.8308 0.5565 -vn 0.1450 -0.8266 0.5438 -vn 0.1449 -0.8269 0.5434 -vn 0.1449 -0.8269 0.5433 -vn 0.3208 -0.8278 0.4602 -vn 0.3209 -0.8276 0.4605 -vn 0.3209 -0.8276 0.4606 -vn 0.4441 -0.8288 0.3403 -vn 0.4440 -0.8290 0.3401 -vn 0.4439 -0.8290 0.3400 -vn 0.5261 -0.8278 0.1949 -vn 0.5267 -0.8273 0.1953 -vn 0.5263 -0.8276 0.1950 -vn 0.5269 -0.8272 0.1953 -vn 0.5527 -0.8309 0.0649 -vn 0.8302 -0.5538 0.0639 -vn 0.8714 -0.4839 0.0812 -vn 0.9777 -0.1943 0.0803 -vn 0.9821 -0.1672 0.0862 -vn -0.0007 -0.9807 0.1955 -vn 0.0511 -0.9801 0.1917 -vn 0.0511 -0.9801 0.1918 -vn 0.0510 -0.9802 0.1915 -vn 0.1130 -0.9803 0.1621 -vn 0.1131 -0.9803 0.1622 -vn 0.1562 -0.9804 0.1197 -vn 0.1563 -0.9804 0.1197 -vn 0.1562 -0.9805 0.1196 -vn 0.1854 -0.9803 0.0686 -vn 0.1853 -0.9803 0.0686 -vn 0.1857 -0.9802 0.0687 -vn 0.1857 -0.9802 0.0688 -vn 0.1950 -0.9807 0.0172 -vn 0.2251 -0.9742 0.0133 -vn -0.6639 -0.7465 0.0444 -vn -0.0186 -0.8889 0.4576 -vn -0.0009 -0.9997 0.0228 -vn 0.0031 -0.9760 0.2176 -vn 0.0294 -0.7464 0.6648 -vn -0.0402 -0.1677 0.9850 -vn -0.9856 -0.1676 0.0226 -vn -0.0337 -0.9994 0.0013 -vn -0.0337 -0.9994 0.0007 -vn -0.0079 -0.9808 0.1950 -vn -0.0514 -0.9802 0.1913 -vn -0.0514 -0.9801 0.1918 -vn -0.0514 -0.9801 0.1917 -vn -0.1143 -0.9802 0.1614 -vn -0.1142 -0.9803 0.1612 -vn -0.1429 -0.9808 0.1329 -vn -0.1681 -0.9803 0.1035 -vn -0.1680 -0.9803 0.1035 -vn -0.1928 -0.9803 0.0439 -vn -0.1927 -0.9803 0.0440 -vn -0.1957 -0.9806 -0.0074 -vn -0.2272 -0.9738 0.0089 -vn -0.2274 -0.9738 0.0083 -vn -0.2272 -0.9738 0.0050 -vn -0.4582 -0.8886 0.0180 -vn -0.5566 -0.8308 -0.0052 -vn -0.5472 -0.8277 0.1247 -vn -0.5473 -0.8276 0.1247 -vn -0.4773 -0.8281 0.2939 -vn -0.4774 -0.8280 0.2939 -vn -0.4073 -0.8311 0.3787 -vn -0.4072 -0.8311 0.3787 -vn -0.3242 -0.8278 0.4578 -vn -0.3245 -0.8275 0.4581 -vn -0.3244 -0.8276 0.4581 -vn -0.3246 -0.8273 0.4584 -vn -0.1459 -0.8269 0.5431 -vn -0.1460 -0.8266 0.5436 -vn -0.1458 -0.8268 0.5432 -vn -0.1461 -0.8264 0.5437 -vn -0.0616 -0.8311 0.5527 -vn -0.8746 -0.4849 -0.0012 -vn -0.8745 -0.4849 -0.0015 -vn -0.8746 -0.4849 -0.0017 -vn -0.8299 -0.5557 0.0509 -vn -0.8141 -0.5503 0.1855 -vn -0.8142 -0.5501 0.1855 -vn -0.7107 -0.5508 0.4376 -vn -0.7106 -0.5510 0.4375 -vn -0.6088 -0.5555 0.5663 -vn -0.6089 -0.5555 0.5663 -vn -0.6090 -0.5555 0.5663 -vn -0.6090 -0.5554 0.5662 -vn -0.4826 -0.5505 0.6812 -vn -0.4827 -0.5502 0.6814 -vn -0.4827 -0.5501 0.6814 -vn -0.2168 -0.5495 0.8069 -vn -0.2171 -0.5487 0.8074 -vn -0.2169 -0.5491 0.8071 -vn -0.2172 -0.5484 0.8076 -vn -0.0119 -0.5552 0.8316 -vn -0.9800 -0.1951 0.0385 -vn -0.9568 -0.1926 0.2180 -vn -0.9568 -0.1925 0.2180 -vn -0.8355 -0.1929 0.5145 -vn -0.8356 -0.1927 0.5145 -vn -0.7182 -0.1947 0.6680 -vn -0.7183 -0.1951 0.6679 -vn -0.5673 -0.1926 0.8007 -vn -0.5672 -0.1925 0.8008 -vn -0.2549 -0.1921 0.9477 -vn -0.2549 -0.1914 0.9478 -vn -0.0267 -0.1948 0.9805 -vn -0.0469 -0.4840 0.8738 -vn -0.6648 -0.7470 0.0033 -vn -0.4585 -0.8887 0.0000 -vn -0.1950 -0.9808 0.0000 -vn -0.2273 -0.9738 0.0011 -vn -0.0338 -0.9994 0.0000 -vn -0.9952 -0.0981 0.0000 -vn -0.9858 -0.1677 -0.0011 -vn -0.9570 -0.2899 0.0003 -vn -0.8746 -0.4849 -0.0006 -vn -0.8309 -0.5564 0.0012 -vn -0.5573 -0.8303 -0.0022 -vn -0.8102 0.0000 0.5861 -vn -0.8891 0.0000 0.4576 -vn -0.9432 -0.2009 0.2645 -vn -0.9717 -0.0818 0.2214 -vn -0.9992 0.0000 0.0393 -vn -0.0408 0.0000 0.9992 -vn -0.2585 -0.1010 0.9607 -vn -0.2642 -0.1172 0.9573 -vn -0.4720 0.0000 0.8816 -vn -0.7036 0.0000 0.7106 -vn -0.5729 -0.3515 0.7404 -vn -0.7263 -0.1279 0.6754 -vn -0.4774 -0.8281 0.2939 -vn -0.4826 -0.5504 0.6813 -vn -0.0009 -0.9998 0.0216 -vn -0.8298 -0.5557 0.0509 -vn -0.9856 -0.1677 0.0226 -vn -0.9800 -0.1950 0.0385 -vn -0.9567 -0.1927 0.2181 -vn -0.2272 -0.9738 0.0083 -vn -0.2273 -0.9738 0.0050 -vn -0.4582 -0.8887 0.0180 -vn -0.8746 -0.4849 -0.0014 -vn -0.0119 -0.5551 0.8317 -vn -0.0469 -0.4841 0.8738 -vn -0.2169 -0.5490 0.8072 -vn -0.2171 -0.5487 0.8073 -vn -0.2172 -0.5483 0.8076 -vn -0.2549 -0.1920 0.9477 -vn -0.2549 -0.1915 0.9478 -vn -0.3245 -0.8275 0.4582 -vn -0.3246 -0.8274 0.4583 -vn -0.3246 -0.8274 0.4584 -vn -0.1458 -0.8269 0.5430 -vn -0.1460 -0.8266 0.5435 -vn -0.1461 -0.8264 0.5438 -vn -0.6048 0.1526 0.7816 -vn -0.4630 -0.1949 0.8647 -vn -0.4072 -0.8312 0.3787 -vn -0.6090 -0.5554 0.5663 -vn -0.6088 -0.5556 0.5663 -vn -0.6090 -0.5553 0.5663 -vn -0.0616 -0.8312 0.5526 -vn -0.1461 -0.8264 0.5439 -vn -0.4828 -0.5501 0.6814 -vn -0.5672 -0.1927 0.8007 -vn -0.7183 -0.1950 0.6679 -vn -0.7183 -0.1950 0.6678 -vn -0.7182 -0.1949 0.6679 -vn -0.7182 -0.1948 0.6680 -vn -0.7106 -0.5511 0.4375 -vn -0.7107 -0.5508 0.4375 -vn -0.7107 -0.5509 0.4375 -vn -0.7106 -0.5511 0.4374 -vn -0.8464 0.1096 0.5211 -vn -0.7947 -0.1945 0.5750 -vn -0.1928 -0.9803 0.0440 -vn -0.1680 -0.9803 0.1034 -vn -0.1429 -0.9808 0.1330 -vn -0.1143 -0.9803 0.1614 -vn -0.0514 -0.9802 0.1912 -vn -0.0514 -0.9802 0.1915 -vn 0.0031 -0.9760 0.2177 -vn -0.0337 -0.9994 0.0006 -vn -0.5470 -0.8278 0.1247 -vn -0.5471 -0.8277 0.1247 -vn -0.8142 -0.5502 0.1855 -vn -0.9568 -0.1923 0.2181 -vn -0.8722 -0.1945 0.4489 -vn -0.9952 -0.0976 0.0000 -vn -0.9858 -0.1678 -0.0011 -vn -0.9569 -0.2904 0.0003 -vn -0.8310 -0.5563 0.0012 -vn -0.5572 -0.8304 -0.0022 -vn -0.4584 -0.8887 0.0000 -vn -0.2274 -0.9738 0.0011 -vn -0.0337 -0.9994 0.0000 -vn -0.0375 -0.9993 -0.0022 -vn -0.0375 -0.9993 0.0000 -vn -0.0375 -0.9993 -0.0020 -vn -0.1940 -0.9810 0.0010 -vn -0.9952 -0.0979 0.0000 -vn -0.9858 -0.1679 -0.0011 -vn -0.8747 -0.4847 -0.0006 -vn -0.6651 -0.7467 -0.0010 -vn -0.5547 -0.8320 0.0015 -vn -0.4576 -0.8891 0.0000 -vn -0.2322 -0.9727 0.0000 -vn 0.0000 -1.0000 0.0014 -vn 0.0000 -1.0000 0.0023 -vn 0.9952 -0.0982 0.0000 -vn 0.9858 -0.1677 -0.0011 -vn 0.9569 -0.2903 0.0003 -vn 0.9088 -0.4173 -0.0003 -vn 0.8309 -0.5564 0.0013 -vn 0.8261 -0.5636 0.0012 -vn 0.1950 -0.9808 0.0000 -vn 0.0335 -0.9994 0.0051 -vn 0.0333 -0.9994 -0.0038 -vn 0.0332 -0.9994 0.0052 -vn 0.2912 -0.9567 -0.0017 -vn 0.5548 -0.8320 0.0014 -vn 0.5185 -0.8551 0.0023 -vn 0.6648 -0.7470 -0.0010 -vn 0.0391 -0.1679 -0.9850 -vn 0.0327 -0.5637 -0.8253 -vn 0.0360 -0.4175 -0.9080 -vn 0.0175 -0.8973 -0.4411 -vn 0.0206 -0.8550 -0.5182 -vn 0.0000 -0.9996 -0.0279 -vn 0.0011 -0.9996 -0.0281 -vn 0.0208 -0.9754 -0.2196 -vn 0.5178 -0.8532 -0.0627 -vn 0.2905 -0.9562 -0.0352 -vn 0.9029 -0.4156 -0.1096 -vn 0.8214 -0.5616 -0.0997 -vn 0.0739 -0.2589 -0.9631 -vn 0.2388 -0.2546 -0.9371 -vn 0.2388 -0.2543 -0.9372 -vn 0.2388 -0.2548 -0.9370 -vn 0.4730 -0.2582 -0.8424 -vn 0.4732 -0.5406 -0.6956 -vn 0.9788 -0.1669 -0.1189 -vn 0.9581 -0.2572 -0.1261 -vn 0.8966 -0.2566 -0.3610 -vn 0.8185 -0.4450 -0.3633 -vn 0.8241 -0.2587 -0.5038 -vn 0.7445 -0.2574 -0.6160 -vn 0.7445 -0.2575 -0.6160 -vn 0.7445 -0.2573 -0.6161 -vn 0.6056 -0.2580 -0.7528 -vn 0.6613 -0.7445 -0.0919 -vn 0.7045 -0.7042 -0.0880 -vn 0.6512 -0.7017 -0.2890 -vn 0.6511 -0.7019 -0.2890 -vn 0.6508 -0.7021 -0.2890 -vn 0.5465 -0.7048 -0.4523 -vn 0.5467 -0.7047 -0.4523 -vn 0.5467 -0.7046 -0.4523 -vn 0.4006 -0.7021 -0.5887 -vn 0.4005 -0.7022 -0.5887 -vn 0.1762 -0.7008 -0.6912 -vn 0.1764 -0.7004 -0.6916 -vn 0.1762 -0.7006 -0.6914 -vn 0.1764 -0.7002 -0.6918 -vn 0.0602 -0.7067 -0.7050 -vn 0.0340 -0.7463 -0.6647 -vn 0.0403 -0.9657 -0.2566 -vn 0.0650 -0.9648 -0.2549 -vn 0.0650 -0.9647 -0.2551 -vn 0.0650 -0.9649 -0.2546 -vn 0.1473 -0.9651 -0.2165 -vn 0.1474 -0.9651 -0.2167 -vn 0.2005 -0.9655 -0.1659 -vn 0.2004 -0.9656 -0.1658 -vn 0.2004 -0.9656 -0.1657 -vn 0.2394 -0.9651 -0.1062 -vn 0.2396 -0.9650 -0.1064 -vn 0.2575 -0.9656 -0.0362 -vn 0.0331 -0.9994 -0.0040 -vn -0.0472 -0.5573 -0.8290 -vn -0.0452 -0.5634 -0.8249 -vn -0.0459 -0.5612 -0.8264 -vn -0.9212 -0.3650 -0.1352 -vn -0.9584 -0.2226 -0.1789 -vn -0.9656 -0.1410 -0.2186 -vn -0.7277 -0.6782 -0.1028 -vn -0.4896 -0.8716 -0.0248 -vn -0.4022 -0.9120 -0.0802 -vn -0.4648 -0.8830 -0.0652 -vn 0.0000 -1.0000 -0.0003 -vn -0.0310 -0.8544 -0.5187 -vn -0.0168 -0.8973 -0.4412 -vn -0.0084 -0.9755 -0.2198 -vn -0.0376 -0.1678 -0.9851 -vn -0.0461 -0.1950 -0.9797 -vn -0.2361 -0.1924 -0.9525 -vn -0.2360 -0.1923 -0.9525 -vn -0.4343 -0.1947 -0.8795 -vn -0.4342 -0.1950 -0.8794 -vn -0.5795 -0.1936 -0.7917 -vn -0.5796 -0.1935 -0.7916 -vn -0.7336 -0.1943 -0.6512 -vn -0.7338 -0.1935 -0.6512 -vn -0.8810 -0.1928 -0.4321 -vn -0.8816 -0.1910 -0.4316 -vn -0.9634 -0.1948 -0.1844 -vn -0.9846 -0.0365 -0.1709 -vn -0.0312 -0.4174 -0.9082 -vn -0.0477 -0.5556 -0.8301 -vn -0.2009 -0.5502 -0.8105 -vn -0.2009 -0.5504 -0.8104 -vn -0.3683 -0.5553 -0.7457 -vn -0.4923 -0.5526 -0.6725 -vn -0.4924 -0.5524 -0.6726 -vn -0.4923 -0.5528 -0.6724 -vn -0.6225 -0.5543 -0.5525 -vn -0.6228 -0.5532 -0.5532 -vn -0.6225 -0.5541 -0.5527 -vn -0.6229 -0.5530 -0.5533 -vn -0.7490 -0.5514 -0.3673 -vn -0.7505 -0.5480 -0.3695 -vn -0.7494 -0.5505 -0.3679 -vn -0.7509 -0.5471 -0.3700 -vn -0.8211 -0.5544 -0.1358 -vn -0.8096 -0.5728 -0.1284 -vn -0.0134 -0.7466 -0.6652 -vn -0.0393 -0.8314 -0.5543 -vn -0.1350 -0.8277 -0.5447 -vn -0.2463 -0.8310 -0.4987 -vn -0.2463 -0.8311 -0.4987 -vn -0.3302 -0.8292 -0.4510 -vn -0.4166 -0.8303 -0.3702 -vn -0.4171 -0.8298 -0.3708 -vn -0.4169 -0.8301 -0.3703 -vn -0.4173 -0.8296 -0.3710 -vn -0.5022 -0.8285 -0.2476 -vn -0.5050 -0.8259 -0.2507 -vn -0.5030 -0.8278 -0.2484 -vn -0.5058 -0.8252 -0.2515 -vn -0.5515 -0.8301 -0.0826 -vn -0.5679 -0.8185 -0.0876 -vn -0.1932 -0.9808 -0.0265 -vn -0.1932 -0.9808 -0.0268 -vn -0.1936 -0.9807 -0.0269 -vn -0.1933 -0.9808 -0.0271 -vn -0.1942 -0.9806 -0.0272 -vn -0.1764 -0.9803 -0.0886 -vn -0.1786 -0.9799 -0.0888 -vn -0.1781 -0.9800 -0.0888 -vn -0.1758 -0.9804 -0.0885 -vn -0.1464 -0.9806 -0.1304 -vn -0.1468 -0.9805 -0.1306 -vn -0.1462 -0.9807 -0.1301 -vn -0.1461 -0.9807 -0.1301 -vn -0.1161 -0.9805 -0.1585 -vn -0.1161 -0.9805 -0.1584 -vn -0.1161 -0.9805 -0.1587 -vn -0.0865 -0.9808 -0.1750 -vn -0.0475 -0.9803 -0.1918 -vn -0.0476 -0.9802 -0.1920 -vn -0.0161 -0.9808 -0.1945 -vn -0.0011 -0.9996 -0.0277 -vn 0.0586 -0.5629 -0.8245 -vn 0.0645 -0.4168 -0.9067 -vn 0.0368 -0.8558 -0.5160 -vn 0.0002 -0.9997 -0.0246 -vn 0.0017 -0.9997 -0.0246 -vn 0.0213 -0.9754 -0.2192 -vn 0.2518 -0.9666 -0.0473 -vn 0.2525 -0.9664 -0.0476 -vn 0.2535 -0.9662 -0.0480 -vn 0.6811 -0.7177 -0.1449 -vn 0.5937 -0.7966 -0.1137 -vn 0.5185 -0.8496 -0.0969 -vn 0.9251 -0.0636 -0.3743 -vn 0.9256 -0.1804 -0.3328 -vn 0.9093 -0.2966 -0.2919 -vn 0.8733 -0.4158 -0.2540 -vn 0.9096 -0.3724 -0.1842 -vn 0.2541 -0.9660 -0.0482 -vn 0.2526 -0.9649 -0.0722 -vn 0.2499 -0.9657 -0.0703 -vn 0.2507 -0.9655 -0.0708 -vn 0.2533 -0.9647 -0.0727 -vn 0.2113 -0.9655 -0.1521 -vn 0.2118 -0.9653 -0.1528 -vn 0.2116 -0.9654 -0.1525 -vn 0.2112 -0.9656 -0.1519 -vn 0.1668 -0.9654 -0.2004 -vn 0.1670 -0.9653 -0.2008 -vn 0.1668 -0.9655 -0.2002 -vn 0.1310 -0.9659 -0.2232 -vn 0.1310 -0.9659 -0.2233 -vn 0.0828 -0.9650 -0.2490 -vn 0.0827 -0.9651 -0.2485 -vn 0.0827 -0.9651 -0.2486 -vn 0.0828 -0.9649 -0.2491 -vn 0.0330 -0.9660 -0.2565 -vn 0.0314 -0.8967 -0.4415 -vn 0.0509 -0.7457 -0.6643 -vn 0.0658 -0.7065 -0.7047 -vn 0.2249 -0.7014 -0.6764 -vn 0.2247 -0.7019 -0.6759 -vn 0.2248 -0.7015 -0.6763 -vn 0.2246 -0.7020 -0.6758 -vn 0.3581 -0.7065 -0.6104 -vn 0.3581 -0.7066 -0.6104 -vn 0.3580 -0.7066 -0.6103 -vn 0.3580 -0.7067 -0.6103 -vn 0.4544 -0.7042 -0.5455 -vn 0.4548 -0.7037 -0.5458 -vn 0.4549 -0.7036 -0.5459 -vn 0.4550 -0.7035 -0.5460 -vn 0.5758 -0.7048 -0.4142 -vn 0.5772 -0.7036 -0.4145 -vn 0.5763 -0.7045 -0.4143 -vn 0.5775 -0.7033 -0.4146 -vn 0.6866 -0.6998 -0.1972 -vn 0.6820 -0.7040 -0.1979 -vn 0.6853 -0.7010 -0.1974 -vn 0.6808 -0.7052 -0.1981 -vn 0.6904 -0.7067 -0.1550 -vn 0.8441 -0.5137 -0.1540 -vn 0.9209 -0.2554 -0.2943 -vn 0.7852 -0.2564 -0.5637 -vn 0.7852 -0.2572 -0.5633 -vn 0.6188 -0.2563 -0.7426 -vn 0.6187 -0.2570 -0.7424 -vn 0.4887 -0.2587 -0.8332 -vn 0.3048 -0.2557 -0.9174 -vn 0.3048 -0.2550 -0.9176 -vn 0.0858 -0.2585 -0.9622 -vn 0.0701 -0.1676 -0.9834 -vn -0.4369 -0.8297 -0.3475 -vn -0.4367 -0.8299 -0.3473 -vn -0.4757 -0.5499 -0.6865 -vn -0.4758 -0.5495 -0.6868 -vn -0.4756 -0.5503 -0.6863 -vn -0.8282 -0.5531 -0.0903 -vn -0.9792 -0.1669 -0.1156 -vn -0.9747 -0.1939 -0.1114 -vn -0.9053 -0.1924 -0.3786 -vn -0.9053 -0.1925 -0.3786 -vn -0.2318 -0.9724 -0.0264 -vn -0.4566 -0.8882 -0.0521 -vn -0.5534 -0.8300 -0.0699 -vn -0.6629 -0.7453 -0.0712 -vn -0.8692 -0.4824 -0.1080 -vn -0.0119 -0.9756 -0.2193 -vn -0.0461 -0.8548 -0.5169 -vn -0.0282 -0.7464 -0.6649 -vn -0.0470 -0.4173 -0.9076 -vn -0.0588 -0.1949 -0.9791 -vn -0.0535 -0.1678 -0.9844 -vn -0.2710 -0.1927 -0.9431 -vn -0.2710 -0.1923 -0.9432 -vn -0.2307 -0.5499 -0.8027 -vn -0.2308 -0.5499 -0.8027 -vn -0.2307 -0.5503 -0.8025 -vn -0.0542 -0.5611 -0.8260 -vn -0.0555 -0.5553 -0.8298 -vn -0.0551 -0.5570 -0.8287 -vn -0.0537 -0.5630 -0.8247 -vn -0.3198 -0.8273 -0.4619 -vn -0.3194 -0.8278 -0.4612 -vn -0.3196 -0.8275 -0.4615 -vn -0.3193 -0.8281 -0.4609 -vn -0.1550 -0.8279 -0.5391 -vn -0.1550 -0.8278 -0.5391 -vn -0.1550 -0.8278 -0.5392 -vn -0.5591 -0.1922 -0.8065 -vn -0.5590 -0.1923 -0.8066 -vn -0.5590 -0.1927 -0.8065 -vn -0.5589 -0.1928 -0.8065 -vn -0.4755 -0.5507 -0.6860 -vn -0.2307 -0.5503 -0.8024 -vn -0.1551 -0.8275 -0.5396 -vn -0.0409 -0.8313 -0.5544 -vn -0.0239 -0.8970 -0.4414 -vn -0.6518 -0.5534 -0.5185 -vn -0.6518 -0.5535 -0.5185 -vn -0.6520 -0.5530 -0.5187 -vn -0.7576 -0.2502 -0.6028 -vn -0.7622 -0.1940 -0.6176 -vn -0.1824 -0.9803 -0.0763 -vn -0.1535 -0.9806 -0.1221 -vn -0.1536 -0.9805 -0.1222 -vn -0.1127 -0.9802 -0.1628 -vn -0.1124 -0.9803 -0.1625 -vn -0.1124 -0.9803 -0.1624 -vn -0.0546 -0.9803 -0.1899 -vn -0.0547 -0.9802 -0.1902 -vn -0.0160 -0.9808 -0.1943 -vn -0.0013 -0.9997 -0.0247 -vn -0.0374 -0.9993 -0.0042 -vn -0.1940 -0.9806 -0.0266 -vn -0.5179 -0.8276 -0.2166 -vn -0.5178 -0.8276 -0.2166 -vn -0.7704 -0.5502 -0.3222 -vn -0.7704 -0.5501 -0.3222 -vn -0.8234 -0.1952 -0.5329 -vn -0.9991 0.0000 -0.0418 -vn -0.7769 0.0000 -0.6296 -vn -0.8395 0.0000 -0.5433 -vn -0.9430 0.0371 -0.3307 -vn -0.8903 0.2622 -0.3723 -vn -0.9921 -0.0540 -0.1133 -vn -0.5124 0.4368 -0.7393 -vn -0.6684 -0.1476 -0.7290 -vn -0.2746 0.1075 -0.9555 -vn -0.2423 0.2076 -0.9477 -vn -0.0542 0.0000 -0.9985 -vn -0.1707 0.0000 0.9853 -vn -0.5157 0.0000 0.8567 -vn -0.5157 0.0000 0.8568 -vn -0.8698 0.0000 0.4934 -vn 0.9994 0.0000 0.0334 -vn 0.9541 0.0000 0.2994 -vn 0.6918 0.0000 0.7221 -vn 0.2616 0.0000 0.9652 -vn -0.9468 -0.2766 -0.1643 -vn -0.8300 -0.5236 -0.1922 -vn -0.8159 -0.4908 -0.3057 -vn -0.8157 -0.4916 -0.3050 -vn -0.8135 -0.4987 -0.2991 -vn -0.8130 -0.5002 -0.2979 -vn -0.7841 -0.3712 -0.4974 -vn -0.7789 -0.3924 -0.4891 -vn -0.7499 -0.2205 -0.6237 -vn -0.7406 -0.2541 -0.6221 -vn -0.7214 -0.0585 -0.6901 -vn -0.7055 -0.1003 -0.7016 -vn -0.3511 -0.6140 -0.7069 -vn -0.3513 -0.6141 -0.7068 -vn -0.3522 -0.6140 -0.7063 -vn -0.3525 -0.6139 -0.7063 -vn -0.7078 0.0027 -0.7064 -vn -0.7073 0.0017 -0.7069 -vn -0.7074 0.0019 -0.7068 -vn -0.7079 0.0029 -0.7063 -vn -0.7046 -0.0527 -0.7077 -vn -0.7276 -0.0901 -0.6800 -vn -0.5467 -0.4381 -0.7136 -vn -0.5215 -0.4951 -0.6950 -vn -0.5061 -0.4966 -0.7052 -vn -0.4780 -0.5211 -0.7071 -vn -0.4271 -0.5655 -0.7056 -vn -0.4859 -0.5847 -0.6497 -vn -0.3979 -0.5838 -0.7077 -vn -0.6973 -0.1195 -0.7067 -vn -0.6902 -0.1536 -0.7071 -vn -0.6806 -0.2015 -0.7044 -vn -0.6966 -0.1937 -0.6908 -vn -0.6527 -0.2544 -0.7136 -vn -0.6567 -0.3102 -0.6874 -vn -0.6299 -0.3223 -0.7066 -vn -0.5822 -0.4034 -0.7059 -vn -0.6202 -0.4014 -0.6740 -vn -0.4069 -0.5815 -0.7045 -vn -0.4469 -0.5820 -0.6794 -vn -0.5662 -0.5273 -0.6336 -vn -0.5894 -0.5326 -0.6074 -vn -0.7158 -0.4849 -0.5025 -vn -0.7254 -0.4913 -0.4822 -vn -0.8350 -0.4563 -0.3074 -vn -0.8352 -0.4567 -0.3063 -vn -0.8364 -0.4603 -0.2976 -vn -0.8366 -0.4610 -0.2958 -vn -0.8628 -0.4582 -0.2135 -vn -0.7180 -0.6812 -0.1429 -vn -0.9676 0.0652 -0.2439 -vn -0.9106 0.3331 -0.2445 -vn 0.2338 0.9583 -0.1643 -vn -0.0385 0.9806 -0.1922 -vn -0.0172 0.9520 -0.3057 -vn -0.0181 0.9522 -0.3051 -vn -0.0252 0.9539 -0.2992 -vn -0.0267 0.9542 -0.2979 -vn 0.0705 0.8647 -0.4974 -vn 0.0497 0.8708 -0.4892 -vn 0.1840 0.7597 -0.6237 -vn 0.1502 0.7684 -0.6221 -vn 0.3100 0.6540 -0.6901 -vn 0.2659 0.6611 -0.7016 -vn 0.0346 0.9763 -0.2135 -vn -0.2310 0.9624 -0.1429 -vn -0.3002 0.6431 -0.7045 -vn -0.2806 0.6780 -0.6794 -vn -0.1736 0.7540 -0.6336 -vn -0.1666 0.7767 -0.6074 -vn -0.0621 0.8623 -0.5025 -vn -0.0628 0.8738 -0.4821 -vn 0.0223 0.9513 -0.3074 -vn 0.0221 0.9517 -0.3063 -vn 0.0196 0.9545 -0.2977 -vn 0.0191 0.9550 -0.2959 -vn 0.3286 0.6821 -0.6532 -vn 0.2771 0.6501 -0.7075 -vn 0.3565 0.6116 -0.7063 -vn 0.3562 0.6116 -0.7064 -vn 0.3553 0.6117 -0.7068 -vn 0.3551 0.6117 -0.7069 -vn -0.2757 0.6528 -0.7055 -vn -0.3562 0.6110 -0.7069 -vn -0.3562 0.6112 -0.7068 -vn -0.3556 0.6122 -0.7062 -vn -0.3554 0.6122 -0.7063 -vn -0.3067 0.6365 -0.7077 -vn -0.2631 0.7137 -0.6491 -vn -0.0572 0.7076 -0.7043 -vn -0.0374 0.7378 -0.6739 -vn -0.1060 0.6925 -0.7136 -vn -0.1674 0.6991 -0.6951 -vn -0.1769 0.6861 -0.7057 -vn -0.2112 0.6748 -0.7071 -vn 0.2469 0.6630 -0.7067 -vn 0.2139 0.6740 -0.7071 -vn 0.1681 0.6918 -0.7023 -vn 0.1805 0.7002 -0.6908 -vn 0.1060 0.6925 -0.7136 -vn 0.0609 0.7231 -0.6881 -vn 0.0371 0.7066 -0.7067 -vn 0.0009 0.7071 -0.7071 -vn 0.8562 0.5167 0.0000 -vn 0.8360 0.5487 0.0022 -vn 0.8394 0.5434 -0.0035 -vn 0.8348 0.5506 0.0006 -vn 0.8358 0.5491 -0.0039 -vn 0.8363 0.5482 -0.0053 -vn 0.8412 0.5406 0.0136 -vn 0.8704 0.4900 -0.0481 -vn -0.3345 0.5791 -0.7435 -vn -0.3343 0.5792 -0.7434 -vn -0.1925 0.3336 -0.9228 -vn -0.1926 0.3336 -0.9228 -vn -0.0869 0.1505 -0.9848 -vn -0.5001 0.8659 0.0000 -vn -0.0927 0.1605 0.9827 -vn -0.0926 0.1605 0.9827 -vn -0.2105 0.3647 0.9070 -vn -0.3075 0.5327 0.7884 -vn -0.4269 0.7396 0.5203 -vn -0.4271 0.7395 0.5203 -vn 0.8660 0.5000 0.0001 -vn 0.8660 0.5000 -0.0001 -vn 0.8660 0.5001 0.0001 -vn -0.4805 0.8325 -0.2756 -vn -0.4807 0.8324 -0.2756 -vn 0.9000 0.4183 0.1222 -vn 0.9280 0.3146 0.1995 -vn 0.8923 0.3779 0.2469 -vn 0.9239 0.2613 0.2794 -vn 0.9298 0.2366 0.2818 -vn 0.8430 0.3233 0.4298 -vn 0.8694 0.1777 0.4610 -vn 0.7925 0.3353 0.5094 -vn 0.8347 0.1597 0.5271 -vn 0.7271 0.3596 0.5848 -vn 0.7155 0.1325 0.6859 -vn 0.6125 0.3536 0.7070 -vn 0.6124 0.3536 0.7071 -vn 0.6124 0.3535 0.7071 -vn 0.4423 0.8969 0.0000 -vn 0.3123 0.9485 -0.0536 -vn 0.3128 0.9498 0.0000 -vn 0.4378 0.8991 0.0091 -vn 0.8129 0.5825 0.0000 -vn 0.6900 0.7231 -0.0319 -vn 0.4921 0.8706 0.0000 -vn 0.6836 0.7299 0.0000 -vn 0.7587 0.6514 0.0038 -vn 0.5789 0.2588 -0.7732 -vn 0.5788 0.2600 -0.7729 -vn 0.5786 0.2621 -0.7723 -vn 0.5786 0.2631 -0.7720 -vn 0.5641 0.2219 -0.7953 -vn 0.2588 0.9659 0.0000 -vn 0.2589 0.9659 0.0000 -vn 0.2590 0.9659 0.0000 -vn 0.5530 0.0326 0.8326 -vn 0.7164 0.1162 0.6880 -vn 0.7167 0.1161 0.6876 -vn 0.7175 0.1157 0.6868 -vn 0.9003 0.4279 0.0799 -vn 0.9493 0.2885 0.1244 -vn 0.9167 0.2974 0.2669 -vn 0.7179 0.1156 0.6865 -vn 0.6959 0.0430 0.7169 -vn 0.7207 0.0369 0.6922 -vn 0.2552 0.0028 0.9669 -vn 0.2699 0.0275 0.9625 -vn 0.3805 0.0218 0.9245 -vn 0.9293 0.2672 0.2550 -vn 0.9532 0.1547 0.2598 -vn 0.9521 0.1553 0.2636 -vn 0.9524 0.1551 0.2623 -vn 0.9536 0.1545 0.2585 -vn 0.9632 0.0734 0.2587 -vn 0.9961 0.0293 0.0833 -vn 0.9682 0.0561 0.2438 -vn 0.9135 0.0664 0.4014 -vn 0.8607 0.0623 0.5053 -vn 0.9870 0.1610 -0.0000 -vn 0.9971 0.0760 0.0000 -vn 0.9032 0.4292 0.0000 -vn 0.9032 0.4293 0.0000 -vn 0.9568 0.2908 0.0000 -vn 0.9513 0.3084 -0.0031 -vn 0.9703 0.2420 0.0000 -vn 0.8689 0.1760 -0.4627 -vn 0.9013 0.1197 -0.4164 -vn 0.8377 0.2987 -0.4571 -vn 0.6499 0.1542 -0.7442 -vn 0.8160 0.2015 -0.5418 -vn 0.7983 0.2573 -0.5445 -vn 0.8257 0.2371 -0.5118 -vn 0.6627 0.2582 -0.7030 -vn 0.9552 0.2694 0.1225 -vn 0.9304 0.3024 -0.2070 -vn 0.9140 0.3266 -0.2408 -vn 0.9749 0.1731 -0.1397 -vn 0.8907 0.3252 -0.3178 -vn 0.9349 0.1116 -0.3369 -vn 0.9411 0.0906 -0.3256 -vn 0.9307 0.3654 -0.0164 -vn 0.8992 0.4366 -0.0280 -vn 0.8754 0.4833 -0.0105 -vn 0.8458 0.1101 -0.5220 -vn 0.9969 0.0760 -0.0206 -vn 0.9513 0.0668 -0.3009 -vn 0.8725 0.0665 -0.4841 -vn 0.8073 0.0721 -0.5857 -vn 0.8064 0.0566 -0.5887 -vn 0.9890 0.0513 -0.1387 -vn 0.9709 0.0693 -0.2292 -vn 0.9660 0.1197 -0.2293 -vn 0.9370 0.1528 -0.3143 -vn 0.9665 0.2565 -0.0111 -vn 0.9660 0.2409 0.0936 -vn 0.9340 0.3028 -0.1897 -vn 0.6021 0.2861 -0.7454 -vn 0.8823 0.4059 -0.2383 -vn 0.9255 0.3736 0.0630 -vn 0.8730 0.4878 0.0000 -vn 0.8730 0.4877 0.0001 -vn 0.8730 0.4878 -0.0001 -vn 0.8729 0.4878 -0.0000 -vn 0.8731 0.4876 0.0003 -vn 0.8731 0.4876 -0.0004 -vn 0.8730 0.4876 -0.0004 -vn 0.8730 0.4877 0.0000 -vn 0.8731 0.4876 -0.0000 -vn 0.8729 0.4880 -0.0001 -vn 0.6120 0.3534 -0.7074 -vn 0.6124 0.3536 -0.7071 -vn 0.6117 0.3534 -0.7078 -vn 0.6123 0.3535 -0.7071 -vn 0.6123 0.3535 -0.7072 -vn 0.6124 0.3535 -0.7071 -vn 0.6122 0.3535 -0.7073 -vn 0.8282 -0.5181 -0.2135 -vn 0.9490 -0.2812 -0.1429 -vn 0.7070 -0.0617 -0.7045 -vn 0.7275 -0.0962 -0.6794 -vn 0.7398 -0.2267 -0.6335 -vn 0.7559 -0.2442 -0.6074 -vn 0.7778 -0.3775 -0.5024 -vn 0.7882 -0.3826 -0.4821 -vn 0.8127 -0.4950 -0.3073 -vn 0.8132 -0.4949 -0.3063 -vn 0.8168 -0.4942 -0.2976 -vn 0.8176 -0.4940 -0.2958 -vn -0.4962 0.8595 -0.1227 -vn -0.4931 0.8686 -0.0484 -vn -0.4971 0.8609 0.1081 -vn -0.4577 0.7927 0.4027 -vn -0.3519 0.6095 0.7104 -vn -0.3265 0.5498 0.7688 -vn -0.2611 0.4522 0.8528 -vn -0.1146 0.1985 0.9734 -vn 0.9659 -0.2588 0.0000 -vn 0.6116 0.3543 -0.7074 -vn 0.6120 0.3539 -0.7073 -vn 0.1146 -0.1985 0.9734 -vn 0.3197 -0.5538 0.7689 -vn 0.3197 -0.5538 0.7688 -vn 0.4385 -0.7594 0.4807 -vn 0.4509 -0.7966 0.4027 -vn 0.4819 -0.8346 0.2669 -vn 0.4994 -0.8650 -0.0480 -vn 0.9523 -0.2347 -0.1950 -vn 0.9521 -0.2354 -0.1953 -vn 0.9521 -0.2349 -0.1957 -vn 0.9762 -0.1866 -0.1106 -vn 0.9791 -0.1886 -0.0762 -vn 0.9956 -0.0731 0.0593 -vn 0.6876 0.3129 0.6553 -vn 0.6447 0.3750 0.6661 -vn 0.7736 0.1601 0.6131 -vn 0.7428 0.3268 0.5843 -vn 0.9036 0.0854 0.4198 -vn 0.8878 0.1540 0.4337 -vn 0.9732 0.0194 0.2290 -vn 0.9733 0.0192 0.2289 -vn 0.9734 0.0184 0.2284 -vn 0.9734 0.0182 0.2283 -vn 0.9935 -0.0650 0.0933 -vn 0.4806 -0.8324 -0.2760 -vn 0.4805 -0.8323 -0.2764 -vn 0.4792 -0.8331 -0.2763 -vn 0.4806 -0.8325 -0.2756 -vn 0.4780 -0.8337 -0.2764 -vn 0.4798 -0.8328 -0.2761 -vn 0.9522 -0.2351 -0.1949 -vn 0.9472 -0.1620 -0.2767 -vn 0.6108 0.3549 -0.7078 -vn 0.6888 0.2860 -0.6662 -vn 0.7002 0.2532 -0.6676 -vn 0.8206 0.1495 -0.5517 -vn 0.9686 -0.1711 -0.1801 -vn 0.9376 -0.1580 -0.3098 -vn 0.9066 0.0005 -0.4219 -vn 0.8922 0.0130 -0.4515 -vn 0.8318 0.1176 -0.5425 -vn 0.4401 -0.7623 -0.4746 -vn 0.3421 -0.5925 -0.7294 -vn 0.2946 -0.5248 -0.7986 -vn 0.2563 -0.4439 -0.8587 -vn 0.1068 -0.1850 -0.9769 -vn 0.7458 0.1111 -0.6568 -vn 0.7460 0.1115 -0.6566 -vn 0.7455 0.1095 -0.6574 -vn 0.8226 0.0495 -0.5664 -vn 0.7451 0.1076 -0.6583 -vn 0.6567 0.2496 -0.7117 -vn 0.6842 0.2371 -0.6897 -vn 0.6224 0.3359 -0.7069 -vn 0.7504 0.0474 -0.6593 -vn 0.8571 -0.0878 -0.5076 -vn 0.8569 -0.1150 -0.5026 -vn 0.9165 -0.2214 -0.3331 -vn 0.9160 -0.2268 -0.3309 -vn -0.1068 0.1850 0.9769 -vn -0.3010 0.5211 0.7986 -vn -0.3009 0.5212 0.7986 -vn -0.3008 0.5212 0.7986 -vn -0.4400 0.7623 0.4746 -vn -0.4403 0.7622 0.4746 -vn 0.8986 0.4388 0.0005 -vn 0.8835 0.4683 0.0050 -vn 0.8658 0.5003 -0.0095 -vn 0.8912 0.4535 -0.0026 -vn 0.8910 0.4540 -0.0028 -vn 0.8906 0.4549 -0.0033 -vn 0.8904 0.4553 -0.0035 -vn 0.8755 0.4831 0.0000 -vn 0.4804 -0.8326 -0.2756 -vn 0.4805 -0.8326 -0.2756 -vn -0.3007 0.5213 0.7986 -vn -0.4398 0.7624 0.4746 -vn -0.4401 0.7623 0.4746 -vn 0.8661 0.5000 0.0000 -vn 0.8662 0.4997 0.0000 -vn -0.0978 0.1695 -0.9807 -vn -0.0979 0.1695 -0.9807 -vn -0.2077 0.3597 -0.9096 -vn -0.2076 0.3597 -0.9097 -vn -0.2075 0.3597 -0.9097 -vn -0.3195 0.5539 -0.7688 -vn -0.3196 0.5539 -0.7688 -vn -0.4575 0.7928 -0.4028 -vn -0.4574 0.7928 -0.4028 -vn -0.4574 0.7928 -0.4027 -vn -0.4993 0.8651 0.0480 -vn -0.4806 0.8325 0.2756 -vn 0.8591 0.5118 -0.0000 -vn 0.8591 0.5119 0.0000 -vn 0.8591 0.5118 0.0001 -vn 0.8591 0.5118 -0.0002 -vn 0.8592 0.5117 -0.0002 -vn 0.8591 0.5117 -0.0002 -vn 0.8590 0.5120 0.0000 -vn 0.8590 0.5119 0.0000 -vn 0.4401 -0.7623 -0.4745 -vn 0.3009 -0.5212 -0.7987 -vn 0.8591 0.5117 0.0001 -vn 0.8590 0.5119 -0.0002 -vn 0.8591 0.5119 -0.0001 -vn 0.8591 0.5118 -0.0001 -vn 0.8591 0.5118 0.0002 -vn 0.3198 -0.5538 0.7688 -vn 0.4576 -0.7927 0.4028 -vn 0.4994 -0.8650 -0.0481 -vn 0.4994 -0.8650 -0.0478 -vn 0.8592 0.5117 0.0001 -vn 0.8591 0.5119 0.0001 -vn -0.4401 0.7622 0.4747 -vn -0.4401 0.7623 0.4747 -vn -0.3009 0.5212 0.7987 -vn -0.3009 0.5211 0.7987 -vn -0.1068 0.1851 0.9769 -vn -0.4401 0.7623 0.4745 -vn -0.3008 0.5211 0.7987 -vn 0.8592 0.5117 0.0002 -vn 0.8590 0.5119 -0.0001 -vn 0.8590 0.5120 -0.0001 -vn 0.8591 0.5117 -0.0000 -vn 0.8590 0.5119 0.0002 -vn 0.8592 0.5116 -0.0001 -vn 0.8660 0.5000 -0.0003 -vn 0.8660 0.5001 0.0004 -vn 0.8661 0.4999 -0.0005 -vn 0.8660 0.5000 -0.0002 -vn 0.8660 0.5001 0.0005 -vn 0.8660 0.5001 0.0007 -vn 0.8660 0.5001 0.0002 -vn 0.8660 0.5000 0.0002 -vn 0.8660 0.5001 -0.0004 -vn 0.8661 0.4999 0.0001 -vn 0.8660 0.5001 0.0008 -vn 0.8661 0.4998 -0.0005 -vn 0.8662 0.4997 -0.0011 -vn 0.8660 0.5001 0.0000 -vn 0.8660 0.5000 -0.0006 -vn 0.8661 0.4999 -0.0000 -vn 0.8661 0.4998 -0.0000 -vn 0.8660 0.5000 -0.0007 -vn 0.8660 0.5000 -0.0005 -vn 0.8256 0.5296 -0.1948 -vn 0.3750 0.7456 -0.5509 -vn 0.3749 0.7456 -0.5510 -vn -0.2242 0.8932 -0.3898 -vn -0.2647 0.9632 0.0464 -vn -0.2649 0.9631 0.0465 -vn -0.2649 0.9632 0.0465 -vn -0.0908 0.6620 -0.7440 -vn -0.0909 0.6620 -0.7439 -vn 0.1076 0.3182 -0.9419 -vn 0.2463 0.9686 0.0344 -vn 0.2462 0.9686 0.0345 -vn 0.2761 0.9168 -0.2886 -vn 0.0658 0.2686 -0.9610 -vn 0.2714 0.3954 -0.8775 -vn 0.5219 0.4910 -0.6975 -vn 0.4532 0.4206 -0.7859 -vn 0.6092 0.5156 -0.6025 -vn 0.7024 0.7117 0.0128 -vn 0.7135 0.6925 -0.1069 -vn 0.7135 0.6924 -0.1069 -vn 0.7501 0.6290 -0.2041 -vn 0.7501 0.6291 -0.2041 -vn 0.8045 0.5348 -0.2584 -vn 0.7548 0.4847 -0.4420 -vn 0.1690 0.0975 -0.9808 -vn 0.1690 0.0976 -0.9808 -vn 0.3831 0.2211 -0.8969 -vn 0.3830 0.2212 -0.8969 -vn 0.5271 0.3043 -0.7935 -vn 0.5272 0.3044 -0.7934 -vn 0.6872 0.3967 -0.6086 -vn 0.6871 0.3967 -0.6087 -vn 0.7767 0.4484 -0.4424 -vn 0.7768 0.4485 -0.4421 -vn 0.8494 0.4904 -0.1950 -vn 0.8494 0.4904 -0.1952 -vn 0.9364 0.3380 -0.0947 -vn 0.9529 -0.0776 -0.2932 -vn 0.5104 -0.3776 -0.7726 -vn 0.5103 -0.3776 -0.7726 -vn 0.2701 -0.0862 -0.9590 -vn 0.6048 0.1518 -0.7817 -vn 0.4722 0.0503 -0.8801 -vn 0.6450 -0.6109 -0.4591 -vn 0.6045 -0.6633 -0.4411 -vn 0.7722 -0.4699 -0.4276 -vn 0.8213 0.3631 -0.4401 -vn 0.7471 0.2790 -0.6034 -vn 0.3112 -0.0350 -0.9497 -vn 0.8204 -0.0234 -0.5713 -vn 0.9200 -0.1958 -0.3395 -vn 0.8851 -0.3244 -0.3338 -vn 0.8699 0.4530 -0.1950 -vn 0.8539 0.4473 -0.2658 -vn 0.9148 0.3443 -0.2112 -vn 0.9148 0.3443 -0.2113 -vn 0.6662 0.2375 -0.7070 -vn 0.9516 0.2804 -0.1255 -vn 0.9846 0.0874 -0.1514 -vn 0.6404 -0.7189 -0.2703 -vn 0.6404 -0.7188 -0.2704 -vn 0.8139 -0.5259 -0.2472 -vn 0.8142 -0.5254 -0.2472 -vn 0.8139 -0.5258 -0.2472 -vn 0.9085 -0.3560 -0.2187 -vn 0.9085 -0.3562 -0.2187 -vn 0.9796 -0.1102 -0.1678 -vn 0.9797 -0.1099 -0.1678 -vn 0.9797 -0.1098 -0.1678 -vn 0.9893 0.0803 -0.1219 -vn 0.9893 0.0802 -0.1219 -vn 0.9432 0.3280 -0.0538 -vn 0.8715 0.4502 0.1947 -vn 0.9983 0.0549 -0.0217 -vn 0.8332 -0.0481 0.5509 -vn 0.8332 -0.0480 0.5509 -vn 0.6614 -0.6408 0.3897 -vn 0.6613 -0.6409 0.3897 -vn 0.6614 -0.6409 0.3897 -vn 0.6550 -0.7542 -0.0471 -vn 0.9183 -0.3940 -0.0384 -vn 0.8248 -0.5638 -0.0431 -vn 0.5279 -0.4097 0.7440 -vn 0.5279 -0.4096 0.7440 -vn 0.3295 -0.0659 0.9419 -vn 0.9893 -0.1426 -0.0297 -vn 0.9599 -0.2740 -0.0591 -vn 0.9320 -0.2194 0.2886 -vn 0.2654 -0.0774 0.9610 -vn 0.4782 0.0375 0.8774 -vn 0.6862 0.2065 0.6975 -vn 0.5909 0.1822 0.7859 -vn 0.7510 0.2698 0.6026 -vn 0.9485 0.3166 -0.0096 -vn 0.9679 0.2495 -0.0298 -vn 0.9564 0.2717 0.1069 -vn 0.9198 0.3350 0.2041 -vn 0.7004 -0.7107 -0.0661 -vn 0.9320 -0.2193 0.2886 -vn 0.9199 0.3350 0.2041 -vn 0.8653 0.4294 0.2584 -vn 0.7971 0.4113 0.4421 -vn 0.1690 0.0976 0.9808 -vn 0.1690 0.0975 0.9808 -vn 0.3831 0.2212 0.8968 -vn 0.3831 0.2211 0.8969 -vn 0.5271 0.3043 0.7934 -vn 0.5272 0.3044 0.7933 -vn 0.6871 0.3967 0.6088 -vn 0.6870 0.3966 0.6089 -vn 0.7766 0.4484 0.4425 -vn 0.7765 0.4484 0.4426 -vn 0.7768 0.4485 0.4421 -vn 0.8494 0.4904 0.1949 -vn 0.8494 0.4904 0.1952 -vn 0.7251 0.5297 0.4401 -vn 0.4341 0.4479 0.7816 -vn 0.0603 0.2770 0.9590 -vn -0.2064 0.8641 0.4591 -vn -0.2063 0.8641 0.4591 -vn -0.0717 0.6309 0.7726 -vn 0.1253 0.2871 0.9497 -vn 0.2796 0.3836 0.8801 -vn 0.2904 0.8947 0.3395 -vn 0.2903 0.8947 0.3395 -vn 0.3899 0.7222 0.5713 -vn 0.5387 0.4582 0.7070 -vn 0.6150 0.5075 0.6036 -vn 0.7187 0.6839 0.1256 -vn 0.7188 0.6838 0.1255 -vn 0.7556 0.6200 0.2112 -vn 0.7556 0.6200 0.2113 -vn 0.7556 0.6201 0.2113 -vn 0.8144 0.5159 0.2659 -vn 0.8273 0.5269 0.1950 -vn -0.2400 0.9335 0.2662 -vn -0.2403 0.9335 0.2663 -vn 0.2725 0.9422 0.1949 -vn 0.2726 0.9422 0.1949 -vn 0.7120 0.6985 0.0714 -vn 0.7121 0.6985 0.0713 -vn 0.1689 0.0975 -0.9808 -vn 0.2245 0.1288 -0.9659 -vn 0.4810 0.2782 -0.8314 -vn 0.5273 0.3044 -0.7933 -vn 0.7200 0.4157 -0.5556 -vn 0.6867 0.3973 -0.6087 -vn 0.8499 0.4896 -0.1950 -vn 0.8365 0.4830 -0.2588 -vn 0.7470 0.2790 -0.6034 -vn 0.9516 0.2805 -0.1256 -vn 0.9516 0.2805 -0.1255 -vn 0.8634 0.4333 -0.2584 -vn 0.9200 -0.1959 -0.3395 -vn 0.9200 -0.1958 -0.3394 -vn 0.8205 -0.0234 -0.5712 -vn 0.6936 0.2006 -0.6918 -vn 0.6050 0.1520 -0.7816 -vn 0.6451 -0.6108 -0.4591 -vn 0.6450 -0.6108 -0.4591 -vn 0.3226 -0.0524 -0.9451 -vn 0.6883 -0.6748 -0.2662 -vn 0.6884 -0.6747 -0.2662 -vn 0.6883 -0.6747 -0.2662 -vn 0.9609 0.2674 -0.0714 -vn 0.9609 0.2675 -0.0714 -vn 0.8654 0.4294 0.2583 -vn 0.8654 0.4294 0.2584 -vn 0.9198 0.3351 0.2041 -vn 0.9564 0.2716 0.1069 -vn 0.9675 0.2525 -0.0127 -vn 0.9320 -0.2192 0.2886 -vn 0.9619 -0.2711 -0.0344 -vn 0.3294 -0.0659 0.9419 -vn 0.5280 -0.4096 0.7439 -vn 0.6615 -0.6408 0.3897 -vn 0.7018 -0.7108 -0.0464 -vn 0.7018 -0.7109 -0.0464 -vn 0.2241 0.1294 0.9659 -vn 0.8365 0.4830 0.2587 -vn 0.8365 0.4830 0.2588 -vn 0.7556 0.6201 0.2112 -vn 0.8069 0.5311 0.2584 -vn 0.8069 0.5311 0.2583 -vn 0.3900 0.7222 0.5712 -vn 0.5288 0.4817 0.6988 -vn -0.0717 0.6308 0.7726 -vn -0.0718 0.6308 0.7726 -vn -0.0719 0.6308 0.7726 -vn 0.1159 0.3055 0.9451 -vn 0.1159 0.3056 0.9451 -vn 0.1160 0.3056 0.9451 -vn -0.2402 0.9335 0.2663 -vn 0.7121 0.6984 0.0713 -vn 0.7121 0.6985 0.0714 -vn 0.8661 0.4999 -0.0001 -vn 0.8661 0.5000 -0.0001 -vn 0.8673 0.4978 0.0000 -vn 0.8658 0.5004 0.0000 -vn 0.8655 0.5009 0.0000 -vn 0.4207 -0.9063 0.0414 -vn 0.3374 -0.9380 0.0799 -vn 0.2506 -0.9603 0.1227 -vn 0.0251 -0.9758 0.2174 -vn 0.0702 -0.9777 0.1978 -vn -0.1565 -0.9457 0.2849 -vn -0.1114 -0.9569 0.2681 -vn -0.2457 -0.9174 0.3131 -vn -0.3609 -0.8649 0.3490 -vn -0.3328 -0.8788 0.3420 -vn -0.4563 -0.8081 0.3724 -vn -0.6628 -0.6240 0.4139 -vn -0.6723 -0.6134 0.4145 -vn -0.7849 -0.4532 0.4226 -vn -0.7396 0.0070 0.6730 -vn -0.9157 0.2454 0.3184 -vn -0.9300 0.1187 0.3479 -vn -0.8845 0.3818 0.2682 -vn -0.8972 0.3376 0.2848 -vn -0.8116 0.5498 0.1977 -vn -0.8326 0.5095 0.2174 -vn -0.6434 0.7610 0.0824 -vn -0.7076 0.6966 0.1183 -vn -0.5747 0.8173 0.0415 -vn -0.9304 0.0567 0.3620 -vn -0.8671 -0.2754 0.4151 -vn -0.8722 -0.2616 0.4132 -vn -0.3536 0.6124 0.7071 -vn -0.3536 0.6123 0.7071 -vn -0.3537 0.6123 0.7071 -vn -0.3535 0.6124 0.7071 -vn -0.1628 -0.0940 0.9822 -vn -0.4491 -0.2593 0.8550 -vn -0.6908 -0.3988 0.6032 -vn -0.6908 -0.3988 0.6031 -vn 0.3536 -0.6124 0.7071 -vn 0.3535 -0.6124 0.7071 -vn 0.3533 -0.6123 0.7073 -vn 0.5000 -0.8660 0.0000 -vn 0.6126 0.3539 0.7067 -vn 0.2113 0.7887 0.5774 -vn 0.6127 0.3540 0.7065 -vn 0.6149 0.4391 0.6550 -vn 0.5993 0.4693 0.6486 -vn 0.6092 0.5961 0.5230 -vn 0.3262 0.9388 -0.1106 -vn 0.3258 0.9272 -0.1847 -vn 0.3206 0.9446 0.0695 -vn 0.4056 0.9109 -0.0761 -vn 0.4608 0.8523 0.2475 -vn 0.4812 0.8581 0.1789 -vn 0.5635 0.7291 0.3886 -vn 0.5635 0.7290 0.3888 -vn 0.5634 0.7286 0.3895 -vn 0.5633 0.7285 0.3897 -vn 0.5959 0.6236 0.5059 -vn 0.2725 0.9422 -0.1949 -vn 0.2735 0.9415 -0.1967 -vn 0.2729 0.9424 -0.1936 -vn 0.5919 0.4535 -0.6664 -vn 0.2744 0.9415 -0.1955 -vn 0.3336 0.9012 -0.2767 -vn 0.3319 0.8910 -0.3098 -vn 0.4537 0.7849 -0.4219 -vn 0.6517 0.3771 -0.6581 -vn 0.5693 0.4798 -0.6676 -vn 0.5398 0.6358 -0.5517 -vn 0.5177 0.6616 -0.5425 -vn 0.4573 0.7662 -0.4515 -vn -0.4806 0.8325 -0.2756 -vn -0.4805 0.8325 -0.2757 -vn -0.4806 0.8325 -0.2757 -vn -0.4804 0.8323 -0.2766 -vn -0.4805 0.8322 -0.2765 -vn -0.4805 0.8320 -0.2774 -vn -0.1068 0.1850 -0.9769 -vn -0.2563 0.4439 -0.8587 -vn -0.3072 0.5175 -0.7986 -vn -0.3421 0.5925 -0.7294 -vn -0.4401 0.7623 -0.4746 -vn 0.1850 -0.6985 -0.6912 -vn 0.2756 -0.6991 -0.6598 -vn 0.2829 -0.7008 -0.6549 -vn 0.2832 -0.7009 -0.6546 -vn 0.2840 -0.7010 -0.6542 -vn 0.3167 -0.7158 -0.6224 -vn 0.0866 -0.7254 -0.6828 -vn 0.1100 -0.7110 -0.6945 -vn 0.0203 -0.7069 -0.7070 -vn 0.3946 -0.6863 -0.6110 -vn 0.5190 -0.6983 -0.4929 -vn 0.5157 -0.6831 -0.5171 -vn 0.6530 -0.6798 -0.3338 -vn 0.6523 -0.6828 -0.3291 -vn 0.6527 -0.6812 -0.3315 -vn 0.6531 -0.6796 -0.3340 -vn 0.9435 0.3303 0.0277 -vn 0.0422 -0.9987 0.0284 -vn 0.0348 -0.9991 0.0229 -vn 0.0402 -0.9988 0.0269 -vn 0.0486 -0.9983 0.0322 -vn 0.0341 -0.9992 0.0224 -vn 0.0307 -0.9995 0.0104 -vn 0.0279 -0.9996 -0.0020 -vn 0.3913 -0.9182 -0.0621 -vn 0.4027 -0.9148 -0.0307 -vn 0.3783 -0.9242 -0.0530 -vn 0.3777 -0.9245 -0.0520 -vn 0.3763 -0.9251 -0.0501 -vn 0.3759 -0.9253 -0.0495 -vn 0.1758 -0.9843 0.0132 -vn 0.4508 -0.8909 -0.0556 -vn 0.4314 -0.9017 -0.0276 -vn 0.5050 -0.8618 -0.0469 -vn 0.9656 0.2596 0.0174 -vn 0.9863 0.0367 -0.1608 -vn 0.8918 0.4523 0.0016 -vn 0.8863 0.4040 0.2265 -vn 0.8705 0.4909 0.0348 -vn 0.8703 0.4914 0.0334 -vn 0.8704 0.4912 0.0341 -vn 0.8697 0.4926 0.0300 -vn 0.8958 0.4444 0.0131 -vn 0.8960 0.4438 0.0137 -vn 0.8966 0.4426 0.0151 -vn 0.8993 0.4368 0.0221 -vn 0.9188 0.3925 0.0420 -vn 0.9532 0.3022 -0.0070 -vn 0.9864 0.1639 -0.0145 -vn 0.9898 0.1312 -0.0563 -vn 0.9897 0.1309 -0.0576 -vn 0.9899 0.1321 -0.0517 -vn 0.9630 -0.2689 -0.0150 -vn 0.9992 0.0353 0.0178 -vn 0.9839 -0.1762 -0.0312 -vn 0.9849 0.1701 0.0326 -vn 0.9949 -0.0952 -0.0326 -vn 0.9842 0.1765 0.0164 -vn 0.9989 -0.0064 -0.0469 -vn 0.9966 0.0772 -0.0276 -vn 0.9961 0.0867 -0.0157 -vn 0.9899 0.1324 -0.0502 -vn 0.9103 -0.4139 0.0030 -vn 0.9465 -0.3226 -0.0029 -vn 0.9893 -0.1459 0.0090 -vn 0.8156 -0.5787 0.0031 -vn 0.8460 -0.5332 0.0001 -vn 0.8909 -0.4542 -0.0001 -vn 0.1152 -0.9924 0.0441 -vn 0.1909 -0.9814 0.0221 -vn 0.3459 -0.9382 0.0140 -vn 0.3490 -0.9370 0.0133 -vn 0.3573 -0.9339 0.0114 -vn 0.3577 -0.9338 0.0114 -vn 0.5802 -0.8144 -0.0089 -vn 0.5054 -0.8629 0.0041 -vn 0.6474 -0.7622 -0.0029 -vn 0.6281 -0.7781 -0.0006 -vn 0.7168 -0.6973 0.0003 -vn 0.6960 -0.7181 0.0024 -vn 0.7703 -0.6377 -0.0027 -vn 0.7073 -0.0046 -0.7069 -vn 0.7068 -0.0048 -0.7074 -vn 0.7034 0.0011 -0.7108 -vn 0.7032 0.0017 -0.7110 -vn 0.7103 -0.0680 -0.7007 -vn 0.7250 -0.0879 -0.6831 -vn 0.3521 -0.6134 -0.7070 -vn 0.3523 -0.6128 -0.7073 -vn 0.3553 -0.6075 -0.7104 -vn 0.3559 -0.6074 -0.7102 -vn 0.4326 -0.5720 -0.6969 -vn 0.4329 -0.6076 -0.6659 -vn 0.4579 -0.5391 -0.7069 -vn 0.5138 -0.4871 -0.7062 -vn 0.5150 -0.5010 -0.6956 -vn 0.5717 -0.3946 -0.7193 -vn 0.5781 -0.4101 -0.7054 -vn 0.6409 -0.3015 -0.7059 -vn 0.6340 -0.2883 -0.7175 -vn 0.6879 -0.2017 -0.6972 -vn 0.6817 -0.1904 -0.7064 -vn 0.6962 -0.1247 -0.7069 -vn 0.8330 -0.4611 -0.3058 -vn 0.8336 -0.4605 -0.3051 -vn 0.8386 -0.4551 -0.2992 -vn 0.8397 -0.4540 -0.2979 -vn 0.7135 -0.4934 -0.4974 -vn 0.7292 -0.4784 -0.4892 -vn 0.5658 -0.5393 -0.6237 -vn 0.5902 -0.5143 -0.6222 -vn 0.4113 -0.5955 -0.6901 -vn 0.4396 -0.5608 -0.7016 -vn 0.7130 -0.6817 -0.1643 -vn 0.8685 -0.4570 -0.1922 -vn 0.0278 -0.9996 -0.0000 -vn 0.0822 -0.9966 0.0009 -vn 0.0749 -0.9972 -0.0056 -vn 0.0838 -0.9965 0.0002 -vn 0.0819 -0.9966 -0.0072 -vn 0.0810 -0.9967 -0.0091 -vn 0.0609 -0.9979 0.0217 -vn -0.0010 -0.9971 -0.0763 -vn -0.9613 0.0000 0.2756 -vn 0.8675 0.4974 0.0000 -vn 0.9287 0.3709 0.0010 -vn 0.9407 0.3367 -0.0404 -vn 0.9421 0.3353 -0.0077 -vn 0.9424 0.3344 -0.0050 -vn 0.9424 0.3345 -0.0051 -vn 0.9407 0.3388 -0.0177 -vn 0.8681 0.4963 0.0000 -vn 0.9165 0.3999 0.0079 -vn 0.9030 0.4252 0.0620 -vn 0.9191 0.3933 0.0227 -vn 0.9859 0.1582 0.0541 -vn 0.9790 0.2031 0.0196 -vn 0.9722 0.2339 0.0070 -vn 0.9858 0.0896 0.1422 -vn 0.9891 0.1340 0.0607 -vn 1.0000 0.0024 0.0000 -vn 0.9927 -0.1203 -0.0000 -vn 0.9767 -0.1924 0.0950 -vn 0.9596 -0.2813 -0.0000 -vn 0.6579 -0.7531 0.0000 -vn 0.5952 -0.7869 0.1626 -vn 0.7258 -0.6880 -0.0000 -vn 0.8660 -0.5000 0.0000 -vn 0.8087 -0.5583 0.1852 -vn 0.9049 -0.4256 -0.0000 -vn 0.2836 -0.9589 0.0070 -vn 0.3136 -0.9493 0.0196 -vn 0.3559 -0.9329 0.0541 -vn 0.3778 -0.9219 0.0859 -vn 0.4350 -0.8998 0.0327 -vn 0.4979 -0.8672 -0.0000 -vn 0.1120 -0.9937 0.0000 -vn 0.0579 -0.9913 0.1182 -vn 0.2106 -0.9772 0.0273 -vn 0.1860 -0.9824 -0.0157 -vn 0.1270 -0.9916 0.0248 -vn 0.0996 -0.9936 0.0531 -vn 0.1977 -0.9802 -0.0082 -vn 0.1947 -0.9800 -0.0403 -vn 0.1425 -0.9898 0.0011 -vn 0.0026 -1.0000 0.0000 -vn 0.0018 -1.0000 -0.0000 -vn 0.0014 -1.0000 -0.0000 -vn -0.5000 0.8660 0.0000 -vn 0.8661 0.4999 0.0003 -vn 0.8659 0.5002 -0.0000 -vn 0.8661 0.4998 0.0010 -vn 0.8649 0.5019 -0.0000 -vn 0.8652 0.5015 -0.0000 -vn 0.2636 0.9059 -0.3316 -vn 0.2620 0.9054 -0.3340 -vn 0.2622 0.9055 -0.3337 -vn 0.2651 0.9063 -0.3292 -vn 0.3337 0.7882 -0.5171 -vn 0.3491 0.8020 -0.4847 -vn 0.3920 0.6857 -0.6133 -vn 0.4615 0.6322 -0.6224 -vn 0.4671 0.5943 -0.6547 -vn 0.5121 0.4315 -0.7427 -vn 0.5244 0.4877 -0.6980 -vn -0.5987 0.7986 -0.0622 -vn 0.7532 0.6574 0.0197 -vn 0.8428 0.5376 0.0281 -vn 0.8473 0.5306 0.0223 -vn 0.8440 0.5357 0.0266 -vn 0.8477 0.5301 0.0216 -vn 0.8513 0.5247 -0.0031 -vn 0.5516 0.8266 -0.1119 -vn 0.8392 0.5429 0.0320 -vn 0.8094 0.5858 0.0416 -vn 0.7427 0.6696 -0.0054 -vn -0.7739 0.6327 0.0281 -vn -0.8461 0.5328 0.0181 -vn -0.8196 0.5540 0.1462 -vn -0.8616 0.5066 0.0307 -vn -0.8415 0.5397 0.0253 -vn -0.8411 0.5403 0.0259 -vn -0.8406 0.5410 0.0265 -vn -0.8377 0.5453 0.0303 -vn -0.8091 0.5862 0.0414 -vn -0.7427 0.6696 -0.0054 -vn -0.6238 0.7812 -0.0218 -vn -0.5616 0.8224 -0.0908 -vn -0.5478 0.8355 -0.0420 -vn -0.5028 0.8626 -0.0562 -vn -0.6516 0.7585 0.0091 -vn -0.4335 0.8997 -0.0515 -vn -0.6801 0.7321 0.0378 -vn -0.3457 0.9378 -0.0309 -vn -0.5365 0.8437 0.0202 -vn -0.2987 0.9543 -0.0103 -vn -0.2496 0.9682 -0.0164 -vn -0.3758 0.9267 0.0085 -vn -0.1513 0.9885 -0.0061 -vn -0.2158 0.9764 0.0025 -vn -0.0507 0.9987 -0.0019 -vn -0.0701 0.9975 0.0000 -vn 0.0208 0.9998 0.0000 -vn 0.0013 1.0000 -0.0006 -vn 0.1326 0.9912 0.0029 -vn 0.0524 0.9986 -0.0093 -vn 0.1513 0.9885 -0.0009 -vn 0.3097 0.9508 0.0014 -vn 0.2496 0.9683 -0.0073 -vn 0.3026 0.9531 -0.0034 -vn 0.4769 0.8789 0.0086 -vn 0.5799 0.8115 -0.0718 -vn 0.6250 0.7803 -0.0217 -vn 0.5487 0.8350 -0.0417 -vn 0.7188 0.6949 0.0193 -vn 0.5035 0.8638 -0.0197 -vn 0.6271 0.7789 0.0079 -vn 0.4340 0.9009 -0.0062 -vn 0.3489 0.9370 -0.0180 -vn -0.4510 0.6887 -0.5676 -vn -0.5535 0.4470 -0.7028 -vn -0.5535 0.4472 -0.7026 -vn -0.5535 0.4472 -0.7027 -vn -0.5535 0.4474 -0.7025 -vn -0.4923 0.5456 -0.6782 -vn -0.4680 0.5906 -0.6574 -vn -0.4678 0.5907 -0.6575 -vn -0.4706 0.5895 -0.6565 -vn -0.4711 0.5893 -0.6564 -vn -0.4070 0.6249 -0.6662 -vn -0.3568 0.7859 -0.5051 -vn -0.3271 0.8035 -0.4974 -vn -0.2666 0.9044 -0.3331 -vn -0.2616 0.9067 -0.3309 -vn -0.6124 0.3536 -0.7071 -vn -0.9151 -0.2258 -0.3340 -vn -0.9152 -0.2256 -0.3338 -vn -0.9163 -0.2247 -0.3315 -vn -0.9175 -0.2235 -0.3291 -vn -0.8596 -0.1189 -0.4970 -vn -0.8592 -0.0850 -0.5045 -vn -0.8224 -0.0389 -0.5676 -vn -0.7873 0.0200 -0.6162 -vn -0.7782 0.0836 -0.6224 -vn -0.7482 0.1074 -0.6548 -vn -0.7169 0.1424 -0.6825 -vn -0.6734 0.2624 -0.6911 -vn -0.6549 0.2741 -0.7042 -vn -0.8700 0.4919 0.0346 -vn -0.8691 0.4938 0.0299 -vn -0.8700 0.4918 0.0349 -vn -0.8735 0.4850 0.0421 -vn -0.8713 0.4890 0.0416 -vn -0.8737 0.4846 0.0416 -vn -0.8748 0.4827 0.0416 -vn -0.8969 0.4402 0.0420 -vn -0.8886 0.4580 0.0261 -vn -0.8892 0.4567 0.0271 -vn -0.8889 0.4573 0.0267 -vn -0.8719 0.4879 0.0411 -vn -0.8721 0.4876 0.0410 -vn -0.8701 0.4915 0.0355 -vn -0.8915 0.4521 0.0305 -vn -0.9122 0.4076 0.0414 -vn -0.9512 0.3084 -0.0054 -vn -0.9968 0.0548 -0.0586 -vn -0.9936 0.1082 -0.0326 -vn -0.9984 0.0041 -0.0562 -vn -0.9968 0.0706 -0.0381 -vn -0.9872 0.1583 -0.0210 -vn -0.9897 0.1323 -0.0539 -vn -0.9908 0.1206 -0.0615 -vn -0.2190 -0.9756 0.0161 -vn -0.4612 -0.8725 -0.1617 -vn -0.0431 -0.9990 0.0138 -vn -0.0412 -0.9991 0.0058 -vn -0.0428 -0.9990 0.0125 -vn -0.0408 -0.9992 0.0042 -vn -0.0070 -0.9995 0.0322 -vn -0.0517 -0.9984 0.0221 -vn -0.0524 -0.9984 0.0228 -vn -0.0534 -0.9983 0.0236 -vn -0.0587 -0.9979 0.0280 -vn -0.1046 -0.9937 0.0408 -vn -0.2085 -0.9780 -0.0054 -vn -0.3564 -0.9341 -0.0210 -vn -0.3828 -0.9221 -0.0568 -vn -0.3831 -0.9219 -0.0579 -vn -0.3821 -0.9226 -0.0528 -vn -0.6761 -0.7368 -0.0031 -vn -0.5295 -0.8483 0.0083 -vn -0.6390 -0.7690 -0.0170 -vn -0.3798 -0.9249 0.0201 -vn -0.5630 -0.8260 -0.0274 -vn -0.3041 -0.9524 0.0193 -vn -0.4956 -0.8667 -0.0562 -vn -0.4372 -0.8985 -0.0381 -vn -0.4230 -0.9059 -0.0173 -vn -0.3819 -0.9228 -0.0515 -vn -0.7138 -0.7004 -0.0065 -vn -0.7802 -0.6252 -0.0199 -vn -0.6742 -0.7384 0.0116 -vn -0.8395 -0.5432 -0.0085 -vn -0.7966 -0.6045 0.0026 -vn -0.8928 -0.4505 -0.0018 -vn -0.8921 -0.4518 -0.0019 -vn -0.8909 -0.4541 -0.0022 -vn -0.8903 -0.4555 -0.0023 -vn -0.9317 -0.3632 0.0008 -vn -0.9557 -0.2942 -0.0020 -vn -0.9634 -0.2679 -0.0001 -vn -0.9916 -0.1290 -0.0002 -vn -0.9761 -0.2172 -0.0114 -vn -0.9984 0.0521 0.0216 -vn -0.9336 0.3571 0.0289 -vn -0.9562 0.2921 0.0208 -vn -0.9783 0.2066 0.0170 -vn -0.9784 0.2059 0.0169 -vn -0.9787 0.2045 0.0165 -vn -0.9788 0.2042 0.0165 -vn -0.9971 -0.0746 -0.0156 -vn -0.9851 -0.1688 -0.0327 -vn -0.3709 -0.7350 -0.5676 -vn -0.1104 -0.7028 -0.7028 -vn -0.1105 -0.7029 -0.7026 -vn -0.1105 -0.7029 -0.7027 -vn -0.1107 -0.7030 -0.7025 -vn -0.2263 -0.6992 -0.6782 -vn -0.2774 -0.7005 -0.6575 -vn -0.2776 -0.7005 -0.6575 -vn -0.2752 -0.7022 -0.6566 -vn -0.2748 -0.7026 -0.6564 -vn -0.3376 -0.6650 -0.6662 -vn -0.5021 -0.7020 -0.5051 -vn -0.5323 -0.6850 -0.4974 -vn -0.6500 -0.6831 -0.3331 -vn -0.6544 -0.6799 -0.3309 -vn 0.0000 -1.0000 -0.0001 -vn 0.0000 -1.0000 0.0001 -vn 0.0000 -1.0000 0.0003 -vn 0.0000 -1.0000 -0.0006 -vn -0.8660 -0.5000 0.0000 -vn -0.0026 -1.0000 0.0000 -vn -0.1425 -0.9898 0.0011 -vn -0.1947 -0.9800 -0.0403 -vn -0.1975 -0.9802 -0.0097 -vn -0.1963 -0.9805 -0.0133 -vn -0.1502 -0.9886 0.0092 -vn -0.0235 -0.9997 0.0000 -vn -0.1119 -0.9931 0.0355 -vn -0.1031 -0.9935 0.0489 -vn -0.1296 -0.9913 0.0227 -vn -0.3559 -0.9329 0.0541 -vn -0.3136 -0.9493 0.0196 -vn -0.2836 -0.9589 0.0070 -vn -0.4154 -0.8985 0.1423 -vn -0.3785 -0.9236 0.0607 -vn -0.4979 -0.8672 -0.0000 -vn -0.6027 -0.7980 -0.0000 -vn -0.6550 -0.7497 0.0943 -vn -0.7252 -0.6885 -0.0000 -vn -0.8220 -0.5695 -0.0000 -vn -0.8620 -0.4977 0.0960 -vn -0.9042 -0.4271 -0.0000 -vn -0.9811 -0.1933 -0.0000 -vn -0.9789 -0.1212 0.1643 -vn -0.9589 -0.2838 -0.0000 -vn -0.9723 0.2338 0.0070 -vn -0.9790 0.2031 0.0196 -vn -0.9859 0.1583 0.0540 -vn -0.9873 0.1337 0.0859 -vn -0.9968 0.0732 0.0327 -vn -1.0000 0.0024 0.0000 -vn -0.9166 0.3999 0.0000 -vn -0.8963 0.4355 0.0828 -vn -0.9118 0.4087 0.0401 -vn -0.9368 0.3494 -0.0203 -vn -0.9474 0.3170 0.0444 -vn -0.9431 0.3326 -0.0003 -vn -0.9417 0.3357 -0.0235 -vn -0.9407 0.3367 -0.0404 -vn -0.9287 0.3709 0.0010 -vn -0.8675 0.4975 0.0000 -vn -0.8668 0.4987 0.0000 -vn -0.8657 0.5005 -0.0000 -vn -0.8635 0.5043 0.0000 -vn -0.8647 0.5023 -0.0000 -vn -0.7855 0.6188 0.0010 -vn -0.7620 0.6464 -0.0404 -vn -0.7611 0.6485 -0.0115 -vn -0.7621 0.6472 -0.0172 -vn -0.7921 0.6102 0.0128 -vn -0.8628 0.5056 0.0000 -vn -0.8045 0.5938 0.0119 -vn -0.8200 0.5686 0.0652 -vn -0.8053 0.5920 0.0316 -vn -0.6300 0.7747 0.0541 -vn -0.6654 0.7463 0.0196 -vn -0.6886 0.7251 0.0070 -vn -0.5704 0.8089 0.1423 -vn -0.6106 0.7896 0.0607 -vn -0.5021 0.8648 0.0000 -vn -0.3891 0.9212 0.0000 -vn -0.3218 0.9421 0.0941 -vn -0.2329 0.9725 0.0000 -vn -0.0805 0.9968 0.0000 -vn 0.0000 0.9954 0.0960 -vn 0.0839 0.9965 0.0000 -vn 0.3232 0.9463 0.0000 -vn 0.3864 0.9065 0.1701 -vn 0.2362 0.9717 0.0000 -vn 0.6886 0.7251 0.0070 -vn 0.6654 0.7463 0.0196 -vn 0.6300 0.7747 0.0540 -vn 0.6095 0.7881 0.0859 -vn 0.5618 0.8266 0.0327 -vn 0.5021 0.8648 0.0000 -vn 0.8046 0.5938 0.0000 -vn 0.8254 0.5585 0.0828 -vn 0.8098 0.5853 0.0401 -vn 0.7709 0.6366 -0.0203 -vn 0.7482 0.6619 0.0444 -vn 0.7596 0.6504 -0.0003 -vn 0.7615 0.6477 -0.0235 -vn 0.7620 0.6464 -0.0404 -vn 0.7855 0.6188 0.0010 -vn 0.8646 0.5025 0.0000 -vn -0.8251 0.5650 0.0003 -vn -0.8558 0.5174 0.0004 -vn -0.8554 0.5179 0.0007 -vn -0.8557 0.5174 0.0004 -vn -0.8376 0.5464 -0.0006 -vn -0.8373 0.5468 -0.0016 -vn -0.8378 0.5459 -0.0021 -vn -0.8390 0.5441 -0.0032 -vn -0.8394 0.5434 -0.0035 -vn -0.8562 0.5167 0.0000 -vn -0.4803 -0.8326 0.2756 -vn -0.4806 -0.8325 0.2756 -vn -0.4401 -0.7623 0.4746 -vn -0.4400 -0.7623 0.4746 -vn -0.3009 -0.5212 0.7986 -vn -0.1068 -0.1850 0.9769 -vn -0.1067 -0.1850 0.9769 -vn -0.8213 0.3631 -0.4400 -vn -0.7253 -0.1631 -0.6688 -vn -0.2701 -0.0862 -0.9590 -vn -0.5972 -0.6529 -0.4659 -vn -0.4605 -0.4163 -0.7840 -vn -0.4606 -0.4163 -0.7840 -vn -0.4606 -0.4162 -0.7840 -vn -0.8419 -0.3650 -0.3974 -vn -0.8419 -0.3651 -0.3974 -vn -0.5628 0.1184 -0.8181 -vn -0.4551 0.0860 -0.8863 -vn -0.6049 0.1518 -0.7817 -vn -0.9633 -0.0177 -0.2679 -vn -0.9633 -0.0176 -0.2679 -vn -0.9633 -0.0175 -0.2679 -vn -0.8847 0.1186 -0.4508 -vn -0.8847 0.1185 -0.4508 -vn -0.7751 0.3083 -0.5515 -vn -0.7395 0.2956 -0.6048 -vn -0.8699 0.4530 -0.1950 -vn -0.8699 0.4530 -0.1949 -vn -0.9087 0.3859 -0.1594 -vn -0.9364 0.3378 -0.0947 -vn -0.1690 0.0975 -0.9808 -vn -0.2242 0.1294 -0.9659 -vn -0.3852 0.2174 -0.8969 -vn -0.5272 0.3044 -0.7934 -vn -0.6128 0.3527 -0.7072 -vn -0.6871 0.3967 -0.6088 -vn -0.7768 0.4485 -0.4420 -vn -0.8369 0.4823 -0.2588 -vn -0.8494 0.4904 -0.1951 -vn -0.9522 -0.2351 -0.1949 -vn -0.4994 -0.8650 -0.0481 -vn -0.4576 -0.7927 0.4028 -vn -0.3197 -0.5538 0.7688 -vn -0.8591 0.5117 0.0001 -vn -0.8592 0.5117 0.0000 -vn -0.8591 0.5118 0.0001 -vn -0.8591 0.5118 -0.0000 -vn -0.8591 0.5119 0.0000 -vn -0.8591 0.5117 -0.0000 -vn -0.8593 0.5115 -0.0002 -vn -0.8593 0.5115 -0.0001 -vn -0.8590 0.5119 0.0000 -vn -0.8588 0.5122 -0.0002 -vn 0.4807 0.8325 0.2756 -vn 0.4806 0.8325 0.2756 -vn -0.2725 0.9422 0.1949 -vn -0.2726 0.9422 0.1949 -vn -0.2462 0.9686 0.0344 -vn -0.2761 0.9168 -0.2887 -vn -0.2761 0.9168 -0.2886 -vn -0.3750 0.7455 -0.5510 -vn -0.3750 0.7456 -0.5509 -vn -0.5219 0.4910 -0.6975 -vn -0.9619 -0.2711 -0.0344 -vn -0.9320 -0.2193 0.2887 -vn -0.9320 -0.2193 0.2886 -vn -0.9320 -0.2192 0.2886 -vn -0.8332 -0.0481 0.5509 -vn -0.6862 0.2065 0.6975 -vn -0.8592 0.5117 0.0001 -vn -0.8590 0.5119 -0.0001 -vn -0.8592 0.5117 -0.0002 -vn -0.8591 0.5119 -0.0001 -vn -0.8590 0.5120 -0.0002 -vn -0.2904 0.8946 0.3395 -vn -0.2903 0.8947 0.3395 -vn -0.2904 0.8947 0.3395 -vn -0.3899 0.7222 0.5712 -vn -0.3900 0.7222 0.5713 -vn -0.3899 0.7222 0.5713 -vn -0.4704 0.5994 0.6476 -vn -0.5336 0.4805 0.6960 -vn -0.5329 0.4832 0.6947 -vn -0.5355 0.4738 0.6992 -vn -0.5360 0.4718 0.7001 -vn -0.5220 0.4910 -0.6975 -vn -0.8593 0.5114 0.0001 -vn -0.8590 0.5119 0.0001 -vn -0.8592 0.5117 -0.0001 -vn 0.4994 0.8650 0.0481 -vn 0.4577 0.7927 -0.4027 -vn 0.4576 0.7927 -0.4028 -vn 0.3197 0.5538 -0.7688 -vn 0.1146 0.1985 -0.9734 -vn -0.6123 0.3536 -0.7071 -vn -0.2462 0.9686 0.0346 -vn -0.2462 0.9686 0.0345 -vn -0.5220 0.4909 -0.6975 -vn -0.9619 -0.2712 -0.0344 -vn -0.8592 0.5116 -0.0001 -vn -0.8589 0.5121 0.0005 -vn -0.8590 0.5120 0.0003 -vn 0.1068 0.1851 0.9769 -vn 0.3009 0.5211 0.7987 -vn 0.3009 0.5212 0.7987 -vn 0.4401 0.7622 0.4747 -vn 0.4401 0.7623 0.4746 -vn -0.5288 0.4817 0.6988 -vn -0.2903 0.8947 0.3394 -vn -0.6816 0.2171 -0.6988 -vn -0.8204 -0.0234 -0.5713 -vn -0.9200 -0.1959 -0.3394 -vn -0.9200 -0.1959 -0.3395 -vn -0.6124 0.3535 0.7071 -vn -0.6124 0.3536 0.7071 -vn -0.8589 0.5121 0.0002 -vn -0.8660 0.5000 -0.0001 -vn -0.8660 0.5000 -0.0003 -vn -0.8660 0.5000 0.0003 -vn -0.8660 0.5000 0.0009 -vn -0.8660 0.5000 -0.0002 -vn -0.8660 0.5000 -0.0005 -vn -0.8660 0.5000 -0.0004 -vn -0.8662 0.4997 0.0000 -vn -0.8662 0.4996 0.0000 -vn -0.8660 0.5001 0.0030 -vn -0.8661 0.4999 -0.0004 -vn -0.8660 0.5000 0.0005 -vn -0.8660 0.5000 0.0001 -vn -0.8660 0.5000 0.0002 -vn -0.8659 0.5001 0.0009 -vn -0.8659 0.5003 0.0018 -vn -0.8660 0.5001 0.0005 -vn -0.8660 0.5001 0.0021 -vn -0.8661 0.4999 -0.0009 -vn -0.8661 0.4998 -0.0000 -vn -0.8660 0.5000 0.0006 -vn -0.8661 0.5000 -0.0000 -vn 0.2403 0.9335 0.2663 -vn 0.2401 0.9335 0.2662 -vn -0.7121 0.6984 0.0714 -vn -0.1160 0.3056 0.9451 -vn 0.0717 0.6309 0.7726 -vn 0.2063 0.8641 0.4591 -vn 0.2064 0.8641 0.4591 -vn -0.5287 0.4817 0.6989 -vn -0.3898 0.7222 0.5713 -vn -0.8069 0.5311 0.2584 -vn -0.7556 0.6201 0.2113 -vn -0.7556 0.6200 0.2113 -vn -0.7188 0.6838 0.1255 -vn -0.7188 0.6838 0.1256 -vn -0.1690 0.0976 0.9808 -vn -0.2245 0.1288 0.9659 -vn -0.3831 0.2212 0.8968 -vn -0.5271 0.3043 0.7934 -vn -0.6129 0.3527 0.7071 -vn -0.6871 0.3967 0.6088 -vn -0.8365 0.4830 0.2588 -vn -0.7781 0.4459 0.4424 -vn -0.8494 0.4904 0.1950 -vn -0.7510 0.2698 0.6026 -vn -0.4782 0.0375 0.8774 -vn -0.6549 -0.7542 -0.0471 -vn -0.6550 -0.7542 -0.0471 -vn -0.6140 -0.6831 0.3954 -vn -0.6140 -0.6832 0.3954 -vn -0.6139 -0.6832 0.3954 -vn -0.6138 -0.6832 0.3954 -vn -0.4784 -0.4487 0.7549 -vn -0.4785 -0.4486 0.7548 -vn -0.4786 -0.4486 0.7548 -vn -0.2772 -0.0998 0.9556 -vn -0.2771 -0.0998 0.9556 -vn -0.8908 -0.4526 -0.0402 -vn -0.8558 -0.3920 0.3377 -vn -0.8558 -0.3919 0.3377 -vn -0.8558 -0.3919 0.3376 -vn -0.7402 -0.1917 0.6445 -vn -0.7402 -0.1916 0.6445 -vn -0.5607 0.1163 0.8198 -vn -0.6100 0.1401 0.7799 -vn -0.9966 -0.0774 -0.0272 -vn -0.9730 -0.0364 0.2279 -vn -0.8949 0.0988 0.4351 -vn -0.8949 0.0989 0.4351 -vn -0.7722 0.3087 0.5553 -vn -0.8243 0.3563 0.4400 -vn -0.9485 0.3167 -0.0096 -vn -0.9485 0.3166 -0.0096 -vn -0.9485 0.3165 -0.0096 -vn -0.9401 0.3311 0.0807 -vn -0.9401 0.3311 0.0806 -vn -0.9125 0.3789 0.1539 -vn -0.9125 0.3789 0.1540 -vn -0.8714 0.4501 0.1950 -vn -0.8714 0.4501 0.1948 -vn -0.6404 -0.7189 -0.2703 -vn -0.6403 -0.7189 -0.2703 -vn -0.8808 -0.4144 -0.2292 -vn -0.8807 -0.4144 -0.2292 -vn -0.9871 -0.0468 -0.1531 -vn -0.9431 0.3280 -0.0538 -vn -0.9432 0.3280 -0.0538 -vn -0.2241 0.1294 0.9659 -vn -0.9675 0.2525 -0.0127 -vn -0.9675 0.2525 -0.0128 -vn -0.9564 0.2717 0.1069 -vn -0.9198 0.3351 0.2040 -vn -0.8654 0.4294 0.2583 -vn -0.8332 -0.0480 0.5509 -vn -0.7018 -0.7108 -0.0464 -vn -0.7018 -0.7109 -0.0464 -vn -0.6614 -0.6408 0.3897 -vn -0.5279 -0.4097 0.7439 -vn -0.5279 -0.4097 0.7440 -vn -0.3295 -0.0659 0.9419 -vn -0.3294 -0.0659 0.9419 -vn -0.8661 0.4999 -0.0000 -vn 0.2402 0.9335 0.2662 -vn 0.3027 0.9147 0.2677 -vn -0.1461 0.9643 0.2206 -vn -0.0815 0.9700 0.2292 -vn -0.3944 0.9035 0.1678 -vn -0.4533 0.8779 0.1545 -vn -0.7118 0.6989 0.0694 -vn -0.7555 0.6529 0.0538 -vn -0.1181 0.9923 0.0384 -vn -0.7024 0.7117 0.0127 -vn -0.7134 0.6925 -0.1069 -vn -0.7135 0.6925 -0.1069 -vn -0.7501 0.6290 -0.2040 -vn -0.7501 0.6290 -0.2041 -vn -0.7501 0.6291 -0.2042 -vn -0.8045 0.5347 -0.2584 -vn -0.8045 0.5348 -0.2584 -vn -0.3709 0.9282 0.0296 -vn -0.2488 0.9684 0.0144 -vn -0.2762 0.9168 -0.2885 -vn -0.3751 0.7456 -0.5509 -vn -0.5220 0.4910 -0.6974 -vn 0.2648 0.9632 0.0464 -vn 0.2647 0.9632 0.0464 -vn 0.2243 0.8932 -0.3897 -vn 0.2244 0.8932 -0.3897 -vn 0.0908 0.6620 -0.7440 -vn 0.0908 0.6620 -0.7439 -vn -0.1077 0.3183 -0.9419 -vn -0.1077 0.3182 -0.9419 -vn -0.2241 0.1294 -0.9659 -vn -0.6124 0.3535 -0.7071 -vn -0.8365 0.4830 -0.2588 -vn -0.8634 0.4333 -0.2584 -vn -0.8634 0.4333 -0.2585 -vn -0.9148 0.3443 -0.2113 -vn -0.9148 0.3444 -0.2113 -vn -0.9516 0.2806 -0.1255 -vn -0.9516 0.2805 -0.1255 -vn -0.6816 0.2170 -0.6988 -vn -0.9200 -0.1958 -0.3395 -vn -0.3226 -0.0524 -0.9451 -vn -0.3226 -0.0523 -0.9451 -vn -0.5105 -0.3775 -0.7726 -vn -0.5104 -0.3776 -0.7726 -vn -0.6451 -0.6108 -0.4591 -vn -0.6450 -0.6109 -0.4591 -vn -0.8650 0.5018 0.0000 -vn -0.8658 0.5003 0.0001 -vn -0.8658 0.5004 0.0001 -vn -0.8256 0.5296 -0.1947 -vn -0.6092 0.5156 -0.6026 -vn -0.2712 0.3952 -0.8776 -vn -0.0521 0.2899 -0.9556 -vn -0.1048 0.3242 -0.9402 -vn 0.0907 0.6621 -0.7439 -vn 0.0907 0.6620 -0.7440 -vn 0.2242 0.8932 -0.3897 -vn 0.2646 0.9632 0.0464 -vn -0.4264 0.4582 -0.7799 -vn -0.5183 0.4993 -0.6943 -vn -0.3749 0.7456 -0.5510 -vn -0.2461 0.9686 0.0344 -vn -0.7207 0.5357 -0.4400 -vn -0.8015 0.5410 -0.2550 -vn -0.7501 0.6291 -0.2041 -vn -0.7024 0.7116 0.0127 -vn -0.8494 0.4904 -0.1950 -vn -0.8494 0.4904 -0.1949 -vn -0.7766 0.4484 -0.4425 -vn -0.7767 0.4484 -0.4424 -vn -0.6872 0.3967 -0.6086 -vn -0.6871 0.3967 -0.6087 -vn -0.5272 0.3044 -0.7933 -vn -0.3828 0.2210 -0.8970 -vn -0.1690 0.0976 -0.9808 -vn -0.8243 0.3562 -0.4400 -vn -0.9893 -0.1428 0.0297 -vn -0.6101 0.1402 -0.7798 -vn -0.2771 -0.0998 -0.9556 -vn -0.7019 -0.7108 0.0464 -vn -0.7019 -0.7107 0.0464 -vn -0.6615 -0.6408 -0.3897 -vn -0.6613 -0.6409 -0.3897 -vn -0.5279 -0.4097 -0.7440 -vn -0.5280 -0.4096 -0.7440 -vn -0.5280 -0.4096 -0.7439 -vn -0.3332 -0.0714 -0.9402 -vn -0.4779 0.0373 -0.8776 -vn -0.9183 -0.3940 0.0384 -vn -0.9625 -0.2700 0.0248 -vn -0.9320 -0.2193 -0.2886 -vn -0.9320 -0.2192 -0.2886 -vn -0.8332 -0.0481 -0.5509 -vn -0.8331 -0.0481 -0.5510 -vn -0.6916 0.1992 -0.6942 -vn -0.7511 0.2698 -0.6025 -vn -0.9675 0.2525 0.0127 -vn -0.9564 0.2717 -0.1069 -vn -0.9198 0.3351 -0.2040 -vn -0.9198 0.3351 -0.2041 -vn -0.8692 0.4236 -0.2550 -vn -0.8714 0.4502 -0.1948 -vn -0.9609 0.2675 0.0713 -vn -0.9433 0.3278 0.0527 -vn -0.9795 -0.1099 0.1686 -vn -0.9871 -0.0468 0.1531 -vn -0.9085 -0.3562 0.2187 -vn -0.8807 -0.4142 0.2297 -vn -0.6886 -0.6748 0.2654 -vn -0.6403 -0.7190 0.2703 -vn -0.7253 -0.1632 0.6688 -vn -0.7254 -0.1631 0.6688 -vn -0.2700 -0.0862 0.9590 -vn -0.4607 -0.4162 0.7839 -vn -0.4607 -0.4162 0.7840 -vn -0.4606 -0.4163 0.7840 -vn -0.4605 -0.4163 0.7840 -vn -0.5972 -0.6530 0.4659 -vn -0.5972 -0.6529 0.4659 -vn -0.8419 -0.3650 0.3974 -vn -0.9633 -0.0177 0.2679 -vn -0.9633 -0.0176 0.2679 -vn -0.8847 0.1185 0.4508 -vn -0.8847 0.1185 0.4509 -vn -0.4722 0.0504 0.8801 -vn -0.5657 0.1145 0.8166 -vn -0.6048 0.1519 0.7817 -vn -0.7470 0.2789 0.6035 -vn -0.7781 0.3042 0.5496 -vn -0.8213 0.3631 0.4400 -vn -0.8699 0.4530 0.1950 -vn -0.9086 0.3859 0.1594 -vn -0.9086 0.3860 0.1593 -vn -0.9364 0.3379 0.0947 -vn -0.8494 0.4904 0.1951 -vn -0.8364 0.4832 0.2589 -vn -0.7768 0.4485 0.4420 -vn -0.6870 0.3967 0.6088 -vn -0.6122 0.3538 0.7071 -vn -0.5272 0.3044 0.7934 -vn -0.2242 0.1294 0.9659 -vn -0.3825 0.2220 0.8969 -vn 0.2065 0.8640 0.4591 -vn 0.0719 0.6308 0.7726 -vn -0.1159 0.3055 0.9451 -vn -0.1159 0.3056 0.9451 -vn -0.3900 0.7222 0.5712 -vn -0.7187 0.6839 0.1256 -vn -0.7555 0.6201 0.2113 -vn -0.8069 0.5311 0.2585 -vn -0.7122 0.6984 0.0713 -vn -0.7121 0.6985 0.0714 -vn 0.2400 0.9335 0.2662 -vn -0.5450 0.7069 -0.4508 -vn -0.5449 0.7069 -0.4509 -vn -0.8273 0.5269 -0.1947 -vn -0.8273 0.5269 -0.1950 -vn -0.8273 0.5269 -0.1949 -vn -0.7886 0.5939 -0.1592 -vn -0.7886 0.5939 -0.1594 -vn -0.7608 0.6421 -0.0947 -vn -0.7607 0.6421 -0.0947 -vn -0.7607 0.6421 -0.0948 -vn -0.4664 0.8430 -0.2679 -vn -0.4666 0.8430 -0.2678 -vn -0.4665 0.8430 -0.2678 -vn -0.1046 0.9116 -0.3975 -vn -0.1049 0.9116 -0.3974 -vn -0.2214 0.7098 -0.6687 -vn -0.2214 0.7097 -0.6688 -vn -0.8274 0.5269 -0.1947 -vn -0.7250 0.5297 -0.4401 -vn -0.6571 0.5112 -0.5540 -vn -0.6150 0.5075 -0.6035 -vn -0.4341 0.4479 -0.7816 -vn -0.3868 0.4219 -0.8200 -vn -0.2797 0.3837 -0.8801 -vn -0.0604 0.2770 -0.9590 -vn -0.0603 0.2770 -0.9590 -vn -0.0603 0.2769 -0.9590 -vn 0.1302 0.6070 -0.7840 -vn 0.2668 0.8436 -0.4659 -vn 0.2667 0.8437 -0.4659 -vn -0.7763 0.4493 -0.4421 -vn -0.8365 0.4830 -0.2589 -vn -0.6870 0.3966 -0.6088 -vn -0.5269 0.3050 -0.7933 -vn -0.3831 0.2212 -0.8968 -vn -0.2240 0.1296 -0.9659 -vn -0.1689 0.0975 -0.9808 -vn -0.9148 0.3444 -0.2112 -vn -0.9148 0.3443 -0.2112 -vn -0.8634 0.4332 -0.2584 -vn -0.8634 0.4332 -0.2585 -vn -0.6450 -0.6108 -0.4591 -vn -0.6451 -0.6107 -0.4591 -vn -0.5104 -0.3775 -0.7726 -vn -0.5103 -0.3777 -0.7726 -vn -0.3225 -0.0524 -0.9451 -vn -0.9609 0.2674 -0.0714 -vn -0.9609 0.2675 -0.0713 -vn -0.6884 -0.6747 -0.2662 -vn -0.8654 0.4294 0.2582 -vn -0.8654 0.4294 0.2584 -vn -0.9198 0.3350 0.2041 -vn -0.9198 0.3351 0.2041 -vn -0.9564 0.2716 0.1069 -vn -0.6861 0.2065 0.6975 -vn -0.8332 -0.0481 0.5510 -vn -0.8331 -0.0481 0.5510 -vn -0.5279 -0.4096 0.7440 -vn -0.5280 -0.4096 0.7439 -vn -0.6615 -0.6408 0.3897 -vn -0.6614 -0.6409 0.3897 -vn -0.6613 -0.6409 0.3897 -vn -0.7017 -0.7109 -0.0464 -vn -0.7019 -0.7108 -0.0464 -vn -0.8365 0.4830 0.2587 -vn -0.6123 0.3535 0.7071 -vn -0.1180 0.9923 -0.0384 -vn -0.7024 0.7117 -0.0127 -vn -0.7135 0.6925 0.1069 -vn -0.7501 0.6291 0.2041 -vn -0.7501 0.6290 0.2041 -vn -0.7501 0.6290 0.2040 -vn -0.8046 0.5348 0.2583 -vn -0.8045 0.5348 0.2583 -vn -0.3711 0.9281 -0.0297 -vn -0.2445 0.9685 -0.0474 -vn -0.2762 0.9167 0.2886 -vn -0.2761 0.9168 0.2886 -vn -0.3749 0.7456 0.5509 -vn -0.3749 0.7456 0.5510 -vn -0.5219 0.4910 0.6976 -vn -0.5220 0.4910 0.6975 -vn 0.2646 0.9632 -0.0464 -vn 0.2647 0.9632 -0.0464 -vn 0.2243 0.8932 0.3897 -vn 0.2244 0.8932 0.3897 -vn 0.0908 0.6620 0.7440 -vn 0.0907 0.6620 0.7440 -vn 0.0907 0.6621 0.7439 -vn -0.1077 0.3183 0.9419 -vn -0.7555 0.6529 -0.0538 -vn -0.7122 0.6982 -0.0722 -vn -0.4532 0.8783 -0.1526 -vn -0.3946 0.9034 -0.1678 -vn -0.0813 0.9700 -0.2292 -vn -0.1457 0.9650 -0.2179 -vn 0.3022 0.9138 -0.2714 -vn 0.2400 0.9335 -0.2662 -vn 0.0021 0.4864 0.8737 -vn -0.0019 0.7363 0.6766 -vn -0.0358 0.7637 0.6446 -vn 0.0127 0.8696 0.4937 -vn -0.0287 0.9187 0.3940 -vn -0.0013 0.9345 0.3560 -vn 0.0027 0.9940 0.1095 -vn -0.0364 0.9913 0.1268 -vn 0.0000 1.0000 0.0085 -vn 0.0000 0.0253 0.9997 -vn 0.0320 0.1848 0.9823 -vn 0.0010 0.1605 0.9870 -vn -0.0009 0.4900 0.8717 -vn 0.6330 0.1737 0.7544 -vn 0.6341 0.1734 -0.7536 -vn 0.6341 0.1733 -0.7536 -vn 0.6341 0.1735 -0.7536 -vn 0.7915 0.1708 -0.5869 -vn 0.9506 0.1707 -0.2594 -vn 0.9506 0.1708 -0.2594 -vn 0.9506 0.1708 -0.2593 -vn 0.9800 0.1708 0.1025 -vn 0.9800 0.1708 0.1026 -vn 0.9799 0.1708 0.1026 -vn 0.8764 0.1707 0.4503 -vn 0.8764 0.1707 0.4504 -vn 0.8764 0.1708 0.4504 -vn 0.6668 0.1713 0.7253 -vn 0.6665 0.1715 0.7255 -vn 0.6643 0.1732 0.7271 -vn 0.6640 0.1735 0.7273 -vn 0.6330 0.1736 0.7544 -vn -0.8730 0.4878 0.0001 -vn -0.8730 0.4878 -0.0001 -vn -0.8730 0.4878 -0.0000 -vn -0.8729 0.4878 0.0000 -vn -0.8731 0.4876 0.0001 -vn -0.8730 0.4878 0.0002 -vn -0.8729 0.4878 -0.0001 -vn -0.8730 0.4877 0.0000 -vn -0.8729 0.4879 0.0002 -vn -0.8729 0.4879 0.0000 -vn -0.6426 0.0250 0.7658 -vn -0.9483 0.1773 -0.2631 -vn -0.6400 0.1795 -0.7471 -vn -0.6391 0.1748 -0.7490 -vn -0.7213 0.1644 -0.6728 -vn -0.8202 0.1764 -0.5442 -vn -0.8917 0.1751 -0.4173 -vn -0.8924 0.1755 -0.4156 -vn -0.8901 0.1742 -0.4211 -vn -0.8860 0.1669 0.4326 -vn -0.8923 0.1737 0.4167 -vn -0.9065 0.1737 0.3847 -vn -0.9487 0.1784 0.2609 -vn -0.9475 0.1763 0.2669 -vn -0.9477 0.1767 0.2656 -vn -0.9491 0.1790 0.2593 -vn -0.9425 0.1745 0.2851 -vn -0.9362 0.1732 0.3057 -vn -0.9286 0.1751 0.3273 -vn -0.9196 0.1790 0.3497 -vn -0.9281 0.1744 0.3290 -vn -0.9085 0.1771 0.3786 -vn -0.8837 0.1648 0.4380 -vn -0.9121 0.1729 0.3717 -vn -0.9204 0.1538 0.3595 -vn -0.9318 0.1430 0.3335 -vn -0.8904 0.1828 0.4170 -vn -0.8890 0.1851 0.4189 -vn -0.8902 0.1833 0.4172 -vn -0.8905 0.1828 0.4166 -vn -0.9829 0.0911 0.1599 -vn -0.9700 0.2221 0.0990 -vn -0.9581 0.1569 0.2395 -vn -0.9619 0.1825 0.2037 -vn -0.9503 0.1680 0.2622 -vn -0.9539 0.1744 0.2444 -vn -0.9429 0.1729 0.2847 -vn -0.9430 0.1730 0.2841 -vn -0.9433 0.1733 0.2830 -vn -0.9434 0.1734 0.2826 -vn -0.9332 0.1738 0.3145 -vn -0.9819 0.1303 0.1376 -vn -0.9803 0.1610 0.1147 -vn -0.9786 0.1822 0.0951 -vn -0.9671 0.1809 0.1790 -vn -0.9622 0.1756 0.2080 -vn -0.9572 0.1730 0.2322 -vn -0.9780 0.1740 0.1149 -vn -0.9631 0.2307 0.1388 -vn -0.9636 0.2286 0.1390 -vn -0.9635 0.1885 0.1901 -vn -0.9561 0.1654 0.2419 -vn -0.9138 0.1275 -0.3856 -vn -0.8983 0.2129 -0.3844 -vn -0.9393 0.1275 -0.3185 -vn -0.9258 0.1747 -0.3353 -vn -0.9702 0.1710 -0.1719 -vn -0.9022 0.1609 -0.4001 -vn -0.8948 0.1719 -0.4119 -vn -0.8836 0.1862 -0.4296 -vn -0.9582 0.1726 -0.2281 -vn -0.9599 0.1716 -0.2219 -vn -0.9593 0.1719 -0.2241 -vn -0.9417 0.1757 -0.2869 -vn -0.9229 0.1662 -0.3472 -vn -0.9074 0.1583 -0.3893 -vn -0.9364 0.1804 -0.3009 -vn -0.8894 0.1738 -0.4227 -vn -0.8861 0.1729 -0.4301 -vn -0.8949 0.1717 -0.4120 -vn -0.8957 0.1715 -0.4103 -vn -0.8970 0.1712 -0.4075 -vn -0.8978 0.1710 -0.4058 -vn -0.9233 0.1757 -0.3415 -vn -0.9634 0.1905 -0.1886 -vn -0.9794 0.1731 -0.1038 -vn -0.9838 0.1742 -0.0426 -vn -0.9861 0.1659 -0.0098 -vn -0.9790 0.1860 0.0829 -vn -0.9780 0.1723 0.1177 -vn -0.9623 0.1741 0.2088 -vn -0.9510 0.1608 0.2641 -vn -0.9461 0.1681 0.2767 -vn -0.9008 0.1848 0.3929 -vn -0.9091 0.1340 0.3945 -vn -0.9009 0.1608 0.4030 -vn -0.9843 0.1609 -0.0721 -vn -0.9794 0.1727 -0.1042 -vn -0.9839 0.1735 0.0425 -vn -0.9831 0.1831 -0.0014 -vn -0.9822 0.1680 0.0844 -vn -0.9805 0.1558 0.1199 -vn -0.9678 0.1794 0.1763 -vn -0.6330 0.1737 0.7544 -vn -0.6330 0.1736 0.7544 -vn -0.6781 0.1841 0.7115 -vn -0.6563 0.1918 0.7297 -vn -0.7094 0.1721 0.6835 -vn -0.6331 0.1737 0.7544 -vn -0.7612 0.1677 0.6264 -vn -0.8331 0.1772 0.5239 -vn -0.8454 0.1752 0.5046 -vn -0.8954 0.1710 0.4111 -vn -0.9085 0.1627 0.3848 -vn -0.7999 0.1392 -0.5838 -vn -0.7144 0.2404 -0.6571 -vn -0.7441 0.2084 -0.6347 -vn -0.7442 0.2084 -0.6346 -vn -0.7456 0.2096 -0.6326 -vn -0.6339 0.1658 -0.7554 -vn -0.6385 0.1726 -0.7500 -vn -0.6397 0.1782 -0.7477 -vn -0.9560 0.1468 -0.2541 -vn -0.9577 0.1729 -0.2303 -vn -0.9708 0.1742 -0.1649 -vn -0.9705 0.1750 -0.1660 -vn -0.9682 0.1904 -0.1624 -vn -0.9590 0.1680 -0.2282 -vn -0.9533 0.1925 -0.2325 -vn -0.8621 0.4504 0.2322 -vn -0.7700 0.2863 0.5703 -vn -0.8698 0.4918 0.0408 -vn -0.8483 0.4033 -0.3431 -vn -0.7492 0.2799 0.6003 -vn -0.7492 0.2799 0.6004 -vn -0.7494 0.2749 0.6023 -vn -0.7491 0.2783 0.6012 -vn -0.7495 0.2725 0.6033 -vn -0.7494 0.2756 0.6020 -vn -0.7896 0.2702 0.5509 -vn -0.8146 0.2238 0.5351 -vn -0.8476 0.3079 0.4322 -vn -0.8841 0.2464 0.3970 -vn -0.8805 0.2805 0.3820 -vn -0.9121 0.2235 0.3438 -vn -0.9128 0.2928 0.2845 -vn -0.9513 0.2256 0.2103 -vn -0.9422 0.2811 0.1822 -vn -0.9667 0.2390 0.0912 -vn -0.9600 0.2653 0.0891 -vn -0.9682 0.2501 -0.0075 -vn -0.9677 0.2518 -0.0070 -vn -0.9679 0.2512 -0.0072 -vn -0.9683 0.2495 -0.0077 -vn -0.9637 0.2541 -0.0817 -vn -0.9624 0.2619 -0.0723 -vn -0.9626 0.2607 -0.0738 -vn -0.9639 0.2531 -0.0828 -vn -0.9533 0.2705 -0.1342 -vn -0.9564 0.2376 -0.1699 -vn -0.9349 0.2757 -0.2234 -vn -0.9274 0.2377 -0.2890 -vn -0.9126 0.2644 -0.3117 -vn -0.8993 0.2578 -0.3533 -vn -0.8853 0.2817 -0.3700 -vn -0.7459 0.2100 -0.6321 -vn -0.8044 0.3118 -0.5057 -vn -0.8452 0.2422 -0.4765 -vn -0.7585 0.2895 -0.5839 -vn -0.7498 0.2788 -0.6001 -vn -0.7505 0.2776 -0.5998 -vn -0.7492 0.2744 -0.6029 -vn -0.7492 0.2782 -0.6011 -vn -0.7491 0.2713 -0.6043 -vn -0.8603 0.4612 0.2173 -vn -0.8686 0.4471 0.2137 -vn -0.8729 0.4393 0.2120 -vn -0.8732 0.4389 0.2117 -vn -0.8715 0.4490 0.1970 -vn -0.8873 0.4212 0.1880 -vn -0.8831 0.4452 0.1483 -vn -0.8918 0.4331 0.1307 -vn -0.8956 0.4236 0.1358 -vn -0.8952 0.4247 0.1353 -vn -0.8914 0.4341 0.1300 -vn -0.9027 0.4142 0.1168 -vn -0.8950 0.4358 0.0956 -vn -0.9082 0.4127 0.0702 -vn -0.9006 0.4304 0.0605 -vn -0.9057 0.4228 0.0294 -vn -0.9087 0.4163 0.0300 -vn -0.9078 0.4183 0.0299 -vn -0.9048 0.4248 0.0293 -vn -0.9075 0.4199 -0.0024 -vn -0.9073 0.4204 -0.0023 -vn -0.9075 0.4201 -0.0023 -vn -0.9077 0.4196 -0.0025 -vn -0.9066 0.4212 -0.0267 -vn -0.9055 0.4237 -0.0239 -vn -0.9057 0.4232 -0.0244 -vn -0.9067 0.4208 -0.0271 -vn -0.9033 0.4268 -0.0445 -vn -0.9076 0.4162 -0.0562 -vn -0.9000 0.4294 -0.0748 -vn -0.9035 0.4175 -0.0971 -vn -0.9033 0.4179 -0.0974 -vn -0.8984 0.4266 -0.1047 -vn -0.8979 0.4274 -0.1054 -vn -0.8969 0.4257 -0.1197 -vn -0.8964 0.4267 -0.1202 -vn -0.8918 0.4346 -0.1255 -vn -0.8916 0.4349 -0.1261 -vn -0.8904 0.4243 -0.1649 -vn -0.8793 0.4437 -0.1731 -vn -0.8738 0.4379 -0.2114 -vn -0.8661 0.4514 -0.2149 -vn -0.8721 0.4640 -0.1552 -vn -0.7934 0.0000 -0.6088 -vn -0.9386 0.3450 0.0001 -vn -0.9882 0.0000 -0.1532 -vn -0.9331 0.0174 -0.3591 -vn -0.9763 -0.0017 -0.2164 -vn -0.8188 0.0012 -0.5740 -vn -0.7103 0.0189 -0.7037 -vn -0.7934 0.0000 0.6088 -vn -0.9986 0.0000 0.0533 -vn -0.9874 0.0029 0.1581 -vn -0.9763 0.0062 0.2164 -vn -0.9592 0.0022 0.2826 -vn -0.8110 -0.0044 0.5850 -vn -0.6428 -0.0000 0.7660 -vn -0.7720 0.1461 0.6186 -vn -0.7720 0.1460 0.6186 -vn -0.8871 0.4037 0.2238 -vn -0.9244 0.3811 0.0131 -vn -0.9239 0.3827 -0.0001 -vn -0.9243 0.3814 0.0128 -vn -0.9906 0.1301 0.0432 -vn -0.9905 0.1304 0.0435 -vn -0.9918 0.1228 0.0359 -vn -0.9250 0.3799 0.0116 -vn -0.9256 0.3769 0.0363 -vn -0.9218 0.3854 0.0410 -vn -0.9256 0.3769 0.0362 -vn -0.9257 0.3766 0.0364 -vn -0.9180 0.3900 0.0720 -vn -0.9262 0.3704 0.0709 -vn -0.9014 0.4117 0.1339 -vn -0.9162 0.3488 0.1971 -vn -0.9919 0.1220 0.0352 -vn -0.9821 0.1391 0.1273 -vn -0.9876 0.1117 0.1103 -vn -0.9635 0.1528 0.2200 -vn -0.9725 0.0930 0.2133 -vn -0.8949 0.2117 0.3929 -vn -0.8338 0.0212 0.5516 -vn -0.9914 0.1305 0.0000 -vn -0.9239 0.3827 0.0000 -vn -0.8886 0.4011 -0.2225 -vn -0.8893 0.3999 -0.2219 -vn -0.8916 0.3959 -0.2200 -vn -0.8338 0.1211 -0.5386 -vn -0.7729 0.1445 -0.6178 -vn -0.7723 0.1456 -0.6184 -vn -0.7725 0.1452 -0.6182 -vn -0.9018 0.3880 -0.1903 -vn -0.9165 0.3603 -0.1737 -vn -0.9126 0.3963 -0.1005 -vn -0.9247 0.3754 -0.0626 -vn -0.9216 0.3855 -0.0460 -vn -0.9239 0.3823 -0.0153 -vn -0.9253 0.3788 -0.0190 -vn -0.9252 0.3791 -0.0189 -vn -0.9238 0.3827 -0.0148 -vn -0.8653 0.0580 -0.4980 -vn -0.8673 0.0658 -0.4935 -vn -0.8659 0.0604 -0.4966 -vn -0.8679 0.0681 -0.4921 -vn -0.9613 0.1359 -0.2397 -vn -0.9751 0.1098 -0.1924 -vn -0.9808 0.1383 -0.1378 -vn -0.9911 0.1189 -0.0591 -vn -0.9905 0.1304 -0.0447 -vn -0.8871 0.4037 -0.2238 -vn -0.7720 0.1460 -0.6186 -vn -0.6428 0.0000 -0.7660 -vn -0.8661 0.5000 0.0001 -vn -0.6947 0.1861 -0.6947 -vn -0.6947 0.1861 -0.6948 -vn -0.8560 -0.0931 -0.5086 -vn -0.9490 -0.2543 -0.1861 -vn -0.9490 -0.2543 -0.1862 -vn -0.9659 -0.2588 0.0000 -vn -0.9565 -0.2563 0.1393 -vn -0.9032 -0.1640 0.3966 -vn -0.8047 0.0066 0.5936 -vn -0.6760 0.2295 0.7002 -vn -0.5086 0.5086 0.6947 -vn -0.3474 0.7878 0.5086 -vn -0.2543 0.9490 0.1862 -vn -0.2543 0.9490 0.1861 -vn -0.2588 0.9659 0.0000 -vn -0.2563 0.9565 -0.1393 -vn -0.3096 0.8642 -0.3966 -vn -0.4081 0.6936 -0.5936 -vn -0.4082 0.6935 -0.5936 -vn -0.5368 0.4707 -0.7002 -vn -0.5367 0.4708 -0.7002 -vn -0.6704 0.2418 0.7015 -vn -0.4751 0.3540 0.8056 -vn -0.7092 0.0332 0.7043 -vn -0.6744 0.0729 0.7347 -vn -0.7511 -0.1280 0.6476 -vn -0.7810 -0.1665 0.6019 -vn -0.8252 -0.2454 0.5088 -vn -0.8718 -0.2881 0.3963 -vn -0.8792 -0.3106 0.3613 -vn -0.9243 -0.3523 0.1466 -vn -0.9209 -0.3398 0.1911 -vn -0.9485 -0.2999 -0.1024 -vn -0.9648 -0.2585 0.0482 -vn -0.5000 -0.8660 0.0000 -vn -0.8660 0.5001 0.0000 -vn -0.8668 0.4986 0.0022 -vn -0.8668 0.4987 0.0018 -vn -0.8665 0.4992 0.0011 -vn -0.8657 0.5006 -0.0004 -vn -0.8662 0.4997 -0.0001 -vn -0.8664 0.4994 0.0002 -vn -0.8662 0.4998 0.0000 -vn -0.8661 0.4998 0.0005 -vn -0.8664 0.4993 -0.0007 -vn -0.8663 0.4995 0.0003 -vn -0.8661 0.4998 0.0002 -vn -0.8659 0.5003 0.0011 -vn -0.8647 0.5023 -0.0014 -vn -0.8650 0.5018 -0.0014 -vn -0.8652 0.5014 -0.0009 -vn -0.8657 0.5006 -0.0010 -vn -0.8660 0.5001 0.0002 -vn -0.8659 0.5003 -0.0001 -vn -0.8659 0.5002 0.0000 -vn -0.8659 0.5003 0.0000 -vn -0.8662 0.4997 -0.0007 -vn -0.8661 0.4998 -0.0004 -vn -0.8659 0.5003 0.0004 -vn -0.8658 0.5003 0.0004 -vn -0.8658 0.5005 0.0007 -vn 0.5000 0.8660 0.0000 -vn -0.2568 0.9583 0.1258 -vn -0.1068 0.9919 -0.0691 -vn -0.1941 0.9252 0.3260 -vn -0.1701 0.9465 0.2742 -vn -0.1841 0.8541 0.4864 -vn -0.2126 0.8180 0.5345 -vn -0.2582 0.7366 0.6251 -vn -0.3309 0.6486 0.6854 -vn -0.3443 0.6159 0.7086 -vn -0.4674 0.4391 0.7673 -vn -0.4479 0.4793 0.7547 -vn -0.6327 0.2470 0.7339 -vn -0.5875 0.3949 0.7063 -vn -0.8660 0.5001 0.0001 -vn -0.9583 -0.2568 -0.1258 -vn -0.9124 -0.4034 0.0690 -vn -0.8984 -0.2945 -0.3259 -vn -0.9048 -0.3260 -0.2741 -vn -0.8318 -0.2676 -0.4864 -vn -0.8147 -0.2248 -0.5346 -vn -0.7670 -0.1447 -0.6251 -vn -0.7272 -0.0378 -0.6854 -vn -0.7055 -0.0099 -0.7086 -vn -0.6139 0.1854 -0.7673 -vn -0.6391 0.1483 -0.7547 -vn -0.5303 0.4244 -0.7339 -vn -0.6357 0.3115 -0.7063 -vn 0.0250 -0.9997 -0.0009 -vn 0.0147 -0.7465 -0.6652 -vn 0.0532 -0.1677 -0.9844 -vn 0.0011 -0.9997 -0.0263 -vn 0.0115 -0.9911 -0.1329 -vn 0.1342 -0.9908 -0.0147 -vn 0.4579 -0.8889 -0.0154 -vn 0.3025 -0.9531 -0.0101 -vn 0.9853 -0.1678 -0.0329 -vn 0.1934 -0.9802 -0.0427 -vn 0.1946 -0.9808 -0.0149 -vn 0.1946 -0.9808 -0.0150 -vn 0.1924 -0.9808 -0.0331 -vn 0.1924 -0.9808 -0.0330 -vn 0.1888 -0.9808 -0.0493 -vn 0.1888 -0.9808 -0.0494 -vn 0.1842 -0.9808 -0.0646 -vn 0.1778 -0.9808 -0.0806 -vn 0.1778 -0.9808 -0.0805 -vn 0.1708 -0.9808 -0.0944 -vn 0.1630 -0.9808 -0.1074 -vn 0.1630 -0.9808 -0.1073 -vn 0.1531 -0.9808 -0.1211 -vn 0.1531 -0.9807 -0.1212 -vn 0.1531 -0.9808 -0.1210 -vn 0.1423 -0.9808 -0.1337 -vn 0.1423 -0.9808 -0.1336 -vn 0.1340 -0.9808 -0.1417 -vn 0.1341 -0.9808 -0.1417 -vn 0.1269 -0.9808 -0.1481 -vn 0.1269 -0.9808 -0.1482 -vn 0.1165 -0.9808 -0.1565 -vn 0.1164 -0.9808 -0.1566 -vn 0.1085 -0.9808 -0.1618 -vn 0.1087 -0.9807 -0.1623 -vn 0.1007 -0.9808 -0.1670 -vn 0.1007 -0.9808 -0.1672 -vn 0.0879 -0.9808 -0.1742 -vn 0.0879 -0.9808 -0.1743 -vn 0.0734 -0.9807 -0.1810 -vn 0.0734 -0.9807 -0.1811 -vn 0.0734 -0.9808 -0.1809 -vn 0.0734 -0.9808 -0.1808 -vn 0.0570 -0.9807 -0.1868 -vn 0.0570 -0.9807 -0.1869 -vn 0.0571 -0.9808 -0.1867 -vn 0.0474 -0.9808 -0.1891 -vn 0.0381 -0.9808 -0.1914 -vn 0.0381 -0.9808 -0.1915 -vn 0.0380 -0.9808 -0.1915 -vn 0.0205 -0.9808 -0.1941 -vn 0.0205 -0.9808 -0.1942 -vn 0.0202 -0.9808 -0.1942 -vn 0.0291 -0.9808 -0.1929 -vn 0.0294 -0.9806 -0.1936 -vn 0.0129 -0.9530 -0.3026 -vn 0.0195 -0.8889 -0.4576 -vn 0.0441 -0.8313 -0.5541 -vn 0.0584 -0.8311 -0.5530 -vn 0.0584 -0.8311 -0.5531 -vn 0.1083 -0.8311 -0.5454 -vn 0.1084 -0.8311 -0.5454 -vn 0.1084 -0.8311 -0.5455 -vn 0.1352 -0.8314 -0.5390 -vn 0.1354 -0.8314 -0.5390 -vn 0.1355 -0.8314 -0.5390 -vn 0.1624 -0.8310 -0.5320 -vn 0.1623 -0.8311 -0.5319 -vn 0.1623 -0.8311 -0.5318 -vn 0.2089 -0.8311 -0.5153 -vn 0.2090 -0.8311 -0.5154 -vn 0.2505 -0.8311 -0.4964 -vn 0.2505 -0.8312 -0.4964 -vn 0.2504 -0.8312 -0.4964 -vn 0.2868 -0.8312 -0.4764 -vn 0.2868 -0.8312 -0.4763 -vn 0.3093 -0.8315 -0.4616 -vn 0.3092 -0.8315 -0.4616 -vn 0.3093 -0.8314 -0.4616 -vn 0.3095 -0.8313 -0.4616 -vn 0.3318 -0.8311 -0.4462 -vn 0.3318 -0.8311 -0.4463 -vn 0.3318 -0.8310 -0.4464 -vn 0.3319 -0.8310 -0.4464 -vn 0.3619 -0.8311 -0.4222 -vn 0.3619 -0.8311 -0.4223 -vn 0.3618 -0.8311 -0.4223 -vn 0.3823 -0.8313 -0.4034 -vn 0.3822 -0.8313 -0.4035 -vn 0.4053 -0.8311 -0.3808 -vn 0.4052 -0.8311 -0.3808 -vn 0.4362 -0.8312 -0.3448 -vn 0.4362 -0.8311 -0.3448 -vn 0.4643 -0.8311 -0.3061 -vn 0.4643 -0.8311 -0.3060 -vn 0.4644 -0.8311 -0.3060 -vn 0.4867 -0.8312 -0.2688 -vn 0.5066 -0.8311 -0.2295 -vn 0.5065 -0.8311 -0.2295 -vn 0.5064 -0.8312 -0.2295 -vn 0.5246 -0.8312 -0.1841 -vn 0.5247 -0.8312 -0.1841 -vn 0.5380 -0.8312 -0.1406 -vn 0.5380 -0.8311 -0.1406 -vn 0.5381 -0.8311 -0.1405 -vn 0.5481 -0.8311 -0.0942 -vn 0.5482 -0.8310 -0.0942 -vn 0.5546 -0.8310 -0.0426 -vn 0.5545 -0.8311 -0.0427 -vn 0.5547 -0.8310 -0.0423 -vn 0.5538 -0.8310 -0.0529 -vn 0.5537 -0.8310 -0.0536 -vn 0.6652 -0.7467 0.0008 -vn 0.0636 -0.4840 -0.8728 -vn 0.0221 -0.5555 -0.8312 -vn 0.0873 -0.5554 -0.8270 -vn 0.0874 -0.5554 -0.8270 -vn 0.1620 -0.5553 -0.8157 -vn 0.1621 -0.5553 -0.8157 -vn 0.1622 -0.5552 -0.8157 -vn 0.2027 -0.5556 -0.8064 -vn 0.2023 -0.5557 -0.8064 -vn 0.2020 -0.5560 -0.8063 -vn 0.2018 -0.5558 -0.8064 -vn 0.2427 -0.5554 -0.7954 -vn 0.2427 -0.5554 -0.7953 -vn 0.2427 -0.5555 -0.7953 -vn 0.3125 -0.5555 -0.7706 -vn 0.3125 -0.5554 -0.7706 -vn 0.3745 -0.5557 -0.7423 -vn 0.3745 -0.5556 -0.7424 -vn 0.3746 -0.5553 -0.7425 -vn 0.3747 -0.5553 -0.7425 -vn 0.4290 -0.5553 -0.7125 -vn 0.4290 -0.5552 -0.7125 -vn 0.4633 -0.5555 -0.6905 -vn 0.4630 -0.5556 -0.6906 -vn 0.4632 -0.5556 -0.6905 -vn 0.4630 -0.5557 -0.6906 -vn 0.4962 -0.5554 -0.6673 -vn 0.4961 -0.5555 -0.6673 -vn 0.4960 -0.5556 -0.6673 -vn 0.5410 -0.5557 -0.6313 -vn 0.5410 -0.5556 -0.6313 -vn 0.5411 -0.5555 -0.6314 -vn 0.5412 -0.5554 -0.6314 -vn 0.5717 -0.5557 -0.6036 -vn 0.5720 -0.5557 -0.6034 -vn 0.5718 -0.5557 -0.6035 -vn 0.5721 -0.5557 -0.6033 -vn 0.6061 -0.5551 -0.5696 -vn 0.6061 -0.5551 -0.5697 -vn 0.6060 -0.5551 -0.5697 -vn 0.6525 -0.5553 -0.5157 -vn 0.6944 -0.5553 -0.4576 -vn 0.6945 -0.5553 -0.4576 -vn 0.6945 -0.5552 -0.4576 -vn 0.6945 -0.5552 -0.4577 -vn 0.7280 -0.5553 -0.4021 -vn 0.7279 -0.5554 -0.4020 -vn 0.7279 -0.5555 -0.4020 -vn 0.7575 -0.5553 -0.3433 -vn 0.7575 -0.5553 -0.3432 -vn 0.7575 -0.5554 -0.3432 -vn 0.7847 -0.5554 -0.2753 -vn 0.8047 -0.5553 -0.2101 -vn 0.8046 -0.5553 -0.2101 -vn 0.8045 -0.5555 -0.2101 -vn 0.8045 -0.5556 -0.2101 -vn 0.8195 -0.5555 -0.1408 -vn 0.8195 -0.5555 -0.1407 -vn 0.8196 -0.5553 -0.1407 -vn 0.8197 -0.5553 -0.1407 -vn 0.8292 -0.5552 -0.0640 -vn 0.8292 -0.5553 -0.0640 -vn 0.8292 -0.5553 -0.0642 -vn 0.8295 -0.5556 -0.0568 -vn 0.8296 -0.5555 -0.0562 -vn 0.0415 -0.1951 -0.9799 -vn 0.1031 -0.1950 -0.9754 -vn 0.1031 -0.1947 -0.9754 -vn 0.1911 -0.1947 -0.9621 -vn 0.1912 -0.1950 -0.9620 -vn 0.2384 -0.1952 -0.9513 -vn 0.2380 -0.1951 -0.9515 -vn 0.2863 -0.1949 -0.9381 -vn 0.3687 -0.1948 -0.9089 -vn 0.4418 -0.1948 -0.8757 -vn 0.4418 -0.1953 -0.8756 -vn 0.5059 -0.1953 -0.8402 -vn 0.5059 -0.1950 -0.8403 -vn 0.5464 -0.1952 -0.8144 -vn 0.5461 -0.1951 -0.8147 -vn 0.5851 -0.1950 -0.7871 -vn 0.5851 -0.1949 -0.7872 -vn 0.6383 -0.1950 -0.7447 -vn 0.6383 -0.1947 -0.7448 -vn 0.6743 -0.1948 -0.7123 -vn 0.6748 -0.1952 -0.7117 -vn 0.7147 -0.1951 -0.6717 -vn 0.7147 -0.1955 -0.6715 -vn 0.7694 -0.1950 -0.6083 -vn 0.7694 -0.1951 -0.6082 -vn 0.8190 -0.1950 -0.5396 -vn 0.8190 -0.1951 -0.5396 -vn 0.8585 -0.1951 -0.4743 -vn 0.8584 -0.1952 -0.4743 -vn 0.8934 -0.1950 -0.4047 -vn 0.8934 -0.1948 -0.4048 -vn 0.9255 -0.1948 -0.3248 -vn 0.9255 -0.1949 -0.3247 -vn 0.9490 -0.1950 -0.2479 -vn 0.9490 -0.1949 -0.2479 -vn 0.9667 -0.1949 -0.1660 -vn 0.9666 -0.1951 -0.1659 -vn 0.9779 -0.1950 -0.0755 -vn 0.9779 -0.1951 -0.0755 -vn 0.9795 -0.1951 -0.0496 -vn 0.8745 -0.4849 -0.0150 -vn 0.0011 -0.9997 0.0251 -vn 0.0113 -0.9909 0.1342 -vn 0.0200 -0.8889 0.4577 -vn 0.0132 -0.9530 0.3026 -vn 0.0430 -0.1678 0.9849 -vn 0.7857 -0.6152 0.0647 -vn 0.8655 -0.4993 0.0398 -vn 0.9262 -0.3763 0.0236 -vn 0.5075 -0.8590 0.0675 -vn 0.1993 -0.9798 0.0175 -vn 0.2022 -0.9778 0.0559 -vn 0.0277 -0.9807 0.1936 -vn 0.0273 -0.9806 0.1940 -vn 0.0161 -0.9808 0.1944 -vn 0.0163 -0.9808 0.1944 -vn 0.0286 -0.9808 0.1931 -vn 0.0287 -0.9808 0.1931 -vn 0.0287 -0.9808 0.1930 -vn 0.0466 -0.9808 0.1896 -vn 0.0619 -0.9808 0.1851 -vn 0.0618 -0.9808 0.1851 -vn 0.0767 -0.9807 0.1796 -vn 0.0767 -0.9807 0.1797 -vn 0.0767 -0.9808 0.1796 -vn 0.0914 -0.9808 0.1725 -vn 0.1049 -0.9808 0.1646 -vn 0.1049 -0.9808 0.1647 -vn 0.1049 -0.9808 0.1645 -vn 0.1048 -0.9808 0.1645 -vn 0.1183 -0.9808 0.1552 -vn 0.1183 -0.9808 0.1551 -vn 0.1310 -0.9808 0.1447 -vn 0.1388 -0.9808 0.1370 -vn 0.1388 -0.9808 0.1371 -vn 0.1465 -0.9808 0.1291 -vn 0.1465 -0.9808 0.1290 -vn 0.1566 -0.9808 0.1166 -vn 0.1651 -0.9808 0.1042 -vn 0.1738 -0.9808 0.0890 -vn 0.1737 -0.9808 0.0890 -vn 0.1808 -0.9808 0.0736 -vn 0.1808 -0.9808 0.0737 -vn 0.1869 -0.9808 0.0565 -vn 0.1869 -0.9808 0.0564 -vn 0.1868 -0.9808 0.0565 -vn 0.1899 -0.9808 0.0443 -vn 0.1898 -0.9808 0.0443 -vn 0.1923 -0.9808 0.0332 -vn 0.1924 -0.9808 0.0332 -vn 0.1944 -0.9808 0.0175 -vn 0.0556 -0.9967 0.0587 -vn 0.3256 -0.9453 0.0196 -vn 0.5565 -0.8308 -0.0072 -vn 0.5539 -0.8312 0.0486 -vn 0.5539 -0.8312 0.0487 -vn 0.5539 -0.8311 0.0487 -vn 0.5480 -0.8311 0.0945 -vn 0.5479 -0.8312 0.0945 -vn 0.5412 -0.8314 0.1262 -vn 0.5413 -0.8313 0.1263 -vn 0.5413 -0.8313 0.1264 -vn 0.5324 -0.8311 0.1609 -vn 0.5149 -0.8311 0.2098 -vn 0.5150 -0.8311 0.2099 -vn 0.4950 -0.8311 0.2536 -vn 0.4949 -0.8311 0.2536 -vn 0.4703 -0.8311 0.2967 -vn 0.4702 -0.8312 0.2966 -vn 0.4702 -0.8312 0.2965 -vn 0.4460 -0.8312 0.3320 -vn 0.4461 -0.8311 0.3320 -vn 0.4173 -0.8311 0.3677 -vn 0.3956 -0.8312 0.3906 -vn 0.3956 -0.8313 0.3904 -vn 0.3955 -0.8314 0.3902 -vn 0.3733 -0.8312 0.4120 -vn 0.3734 -0.8312 0.4120 -vn 0.3734 -0.8311 0.4121 -vn 0.3372 -0.8311 0.4422 -vn 0.2988 -0.8312 0.4689 -vn 0.2603 -0.8312 0.4912 -vn 0.2603 -0.8312 0.4913 -vn 0.2184 -0.8311 0.5114 -vn 0.2184 -0.8312 0.5113 -vn 0.2184 -0.8312 0.5112 -vn 0.1763 -0.8313 0.5272 -vn 0.1763 -0.8312 0.5272 -vn 0.1762 -0.8312 0.5273 -vn 0.1762 -0.8311 0.5274 -vn 0.1328 -0.8312 0.5400 -vn 0.1328 -0.8311 0.5400 -vn 0.1328 -0.8311 0.5401 -vn 0.1328 -0.8310 0.5402 -vn 0.0817 -0.8310 0.5502 -vn 0.0817 -0.8311 0.5501 -vn 0.0464 -0.8314 0.5538 -vn 0.0464 -0.8313 0.5538 -vn 0.0464 -0.8313 0.5539 -vn 0.0448 -0.8313 0.5540 -vn 0.0429 -0.8313 0.5541 -vn 0.0167 -0.7466 0.6651 -vn 0.6410 -0.7670 0.0282 -vn 0.8313 -0.5555 0.0181 -vn 0.8284 -0.5554 0.0727 -vn 0.8284 -0.5554 0.0728 -vn 0.8196 -0.5553 0.1413 -vn 0.8097 -0.5556 0.1891 -vn 0.8097 -0.5556 0.1889 -vn 0.8097 -0.5556 0.1888 -vn 0.7960 -0.5553 0.2407 -vn 0.7961 -0.5553 0.2407 -vn 0.7961 -0.5552 0.2407 -vn 0.7702 -0.5553 0.3139 -vn 0.7701 -0.5553 0.3139 -vn 0.7402 -0.5553 0.3791 -vn 0.7402 -0.5553 0.3792 -vn 0.7402 -0.5552 0.3793 -vn 0.7402 -0.5552 0.3794 -vn 0.7034 -0.5551 0.4438 -vn 0.7034 -0.5552 0.4438 -vn 0.7034 -0.5554 0.4436 -vn 0.7034 -0.5555 0.4436 -vn 0.6671 -0.5555 0.4964 -vn 0.6671 -0.5555 0.4965 -vn 0.6239 -0.5554 0.5498 -vn 0.6239 -0.5555 0.5497 -vn 0.5918 -0.5558 0.5838 -vn 0.5917 -0.5557 0.5841 -vn 0.5916 -0.5555 0.5844 -vn 0.5584 -0.5552 0.6164 -vn 0.5584 -0.5553 0.6163 -vn 0.5584 -0.5553 0.6162 -vn 0.5042 -0.5553 0.6613 -vn 0.5042 -0.5553 0.6614 -vn 0.5042 -0.5552 0.6614 -vn 0.4469 -0.5553 0.7014 -vn 0.4469 -0.5554 0.7013 -vn 0.3893 -0.5554 0.7349 -vn 0.3893 -0.5553 0.7349 -vn 0.3894 -0.5553 0.7349 -vn 0.3267 -0.5552 0.7648 -vn 0.3267 -0.5553 0.7648 -vn 0.2637 -0.5553 0.7887 -vn 0.2636 -0.5553 0.7887 -vn 0.2636 -0.5554 0.7887 -vn 0.1985 -0.5553 0.8076 -vn 0.1222 -0.5553 0.8226 -vn 0.1221 -0.5552 0.8227 -vn 0.1221 -0.5551 0.8227 -vn 0.0694 -0.5555 0.8286 -vn 0.0695 -0.5556 0.8285 -vn 0.0695 -0.5557 0.8285 -vn 0.0697 -0.5558 0.8284 -vn 0.0514 -0.5559 0.8297 -vn 0.0305 -0.4847 0.8741 -vn 0.0517 -0.1949 0.9795 -vn 0.0822 -0.1949 0.9774 -vn 0.0819 -0.1952 0.9773 -vn 0.1440 -0.1951 0.9702 -vn 0.2341 -0.1950 0.9525 -vn 0.2342 -0.1949 0.9525 -vn 0.3110 -0.1949 0.9302 -vn 0.3109 -0.1950 0.9302 -vn 0.3853 -0.1950 0.9020 -vn 0.3853 -0.1949 0.9020 -vn 0.4591 -0.1950 0.8667 -vn 0.4593 -0.1947 0.8667 -vn 0.5272 -0.1947 0.8272 -vn 0.5269 -0.1953 0.8272 -vn 0.5946 -0.1953 0.7799 -vn 0.5948 -0.1949 0.7799 -vn 0.6586 -0.1950 0.7268 -vn 0.6585 -0.1950 0.7269 -vn 0.6978 -0.1952 0.6891 -vn 0.6979 -0.1950 0.6891 -vn 0.7359 -0.1950 0.6484 -vn 0.7359 -0.1952 0.6484 -vn 0.7867 -0.1953 0.5856 -vn 0.7869 -0.1948 0.5855 -vn 0.8296 -0.1947 0.5232 -vn 0.8296 -0.1950 0.5233 -vn 0.8729 -0.1948 0.4473 -vn 0.9083 -0.1948 0.3701 -vn 0.9083 -0.1949 0.3702 -vn 0.9389 -0.1948 0.2838 -vn 0.9388 -0.1950 0.2839 -vn 0.9551 -0.1952 0.2227 -vn 0.9551 -0.1952 0.2228 -vn 0.9665 -0.1949 0.1667 -vn 0.9665 -0.1950 0.1666 -vn 0.9771 -0.1949 0.0859 -vn 0.9770 -0.1951 0.0859 -vn 0.9794 -0.1952 0.0511 -vn 0.9910 -0.1300 0.0334 -vn -0.0449 -0.7459 -0.6645 -vn -0.7531 -0.6566 -0.0410 -vn 0.0000 -1.0000 0.0002 -vn -0.1843 -0.9829 0.0047 -vn -0.3528 -0.9355 -0.0213 -vn -0.2983 -0.9342 -0.1959 -vn -0.9906 -0.1340 -0.0285 -vn -0.0300 -0.1679 -0.9853 -vn 0.0008 -0.9906 -0.1365 -vn -0.0012 -0.9996 -0.0269 -vn -0.1949 -0.9808 -0.0090 -vn -0.1935 -0.9808 -0.0250 -vn -0.1936 -0.9808 -0.0250 -vn -0.1909 -0.9808 -0.0409 -vn -0.1908 -0.9808 -0.0408 -vn -0.1858 -0.9808 -0.0599 -vn -0.1859 -0.9808 -0.0599 -vn -0.1794 -0.9808 -0.0767 -vn -0.1730 -0.9808 -0.0903 -vn -0.1656 -0.9808 -0.1033 -vn -0.1656 -0.9808 -0.1032 -vn -0.1555 -0.9808 -0.1180 -vn -0.1555 -0.9808 -0.1181 -vn -0.1444 -0.9808 -0.1313 -vn -0.1443 -0.9808 -0.1313 -vn -0.1443 -0.9808 -0.1312 -vn -0.1330 -0.9808 -0.1428 -vn -0.1330 -0.9808 -0.1427 -vn -0.1330 -0.9808 -0.1429 -vn -0.1211 -0.9808 -0.1530 -vn -0.1211 -0.9808 -0.1531 -vn -0.1079 -0.9808 -0.1627 -vn -0.1079 -0.9808 -0.1626 -vn -0.0942 -0.9808 -0.1709 -vn -0.0802 -0.9808 -0.1779 -vn -0.0802 -0.9808 -0.1778 -vn -0.0802 -0.9808 -0.1780 -vn -0.0630 -0.9808 -0.1848 -vn -0.0631 -0.9807 -0.1848 -vn -0.0438 -0.9808 -0.1903 -vn -0.0438 -0.9807 -0.1903 -vn -0.0255 -0.9807 -0.1936 -vn -0.0256 -0.9807 -0.1936 -vn 0.0137 -0.9804 -0.1966 -vn -0.0134 -0.9531 -0.3023 -vn -0.0203 -0.8886 -0.4582 -vn -0.0018 -0.8306 -0.5569 -vn -0.0728 -0.8310 -0.5516 -vn -0.0728 -0.8310 -0.5515 -vn -0.0728 -0.8311 -0.5514 -vn -0.0729 -0.8311 -0.5513 -vn -0.1246 -0.8311 -0.5420 -vn -0.1246 -0.8310 -0.5421 -vn -0.1796 -0.8310 -0.5265 -vn -0.1797 -0.8311 -0.5263 -vn -0.2286 -0.8311 -0.5069 -vn -0.2685 -0.8312 -0.4868 -vn -0.2685 -0.8312 -0.4869 -vn -0.2685 -0.8311 -0.4870 -vn -0.2685 -0.8311 -0.4871 -vn -0.3074 -0.8311 -0.4635 -vn -0.3451 -0.8311 -0.4362 -vn -0.3451 -0.8311 -0.4361 -vn -0.3451 -0.8312 -0.4360 -vn -0.3451 -0.8312 -0.4359 -vn -0.3789 -0.8311 -0.4070 -vn -0.4114 -0.8311 -0.3742 -vn -0.4113 -0.8311 -0.3742 -vn -0.4430 -0.8310 -0.3365 -vn -0.4430 -0.8309 -0.3366 -vn -0.4721 -0.8310 -0.2944 -vn -0.4720 -0.8310 -0.2943 -vn -0.4720 -0.8311 -0.2942 -vn -0.4720 -0.8311 -0.2941 -vn -0.4929 -0.8311 -0.2574 -vn -0.4929 -0.8312 -0.2574 -vn -0.4929 -0.8312 -0.2573 -vn -0.5113 -0.8312 -0.2186 -vn -0.5113 -0.8311 -0.2187 -vn -0.5112 -0.8311 -0.2187 -vn -0.5295 -0.8310 -0.1707 -vn -0.5295 -0.8309 -0.1707 -vn -0.5296 -0.8309 -0.1708 -vn -0.5439 -0.8310 -0.1164 -vn -0.5439 -0.8311 -0.1164 -vn -0.5438 -0.8311 -0.1163 -vn -0.5437 -0.8312 -0.1163 -vn -0.5515 -0.8312 -0.0712 -vn -0.5515 -0.8311 -0.0712 -vn -0.5515 -0.8311 -0.0713 -vn -0.5516 -0.8311 -0.0713 -vn -0.5550 -0.8312 -0.0333 -vn -0.5549 -0.8312 -0.0333 -vn -0.5549 -0.8313 -0.0333 -vn -0.5566 -0.8284 0.0626 -vn -0.6323 -0.7747 -0.0084 -vn -0.0083 -0.4849 -0.8745 -vn -0.0524 -0.5557 -0.8297 -vn -0.1089 -0.5552 -0.8245 -vn -0.1089 -0.5552 -0.8246 -vn -0.1863 -0.5552 -0.8106 -vn -0.2686 -0.5551 -0.7872 -vn -0.3419 -0.5552 -0.7582 -vn -0.3420 -0.5552 -0.7582 -vn -0.3420 -0.5552 -0.7581 -vn -0.4015 -0.5553 -0.7283 -vn -0.4015 -0.5554 -0.7283 -vn -0.4015 -0.5555 -0.7282 -vn -0.4015 -0.5555 -0.7281 -vn -0.4597 -0.5556 -0.6928 -vn -0.4597 -0.5555 -0.6929 -vn -0.4596 -0.5555 -0.6930 -vn -0.4596 -0.5554 -0.6930 -vn -0.5160 -0.5554 -0.6521 -vn -0.5161 -0.5554 -0.6521 -vn -0.5161 -0.5554 -0.6520 -vn -0.5162 -0.5554 -0.6520 -vn -0.5666 -0.5555 -0.6086 -vn -0.5666 -0.5554 -0.6087 -vn -0.5666 -0.5553 -0.6087 -vn -0.5667 -0.5552 -0.6088 -vn -0.6152 -0.5553 -0.5596 -vn -0.6151 -0.5554 -0.5596 -vn -0.6623 -0.5551 -0.5032 -vn -0.6623 -0.5552 -0.5031 -vn -0.6623 -0.5553 -0.5030 -vn -0.7057 -0.5554 -0.4399 -vn -0.7057 -0.5554 -0.4398 -vn -0.7058 -0.5554 -0.4398 -vn -0.7371 -0.5555 -0.3848 -vn -0.7371 -0.5554 -0.3849 -vn -0.7371 -0.5554 -0.3850 -vn -0.7372 -0.5553 -0.3850 -vn -0.7646 -0.5554 -0.3269 -vn -0.7646 -0.5554 -0.3270 -vn -0.7646 -0.5553 -0.3270 -vn -0.7916 -0.5551 -0.2552 -vn -0.7916 -0.5552 -0.2552 -vn -0.8132 -0.5555 -0.1739 -vn -0.8132 -0.5554 -0.1739 -vn -0.8133 -0.5553 -0.1739 -vn -0.8133 -0.5553 -0.1740 -vn -0.8248 -0.5553 -0.1065 -vn -0.8299 -0.5556 -0.0498 -vn -0.8300 -0.5556 -0.0498 -vn -0.8317 -0.5551 0.0140 -vn -0.8599 -0.5105 -0.0061 -vn -0.0433 -0.1950 -0.9799 -vn -0.1285 -0.1948 -0.9724 -vn -0.1284 -0.1951 -0.9723 -vn -0.2196 -0.1951 -0.9559 -vn -0.2197 -0.1949 -0.9559 -vn -0.3167 -0.1950 -0.9283 -vn -0.3168 -0.1948 -0.9283 -vn -0.4033 -0.1949 -0.8940 -vn -0.4033 -0.1950 -0.8941 -vn -0.4735 -0.1950 -0.8589 -vn -0.4736 -0.1947 -0.8589 -vn -0.5423 -0.1947 -0.8173 -vn -0.5420 -0.1951 -0.8174 -vn -0.6086 -0.1950 -0.7691 -vn -0.6088 -0.1950 -0.7690 -vn -0.6683 -0.1948 -0.7180 -vn -0.6682 -0.1951 -0.7179 -vn -0.7255 -0.1951 -0.6600 -vn -0.7810 -0.1949 -0.5933 -vn -0.7811 -0.1953 -0.5931 -vn -0.8325 -0.1947 -0.5186 -vn -0.8324 -0.1952 -0.5187 -vn -0.8693 -0.1952 -0.4542 -vn -0.8694 -0.1948 -0.4540 -vn -0.9019 -0.1949 -0.3855 -vn -0.9018 -0.1950 -0.3857 -vn -0.9335 -0.1948 -0.3010 -vn -0.9336 -0.1948 -0.3009 -vn -0.9592 -0.1947 -0.2050 -vn -0.9591 -0.1951 -0.2051 -vn -0.9727 -0.1951 -0.1257 -vn -0.9727 -0.1950 -0.1256 -vn -0.9790 -0.1950 -0.0588 -vn -0.9790 -0.1952 -0.0588 -vn -0.9808 -0.1951 -0.0005 -vn -0.9203 -0.3889 -0.0416 -vn 0.4578 -0.8889 0.0183 -vn 0.3021 -0.9526 -0.0367 -vn 0.1357 -0.9907 -0.0009 -vn 0.0274 -0.9996 0.0011 -vn 0.6651 -0.7464 -0.0216 -vn 0.9850 -0.1681 0.0393 -vn 0.0176 -0.5568 0.8305 -vn 0.0148 -0.5635 0.8260 -vn 0.0156 -0.5614 0.8274 -vn 0.0448 -0.4173 0.9077 -vn 0.0307 -0.1679 0.9853 -vn -0.0005 -0.9911 0.1329 -vn 0.0002 -0.9911 0.1330 -vn -0.0001 -0.9997 0.0257 -vn 0.0011 -0.9997 0.0254 -vn 0.1949 -0.9808 0.0078 -vn 0.1948 -0.9808 0.0087 -vn 0.1941 -0.9808 0.0201 -vn 0.1919 -0.9808 0.0358 -vn 0.1880 -0.9808 0.0523 -vn 0.1881 -0.9808 0.0523 -vn 0.1830 -0.9808 0.0680 -vn 0.1830 -0.9807 0.0680 -vn 0.1789 -0.9808 0.0779 -vn 0.1744 -0.9807 0.0879 -vn 0.1744 -0.9808 0.0878 -vn 0.1657 -0.9808 0.1032 -vn 0.1555 -0.9808 0.1181 -vn 0.1555 -0.9807 0.1182 -vn 0.1554 -0.9808 0.1181 -vn 0.1554 -0.9808 0.1180 -vn 0.1443 -0.9808 0.1315 -vn 0.1336 -0.9808 0.1422 -vn 0.1260 -0.9808 0.1489 -vn 0.1161 -0.9808 0.1570 -vn 0.1161 -0.9808 0.1569 -vn 0.1008 -0.9808 0.1672 -vn 0.1008 -0.9807 0.1673 -vn 0.1007 -0.9808 0.1672 -vn 0.1007 -0.9808 0.1671 -vn 0.0861 -0.9808 0.1751 -vn 0.0861 -0.9808 0.1750 -vn 0.0726 -0.9808 0.1810 -vn 0.0726 -0.9808 0.1811 -vn 0.0727 -0.9808 0.1811 -vn 0.0579 -0.9808 0.1864 -vn 0.0403 -0.9808 0.1909 -vn 0.0403 -0.9808 0.1910 -vn 0.0403 -0.9807 0.1911 -vn 0.0223 -0.9808 0.1939 -vn 0.0223 -0.9808 0.1940 -vn -0.0130 -0.9805 0.1962 -vn 0.0290 -0.9311 0.3637 -vn 0.0298 -0.9310 0.3637 -vn 0.0415 -0.9307 0.3634 -vn 0.0103 -0.8575 0.5144 -vn 0.0026 -0.8308 0.5565 -vn 0.0635 -0.8311 0.5525 -vn 0.0634 -0.8311 0.5525 -vn 0.1149 -0.8311 0.5440 -vn 0.1149 -0.8311 0.5441 -vn 0.1149 -0.8310 0.5442 -vn 0.1149 -0.8310 0.5443 -vn 0.1651 -0.8310 0.5312 -vn 0.1651 -0.8310 0.5311 -vn 0.1651 -0.8311 0.5310 -vn 0.2070 -0.8313 0.5159 -vn 0.2070 -0.8312 0.5159 -vn 0.2455 -0.8311 0.4990 -vn 0.2870 -0.8311 0.4763 -vn 0.2870 -0.8311 0.4764 -vn 0.3308 -0.8311 0.4471 -vn 0.3307 -0.8312 0.4470 -vn 0.3307 -0.8312 0.4469 -vn 0.3590 -0.8314 0.4242 -vn 0.3590 -0.8313 0.4243 -vn 0.3591 -0.8313 0.4243 -vn 0.3806 -0.8313 0.4052 -vn 0.3806 -0.8313 0.4051 -vn 0.4111 -0.8311 0.3745 -vn 0.4111 -0.8311 0.3746 -vn 0.4111 -0.8310 0.3746 -vn 0.4429 -0.8311 0.3363 -vn 0.4720 -0.8311 0.2941 -vn 0.4720 -0.8311 0.2940 -vn 0.4967 -0.8312 0.2500 -vn 0.4967 -0.8311 0.2500 -vn 0.4968 -0.8311 0.2500 -vn 0.5095 -0.8314 0.2217 -vn 0.5095 -0.8314 0.2218 -vn 0.5212 -0.8311 0.1937 -vn 0.5213 -0.8311 0.1937 -vn 0.5213 -0.8311 0.1938 -vn 0.5358 -0.8311 0.1491 -vn 0.5467 -0.8311 0.1020 -vn 0.5468 -0.8311 0.1020 -vn 0.5468 -0.8310 0.1020 -vn 0.5530 -0.8312 0.0572 -vn 0.5530 -0.8312 0.0570 -vn 0.5531 -0.8312 0.0562 -vn 0.5532 -0.8312 0.0552 -vn 0.0443 -0.7459 0.6645 -vn 0.0183 -0.5553 0.8314 -vn 0.0949 -0.5553 0.8262 -vn 0.1718 -0.5553 0.8137 -vn 0.2469 -0.5553 0.7942 -vn 0.2469 -0.5552 0.7942 -vn 0.3096 -0.5554 0.7718 -vn 0.3096 -0.5555 0.7717 -vn 0.3672 -0.5555 0.7461 -vn 0.3671 -0.5554 0.7461 -vn 0.3671 -0.5554 0.7462 -vn 0.4291 -0.5553 0.7124 -vn 0.4291 -0.5553 0.7123 -vn 0.4947 -0.5553 0.6686 -vn 0.4947 -0.5553 0.6685 -vn 0.5371 -0.5556 0.6347 -vn 0.5692 -0.5557 0.6059 -vn 0.5692 -0.5556 0.6060 -vn 0.5692 -0.5555 0.6061 -vn 0.5692 -0.5554 0.6062 -vn 0.6148 -0.5551 0.5602 -vn 0.6148 -0.5552 0.5602 -vn 0.6148 -0.5552 0.5601 -vn 0.6624 -0.5552 0.5030 -vn 0.6623 -0.5552 0.5030 -vn 0.6623 -0.5553 0.5030 -vn 0.6623 -0.5554 0.5029 -vn 0.7059 -0.5553 0.4397 -vn 0.7429 -0.5554 0.3738 -vn 0.7429 -0.5553 0.3739 -vn 0.7623 -0.5555 0.3321 -vn 0.7623 -0.5557 0.3318 -vn 0.7623 -0.5556 0.3319 -vn 0.7623 -0.5557 0.3317 -vn 0.7795 -0.5554 0.2897 -vn 0.7795 -0.5554 0.2898 -vn 0.8011 -0.5554 0.2229 -vn 0.8175 -0.5554 0.1526 -vn 0.8175 -0.5553 0.1526 -vn 0.8175 -0.5553 0.1525 -vn 0.8176 -0.5553 0.1525 -vn 0.8271 -0.5555 0.0857 -vn 0.8271 -0.5556 0.0857 -vn 0.8270 -0.5556 0.0856 -vn 0.8318 -0.5550 0.0145 -vn 0.0437 -0.1952 0.9798 -vn 0.1117 -0.1950 0.9744 -vn 0.1119 -0.1948 0.9744 -vn 0.2027 -0.1948 0.9597 -vn 0.2026 -0.1951 0.9596 -vn 0.2912 -0.1950 0.9366 -vn 0.3650 -0.1950 0.9103 -vn 0.3653 -0.1947 0.9103 -vn 0.4331 -0.1947 0.8801 -vn 0.4330 -0.1949 0.8801 -vn 0.5061 -0.1949 0.8402 -vn 0.5835 -0.1948 0.7884 -vn 0.5834 -0.1951 0.7884 -vn 0.6335 -0.1952 0.7487 -vn 0.6336 -0.1950 0.7487 -vn 0.6714 -0.1950 0.7149 -vn 0.6714 -0.1951 0.7149 -vn 0.7251 -0.1952 0.6604 -vn 0.7250 -0.1950 0.6605 -vn 0.7810 -0.1952 0.5932 -vn 0.7812 -0.1947 0.5932 -vn 0.8325 -0.1948 0.5186 -vn 0.8761 -0.1949 0.4410 -vn 0.8762 -0.1947 0.4409 -vn 0.8994 -0.1950 0.3912 -vn 0.8994 -0.1951 0.3912 -vn 0.9194 -0.1949 0.3417 -vn 0.9193 -0.1950 0.3418 -vn 0.9449 -0.1949 0.2630 -vn 0.9449 -0.1948 0.2629 -vn 0.9642 -0.1949 0.1798 -vn 0.9642 -0.1949 0.1799 -vn 0.9756 -0.1948 0.1011 -vn 0.9756 -0.1950 0.1010 -vn 0.9804 -0.1949 0.0279 -vn 0.8738 -0.4843 0.0445 -vn -0.0445 -0.4172 0.9077 -vn -0.0252 -0.8567 0.5152 -vn -0.6636 -0.7449 -0.0690 -vn -0.8258 -0.5633 0.0275 -vn -0.9082 -0.4174 0.0303 -vn -0.1329 -0.9911 -0.0071 -vn -0.0260 -0.9997 0.0009 -vn 0.0424 -0.9306 0.3635 -vn -0.0012 -0.9911 0.1327 -vn -0.0013 -0.9997 0.0261 -vn -0.0253 -0.7464 0.6650 -vn 0.0070 -0.1679 0.9858 -vn -0.0127 -0.9659 0.2585 -vn -0.0364 -0.9659 0.2563 -vn -0.0591 -0.9659 0.2520 -vn -0.0591 -0.9659 0.2521 -vn -0.0819 -0.9659 0.2456 -vn -0.0819 -0.9659 0.2455 -vn -0.0820 -0.9659 0.2455 -vn -0.1030 -0.9659 0.2374 -vn -0.1030 -0.9659 0.2375 -vn -0.1232 -0.9659 0.2276 -vn -0.1232 -0.9659 0.2275 -vn -0.1232 -0.9659 0.2277 -vn -0.1418 -0.9659 0.2165 -vn -0.1418 -0.9659 0.2166 -vn -0.1418 -0.9659 0.2164 -vn -0.1418 -0.9660 0.2164 -vn -0.1563 -0.9659 0.2063 -vn -0.1563 -0.9659 0.2062 -vn -0.1563 -0.9659 0.2064 -vn -0.1762 -0.9659 0.1897 -vn -0.1913 -0.9659 0.1744 -vn -0.1913 -0.9659 0.1743 -vn -0.2030 -0.9660 0.1604 -vn -0.2030 -0.9659 0.1605 -vn -0.2150 -0.9659 0.1442 -vn -0.2150 -0.9659 0.1443 -vn -0.2263 -0.9659 0.1256 -vn -0.2364 -0.9659 0.1056 -vn -0.2364 -0.9659 0.1057 -vn -0.2443 -0.9659 0.0852 -vn -0.2444 -0.9659 0.0852 -vn -0.2504 -0.9659 0.0654 -vn -0.2505 -0.9659 0.0654 -vn -0.2552 -0.9659 0.0433 -vn -0.2553 -0.9659 0.0433 -vn -0.2582 -0.9659 0.0195 -vn -0.2581 -0.9659 0.0195 -vn -0.2581 -0.9659 0.0194 -vn -0.2608 -0.9629 -0.0696 -vn -0.3638 -0.9314 0.0121 -vn -0.5153 -0.8568 0.0170 -vn -0.7075 -0.7068 0.0026 -vn -0.7055 -0.7068 0.0531 -vn -0.7055 -0.7067 0.0530 -vn -0.7056 -0.7066 0.0530 -vn -0.7057 -0.7065 0.0529 -vn -0.6977 -0.7065 0.1185 -vn -0.6977 -0.7066 0.1185 -vn -0.6847 -0.7065 0.1789 -vn -0.6847 -0.7065 0.1788 -vn -0.6683 -0.7065 0.2329 -vn -0.6681 -0.7066 0.2329 -vn -0.6681 -0.7067 0.2330 -vn -0.6679 -0.7068 0.2330 -vn -0.6460 -0.7066 0.2888 -vn -0.6461 -0.7065 0.2888 -vn -0.6187 -0.7066 0.3434 -vn -0.6187 -0.7066 0.3433 -vn -0.6187 -0.7067 0.3433 -vn -0.5877 -0.7066 0.3942 -vn -0.5876 -0.7066 0.3942 -vn -0.5549 -0.7068 0.4388 -vn -0.5550 -0.7068 0.4387 -vn -0.5550 -0.7067 0.4387 -vn -0.5229 -0.7067 0.4767 -vn -0.5228 -0.7067 0.4767 -vn -0.4816 -0.7066 0.5184 -vn -0.4817 -0.7065 0.5184 -vn -0.4818 -0.7065 0.5184 -vn -0.4819 -0.7064 0.5184 -vn -0.4273 -0.7064 0.5642 -vn -0.4272 -0.7065 0.5642 -vn -0.4272 -0.7066 0.5642 -vn -0.4271 -0.7066 0.5641 -vn -0.3877 -0.7067 0.5919 -vn -0.3878 -0.7067 0.5918 -vn -0.3368 -0.7066 0.6223 -vn -0.3367 -0.7066 0.6223 -vn -0.2817 -0.7067 0.6491 -vn -0.2817 -0.7066 0.6491 -vn -0.2817 -0.7066 0.6492 -vn -0.2241 -0.7065 0.6713 -vn -0.2242 -0.7064 0.6713 -vn -0.1617 -0.7064 0.6890 -vn -0.1617 -0.7065 0.6890 -vn -0.1616 -0.7065 0.6890 -vn -0.1616 -0.7066 0.6889 -vn -0.0995 -0.7066 0.7006 -vn -0.0995 -0.7065 0.7007 -vn -0.0996 -0.7065 0.7007 -vn -0.0030 -0.7055 0.7087 -vn -0.0405 -0.5630 0.8255 -vn -0.0472 -0.2586 0.9648 -vn -0.1359 -0.2585 0.9564 -vn -0.1360 -0.2586 0.9564 -vn -0.2205 -0.2587 0.9405 -vn -0.2207 -0.2589 0.9404 -vn -0.3059 -0.2588 0.9162 -vn -0.3058 -0.2586 0.9163 -vn -0.3845 -0.2586 0.8862 -vn -0.3845 -0.2586 0.8861 -vn -0.4596 -0.2586 0.8496 -vn -0.4597 -0.2586 0.8496 -vn -0.5294 -0.2587 0.8080 -vn -0.5295 -0.2588 0.8079 -vn -0.5830 -0.2587 0.7702 -vn -0.5829 -0.2586 0.7703 -vn -0.6577 -0.2586 0.7075 -vn -0.6576 -0.2586 0.7076 -vn -0.7137 -0.2587 0.6509 -vn -0.7138 -0.2588 0.6507 -vn -0.7578 -0.2589 0.5990 -vn -0.7577 -0.2587 0.5992 -vn -0.8022 -0.2585 0.5381 -vn -0.8022 -0.2586 0.5381 -vn -0.8446 -0.2586 0.4688 -vn -0.8446 -0.2587 0.4687 -vn -0.8819 -0.2586 0.3942 -vn -0.8819 -0.2585 0.3942 -vn -0.9121 -0.2587 0.3182 -vn -0.9121 -0.2587 0.3181 -vn -0.9346 -0.2586 0.2441 -vn -0.9346 -0.2588 0.2440 -vn -0.9523 -0.2588 0.1617 -vn -0.9523 -0.2587 0.1617 -vn -0.9632 -0.2587 0.0722 -vn -0.9633 -0.2587 0.0722 -vn -0.9650 -0.2580 -0.0464 -vn -0.9853 -0.1677 0.0328 -vn 0.0000 -1.0000 0.0007 -vn 0.0000 -1.0000 -0.0008 -vn -0.1201 -0.9922 0.0347 -vn -0.1884 -0.9812 0.0431 -vn -0.1701 -0.9843 0.0461 -vn -0.2141 -0.9732 0.0840 -vn -0.2709 -0.9581 0.0933 -vn -0.2728 -0.9585 0.0830 -vn -0.2726 -0.9585 0.0835 -vn -0.2707 -0.9580 0.0946 -vn -0.6818 -0.6936 0.2324 -vn -0.2792 -0.9543 0.1067 -vn -0.2437 -0.9673 0.0704 -vn -0.2475 -0.9663 0.0704 -vn -0.2461 -0.9667 0.0704 -vn -0.5551 -0.8169 0.1566 -vn -0.6409 -0.7427 0.1943 -vn -0.9619 -0.0248 0.2724 -vn -0.8218 -0.2358 0.5187 -vn -0.8822 -0.2810 0.3778 -vn -0.8935 -0.3146 0.3206 -vn -0.8935 -0.3537 0.2765 -vn -0.8655 -0.4367 0.2451 -vn -0.8655 -0.4368 0.2452 -vn -0.8655 -0.4369 0.2451 -vn -0.0380 -0.5631 0.8255 -vn -0.0418 -0.4173 0.9078 -vn -0.0239 -0.8551 0.5180 -vn -0.0010 -0.9997 0.0226 -vn -0.0101 -0.9911 0.1327 -vn -0.2489 -0.9660 0.0704 -vn -0.2489 -0.9659 0.0706 -vn -0.2459 -0.9658 0.0820 -vn -0.2458 -0.9658 0.0820 -vn -0.2460 -0.9658 0.0823 -vn -0.2295 -0.9658 0.1208 -vn -0.2295 -0.9658 0.1209 -vn -0.2294 -0.9658 0.1207 -vn -0.2106 -0.9658 0.1511 -vn -0.1882 -0.9658 0.1782 -vn -0.1882 -0.9658 0.1783 -vn -0.1882 -0.9658 0.1781 -vn -0.1688 -0.9659 0.1962 -vn -0.1505 -0.9659 0.2106 -vn -0.1506 -0.9659 0.2105 -vn -0.1353 -0.9660 0.2205 -vn -0.1194 -0.9659 0.2297 -vn -0.0998 -0.9659 0.2388 -vn -0.0998 -0.9660 0.2386 -vn -0.0897 -0.9660 0.2426 -vn -0.0897 -0.9660 0.2425 -vn -0.0788 -0.9659 0.2467 -vn -0.0787 -0.9659 0.2466 -vn -0.0567 -0.9659 0.2526 -vn -0.0567 -0.9659 0.2525 -vn -0.0568 -0.9659 0.2526 -vn -0.0568 -0.9659 0.2527 -vn -0.0344 -0.9659 0.2566 -vn -0.0344 -0.9659 0.2567 -vn -0.0209 -0.9660 0.2578 -vn -0.0209 -0.9660 0.2579 -vn -0.0210 -0.9660 0.2577 -vn -0.0383 -0.9658 0.2564 -vn -0.0168 -0.9313 0.3638 -vn -0.0357 -0.7465 0.6644 -vn -0.0542 -0.7069 0.7053 -vn -0.0540 -0.7069 0.7052 -vn -0.0575 -0.7068 0.7050 -vn -0.0575 -0.7069 0.7049 -vn -0.0939 -0.7066 0.7014 -vn -0.0939 -0.7066 0.7013 -vn -0.0938 -0.7066 0.7013 -vn -0.1551 -0.7067 0.6903 -vn -0.1552 -0.7067 0.6903 -vn -0.1552 -0.7066 0.6904 -vn -0.2150 -0.7066 0.6742 -vn -0.2150 -0.7066 0.6741 -vn -0.2455 -0.7070 0.6633 -vn -0.2455 -0.7068 0.6634 -vn -0.2729 -0.7067 0.6528 -vn -0.2729 -0.7067 0.6527 -vn -0.3263 -0.7066 0.6278 -vn -0.3264 -0.7066 0.6278 -vn -0.3264 -0.7066 0.6279 -vn -0.3265 -0.7065 0.6279 -vn -0.3700 -0.7068 0.6030 -vn -0.4116 -0.7066 0.5755 -vn -0.4117 -0.7066 0.5756 -vn -0.4118 -0.7065 0.5756 -vn -0.4614 -0.7066 0.5365 -vn -0.5143 -0.7062 0.4866 -vn -0.5144 -0.7061 0.4866 -vn -0.5145 -0.7060 0.4866 -vn -0.5753 -0.7062 0.4127 -vn -0.5753 -0.7061 0.4127 -vn -0.5754 -0.7061 0.4127 -vn -0.6267 -0.7061 0.3296 -vn -0.6269 -0.7060 0.3295 -vn -0.6271 -0.7058 0.3295 -vn -0.6718 -0.7058 0.2249 -vn -0.6713 -0.7061 0.2252 -vn -0.6712 -0.7062 0.2253 -vn -0.6708 -0.7065 0.2255 -vn -0.6806 -0.7069 0.1927 -vn -0.6805 -0.7069 0.1927 -vn -0.6805 -0.7070 0.1928 -vn -0.6804 -0.7070 0.1930 -vn -0.6804 -0.7069 0.1933 -vn -0.8652 -0.4373 0.2453 -vn -0.8641 -0.2545 0.4342 -vn -0.9156 -0.2586 0.3079 -vn -0.9156 -0.2582 0.3083 -vn -0.8552 -0.2581 0.4494 -vn -0.8553 -0.2583 0.4492 -vn -0.7850 -0.2584 0.5630 -vn -0.7850 -0.2585 0.5629 -vn -0.7018 -0.2584 0.6638 -vn -0.7018 -0.2585 0.6638 -vn -0.6298 -0.2588 0.7324 -vn -0.6298 -0.2587 0.7324 -vn -0.5621 -0.2587 0.7856 -vn -0.5052 -0.2587 0.8233 -vn -0.5052 -0.2588 0.8233 -vn -0.4456 -0.2587 0.8570 -vn -0.4455 -0.2584 0.8572 -vn -0.3726 -0.2585 0.8913 -vn -0.3727 -0.2587 0.8912 -vn -0.3352 -0.2589 0.9059 -vn -0.3358 -0.2590 0.9056 -vn -0.2935 -0.2589 0.9202 -vn -0.2935 -0.2587 0.9203 -vn -0.2118 -0.2587 0.9424 -vn -0.2118 -0.2586 0.9425 -vn -0.1281 -0.2586 0.9575 -vn -0.1282 -0.2587 0.9574 -vn -0.0786 -0.2589 0.9627 -vn -0.0782 -0.2587 0.9628 -vn -0.0765 -0.2588 0.9629 -vn -0.0686 -0.2591 0.9634 -vn -0.0682 -0.2588 0.9635 -vn -0.0454 -0.1677 0.9848 -vn -0.9681 0.1731 -0.1813 -vn -0.9492 0.1741 0.2621 -vn -0.9497 0.1722 0.2615 -vn -0.9504 0.1714 0.2594 -vn -0.9494 0.1713 0.2632 -vn -0.9511 0.1765 0.2536 -vn -0.9500 0.1749 0.2588 -vn -0.9501 0.1750 0.2581 -vn -0.9509 0.1709 0.2581 -vn -0.9511 0.1706 0.2574 -vn -0.9456 0.1787 0.2720 -vn -0.9532 0.1707 0.2496 -vn -0.9484 0.1761 0.2636 -vn -0.9516 0.1740 0.2532 -vn -0.9489 0.1757 0.2620 -vn -0.9589 0.1821 0.2177 -vn -0.9587 0.1819 0.2184 -vn -0.9579 0.1789 0.2247 -vn -0.9579 0.1784 0.2249 -vn -0.9551 0.1745 0.2394 -vn -0.9567 0.1760 0.2318 -vn -0.9565 0.1757 0.2328 -vn -0.9564 0.1646 0.2412 -vn -0.9584 0.1708 0.2286 -vn -0.9636 0.1757 0.2014 -vn -0.9633 0.1749 0.2034 -vn -0.9628 0.1736 0.2072 -vn -0.9625 0.1729 0.2091 -vn -0.9656 0.1738 0.1935 -vn -0.9657 0.1763 0.1907 -vn -0.9672 0.1746 0.1842 -vn -0.9483 0.1698 0.2681 -vn -0.9505 0.1723 0.2586 -vn -0.9547 0.1742 0.2415 -vn -0.9554 0.1746 0.2380 -vn -0.9669 0.1734 0.1870 -vn -0.9668 0.1729 0.1883 -vn -0.9707 0.1742 0.1656 -vn -0.9704 0.1736 0.1679 -vn -0.9699 0.1724 0.1719 -vn -0.9696 0.1717 0.1745 -vn -0.9729 0.1768 0.1494 -vn -0.9726 0.1756 0.1520 -vn -0.9722 0.1729 0.1579 -vn -0.9720 0.1717 0.1603 -vn -0.9758 0.1753 0.1305 -vn -0.9758 0.1751 0.1312 -vn -0.9757 0.1745 0.1327 -vn -0.9756 0.1742 0.1333 -vn -0.9787 0.1733 0.1101 -vn -0.9796 0.1769 0.0949 -vn -0.9796 0.1763 0.0965 -vn -0.9795 0.1750 0.0999 -vn -0.9795 0.1745 0.1011 -vn -0.9822 0.1729 0.0736 -vn -0.9822 0.1734 0.0723 -vn -0.9822 0.1749 0.0681 -vn -0.9823 0.1753 0.0668 -vn -0.9841 0.1723 0.0430 -vn -0.9841 0.1729 0.0407 -vn -0.9840 0.1750 0.0336 -vn -0.9840 0.1756 0.0314 -vn -0.9850 0.1721 0.0121 -vn -0.9853 0.1709 0.0075 -vn -0.9852 0.1714 0.0060 -vn -0.9849 0.1731 0.0004 -vn -0.9848 0.1737 -0.0016 -vn -0.9843 0.1735 -0.0315 -vn -0.9843 0.1738 -0.0311 -vn -0.9830 0.1736 -0.0595 -vn -0.9829 0.1716 -0.0668 -vn -0.9810 0.1749 -0.0834 -vn -0.9800 0.1721 -0.0997 -vn -0.9797 0.1726 -0.1018 -vn -0.9787 0.1741 -0.1083 -vn -0.9784 0.1747 -0.1105 -vn -0.9766 0.1725 -0.1286 -vn -0.9763 0.1729 -0.1302 -vn -0.9754 0.1741 -0.1349 -vn -0.9752 0.1745 -0.1365 -vn -0.9727 0.1729 -0.1548 -vn -0.9724 0.1733 -0.1562 -vn -0.9717 0.1741 -0.1598 -vn -0.9714 0.1744 -0.1613 -vn -0.9690 0.1732 -0.1759 -vn -0.9594 0.1737 -0.2222 -vn -0.9616 0.1759 -0.2106 -vn -0.9595 0.1739 -0.2216 -vn -0.9619 0.1761 -0.2092 -vn -0.9604 0.1718 -0.2194 -vn -0.9654 0.1753 -0.1930 -vn -0.9641 0.1717 -0.2025 -vn -0.9672 0.1745 -0.1848 -vn -0.9507 0.1771 -0.2545 -vn -0.9520 0.1802 -0.2476 -vn -0.9508 0.1774 -0.2541 -vn -0.9521 0.1805 -0.2467 -vn -0.9491 0.1667 -0.2672 -vn -0.9550 0.1789 -0.2364 -vn -0.9522 0.1698 -0.2540 -vn -0.9555 0.1736 -0.2386 -vn -0.9420 0.1727 -0.2876 -vn -0.9383 0.1782 -0.2963 -vn -0.9398 0.1766 -0.2924 -vn -0.9409 0.1758 -0.2893 -vn -0.9443 0.1740 -0.2792 -vn -0.9433 0.1712 -0.2843 -vn -0.9424 0.1722 -0.2867 -vn -0.9429 0.1757 -0.2829 -vn -0.9444 0.1753 -0.2781 -vn -0.9440 0.1749 -0.2799 -vn -0.9446 0.1756 -0.2774 -vn -0.9407 0.1709 -0.2931 -vn -0.9450 0.1744 -0.2766 -vn -0.9458 0.1753 -0.2735 -vn -0.9439 0.1730 -0.2813 -vn -0.9431 0.1722 -0.2843 -vn -0.9485 0.1746 -0.2644 -vn -0.9484 0.1746 -0.2648 -vn -0.9492 0.1752 -0.2614 -vn -0.9494 0.1753 -0.2605 -vn -0.9523 0.1770 -0.2486 -vn -0.9552 0.1742 -0.2391 -vn -0.9524 0.1769 -0.2481 -vn -0.9519 0.1711 -0.2541 -vn -0.9502 0.1725 -0.2594 -vn -0.9497 0.1728 -0.2613 -vn -0.9491 0.1731 -0.2630 -vn -0.9478 0.1735 -0.2676 -vn -0.9521 0.1773 -0.2492 -vn -0.9570 0.1704 -0.2346 -vn -0.9486 0.1780 -0.2615 -vn -0.9544 0.1682 -0.2468 -vn -0.9522 0.1709 -0.2532 -vn -0.9635 0.1743 -0.2033 -vn -0.9639 0.1737 -0.2018 -vn -0.9648 0.1723 -0.1985 -vn -0.9653 0.1716 -0.1969 -vn -0.9590 0.1759 -0.2220 -vn -0.9599 0.1747 -0.2194 -vn -0.9613 0.1713 -0.2159 -vn -0.9621 0.1711 -0.2122 -vn -0.9595 0.1732 -0.2220 -vn -0.9714 0.1688 -0.1670 -vn -0.9676 0.1767 -0.1803 -vn -0.9739 0.1710 -0.1495 -vn -0.9734 0.1719 -0.1513 -vn -0.9724 0.1739 -0.1557 -vn -0.9720 0.1747 -0.1573 -vn -0.9755 0.1731 -0.1360 -vn -0.9753 0.1734 -0.1370 -vn -0.9750 0.1738 -0.1388 -vn -0.9748 0.1740 -0.1399 -vn -0.9776 0.1730 -0.1197 -vn -0.9776 0.1730 -0.1196 -vn -0.9776 0.1730 -0.1195 -vn -0.9801 0.1741 -0.0956 -vn -0.9803 0.1737 -0.0944 -vn -0.9808 0.1726 -0.0910 -vn -0.9809 0.1723 -0.0898 -vn -0.9821 0.1747 -0.0706 -vn -0.9823 0.1741 -0.0683 -vn -0.9830 0.1726 -0.0620 -vn -0.9833 0.1721 -0.0598 -vn -0.9836 0.1749 -0.0448 -vn -0.9836 0.1748 -0.0444 -vn -0.9837 0.1747 -0.0436 -vn -0.9837 0.1746 -0.0431 -vn -0.9851 0.1713 -0.0182 -vn -0.9849 0.1718 -0.0192 -vn -0.9846 0.1735 -0.0226 -vn -0.9845 0.1739 -0.0233 -vn -0.9848 0.1735 -0.0005 -vn -0.9851 0.1708 0.0201 -vn -0.9850 0.1718 0.0183 -vn -0.9844 0.1759 0.0114 -vn -0.9842 0.1770 0.0096 -vn -0.9843 0.1720 0.0407 -vn -0.9843 0.1721 0.0403 -vn -0.9843 0.1722 0.0400 -vn -0.9842 0.1722 0.0399 -vn -0.9828 0.1749 0.0586 -vn -0.9828 0.1747 0.0593 -vn -0.9828 0.1743 0.0610 -vn -0.9828 0.1741 0.0618 -vn -0.9816 0.1731 0.0804 -vn -0.9808 0.1747 0.0863 -vn -0.9795 0.1728 0.1033 -vn -0.9784 0.1744 0.1106 -vn -0.9769 0.1729 0.1255 -vn -0.9756 0.1745 0.1330 -vn -0.9740 0.1730 0.1466 -vn -0.9739 0.1730 0.1472 -vn -0.9639 0.1737 0.2017 -vn -0.9629 0.1735 0.2069 -vn -0.9644 0.1738 0.1992 -vn -0.9669 0.1727 0.1879 -vn -0.9696 0.1692 0.1765 -vn -0.9669 0.1732 0.1874 -vn -0.9698 0.1688 0.1759 -vn -0.9656 0.1774 0.1903 -vn -0.9724 0.1702 0.1598 -vn -0.9677 0.1791 0.1775 -vn -0.9682 0.1783 0.1752 -vn -0.9704 0.1749 0.1664 -vn -0.9705 0.1747 0.1662 -vn -0.9519 0.1740 0.2523 -vn -0.9552 0.1734 0.2397 -vn -0.9572 0.1725 0.2325 -vn -0.9566 0.1729 0.2344 -vn -0.9576 0.1723 0.2309 -vn -0.9593 0.1706 0.2249 -vn -0.9596 0.1703 0.2238 -vn -0.9553 0.1766 0.2371 -vn -0.9622 0.1711 0.2120 -vn -0.9589 0.1757 0.2230 -vn -0.9624 0.1734 0.2091 -vn -0.9385 0.1745 0.2979 -vn -0.9375 0.1749 0.3009 -vn -0.9373 0.1751 0.3015 -vn -0.9419 0.1738 0.2874 -vn -0.9395 0.1742 0.2949 -vn -0.9365 0.1753 0.3036 -vn -0.9360 0.1756 0.3049 -vn -0.9364 0.1755 0.3039 -vn -0.9345 0.1742 0.3105 -vn -0.9343 0.1743 0.3109 -vn -0.9346 0.1741 0.3102 -vn -0.9366 0.1753 0.3035 -vn -0.9502 0.1642 0.2650 -vn -0.9444 0.1706 0.2812 -vn -0.9419 0.1722 0.2885 -vn -0.9419 0.1722 0.2884 -vn -0.9366 0.1725 0.3050 -vn -0.9377 0.1736 0.3010 -vn -0.9374 0.1746 0.3013 -vn -0.9394 0.1737 0.2954 -vn -0.9410 0.1727 0.2910 -vn -0.9347 0.1740 0.3099 -vn -0.9353 0.1734 0.3085 -vn -0.9359 0.1726 0.3069 -vn -0.9365 0.1717 0.3058 -vn -0.9365 0.1716 0.3057 -vn -0.9365 0.1719 0.3056 -vn -0.9298 0.1729 -0.3249 -vn -0.9285 0.1725 -0.3288 -vn -0.9272 0.1720 -0.3328 -vn -0.9310 0.1733 -0.3213 -vn -0.9352 0.1737 -0.3085 -vn -0.9368 0.1737 -0.3037 -vn -0.9343 0.1737 -0.3114 -vn -0.9336 0.1737 -0.3134 -vn -0.9277 0.1721 -0.3314 -vn -0.9275 0.1720 -0.3319 -vn -0.9272 0.1718 -0.3327 -vn -0.9269 0.1747 -0.3322 -vn -0.9257 0.1732 -0.3364 -vn -0.9264 0.1739 -0.3340 -vn -0.9271 0.1717 -0.3332 -vn -0.9363 0.1803 -0.3015 -vn -0.9358 0.1797 -0.3032 -vn -0.9352 0.1788 -0.3056 -vn -0.9337 0.1767 -0.3113 -vn -0.9330 0.1754 -0.3143 -vn -0.9274 0.1750 -0.3306 -vn -0.9279 0.1758 -0.3287 -vn -0.9281 0.1759 -0.3282 -vn -0.9281 0.1752 -0.3285 -vn -0.9283 0.1746 -0.3283 -vn -0.9294 0.1732 -0.3260 -vn -0.7054 0.1853 0.6842 -vn -0.9490 0.1982 0.2453 -vn -0.3656 0.9308 0.0038 -vn -0.0378 0.9992 0.0110 -vn -0.5166 0.8562 -0.0095 -vn -0.9750 0.2214 -0.0174 -vn -0.9952 0.0558 0.0808 -vn -0.9856 0.1451 -0.0868 -vn -0.9690 0.1738 -0.1757 -vn -0.9526 0.1759 -0.2482 -vn -0.9020 0.1458 0.4063 -vn -0.9021 0.1461 0.4061 -vn -0.9021 0.1462 0.4061 -vn -0.1283 0.0823 0.9883 -vn -0.2954 0.0695 0.9528 -vn -0.3788 0.1258 0.9169 -vn -0.4948 0.1470 0.8565 -vn -0.9757 0.2137 -0.0472 -vn -0.9760 0.2128 -0.0471 -vn -0.9768 0.2090 -0.0473 -vn -0.9768 0.2089 -0.0473 -vn -0.9767 0.2092 -0.0478 -vn -0.9704 0.2355 -0.0530 -vn -0.9705 0.2353 -0.0527 -vn -0.9704 0.2355 -0.0531 -vn -0.9704 0.2357 -0.0535 -vn -0.9644 0.2577 -0.0603 -vn -0.9643 0.2577 -0.0604 -vn -0.9644 0.2576 -0.0602 -vn -0.9644 0.2576 -0.0601 -vn -0.9586 0.2765 -0.0682 -vn -0.9585 0.2766 -0.0687 -vn -0.9586 0.2764 -0.0681 -vn -0.9587 0.2764 -0.0676 -vn -0.9533 0.2926 -0.0755 -vn -0.9531 0.2925 -0.0772 -vn -0.9531 0.2928 -0.0770 -vn -0.9533 0.2924 -0.0753 -vn -0.9478 0.3073 -0.0853 -vn -0.9478 0.3071 -0.0864 -vn -0.9478 0.3072 -0.0856 -vn -0.9478 0.3073 -0.0851 -vn -0.9431 0.3188 -0.0944 -vn -0.9430 0.3186 -0.0962 -vn -0.9431 0.3185 -0.0959 -vn -0.9431 0.3190 -0.0942 -vn -0.9385 0.3290 -0.1049 -vn -0.9386 0.3285 -0.1060 -vn -0.9386 0.3286 -0.1053 -vn -0.9360 0.3344 -0.1101 -vn -0.9362 0.3335 -0.1107 -vn -0.9342 0.3386 -0.1127 -vn -0.9344 0.3377 -0.1136 -vn -0.9334 0.3408 -0.1123 -vn -0.9335 0.3403 -0.1127 -vn -0.9334 0.3419 -0.1087 -vn -0.9337 0.3413 -0.1088 -vn -0.9339 0.3423 -0.1036 -vn -0.9340 0.3420 -0.1035 -vn -0.9344 0.3426 -0.0979 -vn -0.9344 0.3424 -0.0981 -vn -0.9350 0.3430 -0.0896 -vn -0.9354 0.3421 -0.0897 -vn -0.9349 0.3435 -0.0890 -vn -0.9366 0.3424 -0.0747 -vn -0.9368 0.3418 -0.0750 -vn -0.9367 0.3420 -0.0748 -vn -0.9365 0.3427 -0.0745 -vn -0.9379 0.3423 -0.0568 -vn -0.9381 0.3415 -0.0573 -vn -0.9380 0.3418 -0.0572 -vn -0.9377 0.3427 -0.0568 -vn -0.9390 0.3419 -0.0376 -vn -0.9390 0.3418 -0.0376 -vn -0.9390 0.3419 -0.0375 -vn -0.9392 0.3423 -0.0263 -vn -0.9393 0.3421 -0.0259 -vn -0.9153 0.4027 -0.0101 -vn -0.7703 0.6376 -0.0131 -vn -0.7660 0.6426 -0.0149 -vn -0.7659 0.6428 -0.0147 -vn -0.7658 0.6428 -0.0194 -vn -0.7656 0.6430 -0.0195 -vn -0.7655 0.6429 -0.0248 -vn -0.7654 0.6431 -0.0250 -vn -0.7652 0.6433 -0.0263 -vn -0.7654 0.6430 -0.0264 -vn -0.7648 0.6439 -0.0218 -vn -0.7654 0.6432 -0.0218 -vn -0.7659 0.6428 -0.0134 -vn -0.7669 0.6417 -0.0036 -vn -0.7674 0.6411 -0.0037 -vn -0.7667 0.6420 -0.0038 -vn -0.7705 0.6373 0.0139 -vn -0.7696 0.6384 0.0137 -vn -0.7703 0.6375 0.0137 -vn -0.7694 0.6386 0.0137 -vn -0.7744 0.6318 0.0350 -vn -0.7714 0.6354 0.0346 -vn -0.7739 0.6324 0.0349 -vn -0.7709 0.6360 0.0345 -vn -0.7787 0.6242 0.0629 -vn -0.7770 0.6263 0.0628 -vn -0.7784 0.6246 0.0629 -vn -0.7767 0.6268 0.0627 -vn -0.7872 0.6089 0.0980 -vn -0.7833 0.6139 0.0981 -vn -0.7866 0.6097 0.0980 -vn -0.7826 0.6147 0.0982 -vn -0.7959 0.5897 0.1369 -vn -0.7898 0.5978 0.1371 -vn -0.7955 0.5903 0.1372 -vn -0.7893 0.5985 0.1370 -vn -0.8080 0.5591 0.1856 -vn -0.8020 0.5675 0.1863 -vn -0.8077 0.5596 0.1855 -vn -0.8016 0.5680 0.1865 -vn -0.8205 0.5235 0.2298 -vn -0.8141 0.5324 0.2320 -vn -0.8201 0.5241 0.2299 -vn -0.8136 0.5331 0.2321 -vn -0.8339 0.4797 0.2728 -vn -0.8281 0.4881 0.2756 -vn -0.8337 0.4801 0.2729 -vn -0.8278 0.4886 0.2757 -vn -0.8468 0.4334 0.3085 -vn -0.8415 0.4412 0.3117 -vn -0.8466 0.4337 0.3085 -vn -0.8412 0.4415 0.3121 -vn -0.8606 0.3785 0.3407 -vn -0.8554 0.3861 0.3453 -vn -0.8604 0.3787 0.3410 -vn -0.8550 0.3867 0.3455 -vn -0.8750 0.3137 0.3688 -vn -0.8692 0.3233 0.3740 -vn -0.8720 0.3183 0.3719 -vn -0.8689 0.3230 0.3750 -vn -0.8888 0.2398 0.3906 -vn -0.8842 0.2465 0.3967 -vn -0.8864 0.2434 0.3937 -vn -0.8841 0.2469 0.3967 -vn -0.9028 0.1496 0.4031 -vn -0.8124 0.1892 0.5516 -vn -0.6520 0.7582 -0.0038 -vn -0.5001 0.8660 -0.0011 -vn -0.5000 0.8660 -0.0033 -vn -0.4990 0.8666 0.0008 -vn -0.5000 0.8660 0.0009 -vn -0.4992 0.8664 0.0105 -vn -0.4994 0.8663 0.0104 -vn -0.4989 0.8666 0.0103 -vn -0.5003 0.8655 0.0256 -vn -0.4992 0.8661 0.0254 -vn -0.5000 0.8657 0.0256 -vn -0.4989 0.8663 0.0253 -vn -0.5020 0.8635 0.0487 -vn -0.4999 0.8647 0.0483 -vn -0.5014 0.8638 0.0487 -vn -0.4993 0.8651 0.0483 -vn -0.5035 0.8609 0.0730 -vn -0.5025 0.8616 0.0723 -vn -0.5024 0.8616 0.0722 -vn -0.5014 0.8623 0.0715 -vn -0.5059 0.8571 0.0973 -vn -0.5009 0.8602 0.0961 -vn -0.5050 0.8577 0.0971 -vn -0.4999 0.8608 0.0959 -vn -0.5082 0.8505 0.1353 -vn -0.5032 0.8536 0.1344 -vn -0.5073 0.8511 0.1353 -vn -0.5023 0.8542 0.1344 -vn -0.5126 0.8400 0.1780 -vn -0.5049 0.8448 0.1769 -vn -0.5113 0.8408 0.1780 -vn -0.5036 0.8457 0.1768 -vn -0.5182 0.8235 0.2307 -vn -0.5098 0.8290 0.2297 -vn -0.5170 0.8244 0.2305 -vn -0.5086 0.8299 0.2294 -vn -0.5276 0.7973 0.2931 -vn -0.5135 0.8067 0.2925 -vn -0.5363 0.7638 0.3591 -vn -0.5185 0.7768 0.3573 -vn -0.5496 0.7117 0.4376 -vn -0.5298 0.7271 0.4367 -vn -0.5608 0.6538 0.5080 -vn -0.5403 0.6696 0.5096 -vn -0.5729 0.5840 0.5751 -vn -0.5546 0.5990 0.5775 -vn -0.5847 0.5117 0.6295 -vn -0.5679 0.5258 0.6333 -vn -0.5979 0.4279 0.6778 -vn -0.5800 0.4426 0.6839 -vn -0.6106 0.3311 0.7194 -vn -0.5935 0.3466 0.7263 -vn -0.6231 0.2222 0.7499 -vn -0.6098 0.2342 0.7572 -vn -0.6380 0.0839 0.7654 -vn -0.5915 0.1133 0.7983 -vn -0.2410 0.0164 0.9704 -vn -0.2139 0.1542 0.9646 -vn -0.2293 0.1800 0.9566 -vn -0.2062 0.2775 0.9383 -vn -0.2233 0.3088 0.9246 -vn -0.2005 0.3922 0.8978 -vn -0.2181 0.4196 0.8811 -vn -0.1956 0.4930 0.8478 -vn -0.2127 0.5199 0.8274 -vn -0.1909 0.5837 0.7892 -vn -0.2084 0.6089 0.7654 -vn -0.1836 0.6739 0.7157 -vn -0.2037 0.6971 0.6875 -vn -0.1803 0.7523 0.6337 -vn -0.1983 0.7715 0.6045 -vn -0.1735 0.8236 0.5400 -vn -0.1917 0.8378 0.5112 -vn -0.1726 0.8733 0.4556 -vn -0.1908 0.8805 0.4340 -vn -0.1721 0.9121 0.3720 -vn -0.1845 0.9153 0.3581 -vn -0.1697 0.9377 0.3031 -vn -0.1833 0.9396 0.2890 -vn -0.1721 0.9550 0.2416 -vn -0.1798 0.9554 0.2345 -vn -0.1700 0.9674 0.1877 -vn -0.1783 0.9673 0.1807 -vn -0.1730 0.9732 0.1512 -vn -0.1759 0.9733 0.1473 -vn -0.1705 0.9787 0.1147 -vn -0.1755 0.9781 0.1116 -vn -0.1707 0.9824 0.0753 -vn -0.1754 0.9818 0.0730 -vn -0.1727 0.9840 0.0445 -vn -0.1746 0.9837 0.0437 -vn -0.1730 0.9847 0.0213 -vn -0.1739 0.9845 0.0210 -vn -0.1734 0.9848 0.0062 -vn -0.2035 0.9791 -0.0038 -vn 0.0307 0.5056 -0.8622 -vn -0.0004 0.9982 -0.0602 -vn 0.0007 0.9980 -0.0633 -vn 0.0004 0.9981 -0.0624 -vn -0.0002 0.9992 -0.0395 -vn 0.0000 0.9994 -0.0359 -vn -0.0005 0.9998 -0.0194 -vn 0.0000 0.9998 -0.0183 -vn -0.0007 0.9982 -0.0593 -vn 0.0004 0.9952 -0.0983 -vn -0.0008 0.9947 -0.1029 -vn 0.0000 0.9932 -0.1167 -vn 0.0000 0.9920 -0.1262 -vn 0.0010 0.9902 -0.1394 -vn -0.0026 0.9869 -0.1612 -vn 0.0026 0.9808 -0.1952 -vn -0.0001 0.8626 -0.5059 -vn -0.0001 0.8624 -0.5062 -vn -0.0000 0.9055 -0.4243 -vn 0.0001 0.9057 -0.4238 -vn -0.0000 0.9327 -0.3606 -vn -0.0000 0.9332 -0.3593 -vn -0.0000 0.9493 -0.3145 -vn -0.0014 0.9474 -0.3201 -vn 0.0015 0.9660 -0.2584 -vn 0.0005 0.9649 -0.2625 -vn -0.0001 0.9752 -0.2211 -vn 0.0012 0.9788 -0.2047 -vn -0.0001 0.8336 -0.5524 -vn -0.0032 0.8169 -0.5767 -vn 0.0035 0.8415 -0.5403 -vn -0.0073 0.7773 -0.6291 -vn 0.0059 0.8024 -0.5968 -vn -0.0066 0.6937 -0.7203 -vn 0.0054 0.7218 -0.6921 -vn -0.0036 0.6167 -0.7872 -vn 0.0042 0.6461 -0.7633 -vn -0.0040 0.5557 -0.8314 -vn -0.0001 0.5772 -0.8166 -vn -0.0001 0.4861 -0.8739 -vn -0.0121 0.3863 -0.9223 -vn -0.0039 0.0694 -0.9976 -vn -0.0055 0.0697 -0.9976 -vn -0.0002 0.0702 -0.9975 -vn 0.0065 0.4280 -0.9038 -vn -0.0023 0.3096 -0.9509 -vn 0.0000 0.3324 -0.9431 -vn 0.0000 0.2842 -0.9588 -vn -0.0002 0.1973 -0.9803 -vn 0.0005 0.2009 -0.9796 -vn -0.0002 0.0688 -0.9976 -vn 0.0000 0.0696 -0.9976 -vn -0.9808 0.1748 -0.0869 -vn -0.9843 0.1737 0.0323 -vn -0.9844 0.1738 0.0289 -vn -0.9843 0.1737 0.0303 -vn -0.9848 0.1732 0.0126 -vn -0.9848 0.1734 0.0106 -vn -0.9847 0.1739 0.0071 -vn -0.9842 0.1736 0.0338 -vn -0.9836 0.1737 0.0481 -vn -0.9834 0.1740 0.0506 -vn -0.9823 0.1734 0.0703 -vn -0.9820 0.1737 0.0745 -vn -0.9812 0.1736 0.0842 -vn -0.9803 0.1738 0.0935 -vn -0.9802 0.1737 0.0946 -vn -0.9801 0.1735 0.0966 -vn -0.9800 0.1734 0.0978 -vn -0.9786 0.1738 0.1103 -vn -0.9787 0.1738 0.1096 -vn -0.9781 0.1739 0.1147 -vn -0.9780 0.1740 0.1150 -vn -0.9767 0.1747 0.1247 -vn -0.9747 0.1764 0.1370 -vn -0.9766 0.1747 0.1252 -vn -0.9746 0.1765 0.1376 -vn -0.9789 0.1708 0.1124 -vn -0.9736 0.1752 0.1464 -vn -0.9761 0.1730 0.1313 -vn -0.9725 0.1741 0.1547 -vn -0.9701 0.1737 0.1692 -vn -0.9704 0.1737 0.1676 -vn -0.9710 0.1738 0.1641 -vn -0.9710 0.1738 0.1640 -vn -0.9736 0.1734 0.1485 -vn -0.9700 0.1737 0.1700 -vn -0.9678 0.1740 0.1818 -vn -0.9688 0.1736 0.1767 -vn -0.9671 0.1744 0.1854 -vn -0.9667 0.1745 0.1871 -vn -0.9654 0.1754 0.1930 -vn -0.9647 0.1761 0.1961 -vn -0.9634 0.1776 0.2008 -vn -0.9638 0.1770 0.1994 -vn -0.9637 0.1771 0.2000 -vn -0.9634 0.1776 0.2009 -vn -0.9633 0.1776 0.2012 -vn -0.9721 0.1637 0.1682 -vn -0.9633 0.1772 0.2017 -vn -0.9713 0.1639 0.1721 -vn -0.9705 0.1660 0.1752 -vn -0.9711 0.1642 0.1731 -vn -0.9624 0.1748 0.2079 -vn -0.9624 0.1749 0.2079 -vn -0.9624 0.1749 0.2078 -vn -0.9632 0.1737 0.2052 -vn -0.9634 0.1734 0.2046 -vn -0.9661 0.1673 0.1966 -vn -0.9647 0.1708 0.2006 -vn -0.9658 0.1681 0.1974 -vn -0.9659 0.1681 0.1970 -vn -0.9650 0.1733 0.1970 -vn -0.9653 0.1736 0.1951 -vn -0.9667 0.1731 0.1884 -vn -0.9714 0.1634 0.1723 -vn -0.9660 0.1675 0.1968 -vn -0.9656 0.1694 0.1972 -vn -0.9847 0.1741 0.0051 -vn -0.9845 0.1728 -0.0315 -vn -0.9844 0.1749 -0.0213 -vn -0.9834 0.1730 -0.0553 -vn -0.9835 0.1732 -0.0529 -vn -0.9826 0.1737 -0.0660 -vn -0.9817 0.1735 -0.0780 -vn -0.9826 0.1737 -0.0664 -vn -0.9817 0.1735 -0.0781 -vn -0.9821 0.1740 -0.0720 -vn -0.9796 0.1716 -0.1050 -vn -0.9804 0.1731 -0.0940 -vn -0.9806 0.1719 -0.0940 -vn -0.9794 0.1713 -0.1072 -vn -0.9789 0.1734 -0.1086 -vn -0.9774 0.1739 -0.1206 -vn -0.9764 0.1734 -0.1289 -vn -0.9745 0.1740 -0.1418 -vn -0.9734 0.1736 -0.1493 -vn -0.9737 0.1736 -0.1475 -vn -0.9734 0.1734 -0.1499 -vn -0.9735 0.1735 -0.1488 -vn -0.9727 0.1736 -0.1540 -vn -0.9717 0.1740 -0.1599 -vn -0.9699 0.1736 -0.1709 -vn -0.9694 0.1734 -0.1736 -vn -0.9697 0.1736 -0.1718 -vn -0.9699 0.1737 -0.1706 -vn -0.9679 0.1736 -0.1818 -vn -0.9674 0.1735 -0.1846 -vn -0.9659 0.1738 -0.1918 -vn -0.9647 0.1734 -0.1983 -vn -0.9642 0.1733 -0.2009 -vn -0.9638 0.1731 -0.2029 -vn -0.9636 0.1731 -0.2035 -vn -0.9625 0.1725 -0.2095 -vn -0.9614 0.1714 -0.2153 -vn -0.9597 0.1694 -0.2241 -vn -0.9607 0.1707 -0.2189 -vn -0.9602 0.1699 -0.2216 -vn -0.9600 0.1696 -0.2228 -vn -0.9597 0.1692 -0.2243 -vn -0.9597 0.1690 -0.2246 -vn -0.9581 0.1746 -0.2269 -vn -0.9585 0.1753 -0.2250 -vn -0.9578 0.1723 -0.2301 -vn -0.9578 0.1732 -0.2293 -vn -0.9599 0.1695 -0.2234 -vn -0.9599 0.1697 -0.2231 -vn -0.9656 0.1935 -0.1736 -vn -0.9572 0.1713 -0.2333 -vn -0.9572 0.1715 -0.2332 -vn -0.9585 0.1777 -0.2228 -vn -0.9592 0.1751 -0.2222 -vn -0.9602 0.1774 -0.2158 -vn -0.9594 0.1747 -0.2214 -vn -0.9607 0.1737 -0.2165 -vn -0.9620 0.1738 -0.2108 -vn -0.9646 0.1831 -0.1899 -vn -0.9638 0.1780 -0.1986 -vn -0.9640 0.1794 -0.1960 -vn -0.9648 0.1840 -0.1880 -vn -0.9584 0.1757 -0.2252 -vn -0.9585 0.1778 -0.2230 -vn -0.9585 0.1786 -0.2223 -vn 0.0000 -0.9999 0.0160 -vn -0.0002 -0.9999 0.0158 -vn -0.0011 -0.9999 0.0142 -vn -0.0013 -0.9999 0.0140 -vn 0.0008 -0.9989 0.0466 -vn 0.0006 -0.9989 0.0459 -vn 0.0002 -0.9990 0.0441 -vn 0.0000 -0.9991 0.0435 -vn 0.0000 -0.9982 0.0598 -vn 0.0002 -0.9981 0.0609 -vn 0.0006 -0.9980 0.0632 -vn 0.0008 -0.9979 0.0641 -vn -0.0004 -0.9974 0.0724 -vn 0.0010 -0.9956 0.0936 -vn 0.0003 -0.9954 0.0960 -vn 0.0000 -0.9926 0.1211 -vn 0.0000 -0.9926 0.1218 -vn 0.0000 -0.9886 0.1509 -vn -0.0003 -0.9887 0.1500 -vn -0.0009 -0.9890 0.1478 -vn -0.0012 -0.9892 0.1468 -vn 0.0015 -0.9804 0.1970 -vn -0.0028 -0.9776 0.2104 -vn 0.0000 -0.9704 0.2416 -vn 0.0000 -0.9684 0.2496 -vn 0.0000 -0.9668 0.2557 -vn -0.0014 -0.9577 0.2878 -vn -0.0011 -0.9572 0.2893 -vn -0.0001 -0.9561 0.2931 -vn 0.0003 -0.9556 0.2947 -vn -0.0003 -0.9347 0.3556 -vn -0.0002 -0.9345 0.3560 -vn -0.0001 -0.9340 0.3571 -vn -0.0000 -0.9338 0.3577 -vn -0.0000 -0.9154 0.4026 -vn -0.0004 -0.9137 0.4064 -vn 0.0008 -0.8813 0.4726 -vn -0.0016 -0.8766 0.4812 -vn 0.0005 -0.8427 0.5384 -vn 0.0045 -0.2637 0.9646 -vn 0.0003 -0.3029 0.9530 -vn -0.0009 -0.4121 0.9112 -vn -0.0006 -0.4110 0.9117 -vn -0.0002 -0.4090 0.9125 -vn 0.0000 -0.4079 0.9130 -vn 0.0000 -0.4910 0.8711 -vn 0.0000 -0.4910 0.8712 -vn 0.0000 -0.4907 0.8713 -vn 0.0000 -0.5487 0.8360 -vn -0.0002 -0.5494 0.8355 -vn -0.0005 -0.5513 0.8343 -vn -0.0007 -0.5520 0.8338 -vn 0.0003 -0.6134 0.7897 -vn 0.0002 -0.6143 0.7891 -vn 0.0000 -0.6165 0.7873 -vn -0.0001 -0.6174 0.7867 -vn 0.0001 -0.6644 0.7474 -vn 0.0001 -0.6647 0.7471 -vn 0.0000 -0.6652 0.7467 -vn 0.0000 -0.6656 0.7463 -vn 0.0000 -0.7086 0.7056 -vn -0.0002 -0.7102 0.7040 -vn -0.0006 -0.7129 0.7012 -vn -0.0008 -0.7145 0.6996 -vn 0.0012 -0.7629 0.6465 -vn -0.0026 -0.7761 0.6306 -vn 0.0011 -0.8120 0.5837 -vn 0.0008 -0.8141 0.5808 -vn 0.0003 -0.8177 0.5756 -vn 0.0000 -0.8199 0.5725 -vn 0.0000 -0.8381 0.5455 -vn -0.0008 -0.3088 0.9511 -vn 0.0000 -0.2633 0.9647 -vn 0.0000 -0.1947 0.9809 -vn -0.0118 -0.2595 0.9657 -vn 0.0199 -0.0715 0.9972 -vn -0.0191 -0.1745 0.9845 -vn 0.0001 -0.0597 0.9982 -vn -0.9968 0.0000 -0.0805 -vn -0.9709 0.0000 -0.2393 -vn -0.9200 0.0000 -0.3920 -vn -0.8452 0.0000 -0.5345 -vn -0.7485 0.0000 -0.6631 -vn -0.6324 0.0000 -0.7746 -vn -0.5000 0.0000 -0.8660 -vn -0.3546 0.0000 -0.9350 -vn -0.2000 0.0000 -0.9798 -vn -0.0403 0.0000 -0.9992 -vn 0.1205 0.0000 -0.9927 -vn 0.2782 0.0000 -0.9605 -vn 0.4287 0.0000 -0.9035 -vn 0.5681 0.0000 -0.8230 -vn 0.6927 0.0000 -0.7212 -vn 0.7994 0.0000 -0.6008 -vn 0.8855 0.0000 -0.4647 -vn 0.9485 0.0000 -0.3167 -vn 0.9871 0.0000 -0.1604 -vn 0.9871 0.0000 0.1604 -vn 0.9485 -0.0000 0.3167 -vn 0.8855 0.0000 0.4647 -vn 0.7994 0.0000 0.6008 -vn 0.6927 0.0000 0.7212 -vn 0.5680 0.0000 0.8230 -vn 0.5681 0.0000 0.8230 -vn 0.4287 0.0000 0.9034 -vn 0.2782 0.0000 0.9605 -vn 0.1205 0.0000 0.9927 -vn -0.0403 0.0000 0.9992 -vn -0.2000 0.0000 0.9798 -vn -0.3546 0.0000 0.9350 -vn -0.5000 0.0000 0.8660 -vn -0.6324 0.0000 0.7746 -vn -0.7485 0.0000 0.6631 -vn -0.8452 0.0000 0.5345 -vn -0.9200 0.0000 0.3920 -vn -0.9709 0.0000 0.2393 -vn -0.9968 0.0000 0.0805 -vn 0.0000 -1.0000 -0.0002 -vn 0.9989 0.0000 -0.0464 -vn 0.9978 -0.0097 -0.0651 -vn 0.9956 -0.0008 -0.0934 -vn 0.9928 0.0000 -0.1196 -vn 0.9445 0.0000 -0.3284 -vn 0.9571 0.0000 -0.2896 -vn 0.9776 -0.0060 -0.2105 -vn 0.9693 -0.0371 -0.2430 -vn 0.9868 0.0000 -0.1622 -vn 0.9176 -0.0307 -0.3963 -vn 0.9287 -0.0045 -0.3707 -vn 0.9004 0.0000 -0.4351 -vn 0.9002 -0.0000 -0.4356 -vn 0.8983 0.0000 -0.4394 -vn 0.8657 -0.0177 -0.5003 -vn 0.8772 -0.0035 -0.4800 -vn 0.8962 0.0000 -0.4437 -vn 0.7485 0.0000 -0.6631 -vn 0.7870 -0.0194 -0.6167 -vn 0.7776 -0.0068 -0.6287 -vn 0.8173 0.0000 -0.5762 -vn 0.8421 0.0000 -0.5393 -vn 0.7210 0.0000 -0.6930 -vn 0.7200 -0.0004 -0.6940 -vn 0.7179 -0.0012 -0.6961 -vn 0.7170 -0.0015 -0.6971 -vn 0.6802 0.0025 -0.7331 -vn 0.6186 -0.0329 -0.7850 -vn 0.6403 -0.0068 -0.7681 -vn 0.5800 0.0000 -0.8146 -vn 0.5135 -0.0013 -0.8581 -vn 0.4875 -0.0297 -0.8726 -vn 0.5476 0.0000 -0.8367 -vn 0.3300 0.0000 -0.9440 -vn 0.3883 -0.0160 -0.9214 -vn 0.3889 -0.0166 -0.9211 -vn 0.3870 -0.0151 -0.9220 -vn 0.3850 -0.0134 -0.9228 -vn 0.4376 0.0000 -0.8992 -vn 0.4564 0.0000 -0.8898 -vn 0.2883 0.0000 -0.9575 -vn 0.2294 -0.0132 -0.9732 -vn 0.2296 -0.0127 -0.9732 -vn 0.2324 -0.0150 -0.9725 -vn 0.2331 -0.0155 -0.9723 -vn 0.0337 0.0000 -0.9994 -vn 0.0906 -0.0269 -0.9955 -vn 0.0724 -0.0122 -0.9973 -vn 0.1412 0.0000 -0.9900 -vn 0.1794 0.0000 -0.9838 -vn 0.8474 -0.2586 -0.4637 -vn 0.8474 -0.2587 -0.4636 -vn 0.4834 -0.8751 -0.0223 -vn 0.9984 -0.0323 -0.0465 -vn 0.9319 -0.3616 -0.0291 -vn 0.6393 -0.7681 0.0366 -vn 0.7584 -0.6516 -0.0142 -vn 0.8253 -0.5633 -0.0383 -vn 0.8933 -0.4475 -0.0415 -vn 0.0230 -0.9997 -0.0011 -vn 0.3496 -0.9368 -0.0106 -vn 0.1319 -0.9913 -0.0004 -vn 0.2610 -0.9650 0.0278 -vn 0.2579 -0.9660 -0.0191 -vn 0.2528 -0.9664 -0.0456 -vn 0.2580 -0.9658 -0.0242 -vn 0.2687 -0.9623 -0.0433 -vn 0.2924 -0.9545 -0.0588 -vn 0.2900 -0.9543 -0.0727 -vn 0.2950 -0.9523 -0.0775 -vn 0.2880 -0.9526 -0.0982 -vn 0.2833 -0.9545 -0.0929 -vn 0.2631 -0.9581 -0.1136 -vn 0.2518 -0.9632 -0.0937 -vn 0.2515 -0.9631 -0.0955 -vn 0.2512 -0.9630 -0.0970 -vn 0.2513 -0.9630 -0.0972 -vn 0.2322 -0.9657 -0.1161 -vn 0.2323 -0.9660 -0.1137 -vn 0.2318 -0.9661 -0.1135 -vn -0.0831 -0.9158 -0.3929 -vn -0.0333 -0.9667 -0.2537 -vn -0.0027 -0.9908 -0.1353 -vn 0.0009 -0.9996 -0.0280 -vn -0.0024 -0.7241 -0.6897 -vn 0.0163 -0.8287 -0.5594 -vn 0.0174 -0.8569 -0.5152 -vn -0.0004 -0.2997 -0.9540 -vn 0.0306 -0.4171 -0.9084 -vn 0.0285 -0.5359 -0.8438 -vn 0.0875 -0.2587 -0.9620 -vn 0.0874 -0.2586 -0.9620 -vn 0.0325 -0.2586 -0.9654 -vn -0.0581 -0.1343 -0.9892 -vn 0.1742 -0.2400 -0.9550 -vn 0.1364 -0.2589 -0.9562 -vn 0.0876 -0.2588 -0.9620 -vn 0.1592 -0.2586 -0.9528 -vn 0.2253 -0.2586 -0.9393 -vn 0.2253 -0.2587 -0.9393 -vn 0.2253 -0.2586 -0.9394 -vn 0.2252 -0.2585 -0.9394 -vn 0.2785 -0.2587 -0.9249 -vn 0.3209 -0.2332 -0.9180 -vn 0.3010 -0.2585 -0.9179 -vn 0.3757 -0.2586 -0.8899 -vn 0.3757 -0.2586 -0.8900 -vn 0.4711 -0.2587 -0.8433 -vn 0.4400 -0.2589 -0.8598 -vn 0.4240 -0.2579 -0.8682 -vn 0.4238 -0.2581 -0.8682 -vn 0.4230 -0.2586 -0.8684 -vn 0.4227 -0.2587 -0.8685 -vn 0.6570 -0.2587 -0.7081 -vn 0.5978 -0.2587 -0.7588 -vn 0.5978 -0.2588 -0.7587 -vn 0.5978 -0.2586 -0.7588 -vn 0.5978 -0.2585 -0.7589 -vn 0.5602 -0.2588 -0.7869 -vn 0.5357 -0.2507 -0.8063 -vn 0.5297 -0.2579 -0.8080 -vn 0.5355 -0.2513 -0.8063 -vn 0.5289 -0.2588 -0.8082 -vn 0.4711 -0.2588 -0.8433 -vn 0.7285 -0.2298 -0.6454 -vn 0.6964 -0.2588 -0.6694 -vn 0.7113 -0.2587 -0.6536 -vn 0.7604 -0.2587 -0.5957 -vn 0.7604 -0.2588 -0.5957 -vn 0.7604 -0.2587 -0.5958 -vn 0.7603 -0.2586 -0.5958 -vn 0.7895 -0.2589 -0.5565 -vn 0.0087 -0.9659 -0.2587 -vn 0.0235 -0.9659 -0.2577 -vn 0.0235 -0.9659 -0.2579 -vn 0.0235 -0.9660 -0.2576 -vn 0.0426 -0.9659 -0.2553 -vn 0.0426 -0.9659 -0.2552 -vn 0.0604 -0.9659 -0.2516 -vn 0.0806 -0.9659 -0.2460 -vn 0.0806 -0.9659 -0.2459 -vn 0.1006 -0.9659 -0.2385 -vn 0.1136 -0.9660 -0.2324 -vn 0.1135 -0.9660 -0.2323 -vn 0.1136 -0.9659 -0.2325 -vn 0.1262 -0.9659 -0.2259 -vn 0.1432 -0.9659 -0.2156 -vn 0.1602 -0.9659 -0.2033 -vn 0.1602 -0.9659 -0.2034 -vn 0.1760 -0.9659 -0.1897 -vn 0.1906 -0.9659 -0.1751 -vn 0.2037 -0.9659 -0.1596 -vn 0.2038 -0.9659 -0.1597 -vn 0.2167 -0.9659 -0.1416 -vn 0.2167 -0.9659 -0.1417 -vn 0.2270 -0.9659 -0.1243 -vn 0.2271 -0.9657 -0.1258 -vn 0.8163 -0.2461 -0.5227 -vn 0.8086 -0.2587 -0.5285 -vn 0.8657 -0.2587 -0.4286 -vn 0.8662 -0.2585 -0.4277 -vn 0.8668 -0.2566 -0.4275 -vn 0.8692 -0.2586 -0.4215 -vn 0.8697 -0.2589 -0.4202 -vn 0.8868 -0.2587 -0.3830 -vn 0.8868 -0.2587 -0.3831 -vn 0.9123 -0.2588 -0.3173 -vn 0.9158 -0.2522 -0.3127 -vn 0.9127 -0.2581 -0.3168 -vn 0.9160 -0.2518 -0.3123 -vn 0.9245 -0.2589 -0.2797 -vn 0.9370 -0.2587 -0.2348 -vn 0.5184 -0.8548 -0.0240 -vn 0.7072 -0.7066 -0.0224 -vn 0.7043 -0.7068 -0.0660 -vn 0.7042 -0.7069 -0.0661 -vn 0.7042 -0.7069 -0.0660 -vn 0.7042 -0.7069 -0.0662 -vn 0.6985 -0.7067 -0.1128 -vn 0.6985 -0.7066 -0.1128 -vn 0.6986 -0.7066 -0.1127 -vn 0.6864 -0.7066 -0.1720 -vn 0.6698 -0.7066 -0.2284 -vn 0.6697 -0.7066 -0.2284 -vn 0.6496 -0.7066 -0.2806 -vn 0.6496 -0.7067 -0.2805 -vn 0.6495 -0.7067 -0.2805 -vn 0.6352 -0.7069 -0.3111 -vn 0.6351 -0.7069 -0.3113 -vn 0.6352 -0.7069 -0.3112 -vn 0.6351 -0.7070 -0.3113 -vn 0.6206 -0.7068 -0.3396 -vn 0.6207 -0.7067 -0.3396 -vn 0.5922 -0.7067 -0.3872 -vn 0.5923 -0.7066 -0.3872 -vn 0.5923 -0.7066 -0.3871 -vn 0.5570 -0.7066 -0.4364 -vn 0.5570 -0.7066 -0.4365 -vn 0.5211 -0.7066 -0.4788 -vn 0.5211 -0.7066 -0.4787 -vn 0.4813 -0.7066 -0.5187 -vn 0.4813 -0.7066 -0.5186 -vn 0.4379 -0.7067 -0.5558 -vn 0.4378 -0.7067 -0.5558 -vn 0.4378 -0.7066 -0.5558 -vn 0.4378 -0.7066 -0.5559 -vn 0.3915 -0.7067 -0.5893 -vn 0.3915 -0.7067 -0.5894 -vn 0.3915 -0.7066 -0.5894 -vn 0.3916 -0.7066 -0.5894 -vn 0.3451 -0.7066 -0.6177 -vn 0.3451 -0.7067 -0.6177 -vn 0.3106 -0.7069 -0.6355 -vn 0.3104 -0.7069 -0.6355 -vn 0.3105 -0.7069 -0.6355 -vn 0.3103 -0.7070 -0.6355 -vn 0.2750 -0.7068 -0.6518 -vn 0.2751 -0.7067 -0.6518 -vn 0.2752 -0.7066 -0.6519 -vn 0.2205 -0.7066 -0.6724 -vn 0.1650 -0.7066 -0.6881 -vn 0.1650 -0.7067 -0.6880 -vn 0.1651 -0.7067 -0.6880 -vn 0.1166 -0.7067 -0.6979 -vn 0.1166 -0.7066 -0.6979 -vn 0.1166 -0.7065 -0.6980 -vn 0.0642 -0.7067 -0.7046 -vn 0.0641 -0.7068 -0.7045 -vn 0.0640 -0.7069 -0.7045 -vn -0.0148 -0.7059 -0.7082 -vn 0.0182 -0.5977 -0.8015 -vn 0.9532 -0.2587 -0.1567 -vn 0.9545 -0.2552 -0.1542 -vn 0.9533 -0.2583 -0.1564 -vn 0.9546 -0.2550 -0.1540 -vn 0.9590 -0.2587 -0.1158 -vn 0.9617 -0.2587 -0.0903 -vn 0.9617 -0.2586 -0.0903 -vn 0.9617 -0.2588 -0.0902 -vn 0.9660 -0.2583 -0.0052 -vn 0.9791 -0.2011 -0.0310 -vn 0.0000 -1.0000 0.0045 -vn 0.0000 -1.0000 0.0012 -vn 0.0000 -1.0000 0.0026 -vn -0.0000 -1.0000 -0.0007 -vn 0.0335 -0.4175 -0.9081 -vn 0.0628 -0.2978 -0.9526 -vn 0.0191 -0.8558 -0.5170 -vn 0.0621 -0.7226 -0.6884 -vn 0.0373 -0.5999 -0.7992 -vn 0.0312 -0.5339 -0.8449 -vn 0.0009 -0.9997 -0.0244 -vn 0.0117 -0.9908 -0.1349 -vn 0.0493 -0.9661 -0.2535 -vn 0.2531 -0.9633 -0.0891 -vn 0.2529 -0.9634 -0.0890 -vn 0.2534 -0.9632 -0.0893 -vn 0.1330 -0.9910 -0.0172 -vn 0.0258 -0.9997 -0.0010 -vn 0.5599 -0.8282 -0.0232 -vn 0.5155 -0.8567 -0.0172 -vn 0.3944 -0.9188 -0.0132 -vn 0.8002 -0.5983 -0.0415 -vn 0.9505 -0.2988 -0.0856 -vn 0.9082 -0.4174 -0.0302 -vn 0.8445 -0.5348 -0.0281 -vn 0.9903 -0.1347 -0.0331 -vn 0.2546 -0.9628 -0.0901 -vn 0.2582 -0.9659 -0.0167 -vn 0.2583 -0.9659 -0.0168 -vn 0.2566 -0.9660 -0.0328 -vn 0.2566 -0.9660 -0.0329 -vn 0.2542 -0.9659 -0.0487 -vn 0.2498 -0.9659 -0.0677 -vn 0.2498 -0.9659 -0.0676 -vn 0.2442 -0.9659 -0.0858 -vn 0.2441 -0.9659 -0.0858 -vn 0.2371 -0.9659 -0.1037 -vn 0.2372 -0.9659 -0.1037 -vn 0.2313 -0.9660 -0.1158 -vn 0.2251 -0.9659 -0.1277 -vn 0.2251 -0.9659 -0.1276 -vn 0.2153 -0.9659 -0.1435 -vn 0.2154 -0.9659 -0.1435 -vn 0.2039 -0.9659 -0.1594 -vn 0.2039 -0.9659 -0.1595 -vn 0.1902 -0.9659 -0.1755 -vn 0.1902 -0.9659 -0.1756 -vn 0.1762 -0.9659 -0.1895 -vn 0.1762 -0.9660 -0.1895 -vn 0.1762 -0.9659 -0.1896 -vn 0.1629 -0.9659 -0.2011 -vn 0.1629 -0.9659 -0.2010 -vn 0.1474 -0.9659 -0.2128 -vn 0.1474 -0.9659 -0.2127 -vn 0.1349 -0.9660 -0.2207 -vn 0.1349 -0.9660 -0.2206 -vn 0.1238 -0.9659 -0.2274 -vn 0.1237 -0.9659 -0.2273 -vn 0.1076 -0.9659 -0.2354 -vn 0.1076 -0.9659 -0.2355 -vn 0.0889 -0.9659 -0.2431 -vn 0.0693 -0.9659 -0.2494 -vn 0.0565 -0.9660 -0.2524 -vn 0.0565 -0.9660 -0.2523 -vn 0.0446 -0.9659 -0.2549 -vn 0.0446 -0.9659 -0.2550 -vn 0.0239 -0.9659 -0.2578 -vn 0.0239 -0.9659 -0.2577 -vn 0.0502 -0.9653 -0.2561 -vn 0.0146 -0.9189 -0.3943 -vn 0.0228 -0.8286 -0.5594 -vn 0.0517 -0.7066 -0.7057 -vn 0.0514 -0.7069 -0.7055 -vn 0.0663 -0.7066 -0.7045 -vn 0.0654 -0.7067 -0.7045 -vn 0.1218 -0.7067 -0.6970 -vn 0.1548 -0.7070 -0.6901 -vn 0.1547 -0.7070 -0.6901 -vn 0.1546 -0.7070 -0.6902 -vn 0.1893 -0.7067 -0.6817 -vn 0.1894 -0.7066 -0.6818 -vn 0.2430 -0.7067 -0.6645 -vn 0.2429 -0.7066 -0.6645 -vn 0.2429 -0.7066 -0.6646 -vn 0.2940 -0.7067 -0.6435 -vn 0.2940 -0.7068 -0.6435 -vn 0.3383 -0.7067 -0.6214 -vn 0.3383 -0.7068 -0.6214 -vn 0.3382 -0.7068 -0.6213 -vn 0.3687 -0.7069 -0.6036 -vn 0.3688 -0.7069 -0.6035 -vn 0.3689 -0.7069 -0.6035 -vn 0.4031 -0.7066 -0.5815 -vn 0.4031 -0.7067 -0.5815 -vn 0.4030 -0.7067 -0.5815 -vn 0.4454 -0.7068 -0.5496 -vn 0.4454 -0.7068 -0.5497 -vn 0.4454 -0.7067 -0.5497 -vn 0.4817 -0.7067 -0.5182 -vn 0.5200 -0.7066 -0.4798 -vn 0.5573 -0.7067 -0.4359 -vn 0.5887 -0.7067 -0.3924 -vn 0.5888 -0.7067 -0.3924 -vn 0.5888 -0.7067 -0.3923 -vn 0.6155 -0.7066 -0.3489 -vn 0.6155 -0.7067 -0.3489 -vn 0.6324 -0.7069 -0.3169 -vn 0.6323 -0.7069 -0.3169 -vn 0.6483 -0.7067 -0.2834 -vn 0.6483 -0.7067 -0.2833 -vn 0.6676 -0.7067 -0.2345 -vn 0.6675 -0.7067 -0.2345 -vn 0.6675 -0.7067 -0.2344 -vn 0.6829 -0.7067 -0.1850 -vn 0.6828 -0.7068 -0.1850 -vn 0.6949 -0.7067 -0.1331 -vn 0.6949 -0.7066 -0.1331 -vn 0.7017 -0.7068 -0.0899 -vn 0.7017 -0.7068 -0.0898 -vn 0.7061 -0.7066 -0.0457 -vn 0.7061 -0.7067 -0.0458 -vn 0.7060 -0.7067 -0.0459 -vn 0.7059 -0.7068 -0.0459 -vn 0.7042 -0.7062 -0.0741 -vn 0.6865 -0.7208 -0.0958 -vn 0.9598 -0.2581 -0.1101 -vn 0.9639 -0.2588 -0.0627 -vn 0.9581 -0.2589 -0.1226 -vn 0.9581 -0.2587 -0.1228 -vn 0.9487 -0.2587 -0.1817 -vn 0.9324 -0.2586 -0.2526 -vn 0.9323 -0.2587 -0.2526 -vn 0.9114 -0.2586 -0.3201 -vn 0.9114 -0.2587 -0.3201 -vn 0.8851 -0.2586 -0.3869 -vn 0.8851 -0.2587 -0.3868 -vn 0.8635 -0.2588 -0.4328 -vn 0.8636 -0.2589 -0.4326 -vn 0.8403 -0.2589 -0.4763 -vn 0.8403 -0.2586 -0.4764 -vn 0.8038 -0.2586 -0.5357 -vn 0.8038 -0.2587 -0.5356 -vn 0.7609 -0.2587 -0.5951 -vn 0.7608 -0.2588 -0.5951 -vn 0.7099 -0.2587 -0.6551 -vn 0.7099 -0.2588 -0.6550 -vn 0.6577 -0.2589 -0.7074 -vn 0.6576 -0.2587 -0.7076 -vn 0.6081 -0.2587 -0.7505 -vn 0.6082 -0.2587 -0.7505 -vn 0.5502 -0.2587 -0.7940 -vn 0.5502 -0.2586 -0.7940 -vn 0.5037 -0.2588 -0.8242 -vn 0.5039 -0.2589 -0.8241 -vn 0.4618 -0.2588 -0.8484 -vn 0.4618 -0.2589 -0.8484 -vn 0.4014 -0.2588 -0.8786 -vn 0.4013 -0.2587 -0.8787 -vn 0.3317 -0.2587 -0.9072 -vn 0.2585 -0.2587 -0.9307 -vn 0.2585 -0.2586 -0.9308 -vn 0.2111 -0.2588 -0.9426 -vn 0.2112 -0.2588 -0.9426 -vn 0.1663 -0.2586 -0.9515 -vn 0.1663 -0.2585 -0.9516 -vn 0.0892 -0.2585 -0.9619 -vn 0.0894 -0.2587 -0.9618 -vn 0.0751 -0.2588 -0.9630 -vn 0.0366 -0.1348 -0.9902 -vn 0.0000 -1.0000 0.0004 -vn -0.4461 -0.8824 0.1492 -vn -0.4572 -0.8769 0.1485 -vn -0.4496 -0.8807 0.1489 -vn 0.1467 0.9746 -0.1692 -vn 0.1671 0.9715 -0.1683 -vn 0.1671 0.9714 -0.1685 -vn 0.1744 0.9702 -0.1684 -vn 0.0007 0.9850 -0.1728 -vn 0.0014 0.9849 -0.1729 -vn 0.0011 0.9850 -0.1727 -vn -0.1276 0.9768 -0.1721 -vn -0.1274 0.9767 -0.1729 -vn -0.1276 0.9780 -0.1652 -vn -0.2806 0.9447 -0.1697 -vn -0.2806 0.9447 -0.1696 -vn -0.6337 0.7606 -0.1414 -vn -0.6338 0.7604 -0.1420 -vn -0.6338 0.7604 -0.1416 -vn -0.5038 0.8497 -0.1554 -vn -0.3161 0.9338 -0.1678 -vn -0.9536 -0.2982 0.0408 -vn -0.9535 -0.2988 0.0396 -vn -0.9535 -0.2986 0.0403 -vn -0.9840 -0.1771 0.0186 -vn -0.9969 0.0740 -0.0253 -vn -0.9969 0.0740 -0.0256 -vn -0.9970 0.0737 -0.0255 -vn -0.9970 0.0735 -0.0256 -vn -0.8913 0.4446 -0.0891 -vn -0.8914 0.4443 -0.0892 -vn -0.6714 0.7284 -0.1363 -vn -0.4411 -0.8849 0.1496 -vn -0.7024 -0.7026 0.1143 -vn -0.7588 -0.6430 0.1037 -vn -0.7588 -0.6432 0.1024 -vn -0.7588 -0.6431 0.1032 -vn -0.8344 -0.5446 0.0849 -vn -0.9310 -0.3614 0.0516 -vn -0.4604 -0.8752 0.1489 -vn -0.4561 -0.8773 0.1491 -vn -0.7589 -0.6429 0.1039 -vn -0.9537 -0.2980 0.0409 -vn -0.9535 -0.2985 0.0410 -vn -0.9969 0.0743 -0.0251 -vn -0.8910 0.4452 -0.0889 -vn -0.6336 0.7606 -0.1413 -vn -0.2803 0.9448 -0.1694 -vn -0.2806 0.9448 -0.1694 -vn 0.0016 0.9849 -0.1731 -vn 0.1797 0.9692 -0.1682 -vn 0.1708 0.9708 -0.1686 -vn -0.4903 -0.8715 -0.0108 -vn -0.8276 -0.5104 0.2336 -vn -0.9434 0.2939 -0.1537 -vn -0.9428 0.2953 -0.1544 -vn -0.9430 0.2950 -0.1542 -vn -0.9663 0.1139 0.2307 -vn 0.8379 -0.3837 -0.3881 -vn -0.1122 -0.0521 -0.9923 -vn -0.1051 -0.0473 -0.9933 -vn -0.1046 -0.0520 -0.9932 -vn 0.1470 0.9442 -0.2947 -vn 0.0126 0.9245 -0.3810 -vn 0.2170 0.8626 -0.4570 -vn -0.1275 0.9782 -0.1639 -vn 0.0015 0.9660 -0.2585 -vn 0.1045 0.7213 -0.6847 -vn 0.1677 0.6914 -0.7027 -vn -0.0046 0.7943 -0.6076 -vn 0.1461 0.3902 -0.9091 -vn -0.0520 0.5650 -0.8234 -vn -0.0427 0.6424 -0.7652 -vn -0.1222 -0.0031 -0.9925 -vn 0.1505 0.1593 -0.9757 -vn -0.0749 0.1199 -0.9900 -vn -0.1179 0.4558 -0.8822 -vn -0.1022 -0.0106 -0.9947 -vn -0.1020 -0.0106 -0.9947 -vn -0.1019 -0.0106 -0.9947 -vn -0.1178 -0.0185 -0.9929 -vn -0.1101 -0.0228 -0.9937 -vn -0.1157 -0.0219 -0.9930 -vn -0.1061 -0.0269 -0.9940 -vn -0.1145 -0.0309 -0.9929 -vn -0.1227 -0.0406 -0.9916 -vn -0.1041 -0.0368 -0.9939 -vn -0.1130 -0.0333 -0.9930 -vn -0.0875 -0.0542 -0.9947 -vn -0.1037 -0.0573 -0.9930 -vn -0.1126 -0.0546 -0.9921 -vn -0.0928 -0.0751 -0.9928 -vn -0.0933 -0.0723 -0.9930 -vn -0.0881 -0.0680 -0.9938 -vn -0.0913 -0.0655 -0.9937 -vn -0.0942 -0.0685 -0.9932 -vn -0.1095 -0.0635 -0.9920 -vn -0.0862 -0.0783 -0.9932 -vn -0.0779 -0.0845 -0.9934 -vn -0.0764 -0.0851 -0.9934 -vn -0.0645 -0.0808 -0.9946 -vn -0.0614 -0.0723 -0.9955 -vn -0.0632 -0.0768 -0.9950 -vn -0.0659 -0.0870 -0.9940 -vn 0.1870 0.0081 -0.9823 -vn 0.0035 -0.1375 -0.9905 -vn -0.0661 -0.0881 -0.9939 -vn 0.5499 -0.0900 -0.8304 -vn 0.2592 -0.2808 -0.9241 -vn 0.1529 -0.2186 -0.9638 -vn 0.6993 -0.6151 -0.3641 -vn -0.9221 -0.1224 0.3670 -vn -0.1941 -0.1558 0.9685 -vn -0.2792 -0.0222 0.9600 -vn -0.3065 -0.0492 0.9506 -vn -0.4579 0.0090 0.8890 -vn -0.4223 0.0569 0.9047 -vn -0.6326 0.0192 0.7743 -vn -0.5140 0.2253 0.8277 -vn -0.8040 -0.0439 0.5930 -vn -0.7837 0.0288 0.6205 -vn -0.8855 0.3388 0.3180 -vn -0.1102 -0.1236 0.9862 -vn -0.1212 -0.1555 0.9804 -vn -0.1246 -0.1090 0.9862 -vn -0.1257 -0.1487 0.9809 -vn -0.1543 -0.1379 0.9784 -vn -0.1517 -0.1364 0.9790 -vn -0.1525 -0.1369 0.9788 -vn -0.1550 -0.1383 0.9782 -vn -0.1532 -0.1115 0.9819 -vn -0.1773 -0.1197 0.9769 -vn -0.1598 -0.0928 0.9828 -vn -0.2144 -0.0964 0.9720 -vn -0.1821 -0.0582 0.9816 -vn -0.1798 -0.0567 0.9821 -vn -0.1880 -0.0616 0.9802 -vn -0.1837 -0.0718 0.9804 -vn -0.1631 -0.0808 0.9833 -vn -0.1901 -0.0629 0.9797 -vn -0.1911 -0.0419 0.9807 -vn -0.2058 -0.0415 0.9777 -vn -0.1916 -0.0200 0.9813 -vn -0.2124 -0.0171 0.9770 -vn -0.2475 -0.0482 0.9677 -vn 0.0143 -0.2100 0.9776 -vn -0.3440 -0.1145 0.9320 -vn -0.0851 -0.3670 0.9263 -vn -0.3167 -0.2836 0.9052 -vn -0.1688 -0.5118 0.8424 -vn -0.2695 -0.4703 0.8404 -vn -0.2869 -0.6249 0.7261 -vn -0.2291 -0.6537 0.7212 -vn -0.3802 -0.7166 0.5848 -vn -0.1982 -0.8105 0.5512 -vn -0.5499 -0.7676 0.3293 -vn -0.4381 -0.8459 0.3043 -vn 0.2129 -0.9433 -0.2545 -vn 0.3991 -0.8649 -0.3045 -vn 0.3886 -0.7122 -0.5846 -vn 0.3871 -0.7145 -0.5828 -vn 0.3891 -0.7114 -0.5852 -vn 0.5313 -0.7856 -0.3171 -vn 0.5650 -0.7505 -0.3429 -vn -0.3811 -0.8959 -0.2283 -vn -0.3811 -0.8960 -0.2280 -vn -0.3811 -0.8958 -0.2288 -vn -0.3253 -0.9254 -0.1946 -vn -0.3256 -0.9255 -0.1934 -vn -0.3255 -0.9255 -0.1937 -vn -0.3253 -0.9254 -0.1947 -vn -0.2749 -0.9499 -0.1487 -vn -0.2755 -0.9499 -0.1477 -vn -0.2753 -0.9499 -0.1480 -vn -0.2746 -0.9499 -0.1489 -vn -0.2403 -0.9672 -0.0825 -vn -0.1359 -0.9782 -0.1568 -vn -0.0720 -0.7353 -0.6739 -vn 0.2276 -0.6380 -0.7356 -vn 0.3866 -0.7153 -0.5822 -vn -0.5450 -0.8266 -0.1405 -vn -0.4477 -0.8572 -0.2546 -vn -0.3812 -0.8960 -0.2276 -vn -0.4846 -0.8333 -0.2661 -vn -0.6229 -0.7352 -0.2672 -vn -0.6229 -0.7349 -0.2681 -vn -0.6229 -0.7350 -0.2678 -vn -0.6230 -0.7354 -0.2667 -vn -0.7166 -0.6439 -0.2680 -vn -0.7166 -0.6439 -0.2681 -vn -0.7166 -0.6440 -0.2678 -vn -0.7166 -0.6441 -0.2677 -vn -0.7791 -0.5667 -0.2681 -vn -0.7791 -0.5666 -0.2681 -vn -0.7791 -0.5668 -0.2678 -vn -0.8333 -0.4835 -0.2680 -vn -0.8333 -0.4835 -0.2679 -vn -0.8787 -0.3951 -0.2679 -vn -0.8787 -0.3951 -0.2680 -vn -0.9146 -0.3026 -0.2682 -vn -0.9147 -0.3027 -0.2678 -vn -0.9147 -0.3027 -0.2677 -vn -0.9146 -0.3025 -0.2682 -vn -0.9409 -0.2068 -0.2681 -vn -0.9410 -0.2069 -0.2677 -vn -0.9410 -0.2068 -0.2680 -vn -0.9409 -0.2067 -0.2684 -vn -0.9581 -0.1001 -0.2683 -vn -0.9583 -0.1003 -0.2675 -vn -0.9583 -0.1002 -0.2677 -vn -0.9579 0.1673 -0.2335 -vn -0.9620 0.0868 -0.2589 -vn -0.9816 0.0306 -0.1883 -vn -0.9635 -0.0043 -0.2678 -vn -0.9581 -0.1000 -0.2685 -vn -0.9778 0.1784 -0.1101 -vn -0.9532 0.2030 -0.2243 -vn -0.9435 0.2936 -0.1535 -vn 0.1639 -0.9618 -0.2193 -vn 0.0648 -0.9132 -0.4023 -vn 0.0671 -0.9117 -0.4054 -vn 0.0664 -0.9121 -0.4045 -vn 0.0642 -0.9136 -0.4015 -vn -0.0526 -0.8580 -0.5110 -vn -0.0522 -0.8572 -0.5123 -vn -0.0523 -0.8574 -0.5120 -vn -0.0527 -0.8582 -0.5106 -vn -0.1573 -0.8026 -0.5753 -vn -0.1571 -0.8018 -0.5766 -vn -0.1572 -0.8020 -0.5763 -vn -0.1574 -0.8029 -0.5750 -vn -0.3285 -0.6980 -0.6364 -vn -0.3277 -0.6956 -0.6393 -vn -0.3279 -0.6964 -0.6384 -vn -0.3287 -0.6986 -0.6355 -vn -0.4962 -0.5853 -0.6413 -vn -0.4960 -0.5848 -0.6419 -vn -0.4960 -0.5849 -0.6417 -vn -0.4962 -0.5854 -0.6411 -vn -0.5701 -0.5122 -0.6424 -vn -0.5701 -0.5121 -0.6424 -vn -0.5702 -0.5123 -0.6422 -vn -0.5702 -0.5124 -0.6422 -vn -0.6198 -0.4508 -0.6424 -vn -0.6198 -0.4507 -0.6424 -vn -0.6199 -0.4508 -0.6423 -vn -0.6629 -0.3846 -0.6424 -vn -0.6629 -0.3846 -0.6423 -vn -0.6990 -0.3143 -0.6423 -vn -0.6990 -0.3144 -0.6423 -vn -0.6990 -0.3143 -0.6424 -vn -0.6989 -0.3143 -0.6424 -vn -0.7276 -0.2408 -0.6423 -vn -0.7277 -0.2408 -0.6423 -vn -0.7276 -0.2407 -0.6424 -vn -0.7275 -0.2407 -0.6425 -vn -0.7486 -0.1647 -0.6423 -vn -0.7486 -0.1648 -0.6422 -vn -0.7485 -0.1648 -0.6423 -vn -0.7483 -0.1646 -0.6426 -vn -0.7625 -0.0799 -0.6421 -vn -0.7625 -0.0799 -0.6420 -vn -0.7624 -0.0799 -0.6421 -vn -0.7621 -0.0797 -0.6425 -vn -0.7618 0.0851 -0.6422 -vn -0.7657 0.0829 -0.6378 -vn -0.7645 0.0836 -0.6392 -vn -0.7606 0.0857 -0.6435 -vn -0.7462 0.3554 -0.5630 -vn -0.7487 0.3535 -0.5609 -vn -0.7479 0.3541 -0.5615 -vn -0.7454 0.3560 -0.5636 -vn -0.7225 0.5505 -0.4182 -vn -0.7255 0.5475 -0.4170 -vn -0.7247 0.5484 -0.4174 -vn -0.7217 0.5513 -0.4185 -vn -0.3597 0.8677 -0.3431 -vn -0.3813 0.7002 -0.6036 -vn -0.3770 0.7022 -0.6039 -vn -0.3782 0.7017 -0.6038 -vn -0.3825 0.6996 -0.6035 -vn -0.4142 0.4405 -0.7965 -vn -0.4108 0.4418 -0.7976 -vn -0.4118 0.4414 -0.7972 -vn -0.4154 0.4400 -0.7962 -vn -0.4350 0.1108 -0.8936 -vn -0.4309 0.1122 -0.8954 -vn -0.4322 0.1118 -0.8948 -vn -0.4362 0.1104 -0.8931 -vn -0.4321 -0.0453 -0.9007 -vn -0.4323 -0.0453 -0.9006 -vn -0.4324 -0.0453 -0.9006 -vn -0.4243 -0.0934 -0.9007 -vn -0.4242 -0.0934 -0.9007 -vn -0.4124 -0.1365 -0.9007 -vn -0.4125 -0.1365 -0.9007 -vn -0.4125 -0.1366 -0.9007 -vn -0.3963 -0.1782 -0.9007 -vn -0.3759 -0.2180 -0.9007 -vn -0.3759 -0.2181 -0.9006 -vn -0.3515 -0.2556 -0.9006 -vn -0.3234 -0.2905 -0.9006 -vn -0.3233 -0.2904 -0.9006 -vn -0.2817 -0.3322 -0.9002 -vn -0.2817 -0.3320 -0.9002 -vn -0.2816 -0.3320 -0.9003 -vn -0.1180 -0.4402 -0.8901 -vn -0.1189 -0.4428 -0.8887 -vn -0.1187 -0.4420 -0.8891 -vn -0.1177 -0.4394 -0.8905 -vn 0.1606 -0.6031 -0.7813 -vn 0.3529 -0.3446 -0.8699 -vn 0.6270 -0.4151 -0.6592 -vn 0.6354 -0.3880 -0.6676 -vn 0.7593 -0.5410 -0.3616 -vn 0.7729 -0.5141 -0.3719 -vn -0.7418 -0.5638 0.3632 -vn -0.7421 -0.5625 0.3645 -vn -0.7420 -0.5629 0.3641 -vn -0.7417 -0.5642 0.3628 -vn -0.6521 -0.6109 0.4491 -vn -0.6520 -0.6106 0.4495 -vn -0.6521 -0.6108 0.4490 -vn -0.6521 -0.6109 0.4489 -vn -0.5960 -0.6405 0.4843 -vn -0.5960 -0.6404 0.4844 -vn -0.5962 -0.6407 0.4838 -vn -0.5509 -0.6668 0.5019 -vn -0.5509 -0.6667 0.5020 -vn -0.5510 -0.6668 0.5017 -vn -0.5510 -0.6669 0.5017 -vn -0.5122 -0.6916 0.5093 -vn -0.5121 -0.6915 0.5094 -vn -0.5124 -0.6916 0.5091 -vn -0.5124 -0.6916 0.5090 -vn -0.5566 -0.6576 0.5077 -vn -0.5569 -0.6577 0.5072 -vn -0.5567 -0.6576 0.5075 -vn -0.5565 -0.6574 0.5080 -vn -0.6403 -0.5757 0.5084 -vn -0.6404 -0.5757 0.5084 -vn -0.6402 -0.5757 0.5087 -vn -0.6401 -0.5756 0.5088 -vn -0.6963 -0.5066 0.5086 -vn -0.6962 -0.5066 0.5086 -vn -0.7448 -0.4321 0.5085 -vn -0.7447 -0.4321 0.5086 -vn -0.7853 -0.3531 0.5086 -vn -0.7854 -0.3531 0.5085 -vn -0.7854 -0.3531 0.5084 -vn -0.8175 -0.2703 0.5085 -vn -0.8175 -0.2703 0.5086 -vn -0.8176 -0.2703 0.5084 -vn -0.8177 -0.2702 0.5083 -vn -0.8410 -0.1847 0.5086 -vn -0.8409 -0.1847 0.5087 -vn -0.8412 -0.1846 0.5083 -vn -0.8412 -0.1846 0.5082 -vn -0.8565 -0.0892 0.5084 -vn -0.8564 -0.0893 0.5085 -vn -0.8566 -0.0893 0.5083 -vn -0.8568 -0.0892 0.5079 -vn -0.8600 -0.0361 0.5090 -vn -0.8600 -0.0361 0.5089 -vn -0.8599 -0.0362 0.5091 -vn -0.8599 -0.0362 0.5092 -vn -0.8603 -0.0790 0.5036 -vn -0.8604 -0.0790 0.5035 -vn -0.8603 -0.0792 0.5037 -vn -0.8602 -0.0792 0.5037 -vn -0.8632 -0.1299 0.4879 -vn -0.8632 -0.1298 0.4878 -vn -0.8632 -0.1298 0.4880 -vn -0.8630 -0.1302 0.4882 -vn -0.8686 -0.1906 0.4574 -vn -0.8689 -0.1900 0.4571 -vn -0.8688 -0.1901 0.4571 -vn -0.9263 -0.3368 0.1686 -vn -0.8937 -0.3980 0.2070 -vn -0.8782 -0.2942 0.3771 -vn -0.9424 -0.2115 0.2591 -vn -0.8771 -0.2547 0.4073 -vn -0.9412 -0.1280 0.3126 -vn -0.8087 -0.1920 0.5561 -vn -0.8085 -0.1912 0.5566 -vn -0.8085 -0.1915 0.5564 -vn -0.8087 -0.1924 0.5558 -vn -0.6653 -0.2665 0.6974 -vn -0.6653 -0.2664 0.6974 -vn -0.6654 -0.2667 0.6972 -vn -0.6655 -0.2668 0.6971 -vn -0.5604 -0.3222 0.7630 -vn -0.5603 -0.3221 0.7631 -vn -0.5605 -0.3223 0.7629 -vn -0.5605 -0.3224 0.7628 -vn -0.4630 -0.3785 0.8015 -vn -0.4629 -0.3785 0.8015 -vn -0.4632 -0.3786 0.8013 -vn -0.4632 -0.3787 0.8013 -vn -0.3701 -0.4380 0.8193 -vn -0.3699 -0.4379 0.8194 -vn -0.3705 -0.4381 0.8190 -vn -0.3706 -0.4381 0.8190 -vn -0.3705 -0.4379 0.8191 -vn -0.4260 -0.3831 0.8196 -vn -0.4259 -0.3831 0.8197 -vn -0.4633 -0.3371 0.8196 -vn -0.4956 -0.2876 0.8196 -vn -0.5226 -0.2349 0.8196 -vn -0.5226 -0.2349 0.8195 -vn -0.5440 -0.1798 0.8196 -vn -0.5441 -0.1798 0.8195 -vn -0.5597 -0.1228 0.8195 -vn -0.5597 -0.1228 0.8196 -vn -0.5598 -0.1228 0.8195 -vn -0.5701 -0.0593 0.8194 -vn -0.5701 -0.0593 0.8195 -vn -0.5705 -0.0461 0.8200 -vn -0.5710 -0.0459 0.8196 -vn -0.5704 -0.0463 0.8201 -vn -0.5714 -0.1536 0.8061 -vn -0.5715 -0.1536 0.8061 -vn -0.5713 -0.1537 0.8062 -vn -0.5712 -0.1538 0.8063 -vn -0.5778 -0.2664 0.7715 -vn -0.5779 -0.2664 0.7714 -vn -0.5776 -0.2665 0.7715 -vn -0.5776 -0.2666 0.7716 -vn -0.5886 -0.3827 0.7121 -vn -0.5890 -0.3823 0.7120 -vn -0.5887 -0.3825 0.7121 -vn -0.5887 -0.3826 0.7121 -vn -0.6027 -0.4927 0.6277 -vn -0.6032 -0.4922 0.6276 -vn -0.6032 -0.4921 0.6277 -vn -0.6027 -0.4928 0.6276 -vn -0.6168 -0.5941 0.5164 -vn -0.6169 -0.5939 0.5164 -vn -0.6166 -0.5943 0.5164 -vn -0.6164 -0.5944 0.5164 -vn -0.6284 -0.7144 0.3077 -vn -0.6915 -0.6518 0.3114 -vn -0.9369 -0.2108 0.2789 -vn -0.8864 -0.4042 0.2255 -vn -0.8293 -0.5214 0.2011 -vn -0.7962 -0.5829 0.1621 -vn -0.6803 -0.7266 0.0955 -vn -0.3107 0.8915 -0.3297 -vn -0.4966 0.8100 -0.3120 -vn -0.7108 0.6602 -0.2426 -vn -0.6676 0.7061 -0.2360 -vn -0.9413 0.3139 -0.1240 -vn -0.8910 0.4392 -0.1149 -vn -0.9970 0.0769 -0.0079 -vn -0.5837 -0.8096 0.0619 -vn -0.5537 -0.8243 0.1179 -vn -0.5541 -0.8240 0.1185 -vn -0.5539 -0.8241 0.1183 -vn -0.5536 -0.8244 0.1178 -vn -0.5313 -0.8357 0.1389 -vn -0.5313 -0.8357 0.1390 -vn -0.5311 -0.8358 0.1388 -vn -0.5311 -0.8359 0.1388 -vn -0.5310 -0.8359 0.1389 -vn -0.5429 -0.8290 0.1341 -vn -0.5429 -0.8290 0.1342 -vn -0.5428 -0.8290 0.1343 -vn -0.5623 -0.8166 0.1305 -vn -0.5624 -0.8165 0.1303 -vn -0.5622 -0.8166 0.1308 -vn -0.5622 -0.8166 0.1309 -vn -0.6408 -0.7566 0.1304 -vn -0.6409 -0.7566 0.1294 -vn -0.6409 -0.7566 0.1298 -vn -0.6407 -0.7566 0.1308 -vn -0.7372 -0.6629 0.1309 -vn -0.7374 -0.6628 0.1302 -vn -0.7373 -0.6628 0.1307 -vn -0.8018 -0.5833 0.1303 -vn -0.8017 -0.5833 0.1305 -vn -0.8576 -0.4976 0.1304 -vn -0.9043 -0.4066 0.1304 -vn -0.9043 -0.4066 0.1303 -vn -0.9413 -0.3113 0.1304 -vn -0.9413 -0.3113 0.1305 -vn -0.9414 -0.3112 0.1301 -vn -0.9684 -0.2128 0.1305 -vn -0.9683 -0.2128 0.1306 -vn -0.9684 -0.2128 0.1304 -vn -0.9684 -0.2127 0.1300 -vn -0.9862 -0.1029 0.1301 -vn -0.9861 -0.1030 0.1307 -vn -0.9861 -0.1030 0.1304 -vn -0.9862 -0.1028 0.1296 -vn -0.9913 -0.0214 0.1299 -vn -0.9912 -0.0218 0.1306 -vn -0.9913 -0.0216 0.1302 -vn -0.9913 -0.0213 0.1296 -vn -0.9911 0.0044 0.1330 -vn -0.9911 0.0043 0.1331 -vn -0.9911 0.0045 0.1329 -vn -0.9902 0.0207 0.1380 -vn -0.9902 0.0208 0.1380 -vn -0.9900 0.0234 0.1392 -vn -0.9925 0.0005 0.1220 -vn -0.9926 0.0011 0.1217 -vn -0.9925 0.0007 0.1218 -vn -0.9925 0.0000 0.1222 -vn -0.9973 -0.0349 0.0644 -vn -0.9819 -0.1610 0.1003 -vn -0.1243 -0.9881 -0.0900 -vn -0.1264 -0.9879 -0.0898 -vn -0.1253 -0.9880 -0.0898 -vn -0.9817 0.1188 0.1485 -vn -0.9830 0.1090 0.1479 -vn -0.9834 0.1058 0.1475 -vn -0.9839 0.1012 0.1471 -vn -0.9565 -0.2733 0.1021 -vn -0.9559 -0.2754 0.1024 -vn -0.9554 -0.2773 0.1019 -vn 0.8641 -0.4724 -0.1739 -vn 0.8644 -0.4727 -0.1715 -vn 0.8638 -0.4722 -0.1756 -vn 0.8188 -0.5475 -0.1727 -vn 0.8188 -0.5475 -0.1726 -vn 0.6294 -0.7584 -0.1694 -vn 0.6287 -0.7590 -0.1693 -vn 0.6288 -0.7589 -0.1693 -vn 0.6285 -0.7592 -0.1692 -vn 0.2814 -0.9491 -0.1419 -vn 0.2803 -0.9494 -0.1418 -vn 0.2798 -0.9496 -0.1417 -vn -0.4893 -0.8717 -0.0268 -vn -0.4909 -0.8708 -0.0266 -vn -0.4918 -0.8703 -0.0262 -vn -0.4930 -0.8696 -0.0263 -vn -0.7749 -0.6309 0.0388 -vn -0.7764 -0.6291 0.0389 -vn -0.7773 -0.6278 0.0395 -vn 0.9160 -0.3651 -0.1662 -vn 0.8923 -0.4189 -0.1685 -vn 0.8189 -0.5474 -0.1724 -vn 0.7412 -0.6482 -0.1749 -vn 0.6004 -0.7819 -0.1678 -vn 0.2789 -0.9498 -0.1417 -vn -0.1228 -0.9883 -0.0902 -vn -0.4927 -0.8698 -0.0267 -vn -0.1260 -0.9879 -0.0901 -vn 0.2325 -0.9629 -0.1368 -vn 0.4260 -0.8908 -0.1580 -vn -0.6941 -0.7197 0.0174 -vn -0.7785 -0.6264 0.0385 -vn -0.7784 -0.6265 0.0392 -vn -0.9545 -0.2802 0.1017 -vn -0.9811 0.1236 0.1488 -vn -0.9822 0.1156 0.1481 -vn -0.9745 -0.1939 0.1132 -vn -0.9566 -0.2732 0.1014 -vn -0.9164 -0.3915 0.0837 -vn -0.8178 -0.5733 0.0504 -vn 0.8637 -0.4721 -0.1764 -vn 0.9014 -0.4222 -0.0963 -vn -0.9212 0.1961 -0.3361 -vn -0.9765 0.0103 -0.2151 -vn -0.9589 0.0683 -0.2753 -vn -0.9771 0.1257 -0.1719 -vn -0.9713 -0.0312 -0.2359 -vn -0.9392 -0.2610 -0.2232 -vn -0.9519 -0.2162 -0.2170 -vn -0.7648 -0.6169 -0.1856 -vn -0.8088 -0.5602 -0.1788 -vn -0.4866 -0.8671 -0.1061 -vn -0.5145 -0.8509 -0.1055 -vn -0.5140 -0.8512 -0.1062 -vn -0.5105 -0.8519 -0.1172 -vn -0.1253 -0.9921 -0.0107 -vn -0.1245 -0.9922 -0.0107 -vn -0.1227 -0.9924 -0.0107 -vn -0.1219 -0.9925 -0.0107 -vn 0.2730 -0.9576 0.0922 -vn 0.3122 -0.9456 0.0914 -vn 0.6132 -0.7699 0.1769 -vn 0.6693 -0.7224 0.1736 -vn 0.8434 -0.4856 0.2300 -vn 0.8580 -0.4604 0.2277 -vn -0.9930 0.1130 0.0346 -vn -0.9931 0.1125 0.0345 -vn -0.9931 0.1118 0.0343 -vn -0.9932 0.1114 0.0342 -vn -0.9635 -0.2678 0.0062 -vn -0.9635 -0.2675 0.0063 -vn -0.9635 -0.2677 0.0062 -vn -0.9636 -0.2671 0.0064 -vn -0.7825 -0.6221 -0.0239 -vn -0.7826 -0.6221 -0.0239 -vn -0.7828 -0.6218 -0.0238 -vn -0.4926 -0.8688 -0.0494 -vn -0.4928 -0.8688 -0.0493 -vn -0.4927 -0.8688 -0.0494 -vn -0.4928 -0.8687 -0.0493 -vn -0.1194 -0.9905 -0.0682 -vn -0.1191 -0.9905 -0.0683 -vn 0.2906 -0.9538 -0.0769 -vn 0.2908 -0.9537 -0.0769 -vn 0.2912 -0.9535 -0.0770 -vn 0.2915 -0.9535 -0.0771 -vn 0.6404 -0.7646 -0.0731 -vn 0.6404 -0.7645 -0.0731 -vn 0.6407 -0.7643 -0.0732 -vn 0.6410 -0.7640 -0.0733 -vn 0.9374 -0.3445 -0.0512 -vn 0.8706 -0.4916 0.0197 -vn -0.6401 -0.7671 -0.0434 -vn -0.6401 -0.7670 -0.0434 -vn -0.9776 -0.1168 -0.1749 -vn 0.8424 -0.4765 0.2515 -vn 0.8424 -0.4765 0.2516 -vn 0.8424 -0.4766 0.2515 -vn 0.8424 -0.4765 0.2517 -vn -0.8880 0.3987 -0.2293 -vn -0.8958 0.3845 -0.2229 -vn -0.8792 0.4210 -0.2229 -vn -0.1127 -0.9885 0.1013 -vn 0.1170 -0.9825 0.1451 -vn 0.2182 -0.9630 0.1581 -vn 0.2165 -0.9621 0.1657 -vn 0.2178 -0.9618 0.1656 -vn 0.3492 -0.9192 0.1822 -vn 0.6259 -0.7488 0.2178 -vn 0.6266 -0.7491 0.2148 -vn 0.6265 -0.7492 0.2148 -vn 0.7880 -0.5733 0.2243 -vn -0.8278 -0.5536 -0.0914 -vn -0.6969 -0.7157 -0.0459 -vn -0.6437 -0.7648 -0.0266 -vn -0.5298 -0.8481 0.0030 -vn -0.5297 -0.8482 0.0024 -vn -0.3382 -0.9397 0.0515 -vn 0.9733 0.1513 0.1723 -vn 0.8156 -0.5301 0.2318 -vn 0.8186 -0.5225 0.2387 -vn 0.8165 -0.5280 0.2336 -vn 0.6260 -0.7488 0.2179 -vn 0.6252 -0.7479 0.2233 -vn 0.2195 -0.9638 0.1511 -vn -0.9456 0.2276 -0.2323 -vn -0.8748 0.4253 -0.2318 -vn -0.9759 0.0589 -0.2099 -vn 0.8194 -0.5203 0.2404 -vn 0.7484 -0.6188 0.2387 -vn 0.6249 -0.7481 0.2233 -vn 0.6251 -0.7479 0.2233 -vn 0.2196 -0.9638 0.1512 -vn 0.2183 -0.9635 0.1553 -vn -0.1896 -0.9802 0.0574 -vn -0.2514 -0.9650 0.0751 -vn -0.2510 -0.9651 0.0750 -vn -0.2486 -0.9667 0.0614 -vn -0.2486 -0.9666 0.0614 -vn -0.2439 -0.9689 0.0422 -vn -0.4089 -0.9126 -0.0007 -vn -0.5794 -0.8134 -0.0508 -vn -0.6340 -0.7702 -0.0694 -vn -0.9022 -0.4080 -0.1400 -vn -0.9059 -0.4056 -0.1219 -vn -0.9297 -0.3416 -0.1376 -vn -0.7358 -0.6695 -0.1021 -vn -0.8962 -0.4112 -0.1663 -vn -0.9791 0.0608 -0.1943 -vn -0.9712 0.1235 -0.2036 -vn -0.9177 0.3077 -0.2514 -vn -0.7756 0.5833 -0.2413 -vn -0.9711 0.0558 -0.2322 -vn -0.9711 0.0560 -0.2322 -vn -0.9710 0.0562 -0.2322 -vn -0.9710 0.0563 -0.2322 -vn -0.9417 -0.2771 -0.1908 -vn -0.8550 -0.4961 -0.1509 -vn -0.8961 0.3217 -0.3059 -vn -0.9027 0.3045 -0.3040 -vn -0.9025 0.3047 -0.3043 -vn -0.9027 0.3043 -0.3041 -vn -0.9029 0.3041 -0.3038 -vn -0.9293 0.2003 -0.3102 -vn -0.9290 0.2002 -0.3111 -vn -0.9304 0.1936 -0.3113 -vn -0.9289 0.1976 -0.3133 -vn -0.5115 -0.8516 -0.1142 -vn -0.5104 -0.8519 -0.1174 -vn -0.5117 -0.8516 -0.1138 -vn -0.5708 -0.8168 -0.0835 -vn -0.3892 -0.9184 -0.0708 -vn -0.1305 -0.9914 0.0133 -vn -0.1312 -0.9912 0.0157 -vn -0.1311 -0.9912 0.0153 -vn -0.1850 -0.9819 0.0408 -vn 0.3077 -0.9461 0.1009 -vn 0.2181 -0.9634 0.1560 -vn 0.6541 -0.7224 0.2241 -vn 0.6176 -0.7458 0.2495 -vn 0.8322 -0.4737 0.2882 -vn -0.9329 0.1960 -0.3021 -vn -0.9309 0.0457 -0.3624 -vn -0.9584 -0.1522 -0.2416 -vn -0.9182 -0.2838 -0.2764 -vn -0.7942 -0.5644 -0.2250 -vn -0.7955 -0.5643 -0.2211 -vn -0.7952 -0.5643 -0.2216 -vn -0.8495 -0.4983 -0.1735 -vn -0.7120 -0.6766 -0.1878 -vn 0.8376 -0.4587 0.2966 -vn 0.8379 -0.4583 0.2964 -vn 0.8377 -0.4586 0.2965 -vn 0.8380 -0.4581 0.2963 -vn 0.6464 -0.7212 0.2491 -vn 0.2933 -0.9446 0.1475 -vn 0.2934 -0.9446 0.1474 -vn -0.1304 -0.9914 0.0132 -vn -0.7943 -0.5644 -0.2250 -vn -0.7944 -0.5643 -0.2249 -vn -0.9426 -0.1553 -0.2957 -vn -0.9098 -0.2255 -0.3485 -vn -0.9515 0.0045 -0.3075 -vn -0.3516 0.7102 0.6099 -vn -0.3470 0.7131 0.6092 -vn -0.3477 0.7127 0.6092 -vn -0.3524 0.7097 0.6101 -vn -0.2973 0.7682 0.5669 -vn -0.2858 0.8008 0.5264 -vn -0.2972 0.7926 0.5325 -vn -0.2201 0.8451 0.4871 -vn -0.2449 0.8315 0.4987 -vn -0.2084 0.9009 0.3807 -vn -0.2090 0.9006 0.3812 -vn -0.2093 0.9004 0.3815 -vn -0.2096 0.9002 0.3818 -vn -0.2431 0.8723 0.4243 -vn -0.2204 0.9524 0.2106 -vn -0.2127 0.9579 0.1930 -vn -0.1938 0.9517 0.2382 -vn -0.1945 0.9513 0.2391 -vn -0.1948 0.9511 0.2396 -vn -0.1952 0.9510 0.2400 -vn -0.2280 0.9239 0.3073 -vn -0.3376 0.9186 0.2056 -vn -0.2805 0.9380 0.2038 -vn -0.2662 0.9446 0.1919 -vn -0.3486 0.9134 0.2103 -vn -0.3532 0.9106 0.2145 -vn -0.3500 0.9125 0.2116 -vn -0.3542 0.9100 0.2154 -vn -0.4014 0.8951 0.1943 -vn -0.7068 0.0467 0.7058 -vn -0.2293 -0.6999 0.6764 -vn -0.3106 -0.5797 0.7533 -vn -0.2599 -0.6260 0.7352 -vn -0.0708 -0.7617 0.6440 -vn -0.1778 -0.6642 0.7261 -vn 0.0729 -0.7689 0.6352 -vn -0.0146 -0.7022 0.7118 -vn 0.2187 -0.7995 0.5595 -vn 0.1383 -0.7268 0.6728 -vn 0.3275 -0.8114 0.4841 -vn -0.3772 -0.5919 0.7123 -vn -0.3772 -0.5920 0.7122 -vn -0.3653 -0.6036 0.7086 -vn -0.5426 -0.4527 0.7076 -vn -0.5355 -0.4678 0.7032 -vn -0.4901 -0.4934 0.7186 -vn -0.4903 -0.4900 0.7208 -vn -0.4903 -0.4895 0.7211 -vn -0.4591 -0.5524 0.6958 -vn -0.4674 -0.5256 0.7108 -vn -0.4289 -0.5680 0.7024 -vn -0.4347 -0.5509 0.7125 -vn -0.4072 -0.5807 0.7050 -vn -0.4104 0.8870 0.2114 -vn -0.7045 0.0126 0.7096 -vn -0.4488 0.8261 0.3408 -vn -0.3699 0.8900 0.2665 -vn -0.4789 0.7249 0.4952 -vn -0.4475 0.7690 0.4566 -vn -0.5208 0.6301 0.5759 -vn -0.5637 0.5641 0.6033 -vn -0.5806 0.4704 0.6646 -vn -0.6689 0.2685 0.6932 -vn -0.6653 0.2183 0.7139 -vn -0.7003 0.1017 0.7066 -vn -0.7061 0.0417 0.7069 -vn -0.7116 -0.0003 0.7026 -vn -0.7006 -0.0507 0.7117 -vn -0.7014 -0.0497 0.7111 -vn -0.7033 -0.0864 0.7056 -vn -0.6931 -0.1148 0.7116 -vn 0.4807 -0.8405 0.2501 -vn 0.4656 -0.8127 0.3504 -vn 0.3834 -0.8084 0.4467 -vn 0.2859 -0.7840 0.5510 -vn -0.6978 -0.1296 0.7045 -vn -0.6805 -0.1809 0.7100 -vn -0.6853 -0.1769 0.7064 -vn -0.6740 -0.2137 0.7072 -vn -0.6611 -0.2384 0.7114 -vn -0.6633 -0.2481 0.7061 -vn -0.6634 -0.2482 0.7059 -vn -0.6633 -0.2484 0.7060 -vn -0.6409 -0.2975 0.7077 -vn -0.6410 -0.2978 0.7074 -vn -0.6413 -0.3015 0.7056 -vn -0.6416 -0.3053 0.7036 -vn -0.6169 -0.3414 0.7091 -vn -0.6140 -0.3622 0.7013 -vn -0.5721 -0.3972 0.7176 -vn -0.5723 -0.3996 0.7161 -vn -0.5723 -0.3999 0.7159 -vn -0.5582 -0.4350 0.7066 -vn 0.5186 -0.8328 0.1938 -vn 0.3936 -0.6866 0.6113 -vn 0.3843 -0.6811 0.6233 -vn 0.4698 -0.6787 0.5645 -vn 0.4703 -0.6790 0.5637 -vn 0.4725 -0.6801 0.5605 -vn 0.4731 -0.6804 0.5597 -vn 0.5005 -0.6770 0.5396 -vn 0.5517 -0.6701 0.4966 -vn 0.5507 -0.6644 0.5052 -vn 0.5504 -0.6655 0.5042 -vn 0.5501 -0.6646 0.5056 -vn 0.5876 -0.6883 0.4255 -vn 0.6314 -0.6762 0.3796 -vn 0.6308 -0.7140 0.3038 -vn 0.6818 -0.6919 0.2375 -vn 0.6758 -0.7113 0.1931 -vn 0.6642 -0.7174 0.2100 -vn 0.6328 -0.7504 0.1910 -vn 0.6170 -0.7572 0.2141 -vn 0.5905 -0.7827 0.1967 -vn 0.5674 -0.7960 0.2111 -vn 0.5666 -0.7962 0.2122 -vn 0.5641 -0.7970 0.2159 -vn 0.5636 -0.7971 0.2166 -vn -0.6286 0.3948 0.6701 -vn 0.3484 -0.6860 0.6387 -vn 0.2749 -0.7139 0.6440 -vn 0.2352 -0.7094 0.6644 -vn 0.1968 -0.7259 0.6590 -vn 0.1284 -0.7350 0.6657 -vn 0.1278 -0.7349 0.6661 -vn 0.1253 -0.7342 0.6673 -vn 0.1247 -0.7340 0.6676 -vn 0.0569 -0.7434 0.6664 -vn 0.0565 -0.7433 0.6665 -vn 0.0564 -0.7433 0.6665 -vn 0.0560 -0.7433 0.6667 -vn 0.0001 -0.7436 0.6687 -vn -0.0188 -0.7403 0.6720 -vn -0.0229 -0.7435 0.6683 -vn 0.0187 -0.7549 0.6556 -vn 0.1128 -0.7485 0.6535 -vn 0.1254 -0.7429 0.6576 -vn 0.6017 -0.5153 0.6102 -vn 0.6737 -0.4887 0.5543 -vn 0.5622 -0.5847 0.5849 -vn 0.5836 -0.5729 0.5756 -vn 0.5288 -0.6127 0.5873 -vn 0.5010 -0.6283 0.5951 -vn 0.4719 -0.6559 0.5891 -vn 0.3706 -0.6996 0.6109 -vn 0.3431 -0.7203 0.6028 -vn 0.2699 -0.7342 0.6230 -vn 0.2405 -0.7423 0.6254 -vn 0.1912 -0.7481 0.6355 -vn 0.6673 -0.4710 0.5769 -vn 0.7091 -0.4260 0.5619 -vn 0.7370 -0.3694 0.5661 -vn 0.7164 -0.3887 0.5794 -vn 0.7262 -0.3791 0.5735 -vn 0.7877 -0.3023 0.5368 -vn 0.7769 -0.3113 0.5473 -vn 0.7891 -0.2580 0.5574 -vn 0.7965 -0.2359 0.5568 -vn 0.7949 -0.2284 0.5621 -vn 0.8023 -0.2168 0.5562 -vn 0.8070 -0.1982 0.5562 -vn 0.8197 -0.1837 0.5425 -vn 0.8051 -0.1403 0.5763 -vn 0.8139 -0.1543 0.5601 -vn 0.8241 -0.1287 0.5516 -vn 0.8297 -0.1012 0.5489 -vn 0.8386 -0.0919 0.5370 -vn 0.8287 -0.0397 0.5583 -vn 0.8313 -0.0437 0.5542 -vn 0.8460 0.0123 0.5330 -vn 0.8462 0.0122 0.5328 -vn 0.8462 0.0125 0.5327 -vn 0.8474 0.0142 0.5308 -vn 0.8391 0.0472 0.5419 -vn 0.8412 0.0936 0.5326 -vn 0.8282 0.1073 0.5501 -vn 0.8313 0.1442 0.5368 -vn 0.8282 0.1658 0.5354 -vn 0.8186 0.1889 0.5424 -vn 0.8205 0.1981 0.5362 -vn 0.8205 0.1979 0.5363 -vn 0.8207 0.1985 0.5358 -vn 0.8080 0.2558 0.5307 -vn 0.8076 0.2542 0.5321 -vn 0.8076 0.2559 0.5313 -vn 0.8071 0.2525 0.5337 -vn 0.7923 0.2994 0.5316 -vn 0.7924 0.2990 0.5318 -vn 0.7925 0.2977 0.5323 -vn 0.7925 0.2973 0.5324 -vn 0.7705 0.3552 0.5292 -vn 0.7537 0.3632 0.5477 -vn 0.7428 0.4051 0.5330 -vn 0.7328 0.4273 0.5296 -vn 0.7131 0.4493 0.5381 -vn 0.7126 0.4525 0.5362 -vn 0.7121 0.4550 0.5347 -vn 0.7119 0.4558 0.5342 -vn 0.6774 0.5139 0.5264 -vn 0.6772 0.4973 0.5422 -vn 0.6471 0.5484 0.5296 -vn 0.6475 0.5477 0.5300 -vn 0.6485 0.5454 0.5310 -vn 0.6486 0.5450 0.5312 -vn 0.6026 0.5863 0.5415 -vn 0.6122 0.5856 0.5313 -vn 0.5669 0.6234 0.5385 -vn 0.5673 0.6226 0.5390 -vn 0.5697 0.6190 0.5406 -vn 0.5707 0.6175 0.5413 -vn 0.5410 0.6536 0.5292 -vn 0.3626 0.7525 0.5498 -vn 0.5488 0.6276 0.5522 -vn 0.5121 0.6783 0.5270 -vn 0.4875 0.6791 0.5487 -vn 0.4642 0.7001 0.5425 -vn 0.4603 0.7020 0.5434 -vn 0.4574 0.7036 0.5439 -vn 0.4524 0.7061 0.5447 -vn 0.4498 0.7075 0.5451 -vn 0.4305 0.7139 0.5522 -vn 0.4236 0.7256 0.5422 -vn 0.3857 0.7389 0.5525 -vn 0.3882 0.7357 0.5551 -vn 0.3879 0.7360 0.5549 -vn 0.3882 0.7355 0.5553 -vn 0.3673 0.7517 0.5478 -vn 0.3504 0.7562 0.5526 -vn 0.3234 0.7622 0.5608 -vn 0.3306 0.7654 0.5522 -vn 0.2990 0.7758 0.5556 -vn 0.2875 0.7777 0.5590 -vn 0.2791 0.7855 0.5523 -vn 0.2868 0.7782 0.5587 -vn 0.2790 0.7859 0.5519 -vn 0.2579 0.7868 0.5607 -vn 0.2569 0.7868 0.5612 -vn 0.2318 0.8038 0.5480 -vn 0.2066 0.7990 0.5647 -vn 0.1590 0.8140 0.5586 -vn 0.1118 0.8184 0.5637 -vn 0.0408 0.8035 0.5939 -vn 0.1093 0.8367 0.5367 -vn -0.0227 0.8131 0.5817 -vn -0.0798 0.7888 0.6095 -vn -0.0272 0.8236 0.5665 -vn -0.1598 0.7989 0.5798 -vn -0.1497 0.8039 0.5756 -vn -0.2440 0.7671 0.5933 -vn -0.2428 0.7681 0.5926 -vn -0.3382 0.7262 0.5985 -vn -0.3735 0.6946 0.6148 -vn -0.4665 0.6426 0.6078 -vn -0.4440 0.6522 0.6144 -vn -0.5349 0.5517 0.6400 -vn -0.5452 0.5220 0.6560 -vn -0.5794 0.4871 0.6535 -vn -0.6153 0.4369 0.6561 -vn -0.6188 0.4154 0.6667 -vn -0.6309 0.3941 0.6683 -vn -0.6310 0.3937 0.6685 -vn -0.6308 0.3944 0.6682 -vn -0.6298 0.3988 0.6665 -vn -0.5909 0.4500 0.6696 -vn -0.5474 0.5313 0.6465 -vn -0.5450 0.4904 0.6801 -vn -0.4685 0.6034 0.6453 -vn -0.4737 0.5709 0.6706 -vn -0.4408 0.6196 0.6494 -vn -0.3814 0.6691 0.6378 -vn -0.3889 0.6492 0.6537 -vn -0.0001 0.0000 -1.0000 -vn -0.6929 0.4323 -0.5771 -vn -0.6807 0.4448 -0.5820 -vn -0.6374 0.4844 -0.5992 -vn -0.6604 0.4673 -0.5879 -vn -0.5624 0.5641 -0.6045 -vn -0.4619 0.6245 -0.6298 -vn -0.4317 0.6366 -0.6391 -vn -0.3573 0.6799 -0.6404 -vn -0.2382 0.7184 -0.6536 -vn -0.1362 0.7305 -0.6692 -vn -0.1347 0.7309 -0.6691 -vn -0.1313 0.7318 -0.6687 -vn -0.1297 0.7323 -0.6685 -vn 0.0829 0.7461 -0.6607 -vn 0.0060 0.7300 -0.6835 -vn 0.1139 0.7259 -0.6783 -vn 0.2112 0.7029 -0.6792 -vn 0.1706 0.7053 -0.6881 -vn 0.2928 0.6796 -0.6726 -vn 0.2375 0.6821 -0.6916 -vn 0.3122 0.6606 -0.6828 -vn 0.3559 0.6307 -0.6896 -vn 0.3561 0.6306 -0.6896 -vn 0.3560 0.6307 -0.6896 -vn 0.3562 0.6306 -0.6895 -vn 0.3752 0.6218 -0.6874 -vn 0.4137 0.6009 -0.6839 -vn 0.3937 0.6037 -0.6932 -vn 0.4269 0.5833 -0.6911 -vn 0.4421 0.5650 -0.6967 -vn 0.4563 0.5573 -0.6937 -vn 0.4759 0.5414 -0.6931 -vn 0.5221 0.4952 -0.6944 -vn 0.5210 0.4957 -0.6949 -vn 0.5154 0.4982 -0.6972 -vn 0.5144 0.4987 -0.6977 -vn 0.5733 0.4325 -0.6959 -vn 0.5858 0.3995 -0.7052 -vn 0.6012 0.3825 -0.7016 -vn 0.6166 0.3582 -0.7011 -vn 0.6387 0.3119 -0.7034 -vn 0.6393 0.3113 -0.7031 -vn 0.6421 0.3086 -0.7017 -vn 0.6428 0.3080 -0.7014 -vn 0.6666 0.2541 -0.7008 -vn 0.6781 0.2136 -0.7033 -vn 0.6896 0.1982 -0.6966 -vn 0.7053 0.1363 -0.6957 -vn 0.7094 0.0951 -0.6984 -vn 0.7169 0.0802 -0.6926 -vn 0.7203 0.0388 -0.6926 -vn 0.7204 0.0416 -0.6923 -vn 0.7196 0.0232 -0.6940 -vn 0.7230 0.0220 -0.6905 -vn 0.7235 0.0202 -0.6900 -vn 0.7222 -0.0113 -0.6916 -vn 0.7227 -0.0085 -0.6911 -vn 0.7210 -0.0178 -0.6927 -vn 0.7207 -0.0196 -0.6929 -vn 0.7172 -0.1569 -0.6789 -vn 0.7159 -0.1026 -0.6906 -vn 0.7154 -0.1040 -0.6909 -vn 0.7177 -0.0975 -0.6895 -vn 0.7185 -0.0954 -0.6890 -vn 0.7263 -0.0472 -0.6857 -vn 0.6890 -0.2384 -0.6844 -vn 0.7026 -0.2154 -0.6782 -vn 0.6746 -0.2906 -0.6786 -vn 0.6450 -0.3490 -0.6798 -vn 0.6538 -0.3378 -0.6771 -vn 0.6099 -0.4196 -0.6723 -vn 0.5838 -0.4572 -0.6710 -vn 0.5332 -0.5163 -0.6701 -vn 0.5197 -0.5383 -0.6634 -vn 0.3996 -0.6540 -0.6423 -vn 0.2932 -0.7110 -0.6391 -vn 0.2939 -0.7105 -0.6394 -vn 0.2957 -0.7092 -0.6400 -vn 0.2965 -0.7086 -0.6403 -vn 0.2481 -0.7382 -0.6273 -vn 0.0556 -0.8189 -0.5713 -vn 0.1434 -0.7756 -0.6147 -vn -0.0279 -0.8196 -0.5723 -vn -0.0280 -0.8196 -0.5722 -vn -0.0281 -0.8196 -0.5722 -vn -0.0115 -0.8123 -0.5832 -vn -0.0279 -0.8159 -0.5775 -vn -0.0417 -0.8191 -0.5722 -vn -0.0645 -0.8159 -0.5746 -vn -0.0970 -0.8167 -0.5689 -vn -0.1456 -0.8128 -0.5641 -vn -0.1750 -0.8027 -0.5701 -vn -0.2091 -0.8031 -0.5579 -vn -0.3263 -0.7783 -0.5364 -vn -0.3101 -0.7771 -0.5477 -vn -0.4288 -0.7308 -0.5311 -vn -0.4601 -0.7034 -0.5418 -vn -0.4946 -0.6891 -0.5297 -vn -0.5917 -0.6206 -0.5146 -vn -0.5796 -0.6247 -0.5233 -vn -0.6968 -0.5048 -0.5096 -vn -0.6958 -0.5053 -0.5104 -vn -0.6879 -0.5100 -0.5165 -vn -0.6873 -0.5104 -0.5168 -vn -0.7770 -0.3703 -0.5090 -vn -0.7763 -0.3709 -0.5096 -vn -0.7706 -0.3761 -0.5145 -vn -0.7702 -0.3765 -0.5148 -vn -0.8291 -0.2227 -0.5129 -vn -0.8286 -0.2233 -0.5133 -vn -0.8249 -0.2285 -0.5170 -vn -0.8246 -0.2288 -0.5174 -vn -0.8508 -0.0683 -0.5211 -vn -0.8505 -0.0688 -0.5215 -vn -0.8484 -0.0732 -0.5243 -vn -0.8483 -0.0736 -0.5244 -vn -0.8417 0.0863 -0.5331 -vn -0.8416 0.0859 -0.5333 -vn -0.8408 0.0825 -0.5351 -vn -0.8407 0.0823 -0.5352 -vn -0.8027 0.2347 -0.5482 -vn -0.8027 0.2345 -0.5483 -vn -0.8026 0.2324 -0.5494 -vn -0.7141 0.4031 -0.5723 -vn -0.7288 0.3671 -0.5781 -vn -0.7540 0.3385 -0.5630 -vn -0.8026 0.2323 -0.5494 -vn 0.3982 0.8597 -0.3199 -vn 0.5597 0.7580 -0.3349 -vn 0.5566 0.7605 -0.3345 -vn 0.5644 0.7542 -0.3356 -vn 0.9106 -0.2697 -0.3132 -vn 0.8985 -0.3108 -0.3101 -vn 0.9167 -0.2477 -0.3135 -vn 0.9266 -0.2041 -0.3159 -vn 0.9269 -0.2027 -0.3159 -vn 0.9262 -0.2061 -0.3158 -vn 0.9259 -0.2075 -0.3158 -vn 0.9337 -0.1627 -0.3190 -vn 0.9385 -0.1245 -0.3220 -vn 0.9358 -0.1462 -0.3207 -vn 0.9435 -0.0613 -0.3256 -vn 0.9402 -0.1031 -0.3247 -vn 0.9435 -0.0111 -0.3312 -vn 0.9431 -0.0452 -0.3295 -vn 0.9422 0.0233 -0.3342 -vn 0.9421 0.0263 -0.3343 -vn 0.9424 0.0188 -0.3341 -vn 0.9424 0.0158 -0.3340 -vn 0.9400 0.0543 -0.3369 -vn 0.9349 0.1040 -0.3394 -vn 0.9348 0.1046 -0.3394 -vn 0.9258 0.1606 -0.3422 -vn 0.9219 0.1800 -0.3431 -vn 0.9223 0.1782 -0.3430 -vn 0.9214 0.1825 -0.3432 -vn 0.9210 0.1843 -0.3433 -vn 0.9124 0.2207 -0.3447 -vn 0.9015 0.2591 -0.3466 -vn 0.8952 0.2800 -0.3468 -vn 0.8765 0.3325 -0.3483 -vn 0.8759 0.3338 -0.3483 -vn 0.8772 0.3305 -0.3482 -vn 0.8777 0.3293 -0.3482 -vn 0.8511 0.3923 -0.3490 -vn 0.8493 0.3959 -0.3492 -vn 0.8467 0.4012 -0.3494 -vn 0.8449 0.4048 -0.3496 -vn 0.8225 0.4486 -0.3496 -vn 0.8094 0.4720 -0.3494 -vn 0.8096 0.4717 -0.3494 -vn 0.8099 0.4712 -0.3494 -vn 0.8101 0.4707 -0.3494 -vn 0.7892 0.5052 -0.3491 -vn 0.7896 0.5046 -0.3491 -vn 0.7902 0.5037 -0.3491 -vn 0.7183 0.6036 -0.3461 -vn 0.7536 0.5576 -0.3480 -vn 0.7556 0.5548 -0.3482 -vn 0.7506 0.5619 -0.3477 -vn 0.7486 0.5647 -0.3474 -vn 0.7906 0.5031 -0.3491 -vn 0.6731 0.6549 -0.3436 -vn 0.6734 0.6545 -0.3437 -vn 0.6739 0.6541 -0.3436 -vn 0.6742 0.6537 -0.3437 -vn 0.6380 0.6903 -0.3413 -vn 0.6191 0.7080 -0.3399 -vn 0.6196 0.7075 -0.3399 -vn 0.6204 0.7068 -0.3400 -vn 0.6209 0.7063 -0.3400 -vn 0.5962 0.7281 -0.3384 -vn 0.5062 0.7962 -0.3313 -vn 0.5212 0.7861 -0.3324 -vn 0.5675 0.7517 -0.3360 -vn 0.4761 0.8155 -0.3291 -vn 0.5156 0.7907 -0.3300 -vn 0.4415 0.8365 -0.3245 -vn 0.4156 0.8504 -0.3225 -vn 0.4886 0.8097 -0.3251 -vn 0.4653 0.8236 -0.3244 -vn 0.3704 0.8728 -0.3177 -vn 0.4050 0.8570 -0.3186 -vn 0.3414 0.8856 -0.3150 -vn 0.3177 0.8948 -0.3135 -vn 0.3161 0.8954 -0.3135 -vn 0.3139 0.8962 -0.3134 -vn 0.3123 0.8968 -0.3134 -vn 0.2959 0.9027 -0.3126 -vn 0.2634 0.9133 -0.3108 -vn 0.2235 0.9241 -0.3100 -vn 0.1476 0.9404 -0.3063 -vn 0.0078 0.9549 -0.2967 -vn 0.1289 0.9435 -0.3054 -vn 0.1823 0.9336 -0.3085 -vn -0.1676 0.9460 -0.2774 -vn -0.0266 0.9554 -0.2940 -vn 0.0484 0.9524 -0.3009 -vn -0.6892 0.7051 -0.1669 -vn -0.6935 0.7013 -0.1654 -vn -0.6964 0.6986 -0.1643 -vn -0.5506 0.8087 -0.2068 -vn -0.5829 0.7881 -0.1976 -vn -0.4099 0.8802 -0.2390 -vn -0.4528 0.8616 -0.2293 -vn -0.2960 0.9193 -0.2593 -vn -0.2927 0.9202 -0.2598 -vn -0.3008 0.9180 -0.2584 -vn -0.3041 0.9171 -0.2578 -vn -0.1886 0.9427 -0.2753 -vn -0.0964 0.9530 -0.2873 -vn -0.8436 0.5263 -0.1060 -vn -0.8436 0.5264 -0.1060 -vn -0.8320 0.5435 -0.1116 -vn -0.8093 0.5747 -0.1216 -vn -0.7894 0.5998 -0.1303 -vn -0.7576 0.6370 -0.1428 -vn -0.6862 0.7078 -0.1679 -vn 0.0246 -0.9922 -0.1222 -vn -0.0141 -0.9936 -0.1123 -vn -0.9516 0.2996 -0.0682 -vn -0.9374 0.3410 -0.0707 -vn -0.9391 0.3365 -0.0696 -vn -0.9374 0.3410 -0.0706 -vn -0.9382 0.3390 -0.0701 -vn -0.9393 0.3365 -0.0675 -vn -0.9409 0.3326 -0.0644 -vn -0.9404 0.3338 -0.0653 -vn -0.9422 0.3295 -0.0613 -vn -0.9424 0.3290 -0.0608 -vn -0.9563 0.2857 -0.0625 -vn -0.9560 0.2866 -0.0631 -vn -0.9584 0.2789 -0.0602 -vn -0.9600 0.2731 -0.0611 -vn -0.9602 0.2728 -0.0593 -vn -0.9606 0.2717 -0.0590 -vn -0.9586 0.2757 -0.0707 -vn -0.9664 0.2447 -0.0782 -vn -0.9587 0.2775 -0.0628 -vn -0.9851 0.1668 -0.0431 -vn -0.9933 0.1029 -0.0531 -vn -0.9940 0.0973 -0.0494 -vn -0.9928 0.1059 -0.0551 -vn -0.9925 0.1085 -0.0568 -vn -0.9993 0.0283 -0.0254 -vn -0.9960 -0.0864 -0.0222 -vn -0.9967 -0.0737 -0.0337 -vn -0.9803 -0.1976 -0.0007 -vn -0.9633 -0.2673 -0.0248 -vn -0.9536 -0.3009 -0.0059 -vn -0.9313 -0.3642 -0.0006 -vn -0.8981 -0.4396 -0.0110 -vn -0.8983 -0.4392 -0.0109 -vn -0.8962 -0.4436 -0.0074 -vn -0.8959 -0.4441 -0.0068 -vn -0.8287 -0.5597 0.0047 -vn -0.8026 -0.5961 -0.0214 -vn -0.7460 -0.6659 0.0052 -vn -0.6798 -0.7328 -0.0303 -vn -0.6654 -0.7462 -0.0205 -vn -0.6134 -0.7896 -0.0177 -vn -0.5829 -0.8122 -0.0242 -vn -0.5635 -0.8259 -0.0208 -vn -0.5041 -0.8628 -0.0375 -vn -0.5057 -0.8618 -0.0381 -vn -0.4987 -0.8661 -0.0357 -vn -0.4968 -0.8672 -0.0350 -vn -0.3699 -0.9269 -0.0636 -vn -0.4362 -0.8990 -0.0398 -vn -0.2633 -0.9629 -0.0597 -vn -0.2663 -0.9627 -0.0485 -vn -0.2658 -0.9627 -0.0502 -vn -0.2642 -0.9629 -0.0541 -vn -0.2605 -0.9636 -0.0597 -vn -0.2528 -0.9650 -0.0691 -vn -0.2531 -0.9652 -0.0663 -vn -0.2512 -0.9656 -0.0673 -vn -0.2610 -0.9630 -0.0679 -vn -0.2697 -0.9605 -0.0681 -vn -0.2698 -0.9605 -0.0681 -vn -0.2728 -0.9596 -0.0682 -vn -0.2514 -0.9655 -0.0673 -vn -0.3076 -0.9496 -0.0610 -vn -0.3317 -0.9415 -0.0597 -vn -0.2636 -0.9628 -0.0600 -vn -0.3062 -0.9500 -0.0607 -vn -0.3066 -0.9499 -0.0608 -vn -0.3063 -0.9500 -0.0607 -vn -0.3097 -0.9489 -0.0600 -vn -0.3108 -0.9486 -0.0597 -vn -0.0506 -0.9933 -0.1035 -vn -0.0340 -0.9937 -0.1068 -vn -0.0339 -0.9937 -0.1068 -vn 0.1794 -0.9703 -0.1623 -vn 0.2437 -0.9531 -0.1797 -vn 0.1472 -0.9770 -0.1542 -vn 0.3126 -0.9301 -0.1927 -vn 0.4194 -0.8805 -0.2210 -vn 0.3024 -0.9334 -0.1930 -vn 0.6297 -0.7296 -0.2668 -vn 0.5650 -0.7853 -0.2530 -vn 0.5060 -0.8282 -0.2408 -vn 0.3774 -0.9020 -0.2098 -vn 0.6681 -0.6921 -0.2732 -vn 0.7276 -0.6231 -0.2868 -vn 0.6665 -0.6932 -0.2743 -vn 0.8441 -0.4406 -0.3057 -vn 0.8372 -0.4542 -0.3045 -vn 0.7539 -0.5904 -0.2882 -vn 0.8173 -0.4910 -0.3015 -vn 0.7806 -0.5510 -0.2950 -vn 0.8740 -0.3764 -0.3073 -vn 0.8828 -0.3538 -0.3090 -vn 0.8379 -0.4534 -0.3040 -vn 0.7873 -0.5416 -0.2945 -vn -0.8665 0.4895 -0.0980 -vn -0.8666 0.4892 -0.0979 -vn -0.9449 0.3204 -0.0673 -vn -0.9400 0.3341 -0.0690 -vn -0.9092 0.4082 -0.0822 -vn -0.9087 0.4092 -0.0824 -vn -0.9081 0.4106 -0.0826 -vn -0.9076 0.4116 -0.0827 -vn -0.8904 0.4460 -0.0904 -vn -0.2471 -0.9664 -0.0700 -vn -0.2510 -0.9655 -0.0692 -vn -0.1757 -0.9811 -0.0815 -vn -0.1262 -0.9879 -0.0903 -vn -0.1236 -0.9882 -0.0907 -vn -0.1200 -0.9886 -0.0914 -vn -0.1174 -0.9888 -0.0918 -vn -0.0774 -0.9921 -0.0986 -vn -0.0340 -0.9936 -0.1073 -vn -0.4604 -0.8751 0.1494 -vn 0.0393 0.9456 0.3230 -vn 0.1047 0.9583 0.2658 -vn 0.1773 0.9827 -0.0537 -vn 0.0813 0.9942 -0.0702 -vn -0.5301 -0.8451 0.0688 -vn -0.4567 -0.8888 -0.0389 -vn -0.6167 -0.7869 0.0220 -vn -0.7595 -0.6504 0.0082 -vn -0.7581 -0.6521 0.0079 -vn -0.7550 -0.6557 0.0072 -vn -0.7535 -0.6574 0.0069 -vn -0.9529 -0.3026 -0.0221 -vn -0.9523 -0.3043 -0.0223 -vn -0.9512 -0.3079 -0.0228 -vn -0.9506 -0.3096 -0.0231 -vn -0.9960 0.0760 -0.0479 -vn -0.9961 0.0745 -0.0481 -vn -0.9963 0.0713 -0.0486 -vn -0.9964 0.0697 -0.0489 -vn -0.8883 0.4543 -0.0670 -vn -0.8889 0.4531 -0.0672 -vn -0.8904 0.4502 -0.0679 -vn -0.8910 0.4489 -0.0682 -vn -0.6286 0.7740 -0.0761 -vn -0.6295 0.7733 -0.0764 -vn -0.6314 0.7716 -0.0771 -vn -0.6324 0.7708 -0.0774 -vn -0.2759 0.9584 -0.0728 -vn -0.2767 0.9582 -0.0731 -vn -0.2785 0.9576 -0.0736 -vn -0.2793 0.9574 -0.0739 -vn 0.0008 0.9980 -0.0638 -vn -0.4249 -0.8735 -0.2376 -vn -0.4262 -0.8729 -0.2374 -vn -0.4290 -0.8717 -0.2368 -vn -0.4304 -0.8711 -0.2366 -vn -0.7421 -0.6323 -0.2222 -vn -0.7418 -0.6327 -0.2223 -vn -0.7412 -0.6333 -0.2226 -vn -0.7409 -0.6336 -0.2227 -vn -0.9414 -0.2898 -0.1727 -vn -0.9412 -0.2902 -0.1728 -vn -0.9409 -0.2912 -0.1732 -vn -0.9407 -0.2916 -0.1734 -vn -0.9918 0.0805 -0.0994 -vn -0.9918 0.0803 -0.0995 -vn -0.9918 0.0800 -0.0997 -vn -0.9918 0.0799 -0.0997 -vn -0.8936 0.4488 -0.0084 -vn -0.8933 0.4494 -0.0081 -vn -0.8932 0.4495 -0.0080 -vn -0.8931 0.4498 -0.0078 -vn -0.6440 0.7599 0.0890 -vn -0.6435 0.7602 0.0894 -vn -0.6425 0.7610 0.0900 -vn -0.6420 0.7614 0.0903 -vn -0.2983 0.9392 0.1699 -vn -0.2977 0.9394 0.1702 -vn -0.2965 0.9397 0.1708 -vn -0.2958 0.9398 0.1710 -vn 0.2013 0.9515 0.2326 -vn 0.0718 0.9850 0.1567 -vn -0.9902 0.1343 -0.0395 -vn -0.3683 -0.9283 -0.0513 -vn -0.4221 -0.9056 -0.0421 -vn -0.4195 -0.9068 -0.0420 -vn -0.4251 -0.9042 -0.0413 -vn -0.4292 -0.9023 -0.0414 -vn -0.4304 -0.9003 -0.0656 -vn -0.4304 -0.9002 -0.0659 -vn -0.4304 -0.9003 -0.0657 -vn -0.4304 -0.9003 -0.0653 -vn -0.3480 -0.9360 -0.0524 -vn -0.3568 -0.9327 -0.0532 -vn -0.3456 -0.9368 -0.0545 -vn -0.3471 -0.9362 -0.0549 -vn -0.3443 -0.9373 -0.0546 -vn -0.3447 -0.9371 -0.0547 -vn -0.3461 -0.9366 -0.0552 -vn -0.3466 -0.9365 -0.0538 -vn -0.5285 -0.8484 -0.0289 -vn -0.5049 -0.8626 -0.0316 -vn -0.5019 -0.8643 -0.0319 -vn -0.5093 -0.8600 -0.0311 -vn -0.5123 -0.8583 -0.0308 -vn -0.4686 -0.8826 -0.0368 -vn -0.4384 -0.8979 -0.0404 -vn -0.4238 -0.9043 -0.0505 -vn -0.4236 -0.9045 -0.0499 -vn -0.5646 -0.8250 -0.0244 -vn -0.5937 -0.8044 -0.0202 -vn -0.5926 -0.8052 -0.0203 -vn -0.5952 -0.8033 -0.0201 -vn -0.5963 -0.8025 -0.0200 -vn -0.6169 -0.7868 -0.0183 -vn -0.6714 -0.7410 -0.0127 -vn -0.6729 -0.7396 -0.0127 -vn -0.6693 -0.7429 -0.0128 -vn -0.6678 -0.7442 -0.0129 -vn -0.7407 -0.6719 -0.0062 -vn -0.7410 -0.6715 -0.0035 -vn -0.7405 -0.6720 -0.0062 -vn -0.7406 -0.6719 -0.0062 -vn -0.7835 -0.6214 -0.0036 -vn -0.8052 -0.5931 -0.0018 -vn -0.8052 -0.5931 -0.0012 -vn -0.8088 -0.5881 -0.0003 -vn -0.8138 -0.5811 -0.0018 -vn -0.8504 -0.5262 -0.0004 -vn -0.8585 -0.5128 0.0003 -vn -0.8585 -0.5128 0.0000 -vn -0.8594 -0.5113 -0.0000 -vn -0.8752 -0.4837 -0.0000 -vn -0.9049 -0.4257 0.0000 -vn -0.9047 -0.4260 0.0000 -vn -0.9050 -0.4255 -0.0000 -vn -0.9052 -0.4249 -0.0000 -vn -0.9419 -0.3358 -0.0020 -vn -0.9415 -0.3369 -0.0015 -vn -0.9423 -0.3346 -0.0019 -vn -0.9429 -0.3330 -0.0022 -vn -0.9708 -0.2399 -0.0031 -vn -0.9708 -0.2399 -0.0061 -vn -0.9708 -0.2399 -0.0030 -vn -0.9755 -0.2198 -0.0063 -vn -0.9630 -0.2693 -0.0048 -vn -0.9972 0.0684 -0.0317 -vn -0.9996 0.0088 -0.0259 -vn -0.9989 -0.0422 -0.0200 -vn -0.9988 -0.0452 -0.0198 -vn -0.9986 -0.0498 -0.0196 -vn -0.9984 -0.0529 -0.0194 -vn -0.9894 -0.1454 -0.0066 -vn -0.9893 -0.1454 -0.0124 -vn -0.9894 -0.1453 -0.0010 -vn -0.9946 -0.1030 -0.0139 -vn -0.9880 -0.1542 -0.0116 -vn -0.9980 0.0541 -0.0311 -vn -0.9921 0.1200 -0.0358 -vn -0.9938 0.1059 -0.0347 -vn -0.9873 0.1452 -0.0649 -vn -0.9873 0.1453 -0.0645 -vn -0.9873 0.1452 -0.0650 -vn -0.9872 0.1452 -0.0654 -vn -0.9868 0.1446 -0.0724 -vn -0.9866 0.1416 -0.0811 -vn -0.9868 0.1564 -0.0427 -vn -0.9865 0.1579 -0.0424 -vn -0.9864 0.1588 -0.0427 -vn -0.9866 0.1578 -0.0419 -vn -0.9881 0.1480 -0.0420 -vn -0.9878 0.1504 -0.0411 -vn -0.9866 0.1576 -0.0418 -vn -0.9833 0.1763 -0.0449 -vn -0.9720 0.2289 -0.0530 -vn -0.9723 0.2277 -0.0528 -vn -0.9709 0.2333 -0.0539 -vn -0.9709 0.2334 -0.0541 -vn -0.9711 0.2325 -0.0541 -vn -0.3193 -0.9138 -0.2509 -vn -0.0952 0.9700 0.2238 -vn -0.0382 0.9692 0.2433 -vn -0.0380 0.9702 0.2393 -vn -0.0384 0.9718 0.2328 -vn -0.0380 0.9713 0.2346 -vn -0.0398 0.9720 0.2314 -vn 0.0169 0.9689 0.2468 -vn 0.0170 0.9689 0.2469 -vn -0.2610 -0.9370 -0.2322 -vn -0.2608 -0.9361 -0.2358 -vn -0.2608 -0.9361 -0.2359 -vn -0.2039 -0.9518 -0.2292 -vn 0.0166 0.9690 0.2465 -vn 0.0153 0.9695 0.2444 -vn -0.3683 0.9054 0.2113 -vn -0.3683 0.9054 0.2112 -vn -0.3683 0.9057 0.2101 -vn -0.7244 0.6755 0.1378 -vn -0.7244 0.6754 0.1378 -vn -0.7240 0.6759 0.1379 -vn -0.7241 0.6744 0.1442 -vn -0.9477 0.3170 0.0379 -vn -0.9476 0.3173 0.0380 -vn -0.9475 0.3174 0.0380 -vn -0.9474 0.3178 0.0381 -vn -0.9950 -0.0775 -0.0633 -vn -0.9951 -0.0767 -0.0631 -vn -0.9950 -0.0770 -0.0632 -vn -0.2607 -0.9352 -0.2395 -vn -0.1097 -0.9628 -0.2468 -vn -0.5869 -0.7788 -0.2216 -vn -0.5870 -0.7787 -0.2215 -vn -0.8748 -0.4595 -0.1540 -vn -0.8745 -0.4598 -0.1541 -vn -0.8745 -0.4599 -0.1541 -vn -0.1604 0.9615 0.2233 -vn -0.2160 0.9512 0.2202 -vn -0.3682 0.9060 0.2089 -vn -0.4154 0.8868 0.2027 -vn -0.6086 0.7742 0.1741 -vn -0.7244 0.6728 0.1503 -vn -0.7689 0.6245 0.1371 -vn -0.9483 0.3114 0.0617 -vn -0.8960 0.4338 0.0948 -vn -0.8959 0.4314 0.1060 -vn -0.8958 0.4315 0.1062 -vn -0.9701 0.2387 0.0442 -vn -0.9697 0.2418 0.0345 -vn -0.9699 0.2394 0.0446 -vn -0.9959 -0.0851 -0.0317 -vn -0.9995 0.0300 -0.0017 -vn -0.9856 -0.1615 -0.0495 -vn -0.8755 -0.4681 -0.1200 -vn -0.9273 -0.3627 -0.0925 -vn -0.8258 -0.5469 -0.1378 -vn -0.6734 -0.7180 -0.1761 -vn -0.5877 -0.7866 -0.1895 -vn -0.4938 -0.8454 -0.2038 -vn -0.1331 -0.9647 -0.2274 -vn -0.2838 -0.9345 -0.2149 -vn -0.2838 -0.9317 -0.2266 -vn -0.2838 -0.9330 -0.2213 -vn -0.0887 -0.9704 -0.2247 -vn -0.9950 -0.0997 0.0001 -vn -0.9990 -0.0452 -0.0017 -vn -0.9978 -0.0657 -0.0005 -vn -0.9948 -0.0985 -0.0278 -vn -0.9997 -0.0241 -0.0031 -vn -0.9999 0.0107 -0.0088 -vn -0.9991 -0.0422 0.0103 -vn -0.9977 0.0675 -0.0023 -vn -0.9985 0.0542 -0.0007 -vn -0.9893 0.1456 0.0014 -vn -0.9915 -0.1303 -0.0002 -vn -0.9894 -0.1454 -0.0008 -vn -0.9816 -0.1911 0.0009 -vn -0.9647 -0.2634 -0.0025 -vn -0.9708 -0.2399 -0.0000 -vn -0.9501 -0.3120 -0.0000 -vn -0.9415 -0.3369 -0.0010 -vn -0.9363 -0.3513 -0.0003 -vn -0.6582 -0.7528 -0.0001 -vn -0.6730 -0.7397 -0.0008 -vn -0.6748 -0.7380 -0.0007 -vn -0.6776 -0.7355 -0.0006 -vn -0.6794 -0.7338 -0.0005 -vn -0.7047 -0.7095 0.0002 -vn -0.7410 -0.6715 -0.0009 -vn -0.7540 -0.6569 0.0006 -vn -0.8068 -0.5908 -0.0003 -vn -0.8113 -0.5847 0.0002 -vn -0.8589 -0.5121 -0.0002 -vn -0.8600 -0.5103 0.0000 -vn -0.8961 -0.4438 -0.0018 -vn -0.9190 -0.3942 0.0002 -vn -0.5982 -0.8013 -0.0015 -vn -0.5957 -0.8032 -0.0016 -vn -0.6055 -0.7958 -0.0054 -vn -0.5998 -0.8002 -0.0040 -vn -0.6009 -0.7994 -0.0031 -vn -0.5977 -0.8017 -0.0031 -vn -0.5697 -0.8217 0.0151 -vn -0.6021 -0.7984 -0.0022 -vn -0.6066 -0.7950 -0.0037 -vn -0.6143 -0.7891 -0.0005 -vn -0.6357 -0.7719 0.0001 -vn -0.4313 -0.9022 -0.0061 -vn -0.4647 -0.8855 0.0007 -vn -0.5125 -0.8587 -0.0007 -vn -0.5349 -0.8449 0.0023 -vn -0.5928 -0.8054 -0.0019 -vn -0.5939 -0.8045 -0.0018 -vn -0.5964 -0.8027 -0.0017 -vn -0.4936 -0.8348 -0.2440 -vn -0.8241 -0.5303 -0.1991 -vn -0.9837 -0.1480 -0.1020 -vn -0.1427 -0.0492 0.9885 -vn -0.0883 -0.9836 -0.1572 -vn -0.1190 -0.9648 -0.2346 -vn 0.1268 -0.9319 -0.3397 -vn 0.0686 -0.8290 -0.5550 -vn -0.2000 -0.7598 -0.6186 -vn 0.2448 -0.6141 -0.7503 -vn -0.2231 -0.6767 -0.7016 -vn 0.0586 -0.4923 -0.8685 -vn -0.1236 -0.5245 -0.8424 -vn -0.0453 -0.3370 -0.9404 -vn -0.0433 -0.3364 -0.9407 -vn -0.0440 -0.3366 -0.9406 -vn -0.0460 -0.3372 -0.9403 -vn -0.1350 -0.1666 -0.9767 -vn -0.1556 -0.1739 -0.9724 -vn -0.0820 -0.0203 -0.9964 -vn -0.0958 -0.0256 -0.9951 -vn -0.1102 -0.0240 -0.9936 -vn -0.1363 -0.0343 -0.9901 -vn -0.0934 -0.0304 -0.9952 -vn -0.1349 -0.0497 -0.9896 -vn -0.1589 -0.0468 -0.9862 -vn -0.2267 -0.0954 -0.9693 -vn -0.0989 -0.0457 0.9940 -vn -0.0998 -0.0396 0.9942 -vn -0.0998 -0.0390 0.9942 -vn -0.0793 -0.0252 0.9965 -vn -0.0711 -0.0233 0.9972 -vn -0.0768 -0.0246 0.9967 -vn -0.0826 -0.0259 0.9962 -vn -0.1099 -0.0294 0.9935 -vn -0.0976 -0.0216 0.9950 -vn -0.1276 -0.0248 0.9915 -vn 0.1289 0.0817 0.9883 -vn -0.2704 0.1220 0.9550 -vn -0.0927 0.8928 0.4408 -vn -0.1704 0.9051 0.3896 -vn -0.7171 -0.3760 0.5869 -vn -0.7170 -0.3762 0.5869 -vn -0.7167 -0.3766 0.5869 -vn -0.8078 -0.4248 0.4086 -vn -0.8053 -0.4295 0.4086 -vn -0.8054 -0.4294 0.4086 -vn -0.8810 -0.4709 -0.0446 -vn -0.8551 -0.4510 -0.2559 -vn -0.7806 -0.4068 -0.4745 -vn -0.4890 0.8334 0.2575 -vn -0.4101 0.8343 0.3684 -vn -0.2125 0.8914 0.4004 -vn -0.2001 0.8344 0.5135 -vn -0.4173 0.7966 0.4375 -vn -0.5154 0.7505 0.4136 -vn -0.4798 0.7545 0.4477 -vn -0.8336 0.4715 0.2878 -vn -0.0987 -0.0462 0.9940 -vn -0.1640 -0.0648 0.9843 -vn -0.4260 -0.1996 0.8824 -vn -0.4055 -0.1950 0.8931 -vn -0.5843 -0.2880 0.7587 -vn -0.9697 0.2421 0.0333 -vn -0.8961 0.4310 0.1063 -vn -0.8217 0.5598 0.1068 -vn -0.7679 0.6065 0.2058 -vn -0.6066 0.7473 0.2712 -vn -0.7018 -0.3749 0.6057 -vn -0.7226 -0.3172 0.6142 -vn -0.7237 -0.3184 0.6123 -vn -0.7229 -0.3175 0.6136 -vn -0.3966 -0.1756 0.9010 -vn -0.4124 -0.1363 0.9008 -vn -0.4044 -0.1348 0.9046 -vn -0.4074 -0.1354 0.9032 -vn -0.4153 -0.1369 0.8993 -vn -0.4236 -0.0931 0.9011 -vn -0.4181 -0.0930 0.9036 -vn -0.4200 -0.0931 0.9027 -vn -0.4255 -0.0931 0.9002 -vn -0.4238 -0.0182 0.9056 -vn -0.4641 -0.0120 0.8857 -vn -0.4521 0.2426 0.8583 -vn -0.0782 0.3107 0.9473 -vn -0.9984 0.0394 -0.0404 -vn -0.9827 0.1813 -0.0367 -vn -0.9871 0.1299 0.0932 -vn -0.9869 0.1309 0.0947 -vn -0.9869 0.1307 0.0944 -vn -0.8262 0.4768 0.3003 -vn -0.8294 0.4039 0.3861 -vn -0.5042 0.6360 0.5842 -vn -0.4831 0.6558 0.5801 -vn -0.1061 0.7513 0.6514 -vn -0.9849 0.0892 0.1482 -vn -0.9854 0.0880 0.1458 -vn -0.9853 0.0883 0.1465 -vn -0.0909 0.4144 0.9056 -vn -0.4389 0.4075 0.8008 -vn -0.4663 0.3993 0.7894 -vn -0.4836 0.2122 0.8492 -vn -0.8041 0.0970 0.5865 -vn -0.7890 -0.0880 0.6081 -vn -0.7802 -0.0903 0.6190 -vn -0.7688 -0.1719 0.6160 -vn -0.7729 -0.1715 0.6109 -vn -0.7715 -0.1716 0.6126 -vn -0.7674 -0.1720 0.6177 -vn -0.7467 -0.2503 0.6162 -vn -0.7529 -0.2510 0.6083 -vn -0.7507 -0.2507 0.6112 -vn -0.7444 -0.2500 0.6191 -vn -0.7240 -0.3187 0.6117 -vn -0.8918 -0.3918 0.2263 -vn -0.8918 -0.3918 0.2265 -vn -0.8563 -0.4664 0.2219 -vn -0.8629 -0.4636 0.2012 -vn -0.9257 -0.3480 -0.1482 -vn -0.9645 -0.2113 -0.1584 -vn -0.9688 -0.2202 -0.1139 -vn -0.9676 -0.2234 -0.1181 -vn -0.9678 -0.2226 -0.1171 -vn -0.9872 0.1296 0.0928 -vn -0.9848 0.0895 0.1490 -vn -0.7654 0.4137 0.4930 -vn -0.8223 0.3145 0.4742 -vn -0.5092 0.5037 0.6979 -vn -0.9749 -0.1528 -0.1617 -vn -0.9711 -0.1666 -0.1711 -vn -0.9701 -0.1872 -0.1542 -vn -0.8624 -0.4765 -0.1711 -vn -0.9010 -0.3960 -0.1770 -vn -0.9014 -0.3957 -0.1755 -vn -0.9012 -0.3959 -0.1765 -vn -0.8918 -0.3920 0.2258 -vn -0.9234 -0.3103 0.2260 -vn -0.9226 -0.3104 0.2290 -vn -0.9229 -0.3104 0.2278 -vn -0.9237 -0.3102 0.2248 -vn -0.9503 -0.2129 0.2273 -vn -0.9499 -0.2131 0.2288 -vn -0.9500 -0.2130 0.2282 -vn -0.9504 -0.2128 0.2267 -vn -0.9629 -0.1348 0.2336 -vn -0.9641 -0.1340 0.2291 -vn -0.9638 -0.1343 0.2304 -vn -0.9626 -0.1351 0.2350 -vn -0.6730 -0.7078 -0.2148 -vn -0.7711 -0.5845 -0.2524 -vn -0.7604 -0.5669 -0.3167 -vn -0.9690 -0.2196 -0.1131 -vn -0.9687 -0.1997 -0.1472 -vn -0.9767 -0.1632 -0.1393 -vn -0.7530 -0.3302 -0.5692 -vn -0.7536 -0.3301 -0.5685 -vn -0.7518 -0.3303 -0.5708 -vn -0.7749 -0.2574 -0.5773 -vn -0.7835 -0.2625 -0.5632 -vn -0.8032 -0.1784 -0.5684 -vn -0.7988 -0.1758 -0.5754 -vn -0.8002 -0.1766 -0.5731 -vn -0.8046 -0.1793 -0.5661 -vn -0.8073 -0.1523 -0.5701 -vn -0.2729 0.6114 0.7428 -vn -0.2071 0.6081 0.7664 -vn -0.4759 0.5370 0.6966 -vn -0.4971 0.3693 0.7851 -vn -0.8215 0.2106 0.5299 -vn -0.7466 0.1847 0.6391 -vn -0.9777 -0.0085 0.2097 -vn -0.9779 -0.0086 0.2089 -vn -0.9783 -0.0088 0.2072 -vn -0.9784 -0.0088 0.2064 -vn -0.9718 -0.1606 -0.1724 -vn -0.9719 -0.1604 -0.1725 -vn -0.9722 -0.1547 -0.1758 -vn -0.9724 -0.1545 -0.1750 -vn -0.9721 -0.1542 -0.1766 -vn -0.9606 -0.2145 -0.1767 -vn -0.9612 -0.2155 -0.1721 -vn -0.9610 -0.2151 -0.1736 -vn -0.9604 -0.2141 -0.1782 -vn -0.9330 -0.3130 -0.1774 -vn -0.9338 -0.3141 -0.1713 -vn -0.9335 -0.3137 -0.1736 -vn -0.9327 -0.3126 -0.1797 -vn -0.9016 -0.3956 -0.1749 -vn -0.7512 -0.3303 -0.5715 -vn -0.7280 -0.3937 -0.5612 -vn -0.6686 -0.3324 -0.6652 -vn -0.3092 -0.8451 -0.4360 -vn -0.4282 -0.8036 -0.4133 -vn -0.3960 -0.7149 -0.5763 -vn -0.4224 -0.6966 -0.5799 -vn -0.3947 -0.6012 -0.6948 -vn -0.4266 -0.5791 -0.6948 -vn -0.4050 -0.4764 -0.7804 -vn -0.4349 -0.4576 -0.7756 -vn -0.4169 -0.3392 -0.8433 -vn -0.4467 -0.3224 -0.8346 -vn -0.4325 -0.1901 -0.8814 -vn -0.4648 -0.1762 -0.8677 -vn -0.4596 -0.0790 -0.8846 -vn -0.4657 -0.0765 -0.8817 -vn -0.4609 -0.0784 -0.8840 -vn -0.5105 -0.2457 -0.8241 -vn -0.4940 -0.2402 -0.8356 -vn -0.4377 -0.1932 -0.8781 -vn -0.4545 -0.1504 -0.8780 -vn -0.4465 -0.1465 -0.8827 -vn -0.4494 -0.1479 -0.8810 -vn -0.4574 -0.1518 -0.8762 -vn -0.4658 -0.1021 -0.8790 -vn -0.4605 -0.0998 -0.8820 -vn -0.4623 -0.1005 -0.8810 -vn -0.4676 -0.1029 -0.8779 -vn -0.4670 -0.0760 -0.8810 -vn -0.8471 -0.1370 -0.5135 -vn -0.7959 -0.1809 -0.5778 -vn -0.7961 -0.2549 -0.5488 -vn -0.7864 -0.2654 -0.5578 -vn -0.7891 -0.3332 -0.5160 -vn -0.7789 -0.3460 -0.5231 -vn -0.7841 -0.4059 -0.4695 -vn -0.7729 -0.4217 -0.4741 -vn -0.7813 -0.4804 -0.3986 -vn -0.7702 -0.4966 -0.4001 -vn -0.7805 -0.5518 -0.2938 -vn -0.3741 -0.8146 -0.4432 -vn -0.4110 -0.8638 -0.2914 -vn -0.2838 -0.9314 -0.2277 -vn -0.3054 0.1385 -0.9421 -vn -0.1118 -0.1069 0.9880 -vn 0.0252 0.0012 0.9997 -vn -0.0805 -0.0562 0.9952 -vn -0.0547 -0.0551 0.9970 -vn -0.0539 -0.0557 0.9970 -vn -0.0441 -0.0611 0.9972 -vn 0.7413 -0.4420 0.5051 -vn 0.7068 -0.5455 0.4504 -vn 0.7291 -0.5363 0.4253 -vn 0.7361 -0.5242 0.4281 -vn 0.7308 -0.4020 0.5517 -vn 0.5637 -0.5554 0.6113 -vn 0.2949 -0.7844 0.5457 -vn -0.1109 -0.0977 -0.9890 -vn -0.1136 -0.0860 -0.9898 -vn -0.1181 -0.0957 -0.9884 -vn -0.1167 -0.0928 -0.9888 -vn -0.1012 -0.1091 -0.9889 -vn -0.1024 -0.1092 -0.9887 -vn -0.1025 -0.1093 -0.9887 -vn -0.1016 -0.1096 -0.9888 -vn -0.1022 -0.1094 -0.9887 -vn -0.1079 -0.1090 -0.9882 -vn -0.3215 0.1075 -0.9408 -vn -0.4812 0.1771 -0.8585 -vn -0.4207 0.3061 -0.8540 -vn -0.6399 0.1955 -0.7432 -vn -0.5453 0.4334 -0.7175 -vn -0.7660 0.2345 -0.5985 -vn -0.6525 0.5229 -0.5485 -vn -0.7931 0.3593 -0.4919 -vn -0.8043 0.5245 -0.2793 -vn -0.8581 0.4071 -0.3130 -vn 0.3374 -0.9108 0.2380 -vn 0.5846 -0.6211 0.5220 -vn 0.7557 -0.5250 0.3914 -vn 0.7455 -0.5376 0.3940 -vn 0.5553 -0.7392 0.3811 -vn 0.5497 -0.7054 0.4474 -vn 0.5227 -0.6604 0.5391 -vn 0.6777 -0.4982 0.5409 -vn -0.0588 -0.0503 0.9970 -vn -0.0560 -0.0438 0.9975 -vn -0.0548 -0.0409 0.9977 -vn -0.3289 -0.2450 0.9120 -vn -0.3301 -0.2464 0.9112 -vn -0.3265 -0.2422 0.9136 -vn -0.3253 -0.2408 0.9145 -vn -0.6315 -0.4669 0.6190 -vn -0.6326 -0.4685 0.6167 -vn -0.6294 -0.4638 0.6234 -vn -0.6284 -0.4622 0.6258 -vn -0.7858 -0.5776 0.2210 -vn -0.7859 -0.5782 0.2192 -vn -0.7856 -0.5766 0.2245 -vn -0.7855 -0.5760 0.2263 -vn -0.7928 -0.5816 -0.1822 -vn -0.7929 -0.5816 -0.1818 -vn -0.6641 -0.4877 -0.5667 -vn -0.6651 -0.4881 -0.5652 -vn -0.6619 -0.4871 -0.5697 -vn -0.6609 -0.4868 -0.5712 -vn -0.3954 -0.2919 -0.8709 -vn -0.3969 -0.2925 -0.8700 -vn -0.3922 -0.2905 -0.8728 -vn -0.3907 -0.2898 -0.8737 -vn -0.1124 -0.0835 -0.9901 -vn -0.1485 -0.1033 -0.9835 -vn -0.3898 -0.2245 0.8931 -vn -0.3382 -0.2194 0.9151 -vn -0.3451 -0.2201 0.9124 -vn -0.3423 -0.2150 0.9147 -vn -0.5593 -0.3346 0.7585 -vn 0.3065 -0.7603 0.5727 -vn 0.1937 -0.7184 0.6681 -vn 0.3034 -0.6344 0.7110 -vn 0.4814 -0.5086 0.7139 -vn -0.0386 -0.4910 0.8703 -vn -0.2244 -0.6433 0.7320 -vn -0.3043 -0.7525 0.5841 -vn -0.1124 -0.9221 0.3703 -vn -0.0115 -0.8111 0.5848 -vn 0.2038 -0.6835 0.7009 -vn 0.0819 -0.6303 0.7720 -vn 0.3549 -0.3662 0.8602 -vn 0.1714 -0.4769 0.8621 -vn 0.6952 -0.5819 0.4220 -vn 0.6388 -0.6272 0.4456 -vn 0.4073 -0.8191 0.4040 -vn 0.4080 -0.8189 0.4036 -vn 0.4074 -0.8192 0.4037 -vn 0.4111 -0.8181 0.4021 -vn -0.0286 -0.9652 0.2601 -vn 0.0933 -0.9621 0.2562 -vn -0.1338 -0.9695 0.2055 -vn -0.7173 -0.3755 0.5869 -vn -0.6876 -0.3807 0.6183 -vn -0.8029 -0.4341 0.4085 -vn -0.8719 -0.4400 0.2150 -vn -0.8721 -0.4460 0.2012 -vn -0.0429 -0.0617 0.9972 -vn 0.1902 0.0959 0.9771 -vn -0.2080 -0.3387 0.9176 -vn -0.2604 -0.3677 0.8927 -vn -0.4938 -0.6005 0.6289 -vn -0.5130 -0.6071 0.6069 -vn -0.6482 -0.7269 0.2268 -vn -0.6484 -0.7269 0.2263 -vn -0.6488 -0.7269 0.2252 -vn -0.6490 -0.7268 0.2248 -vn -0.6698 -0.7201 -0.1812 -vn -0.6721 -0.7179 -0.1814 -vn -0.6697 -0.7203 -0.1805 -vn -0.5102 -0.8569 0.0732 -vn -0.4956 -0.8544 0.1562 -vn -0.5539 -0.8083 0.1997 -vn -0.5701 -0.8135 0.1151 -vn -0.5785 -0.7881 0.2103 -vn 0.0144 -0.2736 0.9617 -vn 0.2564 -0.2211 0.9410 -vn -0.0431 -0.5303 0.8467 -vn 0.0891 -0.5941 0.7994 -vn -0.2711 -0.8071 0.5245 -vn -0.1297 -0.8885 0.4402 -vn -0.4755 -0.8686 0.1395 -vn -0.4290 -0.9011 0.0633 -vn -0.3428 -0.9365 0.0737 -vn -0.8915 -0.4509 -0.0445 -vn -0.8892 -0.4194 -0.1831 -vn -0.8643 -0.4330 -0.2558 -vn -0.5772 -0.5878 -0.5669 -vn -0.6698 -0.7205 -0.1796 -vn -0.6729 -0.7177 -0.1792 -vn -0.6809 -0.7110 -0.1753 -vn -0.6811 -0.7111 -0.1747 -vn -0.6810 -0.7110 -0.1756 -vn -0.6933 -0.7017 -0.1641 -vn -0.6934 -0.7013 -0.1657 -vn -0.6933 -0.7017 -0.1643 -vn -0.6934 -0.7011 -0.1660 -vn -0.7087 -0.6903 -0.1457 -vn -0.7092 -0.6893 -0.1479 -vn -0.7088 -0.6901 -0.1461 -vn -0.7093 -0.6891 -0.1483 -vn -0.7872 -0.3940 -0.4744 -vn -0.7506 -0.3499 -0.5605 -vn -0.6603 -0.3484 -0.6653 -vn -0.3750 -0.3289 -0.8667 -vn -0.5746 -0.5772 -0.5802 -vn -0.6604 -0.5173 -0.5442 -vn -0.6531 -0.5128 -0.5572 -vn -0.7225 -0.4672 -0.5096 -vn -0.7166 -0.4602 -0.5241 -vn -0.7833 -0.4204 -0.4580 -vn -0.7789 -0.4107 -0.4740 -vn -0.8445 -0.3758 -0.3817 -vn -0.8426 -0.3633 -0.3974 -vn -0.5296 -0.8483 0.0018 -vn -0.6857 -0.7216 -0.0950 -vn -0.7177 -0.6837 -0.1318 -vn -0.8061 -0.5638 -0.1798 -vn -0.9012 -0.3357 -0.2742 -vn -0.8928 -0.3578 -0.2736 -vn -0.8369 -0.4951 -0.2333 -vn -0.9534 -0.1304 -0.2722 -vn -0.4984 -0.2687 -0.8243 -vn -0.4452 -0.2213 -0.8676 -vn -0.1906 -0.1624 -0.9681 -vn -0.0693 -0.0429 0.9967 -vn -0.3479 -0.2199 0.9114 -vn -0.3440 -0.2160 0.9138 -vn -0.6653 -0.4175 0.6190 -vn -0.6663 -0.4188 0.6169 -vn -0.6632 -0.4149 0.6229 -vn -0.6621 -0.4135 0.6250 -vn -0.8271 -0.5169 0.2205 -vn -0.8273 -0.5174 0.2188 -vn -0.8269 -0.5160 0.2235 -vn -0.8268 -0.5155 0.2252 -vn -0.8341 -0.5204 -0.1827 -vn -0.8342 -0.5204 -0.1824 -vn -0.6986 -0.4364 -0.5670 -vn -0.6995 -0.4366 -0.5658 -vn -0.6969 -0.4360 -0.5694 -vn -0.6960 -0.4358 -0.5706 -vn -0.4167 -0.2612 -0.8707 -vn -0.4180 -0.2616 -0.8700 -vn -0.4141 -0.2602 -0.8722 -vn -0.4129 -0.2598 -0.8729 -vn -0.1304 -0.0815 -0.9881 -vn -0.0701 -0.0563 -0.9960 -vn -0.0601 -0.0533 0.9968 -vn -0.0444 -0.0413 0.9982 -vn -0.2962 -0.2733 0.9152 -vn -0.3073 -0.2813 0.9091 -vn -0.5739 -0.5251 0.6283 -vn -0.5852 -0.5321 0.6120 -vn -0.7202 -0.6549 0.2289 -vn -0.7211 -0.6551 0.2256 -vn -0.7225 -0.6555 0.2200 -vn -0.7233 -0.6557 0.2167 -vn -0.7285 -0.6605 -0.1817 -vn -0.7285 -0.6606 -0.1812 -vn -0.7286 -0.6608 -0.1804 -vn -0.7286 -0.6609 -0.1800 -vn -0.6074 -0.5511 -0.5722 -vn -0.6086 -0.5527 -0.5694 -vn -0.6106 -0.5556 -0.5644 -vn -0.6117 -0.5572 -0.5616 -vn -0.3583 -0.3266 -0.8746 -vn -0.3603 -0.3290 -0.8729 -vn -0.3636 -0.3330 -0.8700 -vn -0.3656 -0.3354 -0.8683 -vn -0.0893 -0.0823 -0.9926 -vn -0.1091 -0.1089 -0.9880 -vn -0.9451 0.1079 -0.3085 -vn -0.9445 0.1098 -0.3095 -vn -0.9450 0.1083 -0.3087 -vn -0.9444 0.1101 -0.3097 -vn -0.8741 0.1107 -0.4729 -vn -0.8923 0.0810 -0.4441 -vn -0.8174 0.0630 -0.5726 -vn -0.8346 0.0331 -0.5499 -vn -0.7159 -0.0071 -0.6982 -vn -0.7389 -0.0357 -0.6729 -vn -0.6140 -0.0890 -0.7843 -vn -0.6387 -0.1125 -0.7611 -vn -0.5046 -0.1789 -0.8446 -vn -0.5317 -0.1981 -0.8234 -vn -0.3582 -0.2918 -0.8869 -vn -0.2033 -0.1095 -0.9730 -vn -0.3043 -0.2002 -0.9313 -vn -0.1090 -0.9940 0.0008 -vn -0.9670 -0.2547 -0.0047 -vn -0.9694 -0.2456 0.0001 -vn -0.9689 -0.2475 -0.0008 -vn -0.9532 -0.3022 -0.0000 -vn -0.9399 -0.3414 -0.0033 -vn -0.9406 -0.3395 -0.0040 -vn -0.9373 -0.3486 -0.0001 -vn -0.9365 -0.3507 0.0008 -vn -0.9995 0.0302 0.0029 -vn -0.9996 0.0268 0.0032 -vn -0.9994 0.0335 0.0022 -vn -0.9993 0.0374 0.0018 -vn -0.9664 -0.2569 -0.0059 -vn -0.9832 -0.1826 0.0033 -vn -0.9861 -0.1662 -0.0014 -vn -0.9926 -0.1216 0.0009 -vn -0.9925 -0.1219 0.0009 -vn -0.9927 -0.1209 0.0008 -vn -0.9927 -0.1206 0.0007 -vn -0.9961 -0.0880 -0.0006 -vn -0.9999 0.0117 0.0063 -vn -0.9999 -0.0097 0.0130 -vn -0.9981 0.0580 -0.0186 -vn -0.9990 -0.0423 0.0160 -vn -1.0000 -0.0005 -0.0065 -vn -0.9974 -0.0722 0.0017 -vn -0.9939 0.1102 0.0037 -vn -0.9896 0.1436 -0.0090 -vn -0.9899 0.1418 -0.0033 -vn -0.9898 0.1421 -0.0046 -vn -0.9896 0.1435 -0.0109 -vn -0.9966 0.0786 -0.0242 -vn -0.9951 0.0985 0.0005 -vn -0.9986 0.0522 -0.0006 -vn -0.9728 0.2315 0.0004 -vn -0.9626 0.2709 -0.0000 -vn -0.9622 0.2725 0.0017 -vn -0.9622 0.2724 0.0018 -vn -0.9622 0.2724 0.0016 -vn -0.9623 0.2721 0.0012 -vn -0.9897 0.1433 -0.0081 -vn -0.9895 0.1441 -0.0071 -vn -0.9891 0.1474 -0.0030 -vn -0.9830 0.1831 -0.0094 -vn -0.9871 0.1595 0.0142 -vn -0.9764 0.2154 -0.0144 -vn -0.9840 0.1776 0.0122 -vn -0.9813 0.1925 0.0064 -vn -0.8495 0.5275 0.0000 -vn -0.8706 0.4919 -0.0022 -vn -0.8707 0.4918 -0.0016 -vn -0.8706 0.4920 -0.0022 -vn -0.8686 0.4955 -0.0087 -vn -0.9510 0.3092 -0.0000 -vn -0.9327 0.3605 -0.0065 -vn -0.9589 0.2805 0.0426 -vn -0.8856 0.4645 0.0008 -vn -0.8869 0.4619 0.0006 -vn -0.8896 0.4567 0.0003 -vn -0.8912 0.4535 0.0001 -vn -0.9022 0.4314 -0.0009 -vn -0.9107 0.4130 -0.0035 -vn -0.9440 0.3296 0.0150 -vn -0.9030 -0.4296 -0.0010 -vn -0.9031 -0.4293 -0.0009 -vn -0.9035 -0.4285 -0.0004 -vn -0.9037 -0.4282 -0.0002 -vn -0.8613 -0.5080 0.0002 -vn -0.8615 -0.5077 0.0004 -vn -0.8617 -0.5074 0.0006 -vn -0.8620 -0.5070 0.0008 -vn -0.8197 -0.5728 -0.0006 -vn -0.8188 -0.5741 -0.0011 -vn -0.8163 -0.5776 -0.0027 -vn -0.8155 -0.5787 -0.0032 -vn -0.7888 -0.6147 0.0010 -vn -0.7874 -0.6165 0.0008 -vn -0.7848 -0.6197 0.0003 -vn -0.7833 -0.6216 -0.0000 -vn -0.7531 -0.6579 -0.0000 -vn -0.7529 -0.6581 -0.0001 -vn -0.7530 -0.6580 -0.0000 -vn -0.7529 -0.6582 -0.0001 -vn -0.7077 -0.7065 0.0001 -vn -0.7076 -0.7066 0.0001 -vn -0.6851 -0.7284 0.0000 -vn -0.6861 -0.7275 -0.0000 -vn -0.6824 -0.7310 0.0000 -vn -0.6822 -0.7312 0.0000 -vn -0.6830 -0.7304 0.0000 -vn -0.6805 -0.7328 0.0001 -vn -0.6645 -0.7473 0.0014 -vn -0.6638 -0.7479 0.0012 -vn -0.6622 -0.7493 0.0007 -vn -0.6614 -0.7500 0.0004 -vn -0.6194 -0.7850 -0.0008 -vn -0.6302 -0.7764 0.0036 -vn -0.5742 -0.8187 -0.0046 -vn -0.4889 -0.8719 -0.0293 -vn -0.4978 -0.8670 -0.0240 -vn -0.4918 -0.8703 -0.0270 -vn -0.4990 -0.8663 -0.0229 -vn -0.5917 -0.8059 0.0194 -vn -0.5175 -0.8550 -0.0338 -vn -0.5372 -0.8432 -0.0213 -vn -0.5630 -0.8263 0.0170 -vn -0.5440 -0.8390 0.0085 -vn -0.5297 -0.8482 0.0043 -vn -0.4086 -0.9125 0.0179 -vn -0.4071 -0.9132 0.0165 -vn -0.4073 -0.9132 0.0167 -vn -0.2963 -0.9550 0.0162 -vn -0.3104 -0.9506 0.0022 -vn -0.3102 -0.9507 0.0026 -vn -0.3111 -0.9504 0.0011 -vn -0.3114 -0.9503 0.0007 -vn -0.4304 -0.9026 -0.0073 -vn -0.4335 -0.9011 -0.0038 -vn -0.4316 -0.9020 -0.0092 -vn -0.4367 -0.8996 -0.0005 -vn -0.5114 -0.8594 0.0000 -vn -0.4714 -0.8818 -0.0091 -vn -0.4643 -0.8857 -0.0000 -vn -0.4704 -0.8824 -0.0077 -vn -0.4723 -0.8814 -0.0099 -vn -0.4501 -0.8930 0.0003 -vn -0.3864 -0.9221 -0.0201 -vn -0.3967 -0.9179 -0.0094 -vn -0.4273 -0.9041 -0.0034 -vn -0.4296 -0.9030 -0.0062 -vn -0.4303 -0.9026 -0.0089 -vn -0.3066 -0.9508 0.0451 -vn -0.2640 -0.9643 0.0192 -vn -0.1626 -0.9867 -0.0062 -vn -0.1763 -0.9843 0.0004 -vn -0.1267 -0.9919 -0.0000 -vn -0.3991 -0.9169 0.0087 -vn -0.3511 -0.9363 -0.0000 -vn -0.2742 -0.9617 0.0000 -vn -0.2215 -0.9751 -0.0065 -vn -0.0778 -0.9970 0.0000 -vn -0.0621 -0.9977 -0.0276 -vn -0.0737 -0.9972 -0.0085 -vn -0.0342 -0.9994 0.0000 -vn 0.0079 -0.8167 -0.5771 -vn -0.0093 -0.8131 -0.5821 -vn -0.0658 -0.7979 -0.5992 -vn -0.0391 -0.8080 -0.5878 -vn -0.1735 -0.7775 -0.6045 -vn -0.2783 -0.7252 -0.6298 -vn -0.3048 -0.7062 -0.6391 -vn -0.3813 -0.6667 -0.6404 -vn -0.4778 -0.5870 -0.6535 -vn -0.5428 -0.5075 -0.6692 -vn -0.5440 -0.5065 -0.6690 -vn -0.5465 -0.5042 -0.6686 -vn -0.5478 -0.5031 -0.6684 -vn -0.6737 -0.3310 -0.6607 -vn -0.6188 -0.3873 -0.6835 -vn -0.6734 -0.2942 -0.6783 -vn -0.7063 -0.1997 -0.6792 -vn -0.6865 -0.2351 -0.6881 -vn -0.7305 -0.1184 -0.6725 -vn -0.7028 -0.1663 -0.6916 -vn -0.7248 -0.0918 -0.6828 -vn -0.7231 -0.0388 -0.6896 -vn -0.7232 -0.0386 -0.6896 -vn -0.7232 -0.0385 -0.6895 -vn -0.7260 -0.0177 -0.6874 -vn -0.7291 0.0259 -0.6839 -vn -0.7207 0.0075 -0.6932 -vn -0.7213 0.0465 -0.6911 -vn -0.7141 0.0692 -0.6967 -vn -0.7152 0.0853 -0.6937 -vn -0.7123 0.1104 -0.6931 -vn -0.6982 0.1741 -0.6944 -vn -0.6980 0.1729 -0.6949 -vn -0.6972 0.1668 -0.6972 -vn -0.6970 0.1657 -0.6977 -vn -0.6728 0.2510 -0.6959 -vn -0.6517 0.2793 -0.7052 -vn -0.6457 0.3013 -0.7016 -vn -0.6335 0.3274 -0.7011 -vn -0.6063 0.3709 -0.7034 -vn -0.6061 0.3717 -0.7032 -vn -0.6053 0.3757 -0.7017 -vn -0.6052 0.3765 -0.7014 -vn -0.5725 0.4256 -0.7008 -vn -0.5446 0.4570 -0.7033 -vn -0.5378 0.4750 -0.6966 -vn -0.4940 0.5215 -0.6957 -vn -0.4615 0.5471 -0.6984 -vn -0.4530 0.5614 -0.6926 -vn -0.4199 0.5866 -0.6925 -vn -0.4223 0.5852 -0.6922 -vn -0.4064 0.5946 -0.6938 -vn -0.4071 0.5979 -0.6905 -vn -0.4059 0.5993 -0.6900 -vn -0.3787 0.6151 -0.6915 -vn -0.3813 0.6141 -0.6911 -vn -0.3726 0.6176 -0.6926 -vn -0.3709 0.6183 -0.6929 -vn -0.2532 0.6892 -0.6789 -vn -0.2983 0.6588 -0.6906 -vn -0.2968 0.6592 -0.6909 -vn -0.3035 0.6576 -0.6895 -vn -0.3057 0.6571 -0.6890 -vn -0.3506 0.6378 -0.6857 -vn 0.4191 -0.9071 -0.0395 -vn 0.9807 0.1884 -0.0513 -vn 0.9905 0.1308 -0.0421 -vn 0.9901 0.1337 -0.0420 -vn 0.9910 0.1274 -0.0413 -vn 0.9915 0.1230 -0.0414 -vn 0.9905 0.1209 -0.0657 -vn 0.9905 0.1210 -0.0651 -vn 0.9763 0.2098 -0.0523 -vn 0.9771 0.2056 -0.0541 -vn 0.9757 0.2120 -0.0545 -vn 0.9755 0.2130 -0.0547 -vn 0.9755 0.2129 -0.0547 -vn 0.9758 0.2115 -0.0551 -vn 0.9760 0.2111 -0.0537 -vn 0.9995 0.0105 -0.0289 -vn 0.9986 0.0413 -0.0319 -vn 0.9991 0.0293 -0.0308 -vn 0.9962 0.0792 -0.0368 -vn 0.9928 0.1132 -0.0404 -vn 0.9904 0.1286 -0.0504 -vn 0.9904 0.1290 -0.0498 -vn 0.9992 -0.0327 -0.0244 -vn 0.9975 -0.0682 -0.0202 -vn 0.9975 -0.0670 -0.0203 -vn 0.9973 -0.0700 -0.0201 -vn 0.9973 -0.0712 -0.0200 -vn 0.9951 -0.0971 -0.0183 -vn 0.9857 -0.1679 -0.0128 -vn 0.9854 -0.1699 -0.0127 -vn 0.9862 -0.1648 -0.0129 -vn 0.9866 -0.1628 -0.0130 -vn 0.9646 -0.2635 -0.0062 -vn 0.9645 -0.2640 -0.0035 -vn 0.9647 -0.2632 -0.0062 -vn 0.9452 -0.3266 -0.0036 -vn 0.9329 -0.3602 -0.0018 -vn 0.9329 -0.3602 -0.0012 -vn 0.9307 -0.3659 -0.0003 -vn 0.9276 -0.3736 -0.0018 -vn 0.9009 -0.4340 -0.0004 -vn 0.8939 -0.4483 0.0003 -vn 0.8939 -0.4483 0.0000 -vn 0.8931 -0.4499 -0.0000 -vn 0.8785 -0.4778 -0.0000 -vn 0.8453 -0.5342 0.0000 -vn 0.8455 -0.5340 0.0000 -vn 0.8451 -0.5347 -0.0000 -vn 0.7895 -0.6137 -0.0021 -vn 0.7902 -0.6129 -0.0015 -vn 0.7888 -0.6147 -0.0019 -vn 0.7878 -0.6159 -0.0022 -vn 0.7241 -0.6897 -0.0031 -vn 0.7241 -0.6897 -0.0061 -vn 0.7241 -0.6897 -0.0030 -vn 0.7100 -0.7041 -0.0063 -vn 0.7451 -0.6670 -0.0048 -vn 0.4783 -0.8776 -0.0317 -vn 0.5300 -0.8476 -0.0259 -vn 0.5725 -0.8197 -0.0200 -vn 0.5750 -0.8179 -0.0198 -vn 0.5787 -0.8153 -0.0196 -vn 0.5813 -0.8135 -0.0194 -vn 0.6544 -0.7561 -0.0066 -vn 0.6543 -0.7561 -0.0124 -vn 0.6537 -0.7567 -0.0010 -vn 0.6217 -0.7831 -0.0139 -vn 0.6615 -0.7499 -0.0116 -vn 0.4908 -0.8707 -0.0311 -vn 0.4321 -0.9011 -0.0358 -vn 0.4449 -0.8949 -0.0347 -vn 0.4082 -0.9106 -0.0650 -vn 0.4082 -0.9106 -0.0646 -vn 0.4082 -0.9106 -0.0651 -vn 0.4082 -0.9106 -0.0654 -vn 0.4104 -0.9085 -0.0790 -vn 0.4085 -0.9099 -0.0724 -vn 0.4089 -0.9096 -0.0738 -vn 0.4109 -0.9081 -0.0809 -vn 0.3987 -0.9161 -0.0426 -vn 0.3970 -0.9168 -0.0424 -vn 0.3965 -0.9170 -0.0421 -vn 0.3968 -0.9169 -0.0420 -vn 0.4066 -0.9126 -0.0419 -vn 0.4041 -0.9138 -0.0411 -vn 0.3974 -0.9167 -0.0418 -vn 0.3798 -0.9240 -0.0449 -vn 0.3292 -0.9428 -0.0529 -vn 0.3303 -0.9424 -0.0528 -vn 0.3251 -0.9441 -0.0539 -vn 0.3252 -0.9441 -0.0541 -vn 0.3262 -0.9438 -0.0541 -vn 0.8940 0.4375 0.0971 -vn 0.1176 -0.9675 -0.2239 -vn 0.0035 0.9717 0.2362 -vn 0.0036 0.9712 0.2383 -vn 0.0035 0.9716 0.2368 -vn -0.0511 0.9665 0.2516 -vn -0.0511 0.9665 0.2515 -vn -0.0510 0.9665 0.2515 -vn -0.0509 0.9666 0.2513 -vn -0.0509 0.9665 0.2514 -vn 0.0116 0.9735 0.2283 -vn 0.1740 -0.9551 -0.2400 -vn 0.1741 -0.9559 -0.2365 -vn 0.1742 -0.9567 -0.2330 -vn 0.6948 0.7032 0.1512 -vn 0.6950 0.7010 0.1601 -vn 0.6945 0.7014 0.1600 -vn 0.7656 0.6266 0.1455 -vn 0.5874 0.7887 0.1813 -vn 0.2947 0.9291 0.2232 -vn 0.2951 0.9307 0.2163 -vn 0.2951 0.9306 0.2164 -vn 0.0616 0.9718 0.2274 -vn 1.0000 0.0098 -0.0009 -vn 0.9999 0.0105 -0.0036 -vn 1.0000 0.0093 0.0015 -vn 0.9909 -0.1299 -0.0350 -vn 0.9781 -0.2011 -0.0531 -vn 0.9116 -0.3990 -0.0990 -vn 0.8290 -0.5438 -0.1309 -vn 0.7878 -0.5985 -0.1451 -vn 0.6241 -0.7599 -0.1819 -vn 0.4750 -0.8564 -0.2021 -vn 0.4180 -0.8839 -0.2097 -vn 0.0185 -0.9734 -0.2282 -vn -0.0243 -0.9731 -0.2289 -vn 0.6951 0.7020 0.1551 -vn 0.6947 0.7032 0.1512 -vn 0.2947 0.9291 0.2233 -vn 0.1201 0.9637 0.2386 -vn 0.0036 0.9707 0.2403 -vn 0.9285 0.3669 0.0574 -vn 0.9481 0.3151 0.0422 -vn 0.9489 0.3081 0.0682 -vn 0.9742 0.2212 0.0459 -vn 0.9892 0.1463 -0.0006 -vn 0.9974 -0.0517 -0.0508 -vn 0.9903 -0.1207 -0.0694 -vn 0.9600 -0.2606 -0.1021 -vn 0.8285 -0.5348 -0.1663 -vn 0.2336 -0.9393 -0.2514 -vn -0.0759 -0.9675 -0.2412 -vn 0.4748 -0.8489 -0.2322 -vn 0.4747 -0.8490 -0.2322 -vn 0.4745 -0.8491 -0.2322 -vn 0.4744 -0.8491 -0.2322 -vn 0.7400 -0.6450 -0.1908 -vn 0.8780 -0.4542 -0.1509 -vn 0.2098 -0.9287 -0.3058 -vn 0.2292 -0.9248 -0.3037 -vn 0.2291 -0.9248 -0.3036 -vn 0.2291 -0.9248 -0.3037 -vn 0.2290 -0.9247 -0.3041 -vn 0.3309 -0.8912 -0.3103 -vn 0.3303 -0.8909 -0.3116 -vn 0.3367 -0.8885 -0.3119 -vn 0.3328 -0.8894 -0.3133 -vn 0.9931 0.0264 -0.1143 -vn 0.9927 0.0273 -0.1174 -vn 0.9931 0.0263 -0.1139 -vn 0.9956 -0.0425 -0.0835 -vn 0.9836 0.1660 -0.0707 -vn 0.9060 0.4230 0.0133 -vn 0.9063 0.4224 0.0156 -vn 0.9062 0.4225 0.0153 -vn 0.9275 0.3717 0.0409 -vn 0.6326 0.7679 0.1009 -vn 0.6951 0.7018 0.1559 -vn 0.2576 0.9399 0.2241 -vn 0.2970 0.9217 0.2495 -vn -0.0477 0.9564 0.2881 -vn 0.3364 -0.8920 -0.3021 -vn 0.4618 -0.8096 -0.3623 -vn 0.6433 -0.7265 -0.2415 -vn 0.7330 -0.6216 -0.2764 -vn 0.9029 -0.3663 -0.2250 -vn 0.9034 -0.3675 -0.2210 -vn 0.9033 -0.3673 -0.2216 -vn 0.8768 -0.4484 -0.1735 -vn 0.9532 -0.2368 -0.1878 -vn -0.0632 0.9529 0.2966 -vn -0.0637 0.9529 0.2964 -vn -0.0636 0.9529 0.2964 -vn -0.0639 0.9529 0.2964 -vn 0.2607 0.9327 0.2491 -vn 0.2606 0.9327 0.2491 -vn 0.2606 0.9328 0.2491 -vn 0.6390 0.7549 0.1475 -vn 0.6389 0.7550 0.1474 -vn 0.6390 0.7550 0.1474 -vn 0.9927 0.0272 -0.1172 -vn 0.9941 0.0237 -0.1062 -vn 0.6375 -0.7114 -0.2957 -vn 0.6791 -0.6460 -0.3486 -vn 0.5074 -0.8050 -0.3075 -vn -0.0659 0.9821 -0.1765 -vn -0.0658 0.9825 -0.1740 -vn -0.0659 0.9822 -0.1758 -vn -0.1284 0.9870 -0.0964 -vn 0.3299 -0.8822 -0.3360 -vn 0.5159 -0.8291 -0.2153 -vn 0.4577 -0.8454 -0.2753 -vn 0.4193 -0.8914 -0.1719 -vn 0.5485 -0.8022 -0.2359 -vn 0.7249 -0.6517 -0.2232 -vn 0.6939 -0.6866 -0.2169 -vn 0.9313 -0.3134 -0.1855 -vn 0.9072 -0.3807 -0.1788 -vn 0.9928 0.0557 -0.1061 -vn 0.9941 0.0233 -0.1055 -vn 0.9039 0.4276 -0.0107 -vn 0.9036 0.4283 -0.0107 -vn 0.9027 0.4300 -0.0107 -vn 0.9024 0.4308 -0.0107 -vn 0.6608 0.7449 0.0922 -vn 0.6297 0.7714 0.0914 -vn 0.3196 0.9309 0.1769 -vn 0.2493 0.9528 0.1736 -vn -0.0436 0.9722 0.2300 -vn -0.0727 0.9710 0.2277 -vn 0.4385 -0.8981 0.0347 -vn 0.4389 -0.8979 0.0346 -vn 0.4397 -0.8975 0.0343 -vn 0.4400 -0.8973 0.0342 -vn 0.7436 -0.6686 0.0062 -vn 0.7435 -0.6687 0.0063 -vn 0.7433 -0.6690 0.0063 -vn 0.7432 -0.6690 0.0064 -vn 0.9452 -0.3255 -0.0239 -vn 0.9451 -0.3260 -0.0238 -vn 0.9451 -0.3259 -0.0238 -vn 0.9451 -0.3261 -0.0238 -vn 0.9974 0.0516 -0.0493 -vn 0.9975 0.0515 -0.0493 -vn 0.8994 0.4317 -0.0682 -vn 0.8993 0.4320 -0.0683 -vn 0.6482 0.7576 -0.0769 -vn 0.6480 0.7578 -0.0769 -vn 0.6476 0.7581 -0.0771 -vn 0.6475 0.7582 -0.0771 -vn 0.3005 0.9510 -0.0731 -vn 0.3003 0.9510 -0.0732 -vn 0.2999 0.9511 -0.0733 -vn 0.2997 0.9512 -0.0734 -vn -0.2133 0.9756 -0.0512 -vn -0.0532 0.9984 0.0197 -vn 0.9002 0.4262 -0.0900 -vn 0.9010 0.4244 -0.0898 -vn 0.9005 0.4254 -0.0898 -vn 0.4275 -0.8917 0.1485 -vn 0.4364 -0.8875 0.1479 -vn 0.4393 -0.8862 0.1475 -vn 0.4435 -0.8841 0.1471 -vn 0.7447 -0.6596 0.1021 -vn 0.7460 -0.6580 0.1024 -vn 0.7474 -0.6565 0.1019 -vn -0.0658 0.9830 -0.1715 -vn 0.0221 0.9847 -0.1727 -vn 0.0221 0.9848 -0.1726 -vn 0.0218 0.9848 -0.1725 -vn 0.3011 0.9384 -0.1694 -vn 0.3017 0.9383 -0.1693 -vn 0.3017 0.9382 -0.1693 -vn 0.3021 0.9381 -0.1693 -vn 0.6492 0.7472 -0.1419 -vn 0.6500 0.7466 -0.1418 -vn 0.6506 0.7461 -0.1417 -vn 0.9981 0.0559 -0.0268 -vn 0.9982 0.0540 -0.0266 -vn 0.9983 0.0529 -0.0262 -vn 0.9983 0.0516 -0.0263 -vn 0.9485 -0.3144 0.0388 -vn 0.9477 -0.3166 0.0389 -vn 0.9472 -0.3181 0.0395 -vn -0.1843 0.9687 -0.1662 -vn -0.1257 0.9776 -0.1685 -vn 0.0217 0.9848 -0.1724 -vn 0.0213 0.9848 -0.1724 -vn 0.3022 0.9381 -0.1692 -vn 0.1491 0.9732 -0.1748 -vn 0.3366 0.9266 -0.1678 -vn 0.6511 0.7456 -0.1417 -vn 0.8994 0.4277 -0.0902 -vn 0.9983 0.0519 -0.0267 -vn 0.9009 0.4247 -0.0901 -vn 0.6869 0.7138 -0.1368 -vn 0.5221 0.8381 -0.1580 -vn 0.9800 -0.1982 0.0174 -vn 0.9467 -0.3197 0.0385 -vn 0.9467 -0.3197 0.0392 -vn 0.7493 -0.6544 0.1017 -vn 0.4231 -0.8938 0.1488 -vn 0.4304 -0.8904 0.1481 -vn 0.6873 -0.7175 0.1132 -vn 0.7447 -0.6597 0.1014 -vn 0.8224 -0.5627 0.0838 -vn 0.9230 -0.3815 0.0504 -vn 0.9984 0.0550 -0.0109 -vn 0.4233 -0.8761 0.2310 -vn -0.1263 0.9130 -0.3880 -vn 0.1041 -0.0664 -0.9923 -vn 0.0963 -0.0631 -0.9934 -vn 0.1000 -0.0603 -0.9932 -vn -0.8752 -0.3835 -0.2949 -vn -0.7863 -0.4864 -0.3810 -vn -0.8441 -0.2801 -0.4571 -vn -0.7557 -0.6338 -0.1649 -vn -0.7559 -0.6339 -0.1636 -vn -0.7547 -0.6331 -0.1722 -vn -0.8155 -0.5176 -0.2588 -vn -0.6644 -0.2995 -0.6847 -vn -0.6733 -0.2304 -0.7026 -vn -0.6672 -0.4309 -0.6076 -vn -0.4080 -0.0845 -0.9091 -vn -0.4483 -0.3472 -0.8237 -vn -0.5188 -0.3812 -0.7652 -vn 0.0683 -0.1013 -0.9925 -vn -0.2138 0.0394 -0.9761 -vn -0.0621 -0.1264 -0.9900 -vn -0.3200 -0.3463 -0.8818 -vn 0.0638 -0.0802 -0.9947 -vn 0.0637 -0.0802 -0.9947 -vn 0.0637 -0.0801 -0.9947 -vn 0.0788 -0.0893 -0.9929 -vn 0.0785 -0.0805 -0.9937 -vn 0.0807 -0.0856 -0.9931 -vn 0.0798 -0.0751 -0.9940 -vn 0.0877 -0.0799 -0.9929 -vn 0.1005 -0.0817 -0.9916 -vn 0.0871 -0.0681 -0.9939 -vn 0.0888 -0.0774 -0.9930 -vn 0.0926 -0.0446 -0.9947 -vn 0.1041 -0.0566 -0.9930 -vn 0.1064 -0.0655 -0.9922 -vn 0.1134 -0.0379 -0.9928 -vn 0.1112 -0.0398 -0.9930 -vn 0.1048 -0.0380 -0.9938 -vn 0.1045 -0.0418 -0.9936 -vn 0.1085 -0.0427 -0.9932 -vn 0.1123 -0.0581 -0.9920 -vn 0.1123 -0.0305 -0.9932 -vn 0.1128 -0.0204 -0.9934 -vn 0.1125 -0.0187 -0.9935 -vn 0.1028 -0.0110 -0.9946 -vn 0.0940 -0.0129 -0.9955 -vn 0.0988 -0.0121 -0.9950 -vn 0.1090 -0.0088 -0.9940 -vn -0.1068 0.1533 -0.9824 -vn 0.1141 0.0771 -0.9905 -vn 0.1099 -0.0084 -0.9939 -vn -0.2223 0.5121 -0.8297 -vn 0.0975 0.3696 -0.9241 -vn 0.1022 0.2467 -0.9637 -vn 0.1437 0.9203 -0.3639 -vn 0.5994 -0.7113 0.3672 -vn 0.2356 -0.0799 0.9686 -vn 0.1689 -0.2235 0.9600 -vn 0.2059 -0.2319 0.9507 -vn 0.2385 -0.3908 0.8890 -vn 0.1795 -0.3865 0.9046 -vn 0.3232 -0.5439 0.7744 -vn 0.0872 -0.5545 0.8276 -vn 0.4684 -0.6547 0.5933 -vn 0.3982 -0.6761 0.6200 -vn 0.1876 -0.9295 0.3176 -vn 0.1633 -0.0266 0.9862 -vn 0.1961 -0.0186 0.9804 -vn 0.1584 -0.0463 0.9863 -vn 0.1933 -0.0261 0.9808 -vn 0.1991 -0.0560 0.9784 -vn 0.1963 -0.0545 0.9790 -vn 0.1973 -0.0550 0.9788 -vn 0.2001 -0.0565 0.9782 -vn 0.1762 -0.0692 0.9819 -vn 0.1962 -0.0852 0.9769 -vn 0.1641 -0.0849 0.9828 -vn 0.1960 -0.1286 0.9721 -vn 0.1468 -0.1223 0.9816 -vn 0.1443 -0.1210 0.9821 -vn 0.1530 -0.1254 0.9802 -vn 0.1593 -0.1163 0.9804 -vn 0.1560 -0.0942 0.9833 -vn 0.1554 -0.1266 0.9797 -vn 0.1380 -0.1384 0.9807 -vn 0.1459 -0.1516 0.9776 -vn 0.1196 -0.1505 0.9814 -vn 0.1284 -0.1698 0.9771 -vn 0.1741 -0.1828 0.9676 -vn 0.1702 0.1242 0.9775 -vn 0.2816 -0.2280 0.9321 -vn 0.3557 0.1251 0.9262 -vn 0.4094 -0.1140 0.9052 -vn 0.5225 0.1325 0.8423 -vn 0.5414 0.0266 0.8404 -vn 0.6814 0.0932 0.7260 -vn 0.6746 0.1587 0.7209 -vn 0.8087 0.0641 0.5847 -vn 0.7902 0.2685 0.5509 -vn 0.9428 -0.0513 0.3292 -vn 0.9488 0.0852 0.3043 -vn 0.6809 0.6867 -0.2545 -vn 0.5145 0.8016 -0.3044 -vn 0.3916 0.7107 -0.5844 -vn 0.3945 0.7107 -0.5825 -vn 0.3906 0.7107 -0.5851 -vn 0.3768 0.8704 -0.3171 -vn 0.3293 0.8798 -0.3428 -vn 0.9602 0.1600 -0.2287 -vn 0.9604 0.1601 -0.2279 -vn 0.9602 0.1600 -0.2288 -vn 0.9552 0.2231 -0.1944 -vn 0.9555 0.2229 -0.1934 -vn 0.9554 0.2230 -0.1935 -vn 0.9552 0.2231 -0.1945 -vn 0.9488 0.2788 -0.1486 -vn 0.9491 0.2782 -0.1475 -vn 0.9490 0.2783 -0.1479 -vn 0.9487 0.2790 -0.1489 -vn 0.9447 0.3173 -0.0825 -vn 0.8980 0.4111 -0.1568 -vn 0.6593 0.3342 -0.6735 -vn 0.4157 0.5350 -0.7355 -vn 0.3954 0.7107 -0.5819 -vn 0.9899 -0.0152 -0.1407 -vn 0.9634 0.0832 -0.2547 -vn 0.9605 0.1601 -0.2278 -vn 0.9632 0.0391 -0.2660 -vn 0.9549 -0.1302 -0.2670 -vn 0.9546 -0.1302 -0.2680 -vn 0.9546 -0.1303 -0.2677 -vn 0.9549 -0.1301 -0.2668 -vn 0.9283 -0.2580 -0.2677 -vn 0.9282 -0.2581 -0.2681 -vn 0.9283 -0.2580 -0.2676 -vn 0.8967 -0.3523 -0.2680 -vn 0.8968 -0.3523 -0.2678 -vn 0.8557 -0.4427 -0.2680 -vn 0.8557 -0.4426 -0.2680 -vn 0.8056 -0.5284 -0.2679 -vn 0.8056 -0.5283 -0.2681 -vn 0.7470 -0.6084 -0.2679 -vn 0.7471 -0.6084 -0.2679 -vn 0.7469 -0.6084 -0.2681 -vn 0.7469 -0.6084 -0.2682 -vn 0.6805 -0.6820 -0.2678 -vn 0.6806 -0.6820 -0.2677 -vn 0.6804 -0.6820 -0.2682 -vn 0.6804 -0.6820 -0.2683 -vn 0.5995 -0.7541 -0.2680 -vn 0.5998 -0.7542 -0.2674 -vn 0.5997 -0.7542 -0.2676 -vn 0.3737 -0.8977 -0.2335 -vn 0.4437 -0.8580 -0.2590 -vn 0.5017 -0.8443 -0.1884 -vn 0.5213 -0.8103 -0.2677 -vn 0.5994 -0.7541 -0.2683 -vn 0.3750 -0.9205 -0.1101 -vn 0.3410 -0.9129 -0.2244 -vn 0.2746 -0.9470 -0.1667 -vn 0.2838 -0.9498 -0.1316 -vn 0.2478 -0.9592 -0.1361 -vn 0.7230 0.6551 -0.2191 -vn 0.7352 0.5456 -0.4022 -vn 0.7328 0.5467 -0.4051 -vn 0.7335 0.5464 -0.4043 -vn 0.7358 0.5454 -0.4015 -vn 0.7519 0.4169 -0.5108 -vn 0.7508 0.4168 -0.5124 -vn 0.7510 0.4168 -0.5121 -vn 0.7520 0.4169 -0.5105 -vn 0.7615 0.2987 -0.5753 -vn 0.7606 0.2984 -0.5766 -vn 0.7607 0.2984 -0.5764 -vn 0.7617 0.2987 -0.5750 -vn 0.7651 0.0979 -0.6364 -vn 0.7628 0.0974 -0.6392 -vn 0.7635 0.0975 -0.6384 -vn 0.7658 0.0981 -0.6356 -vn 0.7601 -0.1039 -0.6415 -vn 0.7597 -0.1039 -0.6419 -vn 0.7599 -0.1039 -0.6417 -vn 0.7604 -0.1038 -0.6411 -vn 0.7383 -0.2054 -0.6424 -vn 0.7385 -0.2054 -0.6422 -vn 0.7386 -0.2054 -0.6421 -vn 0.7133 -0.2803 -0.6423 -vn 0.7134 -0.2803 -0.6423 -vn 0.7134 -0.2803 -0.6422 -vn 0.6807 -0.3522 -0.6423 -vn 0.6807 -0.3522 -0.6424 -vn 0.6409 -0.4203 -0.6424 -vn 0.6409 -0.4203 -0.6423 -vn 0.6408 -0.4203 -0.6424 -vn 0.5943 -0.4839 -0.6424 -vn 0.5943 -0.4840 -0.6423 -vn 0.5942 -0.4839 -0.6425 -vn 0.5412 -0.5423 -0.6426 -vn 0.5415 -0.5425 -0.6422 -vn 0.5415 -0.5424 -0.6423 -vn 0.4770 -0.5997 -0.6425 -vn 0.4773 -0.5999 -0.6420 -vn 0.4771 -0.5998 -0.6423 -vn 0.4769 -0.5997 -0.6426 -vn 0.3375 -0.6883 -0.6421 -vn 0.3413 -0.6903 -0.6379 -vn 0.3401 -0.6897 -0.6392 -vn 0.3363 -0.6876 -0.6434 -vn 0.1012 -0.8203 -0.5628 -vn 0.1043 -0.8214 -0.5608 -vn 0.1033 -0.8211 -0.5614 -vn 0.1003 -0.8200 -0.5636 -vn -0.0758 -0.9052 -0.4182 -vn -0.0717 -0.9061 -0.4169 -vn -0.0729 -0.9059 -0.4173 -vn -0.0769 -0.9050 -0.4184 -vn -0.5384 -0.7696 -0.3432 -vn -0.3856 -0.6980 -0.6035 -vn -0.3896 -0.6954 -0.6039 -vn -0.3885 -0.6961 -0.6037 -vn -0.3844 -0.6987 -0.6034 -vn -0.1488 -0.5861 -0.7965 -vn -0.1518 -0.5839 -0.7975 -vn -0.1509 -0.5845 -0.7972 -vn -0.1479 -0.5868 -0.7961 -vn 0.1400 -0.4266 -0.8936 -vn 0.1367 -0.4239 -0.8954 -vn 0.1378 -0.4247 -0.8948 -vn 0.1411 -0.4274 -0.8930 -vn 0.2706 -0.3401 -0.9006 -vn 0.2705 -0.3401 -0.9006 -vn 0.2707 -0.3402 -0.9006 -vn 0.3069 -0.3074 -0.9007 -vn 0.3070 -0.3074 -0.9007 -vn 0.3369 -0.2743 -0.9007 -vn 0.3368 -0.2743 -0.9007 -vn 0.3370 -0.2744 -0.9006 -vn 0.3634 -0.2383 -0.9007 -vn 0.3633 -0.2383 -0.9007 -vn 0.3634 -0.2383 -0.9006 -vn 0.3860 -0.1997 -0.9006 -vn 0.4045 -0.1590 -0.9006 -vn 0.4044 -0.1590 -0.9006 -vn 0.4044 -0.1590 -0.9007 -vn 0.4187 -0.1165 -0.9006 -vn 0.4316 -0.0590 -0.9001 -vn 0.4313 -0.0591 -0.9003 -vn 0.4347 0.1371 -0.8901 -vn 0.4372 0.1377 -0.8887 -vn 0.4365 0.1375 -0.8892 -vn 0.4339 0.1369 -0.8905 -vn 0.4223 0.4595 -0.7814 -vn 0.1012 0.4828 -0.8698 -vn 0.0128 0.7520 -0.6590 -vn -0.0143 0.7446 -0.6674 -vn 0.0481 0.9312 -0.3614 -vn 0.0179 0.9281 -0.3718 -vn 0.8741 -0.3226 0.3631 -vn 0.8732 -0.3236 0.3644 -vn 0.8735 -0.3232 0.3640 -vn 0.7819 -0.6001 0.1686 -vn 0.8744 -0.3223 0.3626 -vn 0.8656 -0.2217 0.4491 -vn 0.8653 -0.2218 0.4495 -vn 0.8654 -0.2218 0.4494 -vn 0.8657 -0.2216 0.4488 -vn 0.8605 -0.1584 0.4842 -vn 0.8604 -0.1584 0.4844 -vn 0.8604 -0.1583 0.4844 -vn 0.8607 -0.1583 0.4839 -vn 0.8586 -0.1062 0.5015 -vn 0.8583 -0.1061 0.5020 -vn 0.8585 -0.1062 0.5017 -vn 0.8586 -0.1062 0.5016 -vn 0.8585 -0.0602 0.5092 -vn 0.8585 -0.0602 0.5093 -vn 0.8586 -0.0603 0.5091 -vn 0.8587 -0.0604 0.5090 -vn 0.8537 -0.1160 0.5078 -vn 0.8539 -0.1161 0.5073 -vn 0.8537 -0.1160 0.5076 -vn 0.8535 -0.1159 0.5081 -vn 0.8297 -0.2304 0.5085 -vn 0.8297 -0.2305 0.5084 -vn 0.8295 -0.2303 0.5087 -vn 0.8295 -0.2303 0.5088 -vn 0.8015 -0.3147 0.5085 -vn 0.8014 -0.3147 0.5086 -vn 0.8014 -0.3147 0.5087 -vn 0.7648 -0.3956 0.5086 -vn 0.7199 -0.4722 0.5086 -vn 0.7200 -0.4723 0.5085 -vn 0.6675 -0.5438 0.5086 -vn 0.6675 -0.5438 0.5087 -vn 0.6676 -0.5439 0.5084 -vn 0.6676 -0.5440 0.5084 -vn 0.6080 -0.6098 0.5083 -vn 0.6080 -0.6096 0.5087 -vn 0.6081 -0.6099 0.5083 -vn 0.6081 -0.6099 0.5082 -vn 0.5357 -0.6742 0.5084 -vn 0.5357 -0.6743 0.5082 -vn 0.5358 -0.6745 0.5079 -vn 0.4927 -0.7058 0.5090 -vn 0.4927 -0.7058 0.5089 -vn 0.4927 -0.7057 0.5091 -vn 0.4927 -0.7056 0.5092 -vn 0.5291 -0.6830 0.5036 -vn 0.5291 -0.6830 0.5035 -vn 0.5292 -0.6828 0.5038 -vn 0.5292 -0.6827 0.5038 -vn 0.5736 -0.6579 0.4880 -vn 0.5735 -0.6580 0.4879 -vn 0.5736 -0.6578 0.4881 -vn 0.5737 -0.6577 0.4882 -vn 0.6274 -0.6304 0.4571 -vn 0.6273 -0.6305 0.4571 -vn 0.6275 -0.6301 0.4573 -vn 0.6276 -0.6300 0.4574 -vn 0.6864 -0.6022 0.4077 -vn 0.6859 -0.6029 0.4075 -vn 0.6860 -0.6027 0.4076 -vn 0.6865 -0.6021 0.4078 -vn 0.7463 -0.5743 0.3365 -vn 0.7458 -0.5750 0.3364 -vn 0.7459 -0.5748 0.3364 -vn 0.7466 -0.5739 0.3365 -vn 0.8160 -0.5397 0.2071 -vn 0.8754 -0.4232 0.2336 -vn 0.6139 -0.7248 0.3126 -vn 0.5966 -0.5788 0.5559 -vn 0.5958 -0.5792 0.5564 -vn 0.5960 -0.5791 0.5562 -vn 0.5969 -0.5787 0.5557 -vn 0.5823 -0.4179 0.6973 -vn 0.5822 -0.4179 0.6974 -vn 0.5826 -0.4179 0.6971 -vn 0.5827 -0.4179 0.6970 -vn 0.5728 -0.2993 0.7631 -vn 0.5727 -0.2993 0.7632 -vn 0.5731 -0.2993 0.7629 -vn 0.5732 -0.2993 0.7628 -vn 0.5681 -0.1869 0.8014 -vn 0.5680 -0.1869 0.8015 -vn 0.5682 -0.1870 0.8013 -vn 0.5683 -0.1870 0.8013 -vn 0.5683 -0.0766 0.8193 -vn 0.5681 -0.0766 0.8194 -vn 0.5682 -0.0766 0.8193 -vn 0.5686 -0.0770 0.8190 -vn 0.5684 -0.0771 0.8191 -vn 0.5520 -0.1533 0.8196 -vn 0.5520 -0.1532 0.8196 -vn 0.5333 -0.2094 0.8196 -vn 0.5090 -0.2632 0.8195 -vn 0.5090 -0.2632 0.8196 -vn 0.4791 -0.3143 0.8196 -vn 0.4791 -0.3143 0.8195 -vn 0.4442 -0.3620 0.8196 -vn 0.4442 -0.3619 0.8196 -vn 0.4443 -0.3620 0.8195 -vn 0.4046 -0.4058 0.8195 -vn 0.4046 -0.4058 0.8196 -vn 0.4046 -0.4059 0.8195 -vn 0.3565 -0.4488 0.8195 -vn 0.3565 -0.4487 0.8195 -vn 0.3565 -0.4488 0.8194 -vn 0.3456 -0.4562 0.8200 -vn 0.3458 -0.4564 0.8198 -vn 0.3457 -0.4560 0.8201 -vn 0.4368 -0.3992 0.8061 -vn 0.4368 -0.3993 0.8061 -vn 0.4368 -0.3991 0.8062 -vn 0.4368 -0.3990 0.8062 -vn 0.5354 -0.3441 0.7714 -vn 0.5354 -0.3442 0.7713 -vn 0.5354 -0.3439 0.7714 -vn 0.5354 -0.3438 0.7715 -vn 0.6390 -0.2911 0.7120 -vn 0.6390 -0.2913 0.7119 -vn 0.6391 -0.2907 0.7121 -vn 0.7394 -0.2439 0.6276 -vn 0.7393 -0.2441 0.6275 -vn 0.7393 -0.2439 0.6276 -vn 0.7395 -0.2434 0.6276 -vn 0.8325 -0.2008 0.5164 -vn 0.8324 -0.2010 0.5164 -vn 0.8324 -0.2009 0.5164 -vn 0.8326 -0.2003 0.5164 -vn 0.9402 -0.1458 0.3077 -vn 0.9213 -0.2328 0.3114 -vn 0.6813 -0.6768 0.2788 -vn 0.8173 -0.5303 0.2255 -vn 0.8853 -0.4192 0.2010 -vn 0.9195 -0.3580 0.1620 -vn 0.9785 -0.1830 0.0954 -vn -0.5848 -0.7412 -0.3297 -vn -0.4161 -0.8541 -0.3120 -vn -0.1746 -0.9543 -0.2426 -vn -0.2367 -0.9425 -0.2360 -vn 0.2412 -0.9625 -0.1240 -vn 0.1085 -0.9874 -0.1149 -vn 0.4711 -0.8820 -0.0078 -vn 0.9964 -0.0572 0.0619 -vn 0.9927 -0.0240 0.1180 -vn 0.9926 -0.0244 0.1187 -vn 0.9927 -0.0242 0.1185 -vn 0.9928 -0.0238 0.1177 -vn 0.9903 0.0012 0.1389 -vn 0.9903 0.0013 0.1388 -vn 0.9903 0.0015 0.1389 -vn 0.9903 0.0015 0.1390 -vn 0.9909 -0.0122 0.1342 -vn 0.9909 -0.0123 0.1342 -vn 0.9909 -0.0122 0.1343 -vn 0.9909 -0.0122 0.1344 -vn 0.9908 -0.0353 0.1306 -vn 0.9908 -0.0354 0.1304 -vn 0.9908 -0.0353 0.1305 -vn 0.9908 -0.0352 0.1309 -vn 0.9824 -0.1336 0.1304 -vn 0.9825 -0.1338 0.1294 -vn 0.9825 -0.1338 0.1297 -vn 0.9824 -0.1336 0.1308 -vn 0.9553 -0.2653 0.1308 -vn 0.9553 -0.2655 0.1302 -vn 0.9553 -0.2655 0.1303 -vn 0.9553 -0.2654 0.1307 -vn 0.9228 -0.3624 0.1306 -vn 0.9229 -0.3625 0.1302 -vn 0.9228 -0.3624 0.1304 -vn 0.9228 -0.3624 0.1305 -vn 0.8806 -0.4555 0.1303 -vn 0.8806 -0.4555 0.1304 -vn 0.8291 -0.5437 0.1304 -vn 0.8290 -0.5438 0.1302 -vn 0.8290 -0.5438 0.1301 -vn 0.7687 -0.6261 0.1303 -vn 0.7687 -0.6261 0.1304 -vn 0.7687 -0.6263 0.1301 -vn 0.7687 -0.6263 0.1300 -vn 0.7002 -0.7019 0.1304 -vn 0.7002 -0.7019 0.1305 -vn 0.7002 -0.7020 0.1301 -vn 0.7002 -0.7020 0.1300 -vn 0.6169 -0.7762 0.1301 -vn 0.6170 -0.7761 0.1308 -vn 0.6169 -0.7761 0.1304 -vn 0.6168 -0.7764 0.1295 -vn 0.5509 -0.8244 0.1298 -vn 0.5511 -0.8242 0.1305 -vn 0.5510 -0.8242 0.1303 -vn 0.5508 -0.8245 0.1296 -vn 0.5289 -0.8382 0.1330 -vn 0.5290 -0.8381 0.1331 -vn 0.5289 -0.8382 0.1329 -vn 0.5288 -0.8383 0.1328 -vn 0.5148 -0.8462 0.1379 -vn 0.5147 -0.8462 0.1378 -vn 0.5124 -0.8474 0.1392 -vn 0.5123 -0.8474 0.1392 -vn 0.5221 -0.8427 0.1311 -vn 0.5221 -0.8428 0.1311 -vn 0.5403 -0.8344 0.1093 -vn 0.5401 -0.8345 0.1093 -vn 0.5405 -0.8342 0.1094 -vn 0.5406 -0.8341 0.1094 -vn 0.5653 -0.8224 0.0643 -vn 0.6636 -0.7413 0.1003 -vn 0.9839 0.0981 0.1493 -vn 0.9852 0.0858 0.1486 -vn 0.9843 0.0943 0.1489 -vn -0.9007 -0.4001 -0.1692 -vn -0.9090 -0.3813 -0.1682 -vn -0.9090 -0.3812 -0.1685 -vn -0.9119 -0.3744 -0.1683 -vn -0.8312 -0.5285 -0.1728 -vn -0.8314 -0.5281 -0.1729 -vn -0.8314 -0.5282 -0.1728 -vn -0.7546 -0.6330 -0.1729 -vn -0.6457 -0.7445 -0.1697 -vn -0.6458 -0.7445 -0.1695 -vn -0.3009 -0.9431 -0.1413 -vn -0.3005 -0.9432 -0.1420 -vn -0.3006 -0.9432 -0.1416 -vn -0.4458 -0.8815 -0.1555 -vn -0.6176 -0.7684 -0.1678 -vn 0.7640 -0.6440 0.0408 -vn 0.7644 -0.6436 0.0396 -vn 0.7643 -0.6436 0.0403 -vn 0.6783 -0.7346 0.0186 -vn 0.4735 -0.8804 -0.0253 -vn 0.4739 -0.8802 -0.0255 -vn 0.1040 -0.9906 -0.0891 -vn 0.1045 -0.9905 -0.0893 -vn -0.2533 -0.9577 -0.1363 -vn 0.9833 0.1035 0.1496 -vn 0.9700 -0.2148 0.1143 -vn 0.9500 -0.2945 0.1038 -vn 0.9503 -0.2940 0.1024 -vn 0.9502 -0.2941 0.1032 -vn 0.9078 -0.4108 0.0849 -vn 0.8051 -0.5909 0.0516 -vn 0.9855 0.0823 0.1484 -vn 0.9849 0.0881 0.1488 -vn 0.9500 -0.2945 0.1039 -vn 0.7639 -0.6440 0.0409 -vn 0.4732 -0.8806 -0.0250 -vn 0.1038 -0.9906 -0.0889 -vn 0.1041 -0.9906 -0.0889 -vn -0.6462 -0.7442 -0.1694 -vn -0.6461 -0.7442 -0.1694 -vn -0.8314 -0.5280 -0.1731 -vn -0.9140 -0.3693 -0.1682 -vn -0.9104 -0.3777 -0.1686 -vn 0.9854 0.0820 0.1494 -vn -0.8185 -0.4749 0.3232 -vn -0.8227 -0.4756 0.3114 -vn -0.8191 -0.4751 0.3214 -vn -0.8645 -0.4266 0.2658 -vn -0.9240 -0.3786 -0.0537 -vn -0.8821 -0.4658 -0.0702 -vn 0.9976 0.0071 0.0689 -vn 0.9949 0.0928 -0.0389 -vn 0.9950 -0.0971 0.0220 -vn 0.9567 -0.2909 0.0082 -vn 0.9574 -0.2888 0.0079 -vn 0.9587 -0.2843 0.0072 -vn 0.9594 -0.2821 0.0069 -vn 0.7674 -0.6408 -0.0221 -vn 0.7685 -0.6394 -0.0223 -vn 0.7708 -0.6367 -0.0228 -vn 0.7719 -0.6353 -0.0231 -vn 0.4711 -0.8808 -0.0479 -vn 0.4725 -0.8800 -0.0482 -vn 0.4753 -0.8785 -0.0487 -vn 0.4768 -0.8777 -0.0489 -vn 0.0945 -0.9933 -0.0670 -vn 0.0959 -0.9931 -0.0673 -vn 0.0990 -0.9928 -0.0680 -vn 0.1005 -0.9926 -0.0683 -vn -0.3150 -0.9460 -0.0761 -vn -0.3139 -0.9464 -0.0764 -vn -0.3112 -0.9472 -0.0771 -vn -0.3101 -0.9475 -0.0774 -vn -0.6599 -0.7478 -0.0729 -vn -0.6593 -0.7484 -0.0732 -vn -0.6579 -0.7495 -0.0737 -vn -0.6572 -0.7501 -0.0739 -vn -0.8420 -0.5356 -0.0638 -vn 0.9650 0.1111 -0.2376 -vn 0.9652 0.1097 -0.2373 -vn 0.9657 0.1068 -0.2368 -vn 0.9659 0.1054 -0.2366 -vn 0.9322 -0.2858 -0.2222 -vn 0.9323 -0.2853 -0.2223 -vn 0.9324 -0.2848 -0.2225 -vn 0.9325 -0.2843 -0.2227 -vn 0.7504 -0.6381 -0.1726 -vn 0.7507 -0.6376 -0.1728 -vn 0.7512 -0.6369 -0.1732 -vn 0.7515 -0.6365 -0.1734 -vn 0.4645 -0.8797 -0.1018 -vn 0.4655 -0.8794 -0.0996 -vn 0.4656 -0.8794 -0.0997 -vn 0.4656 -0.8794 -0.0996 -vn 0.1018 -0.9948 -0.0084 -vn 0.1016 -0.9948 -0.0083 -vn 0.1011 -0.9948 -0.0080 -vn 0.1008 -0.9949 -0.0079 -vn -0.2947 -0.9514 0.0890 -vn -0.2953 -0.9512 0.0894 -vn -0.2965 -0.9508 0.0900 -vn -0.2971 -0.9506 0.0903 -vn -0.6316 -0.7565 0.1698 -vn -0.6321 -0.7560 0.1701 -vn -0.6331 -0.7550 0.1707 -vn -0.6336 -0.7546 0.1710 -vn -0.9106 -0.3416 0.2326 -vn -0.8693 -0.4688 0.1567 -vn -0.8231 -0.4756 0.3104 -vn 0.9276 0.2186 -0.3029 -vn 0.9356 0.2052 -0.2874 -vn 0.9344 0.1826 -0.3058 -vn 0.9352 0.1842 -0.3024 -vn 0.9341 0.1786 -0.3092 -vn 0.9337 0.1777 -0.3108 -vn -0.6232 -0.7566 0.1979 -vn -0.6557 -0.7035 0.2742 -vn -0.2874 -0.9514 0.1108 -vn 0.9329 0.1787 -0.3127 -vn 0.9548 0.1094 -0.2764 -vn 0.9239 -0.1804 -0.3375 -vn 0.9237 -0.2882 -0.2523 -vn 0.7699 -0.5849 -0.2553 -vn 0.7442 -0.6397 -0.1920 -vn 0.4840 -0.8648 -0.1337 -vn 0.4643 -0.8798 -0.1020 -vn 0.1040 -0.9946 0.0072 -vn 0.1043 -0.9945 0.0071 -vn 0.1061 -0.9944 0.0040 -vn -0.6644 -0.7051 0.2479 -vn -0.8469 -0.4438 0.2929 -vn -0.8474 -0.4424 0.2937 -vn -0.8485 -0.4390 0.2956 -vn -0.8488 -0.4379 0.2962 -vn -0.4511 -0.8724 0.1881 -vn -0.4511 -0.8724 0.1880 -vn -0.4511 -0.8724 0.1882 -vn -0.3029 -0.9340 0.1897 -vn -0.3134 -0.9364 0.1576 -vn 0.1061 -0.9944 0.0038 -vn -0.2514 -0.9593 0.1287 -vn -0.0422 -0.9971 0.0638 -vn 0.1197 -0.9912 0.0571 -vn 0.1707 -0.9853 -0.0047 -vn 0.4906 -0.8640 -0.1131 -vn 0.7816 -0.5836 -0.2203 -vn 0.7815 -0.5837 -0.2203 -vn 0.9398 -0.1784 -0.2914 -vn 0.9398 -0.1783 -0.2914 -vn 0.9469 0.0940 -0.3074 -vn 0.8573 -0.4908 -0.1550 -vn -0.8474 -0.4703 0.2464 -vn -0.7668 -0.6015 0.2239 -vn -0.8497 -0.4712 0.2366 -vn -0.8487 -0.4735 0.2355 -vn -0.8465 -0.4786 0.2331 -vn -0.8458 -0.4803 0.2323 -vn -0.7814 -0.5803 0.2297 -vn -0.8584 -0.4465 0.2526 -vn -0.8583 -0.4466 0.2526 -vn -0.8583 -0.4468 0.2523 -vn 0.9121 0.3400 -0.2292 -vn 0.9295 0.2834 -0.2359 -vn 0.9303 0.2838 -0.2322 -vn 0.9295 0.2834 -0.2358 -vn 0.9287 0.2830 -0.2395 -vn -0.8580 -0.4482 0.2509 -vn -0.8568 -0.4530 0.2466 -vn -0.6706 -0.7065 0.2263 -vn -0.7780 -0.5789 0.2443 -vn -0.4512 -0.8724 0.1879 -vn -0.5656 -0.7972 0.2113 -vn -0.5659 -0.7973 0.2101 -vn -0.2449 -0.9576 0.1515 -vn -0.0318 -0.9945 0.1003 -vn -0.1810 -0.9738 0.1380 -vn -0.1795 -0.9732 0.1441 -vn -0.1794 -0.9731 0.1442 -vn 0.1868 -0.9810 0.0520 -vn 0.2409 -0.9698 0.0370 -vn 0.5125 -0.8580 -0.0356 -vn 0.9627 -0.1725 -0.2087 -vn 0.9719 -0.0765 -0.2226 -vn 0.9664 0.0988 -0.2374 -vn 0.8708 0.4252 -0.2468 -vn 0.9422 0.2220 -0.2509 -vn -0.7248 -0.6518 0.2233 -vn -0.6856 -0.6939 0.2202 -vn -0.5662 -0.7974 0.2089 -vn -0.5245 -0.8269 0.2027 -vn -0.3255 -0.9294 0.1740 -vn -0.1779 -0.9725 0.1503 -vn -0.1134 -0.9840 0.1371 -vn 0.2471 -0.9670 0.0617 -vn 0.1154 -0.9888 0.0949 -vn 0.1178 -0.9873 0.1062 -vn 0.1178 -0.9873 0.1063 -vn 0.3198 -0.9465 0.0442 -vn 0.3175 -0.9476 0.0346 -vn 0.3196 -0.9465 0.0445 -vn 0.6070 -0.7941 -0.0317 -vn 0.5993 -0.7980 -0.0641 -vn 0.8059 -0.5770 -0.1322 -vn 0.5119 -0.8590 -0.0017 -vn 0.6661 -0.7443 -0.0495 -vn 0.8653 -0.4867 -0.1200 -vn 0.8042 -0.5871 -0.0924 -vn 0.9050 -0.4024 -0.1378 -vn 0.9674 -0.1820 -0.1761 -vn 0.9792 -0.0728 -0.1895 -vn 0.9783 0.0381 -0.2038 -vn 0.8851 0.4061 -0.2274 -vn 0.9406 0.2628 -0.2149 -vn 0.9382 0.2611 -0.2270 -vn 0.9393 0.2619 -0.2215 -vn 0.8660 0.4467 -0.2246 -vn 0.6189 -0.7855 0.0001 -vn 0.5751 -0.8181 -0.0017 -vn 0.5917 -0.8062 -0.0005 -vn 0.6179 -0.7858 -0.0280 -vn 0.5576 -0.8301 -0.0031 -vn 0.5284 -0.8490 -0.0088 -vn 0.5726 -0.8198 0.0103 -vn 0.4831 -0.8756 -0.0018 -vn 0.4798 -0.8774 -0.0022 -vn 0.4879 -0.8729 -0.0011 -vn 0.4910 -0.8712 -0.0007 -vn 0.4090 -0.9125 0.0014 -vn 0.6427 -0.7661 -0.0002 -vn 0.6544 -0.7562 -0.0008 -vn 0.6886 -0.7251 0.0009 -vn 0.7406 -0.6720 -0.0024 -vn 0.7241 -0.6897 -0.0000 -vn 0.7736 -0.6336 -0.0000 -vn 0.7902 -0.6128 -0.0010 -vn 0.7995 -0.6007 -0.0003 -vn 0.9886 -0.1505 -0.0001 -vn 0.9855 -0.1699 -0.0008 -vn 0.9851 -0.1722 -0.0007 -vn 0.9844 -0.1761 -0.0006 -vn 0.9839 -0.1784 -0.0005 -vn 0.9771 -0.2128 0.0002 -vn 0.9645 -0.2640 -0.0009 -vn 0.9592 -0.2827 0.0006 -vn 0.9318 -0.3629 -0.0003 -vn 0.9291 -0.3698 0.0002 -vn 0.8935 -0.4491 -0.0002 -vn 0.8925 -0.4510 0.0000 -vn 0.8558 -0.5173 -0.0018 -vn 0.8263 -0.5632 0.0002 -vn 0.9970 -0.0778 -0.0039 -vn 0.9966 -0.0822 -0.0049 -vn 0.9968 -0.0797 -0.0058 -vn 0.9974 -0.0719 -0.0016 -vn 0.9974 -0.0717 -0.0017 -vn 0.9967 -0.0809 -0.0071 -vn 0.9989 -0.0453 0.0120 -vn 0.9970 -0.0777 -0.0015 -vn 0.9964 -0.0843 -0.0032 -vn 0.9956 -0.0940 -0.0005 -vn 0.9926 -0.1213 0.0001 -vn 0.9926 0.1212 -0.0061 -vn 0.9964 0.0844 0.0006 -vn 0.9996 0.0293 -0.0007 -vn 0.9994 0.0335 -0.0012 -vn 0.9992 0.0388 -0.0018 -vn 0.9991 0.0434 -0.0023 -vn 0.9977 -0.0670 0.0104 -vn 0.9997 -0.0259 -0.0045 -vn 0.9974 -0.0717 -0.0016 -vn 0.9692 0.0325 -0.2443 -vn 0.8902 -0.4097 -0.1992 -vn 0.6536 -0.7499 -0.1020 -vn 0.1182 -0.0938 0.9886 -vn 0.8769 0.4539 -0.1583 -vn 0.8776 0.4178 -0.2350 -vn 0.7173 0.6082 -0.3400 -vn 0.6623 0.5033 -0.5550 -vn 0.7481 0.2394 -0.6189 -vn 0.3848 0.5375 -0.7504 -vn 0.6913 0.1740 -0.7013 -vn 0.3821 0.3155 -0.8686 -vn 0.5091 0.1772 -0.8423 -vn 0.3088 0.1423 -0.9404 -vn 0.3061 0.1448 -0.9409 -vn 0.3070 0.1440 -0.9407 -vn 0.3096 0.1416 -0.9403 -vn 0.2122 -0.0238 -0.9769 -vn 0.2307 -0.0384 -0.9723 -vn 0.0609 -0.0580 -0.9965 -vn 0.0729 -0.0670 -0.9951 -vn 0.0794 -0.0799 -0.9936 -vn 0.1021 -0.0965 -0.9901 -vn 0.0759 -0.0624 -0.9952 -vn 0.1145 -0.0870 -0.9896 -vn 0.1250 -0.1089 -0.9862 -vn 0.2023 -0.1399 -0.9693 -vn 0.0917 -0.0588 0.9941 -vn 0.0870 -0.0628 0.9942 -vn 0.0865 -0.0631 0.9942 -vn 0.0639 -0.0534 0.9965 -vn 0.0578 -0.0474 0.9972 -vn 0.0620 -0.0515 0.9967 -vn 0.0663 -0.0558 0.9962 -vn 0.0839 -0.0769 0.9935 -vn 0.0706 -0.0707 0.9950 -vn 0.0895 -0.0943 0.9915 -vn -0.1379 0.0647 0.9883 -vn 0.0426 -0.2939 0.9549 -vn -0.7033 -0.5580 0.4405 -vn -0.6717 -0.6301 0.3895 -vn 0.7026 -0.4024 0.5869 -vn 0.7026 -0.4023 0.5869 -vn 0.7028 -0.4019 0.5869 -vn 0.7924 -0.4528 0.4087 -vn 0.7951 -0.4481 0.4087 -vn 0.7950 -0.4483 0.4087 -vn 0.8707 -0.4898 -0.0446 -vn 0.8399 -0.4787 -0.2559 -vn 0.7626 -0.4396 -0.4745 -vn 0.7591 -0.4457 -0.4745 -vn 0.7555 -0.4516 -0.4746 -vn -0.4397 -0.8603 0.2580 -vn -0.4831 -0.7943 0.3684 -vn -0.6372 -0.6586 0.4003 -vn -0.5960 -0.6173 0.5134 -vn -0.4490 -0.7788 0.4381 -vn -0.3555 -0.8381 0.4138 -vn -0.3782 -0.8100 0.4482 -vn 0.0508 -0.9563 0.2881 -vn 0.0920 -0.0584 0.9940 -vn 0.1426 -0.1034 0.9844 -vn 0.3972 -0.2519 0.8825 -vn 0.3823 -0.2371 0.8931 -vn 0.5571 -0.3380 0.7586 -vn 0.3172 -0.9478 0.0334 -vn 0.1178 -0.9873 0.1065 -vn -0.0302 -0.9938 0.1072 -vn -0.0987 -0.9735 0.2061 -vn -0.3039 -0.9133 0.2712 -vn 0.6934 -0.3903 0.6057 -vn 0.6559 -0.4388 0.6141 -vn 0.6574 -0.4392 0.6123 -vn 0.6564 -0.4390 0.6136 -vn 0.3613 -0.2401 0.9010 -vn 0.3367 -0.2744 0.9007 -vn 0.3311 -0.2686 0.9046 -vn 0.3332 -0.2707 0.9032 -vn 0.3386 -0.2766 0.8993 -vn 0.3062 -0.3072 0.9010 -vn 0.3032 -0.3026 0.9036 -vn 0.3042 -0.3042 0.9027 -vn 0.3072 -0.3088 0.9002 -vn 0.2434 -0.3475 0.9055 -vn 0.2598 -0.3848 0.8857 -vn 0.0387 -0.5115 0.8584 -vn -0.2198 -0.2325 0.9474 -vn 0.5031 -0.8633 -0.0402 -vn 0.3754 -0.9262 -0.0363 -vn 0.4213 -0.9021 0.0933 -vn 0.4202 -0.9025 0.0948 -vn 0.4205 -0.9024 0.0945 -vn 0.0423 -0.9528 0.3006 -vn 0.1054 -0.9164 0.3862 -vn -0.2653 -0.7668 0.5845 -vn -0.2933 -0.7598 0.5803 -vn -0.5765 -0.4928 0.6517 -vn 0.4542 -0.8784 0.1484 -vn 0.4555 -0.8782 0.1460 -vn 0.4551 -0.8783 0.1465 -vn -0.2999 -0.3001 0.9055 -vn -0.1087 -0.5879 0.8016 -vn -0.0856 -0.6076 0.7896 -vn 0.0814 -0.5217 0.8492 -vn 0.3506 -0.7300 0.5867 -vn 0.4962 -0.6112 0.6166 -vn 0.4984 -0.6179 0.6081 -vn 0.4977 -0.6159 0.6106 -vn 0.4956 -0.6093 0.6190 -vn 0.5582 -0.5558 0.6160 -vn 0.5601 -0.5595 0.6109 -vn 0.5595 -0.5583 0.6126 -vn 0.5576 -0.5546 0.6177 -vn 0.6125 -0.4950 0.6163 -vn 0.6164 -0.4999 0.6084 -vn 0.6150 -0.4981 0.6113 -vn 0.6110 -0.4932 0.6192 -vn 0.6579 -0.4392 0.6118 -vn 0.8098 -0.5414 0.2262 -vn 0.8097 -0.5414 0.2265 -vn 0.8098 -0.5413 0.2261 -vn 0.8536 -0.4713 0.2220 -vn 0.8548 -0.4785 0.2012 -vn 0.7909 -0.5937 -0.1481 -vn 0.6966 -0.6998 -0.1581 -vn 0.7063 -0.6987 -0.1139 -vn 0.7083 -0.6960 -0.1181 -vn 0.7078 -0.6966 -0.1171 -vn 0.4214 -0.9021 0.0930 -vn 0.4539 -0.8785 0.1491 -vn 0.0626 -0.8676 0.4933 -vn 0.1769 -0.8624 0.4744 -vn -0.1509 -0.6999 0.6981 -vn 0.6529 -0.7400 -0.1618 -vn 0.6624 -0.7294 -0.1711 -vn 0.6794 -0.7174 -0.1542 -vn 0.8654 -0.4711 -0.1710 -vn 0.8183 -0.5469 -0.1769 -vn 0.8183 -0.5474 -0.1753 -vn 0.8183 -0.5471 -0.1764 -vn 0.8099 -0.5413 0.2257 -vn 0.7580 -0.6119 0.2259 -vn 0.7577 -0.6111 0.2290 -vn 0.7578 -0.6114 0.2278 -vn 0.7581 -0.6121 0.2247 -vn 0.6904 -0.6868 0.2272 -vn 0.6903 -0.6864 0.2287 -vn 0.6904 -0.6866 0.2281 -vn 0.6904 -0.6870 0.2267 -vn 0.6313 -0.7395 0.2336 -vn 0.6313 -0.7409 0.2291 -vn 0.6313 -0.7405 0.2305 -vn 0.6313 -0.7391 0.2350 -vn 0.9585 -0.1870 -0.2150 -vn 0.9074 -0.3361 -0.2522 -vn 0.8867 -0.3367 -0.3170 -vn 0.7060 -0.6992 -0.1131 -vn 0.6890 -0.7097 -0.1471 -vn 0.6626 -0.7359 -0.1393 -vn 0.6831 -0.4575 -0.5693 -vn 0.6834 -0.4580 -0.5685 -vn 0.6825 -0.4564 -0.5709 -vn 0.6336 -0.5150 -0.5774 -vn 0.6425 -0.5195 -0.5633 -vn 0.5822 -0.5813 -0.5684 -vn 0.5776 -0.5790 -0.5755 -vn 0.5791 -0.5797 -0.5732 -vn 0.5838 -0.5821 -0.5660 -vn 0.5623 -0.5991 -0.5700 -vn -0.3685 -0.5594 0.7425 -vn -0.4018 -0.5007 0.7667 -vn -0.1968 -0.6897 0.6968 -vn -0.0440 -0.6175 0.7853 -vn 0.2641 -0.8058 0.5301 -vn 0.2457 -0.7287 0.6392 -vn 0.5327 -0.8199 0.2098 -vn 0.5328 -0.8200 0.2091 -vn 0.5332 -0.8202 0.2071 -vn 0.5334 -0.8203 0.2064 -vn 0.6577 -0.7333 -0.1723 -vn 0.6575 -0.7336 -0.1720 -vn 0.6530 -0.7367 -0.1758 -vn 0.6530 -0.7369 -0.1749 -vn 0.6525 -0.7369 -0.1766 -vn 0.6973 -0.6947 -0.1765 -vn 0.6984 -0.6947 -0.1722 -vn 0.6980 -0.6947 -0.1737 -vn 0.6969 -0.6947 -0.1781 -vn 0.7655 -0.6185 -0.1774 -vn 0.7668 -0.6186 -0.1712 -vn 0.7664 -0.6185 -0.1735 -vn 0.7650 -0.6184 -0.1797 -vn 0.8183 -0.5476 -0.1749 -vn 0.6822 -0.4559 -0.5716 -vn 0.7233 -0.4022 -0.5613 -vn 0.6397 -0.3852 -0.6651 -vn 0.8785 0.1940 -0.4366 -vn 0.9077 0.0708 -0.4137 -vn 0.8155 0.0502 -0.5765 -vn 0.8143 0.0180 -0.5801 -vn 0.7189 -0.0099 -0.6950 -vn 0.7174 -0.0487 -0.6950 -vn 0.6192 -0.0857 -0.7805 -vn 0.6194 -0.1210 -0.7757 -vn 0.5099 -0.1695 -0.8434 -vn 0.5117 -0.2035 -0.8347 -vn 0.3925 -0.2627 -0.8814 -vn 0.3982 -0.2975 -0.8677 -vn 0.3136 -0.3452 -0.8846 -vn 0.3148 -0.3515 -0.8817 -vn 0.3139 -0.3466 -0.8839 -vn 0.4815 -0.2984 -0.8241 -vn 0.4681 -0.2875 -0.8356 -vn 0.3982 -0.2653 -0.8781 -vn 0.3712 -0.3024 -0.8779 -vn 0.3636 -0.2978 -0.8827 -vn 0.3663 -0.2994 -0.8810 -vn 0.3739 -0.3041 -0.8762 -vn 0.3365 -0.3378 -0.8790 -vn 0.3317 -0.3346 -0.8820 -vn 0.3333 -0.3357 -0.8810 -vn 0.3381 -0.3389 -0.8779 -vn 0.3151 -0.3529 -0.8810 -vn 0.5707 -0.6406 -0.5137 -vn 0.5802 -0.5740 -0.5778 -vn 0.6427 -0.5345 -0.5488 -vn 0.6464 -0.5206 -0.5578 -vn 0.7050 -0.4865 -0.5161 -vn 0.7102 -0.4709 -0.5233 -vn 0.7636 -0.4431 -0.4697 -vn 0.7709 -0.4252 -0.4742 -vn 0.8249 -0.4007 -0.3988 -vn 0.8327 -0.3826 -0.4003 -vn 0.8847 -0.3616 -0.2941 -vn 0.8878 0.1224 -0.4437 -vn 0.9494 0.1176 -0.2913 -vn 0.9380 0.2610 -0.2282 -vn 1.0000 0.0092 0.0017 -vn 0.1501 -0.0370 0.9880 -vn -0.0145 0.0206 0.9997 -vn 0.0911 -0.0379 0.9951 -vn 0.0759 -0.0165 0.9970 -vn 0.0757 -0.0155 0.9970 -vn 0.0751 -0.0043 0.9972 -vn -0.0288 0.8639 0.5029 -vn 0.0779 0.8891 0.4510 -vn 0.0603 0.9025 0.4265 -vn 0.0458 0.9026 0.4280 -vn -0.0511 0.8320 0.5524 -vn 0.1656 0.7739 0.6113 -vn 0.5029 0.6703 0.5458 -vn 0.1422 -0.0411 -0.9890 -vn 0.1336 -0.0495 -0.9898 -vn 0.1443 -0.0481 -0.9884 -vn 0.1410 -0.0485 -0.9888 -vn 0.1499 -0.0324 -0.9882 -vn 0.1473 -0.0279 -0.9887 -vn 0.1472 -0.0273 -0.9887 -vn 0.1474 -0.0273 -0.9887 -vn 0.1903 -0.1311 -0.9729 -vn 0.0462 -0.3322 -0.9421 -vn 0.0836 -0.3289 -0.9407 -vn 0.1084 -0.5012 -0.8585 -vn -0.0307 -0.5191 -0.8542 -vn 0.1783 -0.6449 -0.7432 -vn -0.0734 -0.6927 -0.7175 -vn 0.2138 -0.7722 -0.5983 -vn -0.0898 -0.8314 -0.5483 -vn 0.1233 -0.8619 -0.4918 -vn -0.0092 -0.9601 -0.2794 -vn 0.1181 -0.9424 -0.3129 -vn 0.5866 0.7741 0.2381 -vn 0.2097 0.8267 0.5221 -vn 0.0359 0.9196 0.3913 -vn 0.0523 0.9176 0.3941 -vn 0.3250 0.8655 0.3812 -vn 0.2993 0.8425 0.4479 -vn 0.2761 0.7960 0.5387 -vn 0.0559 0.8393 0.5409 -vn 0.0742 -0.0226 0.9970 -vn 0.0672 -0.0237 0.9975 -vn 0.0641 -0.0242 0.9976 -vn 0.3833 -0.1456 0.9121 -vn 0.3852 -0.1458 0.9112 -vn 0.3798 -0.1450 0.9136 -vn 0.3779 -0.1448 0.9145 -vn 0.7333 -0.2814 0.6189 -vn 0.7352 -0.2816 0.6166 -vn 0.7295 -0.2813 0.6234 -vn 0.7275 -0.2813 0.6257 -vn 0.9095 -0.3520 0.2210 -vn 0.9101 -0.3518 0.2192 -vn 0.9085 -0.3524 0.2246 -vn 0.9080 -0.3526 0.2264 -vn 0.9166 -0.3558 -0.1822 -vn 0.9167 -0.3559 -0.1818 -vn 0.9167 -0.3559 -0.1819 -vn 0.9166 -0.3557 -0.1823 -vn 0.7683 -0.2976 -0.5667 -vn 0.7691 -0.2984 -0.5652 -vn 0.7666 -0.2962 -0.5697 -vn 0.7658 -0.2954 -0.5712 -vn 0.4587 -0.1765 -0.8709 -vn 0.4601 -0.1774 -0.8700 -vn 0.4558 -0.1746 -0.8728 -vn 0.4544 -0.1737 -0.8737 -vn 0.1308 -0.0499 -0.9902 -vn 0.1668 -0.0696 -0.9835 -vn 0.3989 -0.2079 0.8931 -vn 0.3668 -0.1673 0.9151 -vn 0.3710 -0.1727 0.9124 -vn 0.3654 -0.1731 0.9146 -vn 0.5828 -0.2919 0.7583 -vn 0.4765 0.6672 0.5726 -vn 0.5018 0.5496 0.6680 -vn 0.3688 0.5981 0.7116 -vn 0.1724 0.6783 0.7143 -vn 0.4348 0.2316 0.8703 -vn 0.6630 0.1568 0.7320 -vn 0.7981 0.1480 0.5840 -vn 0.8380 0.4009 0.3702 -vn 0.6904 0.4262 0.5845 -vn 0.4670 0.5394 0.7007 -vn 0.4877 0.4082 0.7717 -vn 0.1165 0.4966 0.8601 -vn 0.3103 0.4002 0.8623 -vn 0.1173 0.8990 0.4219 -vn 0.1856 0.8759 0.4453 -vn 0.4717 0.7839 0.4038 -vn 0.4713 0.7843 0.4035 -vn 0.4702 0.7852 0.4029 -vn 0.4690 0.7864 0.4021 -vn 0.8293 0.4945 0.2601 -vn 0.7611 0.5959 0.2562 -vn 0.8893 0.4084 0.2056 -vn 0.7024 -0.4028 0.5869 -vn 0.6907 -0.3752 0.6182 -vn 0.7976 -0.4435 0.4087 -vn 0.8399 -0.4984 0.2149 -vn 0.8450 -0.4954 0.2011 -vn 0.0751 -0.0030 0.9972 -vn -0.1831 0.1090 0.9770 -vn 0.3973 0.0068 0.9176 -vn 0.4500 -0.0218 0.8928 -vn 0.7718 -0.0935 0.6290 -vn 0.7877 -0.1061 0.6068 -vn 0.9614 -0.1559 0.2268 -vn 0.9615 -0.1560 0.2264 -vn 0.9617 -0.1565 0.2251 -vn 0.9618 -0.1566 0.2247 -vn 0.9673 -0.1777 -0.1812 -vn 0.9666 -0.1808 -0.1815 -vn 0.9674 -0.1775 -0.1806 -vn 0.9969 0.0303 0.0731 -vn 0.9869 0.0412 0.1561 -vn 0.9793 -0.0325 0.1995 -vn 0.9924 -0.0435 0.1151 -vn 0.9756 -0.0641 0.2101 -vn 0.2221 0.1591 0.9619 -vn 0.0491 0.3352 0.9409 -vn 0.4703 0.2488 0.8467 -vn 0.4531 0.3947 0.7993 -vn 0.8263 0.2053 0.5245 -vn 0.8189 0.3683 0.4402 -vn 0.9880 0.0659 0.1395 -vn 0.9904 0.1225 0.0633 -vn 0.9740 0.2142 0.0736 -vn 0.8596 -0.5091 -0.0446 -vn 0.8319 -0.5239 -0.1831 -vn 0.8299 -0.4959 -0.2558 -vn 0.9771 -0.1903 -0.0949 -vn 0.9624 -0.2377 -0.1318 -vn 0.9624 -0.2277 -0.1483 -vn 0.9630 -0.2266 -0.1460 -vn 0.9625 -0.2274 -0.1479 -vn 0.9631 -0.2265 -0.1456 -vn 0.9640 -0.2078 -0.1658 -vn 0.9643 -0.2076 -0.1645 -vn 0.9641 -0.2078 -0.1655 -vn 0.9643 -0.2076 -0.1642 -vn 0.9655 -0.1922 -0.1756 -vn 0.9657 -0.1922 -0.1747 -vn 0.9656 -0.1921 -0.1753 -vn 0.9669 -0.1818 -0.1792 -vn 0.9672 -0.1797 -0.1796 -vn 0.8059 -0.1709 -0.5669 -vn 0.7555 -0.4518 -0.4744 -vn 0.6988 -0.4445 -0.5605 -vn 0.6488 -0.3694 -0.6653 -vn 0.6222 -0.7340 -0.2722 -vn 0.8674 -0.4396 -0.2332 -vn 0.7817 -0.5605 -0.2736 -vn 0.4944 -0.2758 -0.8243 -vn 0.4262 -0.2564 -0.8675 -vn 0.2393 -0.0737 -0.9681 -vn 0.0735 -0.0354 0.9967 -vn 0.3724 -0.1752 0.9114 -vn 0.3671 -0.1740 0.9138 -vn 0.7097 -0.3364 0.6190 -vn 0.7114 -0.3366 0.6169 -vn 0.7064 -0.3361 0.6229 -vn 0.7047 -0.3359 0.6250 -vn 0.8805 -0.4195 0.2205 -vn 0.8810 -0.4194 0.2190 -vn 0.8796 -0.4198 0.2236 -vn 0.8792 -0.4199 0.2251 -vn 0.8873 -0.4234 -0.1827 -vn 0.8873 -0.4235 -0.1825 -vn 0.8873 -0.4234 -0.1828 -vn 0.7436 -0.3544 -0.5670 -vn 0.7442 -0.3550 -0.5658 -vn 0.7423 -0.3531 -0.5694 -vn 0.7417 -0.3525 -0.5706 -vn 0.4443 -0.2110 -0.8707 -vn 0.4453 -0.2118 -0.8700 -vn 0.4422 -0.2093 -0.8722 -vn 0.4412 -0.2086 -0.8728 -vn 0.1386 -0.0660 -0.9881 -vn 0.0851 -0.0288 -0.9960 -vn 0.0774 -0.0221 0.9968 -vn 0.0586 -0.0152 0.9982 -vn 0.3896 -0.1028 0.9152 -vn 0.4023 -0.1079 0.9091 -vn 0.7514 -0.2017 0.6283 -vn 0.7632 -0.2074 0.6120 -vn 0.9394 -0.2553 0.2289 -vn 0.9400 -0.2559 0.2256 -vn 0.9411 -0.2569 0.2199 -vn 0.9417 -0.2574 0.2166 -vn 0.9486 -0.2592 -0.1817 -vn 0.9487 -0.2592 -0.1813 -vn 0.9488 -0.2591 -0.1805 -vn 0.9489 -0.2591 -0.1800 -vn 0.7912 -0.2159 -0.5722 -vn 0.7932 -0.2160 -0.5693 -vn 0.7967 -0.2161 -0.5644 -vn 0.7987 -0.2162 -0.5616 -vn 0.4680 -0.1265 -0.8746 -vn 0.4711 -0.1269 -0.8729 -vn 0.4762 -0.1276 -0.8700 -vn 0.4793 -0.1280 -0.8683 -vn 0.1175 -0.0311 -0.9926 -vn 0.1505 -0.0335 -0.9880 -vn 0.9087 -0.3768 -0.1798 -vn 0.7674 -0.5796 -0.2742 -vn 0.7593 -0.5154 -0.3974 -vn 0.7708 -0.5101 -0.3816 -vn 0.7650 -0.4361 -0.4739 -vn 0.7755 -0.4346 -0.4579 -vn 0.7733 -0.3571 -0.5240 -vn 0.7822 -0.3583 -0.5096 -vn 0.7834 -0.2752 -0.5573 -vn 0.7912 -0.2790 -0.5442 -vn 0.7955 -0.1744 -0.5803 -vn 0.5502 -0.1488 -0.8217 -vn 0.4801 -0.0936 -0.8722 -vn 0.4170 -0.8550 -0.3085 -vn 0.4151 -0.8555 -0.3095 -vn 0.4166 -0.8551 -0.3088 -vn 0.4147 -0.8557 -0.3097 -vn 0.3764 -0.7967 -0.4729 -vn 0.4112 -0.7961 -0.4441 -vn 0.3861 -0.7233 -0.5725 -vn 0.4206 -0.7217 -0.5498 -vn 0.3907 -0.6000 -0.6981 -vn 0.4274 -0.6041 -0.6726 -vn 0.4051 -0.4702 -0.7841 -vn 0.4382 -0.4783 -0.7611 -vn 0.4220 -0.3296 -0.8446 -vn 0.4529 -0.3422 -0.8233 -vn 0.4441 -0.1971 -0.8740 -vn -0.0722 -0.1346 -0.9883 -vn 0.1610 -0.0361 -0.9863 -vn 0.1464 -0.0267 -0.9889 -vn 0.1470 -0.0276 -0.9888 -vn 0.2788 -0.9594 0.0425 -vn 0.7346 -0.6785 -0.0047 -vn 0.7283 -0.6853 0.0000 -vn 0.7295 -0.6839 -0.0009 -vn 0.7672 -0.6414 -0.0000 -vn 0.7932 -0.6090 -0.0032 -vn 0.7919 -0.6106 -0.0040 -vn 0.7978 -0.6030 -0.0001 -vn 0.7991 -0.6012 0.0008 -vn 0.5128 -0.8585 0.0031 -vn 0.5145 -0.8575 0.0033 -vn 0.5093 -0.8606 0.0023 -vn 0.5073 -0.8618 0.0019 -vn 0.7361 -0.6769 -0.0058 -vn 0.6825 -0.7308 0.0032 -vn 0.6703 -0.7421 -0.0015 -vn 0.6358 -0.7718 0.0008 -vn 0.6361 -0.7716 0.0009 -vn 0.6355 -0.7721 0.0007 -vn 0.6353 -0.7723 0.0007 -vn 0.6096 -0.7927 -0.0006 -vn 0.5274 -0.8496 0.0064 -vn 0.5454 -0.8380 0.0132 -vn 0.4874 -0.8730 -0.0187 -vn 0.5726 -0.8197 0.0160 -vn 0.5379 -0.8430 -0.0065 -vn 0.5966 -0.8025 0.0017 -vn 0.4413 -0.8974 0.0036 -vn 0.4106 -0.9118 -0.0089 -vn 0.4123 -0.9110 -0.0031 -vn 0.4120 -0.9112 -0.0044 -vn 0.4107 -0.9117 -0.0109 -vn 0.4692 -0.8827 -0.0244 -vn 0.4514 -0.8923 0.0004 -vn 0.4926 -0.8702 -0.0006 -vn 0.3277 -0.9448 0.0004 -vn 0.2876 -0.9578 0.0016 -vn 0.2876 -0.9577 0.0016 -vn 0.2880 -0.9576 0.0012 -vn 0.4109 -0.9116 -0.0080 -vn 0.4102 -0.9120 -0.0070 -vn 0.4072 -0.9133 -0.0030 -vn 0.3740 -0.9274 -0.0095 -vn 0.3961 -0.9181 0.0142 -vn 0.3432 -0.9392 -0.0144 -vn 0.3791 -0.9253 0.0122 -vn 0.3652 -0.9309 0.0064 -vn 0.0101 -0.9999 0.0000 -vn 0.0111 -0.9999 0.0000 -vn 0.0121 -0.9999 0.0000 -vn 0.0529 -0.9986 -0.0021 -vn 0.0532 -0.9986 -0.0016 -vn 0.0529 -0.9986 -0.0022 -vn 0.0490 -0.9988 -0.0087 -vn 0.2892 -0.9573 0.0000 -vn 0.2504 -0.9682 0.0000 -vn 0.1973 -0.9803 -0.0065 -vn 0.0843 -0.9964 0.0008 -vn 0.0873 -0.9962 0.0007 -vn 0.0936 -0.9956 0.0004 -vn 0.0975 -0.9952 0.0002 -vn 0.1209 -0.9927 -0.0009 -vn 0.1412 -0.9900 -0.0035 -vn 0.2295 -0.9732 0.0150 -vn 0.8477 -0.5305 -0.0010 -vn 0.8475 -0.5308 -0.0009 -vn 0.8470 -0.5317 -0.0003 -vn 0.8468 -0.5319 -0.0002 -vn 0.8914 -0.4533 0.0002 -vn 0.8913 -0.4533 0.0002 -vn 0.8909 -0.4541 0.0006 -vn 0.8908 -0.4543 0.0007 -vn 0.9237 -0.3831 -0.0006 -vn 0.9243 -0.3817 -0.0011 -vn 0.9259 -0.3778 -0.0027 -vn 0.9264 -0.3766 -0.0031 -vn 0.9424 -0.3345 0.0009 -vn 0.9431 -0.3324 0.0007 -vn 0.9445 -0.3286 0.0002 -vn 0.9452 -0.3264 -0.0000 -vn 0.9596 -0.2815 -0.0000 -vn 0.9597 -0.2812 -0.0001 -vn 0.9597 -0.2810 -0.0001 -vn 0.9597 -0.2811 -0.0001 -vn 0.9762 -0.2169 0.0001 -vn 0.9762 -0.2170 0.0001 -vn 0.9762 -0.2168 0.0001 -vn 0.9827 -0.1852 0.0000 -vn 0.9823 -0.1873 -0.0000 -vn 0.9826 -0.1857 0.0000 -vn 0.9828 -0.1845 0.0000 -vn 0.9832 -0.1824 0.0000 -vn 0.9837 -0.1799 0.0001 -vn 0.9874 -0.1585 0.0014 -vn 0.9875 -0.1576 0.0012 -vn 0.9878 -0.1556 0.0007 -vn 0.9880 -0.1547 0.0004 -vn 0.9949 -0.1004 -0.0008 -vn 0.9935 -0.1141 0.0036 -vn 0.9990 -0.0440 -0.0047 -vn 0.9977 0.0600 -0.0314 -vn 0.9987 0.0448 -0.0229 -vn 0.9976 -0.0658 0.0193 -vn 0.9992 0.0233 -0.0338 -vn 0.9998 0.0003 -0.0214 -vn 0.9994 -0.0307 0.0170 -vn 0.9999 -0.0077 0.0085 -vn 0.9999 0.0093 0.0042 -vn 0.9891 0.1459 0.0179 -vn 0.9890 0.1468 0.0171 -vn 0.9891 0.1462 0.0177 -vn 0.9884 0.1515 0.0129 -vn 0.9644 0.2640 0.0163 -vn 0.9685 0.2489 0.0018 -vn 0.9685 0.2491 0.0020 -vn 0.9686 0.2485 0.0012 -vn 0.9687 0.2484 0.0010 -vn 0.9925 0.1222 -0.0072 -vn 0.9933 0.1157 -0.0002 -vn 0.9926 0.1208 -0.0091 -vn 0.9933 0.1153 -0.0004 -vn 0.9995 0.0307 0.0000 -vn 0.9971 0.0761 -0.0091 -vn 0.9964 0.0845 -0.0000 -vn 0.9970 0.0774 -0.0077 -vn 0.9971 0.0752 -0.0101 -vn 0.9949 0.1006 0.0004 -vn 0.9853 0.1698 -0.0201 -vn 0.9873 0.1588 -0.0094 -vn 0.9921 0.1256 -0.0034 -vn 0.9924 0.1230 -0.0062 -vn 0.9924 0.1224 -0.0087 -vn 0.9341 0.3564 -0.0183 -vn 0.9643 0.2499 0.0877 -vn 0.9544 0.2954 0.0433 -vn 0.9248 0.3804 0.0004 -vn 0.9045 0.4264 -0.0000 -vn 0.8968 0.4424 0.0008 -vn 0.9859 0.1671 0.0068 -vn 0.9783 0.2072 -0.0000 -vn 0.9583 0.2857 -0.0000 -vn 0.9413 0.3374 -0.0065 -vn 0.8825 0.4703 0.0000 -vn 0.8748 0.4838 -0.0272 -vn 0.8806 0.4739 -0.0085 -vn -0.4100 -0.6782 0.6098 -vn -0.4148 -0.6759 0.6092 -vn -0.4141 -0.6763 0.6092 -vn -0.4091 -0.6786 0.6101 -vn -0.4881 -0.6636 0.5669 -vn -0.5216 -0.6714 0.5265 -vn -0.5085 -0.6766 0.5326 -vn -0.5943 -0.6399 0.4872 -vn -0.5695 -0.6534 0.4987 -vn -0.6477 -0.6599 0.3807 -vn -0.6470 -0.6603 0.3813 -vn -0.6466 -0.6605 0.3817 -vn -0.6463 -0.6606 0.3819 -vn -0.6049 -0.6738 0.4243 -vn -0.6847 -0.6978 0.2106 -vn -0.6934 -0.6942 0.1930 -vn -0.6984 -0.6750 0.2382 -vn -0.6977 -0.6753 0.2391 -vn -0.6974 -0.6755 0.2395 -vn -0.6970 -0.6757 0.2399 -vn -0.6565 -0.6888 0.3074 -vn -0.5932 -0.7784 0.2056 -vn -0.6402 -0.7407 0.2038 -vn -0.6534 -0.7323 0.1919 -vn -0.5828 -0.7849 0.2103 -vn -0.5781 -0.7873 0.2145 -vn -0.5814 -0.7856 0.2116 -vn -0.5770 -0.7878 0.2154 -vn -0.5390 -0.8196 0.1943 -vn 0.3405 -0.6212 0.7058 -vn 0.7136 0.1827 0.6763 -vn 0.6558 0.0496 0.7533 -vn 0.6679 0.1210 0.7343 -vn 0.6804 0.3497 0.6440 -vn 0.6556 0.2066 0.7262 -vn 0.6094 0.4745 0.6352 -vn 0.6000 0.3649 0.7119 -vn 0.5565 0.6142 0.5595 -vn 0.5385 0.5074 0.6727 -vn 0.5082 0.7124 0.4839 -vn 0.7018 0.0000 0.7123 -vn 0.7019 0.0001 0.7123 -vn 0.7020 0.0003 0.7122 -vn 0.7054 0.0165 0.7086 -vn 0.6736 -0.2137 0.7076 -vn 0.6823 -0.2001 0.7031 -vn 0.6799 -0.1477 0.7182 -vn 0.6770 -0.1501 0.7206 -vn 0.6765 -0.1503 0.7209 -vn 0.7126 -0.0898 0.6958 -vn 0.6942 -0.1115 0.7111 -vn 0.7099 -0.0560 0.7021 -vn 0.6982 -0.0705 0.7125 -vn 0.7086 -0.0312 0.7049 -vn -0.5273 -0.8229 0.2115 -vn 0.3680 -0.6009 0.7096 -vn -0.4555 -0.8224 0.3409 -vn -0.5517 -0.7903 0.2666 -vn -0.3541 -0.7934 0.4951 -vn -0.4073 -0.7907 0.4570 -vn -0.2516 -0.7778 0.5760 -vn -0.1724 -0.7785 0.6035 -vn -0.0848 -0.7425 0.6645 -vn 0.1331 -0.7083 0.6932 -vn 0.1732 -0.6784 0.7139 -vn 0.2891 -0.6457 0.7068 -vn 0.3440 -0.6181 0.7068 -vn 0.3828 -0.5999 0.7026 -vn 0.4191 -0.5638 0.7117 -vn 0.4187 -0.5648 0.7111 -vn 0.4508 -0.5468 0.7055 -vn 0.4692 -0.5228 0.7117 -vn 0.4504 0.8571 0.2501 -vn 0.4351 0.8294 0.3504 -vn 0.4755 0.7580 0.4465 -vn 0.5074 0.6626 0.5509 -vn 0.4844 -0.5187 0.7045 -vn 0.5183 -0.4766 0.7100 -vn 0.5175 -0.4830 0.7064 -vn 0.5425 -0.4534 0.7072 -vn 0.5562 -0.4294 0.7115 -vn 0.5657 -0.4262 0.7059 -vn 0.5658 -0.4267 0.7056 -vn 0.5660 -0.4258 0.7060 -vn 0.5952 -0.3807 0.7077 -vn 0.5955 -0.3803 0.7076 -vn 0.5989 -0.3788 0.7056 -vn 0.6024 -0.3770 0.7036 -vn 0.6195 -0.3363 0.7093 -vn 0.6354 -0.3231 0.7014 -vn 0.6431 -0.2686 0.7172 -vn 0.6448 -0.2676 0.7160 -vn 0.6449 -0.2675 0.7159 -vn 0.6451 -0.2675 0.7158 -vn 0.6669 -0.2367 0.7066 -vn 0.4235 0.8849 0.1938 -vn 0.3675 0.7010 0.6112 -vn 0.3678 0.6901 0.6233 -vn 0.3198 0.7610 0.5645 -vn 0.3198 0.7616 0.5636 -vn 0.3196 0.7640 0.5605 -vn 0.3195 0.7646 0.5597 -vn 0.3021 0.7858 0.5397 -vn 0.2686 0.8254 0.4966 -vn 0.2648 0.8212 0.5054 -vn 0.2654 0.8218 0.5042 -vn 0.2648 0.8211 0.5056 -vn 0.2646 0.8654 0.4255 -vn 0.2309 0.8959 0.3796 -vn 0.2631 0.9157 0.3038 -vn 0.2170 0.9468 0.2375 -vn 0.2366 0.9522 0.1931 -vn 0.2480 0.9457 0.2100 -vn 0.2927 0.9369 0.1910 -vn 0.3069 0.9273 0.2141 -vn 0.3426 0.9187 0.1967 -vn 0.3663 0.9062 0.2111 -vn 0.3670 0.9057 0.2122 -vn 0.3691 0.9040 0.2158 -vn 0.3693 0.9037 0.2165 -vn 0.0049 -0.7424 0.6700 -vn 0.3916 0.6620 0.6391 -vn 0.4544 0.6156 0.6439 -vn 0.4724 0.5794 0.6642 -vn 0.5065 0.5561 0.6589 -vn 0.5507 0.5034 0.6658 -vn 0.5508 0.5028 0.6661 -vn 0.5516 0.5004 0.6674 -vn 0.5518 0.4999 0.6676 -vn 0.5963 0.4475 0.6665 -vn 0.5963 0.4473 0.6665 -vn 0.5966 0.4468 0.6667 -vn 0.5967 0.4467 0.6667 -vn 0.6269 0.3998 0.6687 -vn 0.6344 0.3820 0.6720 -vn 0.6394 0.3803 0.6683 -vn 0.6265 0.4215 0.6556 -vn 0.5708 0.4970 0.6536 -vn 0.5591 0.5048 0.6577 -vn 0.1110 0.7847 0.6098 -vn 0.0503 0.8306 0.5546 -vn 0.1908 0.7884 0.5848 -vn 0.1698 0.7998 0.5757 -vn 0.2323 0.7754 0.5872 -vn 0.2609 0.7601 0.5951 -vn 0.3001 0.7503 0.5890 -vn 0.3909 0.6882 0.6112 -vn 0.4235 0.6760 0.6031 -vn 0.4743 0.6220 0.6231 -vn 0.4967 0.6019 0.6253 -vn 0.5283 0.5631 0.6355 -vn 0.0386 0.8160 0.5768 -vn -0.0220 0.8269 0.5619 -vn -0.0843 0.8199 0.5663 -vn -0.0572 0.8129 0.5796 -vn -0.0706 0.8162 0.5735 -vn -0.1691 0.8268 0.5365 -vn -0.1550 0.8222 0.5476 -vn -0.2071 0.8040 0.5574 -vn -0.2292 0.7984 0.5568 -vn -0.2346 0.7931 0.5621 -vn -0.2484 0.7930 0.5562 -vn -0.2671 0.7869 0.5563 -vn -0.2860 0.7901 0.5421 -vn -0.3149 0.7547 0.5756 -vn -0.3079 0.7692 0.5600 -vn -0.3343 0.7642 0.5516 -vn -0.3612 0.7539 0.5488 -vn -0.3735 0.7564 0.5369 -vn -0.4124 0.7203 0.5577 -vn -0.4105 0.7243 0.5539 -vn -0.4657 0.7066 0.5328 -vn -0.4659 0.7065 0.5327 -vn -0.4660 0.7066 0.5325 -vn -0.4677 0.7067 0.5309 -vn -0.4914 0.6819 0.5418 -vn -0.5312 0.6586 0.5330 -vn -0.5358 0.6400 0.5508 -vn -0.5683 0.6234 0.5370 -vn -0.5852 0.6092 0.5352 -vn -0.5999 0.5885 0.5420 -vn -0.6083 0.5854 0.5360 -vn -0.6081 0.5854 0.5362 -vn -0.6087 0.5851 0.5358 -vn -0.6504 0.5435 0.5307 -vn -0.6464 0.5450 0.5340 -vn -0.6501 0.5438 0.5307 -vn -0.6464 0.5447 0.5343 -vn -0.6789 0.5068 0.5313 -vn -0.6785 0.5071 0.5315 -vn -0.6773 0.5080 0.5321 -vn -0.7417 0.4075 0.5328 -vn -0.7449 0.4039 0.5310 -vn -0.7442 0.4047 0.5314 -vn -0.7135 0.4573 0.5308 -vn -0.7136 0.4584 0.5297 -vn -0.6770 0.5083 0.5323 -vn -0.7407 0.4086 0.5333 -vn -0.7544 0.3881 0.5295 -vn -0.7626 0.3594 0.5378 -vn -0.7649 0.3573 0.5361 -vn -0.7666 0.3557 0.5346 -vn -0.7671 0.3551 0.5342 -vn -0.7976 0.2945 0.5263 -vn -0.7829 0.3036 0.5430 -vn -0.8106 0.2504 0.5294 -vn -0.8101 0.2512 0.5298 -vn -0.8086 0.2535 0.5309 -vn -0.8084 0.2538 0.5311 -vn -0.8181 0.1927 0.5418 -vn -0.8229 0.2015 0.5313 -vn -0.8305 0.1425 0.5385 -vn -0.8301 0.1434 0.5389 -vn -0.8281 0.1476 0.5408 -vn -0.8273 0.1492 0.5415 -vn -0.8423 0.1046 0.5288 -vn -0.8294 -0.0990 0.5499 -vn -0.8243 0.1253 0.5520 -vn -0.8471 0.0671 0.5271 -vn -0.8347 0.0461 0.5487 -vn -0.8399 0.0152 0.5425 -vn -0.8393 0.0102 0.5435 -vn -0.8391 0.0070 0.5439 -vn -0.8387 0.0017 0.5446 -vn -0.8384 -0.0011 0.5450 -vn -0.8336 -0.0210 0.5520 -vn -0.8396 -0.0329 0.5423 -vn -0.8303 -0.0721 0.5526 -vn -0.8286 -0.0683 0.5556 -vn -0.8288 -0.0686 0.5553 -vn -0.8286 -0.0679 0.5557 -vn -0.8313 -0.0943 0.5477 -vn -0.8260 -0.1111 0.5526 -vn -0.8166 -0.1369 0.5608 -vn -0.8240 -0.1320 0.5511 -vn -0.8148 -0.1647 0.5558 -vn -0.8102 -0.1749 0.5595 -vn -0.8127 -0.1871 0.5519 -vn -0.8022 -0.2055 0.5607 -vn -0.8015 -0.2063 0.5613 -vn -0.8024 -0.2366 0.5479 -vn -0.7848 -0.2555 0.5647 -vn -0.7719 -0.3035 0.5586 -vn -0.7538 -0.3388 0.5630 -vn -0.6938 -0.4081 0.5934 -vn -0.7807 -0.3658 0.5067 -vn -0.6226 -0.4916 0.6089 -vn -0.6796 -0.4660 0.5665 -vn -0.5879 -0.5641 0.5798 -vn -0.5968 -0.5587 0.5759 -vn -0.5159 -0.6182 0.5931 -vn -0.5167 -0.6179 0.5927 -vn -0.4306 -0.6755 0.5985 -vn -0.3845 -0.6885 0.6150 -vn -0.2907 -0.7391 0.6076 -vn -0.3114 -0.7249 0.6144 -vn -0.1778 -0.7476 0.6399 -vn -0.1467 -0.7402 0.6562 -vn -0.0992 -0.7503 0.6536 -vn -0.0379 -0.7537 0.6561 -vn -0.0176 -0.7451 0.6668 -vn 0.0067 -0.7436 0.6685 -vn 0.0072 -0.7436 0.6686 -vn 0.0065 -0.7438 0.6684 -vn 0.0023 -0.7454 0.6666 -vn -0.0621 -0.7401 0.6696 -vn -0.1539 -0.7472 0.6465 -vn -0.1206 -0.7231 0.6801 -vn -0.2571 -0.7195 0.6452 -vn -0.2268 -0.7063 0.6706 -vn -0.2856 -0.7048 0.6494 -vn -0.3592 -0.6813 0.6378 -vn -0.3384 -0.6768 0.6538 -vn 0.8235 0.5540 -0.1222 -vn 0.8454 0.5221 -0.1124 -vn 0.2590 -0.9635 -0.0682 -vn 0.2160 -0.9738 -0.0708 -vn 0.2209 -0.9728 -0.0696 -vn 0.2163 -0.9738 -0.0706 -vn 0.2184 -0.9733 -0.0701 -vn 0.2211 -0.9729 -0.0675 -vn 0.2271 -0.9718 -0.0630 -vn 0.2264 -0.9720 -0.0636 -vn 0.2286 -0.9716 -0.0615 -vn 0.2291 -0.9715 -0.0609 -vn 0.2731 -0.9599 -0.0627 -vn 0.2722 -0.9602 -0.0631 -vn 0.2800 -0.9581 -0.0603 -vn 0.2859 -0.9563 -0.0608 -vn 0.2862 -0.9563 -0.0594 -vn 0.2871 -0.9561 -0.0591 -vn 0.2826 -0.9566 -0.0707 -vn 0.3131 -0.9465 -0.0782 -vn 0.2813 -0.9576 -0.0628 -vn 0.3887 -0.9204 -0.0431 -vn 0.4470 -0.8929 -0.0531 -vn 0.4522 -0.8905 -0.0494 -vn 0.4442 -0.8942 -0.0552 -vn 0.4418 -0.8953 -0.0569 -vn 0.5131 -0.8580 -0.0255 -vn 0.6082 -0.7935 -0.0221 -vn 0.5975 -0.8011 -0.0340 -vn 0.6934 -0.7206 -0.0007 -vn 0.7431 -0.6687 -0.0248 -vn 0.7663 -0.6424 -0.0059 -vn 0.8077 -0.5896 -0.0006 -vn 0.8533 -0.5213 -0.0106 -vn 0.8532 -0.5215 -0.0108 -vn 0.8557 -0.5175 -0.0073 -vn 0.8560 -0.5170 -0.0069 -vn 0.9173 -0.3981 0.0047 -vn 0.9341 -0.3564 -0.0214 -vn 0.9624 -0.2715 0.0051 -vn 0.9833 -0.1794 -0.0303 -vn 0.9869 -0.1602 -0.0205 -vn 0.9955 -0.0932 -0.0178 -vn 0.9982 -0.0552 -0.0242 -vn 0.9993 -0.0315 -0.0207 -vn 0.9985 0.0387 -0.0375 -vn 0.9986 0.0368 -0.0381 -vn 0.9984 0.0449 -0.0356 -vn 0.9983 0.0471 -0.0350 -vn 0.9804 0.1863 -0.0636 -vn 0.9804 0.1863 -0.0635 -vn 0.9805 0.1862 -0.0635 -vn 0.9925 0.1153 -0.0398 -vn 0.9534 0.2958 -0.0596 -vn 0.9548 0.2934 -0.0486 -vn 0.9547 0.2934 -0.0504 -vn 0.9541 0.2947 -0.0539 -vn 0.9487 0.3079 -0.0721 -vn 0.9526 0.2983 -0.0597 -vn 0.9521 0.2996 -0.0609 -vn 0.9493 0.3071 -0.0673 -vn 0.9523 0.2975 -0.0679 -vn 0.9549 0.2888 -0.0681 -vn 0.9550 0.2887 -0.0681 -vn 0.9559 0.2857 -0.0682 -vn 0.9493 0.3069 -0.0673 -vn 0.9660 0.2512 -0.0610 -vn 0.9722 0.2262 -0.0597 -vn 0.9536 0.2952 -0.0600 -vn 0.9661 0.2508 -0.0607 -vn 0.9663 0.2502 -0.0607 -vn 0.9660 0.2515 -0.0604 -vn 0.9666 0.2491 -0.0598 -vn 0.9669 0.2480 -0.0596 -vn 0.8648 0.4913 -0.1035 -vn 0.8562 0.5054 -0.1068 -vn 0.8563 0.5054 -0.1068 -vn 0.7218 0.6728 -0.1623 -vn 0.6731 0.7174 -0.1796 -vn 0.7451 0.6489 -0.1541 -vn 0.6161 0.7637 -0.1928 -vn 0.5178 0.8265 -0.2209 -vn 0.6246 0.7568 -0.1930 -vn 0.2765 0.9232 -0.2668 -vn 0.3593 0.8983 -0.2529 -vn 0.4264 0.8719 -0.2408 -vn 0.5578 0.8030 -0.2098 -vn 0.2246 0.9354 -0.2732 -vn 0.1341 0.9485 -0.2868 -vn 0.2262 0.9346 -0.2743 -vn -0.0821 0.9486 -0.3057 -vn -0.0668 0.9502 -0.3045 -vn 0.0925 0.9531 -0.2882 -vn -0.0254 0.9531 -0.3015 -vn 0.0451 0.9544 -0.2950 -vn -0.1523 0.9393 -0.3073 -vn -0.1762 0.9346 -0.3090 -vn -0.0680 0.9502 -0.3040 -vn 0.0336 0.9551 -0.2945 -vn 0.0530 -0.9938 -0.0980 -vn 0.0532 -0.9938 -0.0979 -vn 0.2376 -0.9690 -0.0673 -vn 0.2235 -0.9723 -0.0690 -vn 0.1444 -0.9861 -0.0822 -vn 0.1433 -0.9862 -0.0824 -vn 0.1418 -0.9865 -0.0826 -vn 0.1407 -0.9866 -0.0827 -vn 0.0973 -0.9911 -0.0904 -vn 0.9478 0.3111 -0.0700 -vn 0.9491 0.3073 -0.0692 -vn 0.9217 0.3791 -0.0815 -vn 0.9009 0.4246 -0.0903 -vn 0.8997 0.4269 -0.0907 -vn 0.8981 0.4303 -0.0914 -vn 0.8969 0.4326 -0.0918 -vn 0.8782 0.4680 -0.0986 -vn 0.8562 0.5054 -0.1073 -vn -0.1694 0.7091 -0.6844 -vn -0.1960 0.7082 -0.6782 -vn -0.1176 0.7251 -0.6786 -vn -0.0524 0.7316 -0.6798 -vn -0.0666 0.7329 -0.6771 -vn 0.0261 0.7398 -0.6723 -vn 0.0716 0.7380 -0.6710 -vn 0.1488 0.7272 -0.6701 -vn 0.1747 0.7276 -0.6634 -vn 0.3367 0.6885 -0.6423 -vn 0.4420 0.6294 -0.6391 -vn 0.4411 0.6298 -0.6394 -vn 0.4392 0.6305 -0.6400 -vn 0.4382 0.6308 -0.6403 -vn 0.4890 0.6061 -0.6273 -vn 0.6606 0.4871 -0.5713 -vn 0.5770 0.5378 -0.6146 -vn 0.7062 0.4169 -0.5722 -vn 0.7063 0.4169 -0.5722 -vn 0.6911 0.4269 -0.5832 -vn 0.7030 0.4150 -0.5775 -vn 0.7031 0.4150 -0.5775 -vn 0.7131 0.4051 -0.5722 -vn 0.7227 0.3841 -0.5746 -vn 0.7408 0.3573 -0.5689 -vn 0.7636 0.3141 -0.5641 -vn 0.7710 0.2838 -0.5701 -vn 0.7896 0.2553 -0.5579 -vn 0.8317 0.1432 -0.5364 -vn 0.8220 0.1562 -0.5477 -vn 0.8467 0.0312 -0.5311 -vn 0.8404 -0.0099 -0.5418 -vn 0.8469 -0.0468 -0.5297 -vn 0.8413 -0.1654 -0.5146 -vn 0.8383 -0.1529 -0.5233 -vn 0.8002 -0.3162 -0.5096 -vn 0.8001 -0.3151 -0.5104 -vn 0.7998 -0.3059 -0.5164 -vn 0.7998 -0.3052 -0.5168 -vn 0.7299 -0.4562 -0.5090 -vn 0.7301 -0.4552 -0.5096 -vn 0.7315 -0.4476 -0.5144 -vn 0.7315 -0.4471 -0.5148 -vn 0.6334 -0.5794 -0.5129 -vn 0.6337 -0.5787 -0.5134 -vn 0.6359 -0.5728 -0.5172 -vn 0.6361 -0.5724 -0.5174 -vn 0.5149 -0.6807 -0.5211 -vn 0.5151 -0.6802 -0.5215 -vn 0.5176 -0.6761 -0.5243 -vn 0.5180 -0.6758 -0.5244 -vn 0.3796 -0.7561 -0.5331 -vn 0.3800 -0.7558 -0.5333 -vn 0.3823 -0.7534 -0.5350 -vn 0.3825 -0.7532 -0.5352 -vn 0.2335 -0.8031 -0.5482 -vn 0.2338 -0.8029 -0.5484 -vn 0.2353 -0.8018 -0.5493 -vn 0.0439 -0.8189 -0.5723 -vn 0.0822 -0.8118 -0.5781 -vn 0.1198 -0.8177 -0.5630 -vn 0.2355 -0.8017 -0.5494 -vn -0.7076 -0.6498 -0.2774 -vn -0.9400 0.0646 -0.3350 -vn -0.9404 0.0606 -0.3345 -vn -0.9394 0.0704 -0.3356 -vn -0.2620 0.9128 -0.3131 -vn -0.2208 0.9247 -0.3101 -vn -0.2838 0.9062 -0.3135 -vn -0.3260 0.8911 -0.3159 -vn -0.3272 0.8906 -0.3159 -vn -0.3242 0.8917 -0.3158 -vn -0.3230 0.8922 -0.3158 -vn -0.3650 0.8746 -0.3191 -vn -0.3994 0.8584 -0.3220 -vn -0.3796 0.8678 -0.3206 -vn -0.4554 0.8286 -0.3256 -vn -0.4188 0.8481 -0.3247 -vn -0.4977 0.8016 -0.3312 -vn -0.4691 0.8193 -0.3295 -vn -0.5261 0.7820 -0.3342 -vn -0.5285 0.7803 -0.3343 -vn -0.5226 0.7844 -0.3341 -vn -0.5202 0.7860 -0.3340 -vn -0.5510 0.7635 -0.3369 -vn -0.5905 0.7322 -0.3394 -vn -0.5906 0.7321 -0.3394 -vn -0.6330 0.6944 -0.3422 -vn -0.6473 0.6806 -0.3431 -vn -0.6459 0.6820 -0.3430 -vn -0.6493 0.6787 -0.3432 -vn -0.6507 0.6773 -0.3433 -vn -0.6768 0.6505 -0.3447 -vn -0.7031 0.6209 -0.3466 -vn -0.7173 0.6044 -0.3468 -vn -0.7515 0.5603 -0.3483 -vn -0.7523 0.5593 -0.3483 -vn -0.7504 0.5618 -0.3482 -vn -0.7496 0.5629 -0.3482 -vn -0.7885 0.5065 -0.3490 -vn -0.7905 0.5032 -0.3492 -vn -0.7935 0.4982 -0.3494 -vn -0.7955 0.4949 -0.3496 -vn -0.8204 0.4525 -0.3496 -vn -0.8332 0.4286 -0.3494 -vn -0.8329 0.4291 -0.3494 -vn -0.8327 0.4296 -0.3494 -vn -0.8324 0.4302 -0.3494 -vn -0.8504 0.3937 -0.3491 -vn -0.8500 0.3945 -0.3491 -vn -0.8495 0.3955 -0.3491 -vn -0.8951 0.2811 -0.3461 -vn -0.8753 0.3358 -0.3480 -vn -0.8740 0.3390 -0.3482 -vn -0.8773 0.3309 -0.3476 -vn -0.8786 0.3277 -0.3474 -vn -0.8492 0.3963 -0.3491 -vn -0.9141 0.2153 -0.3436 -vn -0.9140 0.2158 -0.3437 -vn -0.9138 0.2167 -0.3436 -vn -0.9136 0.2172 -0.3437 -vn -0.9250 0.1669 -0.3413 -vn -0.9298 0.1413 -0.3399 -vn -0.9297 0.1421 -0.3399 -vn -0.9295 0.1432 -0.3400 -vn -0.9293 0.1440 -0.3400 -vn -0.9344 0.1114 -0.3384 -vn -0.9435 -0.0012 -0.3313 -vn -0.9430 0.0170 -0.3324 -vn -0.9389 0.0743 -0.3360 -vn -0.9436 -0.0370 -0.3291 -vn -0.9439 0.0098 -0.3300 -vn -0.9427 -0.0773 -0.3245 -vn -0.9405 -0.1067 -0.3225 -vn -0.9454 -0.0230 -0.3251 -vn -0.9446 -0.0503 -0.3244 -vn -0.9404 -0.1191 -0.3186 -vn -0.9351 -0.1568 -0.3177 -vn -0.9390 -0.1262 -0.3199 -vn -0.9117 -0.2688 -0.3108 -vn -0.9202 -0.2357 -0.3125 -vn -0.9241 -0.2187 -0.3134 -vn -0.9245 -0.2170 -0.3134 -vn -0.9250 -0.2146 -0.3135 -vn -0.9254 -0.2130 -0.3135 -vn -0.9303 -0.1880 -0.3150 -vn -0.8994 -0.3081 -0.3100 -vn -0.8723 -0.3811 -0.3063 -vn -0.8852 -0.3481 -0.3085 -vn -0.8099 -0.5069 -0.2950 -vn -0.8676 -0.3900 -0.3086 -vn -0.8224 -0.4838 -0.2993 -vn -0.2148 -0.9627 -0.1643 -vn -0.3862 -0.8989 -0.2068 -vn -0.3513 -0.9152 -0.1976 -vn -0.5220 -0.8188 -0.2390 -vn -0.4832 -0.8449 -0.2293 -vn -0.6162 -0.7437 -0.2593 -vn -0.6187 -0.7414 -0.2599 -vn -0.6125 -0.7470 -0.2584 -vn -0.6099 -0.7493 -0.2578 -vn -0.6937 -0.6656 -0.2753 -vn -0.7518 -0.5936 -0.2873 -vn 0.0096 -0.9943 -0.1060 -vn -0.0113 -0.9937 -0.1116 -vn -0.0499 -0.9913 -0.1216 -vn -0.0815 -0.9881 -0.1303 -vn -0.1298 -0.9812 -0.1427 -vn -0.2281 -0.9590 -0.1679 -vn 0.0097 -1.0000 0.0001 -vn 0.0096 -1.0000 0.0000 -vn 0.7635 0.6070 -0.2203 -vn -0.7966 -0.5496 0.2515 -vn -0.7967 -0.5496 0.2515 -vn -0.7967 -0.5495 0.2514 -vn -0.7969 -0.5494 0.2512 -vn -0.7967 -0.5495 0.2516 -vn 0.8550 0.4589 -0.2417 -vn 0.7231 0.6490 -0.2365 -vn 0.7224 0.6485 -0.2400 -vn 0.7238 0.6495 -0.2329 -vn -0.8601 -0.4563 0.2279 -vn -0.8357 -0.4996 0.2281 -vn -0.9474 -0.2360 0.2163 -vn -0.9473 -0.2360 0.2164 -vn -0.9459 -0.2354 0.2232 -vn -0.9795 0.0874 0.1813 -vn -0.9347 0.3242 0.1455 -vn -0.9611 0.2251 0.1601 -vn -0.9611 0.2250 0.1599 -vn -0.9629 0.2237 0.1511 -vn -0.8408 0.5325 0.0971 -vn -0.7593 0.6471 0.0682 -vn -0.6986 0.7141 0.0459 -vn -0.5317 0.8469 -0.0009 -vn -0.5323 0.8465 -0.0037 -vn -0.5313 0.8472 0.0016 -vn -0.4083 0.9122 -0.0350 -vn -0.3410 0.9386 -0.0530 -vn -0.1372 0.9856 -0.0991 -vn 0.0292 0.9910 -0.1309 -vn 0.0972 0.9846 -0.1450 -vn 0.3207 0.9296 -0.1819 -vn 0.4809 0.8531 -0.2021 -vn 0.5340 0.8191 -0.2097 -vn 0.8204 0.5243 -0.2282 -vn 0.7791 0.5846 -0.2262 -vn 0.6767 0.6899 -0.2572 -vn 0.8844 0.4012 -0.2385 -vn 0.4745 0.8491 -0.2322 -vn 0.4750 0.8488 -0.2322 -vn 0.0219 0.9858 -0.1663 -vn 0.0218 0.9858 -0.1663 -vn -0.4152 0.9072 -0.0681 -vn -0.4151 0.9072 -0.0681 -vn -0.4155 0.9071 -0.0680 -vn -0.4155 0.9070 -0.0680 -vn -0.7643 0.6434 0.0434 -vn -0.7646 0.6430 0.0435 -vn -0.9459 -0.2354 0.2233 -vn -0.8839 -0.4023 0.2387 -vn -0.8268 -0.5085 0.2404 -vn -0.8345 0.5436 -0.0900 -vn -0.8334 0.5453 -0.0898 -vn -0.8340 0.5444 -0.0898 -vn 0.5359 0.8311 0.1484 -vn 0.5276 0.8365 0.1478 -vn 0.5249 0.8383 0.1474 -vn 0.5209 0.8408 0.1471 -vn 0.1722 0.9797 0.1021 -vn 0.1701 0.9801 0.1025 -vn 0.1682 0.9805 0.1019 -vn -0.8029 -0.5709 -0.1715 -vn -0.8502 -0.4973 -0.1727 -vn -0.8502 -0.4973 -0.1726 -vn -0.8500 -0.4977 -0.1724 -vn -0.9572 -0.2349 -0.1694 -vn -0.9573 -0.2344 -0.1693 -vn -0.9574 -0.2340 -0.1693 -vn -0.9575 -0.2336 -0.1693 -vn -0.9766 0.1617 -0.1419 -vn -0.9764 0.1628 -0.1418 -vn -0.9763 0.1635 -0.1417 -vn -0.5702 0.8211 -0.0268 -vn -0.5687 0.8221 -0.0266 -vn -0.5677 0.8228 -0.0262 -vn -0.5669 0.8234 -0.0266 -vn -0.2290 0.9727 0.0388 -vn -0.2268 0.9732 0.0390 -vn -0.2253 0.9735 0.0395 -vn -0.7289 -0.6641 -0.1662 -vn -0.7668 -0.6194 -0.1685 -vn -0.8501 -0.4976 -0.1724 -vn -0.9575 -0.2336 -0.1692 -vn -0.9073 -0.3824 -0.1748 -vn -0.9656 -0.1985 -0.1678 -vn -0.9762 0.1643 -0.1417 -vn -0.9762 0.1643 -0.1416 -vn -0.8353 0.5424 -0.0902 -vn -0.5671 0.8232 -0.0267 -vn -0.5667 0.8235 -0.0266 -vn -0.8335 0.5451 -0.0901 -vn -0.8334 0.5453 -0.0900 -vn -0.9677 0.2116 -0.1368 -vn -0.9874 0.0061 -0.1580 -vn -0.3438 0.9389 0.0175 -vn -0.2236 0.9739 0.0385 -vn -0.2237 0.9739 0.0391 -vn 0.1653 0.9810 0.1017 -vn 0.5400 0.8284 0.1488 -vn 0.5332 0.8329 0.1479 -vn 0.2513 0.9613 0.1132 -vn 0.1724 0.9798 0.1014 -vn 0.0483 0.9953 0.0838 -vn -0.1580 0.9861 0.0504 -vn -0.5698 0.8217 -0.0107 -vn -0.0973 0.9675 0.2336 -vn 0.6767 0.7200 -0.1537 -vn 0.6776 0.7190 -0.1544 -vn 0.6773 0.7194 -0.1542 -vn 0.5362 0.8264 0.1718 -vn -0.7110 -0.5857 -0.3892 -vn 0.0026 0.1248 -0.9922 -vn 0.0038 0.1161 -0.9932 -vn -0.0007 0.1176 -0.9931 -vn 0.7851 -0.5454 -0.2936 -vn 0.8261 -0.4151 -0.3811 -vn 0.6829 -0.5705 -0.4563 -vn 0.9359 -0.3127 -0.1624 -vn 0.9361 -0.3129 -0.1609 -vn 0.9344 -0.3120 -0.1721 -vn 0.8687 -0.4236 -0.2566 -vn 0.6030 -0.4093 -0.6848 -vn 0.5489 -0.4528 -0.7026 -vn 0.7165 -0.3428 -0.6076 -vn 0.2731 -0.3225 -0.9063 -vn 0.5251 -0.1964 -0.8280 -vn 0.5964 -0.2423 -0.7653 -vn 0.0542 0.1145 -0.9919 -vn 0.0642 -0.2542 -0.9650 -vn 0.1558 0.0532 -0.9864 -vn 0.4405 -0.1311 -0.8881 -vn 0.0358 0.0974 -0.9946 -vn 0.0355 0.0969 -0.9947 -vn 0.0354 0.0969 -0.9947 -vn 0.0352 0.0966 -0.9947 -vn 0.0355 0.1148 -0.9928 -vn 0.0281 0.1084 -0.9937 -vn 0.0313 0.1133 -0.9931 -vn 0.0221 0.1067 -0.9940 -vn 0.0229 0.1166 -0.9929 -vn 0.0172 0.1257 -0.9919 -vn 0.0126 0.1085 -0.9940 -vn 0.0198 0.1162 -0.9930 -vn -0.0103 0.1033 -0.9946 -vn -0.0059 0.1181 -0.9930 -vn 0.0004 0.1259 -0.9920 -vn -0.0269 0.1166 -0.9928 -vn -0.0239 0.1155 -0.9930 -vn -0.0234 0.1083 -0.9938 -vn -0.0186 0.1100 -0.9938 -vn -0.0202 0.1143 -0.9932 -vn -0.0091 0.1272 -0.9918 -vn -0.0322 0.1109 -0.9933 -vn -0.0429 0.1079 -0.9932 -vn -0.0435 0.1074 -0.9933 -vn -0.0442 0.0930 -0.9947 -vn -0.0382 0.0868 -0.9955 -vn -0.0415 0.0904 -0.9950 -vn -0.0493 0.0973 -0.9940 -vn -0.0727 -0.1760 -0.9817 -vn -0.1225 0.0584 -0.9907 -vn -0.0503 0.0980 -0.9939 -vn -0.3314 -0.4386 -0.8354 -vn -0.3648 -0.1098 -0.9246 -vn -0.2619 -0.0410 -0.9642 -vn -0.8589 -0.3591 -0.3651 -vn -0.4629 -0.1689 -0.8702 -vn -0.6472 -0.3802 -0.6607 -vn -0.6255 -0.4006 -0.6695 -vn -0.8181 -0.4461 -0.3627 -vn -0.7996 -0.4705 -0.3731 -vn 0.5074 0.8077 0.3004 -vn 0.4078 0.8544 0.3220 -vn 0.5322 0.7075 0.4649 -vn 0.4785 0.6651 0.5733 -vn 0.2350 0.7806 0.5792 -vn 0.4091 0.5815 0.7032 -vn 0.4808 0.2905 0.8273 -vn 0.1375 0.5706 0.8096 -vn 0.3414 0.5296 0.7765 -vn 0.1603 0.4454 0.8809 -vn 0.1942 0.1465 0.9700 -vn 0.0818 0.3915 0.9166 -vn 0.0002 0.1507 0.9886 -vn -0.0163 0.2062 0.9784 -vn -0.0821 0.1856 0.9792 -vn -0.0760 0.1640 0.9835 -vn -0.0606 0.2113 0.9755 -vn -0.0578 0.1885 0.9804 -vn -0.0339 0.2031 0.9786 -vn -0.0344 0.1940 0.9804 -vn -0.0342 0.1972 0.9798 -vn -0.0337 0.2060 0.9780 -vn -0.0148 0.1806 0.9834 -vn -0.0134 0.1861 0.9824 -vn -0.0150 0.1802 0.9835 -vn -0.0153 0.1788 0.9838 -vn 0.0077 0.2386 0.9711 -vn -0.0030 0.1701 0.9854 -vn 0.0309 0.2256 0.9737 -vn 0.0201 0.1871 0.9821 -vn 0.0496 0.2013 0.9783 -vn 0.0490 0.2000 0.9786 -vn 0.0492 0.2005 0.9785 -vn 0.0497 0.2016 0.9782 -vn 0.0670 0.1837 0.9807 -vn 0.0779 0.2004 0.9766 -vn 0.0659 0.2411 0.9683 -vn -0.1966 0.0706 0.9779 -vn 0.0521 0.3606 0.9313 -vn -0.2936 0.2329 0.9271 -vn -0.1133 0.4096 0.9052 -vn -0.3881 0.3726 0.8430 -vn -0.2973 0.4534 0.8403 -vn -0.4411 0.5258 0.7273 -vn -0.4834 0.4929 0.7234 -vn -0.4811 0.6526 0.5854 -vn -0.6417 0.5312 0.5533 -vn -0.4514 0.8293 0.3294 -vn -0.5692 0.7635 0.3050 -vn -0.9413 0.2207 -0.2553 -vn -0.9520 0.0190 -0.3054 -vn -0.7341 0.6625 -0.1490 -vn -0.7338 0.6630 -0.1481 -vn -0.7342 0.6623 -0.1494 -vn -0.7649 0.6388 -0.0828 -vn -0.8204 0.5498 -0.1571 -vn -0.6498 0.7431 -0.1599 -vn -0.6902 0.6970 -0.1945 -vn -0.7337 0.6631 -0.1479 -vn -0.5055 0.8515 -0.1393 -vn -0.5760 0.7768 -0.2544 -vn -0.6396 0.7342 -0.2275 -vn -0.5381 0.7998 -0.2659 -vn -0.3887 0.8817 -0.2674 -vn -0.3886 0.8816 -0.2680 -vn -0.3887 0.8816 -0.2678 -vn -0.3889 0.8818 -0.2668 -vn -0.2654 0.9262 -0.2678 -vn -0.2653 0.9261 -0.2681 -vn -0.2654 0.9262 -0.2677 -vn -0.2655 0.9262 -0.2676 -vn -0.1679 0.9487 -0.2680 -vn -0.1680 0.9487 -0.2678 -vn -0.0688 0.9610 -0.2679 -vn -0.0689 0.9610 -0.2678 -vn -0.0689 0.9610 -0.2677 -vn 0.0311 0.9630 -0.2677 -vn 0.0311 0.9629 -0.2680 -vn 0.0312 0.9629 -0.2680 -vn 0.1306 0.9546 -0.2678 -vn 0.1306 0.9545 -0.2681 -vn 0.1306 0.9545 -0.2682 -vn 0.2288 0.9358 -0.2682 -vn 0.2287 0.9360 -0.2676 -vn 0.2287 0.9359 -0.2677 -vn 0.2288 0.9359 -0.2679 -vn 0.3299 0.9051 -0.2684 -vn 0.3298 0.9054 -0.2675 -vn 0.3298 0.9053 -0.2678 -vn 0.5684 0.7888 -0.2337 -vn 0.4972 0.8280 -0.2592 -vn 0.4552 0.8704 -0.1877 -vn 0.4156 0.8692 -0.2679 -vn 0.3299 0.9050 -0.2685 -vn 0.5872 0.8020 -0.1093 -vn 0.5987 0.7689 -0.2245 -vn 0.6763 0.7204 -0.1535 -vn -0.9365 0.2730 -0.2201 -vn -0.8490 0.3413 -0.4034 -vn -0.8487 0.3386 -0.4063 -vn -0.8487 0.3394 -0.4056 -vn -0.8491 0.3419 -0.4026 -vn -0.7022 0.4526 -0.5496 -vn -0.7012 0.4503 -0.5527 -vn -0.7015 0.4511 -0.5517 -vn -0.7025 0.4533 -0.5486 -vn -0.4848 0.6001 -0.6363 -vn -0.4831 0.5983 -0.6393 -vn -0.4836 0.5988 -0.6384 -vn -0.4853 0.6006 -0.6354 -vn -0.3094 0.7021 -0.6413 -vn -0.3092 0.7018 -0.6417 -vn -0.3093 0.7019 -0.6416 -vn -0.3095 0.7022 -0.6412 -vn -0.2109 0.7368 -0.6424 -vn -0.2109 0.7367 -0.6425 -vn -0.2111 0.7369 -0.6422 -vn -0.2111 0.7370 -0.6421 -vn -0.1335 0.7547 -0.6424 -vn -0.1336 0.7548 -0.6422 -vn -0.0547 0.7645 -0.6423 -vn -0.0547 0.7644 -0.6424 -vn 0.0247 0.7660 -0.6424 -vn 0.0247 0.7660 -0.6423 -vn 0.0247 0.7659 -0.6424 -vn 0.1038 0.7594 -0.6423 -vn 0.1038 0.7593 -0.6424 -vn 0.1039 0.7593 -0.6425 -vn 0.1818 0.7446 -0.6423 -vn 0.1818 0.7447 -0.6422 -vn 0.1818 0.7444 -0.6425 -vn 0.1818 0.7443 -0.6426 -vn 0.2622 0.7200 -0.6425 -vn 0.2622 0.7204 -0.6421 -vn 0.2622 0.7203 -0.6423 -vn 0.2623 0.7198 -0.6427 -vn 0.4073 0.6491 -0.6426 -vn 0.4070 0.6537 -0.6381 -vn 0.4071 0.6523 -0.6394 -vn 0.4073 0.6477 -0.6439 -vn 0.6451 0.5161 -0.5634 -vn 0.6444 0.5193 -0.5613 -vn 0.6446 0.5183 -0.5620 -vn 0.6453 0.5152 -0.5641 -vn 0.8108 0.4094 -0.4182 -vn 0.8095 0.4134 -0.4170 -vn 0.8098 0.4123 -0.4174 -vn 0.8112 0.4084 -0.4186 -vn 0.9376 -0.0557 -0.3432 -vn 0.7963 0.0371 -0.6037 -vn 0.7963 0.0322 -0.6040 -vn 0.7963 0.0335 -0.6039 -vn 0.7964 0.0384 -0.6036 -vn 0.5763 0.1806 -0.7970 -vn 0.5760 0.1769 -0.7981 -vn 0.5761 0.1781 -0.7978 -vn 0.5764 0.1818 -0.7967 -vn 0.2872 0.3442 -0.8939 -vn 0.2867 0.3398 -0.8958 -vn 0.2869 0.3412 -0.8952 -vn 0.2874 0.3456 -0.8933 -vn 0.1487 0.4083 -0.9006 -vn 0.1487 0.4084 -0.9006 -vn 0.1030 0.4220 -0.9007 -vn 0.1030 0.4219 -0.9008 -vn 0.1030 0.4221 -0.9007 -vn 0.0588 0.4304 -0.9007 -vn 0.0588 0.4302 -0.9008 -vn 0.0588 0.4307 -0.9006 -vn 0.0140 0.4344 -0.9006 -vn 0.0140 0.4343 -0.9006 -vn -0.0310 0.4334 -0.9007 -vn -0.0310 0.4334 -0.9006 -vn -0.0310 0.4335 -0.9006 -vn -0.0757 0.4280 -0.9006 -vn -0.0757 0.4279 -0.9006 -vn -0.1196 0.4179 -0.9006 -vn -0.1196 0.4178 -0.9006 -vn -0.1755 0.3986 -0.9002 -vn -0.1756 0.3986 -0.9002 -vn -0.1754 0.3984 -0.9003 -vn -0.3451 0.2980 -0.8900 -vn -0.3470 0.2999 -0.8886 -vn -0.3465 0.2993 -0.8890 -vn -0.3446 0.2974 -0.8904 -vn -0.6115 0.1156 -0.7827 -vn -0.6136 0.1184 -0.7807 -vn -0.6129 0.1175 -0.7813 -vn -0.6109 0.1148 -0.7834 -vn -0.8094 -0.0375 -0.5861 -vn -0.8113 -0.0343 -0.5836 -vn -0.8108 -0.0351 -0.5842 -vn -0.8089 -0.0384 -0.5867 -vn -0.9384 -0.1346 -0.3183 -vn -0.9216 -0.1801 -0.3439 -vn -0.1836 0.9131 0.3642 -vn -0.1824 0.9128 0.3654 -vn -0.1828 0.9129 0.3651 -vn -0.1839 0.9131 0.3638 -vn -0.2647 0.8532 0.4494 -vn -0.2645 0.8530 0.4499 -vn -0.2646 0.8531 0.4497 -vn -0.2649 0.8533 0.4491 -vn -0.3155 0.8164 0.4837 -vn -0.3154 0.8161 0.4842 -vn -0.3155 0.8163 0.4838 -vn -0.3156 0.8164 0.4836 -vn -0.3587 0.7871 0.5018 -vn -0.3587 0.7871 0.5019 -vn -0.3587 0.7872 0.5016 -vn -0.3587 0.7873 0.5015 -vn -0.3981 0.7630 0.5092 -vn -0.3982 0.7630 0.5093 -vn -0.3981 0.7631 0.5090 -vn -0.3981 0.7632 0.5090 -vn -0.3480 0.7880 0.5079 -vn -0.3480 0.7884 0.5072 -vn -0.3480 0.7882 0.5075 -vn -0.3480 0.7880 0.5080 -vn -0.2374 0.8277 0.5084 -vn -0.2373 0.8278 0.5084 -vn -0.2374 0.8275 0.5087 -vn -0.2374 0.8275 0.5088 -vn -0.1502 0.8478 0.5086 -vn -0.1502 0.8479 0.5085 -vn -0.1502 0.8479 0.5084 -vn -0.0615 0.8589 0.5084 -vn -0.0615 0.8589 0.5085 -vn -0.0615 0.8588 0.5085 -vn 0.0278 0.8606 0.5085 -vn 0.0278 0.8606 0.5086 -vn 0.1169 0.8531 0.5084 -vn 0.1168 0.8529 0.5088 -vn 0.1170 0.8532 0.5083 -vn 0.2046 0.8364 0.5085 -vn 0.2046 0.8363 0.5086 -vn 0.2047 0.8366 0.5082 -vn 0.2048 0.8366 0.5081 -vn 0.2953 0.8092 0.5080 -vn 0.2950 0.8089 0.5085 -vn 0.2950 0.8090 0.5085 -vn 0.3434 0.7891 0.5093 -vn 0.3437 0.7892 0.5090 -vn 0.3435 0.7891 0.5093 -vn 0.3434 0.7891 0.5094 -vn 0.3054 0.8080 0.5039 -vn 0.3054 0.8080 0.5038 -vn 0.3053 0.8080 0.5040 -vn 0.3053 0.8079 0.5040 -vn 0.2607 0.8329 0.4882 -vn 0.2608 0.8329 0.4881 -vn 0.2606 0.8328 0.4884 -vn 0.2605 0.8328 0.4884 -vn 0.2087 0.8644 0.4573 -vn 0.2089 0.8645 0.4572 -vn 0.2086 0.8645 0.4574 -vn 0.2081 0.8644 0.4576 -vn 0.1014 0.9804 0.1689 -vn 0.0325 0.9778 0.2071 -vn 0.1191 0.9184 0.3773 -vn 0.2215 0.9401 0.2592 -vn 0.1541 0.9002 0.4074 -vn 0.2960 0.9023 0.3135 -vn 0.1795 0.8106 0.5574 -vn 0.1804 0.8099 0.5581 -vn 0.1801 0.8101 0.5579 -vn 0.1793 0.8107 0.5573 -vn 0.0505 0.7145 0.6978 -vn 0.0505 0.7144 0.6979 -vn 0.0504 0.7147 0.6976 -vn 0.0503 0.7148 0.6975 -vn -0.0446 0.6455 0.7625 -vn -0.0444 0.6450 0.7629 -vn -0.0444 0.6451 0.7628 -vn -0.1374 0.5824 0.8012 -vn -0.1374 0.5825 0.8011 -vn -0.1374 0.5826 0.8011 -vn -0.2320 0.5244 0.8192 -vn -0.2320 0.5242 0.8194 -vn -0.2320 0.5249 0.8190 -vn -0.2320 0.5249 0.8189 -vn -0.2319 0.5250 0.8189 -vn -0.2318 0.5246 0.8192 -vn -0.1580 0.5506 0.8197 -vn -0.1580 0.5507 0.8196 -vn -0.1000 0.5642 0.8196 -vn -0.0410 0.5715 0.8196 -vn -0.0410 0.5714 0.8196 -vn 0.0185 0.5726 0.8196 -vn 0.0186 0.5727 0.8195 -vn 0.0186 0.5728 0.8195 -vn 0.0778 0.5677 0.8195 -vn 0.0778 0.5678 0.8195 -vn 0.1362 0.5565 0.8196 -vn 0.1363 0.5567 0.8195 -vn 0.1964 0.5384 0.8195 -vn 0.1965 0.5384 0.8195 -vn 0.2092 0.5329 0.8199 -vn 0.2094 0.5331 0.8197 -vn 0.2090 0.5328 0.8200 -vn 0.1131 0.5803 0.8065 -vn 0.1132 0.5804 0.8064 -vn 0.1129 0.5802 0.8066 -vn 0.1128 0.5802 0.8067 -vn 0.0138 0.6356 0.7719 -vn 0.0139 0.6356 0.7719 -vn 0.0136 0.6355 0.7720 -vn 0.0135 0.6355 0.7720 -vn -0.0866 0.6964 0.7124 -vn -0.0862 0.6966 0.7122 -vn -0.0866 0.6965 0.7124 -vn -0.0867 0.6964 0.7124 -vn -0.1793 0.7575 0.6277 -vn -0.1792 0.7576 0.6277 -vn -0.1795 0.7575 0.6277 -vn -0.1796 0.7575 0.6277 -vn -0.2653 0.8142 0.5164 -vn -0.2644 0.8145 0.5165 -vn -0.2648 0.8143 0.5165 -vn -0.2654 0.8142 0.5165 -vn -0.3680 0.8774 0.3078 -vn -0.2842 0.9068 0.3114 -vn 0.2196 0.9346 0.2798 -vn 0.0236 0.9738 0.2262 -vn -0.1067 0.9736 0.2016 -vn -0.1762 0.9708 0.1628 -vn -0.3562 0.9295 0.0961 -vn 0.9376 -0.1099 -0.3298 -vn 0.9455 0.0926 -0.3121 -vn 0.9044 0.3510 -0.2426 -vn 0.9269 0.2918 -0.2361 -vn 0.6937 0.7095 -0.1240 -vn 0.7844 0.6095 -0.1149 -vn 0.5049 0.8631 -0.0079 -vn -0.4731 0.8788 0.0621 -vn -0.4997 0.8581 0.1182 -vn -0.4992 0.8583 0.1189 -vn -0.4993 0.8582 0.1187 -vn -0.4998 0.8581 0.1180 -vn -0.5196 0.8430 0.1390 -vn -0.5197 0.8430 0.1389 -vn -0.5198 0.8429 0.1391 -vn -0.5086 0.8505 0.1344 -vn -0.5086 0.8505 0.1343 -vn -0.4888 0.8626 0.1305 -vn -0.4888 0.8626 0.1304 -vn -0.4889 0.8625 0.1308 -vn -0.4889 0.8625 0.1309 -vn -0.4003 0.9071 0.1305 -vn -0.4002 0.9073 0.1293 -vn -0.4002 0.9072 0.1299 -vn -0.4003 0.9070 0.1310 -vn -0.2732 0.9531 0.1304 -vn -0.2732 0.9531 0.1303 -vn -0.2732 0.9530 0.1306 -vn -0.1729 0.9763 0.1303 -vn -0.1729 0.9763 0.1302 -vn -0.1730 0.9762 0.1306 -vn -0.1730 0.9762 0.1307 -vn -0.0709 0.9889 0.1303 -vn -0.0709 0.9889 0.1304 -vn -0.0709 0.9889 0.1305 -vn -0.0708 0.9890 0.1302 -vn 0.0320 0.9910 0.1301 -vn 0.0320 0.9910 0.1302 -vn 0.1346 0.9823 0.1301 -vn 0.1344 0.9823 0.1305 -vn 0.1345 0.9823 0.1303 -vn 0.1346 0.9824 0.1299 -vn 0.2356 0.9631 0.1300 -vn 0.2355 0.9631 0.1304 -vn 0.3396 0.9315 0.1304 -vn 0.3395 0.9314 0.1308 -vn 0.3398 0.9315 0.1299 -vn 0.3398 0.9315 0.1298 -vn 0.4133 0.9013 0.1298 -vn 0.4128 0.9014 0.1307 -vn 0.4130 0.9013 0.1306 -vn 0.4134 0.9013 0.1296 -vn 0.4367 0.8897 0.1330 -vn 0.4368 0.8897 0.1329 -vn 0.4368 0.8897 0.1328 -vn 0.4512 0.8817 0.1379 -vn 0.4512 0.8817 0.1380 -vn 0.4514 0.8816 0.1380 -vn 0.4536 0.8803 0.1392 -vn 0.4537 0.8802 0.1391 -vn 0.4340 0.8926 0.1220 -vn 0.4348 0.8923 0.1216 -vn 0.4345 0.8924 0.1218 -vn 0.4338 0.8927 0.1222 -vn 0.4046 0.9122 0.0644 -vn 0.2844 0.9534 0.1003 -vn -0.5987 0.7869 0.1493 -vn -0.5889 0.7945 0.1486 -vn -0.5956 0.7893 0.1489 -vn 0.8122 -0.5583 -0.1692 -vn 0.8006 -0.5752 -0.1683 -vn 0.8005 -0.5751 -0.1685 -vn 0.7963 -0.5810 -0.1683 -vn 0.8857 -0.4309 -0.1727 -vn 0.8855 -0.4313 -0.1728 -vn 0.8856 -0.4312 -0.1727 -vn 0.8854 -0.4315 -0.1729 -vn 0.9342 -0.3121 -0.1730 -vn 0.9724 -0.1604 -0.1697 -vn 0.9724 -0.1604 -0.1696 -vn 0.9609 0.2378 -0.1416 -vn 0.9609 0.2379 -0.1420 -vn 0.9845 0.0818 -0.1554 -vn 0.9780 -0.1236 -0.1678 -vn 0.1487 0.9880 0.0409 -vn 0.1481 0.9882 0.0396 -vn 0.1482 0.9881 0.0403 -vn 0.2709 0.9624 0.0185 -vn 0.5023 0.8643 -0.0253 -vn 0.5023 0.8643 -0.0257 -vn 0.5021 0.8644 -0.0255 -vn 0.5019 0.8646 -0.0256 -vn 0.7894 0.6074 -0.0891 -vn 0.7893 0.6075 -0.0892 -vn 0.7891 0.6077 -0.0892 -vn 0.9486 0.2855 -0.1363 -vn -0.6032 0.7835 0.1496 -vn -0.3250 0.9388 0.1143 -vn -0.2467 0.9635 0.1039 -vn -0.2474 0.9635 0.1025 -vn -0.2472 0.9634 0.1032 -vn -0.1248 0.9885 0.0849 -vn 0.0812 0.9954 0.0516 -vn -0.5861 0.7964 0.1490 -vn -0.5898 0.7936 0.1491 -vn -0.2466 0.9635 0.1039 -vn 0.5025 0.8642 -0.0250 -vn 0.7897 0.6070 -0.0889 -vn 0.7895 0.6073 -0.0889 -vn 0.9610 0.2376 -0.1413 -vn 0.9723 -0.1608 -0.1694 -vn 0.8852 -0.4318 -0.1731 -vn 0.7933 -0.5851 -0.1682 -vn 0.7984 -0.5780 -0.1687 -vn -0.5860 0.7964 0.1496 -vn 0.8332 -0.4486 0.3232 -vn 0.8360 -0.4518 0.3114 -vn 0.8337 -0.4491 0.3214 -vn 0.8161 -0.5133 0.2657 -vn 0.8064 -0.5889 -0.0537 -vn 0.8587 -0.5076 -0.0702 -vn -0.5284 0.8462 0.0689 -vn -0.6000 0.7990 -0.0390 -vn -0.4381 0.8986 0.0220 -vn -0.2533 0.9674 0.0082 -vn -0.2554 0.9668 0.0079 -vn -0.2598 0.9656 0.0073 -vn -0.2620 0.9651 0.0070 -vn 0.1443 0.9893 -0.0221 -vn 0.1425 0.9895 -0.0223 -vn 0.1388 0.9901 -0.0229 -vn 0.1370 0.9903 -0.0231 -vn 0.5036 0.8626 -0.0479 -vn 0.5023 0.8634 -0.0482 -vn 0.4995 0.8649 -0.0486 -vn 0.4981 0.8658 -0.0489 -vn 0.7967 0.6006 -0.0670 -vn 0.7959 0.6016 -0.0673 -vn 0.7940 0.6041 -0.0679 -vn 0.7931 0.6052 -0.0682 -vn 0.9709 0.2271 -0.0761 -vn 0.9706 0.2282 -0.0764 -vn 0.9699 0.2308 -0.0771 -vn 0.9696 0.2320 -0.0774 -vn 0.9826 -0.1706 -0.0728 -vn 0.9828 -0.1698 -0.0731 -vn 0.9830 -0.1679 -0.0736 -vn 0.9832 -0.1671 -0.0739 -vn 0.8973 -0.4368 -0.0638 -vn -0.5999 0.7640 -0.2376 -vn -0.5988 0.7649 -0.2374 -vn -0.5967 0.7667 -0.2369 -vn -0.5956 0.7676 -0.2366 -vn -0.2445 0.9439 -0.2222 -vn -0.2450 0.9437 -0.2223 -vn -0.2459 0.9434 -0.2226 -vn -0.2463 0.9433 -0.2227 -vn 0.1509 0.9734 -0.1726 -vn 0.1505 0.9734 -0.1728 -vn 0.1495 0.9735 -0.1732 -vn 0.1490 0.9735 -0.1734 -vn 0.5062 0.8564 -0.1017 -vn 0.5053 0.8572 -0.0996 -vn 0.5053 0.8572 -0.0997 -vn 0.7942 0.6076 -0.0084 -vn 0.7943 0.6075 -0.0083 -vn 0.7948 0.6069 -0.0079 -vn 0.7948 0.6068 -0.0079 -vn 0.9649 0.2471 0.0890 -vn 0.9650 0.2465 0.0893 -vn 0.9653 0.2453 0.0900 -vn 0.9654 0.2447 0.0903 -vn 0.9752 -0.1420 0.1698 -vn 0.9751 -0.1426 0.1701 -vn 0.9747 -0.1440 0.1707 -vn 0.9746 -0.1446 0.1710 -vn 0.7678 -0.5969 0.2326 -vn 0.8546 -0.4951 0.1567 -vn 0.5622 0.8260 -0.0411 -vn 0.5534 0.8320 -0.0395 -vn 0.5619 0.8262 -0.0405 -vn -0.6741 0.7368 -0.0513 -vn -0.6300 0.7754 -0.0421 -vn -0.6322 0.7737 -0.0420 -vn -0.6275 0.7775 -0.0413 -vn -0.6240 0.7803 -0.0414 -vn -0.6217 0.7805 -0.0653 -vn -0.6217 0.7805 -0.0657 -vn -0.6216 0.7806 -0.0651 -vn -0.6217 0.7806 -0.0649 -vn -0.6899 0.7220 -0.0523 -vn -0.6830 0.7285 -0.0532 -vn -0.6909 0.7209 -0.0539 -vn -0.6923 0.7196 -0.0547 -vn -0.6906 0.7212 -0.0549 -vn -0.6920 0.7198 -0.0547 -vn -0.6923 0.7195 -0.0547 -vn -0.6921 0.7197 -0.0547 -vn -0.6909 0.7209 -0.0553 -vn -0.6908 0.7210 -0.0538 -vn -0.5318 0.8464 -0.0289 -vn -0.5550 0.8313 -0.0315 -vn -0.5578 0.8294 -0.0318 -vn -0.5510 0.8339 -0.0311 -vn -0.5482 0.8358 -0.0308 -vn -0.5885 0.8076 -0.0367 -vn -0.6158 0.7868 -0.0403 -vn -0.6280 0.7766 -0.0505 -vn -0.6283 0.7764 -0.0499 -vn -0.4947 0.8687 -0.0243 -vn -0.4637 0.8857 -0.0202 -vn -0.4653 0.8849 -0.0203 -vn -0.4613 0.8870 -0.0200 -vn -0.4597 0.8878 -0.0199 -vn -0.4366 0.8995 -0.0181 -vn -0.3725 0.9279 -0.0128 -vn -0.3712 0.9284 -0.0127 -vn -0.3745 0.9271 -0.0128 -vn -0.3758 0.9266 -0.0129 -vn -0.2798 0.9600 -0.0062 -vn -0.2801 0.9600 -0.0035 -vn -0.2787 0.9603 -0.0059 -vn -0.2787 0.9604 -0.0061 -vn -0.2140 0.9768 -0.0035 -vn -0.1816 0.9834 -0.0018 -vn -0.1816 0.9834 -0.0012 -vn -0.1755 0.9845 -0.0004 -vn -0.1647 0.9863 -0.0017 -vn -0.0989 0.9951 -0.0003 -vn -0.0935 0.9956 -0.0002 -vn -0.0897 0.9960 0.0001 -vn -0.0845 0.9964 -0.0000 -vn -0.0499 0.9988 -0.0000 -vn 0.0134 0.9999 -0.0001 -vn 0.0122 0.9999 -0.0005 -vn 0.0147 0.9999 -0.0004 -vn 0.0166 0.9999 -0.0002 -vn 0.1104 0.9939 -0.0020 -vn 0.1083 0.9941 -0.0015 -vn 0.1127 0.9936 -0.0020 -vn 0.1158 0.9933 -0.0023 -vn 0.2084 0.9780 -0.0031 -vn 0.2084 0.9780 -0.0061 -vn 0.2084 0.9780 -0.0030 -vn 0.2321 0.9727 -0.0063 -vn 0.1822 0.9833 -0.0050 -vn 0.4973 0.8670 -0.0317 -vn 0.4474 0.8940 -0.0262 -vn 0.3986 0.9169 -0.0200 -vn 0.3962 0.9180 -0.0199 -vn 0.3925 0.9195 -0.0196 -vn 0.3900 0.9206 -0.0195 -vn 0.3015 0.9534 -0.0066 -vn 0.3015 0.9534 -0.0124 -vn 0.3005 0.9538 -0.0011 -vn 0.3452 0.9384 -0.0140 -vn 0.2962 0.9551 -0.0118 -vn 0.4848 0.8741 -0.0311 -vn 0.5414 0.8400 -0.0358 -vn 0.5285 0.8482 -0.0346 -vn 0.5620 0.8245 -0.0651 -vn 0.5621 0.8246 -0.0643 -vn 0.5620 0.8245 -0.0659 -vn 0.5591 0.8253 -0.0791 -vn 0.5613 0.8244 -0.0724 -vn 0.5608 0.8247 -0.0738 -vn 0.5584 0.8256 -0.0811 -vn 0.5711 0.8198 -0.0423 -vn 0.5727 0.8187 -0.0423 -vn 0.5730 0.8185 -0.0421 -vn 0.5730 0.8185 -0.0418 -vn 0.5729 0.8186 -0.0418 -vn 0.5881 0.8075 -0.0449 -vn 0.6307 0.7742 -0.0529 -vn 0.6298 0.7750 -0.0527 -vn 0.6341 0.7714 -0.0539 -vn 0.6342 0.7713 -0.0541 -vn 0.6335 0.7719 -0.0541 -vn 0.5238 0.7824 -0.3368 -vn -0.8022 -0.5705 -0.1761 -vn -0.7738 -0.6261 -0.0965 -vn 0.4804 0.8327 -0.2753 -vn 0.5400 0.8240 -0.1719 -vn 0.3962 0.8874 -0.2359 -vn 0.1759 0.9588 -0.2232 -vn 0.1755 0.9588 -0.2232 -vn 0.1745 0.9590 -0.2233 -vn 0.1739 0.9591 -0.2234 -vn -0.2207 0.9597 -0.1738 -vn -0.2211 0.9596 -0.1738 -vn -0.2221 0.9594 -0.1739 -vn -0.2225 0.9593 -0.1739 -vn -0.5673 0.8174 -0.1003 -vn -0.5674 0.8173 -0.1003 -vn -0.5678 0.8170 -0.1003 -vn -0.5679 0.8170 -0.1003 -vn -0.8375 0.5463 -0.0087 -vn -0.8373 0.5466 -0.0087 -vn -0.8371 0.5470 -0.0087 -vn -0.8368 0.5474 -0.0087 -vn -0.9809 0.1728 0.0893 -vn -0.9808 0.1735 0.0893 -vn -0.9805 0.1750 0.0893 -vn -0.9804 0.1757 0.0893 -vn -0.9614 -0.2160 0.1704 -vn -0.9615 -0.2154 0.1705 -vn -0.9619 -0.2139 0.1706 -vn -0.9620 -0.2133 0.1706 -vn -0.8067 -0.5477 0.2218 -vn -0.8148 -0.5348 0.2239 -vn 0.5355 0.8438 0.0346 -vn 0.5352 0.8440 0.0345 -vn 0.5345 0.8444 0.0343 -vn 0.5342 0.8447 0.0342 -vn 0.1804 0.9836 0.0062 -vn 0.1805 0.9836 0.0062 -vn 0.1808 0.9835 0.0063 -vn 0.1810 0.9835 0.0064 -vn -0.2178 0.9757 -0.0240 -vn -0.2173 0.9758 -0.0238 -vn -0.2177 0.9757 -0.0239 -vn -0.2172 0.9758 -0.0238 -vn -0.5662 0.8228 -0.0493 -vn -0.5661 0.8229 -0.0493 -vn -0.8387 0.5403 -0.0682 -vn -0.8389 0.5399 -0.0683 -vn -0.8388 0.5402 -0.0682 -vn -0.8390 0.5399 -0.0683 -vn -0.9848 0.1555 -0.0769 -vn -0.9849 0.1553 -0.0770 -vn -0.9849 0.1549 -0.0771 -vn -0.9850 0.1547 -0.0771 -vn -0.9675 -0.2419 -0.0731 -vn -0.9675 -0.2422 -0.0731 -vn -0.9674 -0.2426 -0.0732 -vn -0.9673 -0.2427 -0.0733 -vn -0.7194 -0.6927 -0.0512 -vn -0.8226 -0.5683 0.0198 -vn 0.7926 0.0060 0.6097 -vn 0.7932 0.0002 0.6090 -vn 0.7931 0.0010 0.6091 -vn 0.7924 0.0070 0.6099 -vn 0.8209 -0.0683 0.5670 -vn 0.8455 -0.0936 0.5257 -vn 0.8430 -0.0786 0.5322 -vn 0.8564 -0.1721 0.4868 -vn 0.8549 -0.1431 0.4987 -vn 0.9014 -0.2062 0.3806 -vn 0.9014 -0.2056 0.3811 -vn 0.9013 -0.2054 0.3813 -vn 0.9013 -0.2051 0.3816 -vn 0.8908 -0.1625 0.4243 -vn 0.9773 -0.0187 0.2111 -vn 0.9774 -0.0190 0.2107 -vn 0.9779 -0.0208 0.2080 -vn 0.9758 -0.0836 0.2021 -vn 0.9737 -0.0831 0.2122 -vn 0.9751 -0.1038 0.1958 -vn 0.9664 -0.1430 0.2137 -vn 0.9659 -0.1737 0.1921 -vn 0.9530 -0.2177 0.2106 -vn 0.9545 -0.2273 0.1930 -vn 0.9407 -0.2415 0.2382 -vn 0.9407 -0.2407 0.2391 -vn 0.9407 -0.2404 0.2396 -vn 0.9406 -0.2400 0.2400 -vn 0.9307 -0.1989 0.3070 -vn 0.3505 0.6155 0.7059 -vn -0.1247 0.6939 0.7092 -vn -0.1022 0.6840 0.7223 -vn -0.4289 0.5503 0.7164 -vn -0.4519 0.5398 0.7103 -vn -0.3898 0.5906 0.7065 -vn -0.3804 0.5948 0.7082 -vn -0.3890 0.5911 0.7066 -vn -0.8630 0.0663 0.5009 -vn -0.8065 0.1302 0.5768 -vn -0.7142 0.2488 0.6542 -vn -0.7758 0.2032 0.5973 -vn -0.5291 0.3800 0.7587 -vn -0.7070 0.3606 0.6084 -vn -0.5779 0.4442 0.6847 -vn -0.3778 0.5959 0.7086 -vn -0.3652 0.6004 0.7115 -vn -0.3540 0.6165 0.7033 -vn -0.2826 0.6387 0.7156 -vn -0.3245 0.6592 0.6784 -vn -0.2239 0.6534 0.7232 -vn -0.2528 0.6635 0.7042 -vn -0.1823 0.6812 0.7090 -vn -0.2013 0.6899 0.6954 -vn -0.1666 0.6884 0.7059 -vn 0.9772 -0.0184 0.2114 -vn 0.9392 0.0433 0.3406 -vn 0.9623 -0.0566 0.2660 -vn 0.8608 0.1145 0.4959 -vn 0.8883 0.0635 0.4548 -vn 0.7939 0.1948 0.5760 -vn 0.7553 0.2593 0.6019 -vn 0.6752 0.3177 0.6657 -vn 0.5340 0.4849 0.6926 -vn 0.4854 0.5047 0.7139 -vn 0.3899 0.5918 0.7055 -vn 0.3437 0.6176 0.7074 -vn 0.1988 0.6733 0.7121 -vn 0.1710 0.6896 0.7037 -vn 0.1381 0.6882 0.7123 -vn 0.3338 0.6225 0.7079 -vn 0.3310 0.6234 0.7083 -vn 0.3184 0.6274 0.7106 -vn 0.3008 0.6488 0.6990 -vn 0.2601 0.6503 0.7138 -vn 0.2433 0.6660 0.7052 -vn 0.2070 0.6743 0.7089 -vn -0.8291 0.0859 0.5524 -vn -0.8940 0.0094 0.4481 -vn -0.9187 -0.0320 0.3936 -vn -0.9656 -0.0685 0.2507 -vn -0.9630 -0.0559 0.2636 -vn 0.1236 0.6983 0.7051 -vn 0.0734 0.7008 0.7096 -vn 0.0735 0.7008 0.7095 -vn 0.0368 0.7068 0.7065 -vn 0.0109 0.7037 0.7104 -vn 0.0105 0.7039 0.7102 -vn 0.0006 0.7089 0.7053 -vn 0.0000 0.7092 0.7050 -vn -0.0346 0.7052 0.7082 -vn -0.0616 0.7113 0.7001 -vn -0.0960 0.6886 0.7188 -vn -0.7896 -0.0540 0.6112 -vn -0.7805 -0.0480 0.6233 -vn -0.8158 -0.1260 0.5645 -vn -0.8163 -0.1263 0.5636 -vn -0.8182 -0.1278 0.5605 -vn -0.8187 -0.1282 0.5597 -vn -0.8277 -0.1543 0.5396 -vn -0.8438 -0.2034 0.4966 -vn -0.8383 -0.2050 0.5053 -vn -0.8391 -0.2043 0.5042 -vn -0.8382 -0.2044 0.5056 -vn -0.8759 -0.2278 0.4254 -vn -0.8841 -0.2724 0.3796 -vn -0.9179 -0.2553 0.3038 -vn -0.9203 -0.3109 0.2374 -vn -0.9351 -0.2971 0.1931 -vn -0.9355 -0.2840 0.2100 -vn -0.9515 -0.2413 0.1910 -vn -0.9507 -0.2234 0.2151 -vn -0.9653 -0.1743 0.1943 -vn -0.9637 -0.1610 0.2132 -vn -0.9638 -0.1610 0.2128 -vn -0.9640 -0.1606 0.2119 -vn -0.9667 -0.1574 0.2019 -vn -0.9737 -0.0932 0.2080 -vn -0.7718 -0.0184 0.6356 -vn -0.7614 0.0637 0.6451 -vn -0.7192 0.1201 0.6844 -vn -0.7488 0.1017 0.6549 -vn -0.7178 0.2062 0.6650 -vn -0.7032 0.2232 0.6750 -vn -0.6935 0.2737 0.6665 -vn -0.6663 0.3293 0.6690 -vn -0.6672 0.3238 0.6709 -vn -0.6595 0.3488 0.6659 -vn -0.6587 0.3452 0.6685 -vn -0.6871 0.3131 0.6556 -vn -0.7243 0.2226 0.6526 -vn -0.7245 0.2110 0.6562 -vn -0.7577 0.1514 0.6348 -vn -0.7728 0.1080 0.6253 -vn -0.7787 0.0758 0.6228 -vn -0.7938 0.0234 0.6077 -vn -0.7888 -0.0300 0.6139 -vn -0.7244 -0.3136 0.6139 -vn -0.7340 -0.3957 0.5520 -vn -0.7717 -0.2485 0.5855 -vn -0.7701 -0.2775 0.5744 -vn -0.7817 -0.2079 0.5880 -vn -0.7831 -0.1790 0.5955 -vn -0.7946 -0.1430 0.5900 -vn -0.7945 -0.0655 0.6037 -vn -0.7143 -0.3938 0.5786 -vn -0.6931 -0.4510 0.5624 -vn -0.6537 -0.5038 0.5647 -vn -0.6628 -0.4738 0.5798 -vn -0.6583 -0.4876 0.5735 -vn -0.6186 -0.5717 0.5390 -vn -0.6190 -0.5703 0.5401 -vn -0.6186 -0.5713 0.5394 -vn -0.6208 -0.5639 0.5446 -vn -0.5802 -0.5937 0.5575 -vn -0.5602 -0.6133 0.5568 -vn -0.5528 -0.6152 0.5621 -vn -0.5455 -0.6269 0.5563 -vn -0.5338 -0.6369 0.5563 -vn -0.5242 -0.6538 0.5456 -vn -0.4778 -0.6580 0.5821 -vn -0.4972 -0.6616 0.5614 -vn -0.4760 -0.6850 0.5516 -vn -0.4571 -0.6995 0.5493 -vn -0.4511 -0.7122 0.5379 -vn -0.3988 -0.7239 0.5630 -vn -0.4061 -0.7254 0.5558 -vn -0.3623 -0.7633 0.5349 -vn -0.3620 -0.7637 0.5345 -vn -0.3620 -0.7638 0.5345 -vn -0.3599 -0.7671 0.5311 -vn -0.3281 -0.7725 0.5437 -vn -0.3051 -0.7874 0.5356 -vn -0.2695 -0.7897 0.5511 -vn -0.2635 -0.7967 0.5439 -vn -0.2630 -0.7972 0.5434 -vn -0.2627 -0.7977 0.5429 -vn -0.2258 -0.8150 0.5336 -vn -0.1923 -0.8161 0.5450 -vn -0.1829 -0.8241 0.5360 -vn -0.1277 -0.8376 0.5312 -vn -0.1268 -0.8382 0.5304 -vn -0.1277 -0.8378 0.5309 -vn -0.1260 -0.8388 0.5296 -vn -0.0816 -0.8418 0.5336 -vn -0.0815 -0.8418 0.5336 -vn -0.0117 -0.8514 0.5244 -vn -0.0164 -0.8557 0.5172 -vn 0.0615 -0.8420 0.5360 -vn 0.0787 -0.8339 0.5463 -vn 0.0965 -0.8397 0.5345 -vn 0.1537 -0.8352 0.5281 -vn 0.1533 -0.8350 0.5284 -vn 0.1529 -0.8349 0.5287 -vn 0.1979 -0.8214 0.5350 -vn 0.1988 -0.8214 0.5346 -vn 0.2040 -0.8215 0.5324 -vn 0.2048 -0.8216 0.5321 -vn 0.2628 -0.8003 0.5389 -vn 0.2632 -0.7997 0.5396 -vn 0.3071 -0.7857 0.5370 -vn 0.3268 -0.7764 0.5389 -vn 0.3372 -0.7658 0.5476 -vn 0.3590 -0.7628 0.5379 -vn 0.3956 -0.7396 0.5445 -vn 0.3934 -0.7438 0.5404 -vn 0.4303 -0.7203 0.5441 -vn 0.4559 -0.6823 0.5715 -vn 0.4523 -0.7125 0.5364 -vn 0.5129 -0.6602 0.5487 -vn 0.4904 -0.6756 0.5505 -vn 0.4908 -0.6756 0.5502 -vn 0.4939 -0.6743 0.5490 -vn 0.4945 -0.6740 0.5488 -vn 0.5140 -0.6578 0.5505 -vn 0.5268 -0.6459 0.5525 -vn 0.5442 -0.6240 0.5608 -vn 0.5444 -0.6175 0.5677 -vn 0.5660 -0.6069 0.5579 -vn 0.5831 -0.5951 0.5531 -vn 0.5834 -0.5950 0.5529 -vn 0.5833 -0.5950 0.5530 -vn 0.5849 -0.5944 0.5519 -vn 0.5950 -0.5760 0.5606 -vn 0.5963 -0.5729 0.5623 -vn 0.6223 -0.5608 0.5461 -vn 0.6466 -0.4870 0.5871 -vn 0.6387 -0.5348 0.5532 -vn 0.7057 -0.4256 0.5665 -vn 0.7047 -0.4667 0.5344 -vn 0.7400 -0.3343 0.5837 -vn 0.7401 -0.3330 0.5843 -vn 0.7693 -0.2819 0.5733 -vn 0.7884 -0.2055 0.5798 -vn 0.7885 -0.2188 0.5748 -vn 0.7959 -0.1148 0.5944 -vn 0.7969 -0.1197 0.5921 -vn 0.8008 -0.0122 0.5988 -vn 0.7885 0.0307 0.6142 -vn 0.7818 0.1373 0.6082 -vn 0.6915 0.3083 0.6533 -vn 0.7082 0.2618 0.6556 -vn 0.7289 0.2411 0.6408 -vn 0.7807 0.1159 0.6140 -vn 0.7062 0.2332 0.6685 -vn 0.6476 0.2984 0.7011 -vn 0.7304 0.2741 0.6256 -vn 0.6154 0.3864 0.6870 -vn 0.6822 0.3515 0.6411 -vn 0.6344 0.3922 0.6661 -vn 0.6294 0.3930 0.6704 -vn 0.6609 0.3642 0.6562 -vn 0.7309 0.1892 0.6557 -vn 0.7379 0.1473 0.6587 -vn 0.7500 0.1257 0.6494 -vn 0.7685 0.0507 0.6378 -vn 0.7538 0.0661 0.6537 -vn 0.6916 0.4343 -0.5771 -vn 0.6975 0.4179 -0.5821 -vn 0.7142 0.3617 -0.5992 -vn 0.7088 0.3898 -0.5879 -vn 0.7532 0.2593 -0.6045 -vn 0.7635 0.1426 -0.6298 -vn 0.7612 0.1102 -0.6391 -vn 0.7676 0.0243 -0.6404 -vn 0.7503 -0.0997 -0.6535 -vn 0.7166 -0.1967 -0.6692 -vn 0.7163 -0.1982 -0.6691 -vn 0.7157 -0.2016 -0.6687 -vn 0.7154 -0.2033 -0.6684 -vn 0.6348 -0.4007 -0.6607 -vn 0.6540 -0.3244 -0.6835 -vn 0.6032 -0.4196 -0.6783 -vn 0.5400 -0.4971 -0.6792 -vn 0.5598 -0.4617 -0.6881 -vn 0.4834 -0.5604 -0.6725 -vn 0.5097 -0.5117 -0.6916 -vn 0.4577 -0.5694 -0.6828 -vn 0.4117 -0.5957 -0.6896 -vn 0.4116 -0.5959 -0.6896 -vn 0.4117 -0.5958 -0.6896 -vn 0.4115 -0.5960 -0.6895 -vn 0.3953 -0.6092 -0.6875 -vn 0.3597 -0.6347 -0.6839 -vn 0.3710 -0.6179 -0.6932 -vn 0.3520 -0.6301 -0.6921 -vn 0.3171 -0.6489 -0.6917 -vn 0.3175 -0.6483 -0.6920 -vn 0.3201 -0.6454 -0.6936 -vn 0.3205 -0.6449 -0.6938 -vn 0.2790 -0.6647 -0.6931 -vn 0.2173 -0.6860 -0.6944 -vn 0.2182 -0.6853 -0.6948 -vn 0.2229 -0.6813 -0.6972 -vn 0.2238 -0.6806 -0.6977 -vn 0.1385 -0.7046 -0.6959 -vn 0.1033 -0.7015 -0.7052 -vn 0.0813 -0.7079 -0.7016 -vn 0.0528 -0.7111 -0.7011 -vn 0.0015 -0.7108 -0.7034 -vn 0.0008 -0.7110 -0.7031 -vn -0.0031 -0.7125 -0.7017 -vn -0.0039 -0.7128 -0.7014 -vn -0.0628 -0.7106 -0.7008 -vn -0.1042 -0.7032 -0.7033 -vn -0.1231 -0.7069 -0.6966 -vn -0.1856 -0.6940 -0.6957 -vn -0.2244 -0.6796 -0.6984 -vn -0.2411 -0.6799 -0.6926 -vn -0.2799 -0.6648 -0.6926 -vn -0.2775 -0.6662 -0.6923 -vn -0.2937 -0.6575 -0.6938 -vn -0.2962 -0.6598 -0.6906 -vn -0.4396 -0.5904 -0.6769 -vn -0.4070 -0.5993 -0.6894 -vn -0.3599 -0.6327 -0.6857 -vn -0.3311 -0.6408 -0.6926 -vn -0.3325 -0.6397 -0.6929 -vn -0.3257 -0.6447 -0.6915 -vn -0.3235 -0.6464 -0.6911 -vn -0.2980 -0.6596 -0.6900 -vn -0.5155 -0.5156 -0.6844 -vn -0.5007 -0.5378 -0.6782 -vn -0.5561 -0.4799 -0.6786 -vn -0.5958 -0.4277 -0.6798 -vn -0.5895 -0.4405 -0.6771 -vn -0.6439 -0.3653 -0.6723 -vn -0.6663 -0.3254 -0.6710 -vn -0.6974 -0.2540 -0.6702 -vn -0.7113 -0.2322 -0.6634 -vn -0.7629 -0.0736 -0.6423 -vn -0.7677 0.0470 -0.6391 -vn -0.7675 0.0461 -0.6394 -vn -0.7671 0.0441 -0.6400 -vn -0.7669 0.0430 -0.6403 -vn -0.7724 0.0994 -0.6273 -vn -0.7608 0.3077 -0.5713 -vn -0.7603 0.2100 -0.6147 -vn -0.7250 0.3834 -0.5722 -vn -0.7256 0.3653 -0.5832 -vn -0.7217 0.3817 -0.5775 -vn -0.7217 0.3816 -0.5775 -vn -0.7185 0.3954 -0.5722 -vn -0.7057 0.4146 -0.5746 -vn -0.6758 0.4774 -0.5616 -vn -0.6455 0.5082 -0.5701 -vn -0.6310 0.5390 -0.5579 -vn -0.5851 0.6004 -0.5451 -vn -0.5496 0.6247 -0.5547 -vn -0.5286 0.6529 -0.5424 -vn -0.4375 0.7310 -0.5237 -vn -0.4454 0.7188 -0.5338 -vn -0.2997 0.8034 -0.5146 -vn -0.3087 0.7943 -0.5232 -vn -0.1881 0.8368 -0.5141 -vn -0.1477 0.8370 -0.5270 -vn -0.1103 0.8495 -0.5160 -vn 0.0065 0.8607 -0.5090 -vn 0.0056 0.8604 -0.5096 -vn -0.0016 0.8575 -0.5146 -vn -0.0021 0.8573 -0.5148 -vn 0.1620 0.8430 -0.5129 -vn 0.1612 0.8429 -0.5134 -vn 0.1551 0.8417 -0.5172 -vn 0.1546 0.8417 -0.5174 -vn 0.3103 0.7951 -0.5211 -vn 0.3098 0.7950 -0.5215 -vn 0.3049 0.7951 -0.5243 -vn 0.3045 0.7952 -0.5244 -vn 0.4454 0.7193 -0.5331 -vn 0.4449 0.7194 -0.5333 -vn 0.4417 0.7201 -0.5351 -vn 0.4414 0.7202 -0.5352 -vn 0.5619 0.6195 -0.5482 -vn 0.5616 0.6196 -0.5483 -vn 0.5600 0.6203 -0.5492 -vn 0.6747 0.4662 -0.5723 -vn 0.6486 0.4951 -0.5781 -vn 0.6340 0.5302 -0.5630 -vn 0.5597 0.6204 -0.5494 -vn -0.5568 -0.7668 -0.3193 -vn -0.5933 -0.7400 -0.3169 -vn -0.5664 -0.7608 -0.3169 -vn -0.6234 -0.7163 -0.3135 -vn -0.6722 -0.6723 -0.3101 -vn -0.6405 -0.7012 -0.3132 -vn -0.5405 -0.7778 -0.3206 -vn -0.4674 -0.8219 -0.3256 -vn -0.5061 -0.7991 -0.3246 -vn -0.4223 -0.8439 -0.3310 -vn -0.4556 -0.8271 -0.3292 -vn -0.3916 -0.8573 -0.3342 -vn -0.3880 -0.8589 -0.3343 -vn -0.3969 -0.8549 -0.3340 -vn -0.4004 -0.8533 -0.3339 -vn -0.3620 -0.8692 -0.3369 -vn -0.3400 -0.8776 -0.3381 -vn -0.2940 -0.8928 -0.3412 -vn -0.3144 -0.8865 -0.3394 -vn -0.2508 -0.9054 -0.3426 -vn -0.2485 -0.9060 -0.3427 -vn -0.2451 -0.9068 -0.3429 -vn -0.2427 -0.9074 -0.3430 -vn -0.2034 -0.9165 -0.3445 -vn -0.1609 -0.9241 -0.3466 -vn -0.1393 -0.9275 -0.3468 -vn -0.0847 -0.9336 -0.3483 -vn -0.0824 -0.9338 -0.3483 -vn -0.0881 -0.9333 -0.3482 -vn -0.0904 -0.9331 -0.3482 -vn -0.0074 -0.9372 -0.3488 -vn -0.0051 -0.9372 -0.3487 -vn -0.0106 -0.9371 -0.3489 -vn -0.0128 -0.9370 -0.3490 -vn 0.0683 -0.9345 -0.3495 -vn 0.0685 -0.9344 -0.3495 -vn 0.0691 -0.9344 -0.3495 -vn 0.0694 -0.9344 -0.3495 -vn 0.1070 -0.9310 -0.3491 -vn 0.1069 -0.9310 -0.3491 -vn 0.2270 -0.9103 -0.3462 -vn 0.1723 -0.9215 -0.3480 -vn 0.1689 -0.9221 -0.3482 -vn 0.1774 -0.9207 -0.3476 -vn 0.1809 -0.9201 -0.3474 -vn 0.2930 -0.8922 -0.3437 -vn 0.2933 -0.8921 -0.3437 -vn 0.3421 -0.8755 -0.3413 -vn 0.3643 -0.8670 -0.3400 -vn 0.3639 -0.8671 -0.3400 -vn 0.3645 -0.8669 -0.3400 -vn 0.3648 -0.8668 -0.3400 -vn 0.4008 -0.8516 -0.3380 -vn 0.4189 -0.8431 -0.3372 -vn 0.4444 -0.8309 -0.3349 -vn 0.4597 -0.8229 -0.3339 -vn 0.4838 -0.8098 -0.3320 -vn 0.5246 -0.7851 -0.3291 -vn 0.4859 -0.8093 -0.3300 -vn 0.5595 -0.7626 -0.3245 -vn 0.5828 -0.7459 -0.3226 -vn 0.5148 -0.7933 -0.3252 -vn 0.5375 -0.7784 -0.3245 -vn 0.5939 -0.7388 -0.3186 -vn 0.6232 -0.7146 -0.3177 -vn 0.5988 -0.7342 -0.3200 -vn 0.7061 -0.6363 -0.3108 -vn 0.6825 -0.6607 -0.3125 -vn 0.6702 -0.6728 -0.3134 -vn 0.6690 -0.6740 -0.3134 -vn 0.6673 -0.6756 -0.3135 -vn 0.6661 -0.6768 -0.3135 -vn 0.6473 -0.6941 -0.3150 -vn 0.7334 -0.6050 -0.3100 -vn 0.7815 -0.5436 -0.3063 -vn 0.7598 -0.5723 -0.3086 -vn 0.8560 -0.4246 -0.2950 -vn 0.9242 -0.2626 -0.2774 -vn 0.8710 -0.3935 -0.2940 -vn 0.8158 -0.4921 -0.3038 -vn 0.9351 0.3129 -0.1666 -vn 0.9337 0.3178 -0.1652 -vn 0.9327 0.3211 -0.1643 -vn 0.9679 0.1437 -0.2064 -vn 0.9636 0.1799 -0.1976 -vn 0.9710 -0.0149 -0.2388 -vn 0.9729 0.0307 -0.2294 -vn 0.9564 -0.1348 -0.2591 -vn 0.9558 -0.1379 -0.2597 -vn 0.9572 -0.1303 -0.2584 -vn 0.9578 -0.1272 -0.2578 -vn 0.9303 -0.2424 -0.2753 -vn 0.8994 -0.3296 -0.2873 -vn 0.8421 0.5288 -0.1060 -vn 0.8525 0.5107 -0.1116 -vn 0.8694 0.4791 -0.1209 -vn 0.8845 0.4480 -0.1303 -vn 0.9039 0.4031 -0.1428 -vn 0.9360 0.3096 -0.1675 -vn -0.7180 0.6935 -0.0596 -vn 0.6852 0.7252 -0.0682 -vn 0.6687 0.7413 -0.0574 -vn 0.6687 0.7414 -0.0572 -vn 0.6735 0.7365 -0.0628 -vn 0.7160 0.6946 -0.0703 -vn 0.7131 0.6976 -0.0694 -vn 0.7160 0.6946 -0.0702 -vn 0.7149 0.6957 -0.0701 -vn 0.7131 0.6978 -0.0675 -vn 0.7104 0.7009 -0.0645 -vn 0.7112 0.7000 -0.0654 -vn 0.7080 0.7035 -0.0614 -vn 0.7077 0.7039 -0.0609 -vn 0.6753 0.7348 -0.0631 -vn 0.6708 0.7392 -0.0600 -vn 0.6669 0.7418 -0.0707 -vn 0.6418 0.7628 -0.0785 -vn 0.6685 0.7411 -0.0625 -vn 0.5798 0.8136 -0.0430 -vn 0.5261 0.8488 -0.0528 -vn 0.5219 0.8516 -0.0495 -vn 0.5285 0.8472 -0.0546 -vn 0.5304 0.8459 -0.0561 -vn 0.4607 0.8872 -0.0250 -vn 0.3577 0.9335 -0.0236 -vn 0.3575 0.9336 -0.0230 -vn 0.3652 0.9304 -0.0306 -vn 0.3663 0.9300 -0.0315 -vn 0.2395 0.9709 0.0008 -vn 0.1806 0.9832 -0.0250 -vn 0.1068 0.9942 0.0084 -vn -0.0025 0.9999 -0.0158 -vn -0.0178 0.9998 -0.0058 -vn -0.0851 0.9964 -0.0002 -vn -0.1287 0.9917 -0.0008 -vn -0.1616 0.9868 0.0096 -vn -0.2193 0.9756 -0.0114 -vn -0.2936 0.9559 0.0032 -vn -0.3620 0.9316 -0.0320 -vn -0.4205 0.9073 -0.0072 -vn -0.5257 0.8496 -0.0418 -vn -0.5263 0.8493 -0.0414 -vn -0.5206 0.8526 -0.0453 -vn -0.5193 0.8534 -0.0462 -vn -0.5839 0.8111 -0.0340 -vn -0.6310 0.7745 -0.0442 -vn -0.6286 0.7764 -0.0445 -vn -0.6356 0.7708 -0.0437 -vn -0.6378 0.7690 -0.0434 -vn -0.6684 0.7420 -0.0505 -vn -0.6953 0.7162 -0.0598 -vn -0.6967 0.7149 -0.0594 -vn -0.6926 0.7188 -0.0604 -vn -0.6911 0.7202 -0.0607 -vn -0.7501 0.6572 -0.0738 -vn -0.7493 0.6606 -0.0472 -vn -0.7495 0.6602 -0.0491 -vn -0.7495 0.6603 -0.0486 -vn -0.7494 0.6604 -0.0489 -vn -0.7506 0.6585 -0.0539 -vn -0.7590 0.6470 -0.0722 -vn -0.7529 0.6554 -0.0597 -vn -0.7538 0.6543 -0.0609 -vn -0.7588 0.6479 -0.0673 -vn -0.7521 0.6555 -0.0679 -vn -0.7213 0.6891 -0.0692 -vn -0.7382 0.6711 -0.0684 -vn -0.7587 0.6481 -0.0659 -vn -0.7161 0.6953 -0.0607 -vn -0.7181 0.6933 -0.0609 -vn -0.7107 0.7009 -0.0603 -vn -0.7085 0.7032 -0.0601 -vn -0.8714 0.4796 -0.1035 -vn -0.8789 0.4648 -0.1068 -vn -0.8790 0.4648 -0.1068 -vn -0.9443 0.2902 -0.1553 -vn -0.9032 0.4115 -0.1222 -vn -0.8875 0.4469 -0.1123 -vn -0.9644 0.1927 -0.1809 -vn -0.9511 0.2626 -0.1623 -vn -0.9718 0.1358 -0.1930 -vn -0.9758 0.0288 -0.2166 -vn -0.9730 0.1252 -0.1937 -vn -0.9677 -0.0798 -0.2390 -vn -0.9314 -0.2477 -0.2668 -vn -0.9519 -0.1713 -0.2541 -vn -0.9661 -0.0933 -0.2408 -vn -0.9763 0.0547 -0.2096 -vn -0.9145 -0.2985 -0.2732 -vn -0.8792 -0.3806 -0.2866 -vn -0.9154 -0.2948 -0.2741 -vn -0.7651 -0.5667 -0.3057 -vn -0.7749 -0.5539 -0.3044 -vn -0.8604 -0.4202 -0.2882 -vn -0.7992 -0.5200 -0.3015 -vn -0.8368 -0.4613 -0.2950 -vn -0.7204 -0.6217 -0.3073 -vn -0.7040 -0.6395 -0.3090 -vn -0.7740 -0.5555 -0.3040 -vn -0.8312 -0.4715 -0.2945 -vn 0.7011 0.7099 -0.0673 -vn 0.7113 0.6995 -0.0690 -vn 0.7645 0.6394 -0.0822 -vn 0.7636 0.6405 -0.0820 -vn 0.7623 0.6420 -0.0817 -vn 0.7614 0.6431 -0.0815 -vn 0.8188 0.5657 -0.0975 -vn 0.8174 0.5678 -0.0971 -vn 0.8155 0.5707 -0.0966 -vn 0.8141 0.5727 -0.0963 -vn -0.8789 0.4648 -0.1073 -vn -0.8543 0.5107 -0.0968 -vn -0.8139 0.5749 -0.0845 -vn -0.8038 0.5893 -0.0810 -vn -0.7588 0.6477 -0.0692 -vn -0.7613 0.6446 -0.0700 -vn 0.8362 -0.4521 0.3104 -vn -0.6718 0.6759 -0.3031 -vn -0.6647 0.6896 -0.2875 -vn -0.6452 0.7002 -0.3056 -vn -0.6471 0.7000 -0.3021 -vn -0.6415 0.7020 -0.3092 -vn -0.6405 0.7022 -0.3109 -vn 0.9709 -0.1348 0.1979 -vn 0.9427 -0.1903 0.2742 -vn 0.9610 0.2534 0.1109 -vn -0.6409 0.7009 -0.3129 -vn -0.5931 0.7562 -0.2764 -vn -0.3300 0.8816 -0.3375 -vn -0.2381 0.9379 -0.2523 -vn 0.0953 0.9622 -0.2552 -vn 0.1555 0.9690 -0.1920 -vn 0.4833 0.8652 -0.1337 -vn 0.5063 0.8563 -0.1020 -vn 0.7930 0.6092 0.0073 -vn 0.7931 0.6091 0.0069 -vn 0.7919 0.6107 0.0038 -vn 0.9485 -0.1969 0.2479 -vn 0.9486 -0.1969 0.2479 -vn 0.9486 -0.1969 0.2478 -vn 0.8216 -0.4891 0.2929 -vn 0.8206 -0.4903 0.2937 -vn 0.8182 -0.4930 0.2956 -vn 0.8175 -0.4939 0.2962 -vn 0.9795 0.0726 0.1880 -vn 0.9794 0.0727 0.1882 -vn 0.9543 0.2311 0.1897 -vn 0.9619 0.2234 0.1575 -vn 0.7916 0.6110 0.0037 -vn 0.9489 0.2880 0.1288 -vn 0.8715 0.4863 0.0639 -vn 0.7819 0.6208 0.0572 -vn 0.7501 0.6613 -0.0047 -vn 0.4791 0.8704 -0.1131 -vn 0.4791 0.8705 -0.1131 -vn 0.4790 0.8705 -0.1132 -vn 0.0881 0.9715 -0.2202 -vn 0.0881 0.9715 -0.2203 -vn 0.0881 0.9714 -0.2203 -vn -0.3400 0.8941 -0.2914 -vn -0.3401 0.8941 -0.2915 -vn -0.5760 0.7574 -0.3075 -vn -0.0306 0.9874 -0.1550 -vn -0.6815 0.6854 -0.2563 -vn 0.9140 -0.3383 0.2239 -vn 0.8330 -0.4952 0.2466 -vn 0.8323 -0.4964 0.2467 -vn 0.8339 -0.4936 0.2467 -vn 0.8519 -0.4693 0.2323 -vn 0.9035 -0.3617 0.2297 -vn 0.8303 -0.4970 0.2521 -vn 0.8299 -0.4973 0.2529 -vn 0.8300 -0.4972 0.2528 -vn -0.7282 0.6435 -0.2360 -vn -0.7282 0.6435 -0.2359 -vn -0.7274 0.6430 -0.2396 -vn -0.7289 0.6440 -0.2323 -vn 0.8303 -0.4970 0.2520 -vn 0.8346 -0.4925 0.2466 -vn 0.9530 -0.2014 0.2263 -vn 0.9006 -0.3596 0.2443 -vn 0.9795 0.0726 0.1879 -vn 0.9753 -0.0643 0.2113 -vn 0.9756 -0.0645 0.2101 -vn 0.9441 0.2927 0.1515 -vn 0.8638 0.4938 0.1003 -vn 0.9244 0.3557 0.1380 -vn 0.9231 0.3567 0.1441 -vn 0.9230 0.3567 0.1442 -vn 0.7380 0.6728 0.0521 -vn 0.7000 0.7132 0.0370 -vn 0.4625 0.8859 -0.0356 -vn -0.3571 0.9105 -0.2087 -vn -0.4439 0.8680 -0.2226 -vn -0.5903 0.7715 -0.2374 -vn -0.8188 0.5183 -0.2468 -vn -0.7749 0.5807 -0.2496 -vn 0.9348 -0.2761 0.2233 -vn 0.9501 -0.2211 0.2201 -vn 0.9758 -0.0647 0.2089 -vn 0.9791 -0.0140 0.2028 -vn 0.9622 0.2094 0.1740 -vn 0.9217 0.3576 0.1503 -vn 0.8977 0.4186 0.1371 -vn 0.6945 0.7169 0.0616 -vn 0.7817 0.6164 0.0948 -vn 0.7795 0.6176 0.1043 -vn 0.7795 0.6177 0.1045 -vn 0.6398 0.7673 0.0445 -vn 0.6416 0.7663 0.0335 -vn 0.6392 0.7678 0.0446 -vn 0.3587 0.9329 -0.0317 -vn 0.3660 0.9284 -0.0641 -vn 0.0696 0.9888 -0.1322 -vn 0.4637 0.8860 -0.0018 -vn 0.2854 0.9571 -0.0495 -vn -0.0383 0.9920 -0.1199 -vn 0.0796 0.9925 -0.0924 -vn -0.8348 0.5042 -0.2213 -vn -0.8565 0.4635 -0.2270 -vn -0.7150 0.6631 -0.2213 -vn -0.7157 0.6634 -0.2184 -vn -0.7146 0.6628 -0.2237 -vn -0.7908 0.5686 -0.2267 -vn -0.5447 0.8135 -0.2038 -vn -0.4508 0.8723 -0.1895 -vn -0.3514 0.9195 -0.1761 -vn -0.1315 0.9817 -0.1379 -vn 0.0122 0.9999 -0.0011 -vn 0.3462 0.9377 -0.0278 -vn 0.3770 0.9262 -0.0005 -vn 0.3972 0.9177 -0.0018 -vn 0.4152 0.9097 -0.0030 -vn 0.3986 0.9171 -0.0000 -vn 0.4810 0.8767 -0.0002 -vn 0.4795 0.8775 0.0000 -vn 0.4835 0.8753 -0.0005 -vn 0.4850 0.8745 -0.0007 -vn 0.5633 0.8263 0.0016 -vn 0.3015 0.9535 -0.0008 -vn 0.3159 0.9488 -0.0002 -vn 0.3452 0.9385 0.0001 -vn 0.0463 0.9989 0.0002 -vn 0.0926 0.9957 -0.0003 -vn 0.1083 0.9941 -0.0010 -vn 0.1338 0.9910 0.0000 -vn 0.2084 0.9780 0.0000 -vn 0.1841 0.9829 -0.0025 -vn 0.2564 0.9666 0.0009 -vn -0.3897 0.9209 -0.0001 -vn -0.3713 0.9285 -0.0008 -vn -0.3690 0.9294 -0.0007 -vn -0.3655 0.9308 -0.0006 -vn -0.3631 0.9318 -0.0005 -vn -0.3300 0.9440 0.0002 -vn -0.2801 0.9600 -0.0010 -vn -0.2609 0.9654 0.0006 -vn -0.1788 0.9839 -0.0004 -vn -0.1713 0.9852 0.0002 -vn -0.0853 0.9964 -0.0001 -vn -0.0834 0.9965 0.0000 -vn -0.0087 1.0000 0.0000 -vn -0.4607 0.8876 -0.0016 -vn -0.4554 0.8903 -0.0044 -vn -0.4539 0.8910 -0.0042 -vn -0.4586 0.8886 -0.0013 -vn -0.4549 0.8905 -0.0049 -vn -0.4894 0.8719 0.0147 -vn -0.4591 0.8884 0.0001 -vn -0.4514 0.8923 -0.0020 -vn -0.4517 0.8922 -0.0010 -vn -0.4418 0.8971 -0.0005 -vn -0.4170 0.9089 0.0001 -vn -0.6230 0.7822 -0.0061 -vn -0.5934 0.8049 0.0007 -vn -0.5484 0.8362 -0.0007 -vn -0.5263 0.8503 0.0023 -vn -0.4654 0.8851 -0.0019 -vn -0.4642 0.8857 -0.0018 -vn -0.4605 0.8877 -0.0016 -vn -0.5358 0.8089 -0.2419 -vn -0.1174 0.9730 -0.1987 -vn 0.2969 0.9494 -0.1027 -vn 0.0084 0.1069 0.9942 -vn 0.0022 0.1088 0.9941 -vn 0.0078 0.1070 0.9942 -vn 0.0187 0.1499 0.9885 -vn -0.8463 0.5093 -0.1560 -vn -0.8196 0.5243 -0.2309 -vn -0.8940 0.2953 -0.3371 -vn -0.7770 0.2985 -0.5543 -vn -0.5986 0.5116 -0.6164 -vn -0.6573 0.0661 -0.7508 -vn -0.5206 0.4814 -0.7051 -vn -0.4647 0.1811 -0.8668 -vn -0.4213 0.3338 -0.8433 -vn -0.2865 0.1838 -0.9403 -vn -0.2846 0.1936 -0.9389 -vn -0.2852 0.1903 -0.9394 -vn -0.2870 0.1809 -0.9407 -vn -0.0910 0.2078 -0.9739 -vn -0.0916 0.2019 -0.9751 -vn -0.0915 0.2035 -0.9748 -vn -0.0908 0.2097 -0.9735 -vn 0.0178 0.0865 -0.9961 -vn 0.0204 0.1165 -0.9930 -vn 0.0295 0.1125 -0.9932 -vn 0.0217 0.1167 -0.9929 -vn 0.0305 0.1158 -0.9928 -vn 0.0267 0.1101 -0.9936 -vn 0.0291 0.1382 -0.9900 -vn 0.0136 0.0972 -0.9952 -vn 0.0142 0.1301 -0.9914 -vn 0.0051 0.1262 -0.9920 -vn 0.0127 0.1294 -0.9915 -vn 0.0220 0.2459 -0.9691 -vn 0.0124 0.1404 -0.9900 -vn 0.0028 0.1252 -0.9921 -vn 0.0105 0.0695 0.9975 -vn 0.0107 0.0745 0.9972 -vn 0.0106 0.0723 0.9973 -vn 0.0109 0.0795 0.9968 -vn 0.0215 0.1113 0.9936 -vn 0.0231 0.1015 0.9946 -vn 0.0220 0.1080 0.9939 -vn 0.0236 0.0983 0.9949 -vn 0.0333 0.1252 0.9916 -vn 0.0181 -0.1550 0.9877 -vn 0.2258 0.1860 0.9563 -vn 0.8427 -0.3065 0.4426 -vn 0.8888 -0.2429 0.3886 -vn -0.0259 0.8093 0.5869 -vn -0.0365 0.8089 0.5868 -vn -0.0253 0.8094 0.5868 -vn -0.0288 0.9118 0.4097 -vn -0.0383 0.9983 -0.0441 -vn -0.0353 0.9984 -0.0440 -vn -0.0354 0.9984 -0.0440 -vn -0.0301 0.9662 -0.2562 -vn -0.0317 0.9661 -0.2562 -vn -0.0246 0.8801 -0.4742 -vn -0.0252 0.8800 -0.4743 -vn 0.9645 0.0742 0.2535 -vn 0.9297 0.0042 0.3684 -vn 0.8947 -0.1981 0.4004 -vn 0.8375 -0.1859 0.5138 -vn 0.9012 0.0445 0.4312 -vn 0.9016 0.1332 0.4115 -vn 0.8904 0.1005 0.4440 -vn 0.7905 0.5419 0.2855 -vn 0.0017 0.1090 0.9940 -vn 0.0133 0.1778 0.9840 -vn 0.0067 0.4709 0.8822 -vn 0.0019 0.4499 0.8931 -vn -0.0037 0.6516 0.7586 -vn 0.6418 0.7662 0.0320 -vn 0.7795 0.6176 0.1047 -vn 0.8638 0.4933 0.1027 -vn 0.8815 0.4255 0.2046 -vn 0.9377 0.2191 0.2698 -vn -0.0303 0.7951 0.6057 -vn 0.0309 0.7885 0.6142 -vn 0.0303 0.7900 0.6123 -vn 0.0307 0.7890 0.6137 -vn 0.0155 0.4333 0.9011 -vn 0.0580 0.4303 0.9008 -vn 0.0559 0.4224 0.9047 -vn 0.0567 0.4254 0.9032 -vn 0.0588 0.4332 0.8994 -vn 0.1018 0.4215 0.9011 -vn 0.0994 0.4166 0.9036 -vn 0.1002 0.4183 0.9028 -vn 0.1026 0.4232 0.9002 -vn 0.1705 0.3883 0.9056 -vn 0.1939 0.4223 0.8855 -vn 0.4191 0.2994 0.8571 -vn 0.3176 -0.0652 0.9460 -vn 0.4720 0.8806 -0.0414 -vn 0.5931 0.8042 -0.0399 -vn 0.5492 0.8307 0.0913 -vn 0.5500 0.8300 0.0929 -vn 0.5498 0.8302 0.0925 -vn 0.7920 0.5335 0.2969 -vn 0.7268 0.5689 0.3847 -vn 0.7941 0.1748 0.5822 -vn 0.8027 0.1472 0.5779 -vn 0.7248 -0.2314 0.6490 -vn 0.5112 0.8467 0.1475 -vn 0.5103 0.8476 0.1452 -vn 0.5105 0.8474 0.1458 -vn 0.4090 -0.1091 0.9060 -vn 0.5633 0.2273 0.7944 -vn 0.5658 0.2439 0.7877 -vn 0.4055 0.3413 0.8480 -vn 0.4410 0.6801 0.5857 -vn 0.2671 0.7477 0.6080 -vn 0.2611 0.7407 0.6190 -vn 0.1821 0.7666 0.6158 -vn 0.1842 0.7700 0.6109 -vn 0.1835 0.7688 0.6125 -vn 0.1814 0.7655 0.6174 -vn 0.1020 0.7810 0.6162 -vn 0.1041 0.7870 0.6081 -vn 0.1033 0.7848 0.6111 -vn 0.1012 0.7787 0.6191 -vn 0.0301 0.7905 0.6118 -vn 0.0378 0.9734 0.2261 -vn 0.0378 0.9733 0.2264 -vn 0.0377 0.9734 0.2260 -vn -0.0450 0.9740 0.2218 -vn -0.0396 0.9788 0.2011 -vn -0.0339 0.9774 0.2086 -vn -0.0374 0.9789 0.2011 -vn 0.0921 0.9847 -0.1481 -vn 0.2314 0.9595 -0.1608 -vn 0.2250 0.9677 -0.1136 -vn 0.2215 0.9680 -0.1180 -vn 0.2223 0.9679 -0.1169 -vn 0.5490 0.8309 0.0910 -vn 0.5114 0.8465 0.1482 -vn 0.7081 0.5076 0.4909 -vn 0.6441 0.6014 0.4727 -vn 0.6780 0.2367 0.6959 -vn 0.2887 0.9437 -0.1615 -vn 0.2743 0.9463 -0.1710 -vn 0.2552 0.9546 -0.1539 -vn -0.0514 0.9839 -0.1711 -vn 0.0380 0.9835 -0.1770 -vn 0.0385 0.9838 -0.1753 -vn 0.0381 0.9836 -0.1764 -vn 0.0376 0.9735 0.2257 -vn 0.1255 0.9660 0.2260 -vn 0.1250 0.9654 0.2290 -vn 0.1252 0.9656 0.2278 -vn 0.1257 0.9662 0.2249 -vn 0.2247 0.9475 0.2274 -vn 0.2243 0.9472 0.2290 -vn 0.2244 0.9474 0.2283 -vn 0.2248 0.9476 0.2268 -vn 0.3003 0.9247 0.2338 -vn 0.3016 0.9255 0.2292 -vn 0.3012 0.9253 0.2305 -vn 0.2999 0.9245 0.2352 -vn -0.3427 0.9150 -0.2130 -vn -0.1896 0.9484 -0.2541 -vn -0.1790 0.9324 -0.3141 -vn 0.2257 0.9677 -0.1126 -vn 0.2433 0.9588 -0.1467 -vn 0.2799 0.9499 -0.1389 -vn 0.0326 0.8215 -0.5693 -vn 0.0328 0.8219 -0.5687 -vn 0.0320 0.8205 -0.5708 -vn 0.1080 0.8092 -0.5775 -vn 0.1072 0.8195 -0.5630 -vn 0.1912 0.8002 -0.5684 -vn 0.1916 0.7952 -0.5752 -vn 0.1915 0.7969 -0.5730 -vn 0.1911 0.8018 -0.5662 -vn 0.2151 0.7930 -0.5700 -vn 0.6664 -0.0290 0.7451 -vn 0.6420 -0.0738 0.7631 -vn 0.6933 0.1925 0.6944 -vn 0.5524 0.2847 0.7834 -vn 0.5506 0.6460 0.5288 -vn 0.4951 0.5899 0.6379 -vn 0.4209 0.8827 0.2092 -vn 0.4209 0.8829 0.2084 -vn 0.4209 0.8832 0.2068 -vn 0.4208 0.8834 0.2061 -vn 0.2799 0.9444 -0.1725 -vn 0.2801 0.9443 -0.1727 -vn 0.2857 0.9420 -0.1760 -vn 0.2859 0.9421 -0.1751 -vn 0.2861 0.9418 -0.1765 -vn 0.2278 0.9576 -0.1766 -vn 0.2271 0.9585 -0.1721 -vn 0.2274 0.9582 -0.1736 -vn 0.2280 0.9572 -0.1782 -vn 0.1272 0.9759 -0.1774 -vn 0.1267 0.9771 -0.1712 -vn 0.1269 0.9766 -0.1735 -vn 0.1274 0.9754 -0.1796 -vn 0.0386 0.9839 -0.1747 -vn 0.0317 0.8200 -0.5715 -vn -0.0358 0.8269 -0.5612 -vn -0.0068 0.7467 -0.6652 -vn -0.6226 0.6531 -0.4311 -vn -0.5374 0.7372 -0.4096 -vn -0.4717 0.6692 -0.5741 -vn -0.4435 0.6851 -0.5778 -vn -0.3704 0.6188 -0.6927 -vn -0.3366 0.6378 -0.6928 -vn -0.2541 0.5736 -0.7787 -vn -0.2241 0.5922 -0.7740 -vn -0.1257 0.5244 -0.8421 -vn -0.0976 0.5437 -0.8336 -vn 0.0153 0.4729 -0.8810 -vn 0.0420 0.4960 -0.8673 -vn 0.1291 0.4476 -0.8849 -vn 0.1343 0.4523 -0.8817 -vn 0.1302 0.4486 -0.8842 -vn 0.0021 0.5664 -0.8241 -vn -0.0000 0.5501 -0.8351 -vn 0.0177 0.4782 -0.8781 -vn 0.0639 0.4745 -0.8779 -vn 0.0639 0.4656 -0.8827 -vn 0.0639 0.4688 -0.8810 -vn 0.0639 0.4778 -0.8762 -vn 0.1120 0.4635 -0.8790 -vn 0.1119 0.4578 -0.8820 -vn 0.1118 0.4597 -0.8810 -vn 0.1121 0.4654 -0.8780 -vn 0.1354 0.4534 -0.8810 -vn 0.2474 0.8230 -0.5112 -vn 0.1835 0.7955 -0.5776 -vn 0.1171 0.8281 -0.5482 -vn 0.1032 0.8239 -0.5572 -vn 0.0436 0.8559 -0.5153 -vn 0.0274 0.8523 -0.5224 -vn -0.0240 0.8831 -0.4685 -vn -0.0431 0.8800 -0.4730 -vn -0.0920 0.9130 -0.3974 -vn -0.1111 0.9103 -0.3988 -vn -0.1564 0.9438 -0.2913 -vn -0.5706 0.6941 -0.4389 -vn -0.5983 0.7463 -0.2917 -vn -0.7144 0.6628 -0.2242 -vn 0.2525 0.2206 -0.9421 -vn -0.0155 0.1537 -0.9880 -vn -0.0090 0.0612 0.9981 -vn -0.0097 0.0642 0.9979 -vn -0.0077 0.0562 0.9984 -vn -0.0256 0.0733 0.9970 -vn -0.0264 0.0726 0.9970 -vn -0.0357 0.0661 0.9972 -vn -0.7330 -0.4365 0.5217 -vn -0.8032 -0.3904 0.4500 -vn -0.7984 -0.4181 0.4334 -vn -0.7922 -0.4342 0.4288 -vn -0.6725 -0.4995 0.5462 -vn -0.7453 -0.2637 0.6124 -vn -0.8336 0.0778 0.5468 -vn -0.0397 0.1448 -0.9887 -vn -0.0342 0.1473 -0.9885 -vn -0.0368 0.1462 -0.9886 -vn -0.0339 0.1476 -0.9885 -vn -0.0536 0.1402 -0.9887 -vn -0.0534 0.1396 -0.9888 -vn -0.0536 0.1395 -0.9888 -vn -0.0539 0.1385 -0.9889 -vn -0.0536 0.1398 -0.9887 -vn -0.0531 0.1406 -0.9886 -vn -0.0523 0.1409 -0.9886 -vn 0.2426 0.2338 -0.9415 -vn 0.3633 0.3620 -0.8585 -vn 0.4658 0.2361 -0.8528 -vn 0.4502 0.4945 -0.7435 -vn 0.6245 0.3082 -0.7177 -vn 0.5449 0.5864 -0.5993 -vn 0.7557 0.3557 -0.5499 -vn 0.6688 0.5572 -0.4922 -vn 0.8265 0.4891 -0.2788 -vn 0.7409 0.5937 -0.3140 -vn -0.9666 0.0944 0.2384 -vn -0.8143 -0.2545 0.5217 -vn -0.8021 -0.4516 0.3908 -vn -0.8092 -0.4355 0.3944 -vn -0.9075 -0.1764 0.3812 -vn -0.8749 -0.1862 0.4470 -vn -0.8227 -0.1816 0.5387 -vn -0.7444 -0.3918 0.5408 -vn -0.0469 0.4028 0.9141 -vn -0.0355 0.4485 0.8931 -vn -0.0402 0.1476 0.9882 -vn -0.8172 0.0569 0.5736 -vn -0.7295 0.1406 0.6694 -vn -0.7084 0.0319 0.7050 -vn -0.6644 -0.2323 0.7103 -vn -0.4228 0.2501 0.8710 -vn -0.4789 0.4840 0.7324 -vn -0.5424 0.6032 0.5848 -vn -0.7799 0.5043 0.3708 -vn -0.7234 0.3626 0.5875 -vn -0.7024 0.1160 0.7023 -vn -0.6010 0.2027 0.7731 -vn -0.4876 -0.1465 0.8607 -vn -0.5073 0.0513 0.8603 -vn -0.8271 -0.3708 0.4225 -vn -0.8432 -0.3003 0.4460 -vn -0.9146 -0.0086 0.4044 -vn -0.9147 -0.0093 0.4041 -vn -0.9145 -0.0088 0.4044 -vn -0.9153 -0.0126 0.4025 -vn -0.8556 0.4475 0.2603 -vn -0.9060 0.3365 0.2566 -vn -0.8136 0.5438 0.2058 -vn -0.0344 0.9784 0.2039 -vn -0.0320 0.9766 0.2126 -vn -0.0486 0.9111 0.4093 -vn -0.0480 0.7871 0.6149 -vn -0.0371 0.8089 0.5868 -vn -0.0569 0.6494 0.7583 -vn -0.0368 0.0654 0.9972 -vn 0.0036 -0.2107 0.9776 -vn -0.2124 0.3360 0.9176 -vn -0.2156 0.3951 0.8930 -vn -0.3234 0.7071 0.6288 -vn -0.3210 0.7270 0.6069 -vn -0.3700 0.9010 0.2266 -vn -0.3699 0.9011 0.2261 -vn -0.3697 0.9015 0.2251 -vn -0.3696 0.9017 0.2246 -vn -0.3550 0.9172 -0.1810 -vn -0.3525 0.9181 -0.1813 -vn -0.3552 0.9172 -0.1803 -vn -0.5473 0.8338 0.0728 -vn -0.5514 0.8194 0.1568 -vn -0.4843 0.8517 0.2001 -vn -0.4821 0.8685 0.1151 -vn -0.4553 0.8651 0.2103 -vn -0.2574 0.1133 0.9596 -vn -0.3081 -0.1347 0.9418 -vn -0.4562 0.2713 0.8475 -vn -0.5714 0.1803 0.8006 -vn -0.6060 0.5972 0.5255 -vn -0.7418 0.5051 0.4412 -vn -0.5732 0.8074 0.1398 -vn -0.6230 0.7797 0.0634 -vn -0.6925 0.7176 0.0739 -vn -0.0129 0.9830 -0.1833 -vn -0.0324 0.9985 -0.0440 -vn -0.2769 0.7758 -0.5670 -vn -0.3551 0.9173 -0.1801 -vn -0.3516 0.9189 -0.1791 -vn -0.3421 0.9231 -0.1755 -vn -0.3421 0.9233 -0.1746 -vn -0.3421 0.9231 -0.1759 -vn -0.3283 0.9302 -0.1644 -vn -0.3280 0.9300 -0.1656 -vn -0.3282 0.9301 -0.1649 -vn -0.3279 0.9300 -0.1660 -vn -0.3114 0.9390 -0.1457 -vn -0.3103 0.9391 -0.1479 -vn -0.3112 0.9390 -0.1461 -vn -0.3101 0.9390 -0.1485 -vn -0.0086 0.8289 -0.5594 -vn -0.0258 0.8800 -0.4743 -vn -0.0286 0.9662 -0.2562 -vn -0.1328 0.4805 -0.8669 -vn -0.2685 0.7689 -0.5802 -vn -0.1776 0.8197 -0.5446 -vn -0.1767 0.8110 -0.5577 -vn -0.1054 0.8535 -0.5103 -vn -0.1018 0.8453 -0.5246 -vn -0.0367 0.8878 -0.4587 -vn -0.0298 0.8796 -0.4749 -vn 0.0307 0.9235 -0.3823 -vn 0.0411 0.9165 -0.3979 -vn -0.5312 0.8473 0.0017 -vn -0.3497 0.9321 -0.0948 -vn -0.3014 0.9444 -0.1318 -vn -0.1543 0.9715 -0.1800 -vn 0.0918 0.9573 -0.2743 -vn 0.0680 0.9594 -0.2737 -vn -0.0802 0.9691 -0.2331 -vn 0.2995 0.9144 -0.2724 -vn -0.0215 0.1024 -0.9945 -vn -0.0520 0.2430 -0.9686 -vn -0.0153 0.4995 -0.8662 -vn -0.0297 0.5653 -0.8243 -vn -0.0340 0.7458 -0.6653 -vn -0.0105 -0.0152 0.9998 -vn -0.0071 0.0537 0.9985 -vn -0.0617 0.3972 0.9157 -vn -0.0623 0.4114 0.9093 -vn -0.1183 0.7697 0.6274 -vn -0.1179 0.7821 0.6119 -vn -0.1459 0.9630 0.2268 -vn -0.1457 0.9637 0.2238 -vn -0.1453 0.9649 0.2187 -vn -0.1451 0.9656 0.2157 -vn -0.1464 0.9723 -0.1823 -vn -0.1465 0.9723 -0.1820 -vn -0.1465 0.9724 -0.1817 -vn -0.1466 0.9724 -0.1814 -vn -0.1225 0.8119 -0.5708 -vn -0.1230 0.8134 -0.5685 -vn -0.1240 0.8158 -0.5648 -vn -0.1245 0.8173 -0.5625 -vn -0.0733 0.4826 -0.8728 -vn -0.0739 0.4847 -0.8716 -vn -0.0749 0.4881 -0.8695 -vn -0.0755 0.4902 -0.8683 -vn -0.0164 0.1117 -0.9936 -vn -0.0230 0.1350 -0.9906 -vn -0.0216 0.0773 0.9968 -vn -0.0177 0.0579 0.9982 -vn -0.1160 0.3858 0.9153 -vn -0.1184 0.3995 0.9091 -vn -0.2209 0.7459 0.6284 -vn -0.2222 0.7591 0.6119 -vn -0.2735 0.9343 0.2289 -vn -0.2734 0.9351 0.2255 -vn -0.2731 0.9365 0.2198 -vn -0.2729 0.9374 0.2164 -vn -0.2749 0.9442 -0.1816 -vn -0.2750 0.9443 -0.1810 -vn -0.2751 0.9443 -0.1806 -vn -0.2752 0.9444 -0.1799 -vn -0.2295 0.7873 -0.5723 -vn -0.2306 0.7891 -0.5694 -vn -0.2323 0.7921 -0.5644 -vn -0.2332 0.7939 -0.5615 -vn -0.1368 0.4649 -0.8747 -vn -0.1381 0.4679 -0.8730 -vn -0.1402 0.4727 -0.8700 -vn -0.1415 0.4756 -0.8682 -vn -0.0349 0.1161 -0.9926 -vn -0.0476 0.1406 -0.9889 -vn 0.5099 0.8030 -0.3087 -vn 0.5114 0.8016 -0.3097 -vn 0.5103 0.8026 -0.3088 -vn 0.5117 0.8013 -0.3099 -vn 0.4814 0.7377 -0.4733 -vn 0.4625 0.7671 -0.4445 -vn 0.4133 0.7073 -0.5735 -vn 0.3938 0.7360 -0.5506 -vn 0.3052 0.6463 -0.6994 -vn 0.2894 0.6797 -0.6740 -vn 0.1866 0.5905 -0.7852 -vn 0.1763 0.6228 -0.7623 -vn 0.0580 0.5312 -0.8452 -vn 0.0526 0.5640 -0.8241 -vn -0.1070 0.4493 -0.8869 -vn -0.0072 0.2217 -0.9751 -vn -0.0478 0.3626 -0.9307 -vn 0.2406 0.9706 0.0026 -vn 0.0592 0.9982 0.0002 -vn 0.0546 0.9985 0.0004 -vn 0.0519 0.9987 0.0006 -vn 0.0082 1.0000 -0.0032 -vn 0.0099 0.9999 -0.0040 -vn 0.0021 1.0000 -0.0009 -vn 0.0001 1.0000 -0.0002 -vn -0.0862 0.9963 0.0002 -vn -0.0850 0.9964 0.0008 -vn -0.0800 0.9968 0.0034 -vn -0.0785 0.9969 0.0042 -vn -0.1381 0.9904 -0.0009 -vn -0.1360 0.9907 -0.0007 -vn -0.1329 0.9911 -0.0003 -vn 0.1743 0.9846 -0.0139 -vn 0.2046 0.9788 0.0045 -vn 0.1042 0.9945 -0.0035 -vn 0.1057 0.9944 -0.0028 -vn 0.1104 0.9939 -0.0006 -vn 0.1117 0.9937 0.0000 -vn 0.0621 0.9981 0.0000 -vn 0.4600 0.8879 0.0001 -vn 0.4554 0.8903 0.0003 -vn 0.4614 0.8872 0.0001 -vn 0.4542 0.8909 0.0003 -vn 0.4410 0.8975 0.0014 -vn 0.4212 0.9069 0.0050 -vn 0.3968 0.9178 0.0131 -vn 0.4206 0.9072 0.0004 -vn 0.3565 0.9343 -0.0002 -vn 0.3431 0.9393 0.0025 -vn 0.3251 0.9457 -0.0001 -vn 0.2934 0.9560 0.0001 -vn 0.2932 0.9560 0.0001 -vn 0.2930 0.9561 0.0000 -vn 0.2928 0.9562 -0.0000 -vn 0.2634 0.9647 -0.0000 -vn 0.4710 0.8806 -0.0517 -vn 0.4719 0.8802 -0.0506 -vn 0.4690 0.8815 -0.0549 -vn 0.4863 0.8733 -0.0273 -vn 0.5055 0.8628 -0.0079 -vn 0.5340 0.8455 0.0060 -vn 0.5551 0.8317 -0.0135 -vn 0.5531 0.8330 -0.0138 -vn 0.5531 0.8330 -0.0146 -vn 0.5534 0.8327 -0.0172 -vn 0.4682 0.8819 -0.0562 -vn 0.4986 0.8668 -0.0000 -vn 0.4626 0.8866 0.0000 -vn 0.5536 0.8327 -0.0108 -vn 0.5581 0.8296 -0.0147 -vn 0.5536 0.8327 -0.0148 -vn 0.5591 0.8289 -0.0182 -vn 0.5556 0.8313 0.0146 -vn 0.5732 0.8194 0.0072 -vn 0.6698 0.7426 0.0037 -vn 0.6697 0.7426 0.0033 -vn 0.6698 0.7425 0.0037 -vn 0.6699 0.7424 0.0038 -vn 0.6710 0.7414 0.0071 -vn 0.7848 0.6198 0.0003 -vn 0.7639 0.6453 -0.0017 -vn 0.7529 0.6581 0.0018 -vn 0.7090 0.7052 -0.0015 -vn 0.6908 0.7230 0.0010 -vn 0.6553 0.7553 -0.0002 -vn 0.6581 0.7529 -0.0003 -vn 0.6512 0.7589 -0.0001 -vn 0.6484 0.7613 -0.0000 -vn 0.6221 0.7829 0.0000 -vn 0.5906 0.8070 0.0028 -vn 0.8457 0.5337 0.0000 -vn 0.8180 0.5752 -0.0025 -vn 0.8179 0.5754 -0.0020 -vn 0.8182 0.5749 -0.0032 -vn 0.8213 0.5703 -0.0143 -vn 0.8028 0.5962 -0.0010 -vn -0.3214 0.9469 0.0000 -vn -0.3221 0.9467 -0.0002 -vn -0.3235 0.9462 -0.0005 -vn -0.3242 0.9460 -0.0007 -vn -0.2605 0.9655 0.0013 -vn -0.2600 0.9656 0.0015 -vn -0.2589 0.9659 0.0020 -vn -0.2585 0.9660 0.0022 -vn -0.2138 0.9769 -0.0002 -vn -0.1763 0.9843 0.0007 -vn -0.1769 0.9842 0.0010 -vn -0.1744 0.9847 0.0001 -vn -0.1737 0.9848 -0.0001 -vn -0.1310 0.9914 -0.0001 -vn -0.3489 0.9372 -0.0000 -vn -0.3491 0.9371 0.0005 -vn -0.3593 0.9332 0.0005 -vn -0.3566 0.9343 0.0005 -vn -0.3563 0.9344 0.0004 -vn -0.3550 0.9349 -0.0003 -vn -0.3619 0.9322 0.0009 -vn -0.4046 0.9145 0.0063 -vn -0.3871 0.9219 0.0170 -vn -0.4978 0.8669 -0.0238 -vn -0.4314 0.9016 0.0310 -vn -0.4634 0.8861 0.0132 -vn -0.4874 0.8732 0.0051 -vn -0.5073 0.8617 0.0013 -vn -0.5213 0.8534 0.0002 -vn -0.5298 0.8481 0.0000 -vn -0.5275 0.8496 -0.0000 -vn -0.5333 0.8459 0.0000 -vn -0.5354 0.8446 -0.0000 -vn -0.5506 0.8348 -0.0004 -vn -0.6174 0.7865 -0.0170 -vn -0.6131 0.7899 -0.0140 -vn -0.6191 0.7851 -0.0182 -vn -0.6156 0.7879 0.0158 -vn -0.6301 0.7765 0.0078 -vn -0.6115 0.7911 -0.0131 -vn -0.6163 0.7873 -0.0156 -vn -0.6157 0.7879 -0.0153 -vn -0.6105 0.7919 -0.0131 -vn -0.5912 0.8065 -0.0066 -vn -0.5688 0.8224 -0.0026 -vn -0.7226 0.6912 0.0065 -vn -0.7200 0.6939 0.0026 -vn -0.7190 0.6950 0.0010 -vn -0.7192 0.6948 0.0015 -vn -0.7193 0.6947 0.0017 -vn -0.8583 0.5131 0.0000 -vn -0.8662 0.4984 -0.0353 -vn -0.8613 0.5079 -0.0142 -vn -0.6473 0.7622 0.0032 -vn -0.6756 0.7372 0.0000 -vn -0.7031 0.7111 -0.0000 -vn -0.7046 0.7096 -0.0001 -vn -0.7069 0.7074 -0.0001 -vn -0.7084 0.7058 -0.0002 -vn -0.7416 0.6709 0.0007 -vn -0.7521 0.6590 -0.0012 -vn -0.7984 0.6021 0.0013 -vn -0.8003 0.5996 0.0005 -vn -0.8044 0.5941 -0.0011 -vn -0.8065 0.5913 -0.0020 -vn -0.8285 0.5600 0.0003 -vn -0.8447 0.5352 -0.0010 -vn -0.8840 0.4676 0.0000 -vn -0.8840 0.4675 -0.0000 -vn -0.8840 0.4675 -0.0001 -usemtl None -s 1 -f 1//1 2//1 3//1 -f 1//1 3//1 4//1 -f 4//2 3//2 5//2 -f 4//2 5//2 6//2 -f 6//3 5//3 7//3 -f 6//3 7//3 8//3 -f 8//4 7//4 9//4 -f 8//4 9//4 10//4 -f 11//5 10//5 12//5 -f 12//5 10//5 9//5 -f 11//6 12//6 13//6 -f 11//6 13//6 14//6 -f 14//7 13//7 15//7 -f 14//7 15//7 16//7 -f 16//8 15//8 17//8 -f 16//8 17//8 18//8 -f 18//9 17//9 19//9 -f 18//9 19//9 20//9 -f 20//10 19//10 21//10 -f 20//10 21//10 22//10 -f 23//11 22//11 24//11 -f 24//11 22//11 21//11 -f 23//12 24//12 25//12 -f 23//12 25//12 26//12 -f 26//13 25//13 27//13 -f 26//13 27//13 28//13 -f 28//14 27//15 29//15 -f 28//14 29//15 30//14 -f 30//16 29//16 31//16 -f 30//16 31//16 32//16 -f 32//17 31//17 33//17 -f 32//17 33//17 34//17 -f 34//18 33//18 35//18 -f 34//18 35//18 36//18 -f 1//19 36//19 2//19 -f 2//19 36//19 35//19 -f 22//20 23//20 26//20 -f 4//20 6//20 22//20 -f 22//20 6//20 8//20 -f 26//20 28//20 22//20 -f 22//20 28//20 30//20 -f 22//20 30//20 32//20 -f 1//20 4//20 36//20 -f 36//20 4//20 22//20 -f 36//20 22//20 34//20 -f 34//20 22//20 32//20 -f 10//20 11//20 8//20 -f 8//20 11//20 14//20 -f 8//20 14//20 16//20 -f 16//20 18//20 8//20 -f 8//20 18//20 20//20 -f 8//20 20//20 22//20 -f 5//21 3//21 21//21 -f 33//21 31//21 21//21 -f 21//21 31//21 29//21 -f 3//21 2//21 21//21 -f 21//21 2//21 35//21 -f 21//21 35//21 33//21 -f 29//21 27//21 21//21 -f 21//21 27//21 25//21 -f 21//21 25//21 24//21 -f 5//21 21//21 7//21 -f 7//21 21//21 19//21 -f 7//21 19//21 17//21 -f 12//21 9//21 13//21 -f 13//21 9//21 7//21 -f 13//21 7//21 15//21 -f 15//21 7//21 17//21 -f 37//19 38//19 39//19 -f 39//19 38//19 40//19 -f 37//22 39//22 41//22 -f 37//22 41//22 42//22 -f 42//23 41//23 43//23 -f 42//23 43//23 44//23 -f 44//24 43//24 45//24 -f 44//24 45//24 46//24 -f 46//25 45//25 47//25 -f 46//25 47//25 48//25 -f 48//26 47//26 49//26 -f 48//26 49//26 50//26 -f 50//27 49//27 51//27 -f 50//27 51//27 52//27 -f 52//28 51//28 53//28 -f 52//28 53//28 54//28 -f 54//29 53//29 55//29 -f 54//29 55//29 56//29 -f 56//30 55//30 57//30 -f 56//30 57//30 58//30 -f 58//31 57//31 59//31 -f 58//31 59//31 60//31 -f 60//32 59//32 61//32 -f 60//32 61//32 62//32 -f 62//33 61//33 63//33 -f 62//33 63//33 64//33 -f 64//34 63//34 65//34 -f 64//34 65//34 66//34 -f 66//35 65//35 67//35 -f 66//35 67//35 68//35 -f 69//36 68//36 70//36 -f 70//36 68//36 67//36 -f 38//37 69//37 40//37 -f 40//37 69//37 70//37 -f 68//21 69//21 37//21 -f 37//21 69//21 38//21 -f 44//21 46//21 66//21 -f 68//21 37//21 66//21 -f 66//21 37//21 42//21 -f 66//21 42//21 44//21 -f 46//21 48//21 66//21 -f 66//21 48//21 50//21 -f 66//21 50//21 52//21 -f 52//21 54//21 66//21 -f 66//21 54//21 56//21 -f 66//21 56//21 58//21 -f 58//21 60//21 66//21 -f 66//21 60//21 62//21 -f 66//21 62//21 64//21 -f 65//20 51//20 49//20 -f 43//20 41//20 65//20 -f 65//20 41//20 39//20 -f 65//20 39//20 67//20 -f 67//20 39//20 40//20 -f 67//20 40//20 70//20 -f 49//20 47//20 65//20 -f 65//20 47//20 45//20 -f 65//20 45//20 43//20 -f 65//20 63//20 51//20 -f 51//20 63//20 61//20 -f 51//20 61//20 59//20 -f 59//20 57//20 51//20 -f 51//20 57//20 55//20 -f 51//20 55//20 53//20 -f 71//19 72//19 73//19 -f 73//19 72//19 74//19 -f 75//36 71//36 76//36 -f 76//36 71//36 73//36 -f 75//38 76//38 77//38 -f 75//38 77//38 78//38 -f 78//39 77//39 79//39 -f 78//39 79//39 80//39 -f 80//40 79//40 81//40 -f 80//40 81//40 82//40 -f 82//41 81//41 83//41 -f 82//41 83//41 84//41 -f 84//42 83//42 85//42 -f 84//42 85//42 86//42 -f 86//43 85//43 87//43 -f 86//43 87//43 88//43 -f 88//44 87//44 89//44 -f 88//44 89//44 90//44 -f 90//45 89//45 91//45 -f 90//45 91//45 92//45 -f 92//46 91//46 93//46 -f 92//46 93//46 94//46 -f 94//47 93//47 95//47 -f 94//47 95//47 96//47 -f 96//48 95//48 97//48 -f 96//48 97//48 98//48 -f 98//49 97//49 99//49 -f 98//49 99//49 100//49 -f 100//50 99//50 101//50 -f 100//50 101//50 102//50 -f 102//51 101//51 103//51 -f 102//51 103//51 104//51 -f 72//37 104//37 74//37 -f 74//37 104//37 103//37 -f 90//21 92//21 80//21 -f 94//21 96//21 75//21 -f 75//21 96//21 98//21 -f 75//21 98//21 100//21 -f 72//21 71//21 104//21 -f 104//21 71//21 75//21 -f 104//21 75//21 102//21 -f 102//21 75//21 100//21 -f 94//21 75//21 92//21 -f 92//21 75//21 78//21 -f 92//21 78//21 80//21 -f 80//21 82//21 90//21 -f 90//21 82//21 84//21 -f 90//21 84//21 88//21 -f 88//21 84//21 86//21 -f 76//20 73//20 74//20 -f 93//20 91//20 76//20 -f 74//20 103//20 76//20 -f 76//20 103//20 101//20 -f 76//20 101//20 99//20 -f 99//20 97//20 76//20 -f 76//20 97//20 95//20 -f 76//20 95//20 93//20 -f 85//20 83//20 87//20 -f 87//20 83//20 89//20 -f 83//20 81//20 89//20 -f 89//20 81//20 79//20 -f 89//20 79//20 91//20 -f 91//20 79//20 77//20 -f 91//20 77//20 76//20 -f 105//36 106//36 107//36 -f 107//36 106//36 108//36 -f 109//37 105//37 110//37 -f 110//37 105//37 107//37 -f 109//52 110//52 111//52 -f 109//52 111//52 112//52 -f 112//53 111//53 113//53 -f 112//53 113//53 114//53 -f 114//54 113//54 115//54 -f 114//54 115//54 116//54 -f 116//55 115//55 117//55 -f 116//55 117//55 118//55 -f 118//56 117//56 119//56 -f 118//56 119//56 120//56 -f 120//57 119//57 121//57 -f 120//57 121//57 122//57 -f 122//58 121//58 123//58 -f 122//58 123//58 124//58 -f 124//59 123//59 125//59 -f 124//59 125//59 126//59 -f 126//60 125//60 127//60 -f 126//60 127//60 128//60 -f 128//61 127//61 129//61 -f 128//61 129//61 130//61 -f 130//62 129//62 131//62 -f 130//62 131//62 132//62 -f 132//63 131//63 133//63 -f 132//63 133//63 134//63 -f 134//64 133//64 135//64 -f 134//64 135//64 136//64 -f 136//65 135//65 137//65 -f 136//65 137//65 138//65 -f 106//19 138//19 108//19 -f 108//19 138//19 137//19 -f 124//21 126//21 109//21 -f 109//21 132//21 134//21 -f 112//21 114//21 120//21 -f 120//21 114//21 116//21 -f 120//21 116//21 118//21 -f 112//21 120//21 109//21 -f 109//21 120//21 122//21 -f 109//21 122//21 124//21 -f 126//21 128//21 109//21 -f 109//21 128//21 130//21 -f 109//21 130//21 132//21 -f 106//21 105//21 138//21 -f 138//21 105//21 109//21 -f 138//21 109//21 136//21 -f 136//21 109//21 134//21 -f 107//20 108//20 110//20 -f 110//20 108//20 137//20 -f 110//20 131//20 129//20 -f 137//20 135//20 110//20 -f 110//20 135//20 133//20 -f 110//20 133//20 131//20 -f 129//20 127//20 110//20 -f 110//20 127//20 125//20 -f 110//20 125//20 123//20 -f 113//20 119//20 115//20 -f 115//20 119//20 117//20 -f 123//20 121//20 110//20 -f 110//20 121//20 119//20 -f 110//20 119//20 111//20 -f 111//20 119//20 113//20 -f 139//66 140//67 141//68 -f 141//68 140//67 142//67 -f 143//69 144//69 145//69 -f 143//69 145//69 146//69 -f 146//70 145//70 147//70 -f 146//70 147//70 148//70 -f 148//71 147//71 149//72 -f 148//71 149//72 150//72 -f 150//73 149//74 142//75 -f 150//73 142//75 140//76 -f 143//20 151//20 144//20 -f 144//20 151//20 152//20 -f 153//77 154//77 155//77 -f 155//78 154//79 156//80 -f 156//80 157//81 155//78 -f 155//78 157//81 158//82 -f 155//83 158//83 153//83 -f 153//84 158//84 159//84 -f 160//85 161//85 162//85 -f 162//85 161//85 163//85 -f 162//86 163//86 164//87 -f 164//87 163//86 165//87 -f 164//88 165//88 166//88 -f 166//88 165//88 167//88 -f 168//21 169//21 170//21 -f 170//21 169//21 171//21 -f 168//89 170//89 172//89 -f 168//89 172//89 173//89 -f 173//90 172//90 174//90 -f 173//90 174//90 175//90 -f 175//91 174//91 176//91 -f 175//91 176//91 177//91 -f 178//92 177//92 179//92 -f 179//92 177//92 176//92 -f 178//93 179//93 180//93 -f 178//93 180//93 181//93 -f 181//94 180//94 182//94 -f 181//94 182//94 183//94 -f 183//95 182//95 184//96 -f 183//95 184//96 185//96 -f 185//97 184//97 186//97 -f 185//97 186//97 187//97 -f 188//20 187//20 189//20 -f 189//20 187//20 186//20 -f 190//98 191//98 192//98 -f 193//99 194//99 195//99 -f 196//100 197//100 198//100 -f 199//101 200//101 201//101 -f 201//101 200//101 202//101 -f 201//102 202//102 203//102 -f 203//102 202//102 204//102 -f 203//103 204//103 198//103 -f 198//103 204//103 195//103 -f 198//104 195//104 196//104 -f 196//105 195//105 194//105 -f 200//106 205//106 202//107 -f 202//107 205//106 206//107 -f 202//108 206//108 204//109 -f 204//109 206//108 207//109 -f 204//110 207//110 195//110 -f 195//110 207//110 192//110 -f 195//111 192//111 193//111 -f 193//112 192//112 191//112 -f 205//113 208//113 206//114 -f 206//114 208//113 209//114 -f 206//115 209//115 207//115 -f 207//115 209//115 210//115 -f 207//116 210//116 192//117 -f 192//117 210//116 211//117 -f 192//118 211//118 190//118 -f 190//119 211//119 212//119 -f 213//120 208//121 214//120 -f 214//120 208//121 205//121 -f 214//122 205//122 215//122 -f 215//122 205//122 200//122 -f 215//123 200//123 216//123 -f 216//123 200//123 199//123 -f 217//124 218//124 219//124 -f 219//124 218//124 220//124 -f 219//125 220//125 221//125 -f 221//125 220//125 222//125 -f 221//126 222//126 223//127 -f 223//127 222//126 224//127 -f 223//128 224//128 216//129 -f 216//129 224//128 215//129 -f 218//130 225//130 220//130 -f 220//130 225//130 226//130 -f 220//131 226//131 222//132 -f 222//132 226//131 227//132 -f 222//133 227//133 224//134 -f 224//134 227//133 228//134 -f 224//135 228//135 215//135 -f 215//135 228//135 214//135 -f 225//136 229//136 226//137 -f 226//137 229//136 230//137 -f 226//138 230//138 227//139 -f 227//139 230//138 231//139 -f 227//140 231//140 228//141 -f 228//141 231//140 232//141 -f 228//142 232//142 214//143 -f 214//143 232//142 213//143 -f 233//144 234//144 235//144 -f 235//144 234//144 236//144 -f 235//145 236//145 237//146 -f 237//146 236//145 238//146 -f 237//147 238//147 239//147 -f 239//147 238//147 240//147 -f 234//148 241//148 236//149 -f 236//149 241//148 242//149 -f 236//150 242//150 238//150 -f 238//150 242//150 243//150 -f 238//151 243//151 240//151 -f 240//151 243//151 244//152 -f 241//153 245//153 242//154 -f 242//154 245//153 246//154 -f 242//155 246//155 243//155 -f 243//155 246//155 247//155 -f 243//156 247//156 244//157 -f 244//157 247//156 248//157 -f 248//158 229//158 244//158 -f 244//158 229//158 225//158 -f 244//159 225//159 240//159 -f 240//159 225//159 218//159 -f 240//160 218//160 239//160 -f 239//160 218//160 217//160 -f 249//20 250//20 251//20 -f 251//20 250//20 252//20 -f 251//20 252//20 253//20 -f 254//20 255//20 256//20 -f 251//20 257//20 249//20 -f 249//20 257//20 254//20 -f 249//20 254//20 258//20 -f 258//20 254//20 256//20 -f 259//161 256//161 260//161 -f 260//161 256//161 255//161 -f 261//21 262//21 263//21 -f 263//21 262//21 264//21 -f 263//21 264//21 265//21 -f 266//21 267//21 268//21 -f 264//21 269//21 265//21 -f 265//21 269//21 266//21 -f 265//21 266//21 270//21 -f 270//21 266//21 268//21 -f 271//162 272//162 273//162 -f 271//163 273//163 274//163 -f 275//164 276//164 277//164 -f 277//165 276//165 278//165 -f 262//166 279//166 264//167 -f 264//167 279//166 273//167 -f 264//167 273//167 269//167 -f 269//168 273//168 272//168 -f 269//169 272//169 266//169 -f 266//170 272//170 280//170 -f 266//171 280//171 267//171 -f 278//172 281//172 277//172 -f 277//173 281//173 282//174 -f 277//173 282//174 283//175 -f 284//176 285//176 282//176 -f 282//177 285//177 286//177 -f 282//174 286//178 283//175 -f 283//179 286//179 287//179 -f 283//180 287//180 288//180 -f 288//181 289//181 283//181 -f 283//182 289//182 290//182 -f 283//182 290//182 277//183 -f 277//183 290//182 291//183 -f 277//184 291//184 275//184 -f 275//185 291//185 292//185 -f 275//186 292//186 293//186 -f 262//187 284//187 279//187 -f 279//188 284//189 282//188 -f 279//188 282//188 273//190 -f 273//190 282//188 281//190 -f 273//191 281//191 274//191 -f 274//192 281//192 278//192 -f 289//193 294//193 290//193 -f 290//193 294//193 295//193 -f 290//193 295//193 291//193 -f 296//193 297//193 293//193 -f 295//193 298//193 291//193 -f 291//193 298//193 296//193 -f 291//193 296//193 292//193 -f 292//193 296//193 293//193 -f 297//194 299//194 300//194 -f 300//194 301//194 297//194 -f 297//194 301//194 302//194 -f 297//194 302//194 293//195 -f 303//196 272//196 271//196 -f 304//197 305//197 278//197 -f 304//198 306//199 307//198 -f 307//200 306//200 302//200 -f 307//201 302//201 301//201 -f 308//202 309//202 303//203 -f 303//204 309//204 310//204 -f 310//204 267//204 303//204 -f 303//205 267//205 280//205 -f 303//206 280//206 272//206 -f 278//207 276//207 304//207 -f 304//208 276//208 275//208 -f 304//209 275//209 306//209 -f 306//210 275//210 293//210 -f 306//211 293//211 302//211 -f 308//212 303//212 311//212 -f 311//213 303//213 271//213 -f 311//214 271//215 305//216 -f 305//217 271//217 274//217 -f 305//218 274//218 278//218 -f 312//219 309//219 313//219 -f 313//202 309//202 308//202 -f 313//220 308//220 314//220 -f 314//221 308//221 311//221 -f 314//222 311//214 315//223 -f 315//223 311//214 305//216 -f 315//224 305//224 316//224 -f 316//225 305//225 304//225 -f 316//226 304//226 317//226 -f 317//198 304//198 307//198 -f 317//227 307//227 318//227 -f 318//228 307//228 301//228 -f 318//229 301//229 300//229 -f 312//122 319//122 309//122 -f 309//122 319//122 268//122 -f 309//122 268//122 310//122 -f 310//122 268//122 267//230 -f 320//19 321//19 319//19 -f 319//19 312//19 320//19 -f 320//19 312//19 313//19 -f 320//19 313//19 322//19 -f 323//19 324//19 325//19 -f 325//19 324//19 326//19 -f 325//19 326//19 327//19 -f 327//19 326//19 328//19 -f 327//19 328//19 329//19 -f 329//19 328//19 330//19 -f 329//19 330//19 321//19 -f 321//19 330//19 331//19 -f 321//19 331//19 319//19 -f 313//19 314//19 322//19 -f 322//19 314//19 315//19 -f 322//19 315//19 332//19 -f 332//19 315//19 316//19 -f 332//19 316//19 333//19 -f 333//19 316//19 317//19 -f 334//19 259//19 335//19 -f 335//19 259//19 260//19 -f 335//19 260//19 336//19 -f 336//19 260//19 337//19 -f 336//19 337//19 338//19 -f 338//19 337//19 339//19 -f 338//19 339//19 323//19 -f 323//19 339//19 340//19 -f 323//19 340//19 324//19 -f 317//19 318//19 333//19 -f 333//19 318//19 300//19 -f 333//19 300//19 341//19 -f 341//19 300//19 299//19 -f 341//19 299//19 342//19 -f 342//19 299//19 343//19 -f 342//19 343//19 344//19 -f 344//19 343//19 345//19 -f 344//19 345//19 334//19 -f 334//19 345//19 346//19 -f 334//19 346//19 259//19 -f 347//122 334//122 348//122 -f 348//122 334//122 335//122 -f 323//231 349//231 350//231 -f 323//231 350//231 338//232 -f 338//233 350//234 351//234 -f 338//233 351//234 336//233 -f 336//235 351//236 348//236 -f 336//235 348//236 335//235 -f 349//194 323//194 352//194 -f 352//194 323//194 325//194 -f 321//237 353//237 354//237 -f 321//237 354//237 329//237 -f 329//238 354//238 355//238 -f 329//238 355//238 327//238 -f 327//239 355//239 352//239 -f 327//239 352//239 325//239 -f 353//161 321//161 356//161 -f 356//161 321//161 320//161 -f 333//240 357//240 358//240 -f 333//240 358//240 332//240 -f 332//241 358//241 359//241 -f 332//241 359//241 322//242 -f 322//243 359//243 356//243 -f 322//243 356//243 320//243 -f 341//244 360//244 333//244 -f 333//244 360//244 357//244 -f 334//245 347//246 361//245 -f 334//245 361//245 344//245 -f 344//247 361//248 362//248 -f 344//247 362//248 342//247 -f 342//249 362//249 360//249 -f 342//249 360//249 341//249 -f 363//250 364//250 365//250 -f 365//250 364//250 366//250 -f 365//251 366//251 367//251 -f 367//251 366//251 368//251 -f 367//252 368//252 369//252 -f 369//252 368//252 370//252 -f 369//253 370//253 371//253 -f 371//253 370//253 372//253 -f 371//254 372//254 373//254 -f 373//254 372//254 374//254 -f 373//255 374//255 375//255 -f 375//255 374//255 376//255 -f 375//256 376//256 377//256 -f 377//256 376//256 378//256 -f 377//257 378//257 379//257 -f 379//257 378//257 380//257 -f 379//258 380//258 381//258 -f 381//258 380//258 382//258 -f 381//259 382//259 383//259 -f 383//259 382//259 384//259 -f 383//260 384//260 385//260 -f 385//260 384//260 386//260 -f 385//261 386//261 363//261 -f 363//261 386//261 364//261 -f 364//19 387//19 366//19 -f 366//19 387//19 388//19 -f 366//19 388//19 368//19 -f 368//19 388//19 389//19 -f 368//19 389//19 370//19 -f 370//19 389//19 390//19 -f 370//19 390//19 372//19 -f 372//19 390//19 391//19 -f 372//19 391//19 374//19 -f 374//19 391//19 392//19 -f 374//19 392//19 376//19 -f 376//19 392//19 393//19 -f 376//19 393//19 378//19 -f 378//19 393//19 394//19 -f 378//19 394//19 380//19 -f 380//19 394//19 395//19 -f 380//19 395//19 382//19 -f 382//19 395//19 396//19 -f 382//19 396//19 384//19 -f 384//19 396//19 397//19 -f 384//19 397//19 386//19 -f 386//19 397//19 398//19 -f 386//19 398//19 364//19 -f 364//19 398//19 387//19 -f 399//262 392//262 400//262 -f 400//263 392//263 391//263 -f 400//263 391//263 401//263 -f 401//264 391//264 390//264 -f 401//264 390//264 402//264 -f 402//265 390//265 389//265 -f 402//265 389//265 403//265 -f 403//266 389//266 388//266 -f 403//266 388//266 404//266 -f 404//267 388//267 387//267 -f 404//267 387//267 405//267 -f 405//268 387//268 398//268 -f 405//268 398//268 406//268 -f 406//269 398//269 397//269 -f 406//269 397//269 407//269 -f 407//270 397//270 396//270 -f 407//270 396//270 408//270 -f 408//271 396//271 395//272 -f 408//271 395//272 409//272 -f 409//273 395//273 394//273 -f 409//273 394//273 410//273 -f 410//274 394//274 393//274 -f 410//274 393//274 399//274 -f 399//262 393//262 392//262 -f 411//261 400//261 412//261 -f 412//260 400//260 401//260 -f 412//260 401//260 413//260 -f 413//259 401//259 402//259 -f 413//259 402//259 414//259 -f 414//258 402//258 403//258 -f 414//258 403//258 415//258 -f 415//257 403//257 404//257 -f 415//257 404//257 416//257 -f 416//256 404//256 405//256 -f 416//256 405//256 417//256 -f 417//255 405//255 406//255 -f 417//255 406//255 418//255 -f 418//254 406//254 407//254 -f 418//254 407//254 419//254 -f 419//253 407//253 408//253 -f 419//253 408//253 420//253 -f 420//252 408//252 409//252 -f 420//252 409//252 421//252 -f 421//251 409//251 410//251 -f 421//251 410//251 422//251 -f 422//250 410//250 399//250 -f 422//250 399//250 411//250 -f 411//261 399//261 400//261 -f 423//19 422//19 424//19 -f 424//19 422//19 411//19 -f 424//19 411//19 425//19 -f 425//19 411//19 412//19 -f 425//19 412//19 426//19 -f 426//19 412//19 413//19 -f 415//19 427//19 414//19 -f 414//19 427//19 428//19 -f 414//19 428//19 413//19 -f 413//19 428//19 429//19 -f 413//19 429//19 426//19 -f 419//19 420//19 356//19 -f 355//19 430//19 352//19 -f 352//19 430//19 431//19 -f 352//19 431//19 349//19 -f 349//19 431//19 432//19 -f 349//19 432//19 350//19 -f 350//19 432//19 433//19 -f 350//19 433//19 351//19 -f 351//19 433//19 434//19 -f 351//19 434//19 348//19 -f 348//19 434//19 427//19 -f 348//19 427//19 347//19 -f 347//19 427//19 415//19 -f 353//19 435//19 354//19 -f 354//19 435//19 436//19 -f 354//19 436//19 355//19 -f 355//19 436//19 437//19 -f 355//19 437//19 430//19 -f 356//19 359//19 419//19 -f 419//19 359//19 358//19 -f 419//19 358//19 418//19 -f 418//19 358//19 357//19 -f 418//19 357//19 417//19 -f 417//19 357//19 360//19 -f 417//19 360//19 416//19 -f 416//19 360//19 362//19 -f 416//19 362//19 415//19 -f 415//19 362//19 361//19 -f 415//19 361//19 347//19 -f 423//19 438//19 422//19 -f 422//19 438//19 439//19 -f 422//19 439//19 421//19 -f 421//19 439//19 440//19 -f 421//19 440//19 420//19 -f 420//19 440//19 435//19 -f 420//19 435//19 356//19 -f 356//19 435//19 353//19 -f 441//275 442//275 443//275 -f 444//276 445//276 446//276 -f 424//277 447//277 423//278 -f 423//278 447//277 448//278 -f 423//279 448//279 438//280 -f 438//280 448//279 449//280 -f 438//281 449//281 439//281 -f 439//281 449//281 446//281 -f 439//282 446//282 440//283 -f 440//283 446//282 445//283 -f 447//284 450//284 448//285 -f 448//285 450//284 451//285 -f 448//286 451//286 449//286 -f 449//286 451//286 452//286 -f 449//287 452//287 446//287 -f 446//287 452//287 443//287 -f 446//288 443//288 444//288 -f 444//289 443//289 442//289 -f 450//290 453//290 451//291 -f 451//291 453//290 454//291 -f 451//292 454//292 452//292 -f 452//292 454//292 455//292 -f 452//293 455//293 443//293 -f 443//293 455//293 456//293 -f 443//294 456//294 441//294 -f 441//295 456//295 457//295 -f 453//296 458//296 454//296 -f 454//296 458//296 459//296 -f 454//297 459//297 455//297 -f 455//297 459//297 460//297 -f 455//298 460//298 456//298 -f 456//298 460//298 461//298 -f 456//299 461//299 457//299 -f 457//299 461//299 462//299 -f 424//300 425//300 463//300 -f 424//301 463//301 447//301 -f 447//302 463//302 464//302 -f 447//303 464//303 450//303 -f 450//304 464//304 465//304 -f 450//305 465//305 453//305 -f 453//306 465//306 466//306 -f 453//307 466//307 458//307 -f 464//308 463//308 467//308 -f 428//309 468//309 429//310 -f 429//310 468//309 469//310 -f 429//311 469//311 426//312 -f 426//312 469//311 467//312 -f 426//313 467//313 425//314 -f 425//314 467//313 463//314 -f 468//315 470//315 469//315 -f 469//315 470//315 471//315 -f 469//316 471//316 467//316 -f 467//316 471//316 472//316 -f 467//317 472//317 464//317 -f 464//318 472//318 465//318 -f 470//319 473//319 471//319 -f 471//319 473//319 474//319 -f 471//320 474//320 472//321 -f 472//321 474//320 475//321 -f 472//322 475//322 465//322 -f 465//322 475//322 466//322 -f 427//323 476//323 428//323 -f 428//324 476//324 468//324 -f 476//325 477//325 468//325 -f 468//326 477//326 478//326 -f 468//327 478//327 470//327 -f 470//328 478//328 479//328 -f 470//123 479//123 473//123 -f 473//329 479//329 480//329 -f 473//330 480//330 481//330 -f 482//331 483//331 484//331 -f 485//332 486//332 487//332 -f 477//333 476//333 485//333 -f 433//334 432//335 488//334 -f 476//336 427//336 485//336 -f 485//336 427//336 434//336 -f 485//337 434//337 486//338 -f 479//339 478//339 489//339 -f 489//340 478//340 477//340 -f 434//337 433//338 486//338 -f 486//334 433//334 488//334 -f 486//341 488//341 487//341 -f 487//342 488//342 490//342 -f 487//343 490//343 491//343 -f 480//344 479//344 492//344 -f 492//345 479//345 489//345 -f 492//346 489//346 484//346 -f 477//347 485//347 489//347 -f 489//332 485//332 487//332 -f 489//346 487//346 484//346 -f 484//348 487//348 491//348 -f 484//349 491//349 482//349 -f 483//350 493//350 484//351 -f 484//351 493//350 494//351 -f 484//352 494//353 492//354 -f 492//354 494//353 495//354 -f 492//355 495//355 480//355 -f 480//355 495//355 481//355 -f 496//356 493//356 497//356 -f 497//356 493//356 483//356 -f 497//357 483//357 498//357 -f 498//357 483//357 482//357 -f 498//358 482//359 499//358 -f 499//358 482//359 491//359 -f 499//360 491//361 500//360 -f 500//360 491//361 490//361 -f 500//362 490//363 501//362 -f 501//362 490//363 488//363 -f 501//364 488//365 431//365 -f 431//365 488//365 432//365 -f 502//366 503//366 504//366 -f 498//367 499//367 505//367 -f 436//368 435//369 506//369 -f 500//370 501//370 507//370 -f 507//371 501//371 431//371 -f 430//372 437//372 508//372 -f 508//373 437//373 509//373 -f 508//374 509//374 510//374 -f 499//375 500//375 505//375 -f 505//376 500//376 507//376 -f 505//377 507//377 511//378 -f 437//373 436//373 509//373 -f 509//368 436//368 506//369 -f 509//379 506//379 510//379 -f 510//380 506//380 512//380 -f 510//381 512//381 513//381 -f 497//382 498//382 514//382 -f 514//383 498//383 505//383 -f 514//384 505//384 515//384 -f 515//384 505//384 511//384 -f 515//385 511//386 504//386 -f 431//371 430//371 507//371 -f 507//372 430//372 508//372 -f 507//377 508//378 511//378 -f 511//374 508//374 510//374 -f 511//386 510//386 504//386 -f 504//387 510//387 513//387 -f 504//388 513//388 502//388 -f 503//389 516//389 504//389 -f 504//389 516//389 517//389 -f 504//390 517//390 515//390 -f 515//390 517//390 518//390 -f 515//391 518//391 514//391 -f 514//391 518//391 519//391 -f 514//392 519//392 497//392 -f 497//392 519//392 496//392 -f 435//393 440//393 506//393 -f 506//393 440//393 445//393 -f 506//394 445//394 512//394 -f 512//394 445//394 444//394 -f 512//395 444//395 513//395 -f 513//395 444//395 442//395 -f 513//396 442//396 502//396 -f 502//396 442//396 441//396 -f 502//397 441//397 503//397 -f 503//397 441//397 457//397 -f 503//398 457//398 516//398 -f 516//398 457//398 462//398 -f 473//19 233//19 474//19 -f 474//19 233//19 235//19 -f 474//19 235//19 475//19 -f 475//19 235//19 237//19 -f 475//19 237//19 466//19 -f 466//19 237//19 239//19 -f 466//19 239//19 458//19 -f 458//19 239//19 217//19 -f 458//19 217//19 459//19 -f 459//19 217//19 219//19 -f 459//19 219//19 460//19 -f 460//19 219//19 221//19 -f 460//19 221//19 461//19 -f 461//19 221//19 223//19 -f 461//19 223//19 462//19 -f 462//19 223//19 216//19 -f 462//19 216//19 516//19 -f 516//19 216//19 199//19 -f 516//19 199//19 517//19 -f 517//19 199//19 201//19 -f 517//19 201//19 518//19 -f 518//19 201//19 203//19 -f 518//19 203//19 519//19 -f 519//19 203//19 198//19 -f 519//19 198//19 496//19 -f 496//19 198//19 197//19 -f 496//19 197//19 493//19 -f 493//19 197//19 520//19 -f 493//19 520//19 494//19 -f 494//19 520//19 521//19 -f 494//19 521//19 495//19 -f 495//19 521//19 522//19 -f 495//19 522//19 481//19 -f 481//19 522//19 523//19 -f 481//19 523//19 473//19 -f 473//19 523//19 233//19 -f 212//399 524//399 190//399 -f 190//399 524//399 525//399 -f 190//400 525//401 191//400 -f 191//400 525//401 526//401 -f 191//402 526//402 193//402 -f 193//402 526//402 527//402 -f 193//403 527//403 194//403 -f 194//403 527//403 528//403 -f 194//404 528//405 196//404 -f 196//404 528//405 529//405 -f 196//406 529//407 197//406 -f 197//406 529//407 520//407 -f 525//408 524//408 530//408 -f 527//409 526//409 531//409 -f 529//410 528//410 532//410 -f 520//411 529//411 521//411 -f 521//412 529//412 532//412 -f 521//413 532//413 522//414 -f 522//414 532//413 533//414 -f 522//415 533//415 523//415 -f 523//415 533//415 534//415 -f 528//416 527//416 532//416 -f 532//417 527//417 531//417 -f 532//418 531//418 533//419 -f 533//419 531//418 535//419 -f 533//420 535//420 534//421 -f 534//421 535//420 536//421 -f 526//422 525//422 531//422 -f 531//423 525//423 530//423 -f 531//424 530//424 535//425 -f 535//425 530//424 537//425 -f 535//426 537//426 536//426 -f 536//426 537//426 538//427 -f 538//428 245//428 536//428 -f 536//428 245//428 241//428 -f 536//429 241//429 534//429 -f 534//429 241//429 234//429 -f 534//430 234//430 523//430 -f 523//430 234//430 233//430 -f 245//19 171//19 246//19 -f 246//19 171//19 539//19 -f 246//19 539//19 247//19 -f 247//19 539//19 540//19 -f 247//19 540//19 248//19 -f 248//19 540//19 541//19 -f 248//19 541//19 229//19 -f 229//19 541//19 542//19 -f 229//19 542//19 230//19 -f 230//19 542//19 543//19 -f 230//19 543//19 231//19 -f 231//19 543//19 544//19 -f 231//19 544//19 232//19 -f 232//19 544//19 545//19 -f 232//19 545//19 213//19 -f 213//19 545//19 189//19 -f 213//19 189//19 208//19 -f 208//19 189//19 186//19 -f 208//19 186//19 209//19 -f 209//19 186//19 184//19 -f 209//19 184//19 210//19 -f 210//19 184//19 182//19 -f 210//19 182//19 211//19 -f 211//19 182//19 180//19 -f 211//19 180//19 212//19 -f 212//19 180//19 179//19 -f 212//19 179//19 524//19 -f 524//19 179//19 176//19 -f 524//19 176//19 530//19 -f 530//19 176//19 174//19 -f 530//19 174//19 537//19 -f 537//19 174//19 172//19 -f 537//19 172//19 538//19 -f 538//19 172//19 170//19 -f 538//19 170//19 245//19 -f 245//19 170//19 171//19 -f 546//431 541//431 540//431 -f 546//431 540//431 547//431 -f 547//432 540//432 539//432 -f 547//432 539//432 548//432 -f 548//433 539//433 171//433 -f 548//433 171//433 169//433 -f 549//434 550//434 551//434 -f 552//435 553//436 554//437 -f 554//438 553//438 549//438 -f 549//439 551//440 554//441 -f 554//441 551//440 555//442 -f 554//437 555//443 552//435 -f 556//20 557//20 558//20 -f 558//20 557//20 559//20 -f 560//444 561//444 562//444 -f 560//444 562//444 563//444 -f 563//445 562//445 564//445 -f 563//445 564//445 565//445 -f 565//446 564//446 566//446 -f 565//446 566//446 567//446 -f 567//447 566//447 568//447 -f 567//447 568//447 569//447 -f 570//21 571//21 572//21 -f 572//21 571//21 573//21 -f 574//448 575//448 576//448 -f 576//449 575//449 577//449 -f 577//450 578//450 576//450 -f 576//451 578//451 579//451 -f 576//452 579//452 580//452 -f 579//453 581//453 580//453 -f 580//454 581//454 582//454 -f 580//455 582//455 583//455 -f 583//456 582//456 584//456 -f 584//457 582//457 570//457 -f 584//458 570//458 572//458 -f 585//459 586//460 587//459 -f 587//459 586//460 588//460 -f 587//461 588//461 589//462 -f 589//462 588//461 590//462 -f 589//463 590//464 591//463 -f 591//463 590//464 592//464 -f 591//465 592//465 593//465 -f 593//466 592//466 594//466 -f 592//467 595//467 594//467 -f 594//468 595//468 596//468 -f 594//469 596//470 597//471 -f 597//471 596//470 598//472 -f 597//473 598//474 599//475 -f 599//475 598//474 600//476 -f 601//477 560//477 602//477 -f 602//478 560//478 603//478 -f 602//479 603//479 604//479 -f 604//480 603//480 605//480 -f 604//481 605//481 606//481 -f 606//482 605//482 607//482 -f 606//483 607//483 608//483 -f 609//484 610//484 611//484 -f 611//485 610//485 608//485 -f 611//486 608//486 612//486 -f 612//487 608//487 607//487 -f 613//19 610//19 614//19 -f 614//19 610//19 609//19 -f 614//19 609//19 615//19 -f 616//19 617//19 618//19 -f 619//19 620//19 621//19 -f 621//19 620//19 622//19 -f 621//19 622//19 623//19 -f 623//19 622//19 624//19 -f 623//19 624//19 625//19 -f 618//19 617//19 626//19 -f 626//19 617//19 627//19 -f 626//19 627//19 609//19 -f 609//19 627//19 628//19 -f 609//19 628//19 615//19 -f 618//19 629//19 616//19 -f 616//19 629//19 630//19 -f 616//19 630//19 631//19 -f 631//19 630//19 632//19 -f 631//19 632//19 633//19 -f 633//19 632//19 634//19 -f 633//19 634//19 635//19 -f 635//19 634//19 636//19 -f 635//19 636//19 637//19 -f 637//19 636//19 638//19 -f 637//19 638//19 639//19 -f 639//19 638//19 640//19 -f 639//19 640//19 641//19 -f 624//19 642//19 625//19 -f 625//19 642//19 643//19 -f 625//19 643//19 644//19 -f 644//19 643//19 645//19 -f 644//19 645//19 600//19 -f 600//19 645//19 646//19 -f 600//19 646//19 599//19 -f 599//19 646//19 641//19 -f 599//19 641//19 647//19 -f 647//19 641//19 640//19 -f 574//19 648//19 575//19 -f 575//19 648//19 649//19 -f 575//19 649//19 650//19 -f 650//19 649//19 651//19 -f 650//19 651//19 652//19 -f 652//19 651//19 653//19 -f 652//19 653//19 654//19 -f 654//19 653//19 655//19 -f 654//19 655//19 619//19 -f 619//19 655//19 656//19 -f 619//19 656//19 620//19 -f 649//488 648//488 657//488 -f 657//489 648//489 658//489 -f 659//490 660//490 661//490 -f 661//491 660//491 662//491 -f 661//492 662//492 663//492 -f 663//493 662//493 664//493 -f 663//494 664//494 665//494 -f 665//495 664//495 666//495 -f 665//496 666//496 658//496 -f 658//497 666//497 667//497 -f 658//498 667//498 657//498 -f 659//20 668//20 660//20 -f 660//20 668//20 669//20 -f 660//499 669//499 670//499 -f 660//499 670//499 671//499 -f 671//500 670//500 672//500 -f 671//500 672//500 673//500 -f 673//501 672//501 674//501 -f 673//502 674//502 675//502 -f 675//503 674//503 676//503 -f 675//503 676//503 677//503 -f 678//21 679//21 680//21 -f 680//21 679//21 681//21 -f 682//504 683//504 684//504 -f 684//504 683//504 685//504 -f 686//504 687//504 688//504 -f 688//504 687//504 689//504 -f 690//505 691//506 692//507 -f 692//507 691//506 693//508 -f 690//509 692//509 694//509 -f 694//510 692//510 695//510 -f 694//511 695//511 696//511 -f 697//512 698//512 699//512 -f 697//513 699//513 695//513 -f 695//514 699//514 700//514 -f 695//515 700//515 696//515 -f 698//516 697//516 701//516 -f 701//517 697//517 702//517 -f 701//518 702//518 703//518 -f 704//519 705//520 706//521 -f 707//522 708//522 709//522 -f 710//523 711//523 712//523 -f 713//524 714//524 715//524 -f 710//525 712//525 716//525 -f 717//526 718//526 719//526 -f 720//527 721//528 704//528 -f 719//529 722//529 717//529 -f 717//530 722//530 723//530 -f 717//531 723//531 724//531 -f 724//532 723//532 725//532 -f 724//533 725//533 726//533 -f 726//534 725//534 727//534 -f 726//534 727//534 728//534 -f 728//535 727//535 729//535 -f 728//536 729//536 730//536 -f 730//537 731//538 728//539 -f 728//539 731//538 732//540 -f 728//541 732//542 726//541 -f 726//541 732//542 733//543 -f 726//544 733//544 724//545 -f 724//545 733//544 734//546 -f 724//547 734//548 717//549 -f 717//549 734//548 709//548 -f 717//550 709//550 718//550 -f 718//551 709//551 708//551 -f 705//552 707//552 706//552 -f 706//553 707//553 709//553 -f 706//554 709//555 735//555 -f 735//555 709//555 734//556 -f 735//557 734//557 736//558 -f 736//558 734//557 733//559 -f 736//560 733//560 737//561 -f 737//561 733//560 732//562 -f 737//563 732//564 712//565 -f 712//565 732//564 731//566 -f 712//567 731//567 716//567 -f 716//568 731//568 730//568 -f 716//569 730//569 738//569 -f 738//570 730//570 729//570 -f 738//571 729//571 686//571 -f 704//572 706//572 720//572 -f 720//573 706//574 735//575 -f 720//573 735//575 739//575 -f 739//576 735//576 736//577 -f 739//576 736//577 740//577 -f 740//578 736//579 737//580 -f 740//578 737//580 741//580 -f 741//581 737//582 712//583 -f 741//581 712//583 715//584 -f 715//585 712//585 711//585 -f 715//586 711//586 713//586 -f 742//587 743//587 744//587 -f 707//588 705//588 745//588 -f 704//528 721//528 746//589 -f 704//519 746//590 705//520 -f 707//591 745//591 708//591 -f 747//592 719//592 718//592 -f 748//593 749//593 750//593 -f 751//594 752//595 753//595 -f 705//596 746//596 745//596 -f 745//597 746//598 754//599 -f 745//597 754//599 755//597 -f 755//600 754//600 756//601 -f 755//600 756//601 757//601 -f 757//602 756//602 758//602 -f 757//602 758//602 759//602 -f 759//603 758//604 760//603 -f 759//603 760//603 761//603 -f 761//605 760//605 751//606 -f 761//605 751//606 762//606 -f 762//607 751//607 753//607 -f 762//608 753//609 763//610 -f 763//611 742//611 762//611 -f 762//612 742//612 744//612 -f 762//613 744//613 761//614 -f 761//614 744//613 764//614 -f 761//615 764//615 759//616 -f 759//616 764//615 765//616 -f 759//617 765//617 757//618 -f 757//618 765//617 766//618 -f 757//619 766//620 755//621 -f 755//621 766//620 767//622 -f 755//623 767//624 745//625 -f 745//625 767//624 768//626 -f 745//627 768//627 708//627 -f 743//628 749//629 744//630 -f 744//631 749//631 748//631 -f 744//632 748//632 764//633 -f 764//633 748//632 769//633 -f 764//634 769//634 765//635 -f 765//635 769//634 770//635 -f 765//636 770//637 766//638 -f 766//638 770//637 771//639 -f 766//640 771//640 767//641 -f 767//641 771//640 772//642 -f 767//643 772//644 768//645 -f 768//645 772//644 773//646 -f 768//647 773//647 708//647 -f 750//648 774//648 748//648 -f 748//649 774//649 775//649 -f 748//650 775//650 769//650 -f 769//651 775//651 776//651 -f 769//652 776//652 770//652 -f 770//653 776//653 777//653 -f 770//654 777//654 771//654 -f 771//655 777//655 778//655 -f 771//656 778//656 772//656 -f 772//657 778//657 747//657 -f 772//658 747//658 773//658 -f 773//659 747//659 718//659 -f 773//660 718//660 708//660 -f 743//661 742//661 779//661 -f 779//662 742//662 763//662 -f 779//663 763//663 780//663 -f 780//664 763//610 753//609 -f 780//665 753//595 752//595 -f 781//666 750//666 782//666 -f 782//667 750//667 749//667 -f 782//668 749//668 783//668 -f 783//669 749//629 743//628 -f 783//670 743//670 784//670 -f 784//671 743//671 779//671 -f 785//672 786//672 787//672 -f 787//673 786//673 788//673 -f 787//674 788//674 789//674 -f 789//675 788//675 790//675 -f 789//676 790//676 791//676 -f 792//677 793//677 794//677 -f 794//678 793//678 795//678 -f 794//679 795//679 796//679 -f 796//680 795//680 797//680 -f 796//681 797//681 787//681 -f 787//682 797//682 798//682 -f 787//683 798//683 785//683 -f 799//615 800//684 801//684 -f 802//618 799//617 803//618 -f 804//642 805//685 806//685 -f 807//588 808//588 809//588 -f 810//686 811//686 812//686 -f 813//687 814//687 815//687 -f 813//688 791//688 814//688 -f 814//689 791//689 790//689 -f 814//649 790//649 788//690 -f 816//691 817//692 818//608 -f 818//693 817//693 819//693 -f 818//612 819//612 815//612 -f 815//587 819//587 820//587 -f 815//630 820//628 813//694 -f 807//591 809//591 821//591 -f 822//695 823//695 821//695 -f 821//696 823//696 824//696 -f 822//697 825//698 823//699 -f 823//658 825//700 793//701 -f 823//659 793//659 824//659 -f 824//592 793//592 792//592 -f 802//619 805//702 826//703 -f 826//703 805//702 804//704 -f 826//705 804//706 809//707 -f 798//708 797//708 825//708 -f 825//709 797//709 795//709 -f 825//700 795//657 793//701 -f 802//618 803//618 805//710 -f 805//711 803//712 827//637 -f 805//711 827//637 806//713 -f 821//714 809//714 822//714 -f 822//715 809//707 804//706 -f 822//697 804//643 825//698 -f 825//716 804//642 806//685 -f 825//717 806//717 798//717 -f 798//718 806//719 827//720 -f 798//718 827//720 785//721 -f 799//615 801//684 803//615 -f 803//722 801//723 828//724 -f 803//722 828//724 827//725 -f 827//726 828//726 786//726 -f 827//727 786//727 785//727 -f 829//606 800//728 830//728 -f 830//603 800//603 799//729 -f 830//603 799//729 831//729 -f 831//730 799//730 802//730 -f 831//730 802//730 832//602 -f 832//601 802//601 826//731 -f 832//601 826//731 833//731 -f 833//597 826//732 809//733 -f 833//597 809//733 812//598 -f 812//596 809//596 808//596 -f 812//734 808//734 810//734 -f 834//735 816//735 829//594 -f 829//607 816//607 818//607 -f 829//606 818//606 800//728 -f 800//736 818//737 815//737 -f 800//736 815//737 801//614 -f 801//738 815//632 814//632 -f 801//738 814//632 828//738 -f 828//739 814//649 788//690 -f 828//740 788//740 786//740 -f 835//741 791//741 836//741 -f 836//742 791//742 813//742 -f 836//743 813//743 837//743 -f 837//669 813//694 820//628 -f 837//744 820//744 838//744 -f 838//745 820//745 839//745 -f 820//661 819//661 839//661 -f 839//746 819//746 817//746 -f 839//663 817//663 840//663 -f 840//747 817//692 816//691 -f 840//748 816//735 834//735 -f 841//193 842//193 843//193 -f 843//193 842//193 844//193 -f 845//749 846//750 847//751 -f 847//752 846//752 848//752 -f 841//753 843//753 849//753 -f 849//754 843//754 850//754 -f 849//743 850//743 851//743 -f 851//755 850//755 852//755 -f 851//744 852//744 853//744 -f 853//756 852//756 854//756 -f 853//757 854//757 848//757 -f 848//758 854//758 855//758 -f 848//759 855//759 847//759 -f 856//760 857//19 780//19 -f 858//19 859//19 860//19 -f 860//19 859//19 861//19 -f 860//19 861//19 862//19 -f 863//19 864//19 840//19 -f 858//19 860//19 865//19 -f 865//19 860//19 866//19 -f 865//19 866//19 867//19 -f 867//19 866//19 868//19 -f 867//19 868//19 856//760 -f 856//760 868//19 869//19 -f 856//760 869//19 857//19 -f 780//19 752//19 856//760 -f 856//760 752//19 751//19 -f 856//760 751//19 870//761 -f 870//761 751//19 760//19 -f 870//761 760//19 871//19 -f 871//19 760//19 758//19 -f 871//19 758//19 872//19 -f 872//19 758//19 756//19 -f 872//19 756//19 873//19 -f 873//19 756//19 754//19 -f 861//19 874//19 862//19 -f 862//19 874//19 875//19 -f 862//19 875//19 811//19 -f 811//19 875//19 876//19 -f 811//19 876//19 812//19 -f 812//19 876//19 877//19 -f 812//19 877//19 833//19 -f 833//19 877//19 878//19 -f 833//19 878//19 832//19 -f 832//19 878//19 879//19 -f 832//19 879//19 831//19 -f 831//19 879//19 830//19 -f 880//19 846//19 714//19 -f 714//19 846//19 845//19 -f 714//19 845//19 715//19 -f 715//19 845//19 881//19 -f 715//19 881//19 741//19 -f 741//19 881//19 882//19 -f 741//19 882//19 740//19 -f 740//19 882//19 883//19 -f 740//19 883//19 739//19 -f 739//19 883//19 884//19 -f 739//19 884//19 720//19 -f 720//19 884//19 885//19 -f 720//19 885//19 721//19 -f 721//19 885//19 886//19 -f 721//19 886//19 746//19 -f 746//19 886//19 887//19 -f 746//19 887//19 754//19 -f 754//19 887//19 888//19 -f 754//19 888//19 873//19 -f 840//19 834//19 863//19 -f 863//19 834//19 829//19 -f 863//19 829//19 889//19 -f 889//19 829//19 830//19 -f 889//19 830//19 890//19 -f 890//19 830//19 879//19 -f 703//762 891//762 892//762 -f 703//763 892//763 893//763 -f 893//764 892//764 894//764 -f 893//765 894//765 895//765 -f 895//766 894//766 896//766 -f 895//767 896//767 897//767 -f 898//768 864//768 863//768 -f 863//769 899//770 898//771 -f 898//772 899//772 900//772 -f 898//773 900//773 896//773 -f 896//774 900//774 901//774 -f 896//775 901//775 897//775 -f 902//776 691//776 690//776 -f 903//777 904//777 905//777 -f 905//778 904//778 902//778 -f 906//779 907//779 908//779 -f 908//780 907//780 909//780 -f 876//781 910//781 877//782 -f 877//783 910//783 906//783 -f 901//784 900//784 911//784 -f 911//785 900//785 899//785 -f 893//786 895//786 912//786 -f 912//787 895//787 897//787 -f 902//788 690//788 905//788 -f 905//789 690//789 694//790 -f 905//789 694//790 913//791 -f 913//792 694//792 696//792 -f 913//793 696//793 914//793 -f 703//794 893//794 701//794 -f 701//795 893//795 912//795 -f 701//796 912//796 698//796 -f 698//797 912//797 915//797 -f 698//798 915//798 699//798 -f 699//799 915//800 914//801 -f 699//799 914//801 700//801 -f 700//802 914//802 696//802 -f 897//803 901//803 912//803 -f 912//804 901//804 911//804 -f 912//805 911//805 915//806 -f 915//806 911//805 916//807 -f 915//808 916//808 914//809 -f 914//809 916//808 917//810 -f 914//811 917//811 913//812 -f 913//812 917//811 918//812 -f 913//813 918//814 905//815 -f 905//815 918//814 908//816 -f 905//817 908//817 903//817 -f 903//818 908//818 909//818 -f 906//819 908//819 877//819 -f 877//820 908//820 918//821 -f 877//820 918//821 878//822 -f 878//823 918//823 917//824 -f 878//823 917//824 879//824 -f 879//825 917//825 916//826 -f 879//825 916//826 890//827 -f 890//828 916//828 911//829 -f 890//828 911//829 889//829 -f 889//830 911//830 899//830 -f 889//831 899//770 863//769 -f 904//832 903//833 919//834 -f 920//835 921//835 922//835 -f 922//836 921//836 923//836 -f 922//837 923//837 924//837 -f 925//838 926//838 927//838 -f 928//839 929//839 930//839 -f 930//840 929//840 931//840 -f 930//841 931//841 932//841 -f 867//19 856//760 928//842 -f 909//843 907//843 933//843 -f 933//844 907//844 906//844 -f 933//845 906//845 910//845 -f 934//846 691//846 902//846 -f 902//847 935//847 934//847 -f 934//848 935//848 936//848 -f 934//849 936//849 937//849 -f 937//850 936//850 938//850 -f 937//851 938//851 939//851 -f 939//852 938//852 940//852 -f 939//853 940//853 941//853 -f 941//854 940//854 942//854 -f 941//855 942//855 943//855 -f 943//856 942//856 922//856 -f 943//857 922//857 944//857 -f 944//858 922//858 924//858 -f 944//859 924//859 945//859 -f 902//860 904//860 935//860 -f 935//861 904//832 919//834 -f 935//862 919//862 936//863 -f 936//863 919//862 946//863 -f 936//864 946//864 938//864 -f 938//864 946//864 947//864 -f 938//865 947//865 940//866 -f 940//866 947//865 948//867 -f 940//868 948//869 942//870 -f 942//870 948//869 949//871 -f 942//872 949//873 922//874 -f 922//874 949//873 925//875 -f 922//876 925//876 920//876 -f 920//877 925//877 927//877 -f 903//878 909//878 919//878 -f 919//879 909//879 933//879 -f 919//880 933//880 946//880 -f 946//880 933//880 950//880 -f 946//881 950//881 947//882 -f 947//882 950//881 951//882 -f 947//883 951//883 948//883 -f 948//883 951//883 952//883 -f 948//884 952//885 949//886 -f 949//886 952//885 953//887 -f 949//888 953//889 925//890 -f 925//890 953//889 932//891 -f 925//892 932//892 926//892 -f 926//893 932//893 931//893 -f 928//894 930//895 867//896 -f 867//896 930//895 932//897 -f 867//896 932//897 865//898 -f 865//899 932//900 953//901 -f 865//899 953//901 858//902 -f 858//903 953//904 952//905 -f 858//903 952//905 859//906 -f 859//907 952//908 951//909 -f 859//907 951//909 861//909 -f 861//910 951//910 950//910 -f 861//910 950//910 874//910 -f 874//911 950//911 933//912 -f 874//911 933//912 875//912 -f 875//913 933//913 910//913 -f 875//914 910//781 876//781 -f 928//842 856//760 870//761 -f 954//915 955//915 956//915 -f 956//916 955//916 957//916 -f 958//917 959//917 960//917 -f 886//918 961//918 887//919 -f 887//920 961//920 962//920 -f 928//921 870//922 929//923 -f 927//924 926//924 963//924 -f 963//925 926//925 931//925 -f 963//926 931//926 929//926 -f 945//927 924//927 964//927 -f 924//928 923//928 964//928 -f 964//929 923//929 921//929 -f 964//930 921//930 965//930 -f 965//931 921//931 920//931 -f 929//923 870//922 963//932 -f 963//933 870//934 871//935 -f 963//933 871//935 966//936 -f 966//937 871//938 872//939 -f 966//937 872//939 967//940 -f 967//941 872//942 873//943 -f 967//941 873//943 968//943 -f 968//944 873//944 888//945 -f 968//944 888//945 969//945 -f 969//946 888//947 887//948 -f 969//946 887//948 958//949 -f 958//950 887//950 962//950 -f 958//951 962//951 959//951 -f 960//952 954//952 958//952 -f 958//953 954//953 956//953 -f 958//954 956//955 969//956 -f 969//956 956//955 970//957 -f 969//958 970//959 968//960 -f 968//960 970//959 971//961 -f 968//962 971//963 967//964 -f 967//964 971//963 972//965 -f 967//966 972//967 966//968 -f 966//968 972//967 964//969 -f 966//970 964//971 963//972 -f 963//972 964//971 965//973 -f 963//974 965//974 927//974 -f 927//975 965//975 920//975 -f 945//976 964//976 973//976 -f 973//977 964//977 972//977 -f 973//978 972//978 974//978 -f 974//979 972//979 971//979 -f 974//980 971//980 975//980 -f 975//981 971//981 970//981 -f 975//981 970//981 976//981 -f 976//982 970//982 956//982 -f 976//983 956//983 977//983 -f 977//984 956//984 957//984 -f 977//985 957//985 978//985 -f 979//986 980//987 981//987 -f 982//988 983//989 984//990 -f 850//991 985//991 986//991 -f 850//992 843//992 985//992 -f 985//993 843//993 987//993 -f 985//994 987//994 988//995 -f 847//996 855//996 989//996 -f 989//997 855//997 854//997 -f 989//998 854//998 986//998 -f 986//999 854//999 852//999 -f 986//1000 852//1000 850//1000 -f 990//1001 962//1001 961//1001 -f 959//1002 991//1002 960//1002 -f 960//1003 991//1003 954//1003 -f 955//1004 992//1004 957//1004 -f 957//1005 992//1005 993//1005 -f 957//1006 993//1006 978//1006 -f 994//1007 993//1008 995//1007 -f 995//1007 993//1008 992//1008 -f 995//1009 992//1010 991//1011 -f 991//1012 992//1013 955//1014 -f 991//1012 955//1014 954//1015 -f 979//1016 983//1017 996//1018 -f 996//1018 983//1017 982//1019 -f 996//1020 982//1021 990//1022 -f 997//1023 994//1024 984//1025 -f 984//1025 994//1024 995//1026 -f 984//990 995//1027 982//988 -f 982//1028 995//1009 991//1011 -f 982//1021 991//1029 990//1022 -f 990//1030 991//1030 959//1030 -f 990//1031 959//1031 962//1031 -f 979//986 981//987 983//986 -f 983//1032 981//1033 998//1033 -f 983//1032 998//1033 984//1034 -f 984//1035 998//1035 999//1035 -f 984//1036 999//1036 997//1036 -f 881//1037 980//1037 882//1037 -f 882//1038 980//1038 979//1039 -f 882//1038 979//1039 883//1039 -f 883//1040 979//1040 996//1041 -f 883//1040 996//1041 884//1042 -f 884//1043 996//1043 990//1044 -f 884//1043 990//1044 885//1044 -f 885//1045 990//1045 961//1045 -f 885//1046 961//918 886//918 -f 845//749 847//751 881//1047 -f 881//1048 847//1048 989//1048 -f 881//1037 989//1037 980//1037 -f 980//1049 989//1050 986//1050 -f 980//1049 986//1050 981//1049 -f 981//1051 986//1052 985//1052 -f 981//1051 985//1052 998//1051 -f 998//995 985//994 988//995 -f 998//1053 988//1053 999//1053 -f 843//1054 844//1054 1000//1054 -f 997//1055 999//1055 1001//1055 -f 1001//1056 999//1056 988//1056 -f 1001//1057 988//1057 1000//1057 -f 1000//1058 988//1058 987//1058 -f 1000//1059 987//1059 843//1059 -f 997//1060 1001//1060 994//1060 -f 994//1061 1001//1061 1002//1061 -f 994//1062 1002//1062 993//1062 -f 993//1063 1002//1063 1003//1063 -f 993//1064 1003//1064 978//1064 -f 1004//1065 1005//1065 1006//1065 -f 1004//1065 1006//1065 1007//1065 -f 1007//1066 1006//1066 1008//1066 -f 1007//1067 1008//1067 1009//1067 -f 1009//1068 1008//1068 1010//1068 -f 1009//1068 1010//1068 1011//1068 -f 1012//1069 1013//1069 1014//1069 -f 1012//1069 1014//1069 1015//1069 -f 1015//1070 1014//1070 1016//1070 -f 1015//1070 1016//1070 1017//1070 -f 1017//1071 1016//1071 1018//1071 -f 1017//1071 1018//1071 1019//1071 -f 1019//1072 1018//1072 1020//1072 -f 1019//1072 1020//1072 1021//1072 -f 1022//504 1023//504 1024//504 -f 1024//504 1023//504 1025//504 -f 1026//20 1027//20 1028//20 -f 1028//20 1027//20 1029//20 -f 1030//1073 1031//1073 1032//1073 -f 1032//1074 1031//1074 1033//1074 -f 1032//1075 1033//1076 1034//1077 -f 1034//1077 1033//1076 1035//1078 -f 1034//1079 1035//1079 1036//1079 -f 1036//1080 1035//1080 1037//1080 -f 1036//1081 1037//1081 1038//1081 -f 1038//1082 1037//1082 1039//1082 -f 1038//1083 1039//1083 1040//1083 -f 1040//1084 1039//1084 1041//1084 -f 1042//1085 1043//1086 1044//1087 -f 1044//1087 1043//1086 1045//1088 -f 1046//1089 1040//1090 1041//1091 -f 1041//1091 1047//1092 1046//1089 -f 1046//1093 1047//1093 1048//1093 -f 1046//1094 1048//1094 1049//1094 -f 1050//1095 1051//1095 1052//1095 -f 1050//1096 1052//1096 1053//1096 -f 1052//1097 1054//1097 1053//1097 -f 1053//1098 1054//1098 1055//1098 -f 1053//1099 1055//1099 1045//1099 -f 1045//1100 1055//1100 1056//1100 -f 1045//1101 1056//1101 1044//1101 -f 1048//1102 1057//1102 1049//1102 -f 1049//1103 1057//1103 1058//1103 -f 1049//1104 1058//1104 1059//1104 -f 1058//1105 1060//1105 1059//1105 -f 1059//1106 1060//1106 1061//1106 -f 1059//1107 1061//1107 1062//1107 -f 1062//1108 1061//1108 1063//1108 -f 1062//1109 1063//1109 1050//1109 -f 1050//1110 1063//1110 1051//1110 -f 1043//1111 1042//1111 1064//1111 -f 1064//1112 1042//1112 1065//1112 -f 1064//1113 1065//1113 1066//1113 -f 1066//1114 1065//1114 1067//1114 -f 1066//1115 1067//1115 1068//1115 -f 1068//1116 1067//1116 1069//1116 -f 1068//1117 1069//1118 1070//1119 -f 1070//1119 1069//1118 1071//1120 -f 1070//1121 1071//1121 1072//1121 -f 1072//1122 1071//1122 1073//1122 -f 1074//1123 1073//1123 1075//1123 -f 1075//1124 1073//1124 1071//1124 -f 1076//1125 1077//1125 1078//1125 -f 1078//1126 1077//1126 1079//1126 -f 1078//1127 1079//1128 1080//1129 -f 1080//1129 1079//1128 1081//1130 -f 1080//1131 1081//1131 1082//1131 -f 1082//1132 1081//1132 1083//1132 -f 1082//1133 1083//1133 1084//1133 -f 1084//1134 1083//1134 1085//1134 -f 1084//1135 1085//1135 1086//1135 -f 1086//1136 1085//1136 1087//1136 -f 1088//1137 1089//1137 1090//1137 -f 1090//1138 1089//1138 1091//1138 -f 1092//1139 1093//1139 1094//1139 -f 1094//1140 1093//1140 1095//1140 -f 1094//1141 1095//1141 1096//1141 -f 1096//1142 1095//1142 1097//1142 -f 1096//1143 1097//1143 1098//1143 -f 1098//1144 1097//1144 1099//1144 -f 1098//1145 1099//1146 1088//1147 -f 1088//1147 1099//1146 1089//1148 -f 1100//1149 1101//1149 1102//1149 -f 1102//1150 1101//1150 1103//1150 -f 1102//1151 1103//1152 1087//1153 -f 1087//1153 1103//1152 1086//1154 -f 1104//1155 1105//1155 1106//1155 -f 1093//1156 1092//1157 1107//1158 -f 1107//1158 1092//1157 1104//1159 -f 1107//1160 1104//1160 1108//1160 -f 1108//1161 1104//1161 1106//1161 -f 1109//1162 1110//1162 1111//1162 -f 1111//1163 1112//1163 1109//1163 -f 1109//1164 1112//1164 1113//1164 -f 1109//1165 1113//1165 1105//1165 -f 1105//1166 1113//1166 1114//1166 -f 1105//1167 1114//1167 1106//1167 -f 1100//1168 1115//1168 1101//1168 -f 1101//1169 1115//1169 1116//1169 -f 1101//1170 1116//1170 1117//1170 -f 1116//1171 1118//1171 1117//1171 -f 1117//1172 1118//1172 1119//1172 -f 1117//1173 1119//1173 1110//1173 -f 1110//1174 1119//1174 1120//1174 -f 1110//1175 1120//1175 1111//1175 -f 1121//1176 1122//1176 1123//1176 -f 1123//1177 1122//1178 1124//1179 -f 1124//1179 1125//1180 1123//1177 -f 1123//1177 1125//1180 1126//1181 -f 1123//1182 1126//1182 1121//1182 -f 1121//1183 1126//1183 1127//1183 -f 1128//1184 1129//1184 1130//1185 -f 1128//1184 1130//1185 1131//1185 -f 1131//1186 1130//1186 1132//1187 -f 1131//1186 1132//1187 1133//1187 -f 1133//1188 1132//1188 1134//1188 -f 1133//1188 1134//1188 1135//1188 -f 1128//1189 1136//1189 1129//1189 -f 1129//1189 1136//1189 1137//1189 -f 1138//1190 1139//1190 1140//1191 -f 1138//1190 1140//1191 1141//1191 -f 1141//1192 1140//1192 1142//1192 -f 1141//1192 1142//1192 1143//1192 -f 1143//1193 1142//1193 1144//1193 -f 1143//1193 1144//1193 1145//1193 -f 1145//1194 1144//1194 1137//1195 -f 1145//1194 1137//1195 1136//1195 -f 1146//20 1139//20 1147//20 -f 1147//20 1139//20 1138//20 -f 1148//21 1149//21 1150//21 -f 1150//21 1149//21 1151//21 -f 1152//37 1153//37 1154//37 -f 1152//37 1154//37 1155//37 -f 1155//37 1154//37 1156//37 -f 1155//1196 1156//37 1157//37 -f 1138//37 1149//37 1148//1196 -f 1122//37 1128//37 1158//37 -f 1158//37 1128//37 1131//37 -f 1158//37 1131//37 1159//37 -f 1159//37 1131//37 1133//37 -f 1160//37 1161//37 1162//37 -f 1163//37 1164//1197 1165//37 -f 1165//37 1164//1197 1157//37 -f 1165//37 1157//37 1166//37 -f 1166//37 1157//37 1156//37 -f 1138//37 1141//37 1149//37 -f 1149//37 1141//37 1143//37 -f 1149//37 1143//37 1121//37 -f 1121//37 1143//37 1145//37 -f 1121//37 1145//37 1122//37 -f 1122//37 1145//37 1136//37 -f 1122//37 1136//37 1128//37 -f 1167//37 1168//1197 1169//37 -f 1153//37 1160//37 1154//37 -f 1154//37 1160//37 1162//37 -f 1154//37 1162//37 1135//37 -f 1135//37 1162//37 1170//37 -f 1135//37 1170//37 1133//37 -f 1133//37 1170//37 1171//37 -f 1133//37 1171//37 1159//37 -f 1148//1196 1167//37 1138//37 -f 1138//37 1167//37 1169//37 -f 1138//37 1169//37 1147//37 -f 1147//37 1169//37 1172//37 -f 1172//37 1173//37 1147//37 -f 1147//37 1173//37 1174//1198 -f 1147//37 1174//37 1175//37 -f 1176//1199 1177//1200 1155//1199 -f 1155//1199 1177//1200 1152//1200 -f 1178//1201 1179//1201 1180//1201 -f 1180//1202 1179//1202 1181//1202 -f 1180//1203 1181//1203 1182//1203 -f 1181//1204 1183//1204 1182//1204 -f 1182//1205 1183//1205 1184//1205 -f 1182//1206 1184//1206 1185//1206 -f 1185//1207 1184//1207 1186//1207 -f 1185//1208 1186//1208 1187//1208 -f 1187//1209 1186//1209 1188//1209 -f 1187//1210 1188//1210 1189//1210 -f 1189//1211 1188//1211 1190//1211 -f 1191//1212 1189//1213 1192//1212 -f 1192//1212 1189//1213 1193//1214 -f 1190//1213 1194//1213 1189//1213 -f 1189//1213 1194//1213 1195//1213 -f 1189//1213 1195//1213 1193//1214 -f 1195//1215 1196//1215 1193//1215 -f 1193//1216 1196//1216 1197//1216 -f 1198//1217 1199//1217 1200//1217 -f 1200//1218 1199//1218 1201//1218 -f 1202//1219 1203//1219 1204//1219 -f 1204//1220 1203//1220 1201//1220 -f 1197//1221 1200//1221 1193//1221 -f 1193//1221 1200//1221 1201//1221 -f 1193//1222 1201//1222 1192//1222 -f 1192//1223 1201//1223 1203//1223 -f 1192//1219 1203//1219 1191//1219 -f 1205//1224 1206//1225 1207//1226 -f 1207//1226 1206//1225 1208//1227 -f 1207//1228 1208//1228 1209//1228 -f 1194//1229 1210//1229 1198//1229 -f 1210//1229 1206//1229 1198//1229 -f 1198//1229 1206//1229 1205//1230 -f 1198//1229 1205//1230 1199//1231 -f 1195//1229 1194//1229 1196//1229 -f 1196//1229 1194//1229 1198//1229 -f 1196//1230 1198//1230 1211//1230 -f 1211//1230 1198//1230 1212//1230 -f 1210//20 1194//20 1213//20 -f 1213//20 1194//20 1190//20 -f 1214//1232 1215//1232 1186//1232 -f 1183//1233 1216//1234 1184//1235 -f 1178//1236 1217//1236 1179//1236 -f 1179//1237 1217//1237 1218//1237 -f 1179//1238 1218//1238 1181//1238 -f 1184//1235 1216//1234 1186//1239 -f 1186//1240 1216//1240 1219//1240 -f 1186//1241 1219//1241 1214//1241 -f 1213//1242 1190//1242 1215//1242 -f 1215//1243 1190//1243 1188//1243 -f 1215//1244 1188//1244 1186//1244 -f 1181//1245 1218//1245 1183//1245 -f 1183//1246 1218//1247 1220//1248 -f 1183//1246 1220//1248 1216//1249 -f 1216//1250 1220//1250 1221//1250 -f 1216//1251 1221//1251 1222//1251 -f 1222//1252 1223//1252 1216//1252 -f 1216//1253 1223//1253 1224//1253 -f 1216//1254 1224//1254 1219//1254 -f 1218//1255 1225//1255 1220//1255 -f 1220//1255 1225//1255 1226//1255 -f 1220//1256 1226//1256 1221//1256 -f 1221//1256 1226//1256 1227//1256 -f 1178//1257 1228//1258 1217//1257 -f 1217//1257 1228//1258 1229//1258 -f 1217//1259 1229//1259 1218//1259 -f 1218//1260 1229//1260 1230//1260 -f 1218//1261 1230//1261 1225//1261 -f 1231//1262 1232//1262 1233//1262 -f 1233//1263 1232//1263 1234//1263 -f 1233//1264 1234//1264 1235//1264 -f 1236//1265 1237//1265 1238//1265 -f 1238//1266 1231//1266 1236//1266 -f 1236//1267 1231//1267 1233//1267 -f 1236//1268 1233//1268 1237//1268 -f 1237//1269 1233//1269 1239//1269 -f 1240//1270 1241//1270 1242//1270 -f 1242//1271 1243//1271 1240//1271 -f 1240//1272 1243//1272 1244//1272 -f 1240//1273 1244//1273 1245//1273 -f 1245//1274 1244//1274 1235//1274 -f 1245//1275 1235//1275 1246//1275 -f 1246//1276 1235//1276 1234//1276 -f 1241//1277 1247//1277 1242//1277 -f 1242//1278 1247//1278 1248//1278 -f 1242//1279 1248//1279 1228//1279 -f 1245//1280 1249//1280 1240//1280 -f 1250//1281 1227//1281 1226//1281 -f 1249//1282 1251//1282 1252//1282 -f 1249//1283 1245//1283 1251//1283 -f 1251//1284 1245//1284 1246//1284 -f 1251//1285 1246//1285 1234//1285 -f 1252//1286 1250//1286 1249//1286 -f 1249//1287 1250//1287 1226//1287 -f 1249//1288 1226//1288 1240//1288 -f 1240//1289 1226//1289 1225//1289 -f 1240//1290 1225//1290 1241//1290 -f 1241//1291 1225//1291 1230//1291 -f 1241//1292 1230//1292 1229//1292 -f 1228//1293 1248//1293 1229//1293 -f 1229//1294 1248//1294 1247//1294 -f 1229//1295 1247//1295 1241//1295 -f 1208//1296 1206//1296 1210//1296 -f 1210//1296 1250//1297 1252//1298 -f 1232//1296 1231//1296 1210//1296 -f 1210//1296 1231//1296 1238//1296 -f 1215//1299 1214//1299 1227//1300 -f 1232//1296 1210//1296 1234//1301 -f 1234//1301 1210//1296 1252//1298 -f 1234//1301 1252//1298 1251//1302 -f 1238//1296 1237//1296 1210//1296 -f 1210//1296 1237//1296 1209//1296 -f 1210//1296 1209//1296 1208//1296 -f 1250//1297 1210//1296 1227//1300 -f 1227//1300 1210//1296 1213//1296 -f 1227//1300 1213//1296 1215//1299 -f 1214//1299 1219//1303 1227//1300 -f 1227//1300 1219//1303 1224//1304 -f 1227//1300 1224//1304 1221//1299 -f 1221//1299 1224//1304 1223//1305 -f 1221//1299 1223//1305 1222//1297 -f 1239//1306 1201//1307 1199//1308 -f 1201//1307 1239//1306 1204//1309 -f 1204//1309 1239//1306 1253//1310 -f 1204//1309 1253//1310 1202//1311 -f 1209//1311 1237//1307 1207//1307 -f 1207//1307 1237//1307 1239//1306 -f 1207//1307 1239//1306 1205//1312 -f 1205//1312 1239//1306 1199//1308 -f 1254//1313 1255//1313 1256//1313 -f 1256//1314 1255//1314 1257//1314 -f 1258//1315 1259//1315 1260//1315 -f 1260//1316 1259//1316 1261//1316 -f 1260//1317 1261//1317 1262//1317 -f 1262//1318 1261//1318 1263//1318 -f 1262//1319 1263//1319 1264//1319 -f 1264//1320 1263//1320 1265//1320 -f 1264//1321 1265//1322 1254//1323 -f 1254//1323 1265//1322 1255//1324 -f 1266//1325 1253//1325 1267//1325 -f 1267//1326 1253//1326 1268//1326 -f 1253//1327 1269//1327 1268//1327 -f 1268//1328 1269//1328 1270//1328 -f 1268//1328 1270//1328 1271//1328 -f 1271//1329 1270//1329 1272//1329 -f 1272//1330 1270//1330 1273//1330 -f 1272//1331 1273//1331 1274//1331 -f 1274//1332 1273//1332 1275//1332 -f 1274//1332 1275//1332 1276//1332 -f 1277//1333 1278//1333 1279//1333 -f 1279//1333 1278//1333 1280//1333 -f 1281//1307 1282//1334 1283//1307 -f 1283//1307 1282//1334 1284//1335 -f 1285//1336 1286//1336 1287//1336 -f 1285//1336 1287//1336 1288//1336 -f 1288//1337 1287//1338 1289//1338 -f 1288//1337 1289//1338 1290//1337 -f 1290//1339 1289//1339 1291//1339 -f 1291//1340 1289//1340 1292//1340 -f 1291//1341 1292//1341 1293//1341 -f 1293//1342 1292//1342 1294//1342 -f 1293//1342 1294//1342 1295//1342 -f 1296//1343 1297//1344 1295//1345 -f 1295//1346 1297//1346 1298//1346 -f 1295//1347 1298//1347 1293//1347 -f 1293//1348 1298//1348 1299//1348 -f 1300//1349 1301//1349 1302//1349 -f 1302//1350 1301//1350 1285//1350 -f 1302//1351 1285//1351 1303//1351 -f 1303//1352 1285//1352 1288//1352 -f 1303//1353 1288//1353 1304//1353 -f 1304//1354 1288//1354 1290//1354 -f 1304//1355 1290//1356 1299//1357 -f 1299//1357 1290//1356 1291//1358 -f 1299//1359 1291//1359 1293//1359 -f 1296//1360 1295//1361 1294//1362 -f 1305//1363 1306//1364 1294//1362 -f 1294//1362 1306//1364 1307//1365 -f 1294//1362 1307//1365 1296//1360 -f 1308//1366 1297//1344 1307//1366 -f 1307//1366 1297//1344 1296//1343 -f 1309//1367 1308//1367 1307//1367 -f 1284//1335 1282//1334 1310//1368 -f 1310//1369 1282//1369 1311//1369 -f 1310//1370 1311//1370 1312//1370 -f 1312//1371 1311//1371 1313//1371 -f 1307//1372 1306//1372 1309//1372 -f 1309//1373 1306//1373 1314//1373 -f 1309//1374 1314//1374 1313//1374 -f 1313//1375 1314//1375 1315//1375 -f 1313//1376 1315//1376 1312//1376 -f 1305//1377 1316//1377 1306//1377 -f 1306//1377 1316//1377 1314//1377 -f 1314//1378 1316//1378 1315//1378 -f 1315//1379 1316//1379 1317//1379 -f 1315//1380 1317//1380 1312//1380 -f 1312//1381 1317//1381 1318//1381 -f 1312//1381 1318//1381 1310//1381 -f 1319//1382 1320//1383 1321//1384 -f 1322//1385 1319//1385 1323//1385 -f 1323//1386 1319//1382 1321//1384 -f 1323//1387 1321//1387 1324//1387 -f 1324//1388 1321//1388 1325//1388 -f 1324//1389 1325//1389 1326//1389 -f 1323//1390 1327//1390 1322//1390 -f 1322//1391 1327//1391 1328//1391 -f 1322//1392 1328//1392 1329//1392 -f 1329//1393 1328//1393 1330//1393 -f 1329//1394 1330//1394 1331//1394 -f 1332//1395 1333//1395 1334//1395 -f 1332//1395 1334//1395 1335//1395 -f 1335//1396 1334//1396 1336//1397 -f 1335//1396 1336//1397 1337//1398 -f 1337//1399 1336//1399 1338//1400 -f 1337//1399 1338//1400 1339//1400 -f 1332//20 1340//20 1333//20 -f 1333//20 1340//20 1341//20 -f 1342//1401 1343//1401 1344//1401 -f 1342//1402 1345//1402 1346//1402 -f 1346//1403 1345//1403 1347//1403 -f 1342//1404 1344//1405 1345//1406 -f 1345//1406 1344//1405 1348//1407 -f 1345//1408 1348//1408 1347//1408 -f 1349//21 1350//21 1351//21 -f 1351//21 1350//21 1352//21 -f 1353//1409 1354//1410 1355//1409 -f 1355//1409 1354//1410 1356//1410 -f 1357//20 1358//20 1359//20 -f 1359//20 1358//20 1360//20 -f 1357//1395 1359//1395 1361//1395 -f 1361//1395 1359//1395 1362//1395 -f 1361//1396 1362//1411 1363//1411 -f 1363//1411 1362//1411 1364//1411 -f 1363//1412 1364//1412 1365//1412 -f 1365//1413 1364//1413 1366//1413 -f 1367//1414 1352//37 1348//1415 -f 1348//1415 1352//37 1347//37 -f 1332//37 1351//37 1340//37 -f 1340//37 1351//37 1352//37 -f 1340//37 1352//37 1368//37 -f 1368//37 1352//37 1367//1414 -f 1368//37 1367//1414 1369//37 -f 1353//37 1339//37 1354//37 -f 1354//37 1339//37 1366//37 -f 1332//37 1335//37 1351//37 -f 1351//37 1335//37 1337//37 -f 1351//37 1337//37 1370//37 -f 1370//37 1337//37 1339//37 -f 1370//37 1339//37 1371//37 -f 1371//37 1339//37 1353//37 -f 1360//37 1372//37 1373//37 -f 1364//37 1362//37 1366//37 -f 1366//37 1362//37 1359//37 -f 1366//37 1359//37 1354//37 -f 1354//37 1359//37 1360//37 -f 1354//37 1360//37 1374//37 -f 1374//37 1360//37 1373//37 -f 1352//1416 1350//1416 1347//1417 -f 1347//1417 1350//1416 1375//1417 -f 1347//1418 1375//1419 1346//1419 -f 1375//1419 1376//1420 1346//1419 -f 1346//1421 1376//1421 1377//1422 -f 1346//1421 1377//1422 1342//1422 -f 1342//1423 1377//1423 1378//1424 -f 1342//1423 1378//1424 1343//1425 -f 1343//1426 1378//1426 1379//1426 -f 1343//1426 1379//1426 1344//1426 -f 1380//1427 1381//1427 1382//1427 -f 1382//1427 1381//1427 1383//1427 -f 1384//1428 1385//1428 1386//1429 -f 1386//1429 1385//1428 1387//1428 -f 1386//1429 1387//1428 1388//1430 -f 1388//1430 1387//1428 1389//1428 -f 1390//1431 1391//1432 1392//1433 -f 1392//1433 1391//1432 1393//1432 -f 1392//1428 1393//1429 1387//1428 -f 1394//1434 1395//1428 1396//1435 -f 1396//1435 1395//1428 1382//1428 -f 1396//1430 1382//1429 1397//1428 -f 1397//1428 1382//1429 1383//1428 -f 1398//1435 1389//1428 1399//1429 -f 1399//1429 1389//1428 1387//1428 -f 1399//1429 1387//1428 1383//1428 -f 1383//1428 1387//1428 1393//1429 -f 1383//1428 1393//1429 1397//1428 -f 1392//1436 1400//1436 1401//1436 -f 1392//1436 1401//1436 1390//1436 -f 1390//1437 1401//1437 1402//1437 -f 1390//1437 1402//1437 1391//1437 -f 1391//1381 1402//1381 1403//1381 -f 1391//1381 1403//1381 1393//1381 -f 1404//1427 1405//1427 1406//1427 -f 1406//1427 1405//1427 1407//1427 -f 1408//20 1409//20 1410//20 -f 1410//20 1409//20 1411//20 -f 1412//1428 1413//1438 1414//1430 -f 1414//1430 1413//1438 1415//1428 -f 1414//1430 1415//1428 1411//1428 -f 1411//1428 1415//1428 1410//1429 -f 1416//1439 1417//1428 1418//1440 -f 1418//1440 1417//1428 1406//1430 -f 1418//1428 1406//1428 1419//1428 -f 1419//1428 1406//1428 1420//1441 -f 1421//1431 1410//1431 1422//1431 -f 1422//1442 1410//1429 1415//1428 -f 1422//1442 1415//1428 1407//1430 -f 1407//1430 1415//1428 1406//1428 -f 1423//1441 1420//1441 1424//1430 -f 1424//1430 1420//1441 1406//1428 -f 1424//1430 1406//1428 1425//1430 -f 1425//1430 1406//1428 1415//1428 -f 1411//1336 1409//1336 1426//1336 -f 1411//1336 1426//1336 1414//1336 -f 1414//1338 1426//1443 1427//1443 -f 1414//1338 1427//1443 1412//1338 -f 1412//1444 1427//1444 1428//1444 -f 1412//1444 1428//1444 1413//1444 -f 1413//1445 1428//1446 1429//1446 -f 1413//1445 1429//1446 1415//1445 -f 1430//1427 1431//1427 1432//1427 -f 1432//1427 1431//1427 1433//1427 -f 1434//1440 1435//1428 1436//1429 -f 1436//1429 1435//1428 1432//1428 -f 1436//1447 1432//1428 1437//1428 -f 1437//1428 1432//1428 1438//1429 -f 1439//1431 1440//1441 1433//1428 -f 1433//1428 1440//1441 1441//1429 -f 1433//1428 1441//1429 1432//1428 -f 1442//1434 1443//1429 1444//1434 -f 1444//1434 1443//1429 1445//1428 -f 1444//1434 1445//1428 1446//1430 -f 1446//1430 1445//1428 1447//1428 -f 1448//1448 1438//1429 1449//1430 -f 1449//1430 1438//1429 1432//1428 -f 1449//1430 1432//1428 1447//1428 -f 1447//1428 1432//1428 1441//1429 -f 1447//1428 1441//1429 1446//1430 -f 1433//1413 1431//1449 1450//1450 -f 1433//1413 1450//1450 1439//1413 -f 1439//1451 1450//1452 1451//1452 -f 1439//1451 1451//1452 1440//1451 -f 1440//1395 1451//1453 1452//1453 -f 1440//1395 1452//1453 1441//1395 -f 1453//1363 1454//1363 1455//1363 -f 1455//1363 1454//1363 1456//1363 -f 1457//1454 1458//1449 1459//1449 -f 1457//1454 1459//1449 1460//1454 -f 1460//1455 1459//1397 1461//1397 -f 1460//1455 1461//1397 1462//1455 -f 1462//1395 1461//1395 1463//1395 -f 1462//1395 1463//1395 1464//1395 -f 1465//1427 1458//1427 1466//1427 -f 1466//1427 1458//1427 1457//1427 -f 1467//1456 1468//1457 1469//1430 -f 1469//1430 1468//1457 1466//1458 -f 1469//1457 1466//1428 1470//1429 -f 1470//1429 1466//1428 1471//1428 -f 1460//1459 1462//1430 1457//1428 -f 1457//1428 1462//1430 1464//1429 -f 1457//1428 1464//1429 1466//1428 -f 1472//1428 1473//1459 1474//1428 -f 1474//1428 1473//1459 1455//1459 -f 1474//1458 1455//1428 1475//1429 -f 1475//1429 1455//1428 1456//1428 -f 1476//1460 1471//1460 1477//1460 -f 1477//1441 1471//1428 1466//1428 -f 1477//1441 1466//1428 1456//1428 -f 1456//1428 1466//1428 1464//1429 -f 1456//1428 1464//1429 1475//1429 -f 1478//21 1479//21 1471//21 -f 1471//21 1479//21 1470//21 -f 1480//1427 1481//1427 1482//1427 -f 1482//1427 1481//1427 1483//1427 -f 1484//1461 1485//1428 1486//1428 -f 1486//1428 1485//1428 1482//1428 -f 1486//1435 1482//1428 1487//1430 -f 1487//1430 1482//1428 1488//1428 -f 1489//1448 1490//1440 1491//1429 -f 1491//1429 1490//1440 1492//1440 -f 1491//1440 1492//1428 1493//1428 -f 1493//1428 1492//1428 1494//1428 -f 1495//1440 1488//1428 1496//1430 -f 1496//1430 1488//1428 1482//1428 -f 1496//1430 1482//1428 1497//1430 -f 1497//1430 1482//1428 1492//1428 -f 1498//1435 1494//1428 1499//1430 -f 1499//1430 1494//1428 1492//1428 -f 1499//1430 1492//1428 1483//1430 -f 1483//1430 1492//1428 1482//1428 -f 1500//1363 1501//1363 1492//1363 -f 1492//1363 1501//1363 1497//1363 -f 1502//37 1503//1462 1504//37 -f 1505//37 1506//1463 1507//1197 -f 1508//37 1509//37 1502//1464 -f 1502//1464 1509//37 1510//1465 -f 1511//37 1512//1196 1513//37 -f 1512//1196 1514//37 1513//37 -f 1513//37 1514//37 1515//37 -f 1513//37 1515//37 1516//37 -f 1516//37 1515//37 1517//37 -f 1516//37 1517//37 1518//37 -f 1518//37 1517//37 1429//37 -f 1518//37 1429//37 1519//37 -f 1519//37 1429//37 1428//37 -f 1519//37 1428//37 1520//37 -f 1521//37 1522//37 1505//37 -f 1505//37 1522//37 1523//37 -f 1428//37 1427//37 1520//37 -f 1520//37 1427//37 1426//1196 -f 1520//37 1426//1196 1409//1465 -f 1524//37 1525//1197 1526//37 -f 1527//1466 1503//1462 1478//1467 -f 1478//1467 1503//1462 1502//37 -f 1478//1467 1502//37 1479//1196 -f 1479//1462 1502//1464 1510//1465 -f 1409//1465 1408//1464 1520//37 -f 1520//37 1408//1464 1521//37 -f 1520//37 1521//37 1528//37 -f 1528//37 1521//37 1505//37 -f 1507//1197 1529//1196 1505//37 -f 1505//37 1529//1196 1530//37 -f 1505//37 1530//37 1524//37 -f 1524//37 1530//37 1531//1196 -f 1524//37 1531//1196 1525//1197 -f 1532//37 1533//1197 1502//37 -f 1502//37 1533//1197 1534//1468 -f 1478//1467 1535//1469 1527//1466 -f 1527//1466 1535//1469 1536//1197 -f 1527//1466 1536//1197 1404//37 -f 1404//37 1536//1197 1454//37 -f 1404//37 1454//37 1405//37 -f 1405//37 1454//37 1453//37 -f 1405//1196 1453//1197 1537//1197 -f 1537//1197 1453//1197 1521//37 -f 1537//1197 1521//37 1538//1470 -f 1538//1470 1521//37 1408//1464 -f 1526//37 1381//1471 1524//37 -f 1524//37 1381//37 1380//37 -f 1524//37 1380//37 1502//37 -f 1502//37 1380//37 1539//37 -f 1502//37 1539//37 1532//37 -f 1523//37 1540//1469 1505//37 -f 1505//37 1540//1469 1463//1469 -f 1505//37 1463//1472 1506//1463 -f 1463//1472 1461//1468 1506//1463 -f 1506//1463 1461//1468 1459//1197 -f 1506//1463 1459//1197 1541//37 -f 1541//37 1459//1197 1458//1196 -f 1541//37 1458//1196 1400//1197 -f 1400//1197 1458//1196 1465//37 -f 1400//1197 1465//37 1401//1196 -f 1401//1196 1465//37 1508//37 -f 1401//1196 1508//37 1402//1473 -f 1402//1473 1508//37 1502//1464 -f 1402//1473 1502//1464 1403//1474 -f 1403//1468 1502//37 1534//1468 -f 1542//37 1543//37 1544//1197 -f 1545//37 1546//37 1502//37 -f 1502//37 1546//37 1547//1197 -f 1502//37 1547//1197 1548//37 -f 1549//1475 1550//37 1524//37 -f 1524//37 1550//37 1551//37 -f 1524//37 1551//37 1552//1476 -f 1553//37 1543//37 1554//37 -f 1554//37 1543//37 1542//37 -f 1554//37 1542//37 1555//37 -f 1555//37 1542//37 1556//37 -f 1548//37 1501//37 1502//37 -f 1502//37 1501//37 1500//1477 -f 1502//37 1500//1477 1524//37 -f 1524//37 1500//1477 1557//1478 -f 1524//37 1557//1478 1549//1475 -f 1558//37 1559//37 1560//37 -f 1560//37 1559//37 1524//37 -f 1560//37 1524//37 1561//37 -f 1561//37 1524//37 1552//1476 -f 1561//37 1552//1476 1562//1479 -f 1558//37 1452//37 1559//37 -f 1559//37 1452//1475 1451//37 -f 1559//37 1451//37 1563//37 -f 1563//37 1451//37 1450//37 -f 1556//37 1542//37 1564//37 -f 1564//37 1542//37 1565//37 -f 1564//37 1565//37 1566//1196 -f 1566//1196 1565//37 1567//37 -f 1566//1196 1567//37 1430//37 -f 1430//37 1567//37 1568//37 -f 1430//37 1568//37 1431//37 -f 1431//37 1568//37 1569//37 -f 1431//37 1569//37 1450//37 -f 1450//37 1569//37 1570//37 -f 1450//37 1570//37 1563//37 -f 1552//1476 1571//1480 1562//1479 -f 1562//1479 1571//1480 1572//37 -f 1562//1479 1572//37 1573//37 -f 1573//37 1572//37 1481//1196 -f 1573//37 1481//37 1574//1197 -f 1574//1197 1481//37 1480//37 -f 1574//1197 1480//37 1575//37 -f 1575//37 1480//37 1553//37 -f 1575//37 1553//37 1576//1197 -f 1576//1197 1553//37 1554//37 -f 1544//1197 1545//37 1542//37 -f 1542//37 1545//37 1502//37 -f 1542//37 1502//37 1577//37 -f 1577//37 1502//37 1578//1197 -f 1504//37 1511//37 1502//37 -f 1502//37 1511//37 1513//37 -f 1502//37 1513//37 1578//1197 -f 1578//1197 1513//37 1579//1198 -f 1580//1481 1581//1481 1582//1481 -f 1583//1482 1584//1483 1585//1483 -f 1519//1484 1520//1484 1583//1484 -f 1586//1485 1587//1486 1518//1487 -f 1583//1488 1520//1488 1584//1489 -f 1584//1489 1520//1488 1528//1489 -f 1584//1490 1528//1490 1505//1490 -f 1588//1491 1587//1491 1589//1492 -f 1589//1492 1587//1491 1586//1492 -f 1589//1493 1586//1493 1590//1493 -f 1505//1494 1591//1494 1584//1494 -f 1584//1495 1591//1495 1592//1495 -f 1584//1496 1592//1496 1585//1496 -f 1585//1497 1592//1497 1593//1497 -f 1585//1498 1593//1498 1594//1498 -f 1595//1499 1588//1499 1596//1499 -f 1596//1499 1588//1499 1589//1499 -f 1596//1500 1589//1500 1597//1500 -f 1597//1500 1589//1500 1590//1501 -f 1597//1502 1590//1502 1582//1502 -f 1518//1487 1519//1485 1586//1485 -f 1586//1484 1519//1484 1583//1484 -f 1586//1493 1583//1493 1590//1493 -f 1590//1482 1583//1482 1585//1483 -f 1590//1502 1585//1503 1582//1502 -f 1582//1504 1585//1504 1594//1504 -f 1582//1505 1594//1505 1580//1505 -f 1524//1506 1559//1507 1598//1507 -f 1505//1507 1524//1506 1591//1507 -f 1591//1507 1524//1506 1598//1507 -f 1591//1508 1598//1509 1592//1508 -f 1592//1508 1598//1509 1599//1509 -f 1592//1510 1599//1511 1593//1510 -f 1593//1510 1599//1511 1600//1511 -f 1593//1512 1600//1513 1594//1512 -f 1594//1512 1600//1513 1601//1513 -f 1594//1514 1601//1514 1580//1515 -f 1580//1515 1601//1514 1602//1515 -f 1580//1516 1602//1517 1581//1516 -f 1581//1516 1602//1517 1603//1517 -f 1604//1518 1605//1518 1606//1518 -f 1607//1519 1608//1519 1609//1519 -f 1563//1520 1570//1521 1610//1521 -f 1598//1522 1559//1522 1563//1522 -f 1600//1523 1599//1523 1611//1523 -f 1611//1524 1599//1524 1598//1524 -f 1570//1525 1569//1525 1610//1525 -f 1610//1526 1569//1526 1612//1526 -f 1610//1527 1612//1527 1613//1527 -f 1602//1528 1601//1528 1614//1528 -f 1614//1529 1601//1529 1600//1529 -f 1598//1530 1563//1530 1611//1530 -f 1611//1520 1563//1520 1610//1521 -f 1611//1531 1610//1531 1609//1531 -f 1609//1532 1610//1532 1613//1532 -f 1609//1533 1613//1533 1607//1533 -f 1603//1534 1602//1534 1615//1534 -f 1615//1535 1602//1535 1614//1535 -f 1615//1536 1614//1537 1606//1537 -f 1600//1538 1611//1538 1614//1538 -f 1614//1531 1611//1531 1609//1531 -f 1614//1537 1609//1537 1606//1537 -f 1606//1539 1609//1539 1608//1539 -f 1606//1540 1608//1540 1604//1540 -f 1569//1541 1568//1542 1612//1541 -f 1612//1541 1568//1542 1616//1542 -f 1612//1543 1616//1544 1613//1545 -f 1613//1545 1616//1544 1617//1544 -f 1613//1546 1617//1547 1607//1546 -f 1607//1546 1617//1547 1618//1547 -f 1607//1548 1618//1549 1608//1550 -f 1608//1550 1618//1549 1619//1549 -f 1608//1551 1619//1552 1604//1551 -f 1604//1551 1619//1552 1620//1552 -f 1604//1553 1620//1553 1605//1553 -f 1605//1553 1620//1553 1621//1553 -f 1622//1554 1623//1554 1624//1554 -f 1620//1555 1619//1555 1625//1555 -f 1626//1556 1627//1557 1628//1556 -f 1567//1558 1565//1559 1626//1560 -f 1616//1561 1568//1561 1567//1561 -f 1618//1562 1617//1562 1629//1562 -f 1629//1563 1617//1563 1616//1563 -f 1626//1564 1565//1564 1627//1565 -f 1627//1565 1565//1564 1542//1565 -f 1627//1566 1542//1566 1577//1566 -f 1619//1567 1618//1567 1625//1567 -f 1625//1568 1618//1568 1629//1568 -f 1625//1569 1629//1569 1630//1569 -f 1577//1570 1631//1570 1627//1570 -f 1627//1571 1631//1571 1632//1571 -f 1627//1572 1632//1572 1628//1572 -f 1628//1573 1632//1573 1633//1573 -f 1628//1574 1633//1574 1634//1574 -f 1621//1575 1620//1575 1635//1575 -f 1635//1576 1620//1576 1625//1576 -f 1635//1577 1625//1577 1636//1577 -f 1636//1577 1625//1577 1630//1577 -f 1636//1578 1630//1578 1624//1578 -f 1616//1579 1567//1579 1629//1579 -f 1629//1558 1567//1558 1626//1560 -f 1629//1569 1626//1580 1630//1569 -f 1630//1556 1626//1556 1628//1556 -f 1630//1578 1628//1581 1624//1578 -f 1624//1582 1628//1582 1634//1582 -f 1624//1583 1634//1583 1622//1583 -f 1577//1584 1578//1585 1631//1584 -f 1631//1584 1578//1585 1637//1585 -f 1631//1586 1637//1587 1632//1586 -f 1632//1586 1637//1587 1638//1587 -f 1632//1588 1638//1589 1633//1588 -f 1633//1588 1638//1589 1639//1589 -f 1633//1590 1639//1591 1634//1590 -f 1634//1590 1639//1591 1640//1591 -f 1634//1592 1640//1593 1622//1594 -f 1622//1594 1640//1593 1641//1594 -f 1622//1595 1641//1596 1623//1595 -f 1623//1595 1641//1596 1642//1596 -f 1641//1597 1640//1597 1643//1597 -f 1639//1598 1638//1598 1644//1598 -f 1637//1599 1578//1599 1579//1599 -f 1516//1600 1645//1600 1513//1601 -f 1513//1601 1645//1600 1646//1601 -f 1513//1602 1646//1602 1579//1602 -f 1579//1602 1646//1602 1644//1602 -f 1579//1603 1644//1603 1637//1603 -f 1637//1604 1644//1604 1638//1604 -f 1645//1605 1647//1606 1646//1606 -f 1646//1606 1647//1606 1648//1606 -f 1646//1607 1648//1607 1644//1607 -f 1644//1607 1648//1607 1643//1607 -f 1644//1608 1643//1608 1639//1608 -f 1639//1609 1643//1609 1640//1609 -f 1647//1610 1649//1610 1648//1611 -f 1648//1611 1649//1610 1650//1611 -f 1648//1612 1650//1612 1643//1613 -f 1643//1613 1650//1612 1651//1614 -f 1643//1615 1651//1615 1641//1615 -f 1641//1616 1651//1616 1642//1616 -f 1516//1617 1518//1618 1645//1617 -f 1645//1617 1518//1618 1587//1618 -f 1645//1619 1587//1620 1647//1619 -f 1647//1619 1587//1620 1588//1620 -f 1647//1621 1588//1622 1649//1621 -f 1649//1621 1588//1622 1595//1622 -f 1652//37 1635//37 1653//37 -f 1653//37 1635//37 1636//37 -f 1654//37 1655//37 1636//37 -f 1636//37 1655//37 1656//37 -f 1636//37 1656//37 1653//37 -f 1657//37 1596//37 1658//37 -f 1658//37 1596//37 1597//37 -f 1659//37 1660//37 1597//37 -f 1597//37 1660//37 1661//37 -f 1597//37 1661//37 1658//37 -f 1636//37 1624//37 1654//37 -f 1654//37 1624//37 1623//37 -f 1654//37 1623//37 1662//1197 -f 1662//1197 1623//37 1642//1197 -f 1662//1197 1642//1197 1663//37 -f 1663//37 1642//1197 1651//37 -f 1663//37 1651//37 1664//37 -f 1664//37 1651//37 1650//37 -f 1664//37 1650//37 1665//37 -f 1665//37 1650//37 1649//37 -f 1665//37 1649//37 1657//37 -f 1657//37 1649//37 1595//37 -f 1657//37 1595//37 1596//37 -f 1597//37 1582//37 1659//37 -f 1659//37 1582//37 1581//37 -f 1659//37 1581//37 1666//1196 -f 1666//1196 1581//37 1603//37 -f 1666//1196 1603//37 1667//37 -f 1667//37 1603//37 1615//37 -f 1667//37 1615//37 1668//37 -f 1668//37 1615//37 1606//37 -f 1668//37 1606//37 1669//37 -f 1669//37 1606//37 1605//37 -f 1669//37 1605//37 1652//37 -f 1652//37 1605//37 1621//37 -f 1652//37 1621//37 1635//37 -f 1670//1623 1671//1623 1672//1623 -f 1670//1624 1672//1624 1673//1624 -f 1673//1625 1672//1625 1674//1625 -f 1673//1626 1674//1626 1675//1626 -f 1675//1627 1674//1627 1676//1627 -f 1675//1628 1676//1628 1677//1628 -f 1677//1629 1676//1629 1654//1629 -f 1677//1630 1654//1630 1662//1630 -f 1675//1631 1677//1631 1678//1631 -f 1665//1632 1679//1632 1664//1633 -f 1664//1633 1679//1632 1680//1633 -f 1664//1537 1680//1537 1663//1536 -f 1663//1536 1680//1537 1678//1536 -f 1663//1634 1678//1634 1662//1634 -f 1662//1634 1678//1634 1677//1634 -f 1679//1635 1681//1532 1680//1636 -f 1680//1636 1681//1532 1682//1636 -f 1680//1637 1682//1637 1678//1531 -f 1678//1531 1682//1637 1683//1531 -f 1678//1638 1683//1638 1675//1638 -f 1675//1639 1683//1639 1673//1639 -f 1681//1640 1684//1640 1682//1641 -f 1682//1641 1684//1640 1685//1525 -f 1682//1520 1685//1520 1683//1520 -f 1683//1520 1685//1520 1686//1520 -f 1683//1642 1686//1642 1673//1642 -f 1673//1642 1686//1642 1670//1642 -f 1687//1643 1684//1644 1688//1645 -f 1688//1645 1684//1644 1681//1644 -f 1688//1366 1681//1366 1689//1366 -f 1689//1366 1681//1366 1679//1366 -f 1689//1646 1679//1647 1657//1646 -f 1657//1646 1679//1647 1665//1647 -f 1659//1648 1690//1648 1660//1649 -f 1660//1649 1690//1648 1691//1649 -f 1660//1650 1691//1650 1661//1650 -f 1661//1650 1691//1650 1692//1578 -f 1661//1577 1692//1577 1658//1651 -f 1658//1651 1692//1577 1693//1651 -f 1658//1652 1693//1652 1657//1652 -f 1657//1652 1693//1652 1689//1652 -f 1690//1572 1694//1572 1691//1572 -f 1691//1572 1694//1572 1695//1572 -f 1691//1556 1695//1556 1692//1556 -f 1692//1556 1695//1556 1696//1556 -f 1692//1580 1696//1580 1693//1653 -f 1693//1653 1696//1580 1697//1653 -f 1693//1654 1697//1654 1689//1654 -f 1689//1654 1697//1654 1688//1654 -f 1694//1655 1698//1655 1695//1566 -f 1695//1566 1698//1655 1699//1566 -f 1695//1656 1699//1656 1696//1656 -f 1696//1656 1699//1656 1700//1656 -f 1696//1657 1700//1657 1697//1558 -f 1697//1558 1700//1657 1701//1560 -f 1697//1658 1701//1658 1688//1659 -f 1688//1659 1701//1658 1687//1659 -f 1702//1660 1698//1660 1703//1660 -f 1703//1660 1698//1660 1694//1660 -f 1703//1214 1694//1213 1704//1213 -f 1704//1213 1694//1213 1690//1213 -f 1704//1661 1690//1662 1666//1661 -f 1666//1661 1690//1662 1659//1662 -f 1669//1610 1705//1610 1668//1611 -f 1668//1611 1705//1610 1706//1611 -f 1668//1663 1706//1612 1667//1612 -f 1667//1612 1706//1612 1707//1612 -f 1667//1664 1707//1664 1666//1664 -f 1666//1664 1707//1664 1704//1665 -f 1705//1606 1708//1605 1706//1605 -f 1706//1605 1708//1605 1709//1605 -f 1706//1666 1709//1666 1707//1666 -f 1707//1666 1709//1666 1710//1666 -f 1707//1667 1710//1667 1704//1667 -f 1704//1667 1710//1667 1703//1667 -f 1708//1600 1711//1600 1709//1600 -f 1709//1600 1711//1600 1712//1600 -f 1709//1668 1712//1669 1710//1669 -f 1710//1669 1712//1669 1713//1670 -f 1710//1671 1713//1671 1703//1672 -f 1703//1672 1713//1671 1702//1673 -f 1714//1674 1711//1617 1715//1674 -f 1715//1674 1711//1617 1708//1617 -f 1715//1619 1708//1619 1716//1619 -f 1716//1619 1708//1619 1705//1619 -f 1716//1675 1705//1676 1652//1675 -f 1652//1675 1705//1676 1669//1676 -f 1349//37 1289//37 1287//37 -f 1687//37 1701//37 1363//37 -f 1363//37 1701//37 1361//37 -f 1717//37 1718//37 1286//37 -f 1286//37 1718//37 107//37 -f 1286//37 107//37 1287//37 -f 1341//37 1719//37 1330//37 -f 1365//37 1685//37 1363//37 -f 1363//37 1685//37 1684//1677 -f 1363//37 1684//1677 1687//37 -f 1349//37 1720//1464 1289//37 -f 1289//37 1720//1464 1721//37 -f 1289//37 1721//37 1292//37 -f 1292//37 1721//37 1355//1678 -f 1292//37 1355//37 1294//37 -f 1294//37 1355//37 1356//37 -f 1294//37 1356//37 1305//37 -f 1305//37 1356//37 1722//37 -f 1305//37 1722//37 1316//37 -f 1316//37 1722//37 1723//37 -f 1316//37 1723//37 1317//1197 -f 1317//1197 1723//37 1724//37 -f 1317//1197 1724//37 1318//37 -f 1287//37 107//37 1349//37 -f 1349//37 107//37 1725//37 -f 1349//37 1725//37 1350//37 -f 1350//37 1725//37 1726//1679 -f 1350//37 1726//1679 1375//1415 -f 1719//37 1727//37 1330//37 -f 1330//37 1727//37 1728//1680 -f 1330//37 1728//1680 1729//1681 -f 1671//37 1670//37 1334//37 -f 1334//37 1670//37 1686//37 -f 1334//37 1686//37 1336//37 -f 1336//37 1686//37 1685//37 -f 1336//37 1685//37 1338//37 -f 1338//37 1685//37 1365//37 -f 1702//37 1713//37 1324//37 -f 1701//37 1700//37 1361//37 -f 1361//37 1700//37 1699//37 -f 1361//37 1699//37 1698//37 -f 1334//37 1333//37 1671//37 -f 1671//37 1333//37 1341//37 -f 1671//37 1341//37 1730//37 -f 1730//37 1341//37 1330//37 -f 1730//37 1330//37 1731//37 -f 1328//37 1714//37 1330//37 -f 1330//37 1714//37 1732//37 -f 1330//37 1732//37 1731//37 -f 1713//37 1712//37 1324//37 -f 1324//37 1712//37 1711//37 -f 1324//37 1711//37 1323//37 -f 1323//37 1711//37 1714//37 -f 1323//37 1714//37 1327//37 -f 1327//37 1714//37 1328//37 -f 1724//37 1358//37 1318//37 -f 1318//37 1358//37 1357//37 -f 1318//37 1357//37 1324//37 -f 1324//37 1357//37 1361//37 -f 1324//37 1361//37 1702//37 -f 1702//37 1361//37 1698//37 -f 1733//1682 1734//1682 1735//1682 -f 1733//1683 1735//1683 1736//1683 -f 1736//1684 1735//1684 1737//1684 -f 1736//1685 1737//1685 1738//1685 -f 1738//1686 1737//1686 1739//1686 -f 1738//1687 1739//1687 1740//1687 -f 1740//1688 1739//1688 1741//1688 -f 1740//1689 1741//1689 1742//1689 -f 1742//1690 1741//1690 1743//1690 -f 1742//1691 1743//1691 1744//1691 -f 1744//1692 1743//1692 1745//1692 -f 1745//1693 1743//1693 1746//1693 -f 1745//1694 1746//1694 1747//1694 -f 1748//1695 1747//1695 1749//1695 -f 1749//1695 1747//1695 1746//1695 -f 1750//1696 1751//1696 1752//1696 -f 1753//1697 1750//1697 1754//1697 -f 1754//1698 1755//1698 1753//1698 -f 1753//1699 1755//1699 1756//1699 -f 1753//1700 1756//1700 1757//1700 -f 1757//1701 1756//1701 1758//1701 -f 1757//1702 1758//1702 1759//1702 -f 1759//1703 1758//1703 1760//1703 -f 1760//1704 1758//1704 1761//1704 -f 1760//1705 1761//1705 1762//1705 -f 1750//1706 1752//1706 1754//1706 -f 1754//1707 1752//1707 1748//1707 -f 1754//1708 1748//1708 1749//1708 -f 1763//1709 1764//1709 1765//1709 -f 1765//1709 1762//1710 1763//1709 -f 1763//1709 1762//1710 1761//1711 -f 1763//1709 1761//1711 1758//1712 -f 1754//1712 1766//1710 1755//1710 -f 1755//1710 1766//1710 1763//1709 -f 1755//1710 1763//1709 1756//1712 -f 1756//1712 1763//1709 1758//1712 -f 1767//20 1768//20 1763//20 -f 1763//20 1768//20 1764//20 -f 1767//1713 1763//1713 1766//1713 -f 1767//1713 1766//1713 1769//1713 -f 1769//1714 1766//1714 1754//1714 -f 1769//1714 1754//1714 1743//1714 -f 1743//1715 1754//1716 1749//1716 -f 1743//1715 1749//1716 1746//1715 -f 1278//1717 1768//1717 1734//1717 -f 1734//1718 1768//1717 1767//1718 -f 1739//1717 1737//1717 1767//1718 -f 1767//1718 1737//1717 1735//1717 -f 1767//1718 1735//1717 1734//1718 -f 1769//1719 1743//1718 1767//1718 -f 1767//1718 1743//1718 1741//1718 -f 1767//1718 1741//1718 1739//1717 -f 1718//1720 1717//1720 1733//1720 -f 1733//1720 1717//1720 1280//1720 -f 1733//1720 1280//1720 1734//1720 -f 1734//1720 1280//1720 1278//1720 -f 1301//20 1279//20 1280//20 -f 1280//20 1717//20 1301//20 -f 1301//20 1717//20 1286//20 -f 1301//20 1286//20 1285//20 -f 1301//1213 1300//1213 1279//1213 -f 1279//1213 1300//1213 1770//1213 -f 1279//1213 1770//1213 1771//1213 -f 1771//1213 1770//1213 1772//1721 -f 1773//37 1277//37 1771//37 -f 1771//37 1277//37 1279//37 -f 1773//1213 1764//1213 1277//1213 -f 1277//1213 1764//1213 1768//1213 -f 1773//1722 1765//1722 1764//1722 -f 1765//1229 1773//1229 1774//1229 -f 1774//1229 1773//1229 1771//1229 -f 1772//20 1276//20 1275//20 -f 1275//20 1775//20 1772//20 -f 1772//20 1775//20 1774//20 -f 1772//20 1774//20 1771//20 -f 1772//1721 1770//1213 1276//1723 -f 1276//1724 1770//1724 1776//1724 -f 1276//1725 1776//1725 1274//1725 -f 1274//1726 1776//1726 1777//1726 -f 1778//1727 1779//1727 1780//1727 -f 1780//1728 1779//1728 1267//1728 -f 1780//1729 1267//1729 1781//1729 -f 1781//1730 1267//1730 1268//1730 -f 1781//1731 1268//1731 1782//1731 -f 1782//1732 1268//1732 1271//1732 -f 1782//1733 1271//1734 1777//1735 -f 1777//1735 1271//1734 1272//1736 -f 1777//1737 1272//1737 1274//1737 -f 1778//1738 1783//1739 1779//1738 -f 1779//1738 1783//1739 1784//1740 -f 1783//37 1778//37 1281//37 -f 1770//37 1300//37 1297//37 -f 1297//37 1300//37 1302//37 -f 1297//37 1302//37 1298//37 -f 1776//37 1770//37 1778//37 -f 1770//37 1297//37 1778//37 -f 1778//37 1297//37 1282//37 -f 1778//37 1282//37 1281//37 -f 1303//1197 1304//37 1302//37 -f 1302//37 1304//37 1299//37 -f 1302//37 1299//37 1298//37 -f 1313//1197 1311//37 1309//37 -f 1309//37 1311//37 1282//37 -f 1309//37 1282//37 1308//37 -f 1308//37 1282//37 1297//37 -f 1785//1197 1786//37 1281//37 -f 1281//37 1786//37 1787//37 -f 1281//37 1787//37 1783//37 -f 1782//1477 1777//37 1781//37 -f 1781//37 1777//37 1776//37 -f 1781//37 1776//37 1780//37 -f 1780//37 1776//37 1778//37 -f 1785//1741 1281//1741 1283//1741 -f 1784//1740 1783//1739 1788//1742 -f 1788//1743 1783//1743 1787//1743 -f 1788//1744 1787//1744 1789//1744 -f 1789//1745 1787//1745 1786//1745 -f 1283//1746 1790//1746 1785//1746 -f 1785//1747 1790//1747 1791//1747 -f 1785//1748 1791//1748 1786//1748 -f 1786//1749 1791//1749 1792//1749 -f 1786//1750 1792//1750 1789//1750 -f 1266//1751 1267//1752 1203//1751 -f 1203//1751 1267//1752 1779//1753 -f 1203//1751 1779//1753 1793//1754 -f 1793//1754 1779//1753 1784//1755 -f 1793//1754 1784//1755 1788//1756 -f 1794//1757 1795//1757 1790//1757 -f 1790//1757 1795//1757 1791//1757 -f 1791//1758 1795//1758 1792//1758 -f 1792//1759 1795//1759 1796//1759 -f 1792//1760 1796//1760 1789//1760 -f 1789//1761 1796//1761 1793//1761 -f 1789//1761 1793//1761 1788//1761 -f 1284//21 1310//21 1318//21 -f 1284//21 1318//21 1283//21 -f 1283//21 1318//21 1794//21 -f 1283//21 1794//21 1790//21 -f 1797//1307 1794//1307 1798//1307 -f 1798//1307 1794//1307 1318//1307 -f 1798//1307 1318//1307 1326//1307 -f 1326//1307 1318//1307 1324//1307 -f 1799//21 1800//21 1320//21 -f 1801//21 1802//21 1803//21 -f 1803//21 1802//21 1804//21 -f 1803//21 1804//21 1805//21 -f 1806//21 1807//21 1326//21 -f 1326//21 1807//21 1808//21 -f 1326//21 1808//21 1798//21 -f 1809//21 1810//21 1811//21 -f 1804//21 1812//21 1809//21 -f 1809//21 1812//21 1813//21 -f 1814//21 1815//21 1808//21 -f 1808//21 1815//21 1816//21 -f 1808//21 1816//21 1798//21 -f 1811//21 1817//21 1809//21 -f 1809//21 1817//21 1818//21 -f 1809//21 1818//21 1804//21 -f 1802//21 1819//21 1804//21 -f 1804//21 1819//21 1820//21 -f 1804//21 1820//21 1821//21 -f 1822//21 1823//21 1320//21 -f 1320//21 1823//21 1824//21 -f 1320//21 1824//21 1799//21 -f 1821//21 1825//21 1804//21 -f 1804//21 1825//21 1826//21 -f 1804//21 1826//21 1827//21 -f 1804//21 1828//21 1829//21 -f 1814//21 1830//21 1815//21 -f 1815//21 1830//21 1831//21 -f 1815//21 1831//21 1832//21 -f 1827//21 1833//21 1804//21 -f 1804//21 1833//21 1834//21 -f 1804//21 1834//21 1828//21 -f 1829//21 1835//21 1804//21 -f 1804//21 1835//21 1836//21 -f 1804//21 1836//21 1812//21 -f 1810//21 1809//21 1320//21 -f 1320//21 1809//21 1837//21 -f 1320//21 1837//21 1822//21 -f 1325//21 1838//21 1326//21 -f 1326//21 1838//21 1839//21 -f 1326//21 1839//21 1806//21 -f 1800//21 1840//21 1320//21 -f 1320//21 1840//21 1838//21 -f 1320//21 1838//21 1321//21 -f 1321//21 1838//21 1325//21 -f 1813//21 1841//21 1809//21 -f 1809//21 1841//21 1842//21 -f 1809//21 1842//21 1843//21 -f 1843//21 1842//21 1844//21 -f 1843//21 1844//21 1845//21 -f 1831//21 1846//21 1847//21 -f 1846//21 1831//21 1848//21 -f 1848//21 1831//21 1849//21 -f 1848//21 1849//21 1850//21 -f 1847//21 1851//21 1831//21 -f 1831//21 1851//21 1852//21 -f 1831//21 1852//21 1832//21 -f 1853//122 1854//122 1829//122 -f 1853//122 1829//122 1855//122 -f 1828//122 1856//122 1857//122 -f 1828//122 1857//122 1829//122 -f 1829//122 1857//122 1858//122 -f 1829//122 1858//122 1855//122 -f 1833//1762 1827//1762 1859//1762 -f 1827//1763 1826//1764 1859//1765 -f 1859//1765 1826//1764 1860//1766 -f 1859//1767 1860//1767 1861//1767 -f 1833//1768 1859//1768 1834//1768 -f 1834//1769 1859//1769 1856//1769 -f 1834//1770 1856//1770 1828//1770 -f 1860//1771 1862//1771 1861//1771 -f 1861//1772 1862//1772 1863//1772 -f 1861//1773 1863//1773 1864//1773 -f 1864//1774 1863//1775 1865//1776 -f 1864//1774 1865//1776 1866//1777 -f 1867//1778 1868//1778 1869//1778 -f 1870//1779 1871//1780 1872//1781 -f 1870//1782 1872//1782 1873//1782 -f 1871//1780 1874//1783 1872//1781 -f 1872//1784 1874//1784 1862//1784 -f 1872//1785 1862//1785 1860//1785 -f 1875//1786 1876//1786 1877//1786 -f 1878//1787 1875//1787 1879//1787 -f 1875//1788 1877//1789 1879//1790 -f 1879//1790 1877//1789 1873//1791 -f 1879//1792 1873//1792 1880//1792 -f 1878//1793 1879//1793 1881//1793 -f 1881//1794 1879//1794 1880//1794 -f 1881//1795 1880//1795 1882//1795 -f 1867//1796 1869//1796 1883//1796 -f 1884//1797 1885//1797 1259//1797 -f 1886//1798 1868//1798 1887//1798 -f 1887//1799 1868//1799 1888//1799 -f 1887//1800 1888//1801 1322//1802 -f 1322//1802 1888//1801 1319//1803 -f 1886//1804 1889//1805 1868//1806 -f 1868//1806 1889//1805 1890//1807 -f 1868//1808 1890//1808 1869//1808 -f 1869//1809 1890//1809 1891//1809 -f 1869//1810 1891//1810 1892//1810 -f 1892//1811 1891//1812 1893//1813 -f 1894//1814 1895//1814 1896//1814 -f 1896//1815 1895//1815 1897//1815 -f 1896//1816 1897//1816 1898//1816 -f 1898//1817 1897//1817 1883//1817 -f 1898//1818 1883//1818 1899//1818 -f 1899//1819 1883//1819 1869//1819 -f 1899//1820 1869//1820 1259//1820 -f 1259//1821 1869//1821 1892//1821 -f 1259//1822 1892//1822 1884//1822 -f 1884//1823 1892//1811 1893//1813 -f 1900//1824 1901//1824 1894//1824 -f 1894//1825 1901//1825 1902//1825 -f 1894//1826 1902//1826 1895//1826 -f 1903//1827 1904//1827 1900//1827 -f 1900//1828 1904//1828 1905//1828 -f 1900//1829 1905//1829 1901//1829 -f 1873//1830 1872//1830 1880//1830 -f 1880//1831 1872//1831 1906//1831 -f 1880//1832 1906//1833 1882//1834 -f 1882//1834 1906//1833 1907//1835 -f 1882//1836 1907//1836 1908//1836 -f 1908//1837 1907//1837 1909//1837 -f 1908//1838 1909//1838 1910//1838 -f 1910//1839 1909//1839 1911//1839 -f 1910//1840 1911//1840 1903//1840 -f 1903//1841 1911//1841 1912//1841 -f 1903//1842 1912//1842 1904//1842 -f 1259//1843 1258//1844 1899//1845 -f 1899//1845 1258//1844 1913//1846 -f 1899//1847 1913//1847 1898//1847 -f 1898//1848 1913//1848 1914//1848 -f 1915//1849 1881//1850 1916//1851 -f 1916//1851 1881//1850 1882//1852 -f 1916//1853 1882//1853 1917//1853 -f 1882//1854 1908//1854 1917//1854 -f 1917//1855 1908//1855 1910//1855 -f 1917//1856 1910//1856 1918//1856 -f 1918//1857 1910//1857 1903//1857 -f 1918//1858 1903//1858 1919//1858 -f 1919//1859 1903//1859 1900//1859 -f 1919//1860 1900//1860 1920//1860 -f 1920//1861 1900//1861 1894//1861 -f 1920//1862 1894//1862 1914//1862 -f 1914//1863 1894//1863 1896//1863 -f 1914//1864 1896//1864 1898//1864 -f 1921//1865 1922//1866 1923//1867 -f 1923//1867 1922//1866 1924//1868 -f 1923//1869 1924//1869 1925//1869 -f 1925//1870 1924//1870 1926//1870 -f 1925//1871 1926//1871 1927//1871 -f 1927//1872 1926//1872 1928//1872 -f 1927//1873 1928//1873 1915//1873 -f 1915//1874 1928//1874 1881//1874 -f 1929//1875 1930//1875 1921//1875 -f 1921//1876 1930//1876 1922//1876 -f 1931//1877 1932//1877 1933//1877 -f 1933//1878 1932//1879 1934//1880 -f 1934//1880 1935//1881 1933//1878 -f 1933//1878 1935//1881 1936//1882 -f 1933//1883 1936//1883 1931//1883 -f 1931//1884 1936//1884 1937//1884 -f 1938//1885 1934//1885 1939//1885 -f 1939//1885 1934//1885 1932//1885 -f 1939//1885 1932//1885 1940//1885 -f 1940//1885 1932//1885 1941//1885 -f 1940//1885 1941//1885 1942//1885 -f 1256//1886 1330//1886 1729//1886 -f 1256//1887 1729//1887 1254//1887 -f 1729//1888 1379//1888 1254//1888 -f 1254//1889 1379//1890 1378//1891 -f 1254//1889 1378//1891 1943//1892 -f 1375//1415 1726//1679 1376//1893 -f 1376//1894 1726//1894 1943//1894 -f 1376//1895 1943//1895 1377//1895 -f 1377//1896 1943//1896 1378//1896 -f 1260//1897 1262//1897 1943//1897 -f 1943//1898 1262//1898 1264//1898 -f 1943//1899 1264//1899 1254//1899 -f 1260//1900 1943//1900 1258//1900 -f 1258//1901 1943//1901 1944//1901 -f 1258//1902 1944//1902 1913//1902 -f 1913//1903 1944//1903 1914//1903 -f 1914//1904 1944//1904 1945//1904 -f 1914//1905 1945//1905 1920//1905 -f 1946//1906 1947//1906 1916//1906 -f 1916//1907 1917//1907 1946//1907 -f 1946//1908 1917//1908 1918//1908 -f 1946//1909 1918//1909 1945//1909 -f 1945//1910 1918//1910 1919//1910 -f 1945//1911 1919//1911 1920//1911 -f 1948//1912 1921//1912 1923//1912 -f 1923//1913 1925//1913 1948//1913 -f 1948//1914 1925//1914 1927//1914 -f 1948//1915 1927//1915 1947//1915 -f 1947//1916 1927//1916 1915//1916 -f 1947//1917 1915//1917 1916//1917 -f 1949//1918 1950//1918 1948//1918 -f 1948//1919 1950//1919 1951//1919 -f 1952//1920 1921//1920 1953//1920 -f 1953//1921 1921//1921 1948//1921 -f 1953//1922 1948//1922 1954//1922 -f 1954//1923 1948//1923 1951//1923 -f 1952//1924 1938//1924 1921//1924 -f 1921//1925 1938//1925 1939//1925 -f 1921//1926 1939//1926 1929//1926 -f 1929//1927 1939//1928 1866//1929 -f 1725//20 1955//20 1949//20 -f 1725//20 1949//20 1726//20 -f 1726//20 1949//20 1948//20 -f 1726//20 1948//20 1943//20 -f 1945//20 1944//20 1946//20 -f 1946//20 1944//20 1943//20 -f 1946//20 1943//20 1947//20 -f 1947//20 1943//20 1948//20 -f 107//1909 108//1909 1725//1909 -f 1725//1909 108//1909 1955//1909 -f 1759//20 1760//20 1956//20 -f 108//20 107//20 40//20 -f 40//20 107//20 1718//20 -f 1748//20 1752//20 1956//20 -f 1733//20 1736//20 1718//20 -f 1718//20 1736//20 1738//20 -f 1752//20 1751//20 1956//20 -f 1956//20 1751//20 1757//20 -f 1956//20 1757//20 1759//20 -f 1738//20 1744//20 1718//20 -f 1718//20 1744//20 1745//20 -f 1718//20 1745//20 1747//20 -f 73//20 70//20 74//20 -f 74//20 70//20 40//20 -f 74//20 40//20 1956//20 -f 1956//20 40//20 1718//20 -f 1956//20 1718//20 1748//20 -f 1748//20 1718//20 1747//20 -f 1775//1930 1956//1930 1760//1930 -f 1762//1930 1765//1930 1760//1930 -f 1760//1930 1765//1930 1774//1930 -f 1760//1930 1774//1930 1775//1930 -f 1957//37 1958//37 1203//37 -f 1203//37 1958//37 1959//1414 -f 1182//37 1132//37 1130//37 -f 1273//37 1270//37 74//1931 -f 1960//37 1961//37 1797//37 -f 1962//37 1963//37 1793//37 -f 1959//1414 1964//1932 1203//37 -f 1203//37 1964//1932 1965//37 -f 1203//37 1965//37 1191//37 -f 1191//37 1965//37 1966//37 -f 1191//37 1966//37 1189//37 -f 1189//37 1966//37 1134//37 -f 1189//37 1134//37 1187//37 -f 1187//37 1134//37 1132//37 -f 1187//37 1132//37 1185//37 -f 1185//37 1132//37 1182//37 -f 1963//37 1177//37 1793//37 -f 1793//37 1177//37 1176//37 -f 1793//37 1176//37 1203//37 -f 1203//37 1176//37 1967//1477 -f 1203//37 1967//1477 1957//37 -f 1273//37 74//1931 1275//37 -f 1275//37 74//1931 1956//37 -f 1275//37 1956//37 1775//37 -f 1968//37 1969//37 1151//37 -f 1151//37 1969//37 1970//37 -f 1151//37 1970//37 1150//37 -f 1150//37 1970//37 74//37 -f 1150//1933 74//1931 1971//1469 -f 1971//1469 74//1931 1270//37 -f 1971//1469 1270//37 1972//37 -f 1972//37 1270//37 1973//37 -f 1974//1934 1975//1935 1976//37 -f 1976//37 1975//1935 1977//37 -f 1976//37 1977//37 1978//37 -f 1978//37 1977//37 1960//37 -f 1978//37 1960//37 1979//37 -f 1979//37 1960//37 1797//37 -f 1961//37 1980//37 1797//37 -f 1797//37 1980//37 1981//37 -f 1797//37 1981//37 1794//37 -f 1794//37 1981//37 1982//37 -f 1794//37 1982//37 1795//1196 -f 1795//1196 1982//37 1962//37 -f 1795//1196 1962//37 1796//37 -f 1796//37 1962//37 1793//37 -f 1146//37 1253//37 1139//37 -f 1139//37 1253//37 1239//37 -f 1139//37 1239//37 1140//37 -f 1142//37 1243//37 1144//37 -f 1144//37 1243//37 1242//37 -f 1144//37 1242//37 1137//37 -f 1137//37 1242//37 1228//37 -f 1137//37 1228//37 1129//37 -f 1129//37 1228//37 1178//37 -f 1129//37 1178//37 1130//37 -f 1130//37 1178//37 1180//37 -f 1130//37 1180//37 1182//37 -f 1146//37 1983//37 1253//37 -f 1253//37 1983//37 1984//37 -f 1253//37 1984//37 1269//37 -f 1269//37 1984//37 1985//37 -f 1269//37 1985//37 1270//37 -f 1270//37 1985//37 1986//37 -f 1270//37 1986//37 1973//37 -f 1239//37 1233//37 1140//37 -f 1140//37 1233//37 1235//37 -f 1140//37 1235//37 1142//37 -f 1142//37 1235//37 1244//37 -f 1142//37 1244//37 1243//37 -f 1987//1936 1974//1937 1976//1938 -f 1987//1936 1976//1938 1988//1939 -f 1988//1940 1976//1940 1978//1940 -f 1988//1941 1978//1941 1989//1941 -f 1989//1942 1978//1942 1990//1942 -f 1990//1943 1978//1943 1979//1943 -f 1990//1944 1979//1944 1816//1944 -f 1816//1945 1979//1945 1797//1945 -f 1816//1946 1797//1946 1798//1946 -f 1991//1947 1992//1947 1993//1947 -f 1994//1948 1995//1948 1996//1948 -f 1997//1949 1998//1950 1995//1951 -f 1995//1951 1998//1950 1989//1952 -f 1995//1953 1989//1953 1990//1953 -f 1999//1954 2000//1954 2001//1954 -f 1997//1955 1995//1955 2002//1955 -f 2002//1956 1995//1956 1994//1956 -f 2002//1957 1994//1957 2003//1957 -f 2004//1958 2005//1958 2006//1958 -f 2007//1959 2005//1959 2008//1959 -f 2008//1960 2005//1960 2009//1960 -f 2008//1961 2009//1961 2010//1961 -f 2007//1962 2011//1963 2005//1964 -f 2005//1964 2011//1963 2012//1965 -f 2005//1966 2012//1966 2006//1966 -f 2006//1967 2012//1967 1991//1967 -f 2006//1968 1991//1968 2013//1968 -f 2013//1969 1991//1969 1993//1969 -f 2013//1970 1093//1970 2006//1970 -f 2006//1971 1093//1971 1107//1971 -f 2006//1972 1107//1972 2004//1972 -f 2004//1973 1107//1973 1108//1973 -f 2004//1974 1108//1974 2014//1974 -f 2014//1975 1108//1975 1106//1975 -f 2014//1976 1106//1976 2015//1976 -f 1106//1977 1114//1977 2015//1977 -f 2015//1978 1114//1978 1113//1978 -f 2015//1979 1113//1979 2016//1979 -f 2016//1980 1113//1980 1112//1980 -f 2016//1981 1112//1981 2017//1981 -f 2017//1982 1112//1982 1111//1982 -f 2017//1983 1111//1983 2018//1983 -f 2018//1984 1111//1984 2019//1984 -f 2019//1985 1111//1985 1120//1985 -f 2019//1986 1120//1986 2020//1986 -f 1120//1987 1119//1987 2020//1987 -f 2020//1988 1119//1988 1118//1988 -f 2020//1989 1118//1989 2021//1989 -f 1118//1990 1116//1990 2021//1990 -f 2021//1991 1116//1991 1115//1991 -f 2021//1992 1115//1992 2022//1992 -f 2001//1993 2003//1993 1999//1993 -f 1999//1994 2003//1994 1994//1994 -f 1999//1995 1994//1995 1087//1995 -f 1087//1996 1994//1996 1996//1996 -f 1087//1997 1996//1997 1102//1997 -f 1102//1998 1996//1998 2022//1998 -f 1102//1999 2022//1999 1100//1999 -f 1100//2000 2022//2000 1115//2000 -f 2008//2001 2010//2001 2023//2001 -f 1839//2002 2024//2003 1806//2004 -f 1806//2004 2024//2003 2023//2005 -f 1806//2006 2023//2006 1807//2006 -f 1807//2007 2023//2008 2010//2009 -f 1807//2007 2010//2009 1808//2010 -f 2023//2011 2025//2011 2008//2011 -f 2008//2012 2025//2012 2026//2012 -f 2008//2013 2026//2013 2027//2013 -f 2027//2014 2026//2014 2028//2014 -f 2027//2015 2028//2015 2029//2015 -f 2024//2016 1839//2016 2030//2016 -f 2030//2016 1839//2016 1838//2016 -f 2031//2017 2032//2018 2033//2019 -f 2033//2019 2032//2018 2034//2020 -f 2034//2021 2032//2021 2035//2021 -f 2035//2022 2032//2022 2036//2022 -f 2035//2023 2036//2023 2037//2023 -f 2037//2024 2036//2024 2038//2024 -f 2038//2025 2036//2025 2039//2025 -f 2038//2026 2039//2026 1800//2026 -f 1800//2027 2039//2027 1840//2027 -f 1840//2028 2039//2028 2030//2028 -f 1840//2029 2030//2029 1838//2029 -f 2037//2030 2038//2031 2040//2032 -f 2041//2033 2042//2034 2043//2035 -f 2043//2035 2044//2036 2041//2033 -f 2041//2037 2044//2037 2045//2037 -f 2041//2038 2045//2039 2046//2040 -f 2042//2034 2041//2033 2040//2041 -f 2040//2041 2041//2033 2035//2042 -f 2040//2032 2035//2043 2037//2030 -f 2046//2040 2045//2039 2047//2044 -f 2047//2045 2045//2045 2048//2045 -f 2047//2046 2048//2046 2049//2046 -f 1041//2047 2050//2047 2051//2047 -f 2051//2048 2050//2048 2052//2048 -f 1047//2049 1041//2049 2048//2049 -f 2048//2050 1041//2050 2051//2050 -f 2048//2051 2051//2051 2049//2051 -f 2049//2052 2051//2052 2052//2052 -f 2049//2053 2052//2053 2053//2053 -f 2054//2054 2055//2054 2056//2054 -f 2057//2055 2058//2055 1042//2055 -f 2059//2056 2055//2057 2060//2058 -f 2060//2058 2055//2057 2061//2059 -f 2060//2060 2061//2060 2062//2060 -f 2059//2061 2063//2062 2055//2063 -f 2055//2063 2063//2062 1074//2064 -f 2055//2065 1074//2065 2056//2065 -f 2056//2066 1074//2066 1075//2066 -f 2056//2067 1075//2067 2064//2067 -f 2064//2068 1075//2069 2065//2070 -f 1054//2071 2066//2071 1055//2071 -f 1055//2072 2066//2072 2067//2072 -f 1055//2073 2067//2073 1056//2073 -f 1056//2074 2067//2074 2054//2074 -f 1056//2075 2054//2075 1044//2075 -f 1044//2076 2054//2076 2056//2076 -f 1044//2077 2056//2077 1042//2077 -f 1042//2078 2056//2078 2064//2078 -f 1042//2079 2064//2079 2057//2079 -f 2057//2080 2064//2068 2065//2070 -f 1054//2081 1052//2081 2066//2081 -f 2066//2082 1052//2082 1051//2082 -f 2066//2083 1051//2083 2068//2083 -f 2068//2084 1051//2084 1063//2084 -f 2068//2085 1063//2085 2069//2085 -f 2069//2086 1063//2087 2070//2088 -f 1063//2087 1061//2089 2070//2088 -f 2070//2090 1061//2090 1060//2090 -f 2070//2091 1060//2091 2071//2091 -f 2071//2092 1060//2092 1058//2092 -f 2071//2093 1058//2093 2072//2093 -f 2072//2094 1058//2094 1057//2094 -f 2072//2095 1057//2095 2073//2095 -f 2045//2096 2074//2096 2048//2096 -f 2048//2097 2074//2097 2075//2097 -f 2048//2098 2075//2099 1047//2100 -f 1047//2100 2075//2099 2073//2101 -f 1047//2102 2073//2102 1048//2102 -f 1048//2103 2073//2103 1057//2103 -f 2060//2104 2062//2104 2076//2104 -f 1829//2105 1854//2106 1835//2107 -f 1835//2107 1854//2106 2076//2108 -f 1835//2109 2076//2109 1836//2109 -f 1836//2110 2076//2111 2062//2112 -f 1836//2110 2062//2112 1812//2113 -f 2076//2114 2077//2114 2060//2114 -f 2060//2115 2077//2115 2078//2115 -f 2060//2116 2078//2116 2079//2116 -f 2079//2117 2078//2117 2080//2117 -f 2079//2118 2080//2118 2081//2118 -f 2082//19 2083//19 2084//19 -f 2085//19 2086//19 2080//19 -f 1940//19 1866//1929 1939//1928 -f 2087//19 2088//19 2089//19 -f 2090//19 2091//19 2092//19 -f 2093//19 2094//19 2095//19 -f 2091//19 2096//19 2092//19 -f 2092//19 2096//19 2097//19 -f 2092//19 2097//19 2098//19 -f 2099//19 2100//19 2084//19 -f 2101//19 2102//19 2103//19 -f 2104//19 2105//19 1020//19 -f 1020//19 2105//19 2106//19 -f 1020//19 2106//19 2107//19 -f 2100//19 2108//19 2084//19 -f 2084//19 2108//19 2109//19 -f 2084//19 2109//19 2101//19 -f 1020//19 1018//19 2104//19 -f 2104//19 1018//19 1016//19 -f 2104//19 1016//19 2097//19 -f 2097//19 1016//19 1014//19 -f 2097//19 1014//19 2098//19 -f 2098//19 1014//19 1013//19 -f 2098//19 1013//19 2110//19 -f 2110//19 2111//19 2098//19 -f 2098//19 2111//19 2112//19 -f 2098//19 2112//19 2099//19 -f 2113//19 2093//19 2106//19 -f 2106//19 2093//19 2095//19 -f 2106//19 2095//19 2107//19 -f 2107//19 2095//19 2114//19 -f 2107//19 2114//19 2115//19 -f 2115//19 2114//19 2116//19 -f 2115//19 2116//19 2117//19 -f 2118//2119 1855//19 2119//19 -f 2119//19 1855//19 1858//19 -f 2119//19 1858//19 2120//19 -f 2120//19 1858//19 2121//19 -f 1005//19 2122//19 2089//19 -f 2089//19 2122//19 2123//19 -f 1010//19 1008//19 2124//19 -f 2124//19 1008//19 1006//19 -f 1006//19 1005//19 2124//19 -f 2124//19 1005//19 2089//19 -f 2124//19 2089//19 2125//19 -f 2125//19 2089//19 2088//19 -f 2125//19 2088//19 2126//19 -f 2126//19 2088//19 2127//19 -f 2126//19 2127//19 2128//19 -f 2128//19 2127//19 2129//19 -f 2128//19 2129//19 2130//19 -f 2130//19 2129//19 2131//19 -f 2123//19 2132//19 2089//19 -f 2089//19 2132//19 2133//19 -f 2089//19 2133//19 2134//19 -f 2134//19 2133//19 2135//19 -f 2135//19 2136//19 2134//19 -f 2134//19 2136//19 2137//2119 -f 2134//19 2137//2119 2138//19 -f 2139//19 1856//19 2140//19 -f 2140//19 1856//19 1859//19 -f 2140//19 1859//19 1861//19 -f 2139//19 1028//19 1856//19 -f 1856//19 1028//19 1029//19 -f 1856//19 1029//19 1857//19 -f 1940//19 1942//19 1866//1929 -f 1866//1929 1942//19 2140//19 -f 1866//1929 2140//19 1864//19 -f 1864//19 2140//19 1861//19 -f 2077//19 2141//19 2078//19 -f 2078//19 2141//19 2142//19 -f 2078//19 2142//19 2080//19 -f 2080//19 2142//19 2143//19 -f 2080//19 2143//19 2085//19 -f 2144//19 2145//19 2142//19 -f 2142//19 2145//19 2146//19 -f 2142//19 2146//19 2143//19 -f 2147//19 685//19 683//19 -f 2099//19 2084//19 2098//19 -f 2098//19 2084//19 2083//19 -f 2098//19 2083//19 2148//19 -f 2149//19 2150//19 2151//19 -f 2151//19 2150//19 2134//19 -f 2151//19 2134//19 2129//19 -f 2129//19 2134//19 2138//19 -f 2129//19 2138//19 2131//19 -f 689//19 2103//19 2089//19 -f 2152//19 2103//19 2153//19 -f 2153//19 2103//19 689//19 -f 2153//19 689//19 2154//19 -f 689//19 687//19 2154//19 -f 2154//19 687//19 2155//19 -f 2154//19 2155//19 2156//19 -f 2157//19 2158//19 2159//19 -f 2159//19 2158//19 2154//19 -f 2159//19 2154//19 2160//19 -f 2160//19 2154//19 2156//19 -f 2161//19 2162//19 2163//19 -f 2164//19 2165//19 789//19 -f 789//19 2165//19 2166//19 -f 796//19 787//19 794//19 -f 794//19 787//19 789//19 -f 794//19 789//19 2167//19 -f 2167//19 789//19 2166//19 -f 2101//19 2103//19 2084//19 -f 2084//19 2103//19 702//19 -f 2084//19 702//19 697//19 -f 2164//19 789//19 2152//19 -f 2152//19 789//19 2168//19 -f 2152//19 2168//19 2103//19 -f 2103//19 2168//19 2169//19 -f 2103//19 2169//19 702//19 -f 1003//2120 1002//19 2134//19 -f 2134//19 1002//19 1001//19 -f 1001//19 1000//19 2134//19 -f 2134//19 1000//19 844//19 -f 2134//19 844//19 2089//19 -f 2089//19 844//19 842//19 -f 2089//19 842//19 689//19 -f 697//19 695//19 2084//19 -f 2084//19 695//19 692//2121 -f 2084//19 692//2121 693//19 -f 2150//19 2082//19 2134//19 -f 2134//19 2082//19 2084//19 -f 2134//19 2084//19 1003//2120 -f 1003//2120 2084//19 693//19 -f 1003//19 693//19 2170//19 -f 2170//19 693//19 2171//19 -f 2170//19 2171//19 2163//19 -f 2163//19 2171//19 2172//19 -f 2163//19 2172//19 2161//19 -f 1023//19 2098//19 2147//19 -f 2147//19 2098//19 2173//19 -f 2147//19 2173//19 685//19 -f 1023//19 2174//19 2098//19 -f 2098//19 2174//19 2175//19 -f 2098//19 2175//19 2092//19 -f 2092//19 2175//19 2176//19 -f 2092//19 2176//19 2177//19 -f 2177//19 2176//19 1025//19 -f 676//19 674//19 2177//19 -f 2177//19 674//19 672//19 -f 2147//19 2178//19 559//19 -f 573//19 2142//19 668//19 -f 668//19 2142//19 2141//19 -f 668//19 2141//19 669//19 -f 669//19 2141//19 2177//19 -f 669//19 2177//19 670//19 -f 670//19 2177//19 672//19 -f 568//19 566//19 2142//19 -f 2142//19 566//19 564//19 -f 2142//19 564//19 562//2122 -f 2179//19 2180//19 2181//19 -f 2182//19 2183//19 559//19 -f 559//19 2183//19 2184//19 -f 2185//19 573//19 2186//19 -f 2186//19 573//19 571//19 -f 2186//19 571//19 2187//19 -f 2187//19 571//19 2188//19 -f 2185//19 2189//19 573//19 -f 573//19 2189//19 2190//19 -f 573//19 2190//19 2142//19 -f 2142//19 2190//19 2191//19 -f 2142//19 2191//19 568//19 -f 2178//19 2147//19 561//19 -f 2184//19 676//19 559//19 -f 559//19 676//19 2177//19 -f 559//19 2177//19 2147//19 -f 2147//19 2177//19 1025//19 -f 2147//19 1025//19 1023//19 -f 562//2122 561//19 2142//19 -f 2142//19 561//19 2147//19 -f 2142//19 2147//19 2144//19 -f 2144//19 2147//19 683//19 -f 2144//19 683//19 2148//19 -f 2148//19 683//19 2192//19 -f 2148//19 2192//19 2098//19 -f 2098//19 2192//19 2193//19 -f 2098//19 2193//19 2173//19 -f 2194//19 2195//19 557//19 -f 557//19 2195//19 681//19 -f 557//19 681//19 559//19 -f 559//19 681//19 679//19 -f 559//19 679//19 2182//19 -f 2179//19 2181//19 2196//19 -f 2196//19 2181//19 557//19 -f 557//19 2181//19 2197//19 -f 557//19 2197//19 2194//19 -f 2198//19 2188//19 2199//19 -f 2199//19 2188//19 571//19 -f 2199//19 571//19 2200//19 -f 2200//19 571//19 2201//19 -f 2102//19 2121//19 2103//19 -f 2103//19 2121//19 1858//19 -f 2103//19 1858//19 2089//19 -f 2089//19 1858//19 1857//19 -f 2089//19 1857//19 2087//19 -f 2087//19 1857//19 1029//19 -f 2077//19 2076//19 2141//19 -f 2141//19 2076//19 1854//19 -f 2141//19 1854//19 2177//19 -f 2177//19 1854//19 1853//19 -f 2177//19 1853//19 2092//19 -f 2092//19 1853//19 1855//19 -f 2092//19 1855//19 2090//19 -f 2090//19 1855//19 2118//2119 -f 2082//20 2150//20 2202//20 -f 2145//20 2144//20 2203//20 -f 2203//20 2144//20 2148//20 -f 2203//20 2148//20 2202//20 -f 2202//20 2148//20 2083//20 -f 2202//20 2083//20 2082//20 -f 183//19 185//19 2204//19 -f 2204//19 185//19 187//19 -f 2204//19 187//19 2205//19 -f 2205//19 187//19 188//19 -f 2205//19 188//19 2206//19 -f 2206//19 2207//19 2205//19 -f 2205//19 2207//19 2208//19 -f 2205//19 2208//19 1931//19 -f 2209//19 2204//19 555//19 -f 555//19 2204//19 552//19 -f 1026//19 547//19 548//19 -f 2203//19 2202//19 2204//19 -f 2204//19 2202//19 181//19 -f 2204//19 181//19 183//19 -f 2209//19 2210//19 2204//19 -f 2204//19 2210//19 2211//19 -f 2204//19 2211//19 2203//19 -f 2212//19 2213//19 1026//19 -f 1026//19 2213//19 546//19 -f 1026//19 546//19 547//19 -f 1931//19 2208//19 1932//19 -f 1932//19 2208//19 2213//19 -f 1932//19 2213//19 1941//19 -f 1941//19 2213//19 2212//19 -f 1941//19 2212//19 2214//19 -f 1027//19 175//19 177//19 -f 548//19 169//19 1026//19 -f 1026//19 169//19 168//19 -f 1026//19 168//19 1027//19 -f 1027//19 168//19 173//19 -f 1027//19 173//19 175//19 -f 2202//19 2215//19 181//19 -f 181//19 2215//19 2216//19 -f 181//19 2216//19 178//19 -f 178//19 2216//19 2217//19 -f 178//19 2217//19 2218//19 -f 177//19 178//19 1027//19 -f 1027//19 178//19 2218//19 -f 1027//19 2218//19 2219//19 -f 2219//19 2218//19 2220//19 -f 2221//21 2222//21 2205//21 -f 2205//21 2222//21 2204//21 -f 108//19 40//19 1955//19 -f 1955//19 40//19 2223//19 -f 2224//19 2225//19 2222//19 -f 1950//19 1949//19 2221//19 -f 2221//19 1949//19 1955//19 -f 2221//19 1955//19 2222//19 -f 2222//19 1955//19 2223//19 -f 2222//19 2223//19 2224//19 -f 40//2123 70//2123 2223//2123 -f 2223//2123 70//2123 2226//2123 -f 2223//20 2226//20 2227//20 -f 2228//20 2229//20 2230//20 -f 2231//20 2232//20 2233//20 -f 2233//20 2228//20 2231//20 -f 2231//20 2228//20 2230//20 -f 2231//20 2230//20 2227//20 -f 2227//20 2230//20 2224//20 -f 2227//20 2224//20 2223//20 -f 1072//2124 2080//2124 2086//2124 -f 1072//2125 2086//2125 1070//2125 -f 2086//2126 2234//2126 1070//2126 -f 1070//2127 2234//2127 2235//2127 -f 1070//2128 2235//2128 2230//2128 -f 2230//2129 2235//2129 2236//2129 -f 2225//2130 2224//2130 2237//2130 -f 2237//2131 2224//2131 2230//2131 -f 2237//2132 2230//2132 2238//2132 -f 2238//2133 2230//2133 2236//2133 -f 1064//2134 1066//2134 2230//2134 -f 2230//2135 1066//2135 1068//2135 -f 2230//2136 1068//2136 1070//2136 -f 1064//2137 2230//2137 1043//2137 -f 1043//2138 2230//2138 2229//2138 -f 1043//2139 2229//2139 1045//2139 -f 1045//2140 2229//2140 1053//2140 -f 1053//2141 2229//2141 2228//2141 -f 1053//2142 2228//2142 1050//2142 -f 1050//2143 2228//2143 1062//2143 -f 1062//2144 2228//2144 2233//2144 -f 1062//2145 2233//2145 1059//2145 -f 2232//2146 1046//2146 2233//2146 -f 2233//2147 1046//2147 1049//2147 -f 2233//2148 1049//2148 1059//2148 -f 2231//2149 1032//2149 1034//2149 -f 1034//2150 1036//2150 2231//2150 -f 2231//2151 1036//2151 1038//2151 -f 2231//2152 1038//2152 2232//2152 -f 2232//2153 1038//2153 1040//2153 -f 2232//2154 1040//2154 1046//2154 -f 2231//2155 2227//2155 2239//2155 -f 2239//2156 2240//2156 2231//2156 -f 2231//2157 2240//2157 2241//2157 -f 2231//2158 2241//2158 1032//2158 -f 1032//2159 2241//2159 2242//2159 -f 1032//2160 2242//2160 2243//2160 -f 2243//2161 2244//2161 1032//2161 -f 1032//2162 2244//2162 2245//2162 -f 1032//2163 2245//2163 1030//2163 -f 1030//2164 2245//2165 2031//2166 -f 2246//21 2247//21 2248//21 -f 2248//21 2247//21 2249//21 -f 2239//36 2227//36 2249//36 -f 2249//36 2227//36 2226//36 -f 2249//36 2226//36 2248//36 -f 70//36 73//36 2226//36 -f 2226//36 73//36 2250//36 -f 2226//36 2250//36 2248//36 -f 2248//36 2250//36 2251//36 -f 2248//36 2251//2167 2252//2166 -f 73//8 74//8 2250//8 -f 2250//8 74//8 1970//8 -f 2250//20 1970//20 1969//20 -f 2250//20 1969//20 2251//20 -f 2251//20 1969//20 2253//20 -f 2251//20 2253//20 2254//20 -f 2255//20 2256//20 2257//20 -f 2257//20 2256//20 2254//20 -f 2257//20 2254//20 2258//20 -f 2258//20 2254//20 2253//20 -f 1090//2168 2028//2168 2259//2168 -f 1090//2169 2259//2169 1088//2169 -f 2259//2170 2260//2170 1088//2170 -f 1088//2171 2260//2171 2261//2171 -f 1088//2172 2261//2172 2254//2172 -f 2254//2173 2261//2173 2262//2173 -f 2252//2166 2251//2167 2263//2174 -f 2263//2175 2251//2175 2254//2175 -f 2263//2176 2254//2176 2264//2176 -f 2264//2177 2254//2177 2262//2177 -f 1094//2178 1096//2178 2254//2178 -f 2254//2179 1096//2179 1098//2179 -f 2254//2180 1098//2180 1088//2180 -f 1094//2181 2254//2181 1092//2181 -f 1092//2182 2254//2182 2256//2182 -f 1092//2183 2256//2183 1104//2183 -f 1104//2184 2256//2184 1105//2184 -f 1105//2185 2256//2185 2255//2185 -f 1105//2186 2255//2186 1109//2186 -f 1109//2187 2255//2187 1110//2187 -f 1110//2188 2255//2188 2257//2188 -f 1110//2189 2257//2189 1117//2189 -f 2258//2190 1103//2190 2257//2190 -f 2257//2191 1103//2191 1101//2191 -f 2257//2192 1101//2192 1117//2192 -f 2253//2193 1078//2193 1080//2193 -f 1080//2194 1082//2194 2253//2194 -f 2253//2195 1082//2195 1084//2195 -f 2253//2196 1084//2196 2258//2196 -f 2258//2197 1084//2197 1086//2197 -f 2258//2198 1086//2198 1103//2198 -f 2253//2199 1969//2199 1968//2199 -f 1968//2200 2265//2200 2253//2200 -f 2253//2201 2265//2201 2266//2201 -f 2253//2202 2266//2202 1078//2202 -f 1078//2203 2266//2203 2267//2203 -f 1078//2204 2267//2204 2268//2204 -f 2268//2205 2269//2205 1078//2205 -f 1078//2206 2269//2206 1975//2206 -f 1078//2207 1975//2207 1076//2207 -f 1076//2208 1975//1935 1974//1934 -f 2270//2209 2271//2209 2272//2209 -f 2273//2210 2274//2211 2275//2212 -f 2275//2213 2274//2213 2270//2213 -f 2270//2214 2272//2215 2275//2216 -f 2275//2216 2272//2215 2276//2217 -f 2275//2212 2276//2218 2273//2210 -f 2272//2219 2260//2219 2276//2219 -f 2276//2220 2260//2220 2259//2220 -f 2276//2220 2259//2220 2277//2220 -f 2277//2220 2259//2220 2278//2220 -f 2277//2221 2278//2221 2279//2222 -f 2279//2222 2278//2221 2280//2222 -f 2279//2223 2280//2223 2281//2223 -f 2281//2223 2280//2223 2282//2223 -f 2281//2224 2282//2224 2283//2225 -f 2283//2225 2282//2224 2284//2225 -f 2285//20 2283//20 2286//20 -f 2286//20 2283//20 2284//20 -f 2287//2226 2288//2226 2289//2226 -f 2290//2227 2291//2227 2292//2227 -f 2293//2228 2294//2228 2295//2228 -f 2296//2229 2297//2229 2290//2229 -f 2290//2229 2297//2229 2298//2229 -f 2290//2230 2298//2231 2291//2232 -f 2299//2233 2300//2234 2296//2234 -f 2298//2231 2293//2232 2291//2232 -f 2291//2228 2293//2228 2295//2228 -f 2291//2235 2295//2235 2292//2235 -f 2292//2236 2295//2236 2301//2236 -f 2292//2237 2301//2237 2302//2237 -f 2303//2238 2300//2238 2304//2239 -f 2304//2239 2300//2238 2299//2240 -f 2304//2241 2299//2242 2289//2242 -f 2296//2234 2290//2233 2299//2233 -f 2299//2227 2290//2227 2292//2227 -f 2299//2242 2292//2242 2289//2242 -f 2289//2243 2292//2243 2302//2243 -f 2289//2244 2302//2244 2287//2244 -f 2288//2245 2305//2246 2289//2246 -f 2289//2246 2305//2246 2306//2246 -f 2289//2247 2306//2247 2304//2247 -f 2304//2247 2306//2247 2307//2247 -f 2304//2248 2307//2248 2303//2248 -f 2303//2248 2307//2248 2308//2248 -f 2295//2249 2294//2249 2309//2249 -f 2309//2250 2310//2250 2311//2250 -f 2295//2251 2309//2251 2301//2251 -f 2301//2250 2309//2250 2311//2250 -f 2301//2252 2311//2252 2302//2252 -f 2302//2253 2311//2253 2312//2253 -f 2302//2254 2312//2254 2287//2254 -f 2287//2255 2312//2255 2288//2255 -f 2288//2256 2312//2256 2313//2256 -f 2288//2257 2313//2257 2305//2257 -f 2314//2258 2315//2258 2316//2258 -f 2316//2258 2315//2258 2317//2258 -f 2318//2259 2315//2259 2319//2259 -f 2318//2259 2319//2259 2320//2259 -f 2320//2260 2319//2260 2321//2260 -f 2320//2260 2321//2260 2322//2260 -f 2322//2261 2321//2261 2323//2261 -f 2322//2261 2323//2261 2324//2261 -f 2324//69 2323//69 2325//69 -f 2324//69 2325//69 2326//69 -f 2318//2262 2320//2263 2322//2264 -f 2327//2265 2328//2266 2329//2265 -f 2329//2267 2328//2267 2330//2267 -f 2322//2264 2324//2265 2318//2262 -f 2318//2262 2324//2265 2326//2265 -f 2318//2265 2326//2265 2327//2265 -f 2327//2265 2326//2265 2331//2266 -f 2327//2265 2331//2266 2328//2266 -f 2332//2268 2327//2265 2333//2269 -f 2333//2269 2327//2265 2329//2265 -f 2333//2269 2329//2265 2334//2270 -f 2334//2270 2329//2265 2335//2265 -f 2334//2270 2335//2265 2336//2264 -f 2336//2264 2335//2265 2337//2265 -f 2336//2264 2337//2265 2338//2266 -f 2338//2266 2337//2265 2339//2271 -f 2329//2272 2340//2272 2335//2272 -f 2335//2273 2340//2273 2341//2273 -f 2342//2274 2341//2274 2343//2274 -f 2343//2275 2341//2275 2340//2275 -f 2341//2276 2342//2276 2344//2276 -f 2344//2276 2342//2276 2345//2276 -f 2344//2277 2345//2278 2346//2278 -f 2346//2278 2345//2278 2347//2278 -f 2346//2279 2347//2280 2348//2279 -f 2348//2279 2347//2280 2349//2280 -f 2348//2281 2349//2281 2350//2281 -f 2350//2281 2349//2281 2351//2281 -f 2352//2258 2353//2258 2354//2258 -f 2354//2258 2353//2258 2355//2258 -f 2353//2282 2352//2282 2356//2282 -f 2356//2282 2352//2282 2357//2282 -f 2356//2283 2357//2284 2358//2284 -f 2358//2284 2357//2284 2359//2285 -f 2358//2286 2359//2286 2360//2286 -f 2360//2286 2359//2286 2361//2286 -f 2360//2287 2361//2287 2362//2287 -f 2362//2287 2361//2287 2363//2287 -f 2364//2266 2365//2288 2366//2289 -f 2366//2289 2365//2288 2367//2265 -f 2366//2289 2367//2265 2368//2265 -f 2368//2265 2367//2265 2369//2265 -f 2368//2265 2369//2265 2370//2265 -f 2370//2265 2369//2265 2371//2266 -f 2370//2265 2371//2266 2372//2266 -f 2372//2290 2371//2290 2373//2290 -f 2374//2290 2370//2265 2375//2266 -f 2375//2266 2370//2265 2372//2266 -f 2375//2266 2372//2266 2376//2266 -f 2376//2266 2372//2266 2377//2291 -f 2376//2266 2377//2291 2378//2265 -f 2378//2265 2377//2291 2379//2292 -f 2378//2265 2379//2292 2380//2264 -f 2380//2264 2379//2292 2381//2270 -f 2372//2273 2382//2273 2377//2273 -f 2377//2273 2382//2273 2383//2273 -f 2384//2293 2382//2294 2385//2295 -f 2385//2295 2382//2294 2386//2294 -f 2385//2296 2386//2297 2387//2298 -f 2387//2298 2386//2297 2388//2297 -f 2387//2299 2388//2299 2389//2299 -f 2389//2300 2388//2301 2390//2302 -f 2389//2300 2390//2302 2391//2303 -f 2392//2274 2383//2274 2384//2274 -f 2384//2274 2383//2274 2382//2274 -f 2383//2276 2392//2276 2393//2276 -f 2393//2276 2392//2276 2394//2276 -f 2393//2277 2394//2278 2395//2278 -f 2395//2278 2394//2278 2396//2278 -f 2395//2279 2396//2280 2397//2279 -f 2397//2279 2396//2280 2398//2280 -f 2397//2281 2398//2304 2399//2281 -f 2399//2281 2398//2304 2400//2304 -f 2401//2258 2402//2258 2403//2258 -f 2403//2258 2402//2258 2404//2258 -f 2405//2274 2406//2274 2407//2274 -f 2407//2274 2406//2274 2408//2274 -f 2409//2273 2408//2273 2410//2273 -f 2410//2273 2408//2273 2406//2273 -f 2411//2266 2409//2265 2410//2265 -f 2412//2305 2413//2264 2410//2265 -f 2410//2265 2413//2264 2414//2264 -f 2410//2265 2414//2264 2411//2266 -f 2411//2266 2415//2265 2409//2265 -f 2409//2265 2415//2265 2416//2267 -f 2409//2265 2416//2267 2417//2266 -f 2417//2266 2416//2267 2418//2306 -f 2419//2307 2409//2307 2420//2307 -f 2420//2266 2409//2265 2417//2266 -f 2420//2266 2417//2266 2421//2266 -f 2421//2266 2417//2266 2422//2266 -f 2421//2266 2422//2266 2423//2264 -f 2423//2264 2422//2266 2424//2266 -f 2423//2264 2424//2266 2425//2289 -f 2425//2289 2424//2266 2426//2266 -f 2410//2308 2406//2308 2427//2308 -f 2410//2308 2427//2308 2412//2308 -f 2412//2309 2427//2310 2428//2310 -f 2412//2309 2428//2310 2413//2309 -f 2413//2311 2428//2311 2429//2311 -f 2413//2311 2429//2311 2414//2311 -f 2414//2312 2429//2312 2430//2312 -f 2414//2312 2430//2312 2411//2312 -f 2430//2313 2431//2313 2432//2313 -f 2432//2313 2431//2313 2433//2313 -f 2406//2314 2405//2276 2427//2315 -f 2427//2315 2405//2276 2434//2276 -f 2427//2277 2434//2278 2428//2278 -f 2428//2278 2434//2278 2435//2278 -f 2428//2279 2435//2280 2429//2279 -f 2429//2279 2435//2280 2436//2280 -f 2429//2281 2436//2316 2430//2281 -f 2430//2281 2436//2316 2431//2316 -f 2437//2258 2438//2258 2439//2258 -f 2439//2258 2438//2258 2440//2258 -f 2438//2317 2437//2282 2441//2282 -f 2441//2282 2437//2282 2442//2282 -f 2441//2284 2442//2284 2443//2284 -f 2443//2284 2442//2284 2444//2285 -f 2443//2286 2444//2286 2445//2286 -f 2445//2286 2444//2286 2446//2286 -f 2445//2287 2446//2287 2447//2287 -f 2447//2287 2446//2287 2448//2287 -f 2449//21 2450//21 2451//21 -f 2451//21 2450//21 2452//21 -f 2453//2265 2454//2318 2455//2265 -f 2456//2264 2457//2264 2458//2264 -f 2458//2264 2457//2264 2449//2264 -f 2458//2292 2449//2265 2459//2266 -f 2459//2266 2449//2265 2451//2264 -f 2459//2266 2451//2264 2455//2265 -f 2460//2319 2461//2320 2451//2264 -f 2451//2264 2461//2320 2462//2265 -f 2451//2264 2462//2265 2455//2265 -f 2455//2265 2462//2265 2463//2265 -f 2455//2265 2463//2265 2453//2265 -f 2464//2267 2465//2265 2466//2265 -f 2466//2265 2465//2265 2467//2265 -f 2466//2265 2467//2265 2463//2265 -f 2463//2265 2467//2265 2468//2265 -f 2463//2265 2468//2289 2453//2265 -f 2468//88 2469//88 2470//88 -f 2468//88 2470//88 2453//2321 -f 2453//2322 2470//2323 2471//2323 -f 2453//2322 2471//2323 2454//2322 -f 2454//2324 2471//2325 2472//2325 -f 2454//2324 2472//2325 2455//2324 -f 2469//2326 2473//2326 2470//2326 -f 2470//2326 2473//2326 2474//2326 -f 2470//2297 2474//2298 2471//2298 -f 2471//2298 2474//2298 2475//2298 -f 2471//2327 2475//2294 2472//2294 -f 2472//2294 2475//2294 2476//2294 -f 2477//2274 2478//2274 2476//2274 -f 2476//2274 2478//2274 2472//2274 -f 2479//2328 2480//2328 2481//2328 -f 2481//2328 2480//2328 2482//2328 -f 2481//2329 2482//2329 2483//2329 -f 2483//2329 2482//2329 2484//2329 -f 2483//2330 2484//2331 2485//2331 -f 2485//2331 2484//2331 2486//2331 -f 2487//2258 2488//2258 2486//2258 -f 2486//2258 2488//2258 2485//2258 -f 2488//2282 2487//2282 2489//2282 -f 2489//2282 2487//2282 2490//2282 -f 2489//2283 2490//2284 2491//2284 -f 2491//2284 2490//2284 2492//2284 -f 2491//2286 2492//2286 2493//2286 -f 2493//2286 2492//2286 2494//2286 -f 2493//2287 2494//2287 2495//2287 -f 2495//2287 2494//2287 2496//2287 -f 2497//2332 2498//2333 2496//2332 -f 2496//2332 2498//2333 2495//2333 -f 2499//2262 2500//2264 2501//2265 -f 2501//2265 2500//2264 2502//2265 -f 2501//2265 2502//2265 2503//2265 -f 2503//2265 2502//2265 2504//2266 -f 2503//2265 2504//2266 2505//2266 -f 2505//2266 2504//2266 2506//2266 -f 2505//2266 2506//2266 2507//2265 -f 2507//2290 2506//2290 2508//2290 -f 2509//2334 2505//2266 2510//2267 -f 2510//2267 2505//2266 2507//2265 -f 2510//2267 2507//2265 2511//2267 -f 2511//2267 2507//2265 2512//2266 -f 2511//2267 2512//2266 2513//2291 -f 2513//2291 2512//2266 2514//2289 -f 2513//2291 2514//2289 2515//2265 -f 2515//2265 2514//2289 2516//2266 -f 2507//2273 2517//2273 2512//2273 -f 2512//2273 2517//2273 2518//2273 -f 2519//2274 2518//2274 2520//2274 -f 2520//2274 2518//2274 2517//2274 -f 2518//2276 2519//2276 2521//2276 -f 2521//2276 2519//2276 2522//2276 -f 2521//2277 2522//2278 2523//2278 -f 2523//2278 2522//2278 2524//2278 -f 2523//2279 2524//2280 2525//2279 -f 2525//2279 2524//2280 2526//2280 -f 2525//2281 2526//2304 2527//2281 -f 2527//2281 2526//2304 2528//2304 -f 2529//2335 2530//2335 2531//2336 -f 2531//2336 2530//2335 2532//36 -f 2533//2337 2534//2338 2435//2337 -f 2435//2337 2534//2338 2436//2339 -f 2535//36 2536//36 2294//36 -f 2537//2340 2538//2341 2309//36 -f 2309//36 2538//2341 2539//36 -f 2309//36 2539//36 2540//36 -f 2475//36 2492//36 2476//36 -f 2476//36 2492//36 2490//36 -f 2476//36 2490//36 2477//36 -f 2477//2342 2490//2343 2541//2342 -f 2398//36 2396//36 2433//2344 -f 2475//36 2474//2345 2492//36 -f 2492//36 2474//2345 2473//2340 -f 2492//36 2473//2340 2494//2346 -f 2494//2346 2473//2340 2309//36 -f 2494//2346 2309//36 2496//2347 -f 2496//2347 2309//36 2294//2347 -f 2496//2347 2294//2347 2497//2348 -f 2497//36 2294//36 2536//36 -f 2403//36 2542//2335 2396//2349 -f 2396//2349 2542//2335 2543//2337 -f 2396//2349 2543//2337 2433//2350 -f 2384//36 2385//36 2540//36 -f 2294//36 2293//36 2535//36 -f 2535//36 2293//36 2298//36 -f 2535//36 2298//36 2520//36 -f 2520//36 2298//36 2297//36 -f 2520//36 2297//36 2519//36 -f 2519//36 2297//36 2544//36 -f 2519//36 2544//36 2522//36 -f 2522//36 2544//36 2545//36 -f 2522//36 2545//36 2524//36 -f 2524//36 2545//36 2546//36 -f 2524//36 2546//36 2526//36 -f 2526//36 2546//36 2547//36 -f 2526//36 2547//36 2528//2335 -f 2528//2351 2547//2352 2480//2351 -f 2473//2340 2448//2353 2309//36 -f 2309//36 2448//36 2446//36 -f 2309//36 2446//36 2537//2340 -f 2537//2340 2446//36 2444//36 -f 2537//2340 2444//36 2548//2341 -f 2434//36 2405//36 2442//36 -f 2442//36 2405//36 2407//36 -f 2442//36 2407//36 2444//36 -f 2444//36 2407//36 2549//36 -f 2444//36 2549//36 2548//2341 -f 2484//36 2550//36 2486//36 -f 2486//36 2550//36 2541//2342 -f 2486//36 2541//2342 2487//2342 -f 2487//2342 2541//2342 2490//2343 -f 2540//36 2385//36 2309//36 -f 2309//36 2385//36 2387//36 -f 2309//36 2387//36 2389//36 -f 2540//36 2551//36 2384//36 -f 2384//36 2551//36 2401//36 -f 2384//36 2401//36 2392//36 -f 2392//36 2401//36 2403//36 -f 2392//36 2403//36 2394//36 -f 2394//36 2403//36 2396//2349 -f 2530//2335 2552//2354 2553//2335 -f 2442//36 2437//2342 2434//36 -f 2434//36 2437//2342 2439//36 -f 2434//36 2439//36 2435//2337 -f 2435//2337 2439//36 2554//36 -f 2435//2337 2554//36 2533//2337 -f 2553//2335 2400//2335 2530//2335 -f 2530//2335 2400//36 2547//2352 -f 2530//2335 2547//2352 2532//36 -f 2484//36 2482//2337 2550//36 -f 2550//36 2482//2337 2480//2351 -f 2550//36 2480//2351 2555//2335 -f 2555//2335 2480//2351 2547//2352 -f 2555//2335 2547//2352 2556//2346 -f 2556//2346 2547//2352 2534//2338 -f 2436//2339 2534//2338 2431//2355 -f 2431//2355 2534//2338 2547//2352 -f 2431//2355 2547//2352 2433//2344 -f 2433//2344 2547//2352 2400//36 -f 2433//2344 2400//36 2398//36 -f 2389//36 2391//36 2309//36 -f 2309//36 2391//36 2363//36 -f 2309//36 2363//36 2310//36 -f 2310//36 2557//36 2558//36 -f 2558//36 2557//36 2559//36 -f 2560//36 2561//2339 2310//36 -f 2310//36 2561//2339 2562//2335 -f 2310//36 2562//2335 2557//36 -f 2357//36 2352//36 2343//36 -f 2343//36 2352//36 2342//36 -f 2342//36 2352//36 2354//36 -f 2342//36 2354//36 2345//36 -f 2343//36 2563//36 2357//36 -f 2357//36 2563//36 2560//36 -f 2357//36 2560//36 2359//36 -f 2359//36 2560//36 2310//36 -f 2359//36 2310//36 2361//2335 -f 2361//2335 2310//36 2363//36 -f 2564//36 2565//36 2529//36 -f 2529//36 2565//36 2351//36 -f 2529//2335 2351//2347 2530//2335 -f 2530//2335 2351//2347 2349//36 -f 2530//2335 2349//36 2347//36 -f 2345//36 2354//36 2347//36 -f 2347//36 2354//36 2566//36 -f 2347//36 2566//36 2530//2335 -f 2530//2335 2566//36 2567//2356 -f 2530//2335 2567//2356 2552//2354 -f 2564//36 2529//36 2568//36 -f 2568//36 2529//36 2569//36 -f 2568//36 2569//36 2316//36 -f 2316//36 2569//36 2570//36 -f 2316//36 2570//36 2314//36 -f 2314//36 2570//36 2571//36 -f 2314//36 2571//36 2572//36 -f 2572//36 2571//36 2573//36 -f 2572//36 2573//36 2559//36 -f 2559//36 2573//36 2574//36 -f 2559//36 2574//36 2558//36 -f 2571//2357 2570//2358 2575//2357 -f 2575//2357 2570//2358 2576//2358 -f 2575//2275 2576//2274 2577//2275 -f 2577//2275 2576//2274 2578//2274 -f 2577//2359 2578//2359 2579//2359 -f 2579//2359 2578//2359 2580//2359 -f 2531//2360 2581//2360 2529//2360 -f 2529//2360 2581//2360 2582//2360 -f 2529//2361 2582//2361 2569//2361 -f 2569//2361 2582//2361 2583//2361 -f 2569//2362 2583//2362 2570//2363 -f 2570//2363 2583//2362 2576//2363 -f 2581//2326 2584//2326 2582//2364 -f 2582//2364 2584//2326 2585//2364 -f 2582//2365 2585//2365 2583//2298 -f 2583//2298 2585//2365 2586//2298 -f 2583//2294 2586//2294 2576//2294 -f 2576//2294 2586//2294 2578//2294 -f 2584//2366 2587//2366 2585//2366 -f 2585//2366 2587//2366 2588//2366 -f 2585//2367 2588//2368 2586//2368 -f 2586//2368 2588//2368 2589//2368 -f 2586//2369 2589//2369 2578//2370 -f 2578//2370 2589//2369 2580//2370 -f 2532//2371 2590//2371 2531//2371 -f 2531//2372 2590//2372 2581//2372 -f 2590//2373 2591//2373 2581//2373 -f 2581//2374 2591//2374 2592//2374 -f 2581//2375 2592//2375 2584//2375 -f 2584//2376 2592//2376 2593//2376 -f 2584//2377 2593//2377 2587//2377 -f 2587//2378 2593//2378 2594//2378 -f 2587//2379 2594//2379 2595//2379 -f 2593//2380 2592//2380 2596//2380 -f 2591//2381 2590//2381 2597//2381 -f 2544//2382 2598//2383 2545//2383 -f 2545//2383 2598//2383 2599//2383 -f 2545//2384 2599//2385 2546//2386 -f 2546//2386 2599//2385 2600//2387 -f 2546//2388 2600//2389 2547//2390 -f 2547//2390 2600//2389 2597//2390 -f 2547//2391 2597//2391 2532//2391 -f 2532//2391 2597//2391 2590//2392 -f 2598//2393 2601//2393 2599//2393 -f 2599//2393 2601//2393 2602//2393 -f 2599//2394 2602//2395 2600//2396 -f 2600//2396 2602//2395 2603//2396 -f 2600//2397 2603//2397 2597//2398 -f 2597//2398 2603//2397 2596//2398 -f 2597//2399 2596//2399 2591//2399 -f 2591//2400 2596//2400 2592//2400 -f 2601//2401 2604//2401 2602//2401 -f 2602//2401 2604//2401 2605//2401 -f 2602//2402 2605//2402 2603//2402 -f 2603//2402 2605//2402 2606//2402 -f 2603//2403 2606//2403 2596//2404 -f 2596//2404 2606//2403 2607//2404 -f 2596//2405 2607//2405 2593//2405 -f 2593//2406 2607//2406 2594//2406 -f 2604//2407 2608//2407 2605//2408 -f 2605//2408 2608//2407 2609//2409 -f 2605//2410 2609//2410 2606//2410 -f 2606//2410 2609//2410 2610//2411 -f 2606//2412 2610//2412 2607//2413 -f 2607//2413 2610//2412 2611//2413 -f 2607//2414 2611//2414 2594//2415 -f 2594//2415 2611//2414 2595//2415 -f 2544//2416 2297//2417 2598//2416 -f 2598//2416 2297//2417 2296//2417 -f 2598//2418 2296//2419 2601//2418 -f 2601//2418 2296//2419 2300//2419 -f 2601//2420 2300//2420 2604//2420 -f 2604//2420 2300//2420 2303//2420 -f 2604//2421 2303//2422 2608//2421 -f 2608//2421 2303//2422 2308//2422 -f 2612//2423 2613//2423 2614//2423 -f 2614//2423 2613//2423 2615//2423 -f 2614//2332 2615//2332 2616//2332 -f 2616//2332 2615//2332 2617//2332 -f 2616//2377 2617//2377 2618//2377 -f 2618//2377 2617//2377 2619//2377 -f 2620//2424 2621//2424 2622//2424 -f 2622//2425 2621//2425 2623//2425 -f 2622//2426 2623//2426 2624//2426 -f 2624//2426 2623//2426 2625//2426 -f 2624//2427 2625//2427 2626//2427 -f 2626//2427 2625//2427 2627//2427 -f 2626//2428 2627//2428 2618//2428 -f 2618//2428 2627//2428 2616//2428 -f 2621//2282 2628//2282 2623//2282 -f 2623//2282 2628//2282 2629//2282 -f 2623//2284 2629//2284 2625//2284 -f 2625//2284 2629//2284 2630//2284 -f 2625//2286 2630//2286 2627//2429 -f 2627//2429 2630//2286 2631//2429 -f 2627//2287 2631//2287 2616//2287 -f 2616//2287 2631//2287 2614//2287 -f 2628//2430 2632//2430 2629//2430 -f 2629//2431 2632//2431 2633//2431 -f 2629//2432 2633//2432 2630//2432 -f 2630//2432 2633//2432 2634//2432 -f 2630//2433 2634//2433 2631//2434 -f 2631//2434 2634//2433 2635//2434 -f 2631//2435 2635//2435 2614//2436 -f 2614//2436 2635//2435 2612//2436 -f 2618//36 2636//36 2626//36 -f 2626//36 2636//36 2637//36 -f 2638//36 2639//36 2610//36 -f 2640//36 2611//36 2641//36 -f 2641//36 2611//36 2610//36 -f 2641//36 2610//36 2642//36 -f 2642//36 2610//36 2639//36 -f 2620//36 2622//36 2637//36 -f 2637//36 2622//36 2624//36 -f 2637//36 2624//36 2626//36 -f 2610//36 2609//36 2638//36 -f 2638//36 2609//36 2608//2437 -f 2638//36 2608//2437 2643//36 -f 2643//36 2608//2437 2308//36 -f 2643//36 2308//36 2644//36 -f 2644//36 2308//36 2307//36 -f 2644//36 2307//36 2645//36 -f 2645//36 2307//36 2306//36 -f 2645//36 2306//36 2619//36 -f 2619//36 2306//36 2305//36 -f 2619//36 2305//36 2618//36 -f 2618//36 2305//36 2313//36 -f 2618//36 2313//36 2636//36 -f 2637//36 2646//36 2620//36 -f 2620//36 2646//36 2579//36 -f 2620//36 2579//36 2647//36 -f 2647//36 2579//36 2580//36 -f 2647//36 2580//36 2648//36 -f 2648//36 2580//36 2589//36 -f 2648//36 2589//36 2649//36 -f 2649//36 2589//36 2588//36 -f 2649//36 2588//36 2650//36 -f 2650//36 2588//36 2587//2335 -f 2650//36 2587//2335 2640//36 -f 2640//36 2587//2335 2595//36 -f 2640//36 2595//36 2611//36 -f 2651//2438 2652//2438 2653//2438 -f 2651//2439 2653//2439 2654//2439 -f 2654//2440 2653//2440 2655//2440 -f 2654//2441 2655//2441 2656//2441 -f 2656//2442 2655//2442 2657//2442 -f 2656//2443 2657//2443 2658//2443 -f 2658//2444 2657//2444 2638//2444 -f 2658//2445 2638//2445 2643//2445 -f 2655//2446 2653//2446 2659//2446 -f 2638//2447 2657//2447 2639//2447 -f 2639//2447 2657//2447 2660//2447 -f 2639//2448 2660//2448 2642//2449 -f 2642//2449 2660//2448 2661//2449 -f 2642//2450 2661//2451 2641//2451 -f 2641//2451 2661//2451 2662//2452 -f 2641//2453 2662//2453 2640//2454 -f 2640//2454 2662//2453 2663//2454 -f 2657//2455 2655//2455 2660//2455 -f 2660//2456 2655//2456 2659//2456 -f 2660//2278 2659//2278 2661//2457 -f 2661//2457 2659//2278 2664//2457 -f 2661//2280 2664//2280 2662//2458 -f 2662//2458 2664//2280 2665//2458 -f 2662//2459 2665//2459 2663//2304 -f 2663//2304 2665//2459 2666//2304 -f 2653//2460 2652//2461 2659//2461 -f 2659//2461 2652//2461 2667//2461 -f 2659//2462 2667//2462 2664//2462 -f 2664//2462 2667//2462 2668//2463 -f 2664//2464 2668//2464 2665//2464 -f 2665//2464 2668//2464 2669//2465 -f 2665//2466 2669//2466 2666//2467 -f 2666//2467 2669//2466 2670//2467 -f 2670//2468 2671//2468 2666//2468 -f 2666//2468 2671//2468 2672//2468 -f 2666//2016 2672//2469 2663//2016 -f 2663//2016 2672//2469 2673//2469 -f 2663//2470 2673//2470 2640//2470 -f 2640//2470 2673//2470 2650//2470 -f 2650//2471 2673//2471 2649//2471 -f 2649//2471 2673//2471 2674//2472 -f 2649//2473 2674//2473 2648//2474 -f 2648//2474 2674//2473 2675//2474 -f 2648//2475 2675//2475 2647//2475 -f 2647//2476 2675//2476 2676//2476 -f 2673//2477 2672//2328 2674//2328 -f 2674//2328 2672//2328 2677//2328 -f 2674//2329 2677//2329 2675//2329 -f 2675//2329 2677//2329 2678//2329 -f 2675//2478 2678//2478 2676//2478 -f 2676//2478 2678//2478 2679//2478 -f 2672//2479 2671//2479 2677//2480 -f 2677//2480 2671//2479 2680//2480 -f 2677//2481 2680//2481 2678//2482 -f 2678//2482 2680//2481 2681//2482 -f 2678//2483 2681//2483 2679//2483 -f 2679//2484 2681//2484 2682//2484 -f 166//36 2668//36 2667//36 -f 2278//36 2259//36 2028//36 -f 2612//36 2635//36 2683//36 -f 2683//36 2635//36 2634//36 -f 2683//36 2634//36 2684//36 -f 2684//36 2634//36 2685//36 -f 2686//36 2670//36 166//36 -f 166//36 2670//36 2669//36 -f 166//36 2669//36 2668//36 -f 2245//2165 160//2485 2031//2166 -f 2031//36 160//36 162//36 -f 2031//36 162//36 164//36 -f 2028//36 2026//36 2278//36 -f 2278//36 2026//36 2025//36 -f 2278//36 2025//36 2280//36 -f 2280//36 2025//36 2023//36 -f 2280//36 2023//36 2282//36 -f 2282//36 2023//36 2024//36 -f 2282//36 2024//36 2284//36 -f 2651//36 2687//36 2030//36 -f 2030//36 2687//36 2688//36 -f 2030//36 2688//36 2613//36 -f 2634//36 2633//36 2685//36 -f 2685//36 2633//36 2632//36 -f 2685//36 2632//36 2689//36 -f 2689//36 2632//36 2682//36 -f 2689//36 2682//36 2690//36 -f 2690//36 2682//36 2681//36 -f 2690//36 2681//36 2691//36 -f 2691//36 2681//36 2680//36 -f 2691//36 2680//36 2686//36 -f 2686//36 2680//36 2671//36 -f 2686//36 2671//36 2670//36 -f 2036//36 2032//36 2652//36 -f 2652//36 2032//36 2031//36 -f 2652//36 2031//36 2667//36 -f 2667//36 2031//36 164//36 -f 2667//36 164//36 166//36 -f 2651//36 2030//36 2652//36 -f 2652//36 2030//36 2039//36 -f 2652//36 2039//36 2036//36 -f 2284//36 2024//36 2286//36 -f 2286//36 2024//36 2030//36 -f 2286//36 2030//36 2683//36 -f 2683//36 2030//36 2613//36 -f 2683//36 2613//36 2612//36 -f 167//20 2692//20 166//20 -f 166//20 2692//20 2686//20 -f 148//36 150//36 2247//36 -f 154//36 153//36 2247//36 -f 2693//36 2246//36 2694//36 -f 2694//36 2246//36 2273//36 -f 2694//36 2273//36 2695//36 -f 2695//36 2273//36 2276//36 -f 2695//36 2276//36 2696//36 -f 2283//36 2697//36 2281//36 -f 2281//36 2697//36 2698//36 -f 2693//36 151//36 2246//36 -f 2246//36 151//36 143//36 -f 2246//36 143//36 2247//36 -f 2247//36 143//36 146//36 -f 2247//36 146//36 148//36 -f 139//36 2699//36 2285//36 -f 2696//36 2276//36 2700//36 -f 2700//36 2276//36 2277//36 -f 2700//36 2277//36 2698//36 -f 2698//36 2277//36 2279//36 -f 2698//36 2279//36 2281//36 -f 2699//36 2701//36 2285//36 -f 2285//36 2701//36 2702//36 -f 2285//36 2702//36 2283//36 -f 2283//36 2702//36 2703//36 -f 2283//36 2703//36 2697//36 -f 2704//36 150//36 2705//36 -f 2705//36 150//36 140//36 -f 2705//36 140//36 2706//36 -f 165//36 163//36 167//36 -f 167//36 163//36 161//2486 -f 161//2486 154//2487 167//36 -f 167//36 154//36 2247//36 -f 167//36 2247//36 2692//36 -f 2692//36 2247//36 150//36 -f 2692//36 150//36 2707//36 -f 2707//36 150//36 2704//36 -f 2708//2335 2709//36 2285//36 -f 2285//36 2709//36 2706//36 -f 2285//36 2706//36 139//36 -f 139//36 2706//36 140//36 -f 2703//21 2702//21 2710//21 -f 2710//21 2702//21 2711//21 -f 2712//36 2713//36 2714//36 -f 2714//36 2713//36 2715//36 -f 2714//36 2715//36 2716//36 -f 2716//36 2715//36 2717//36 -f 2716//36 2717//36 2718//36 -f 2718//36 2717//36 2710//36 -f 2718//36 2710//36 2719//36 -f 2719//36 2710//36 2711//36 -f 2719//36 2711//36 2720//36 -f 2720//36 2711//36 2721//36 -f 2720//36 2721//36 2722//36 -f 2722//36 2721//36 2723//36 -f 2722//36 2723//36 2724//36 -f 2724//36 2723//36 141//36 -f 2724//36 141//36 2725//36 -f 2725//36 141//36 142//36 -f 2725//36 142//36 2726//36 -f 2726//36 142//36 149//36 -f 2726//36 149//36 2727//36 -f 2727//36 149//36 147//36 -f 2727//36 147//36 2728//36 -f 2728//36 147//36 145//36 -f 2728//36 145//36 2729//36 -f 2729//36 145//36 144//36 -f 2729//36 144//36 2730//36 -f 2730//36 144//36 152//36 -f 2730//36 152//36 2731//36 -f 2731//36 152//36 2732//36 -f 2731//36 2732//36 2733//36 -f 2733//36 2732//36 2734//36 -f 2733//36 2734//36 2735//36 -f 2735//36 2734//36 2736//36 -f 2735//36 2736//36 2737//36 -f 2737//36 2736//36 2738//36 -f 2737//36 2738//36 2712//36 -f 2712//36 2738//36 2713//36 -f 2739//2488 2740//2488 2741//2488 -f 2742//2489 2743//2489 2744//2489 -f 2745//2490 2746//2490 2747//2490 -f 2729//2491 2745//2491 2728//2491 -f 2728//2492 2745//2492 2747//2492 -f 2728//2493 2747//2493 2727//2494 -f 2727//2494 2747//2493 2748//2494 -f 2727//2495 2748//2495 2726//2495 -f 2726//2495 2748//2495 2749//2495 -f 2726//2461 2749//2461 2725//2496 -f 2725//2496 2749//2461 2750//2496 -f 2746//2497 2742//2497 2747//2497 -f 2747//2498 2742//2498 2744//2498 -f 2747//2499 2744//2499 2748//2280 -f 2748//2280 2744//2499 2751//2280 -f 2748//2278 2751//2278 2749//2278 -f 2749//2278 2751//2278 2752//2278 -f 2749//2276 2752//2276 2750//2500 -f 2750//2500 2752//2276 2753//2500 -f 2743//2501 2739//2501 2744//2501 -f 2744//2502 2739//2502 2741//2502 -f 2744//2450 2741//2450 2751//2503 -f 2751//2503 2741//2450 2754//2503 -f 2751//2449 2754//2449 2752//2449 -f 2752//2449 2754//2449 2755//2449 -f 2752//2447 2755//2447 2753//2504 -f 2753//2504 2755//2447 2756//2504 -f 2757//2505 2740//2506 2758//2505 -f 2758//2505 2740//2506 2739//2506 -f 2758//2507 2739//2508 2759//2507 -f 2759//2507 2739//2508 2743//2508 -f 2759//2509 2743//2510 2760//2509 -f 2760//2509 2743//2510 2742//2510 -f 2760//2511 2742//2252 2761//2511 -f 2761//2511 2742//2252 2746//2252 -f 2761//2512 2746//2512 2762//2512 -f 2762//2512 2746//2512 2745//2512 -f 2762//2513 2745//2513 2730//2513 -f 2730//2513 2745//2513 2729//2513 -f 2758//2514 2759//2514 2763//2514 -f 2764//2515 2765//2515 2766//2515 -f 2760//2516 2761//2516 2767//2516 -f 2762//2517 2730//2517 2731//2517 -f 2737//2518 2768//2518 2735//2518 -f 2735//2518 2768//2518 2769//2519 -f 2735//2520 2769//2520 2733//2521 -f 2733//2521 2769//2520 2770//2521 -f 2733//2522 2770//2522 2731//2523 -f 2731//2523 2770//2522 2767//2524 -f 2731//2525 2767//2525 2762//2525 -f 2762//2526 2767//2526 2761//2526 -f 2768//2527 2764//2527 2769//2527 -f 2769//2528 2764//2528 2766//2528 -f 2769//2529 2766//2529 2770//2530 -f 2770//2530 2766//2529 2771//2530 -f 2770//2531 2771//2531 2767//2532 -f 2767//2532 2771//2531 2763//2532 -f 2767//2533 2763//2533 2760//2533 -f 2760//2534 2763//2534 2759//2534 -f 2765//2535 2772//2535 2766//2535 -f 2766//2535 2772//2535 2773//2535 -f 2766//2536 2773//2536 2771//2536 -f 2771//2536 2773//2536 2774//2536 -f 2771//2537 2774//2537 2763//2538 -f 2763//2538 2774//2537 2775//2538 -f 2763//2539 2775//2539 2758//2539 -f 2758//2540 2775//2540 2757//2540 -f 2776//2541 2772//2541 2765//2541 -f 2776//2542 2765//2542 2777//2542 -f 2777//2543 2765//2543 2764//2543 -f 2777//2544 2764//2544 2778//2544 -f 2778//2545 2764//2545 2768//2545 -f 2778//2546 2768//2546 2779//2546 -f 2779//2547 2768//2547 2737//2547 -f 2779//2548 2737//2548 2712//2548 -f 2780//2549 2781//2550 2782//2550 -f 2716//2551 2718//2551 2783//2551 -f 2716//2552 2781//2553 2714//2554 -f 2714//2554 2781//2553 2780//2555 -f 2714//2556 2780//2556 2712//2557 -f 2712//2557 2780//2556 2779//2557 -f 2784//2558 2778//2558 2779//2558 -f 2777//2559 2778//2559 2785//2560 -f 2785//2560 2778//2559 2784//2560 -f 2785//2561 2784//2562 2786//2562 -f 2716//2551 2783//2551 2781//2551 -f 2781//2563 2783//2563 2787//2563 -f 2781//2564 2787//2564 2782//2564 -f 2782//2565 2787//2565 2788//2565 -f 2782//2566 2788//2566 2789//2566 -f 2779//2558 2780//2558 2784//2558 -f 2784//2549 2780//2549 2782//2550 -f 2784//2562 2782//2562 2786//2562 -f 2786//2567 2782//2567 2789//2567 -f 2786//2568 2789//2568 2790//2568 -f 2790//2569 2791//2569 2786//2569 -f 2786//2569 2791//2569 2792//2569 -f 2786//2570 2792//2570 2785//2571 -f 2785//2571 2792//2570 2793//2571 -f 2785//2572 2793//2572 2777//2572 -f 2777//2572 2793//2572 2776//2572 -f 2791//2573 2790//2573 2794//2573 -f 2794//2574 2790//2574 2795//2574 -f 2790//2575 2789//2575 2795//2575 -f 2795//2576 2789//2576 2788//2576 -f 2795//2577 2788//2577 2796//2577 -f 2796//2578 2788//2578 2787//2578 -f 2796//2579 2787//2579 2719//2579 -f 2719//2580 2787//2580 2783//2580 -f 2719//2371 2783//2371 2718//2371 -f 2724//2363 2797//2363 2722//2581 -f 2722//2581 2797//2363 2798//2581 -f 2722//2582 2798//2582 2720//2582 -f 2720//2582 2798//2582 2799//2582 -f 2720//2583 2799//2584 2719//2360 -f 2719//2360 2799//2584 2796//2360 -f 2797//2294 2800//2294 2798//2295 -f 2798//2295 2800//2294 2801//2293 -f 2798//2585 2801//2585 2799//2585 -f 2799//2585 2801//2585 2802//2585 -f 2799//2326 2802//2326 2796//2326 -f 2796//2326 2802//2326 2795//2326 -f 2800//2586 2803//2586 2801//2586 -f 2801//2586 2803//2586 2804//2586 -f 2801//2587 2804//2587 2802//2367 -f 2802//2367 2804//2587 2805//2367 -f 2802//2366 2805//2366 2795//2588 -f 2795//2588 2805//2366 2794//2588 -f 2756//2589 2803//2590 2753//2589 -f 2753//2589 2803//2590 2800//2590 -f 2753//2274 2800//2274 2750//2274 -f 2750//2274 2800//2274 2797//2274 -f 2750//2591 2797//2591 2725//2591 -f 2725//2591 2797//2591 2724//2591 -f 2806//36 2794//36 2807//36 -f 2807//36 2794//36 2805//36 -f 2807//36 2805//36 2808//2437 -f 2808//2437 2805//36 2804//2437 -f 2808//2437 2804//2437 2809//36 -f 2809//36 2804//2437 2803//36 -f 2809//36 2803//36 2810//36 -f 2810//36 2803//36 2756//36 -f 2810//36 2756//36 2811//36 -f 2811//36 2756//36 2755//36 -f 2811//36 2755//36 2812//36 -f 2812//36 2755//36 2754//36 -f 2812//36 2754//36 2813//36 -f 2813//36 2754//36 2741//36 -f 2813//36 2741//36 2814//36 -f 2814//36 2741//36 2740//36 -f 2814//36 2740//36 2815//36 -f 2815//36 2740//36 2757//36 -f 2815//36 2757//36 2816//36 -f 2816//36 2757//36 2775//36 -f 2816//36 2775//36 2817//36 -f 2817//36 2775//36 2774//36 -f 2817//36 2774//36 2818//2437 -f 2818//2437 2774//36 2773//2437 -f 2818//2437 2773//2437 2819//36 -f 2819//36 2773//2437 2772//36 -f 2819//36 2772//36 2820//36 -f 2820//36 2772//36 2776//36 -f 2820//36 2776//36 2821//36 -f 2821//36 2776//36 2793//36 -f 2821//36 2793//36 2822//2335 -f 2822//2335 2793//36 2792//2335 -f 2822//2335 2792//2335 2823//36 -f 2823//36 2792//2335 2791//36 -f 2823//36 2791//36 2806//36 -f 2806//36 2791//36 2794//36 -f 2824//2592 2825//2593 2826//2593 -f 2822//2594 2823//2595 2827//2596 -f 2822//2597 2825//2597 2821//2598 -f 2821//2598 2825//2597 2824//2598 -f 2821//2599 2824//2599 2820//2600 -f 2820//2600 2824//2599 2828//2601 -f 2829//2602 2830//2603 2828//2604 -f 2831//2605 2830//2605 2832//2606 -f 2832//2606 2830//2605 2829//2606 -f 2832//2607 2829//2607 2833//2608 -f 2822//2594 2827//2596 2825//2609 -f 2825//2610 2827//2610 2834//2610 -f 2825//2611 2834//2611 2826//2611 -f 2826//2612 2834//2612 2835//2612 -f 2826//2613 2835//2613 2836//2613 -f 2828//2604 2824//2602 2829//2602 -f 2829//2592 2824//2592 2826//2593 -f 2829//2607 2826//2608 2833//2608 -f 2833//2614 2826//2614 2836//2614 -f 2833//2615 2836//2615 2837//2615 -f 2837//2616 2838//2617 2833//2618 -f 2833//2618 2838//2617 2839//2618 -f 2833//2619 2839//2619 2832//2619 -f 2832//2619 2839//2619 2840//2619 -f 2832//2620 2840//2620 2831//2621 -f 2831//2621 2840//2620 2841//2621 -f 2827//2257 2823//2257 2806//2257 -f 2827//2622 2806//2622 2834//2622 -f 2834//2623 2806//2623 2842//2623 -f 2834//2624 2842//2624 2835//2624 -f 2835//2625 2842//2625 2836//2625 -f 2836//2016 2842//2016 2843//2016 -f 2836//2626 2843//2626 2837//2626 -f 2837//2627 2843//2627 2844//2627 -f 2837//2628 2844//2628 2838//2628 -f 2809//2476 2845//2476 2808//2475 -f 2808//2475 2845//2476 2846//2475 -f 2808//2629 2846//2629 2807//2629 -f 2807//2629 2846//2629 2847//2630 -f 2807//2471 2847//2471 2806//2631 -f 2806//2631 2847//2471 2842//2632 -f 2845//2478 2848//2478 2846//2331 -f 2846//2331 2848//2478 2849//2331 -f 2846//2329 2849//2329 2847//2329 -f 2847//2329 2849//2329 2850//2329 -f 2847//2328 2850//2328 2842//2328 -f 2842//2328 2850//2328 2843//2328 -f 2848//2484 2851//2633 2849//2634 -f 2849//2634 2851//2633 2852//2634 -f 2849//2635 2852//2635 2850//2482 -f 2850//2482 2852//2635 2853//2636 -f 2850//2637 2853//2637 2843//2479 -f 2843//2479 2853//2637 2844//2480 -f 2809//2638 2810//2639 2845//2638 -f 2845//2638 2810//2639 2854//2639 -f 2845//2258 2854//2258 2848//2258 -f 2848//2258 2854//2258 2855//2258 -f 2848//2640 2855//2640 2851//2640 -f 2851//2640 2855//2640 2856//2640 -f 2814//2641 2857//2428 2813//2642 -f 2813//2642 2857//2428 2858//2642 -f 2813//2643 2858//2644 2812//2644 -f 2812//2644 2858//2644 2859//2644 -f 2812//2426 2859//2426 2811//2645 -f 2811//2645 2859//2426 2860//2645 -f 2811//2424 2860//2424 2810//2424 -f 2810//2424 2860//2424 2854//2424 -f 2857//2287 2861//2287 2858//2646 -f 2858//2646 2861//2287 2862//2646 -f 2858//2647 2862//2648 2859//2648 -f 2859//2648 2862//2648 2863//2648 -f 2859//2284 2863//2284 2860//2285 -f 2860//2285 2863//2284 2864//2285 -f 2860//2282 2864//2282 2854//2282 -f 2854//2282 2864//2282 2855//2282 -f 2861//2435 2865//2435 2862//2435 -f 2862//2435 2865//2435 2866//2435 -f 2862//2649 2866//2649 2863//2650 -f 2863//2650 2866//2649 2867//2650 -f 2863//2651 2867//2432 2864//2652 -f 2864//2652 2867//2432 2868//2653 -f 2864//2654 2868//2431 2855//2430 -f 2855//2430 2868//2431 2856//2655 -f 2814//2656 2815//2377 2857//2656 -f 2857//2656 2815//2377 2869//2377 -f 2857//2657 2869//2333 2861//2657 -f 2861//2657 2869//2333 2870//2333 -f 2861//2579 2870//2579 2865//2579 -f 2865//2579 2870//2579 2871//2579 -f 2872//2658 2873//2658 2874//2658 -f 2819//2659 2875//2659 2818//2659 -f 2818//2659 2875//2659 2876//2659 -f 2818//2660 2876//2660 2817//2660 -f 2817//2660 2876//2660 2877//2660 -f 2817//2661 2877//2661 2816//2662 -f 2816//2662 2877//2661 2878//2663 -f 2816//2664 2878//2664 2815//2665 -f 2815//2665 2878//2664 2869//2665 -f 2875//2666 2872//2666 2876//2666 -f 2876//2667 2872//2667 2874//2667 -f 2876//2668 2874//2668 2877//2669 -f 2877//2669 2874//2668 2879//2669 -f 2877//2670 2879//2671 2878//2671 -f 2878//2671 2879//2671 2880//2671 -f 2878//2672 2880//2672 2869//2673 -f 2869//2673 2880//2672 2870//2673 -f 2873//2674 2881//2674 2874//2675 -f 2874//2675 2881//2674 2882//2675 -f 2874//2676 2882//2676 2879//2676 -f 2879//2676 2882//2676 2883//2677 -f 2879//2678 2883//2678 2880//2679 -f 2880//2679 2883//2678 2884//2680 -f 2880//2681 2884//2681 2870//2681 -f 2870//2681 2884//2681 2871//2681 -f 2819//2682 2820//2682 2828//2682 -f 2819//2683 2828//2683 2875//2683 -f 2875//2684 2828//2684 2830//2684 -f 2875//2685 2830//2685 2872//2685 -f 2872//2686 2830//2686 2831//2686 -f 2872//2687 2831//2687 2873//2687 -f 2873//2688 2831//2688 2841//2688 -f 2873//2689 2841//2689 2881//2689 -f 2885//2690 2886//2690 2887//2690 -f 2887//2691 2886//2691 2888//2691 -f 2887//2692 2888//2692 2889//2692 -f 2889//2693 2888//2693 2890//2693 -f 2889//2694 2890//2694 2891//2694 -f 2891//2695 2890//2695 2892//2695 -f 2891//2696 2892//2696 2893//2696 -f 2893//2697 2892//2697 2894//2697 -f 2893//2698 2894//2698 2895//2698 -f 2896//2699 2897//2699 2898//2699 -f 2896//2700 2898//2700 2885//2700 -f 2885//2701 2898//2701 2899//2701 -f 2885//2702 2899//2702 2886//2702 -f 2900//2703 2901//2703 2902//2703 -f 2903//2704 2904//2704 2905//2704 -f 2900//2703 2902//2703 2906//2703 -f 2907//2705 2903//2705 2908//2704 -f 2908//2704 2903//2705 2905//2706 -f 2908//2707 2905//2707 2909//2707 -f 2909//2707 2905//2707 2910//2707 -f 2909//2708 2910//2709 2911//2708 -f 2911//2708 2910//2709 2912//2710 -f 2911//2711 2912//2712 2913//2712 -f 2913//2712 2912//2712 2914//2713 -f 2913//2714 2914//2715 2915//2714 -f 2915//2714 2914//2715 2916//2716 -f 2915//2717 2916//2718 2902//2719 -f 2902//2719 2916//2718 2917//2720 -f 2902//2721 2917//2721 2906//2721 -f 2918//2722 2919//2723 2920//2724 -f 2921//2724 2922//2724 2923//2724 -f 2923//2724 2922//2724 2924//2724 -f 2923//2724 2924//2724 2925//2724 -f 2925//2724 2924//2724 2926//2724 -f 2926//2724 2924//2724 2927//2724 -f 2926//2724 2927//2724 2928//2725 -f 2929//2726 2920//2724 2930//2722 -f 2931//2724 2932//2724 2933//2724 -f 2933//2724 2932//2724 2934//2724 -f 2930//2722 2935//2727 2929//2726 -f 2929//2726 2935//2727 2936//2724 -f 2929//2722 2936//2724 2937//2724 -f 2937//2724 2936//2724 2938//2728 -f 2939//2729 2940//2729 2929//2726 -f 2929//2726 2940//2729 2941//2724 -f 2929//2726 2941//2724 2920//2724 -f 2920//2724 2941//2724 2942//2728 -f 2920//2724 2942//2728 2918//2722 -f 2943//2724 2944//2724 2945//2724 -f 2945//2724 2944//2724 2946//2724 -f 2945//2724 2946//2724 2947//2724 -f 2947//2724 2946//2724 2933//2724 -f 2947//2724 2933//2724 2948//2724 -f 2934//2724 2949//2724 2933//2724 -f 2933//2724 2949//2724 2950//2724 -f 2933//2724 2950//2724 2948//2724 -f 2948//2724 2950//2724 2951//2730 -f 2948//2730 2951//2724 2927//2724 -f 2927//2724 2951//2724 2952//2724 -f 2927//2724 2952//2724 2928//2725 -f 2933//2724 2953//2724 2931//2724 -f 2931//2724 2953//2724 2954//2724 -f 2931//2724 2954//2724 2955//2724 -f 2955//2724 2954//2724 2956//2724 -f 2955//2724 2956//2724 2957//2724 -f 2957//2724 2956//2724 2958//2724 -f 2957//2724 2958//2724 2959//2725 -f 2939//2729 2943//2724 2940//2729 -f 2940//2729 2943//2724 2945//2724 -f 2940//2729 2945//2724 2960//2729 -f 2960//2729 2945//2724 2961//2725 -f 2960//2729 2961//2725 2962//2725 -f 2962//2725 2961//2725 2963//2729 -f 2964//2725 2957//2724 2965//2724 -f 2965//2724 2957//2724 2959//2725 -f 2965//2724 2959//2725 2966//2731 -f 2966//2731 2959//2725 2967//2724 -f 2933//2732 2906//2732 2953//2732 -f 2947//2733 2948//2733 2968//2733 -f 2969//2734 2970//2734 2934//2735 -f 2934//2736 2970//2736 2949//2736 -f 2971//2737 2950//2737 2972//2737 -f 2973//2738 2951//2739 2950//2740 -f 2974//2741 2943//2741 2975//2741 -f 2975//2742 2943//2742 2939//2742 -f 2975//2743 2939//2743 2929//2743 -f 2976//2744 2977//2745 2978//2746 -f 2978//2746 2979//2747 2976//2744 -f 2976//2748 2979//2748 2980//2748 -f 2976//2749 2980//2749 2981//2749 -f 2981//2750 2982//2750 2976//2750 -f 2976//2751 2982//2751 2983//2751 -f 2976//2752 2983//2752 2984//2752 -f 2985//2753 2943//2753 2983//2753 -f 2983//2754 2943//2754 2974//2754 -f 2983//2755 2974//2755 2984//2755 -f 2986//2756 2987//2756 2988//2756 -f 2988//2757 2989//2757 2986//2757 -f 2986//2758 2989//2759 2899//2760 -f 2986//2758 2899//2760 2898//2761 -f 2990//2762 2894//2762 2991//2762 -f 2991//2763 2894//2763 2892//2763 -f 2991//2764 2892//2764 2992//2764 -f 2992//2765 2892//2765 2890//2765 -f 2992//2766 2890//2766 2993//2766 -f 2993//2767 2890//2767 2888//2767 -f 2993//2768 2888//2769 2989//2770 -f 2989//2770 2888//2769 2886//2771 -f 2989//2772 2886//2772 2899//2772 -f 2990//2773 2994//2773 2894//2773 -f 2894//2774 2994//2774 2995//2774 -f 2894//2775 2995//2775 2996//2775 -f 2997//2776 2998//2776 2977//2776 -f 2977//2777 2998//2777 2999//2777 -f 2977//2778 2999//2778 2978//2778 -f 2997//2779 3000//2779 2962//2779 -f 2962//2780 3000//2780 3001//2780 -f 2962//2781 3001//2781 2960//2781 -f 2960//2782 3001//2782 3002//2782 -f 2960//2783 3002//2783 2940//2783 -f 3003//2784 2971//2784 3004//2784 -f 3004//2785 2971//2785 3005//2785 -f 3004//2786 3005//2786 3006//2786 -f 3006//2787 3005//2787 3007//2787 -f 3006//2788 3007//2788 3008//2788 -f 3003//2789 3009//2789 2971//2789 -f 2971//2790 3009//2790 3010//2790 -f 2971//2791 3010//2791 3011//2791 -f 3012//2792 3013//2793 3014//2794 -f 3014//2795 3013//2795 3015//2795 -f 3015//2796 3016//2796 3014//2796 -f 3014//2797 3016//2797 3017//2797 -f 3014//2798 3017//2798 3018//2798 -f 2973//2738 2950//2740 3019//2799 -f 3019//2800 2950//2800 2971//2800 -f 3019//2801 2971//2802 3017//2803 -f 3017//2803 2971//2802 3011//2804 -f 3017//2805 3011//2805 3018//2805 -f 3007//2806 3020//2806 3008//2806 -f 3008//2807 3020//2807 3021//2807 -f 3008//2808 3021//2808 3022//2808 -f 3022//2809 3021//2809 3023//2809 -f 3022//2810 3023//2810 3024//2810 -f 3024//2811 3023//2811 3025//2811 -f 3024//2812 3025//2812 3026//2812 -f 3026//2813 3025//2813 3027//2813 -f 3026//2814 3027//2814 3028//2814 -f 3028//2815 3027//2815 2986//2815 -f 3028//2816 2986//2816 3029//2816 -f 3029//2817 2986//2817 2898//2817 -f 2961//2818 3030//2818 2963//2818 -f 2963//2819 3030//2819 2895//2819 -f 2963//2820 2895//2820 2962//2820 -f 2962//2821 2895//2821 2894//2821 -f 2962//2822 2894//2822 2997//2822 -f 2997//2823 2894//2823 2996//2823 -f 2997//2824 2996//2824 2998//2824 -f 2906//2825 2933//2826 2900//2826 -f 2900//2826 2933//2826 2946//2825 -f 2900//2826 2946//2825 3031//2825 -f 3032//2827 3033//2827 2944//2827 -f 2944//2828 3033//2828 3034//2828 -f 2944//2829 3034//2829 2946//2829 -f 2946//2825 3034//2830 3035//2825 -f 2946//2825 3035//2825 3031//2825 -f 3032//2831 2944//2831 3036//2831 -f 3036//2832 2944//2832 2943//2832 -f 3036//2833 2943//2833 2986//2833 -f 2986//2834 2943//2834 2985//2834 -f 2986//2835 2985//2835 2987//2835 -f 2949//2836 2970//2836 2950//2836 -f 2950//2837 2970//2837 3037//2837 -f 2950//2838 3037//2839 2972//2840 -f 2932//2841 2904//2841 2934//2841 -f 2934//2735 2904//2842 2903//2843 -f 2934//2735 2903//2843 2969//2734 -f 2947//2844 2968//2844 2945//2844 -f 3014//2794 3030//2845 3012//2792 -f 3012//2846 3030//2846 2961//2846 -f 3012//2847 2961//2847 3038//2847 -f 3038//2848 2961//2848 2945//2848 -f 3038//2849 2945//2849 3039//2849 -f 3039//2850 2945//2850 2968//2850 -f 3040//2851 2901//2851 3041//2851 -f 3041//2852 2901//2852 2900//2852 -f 3042//2853 3043//2853 3040//2853 -f 3044//2854 2907//2854 3045//2854 -f 2900//2855 3031//2855 3041//2855 -f 3041//2855 3031//2855 3035//2856 -f 3041//2855 3035//2856 3046//2857 -f 3035//2856 3034//2858 3046//2857 -f 3046//2857 3034//2858 3033//2859 -f 3046//2857 3033//2859 3047//2860 -f 3033//2861 3032//2861 3047//2861 -f 3047//2862 3032//2862 3036//2862 -f 3047//2863 3036//2863 3048//2863 -f 3048//2864 3036//2864 2986//2864 -f 3048//2865 2986//2865 3049//2865 -f 3049//2866 2986//2866 3027//2866 -f 3049//2867 3027//2867 3050//2867 -f 3050//2868 3027//2868 3025//2868 -f 3050//2869 3025//2869 3051//2869 -f 3051//2870 3025//2870 3023//2870 -f 3051//2871 3023//2871 3052//2871 -f 3052//2872 3023//2873 3021//2874 -f 3052//2872 3021//2874 3053//2875 -f 3053//2876 3021//2877 3020//2878 -f 3053//2876 3020//2878 3054//2879 -f 3054//2880 3020//2880 3007//2880 -f 3054//2881 3007//2881 3055//2881 -f 3055//2882 3007//2882 3005//2882 -f 3055//2883 3005//2883 3056//2883 -f 3056//2884 3005//2884 2971//2884 -f 3056//2885 2971//2885 3057//2885 -f 3057//2886 2971//2886 2972//2886 -f 3037//2839 3044//2887 2972//2840 -f 2972//2888 3044//2888 3058//2888 -f 2972//2889 3058//2889 3057//2889 -f 2903//2890 2907//2890 2969//2890 -f 2969//2891 2907//2892 3044//2893 -f 2969//2891 3044//2893 2970//2894 -f 2970//2894 3044//2893 3037//2895 -f 3040//2896 3041//2896 3042//2896 -f 3042//2897 3041//2897 3046//2897 -f 3042//2897 3046//2897 3059//2898 -f 3059//2898 3046//2897 3047//2899 -f 3059//2900 3047//2900 3060//2900 -f 3060//2901 3047//2901 3048//2901 -f 3060//2902 3048//2902 3061//2902 -f 3061//2903 3048//2904 3049//2905 -f 3061//2903 3049//2905 3062//2906 -f 3062//2907 3049//2907 3050//2907 -f 3062//2908 3050//2908 3063//2908 -f 3063//2909 3050//2909 3051//2909 -f 3063//2910 3051//2910 3064//2910 -f 3064//2911 3051//2912 3052//2913 -f 3064//2911 3052//2913 3065//2914 -f 3065//2915 3052//2916 3053//2917 -f 3065//2915 3053//2917 3066//2918 -f 3066//2919 3053//2920 3054//2921 -f 3066//2919 3054//2921 3067//2922 -f 3067//2923 3054//2923 3055//2923 -f 3067//2924 3055//2924 3068//2924 -f 3068//2925 3055//2925 3056//2925 -f 3068//2926 3056//2927 3069//2928 -f 3069//2928 3056//2927 3057//2929 -f 3069//2930 3057//2931 3070//2932 -f 3070//2932 3057//2931 3058//2933 -f 3070//2934 3058//2934 3071//2934 -f 3071//2935 3058//2935 3044//2935 -f 3071//2936 3044//2936 3072//2936 -f 3072//2937 3044//2937 3045//2937 -f 3072//2938 3045//2938 3073//2938 -f 3074//2939 3075//2939 3076//2939 -f 3077//2940 3078//2940 3079//2940 -f 3079//2941 3078//2941 3080//2941 -f 3079//2942 3080//2942 3081//2942 -f 3081//2943 3080//2943 3074//2943 -f 3081//2944 3074//2944 3082//2944 -f 3082//2945 3074//2945 3076//2945 -f 3078//193 3083//193 3080//193 -f 3080//193 3083//193 3084//193 -f 3085//2946 3086//2946 3087//2946 -f 3083//2947 3088//2947 3084//2947 -f 3084//2948 3088//2948 3089//2948 -f 3084//2949 3089//2949 3087//2949 -f 3087//2950 3089//2950 3090//2950 -f 3087//2951 3090//2951 3085//2951 -f 3086//2952 3085//2952 3091//2952 -f 3091//2953 3085//2954 3092//2954 -f 3091//2953 3092//2954 3093//2953 -f 3093//2955 3092//2955 3094//2955 -f 3093//2955 3094//2955 3095//2955 -f 3096//2956 3097//2957 3098//2958 -f 3083//2959 3096//2960 3099//2961 -f 3096//2956 3098//2958 3099//2962 -f 3099//2963 3098//2964 3100//2965 -f 3099//2963 3100//2965 3101//2966 -f 3101//2967 3100//2967 3102//2967 -f 3101//2968 3102//2968 3103//2968 -f 3103//2969 3102//2969 3094//2969 -f 3103//2970 3094//2970 3092//2970 -f 3083//2959 3099//2961 3088//2971 -f 3088//2972 3099//2972 3101//2972 -f 3088//2973 3101//2973 3089//2973 -f 3089//2974 3101//2974 3103//2974 -f 3089//2975 3103//2975 3090//2975 -f 3090//2976 3103//2976 3092//2976 -f 3090//2977 3092//2977 3085//2977 -f 3083//2978 3078//2978 3096//2978 -f 3096//2978 3078//2978 3104//2978 -f 3096//2956 3104//2979 3097//2957 -f 3097//2957 3104//2979 3105//2979 -f 3106//2980 3107//2981 3108//2982 -f 3082//2983 3076//2983 3109//2983 -f 3109//2984 3076//2985 3106//2986 -f 3106//2987 3108//2987 3109//2987 -f 3109//2988 3108//2988 3110//2988 -f 3109//2989 3110//2989 3111//2989 -f 3111//2990 3110//2990 3112//2990 -f 3111//2991 3112//2991 3113//2991 -f 3113//2992 3112//2993 3105//2994 -f 3113//2992 3105//2994 3104//2995 -f 3082//2996 3109//2997 3081//2998 -f 3081//2998 3109//2997 3111//2999 -f 3081//3000 3111//3000 3079//3000 -f 3079//3001 3111//3001 3113//3001 -f 3079//3002 3113//3002 3077//3002 -f 3077//3003 3113//3003 3104//3003 -f 3077//3004 3104//3004 3078//3004 -f 3114//3005 3107//2981 3106//2980 -f 3114//3005 3106//2980 3115//3005 -f 3115//3006 3106//2986 3076//2985 -f 3115//3006 3076//2985 3116//3006 -f 3076//3007 3075//3007 3116//3007 -f 3043//8 3114//8 3115//8 -f 3045//8 2907//8 2908//8 -f 3091//8 3093//8 2908//8 -f 3045//8 2908//8 3073//8 -f 3073//8 2908//8 3093//8 -f 3073//8 3093//8 3095//8 -f 3043//8 3115//8 3040//8 -f 3040//8 3115//8 3116//8 -f 3040//8 3116//8 2901//8 -f 2901//8 3116//8 2902//8 -f 2902//8 3116//8 3075//8 -f 2902//8 3075//8 2915//8 -f 2915//8 3075//8 3074//8 -f 2915//8 3074//8 2913//8 -f 2913//8 3074//8 3080//8 -f 2913//8 3080//8 2911//8 -f 2911//8 3080//8 3084//8 -f 2911//8 3084//8 2909//8 -f 2909//8 3084//8 3087//8 -f 2909//8 3087//8 2908//8 -f 2908//8 3087//8 3086//8 -f 2908//8 3086//8 3091//8 -f 3072//36 3073//36 3095//36 -f 3117//36 3110//36 2844//36 -f 2844//36 3110//36 3108//36 -f 3065//36 2881//36 3064//36 -f 3064//36 2881//36 2841//36 -f 3064//36 2841//36 3063//36 -f 3095//36 3094//36 3118//36 -f 3118//36 3094//36 3102//36 -f 3118//36 3102//36 3119//36 -f 2871//36 2884//36 3068//36 -f 3097//36 3117//36 3120//3008 -f 3097//36 3105//36 3117//36 -f 3117//36 3105//36 3112//36 -f 3117//36 3112//36 3110//36 -f 3068//36 3069//36 2871//36 -f 2871//36 3069//36 3070//36 -f 2871//36 3070//36 3071//36 -f 2851//36 3121//36 2852//36 -f 2852//36 3121//36 3122//36 -f 2852//36 3122//36 2853//36 -f 2853//36 3122//36 3123//36 -f 2853//36 3123//36 2844//36 -f 2844//36 3123//36 3124//36 -f 2844//36 3124//36 3117//36 -f 3059//36 3060//36 2838//36 -f 3060//36 3061//36 2838//36 -f 2838//36 3061//36 3062//36 -f 2838//36 3062//36 2839//36 -f 2839//36 3062//36 3063//36 -f 2839//36 3063//36 2840//36 -f 2840//36 3063//36 2841//36 -f 3125//36 2866//36 3126//36 -f 3126//36 2866//36 2865//36 -f 3126//36 2865//36 3127//36 -f 3065//36 3066//36 2881//36 -f 2881//36 3066//36 3067//36 -f 2881//36 3067//36 2882//36 -f 2882//36 3067//36 3068//36 -f 2882//36 3068//36 2883//36 -f 2883//36 3068//36 2884//36 -f 3071//36 3072//36 2871//36 -f 2871//36 3072//36 3095//36 -f 2871//36 3095//36 2865//36 -f 2867//36 2866//36 2868//36 -f 2868//36 2866//36 3125//36 -f 2868//36 3125//36 2856//36 -f 2856//36 3125//36 3128//36 -f 2856//36 3128//36 2851//36 -f 2851//36 3128//36 3129//36 -f 2851//36 3129//36 3121//36 -f 3114//36 3043//36 3042//36 -f 3102//36 3100//36 3119//36 -f 3119//36 3100//36 3098//36 -f 3119//36 3098//36 3130//36 -f 3130//36 3098//36 3097//36 -f 3130//36 3097//36 3131//36 -f 3131//36 3097//36 3120//3008 -f 3118//36 3132//36 3095//36 -f 3095//36 3132//36 3133//36 -f 3095//36 3133//36 2865//36 -f 2865//36 3133//36 3134//36 -f 2865//36 3134//36 3127//36 -f 3108//36 3107//36 2844//36 -f 2844//36 3107//36 3114//36 -f 2844//36 3114//36 2838//36 -f 2838//36 3114//36 3042//36 -f 2838//36 3042//36 3059//36 -f 3135//3009 3123//3009 3122//3009 -f 3135//3009 3122//3009 3136//3010 -f 3136//3011 3122//3011 3121//3011 -f 3136//3011 3121//3011 3137//3011 -f 3137//3012 3121//3013 3129//3012 -f 3137//3012 3129//3012 3138//3012 -f 3138//3014 3129//3014 3139//3014 -f 3139//3014 3129//3014 3128//3014 -f 3139//3015 3128//3015 3125//3015 -f 3139//3015 3125//3015 3140//3015 -f 3140//3016 3125//3016 3126//3016 -f 3140//3016 3126//3016 3141//3016 -f 3141//3017 3126//3017 3127//3017 -f 3141//3017 3127//3017 3142//3017 -f 3142//3018 3127//3018 3134//3018 -f 3142//3018 3134//3018 3143//3018 -f 3133//2333 3144//2333 3134//2333 -f 3134//2333 3144//2333 3143//2333 -f 3144//3019 3133//3019 3132//3019 -f 3144//3019 3132//3019 3145//3019 -f 3145//3020 3132//3020 3118//3020 -f 3145//3020 3118//3020 3146//3020 -f 3146//3021 3118//3022 3119//3021 -f 3146//3021 3119//3021 3147//3021 -f 3130//3023 3148//3023 3119//3023 -f 3119//3023 3148//3023 3147//3023 -f 3148//3024 3130//3024 3131//3024 -f 3148//3024 3131//3024 3149//3024 -f 3149//3025 3131//3025 3120//3025 -f 3149//3025 3120//3025 3150//3025 -f 3150//3026 3120//3026 3117//3026 -f 3150//3026 3117//3026 3151//3027 -f 3151//3028 3117//3028 3124//3028 -f 3151//3028 3124//3028 3152//3029 -f 3123//2016 3135//2016 3124//2016 -f 3124//2016 3135//2016 3152//2016 -f 3153//21 3154//21 3155//21 -f 3156//21 3157//21 3155//21 -f 3155//21 3157//21 3158//21 -f 3155//21 3158//21 3153//21 -f 3159//20 3160//20 3161//20 -f 3162//20 3163//20 3161//20 -f 3161//20 3163//20 3164//20 -f 3161//20 3164//20 3159//20 -f 3165//2333 3163//2333 3166//2333 -f 3166//2333 3163//2333 3162//2333 -f 3166//3030 3162//3030 3167//3030 -f 3167//3031 3162//3031 3168//3031 -f 3167//3032 3168//3032 3169//3032 -f 3169//3033 3168//3033 3170//3033 -f 3169//3034 3170//3034 3171//3034 -f 3171//3035 3170//3035 3172//3035 -f 3171//3036 3172//3036 3173//3036 -f 3173//3037 3172//3037 3174//3037 -f 3173//3038 3174//3038 3175//3038 -f 3175//3039 3174//3039 3176//3039 -f 3175//3040 3176//3040 3177//3040 -f 3177//3041 3176//3041 3178//3041 -f 3177//3042 3178//3042 3179//3042 -f 3179//3014 3178//3014 3180//3014 -f 3180//3014 3178//3014 3181//3014 -f 3182//3043 3183//3043 3184//3043 -f 3181//3043 3178//3043 3184//3043 -f 3184//3043 3178//3043 3185//3043 -f 3184//3043 3185//3043 3182//3043 -f 3159//2437 3154//2437 3160//3044 -f 3160//3044 3154//2437 3153//3044 -f 3186//3045 3187//3046 3188//3047 -f 3188//3047 3187//3046 3189//3048 -f 3188//3047 3189//3048 3190//3049 -f 3190//3049 3189//3048 3154//3050 -f 3190//3051 3154//2437 3191//2354 -f 3191//2354 3154//2437 3159//2437 -f 3191//3052 3159//2354 3192//3053 -f 3192//3053 3159//2354 3193//3054 -f 3192//3053 3193//3054 3194//3055 -f 3194//3055 3193//3054 3195//3056 -f 3196//3057 3197//3058 3198//3059 -f 3198//3059 3197//3058 3199//3060 -f 3198//3059 3199//3060 3182//3061 -f 3182//3061 3199//3060 3160//3062 -f 3182//3063 3160//3044 3183//3064 -f 3183//3064 3160//3044 3153//3044 -f 3183//3065 3153//3066 3200//3067 -f 3200//3067 3153//3066 3201//3068 -f 3200//3067 3201//3068 3202//2486 -f 3202//2486 3201//3068 3203//3069 -f 3190//3070 3191//3070 3204//3070 -f 3205//3070 3206//3070 3204//3070 -f 3204//3070 3206//3070 3207//3070 -f 3204//3070 3207//3070 3190//3070 -f 3205//3023 3208//3023 3206//3023 -f 3206//3023 3208//3023 3209//3023 -f 3208//3071 3205//3071 3210//3071 -f 3210//3072 3205//3072 3211//3072 -f 3210//3073 3211//3073 3212//3073 -f 3212//3074 3211//3074 3213//3074 -f 3212//3075 3213//3075 3214//3075 -f 3214//3076 3213//3076 3215//3076 -f 3214//3077 3215//3077 3216//3077 -f 3216//3078 3215//3078 3217//3078 -f 3216//3079 3217//3079 3218//3079 -f 3218//3080 3217//3080 3219//3080 -f 3218//3081 3219//3081 3220//3081 -f 3220//3082 3219//3082 3163//3082 -f 3220//3083 3163//3083 3165//3083 -f 3143//36 3221//36 3142//36 -f 3142//36 3221//36 3222//36 -f 3142//36 3222//36 3141//36 -f 3141//36 3222//36 3140//36 -f 3140//36 3222//36 3223//36 -f 3140//36 3223//36 3139//36 -f 3139//36 3223//36 3209//3084 -f 3139//36 3209//36 3138//36 -f 3209//36 3208//36 3138//36 -f 3138//36 3208//36 3210//36 -f 3138//36 3210//36 3137//36 -f 3137//36 3210//36 3212//36 -f 3137//36 3212//36 3136//36 -f 3147//36 3224//36 3146//36 -f 3146//36 3224//36 3225//36 -f 3146//36 3225//36 3145//36 -f 3218//36 3135//36 3216//36 -f 3216//36 3135//36 3136//36 -f 3216//36 3136//36 3214//36 -f 3214//36 3136//36 3212//36 -f 3175//36 3148//36 3173//36 -f 3173//36 3148//36 3149//36 -f 3173//36 3149//36 3171//36 -f 3171//36 3149//36 3150//36 -f 3171//36 3150//36 3169//36 -f 3169//36 3150//36 3151//36 -f 3169//36 3151//36 3167//36 -f 3167//36 3151//36 3152//36 -f 3226//36 3144//36 3227//36 -f 3227//36 3144//36 3145//36 -f 3227//36 3145//36 3228//36 -f 3228//36 3145//36 3225//36 -f 3218//36 3220//36 3135//36 -f 3135//36 3220//36 3165//36 -f 3135//36 3165//36 3152//36 -f 3152//36 3165//36 3166//36 -f 3152//36 3166//36 3167//36 -f 3175//36 3177//36 3148//36 -f 3148//36 3177//36 3179//36 -f 3148//36 3179//36 3147//36 -f 3147//36 3179//36 3180//36 -f 3147//36 3180//36 3224//36 -f 3226//36 3229//36 3144//36 -f 3144//36 3229//36 3230//36 -f 3144//36 3230//36 3143//36 -f 3143//36 3230//36 3231//36 -f 3143//36 3231//36 3221//36 -f 3230//2016 3157//2016 3231//2016 -f 3231//2016 3157//2016 3156//2016 -f 3180//3085 3181//3085 3224//3085 -f 3224//3086 3181//3086 3232//3086 -f 3224//3087 3232//3087 3225//3087 -f 3225//3088 3232//3088 3233//3088 -f 3225//3089 3233//3089 3228//3089 -f 3228//3090 3233//3090 3234//3090 -f 3228//3091 3234//3091 3227//3091 -f 3227//3092 3234//3092 3235//3092 -f 3227//3093 3235//3093 3226//3093 -f 3226//3094 3235//3094 3236//3094 -f 3226//3095 3236//3095 3229//3095 -f 3229//3096 3236//3096 3157//3096 -f 3229//3097 3157//3097 3230//3097 -f 3237//504 3238//504 3239//504 -f 3237//504 3239//504 3240//504 -f 3240//504 3239//504 3241//504 -f 3240//504 3241//504 3242//504 -f 3242//504 3241//504 3243//504 -f 3242//504 3243//504 3244//504 -f 3244//504 3245//504 3242//504 -f 3242//504 3245//504 3246//504 -f 3242//504 3246//504 3247//504 -f 3248//504 3249//504 3250//504 -f 3250//504 3249//504 3251//504 -f 3250//504 3251//504 3252//504 -f 3247//504 3253//504 3242//504 -f 3242//504 3253//504 3254//504 -f 3242//504 3254//504 3255//504 -f 3255//504 3254//504 3256//504 -f 3255//504 3256//504 3257//504 -f 3257//504 3258//504 3255//504 -f 3255//504 3258//504 3250//504 -f 3255//504 3250//504 3259//504 -f 3259//504 3250//504 3252//504 -f 3260//3098 3261//3098 3262//3098 -f 3263//3099 3264//3099 3265//3099 -f 3266//3100 3267//3100 3268//3100 -f 3269//3101 3270//3101 3271//3101 -f 3271//3102 3270//3102 3272//3102 -f 3260//3103 3262//3103 3273//3103 -f 3274//3104 3275//3104 3276//3104 -f 3276//3105 3275//3105 3273//3105 -f 3277//3106 1012//3106 3278//3106 -f 3273//3107 3262//3107 3276//3107 -f 3276//3108 3262//3108 3279//3109 -f 3276//3108 3279//3109 3280//3109 -f 3280//3110 3279//3111 3281//3110 -f 3280//3110 3281//3110 3282//3110 -f 3282//3112 3281//3112 3283//3113 -f 3282//3112 3283//3113 3284//3113 -f 3284//3114 3283//3114 3285//3114 -f 3284//3114 3285//3114 3286//3114 -f 3286//3115 3285//3115 3287//3116 -f 3286//3115 3287//3116 3288//3116 -f 3288//3117 3287//3117 3289//3117 -f 3288//3117 3289//3117 3290//3117 -f 3290//3118 3289//3119 3291//3118 -f 3290//3118 3291//3118 3292//3118 -f 3292//3120 3291//3121 3293//3122 -f 3292//3120 3293//3122 3294//3122 -f 3294//3123 3293//3123 3295//3124 -f 3294//3123 3295//3124 3296//3125 -f 3296//3125 3295//3124 3297//3126 -f 3296//3125 3297//3126 3298//3127 -f 3298//3127 3297//3126 3299//3128 -f 3298//3127 3299//3128 3300//3129 -f 3300//3129 3299//3128 3301//3130 -f 3300//3129 3301//3130 3302//3131 -f 3302//3131 3301//3130 3303//3132 -f 3302//3131 3303//3132 3304//3133 -f 3304//3133 3303//3132 3305//3134 -f 3304//3133 3305//3134 3306//3134 -f 3306//3135 3305//3135 3307//3136 -f 3306//3135 3307//3136 3308//3136 -f 3308//3137 3307//3138 3309//3139 -f 3308//3137 3309//3139 3310//3140 -f 3310//3141 3309//3142 3311//3143 -f 3310//3141 3311//3143 3312//3144 -f 3312//3144 3311//3143 3313//3144 -f 3312//3144 3313//3144 3314//3145 -f 3314//3145 3313//3144 3315//3146 -f 3314//3145 3315//3146 3316//3147 -f 3316//3148 3315//3149 3271//3150 -f 3316//3148 3271//3150 3317//3151 -f 3317//3151 3271//3150 3272//3152 -f 3317//3153 3272//3153 3318//3153 -f 3318//3154 3263//3154 3317//3154 -f 3317//3155 3263//3155 3265//3155 -f 3317//3156 3265//3156 3316//3156 -f 3316//3156 3265//3156 3319//3157 -f 3316//3158 3319//3159 3314//3160 -f 3314//3160 3319//3159 3320//3160 -f 3314//3161 3320//3162 3312//3161 -f 3312//3161 3320//3162 3321//3163 -f 3312//3164 3321//3164 3310//3165 -f 3310//3165 3321//3164 3322//3166 -f 3310//3167 3322//3167 3308//3168 -f 3308//3168 3322//3167 3323//3168 -f 3308//3169 3323//3170 3306//3171 -f 3306//3171 3323//3170 3324//3171 -f 3306//3172 3324//3172 3304//3173 -f 3304//3173 3324//3172 3325//3173 -f 3304//3174 3325//3175 3302//3176 -f 3302//3176 3325//3175 3326//3177 -f 3302//3178 3326//3179 3300//3180 -f 3300//3180 3326//3179 3327//3181 -f 3300//3182 3327//3183 3298//3184 -f 3298//3184 3327//3183 3328//3184 -f 3298//3185 3328//3186 3296//3185 -f 3296//3185 3328//3186 3329//3186 -f 3296//3187 3329//3187 3294//3188 -f 3294//3188 3329//3187 3330//3188 -f 3294//3189 3330//3189 3292//3189 -f 3292//3189 3330//3189 3331//3190 -f 3292//3191 3331//3192 3290//3193 -f 3290//3193 3331//3192 3332//3193 -f 3290//3194 3332//3194 3288//3194 -f 3288//3194 3332//3194 3333//3194 -f 3288//3195 3333//3196 3286//3196 -f 3286//3196 3333//3196 3334//3197 -f 3286//3198 3334//3199 3284//3199 -f 3284//3199 3334//3199 3335//3199 -f 3284//3200 3335//3201 3282//3202 -f 3282//3202 3335//3201 3336//3202 -f 3282//3203 3336//3203 3280//3204 -f 3280//3204 3336//3203 3337//3204 -f 3280//3205 3337//3206 3276//3207 -f 3276//3207 3337//3206 3338//3208 -f 3276//3207 3338//3208 3274//3209 -f 3274//3210 3338//3210 3339//3210 -f 3264//3211 3267//3211 3265//3211 -f 3265//3212 3267//3212 3266//3212 -f 3265//3213 3266//3214 3319//3214 -f 3319//3214 3266//3214 3340//3214 -f 3319//3215 3340//3216 3320//3216 -f 3320//3216 3340//3216 3341//3217 -f 3320//3218 3341//3219 3321//3220 -f 3321//3220 3341//3219 3342//3221 -f 3321//3222 3342//3222 3322//3223 -f 3322//3223 3342//3222 3343//3224 -f 3322//3225 3343//3225 3323//3226 -f 3323//3226 3343//3225 3344//3226 -f 3323//3227 3344//3228 3324//3229 -f 3324//3229 3344//3228 3345//3230 -f 3324//3231 3345//3231 3325//3232 -f 3325//3232 3345//3231 3346//3232 -f 3325//3233 3346//3234 3326//3235 -f 3326//3235 3346//3234 3347//3236 -f 3326//3237 3347//3237 3327//3238 -f 3327//3238 3347//3237 3348//3239 -f 3327//3240 3348//3241 3328//3242 -f 3328//3242 3348//3241 3349//3243 -f 3328//3244 3349//3245 3329//3246 -f 3329//3246 3349//3245 3350//3247 -f 3329//3248 3350//3248 3330//3249 -f 3330//3249 3350//3248 3351//3250 -f 3330//3251 3351//3251 3331//3251 -f 3331//3251 3351//3251 3352//3251 -f 3331//3252 3352//3253 3332//3254 -f 3332//3254 3352//3253 3353//3255 -f 3332//3256 3353//3256 3333//3257 -f 3333//3257 3353//3256 3354//3258 -f 3333//3259 3354//3259 3334//3260 -f 3334//3260 3354//3259 3355//3261 -f 3334//3262 3355//3262 3335//3262 -f 3335//3262 3355//3262 3356//3262 -f 3335//3263 3356//3264 3336//3265 -f 3336//3265 3356//3264 3357//3266 -f 3336//3267 3357//3268 3337//3269 -f 3337//3269 3357//3268 3358//3270 -f 3337//3271 3358//3272 3338//3273 -f 3338//3273 3358//3272 3359//3274 -f 3338//3273 3359//3274 3339//3275 -f 3268//3276 3360//3276 3266//3276 -f 3266//3277 3360//3277 3361//3277 -f 3266//3278 3361//3278 3340//3278 -f 3340//3279 3361//3279 3362//3279 -f 3340//3280 3362//3280 3341//3280 -f 3341//3281 3362//3281 3363//3281 -f 3341//3282 3363//3282 3342//3282 -f 3342//3283 3363//3283 3364//3283 -f 3342//3283 3364//3283 3343//3283 -f 3343//3284 3364//3284 3365//3284 -f 3343//3284 3365//3284 3344//3284 -f 3344//3285 3365//3285 3366//3285 -f 3344//3286 3366//3286 3345//3286 -f 3345//3287 3366//3287 3367//3287 -f 3345//3288 3367//3288 3346//3288 -f 3346//3289 3367//3289 3368//3289 -f 3346//3290 3368//3290 3347//3290 -f 3347//3291 3368//3291 3369//3291 -f 3347//3292 3369//3292 3348//3292 -f 3348//3293 3369//3293 3370//3293 -f 3348//3294 3370//3294 3349//3294 -f 3349//3295 3370//3295 3371//3295 -f 3349//3296 3371//3296 3350//3296 -f 3350//3297 3371//3297 3372//3297 -f 3350//3298 3372//3298 3351//3298 -f 3351//3299 3372//3299 3373//3299 -f 3351//3300 3373//3300 3352//3300 -f 3352//3301 3373//3301 3374//3301 -f 3352//3302 3374//3302 3353//3302 -f 3353//3303 3374//3303 3375//3303 -f 3353//3304 3375//3304 3354//3304 -f 3354//3305 3375//3305 3376//3305 -f 3354//3306 3376//3306 3355//3306 -f 3355//3307 3376//3307 3377//3307 -f 3355//3308 3377//3308 3356//3308 -f 3356//3309 3377//3309 3378//3309 -f 3356//3310 3378//3310 3357//3310 -f 3357//3311 3378//3311 3379//3311 -f 3357//3312 3379//3312 3358//3312 -f 3358//3313 3379//3313 3277//3313 -f 3358//3314 3277//3314 3359//3314 -f 3359//3315 3277//3315 3278//3315 -f 3359//3316 3278//3316 3339//3316 -f 3380//3317 3381//3317 3382//3317 -f 3380//3318 3382//3318 3383//3318 -f 3384//3319 3385//3319 3386//3319 -f 3386//3320 3385//3320 3383//3320 -f 3387//3321 3388//3321 3389//3321 -f 3390//3322 3391//3322 3392//3322 -f 3392//3323 3391//3323 3393//3323 -f 3392//3324 3393//3324 3394//3324 -f 3395//3325 3396//3325 3397//3325 -f 3398//3326 3399//3326 3400//3326 -f 3400//3327 3399//3327 3401//3327 -f 3383//3328 3382//3329 3386//3330 -f 3386//3330 3382//3329 3402//3331 -f 3386//3330 3402//3331 3403//3332 -f 3403//3332 3402//3331 3404//3333 -f 3403//3332 3404//3333 3405//3334 -f 3405//3335 3404//3335 3406//3335 -f 3405//3335 3406//3335 3407//3335 -f 3407//3336 3406//3337 3408//3336 -f 3407//3336 3408//3336 3409//3336 -f 3409//3338 3408//3339 3410//3338 -f 3409//3338 3410//3338 3411//3340 -f 3411//3341 3410//3341 3412//3341 -f 3411//3341 3412//3341 3413//3341 -f 3413//3342 3412//3343 3414//3344 -f 3413//3342 3414//3344 3415//3345 -f 3415//3346 3414//3347 3416//3346 -f 3415//3346 3416//3346 3417//3346 -f 3417//3348 3416//3348 3418//3348 -f 3417//3348 3418//3348 3419//3349 -f 3419//3349 3418//3348 3420//3350 -f 3419//3349 3420//3350 3421//3351 -f 3421//3351 3420//3350 3422//3352 -f 3421//3351 3422//3352 3423//3352 -f 3423//3353 3422//3353 3424//3353 -f 3423//3353 3424//3353 3425//3353 -f 3425//3354 3424//3354 3426//3354 -f 3425//3354 3426//3354 3427//3354 -f 3427//3355 3426//3355 3428//3356 -f 3427//3355 3428//3356 3429//3356 -f 3429//3357 3428//3357 3430//3358 -f 3429//3357 3430//3358 3431//3358 -f 3431//3359 3430//3360 3432//3361 -f 3431//3359 3432//3361 3433//3362 -f 3433//3362 3432//3361 3434//3363 -f 3433//3362 3434//3363 3435//3364 -f 3435//3364 3434//3363 3436//3365 -f 3435//3364 3436//3365 3398//3365 -f 3398//3366 3436//3366 3437//3366 -f 3398//3367 3437//3367 3399//3367 -f 3401//3368 3395//3368 3400//3368 -f 3400//3369 3395//3369 3397//3369 -f 3400//3370 3397//3370 3398//3371 -f 3398//3371 3397//3370 3438//3372 -f 3398//3373 3438//3373 3435//3374 -f 3435//3374 3438//3373 3439//3374 -f 3435//3375 3439//3376 3433//3376 -f 3433//3376 3439//3376 3440//3377 -f 3433//3378 3440//3378 3431//3378 -f 3431//3378 3440//3378 3441//3378 -f 3431//3379 3441//3380 3429//3380 -f 3429//3380 3441//3380 3442//3380 -f 3429//3381 3442//3382 3427//3382 -f 3427//3382 3442//3382 3443//3382 -f 3427//3383 3443//3383 3425//3384 -f 3425//3384 3443//3383 3444//3385 -f 3425//3386 3444//3386 3423//3387 -f 3423//3387 3444//3386 3445//3387 -f 3423//3388 3445//3388 3421//3388 -f 3421//3388 3445//3388 3446//3388 -f 3421//3389 3446//3390 3419//3390 -f 3419//3390 3446//3390 3447//3391 -f 3419//3392 3447//3393 3417//3394 -f 3417//3394 3447//3393 3448//3394 -f 3417//3395 3448//3395 3415//3395 -f 3415//3395 3448//3395 3449//3395 -f 3415//3396 3449//3396 3413//3396 -f 3413//3396 3449//3396 3450//3396 -f 3413//3397 3450//3397 3411//3398 -f 3411//3398 3450//3397 3451//3398 -f 3411//3399 3451//3399 3409//3400 -f 3409//3400 3451//3399 3452//3401 -f 3409//3402 3452//3403 3407//3404 -f 3407//3404 3452//3403 3453//3405 -f 3407//3406 3453//3407 3405//3408 -f 3405//3408 3453//3407 3454//3409 -f 3405//3410 3454//3410 3403//3411 -f 3403//3411 3454//3410 3455//3411 -f 3403//3412 3455//3413 3386//3414 -f 3386//3414 3455//3413 3456//3415 -f 3386//3414 3456//3415 3384//3416 -f 3384//3417 3456//3417 3457//3417 -f 3396//3418 3390//3418 3397//3418 -f 3397//3419 3390//3419 3392//3419 -f 3397//3420 3392//3420 3438//3421 -f 3438//3421 3392//3420 3458//3421 -f 3438//3422 3458//3422 3439//3422 -f 3439//3422 3458//3422 3459//3422 -f 3439//3423 3459//3424 3440//3424 -f 3440//3424 3459//3424 3460//3425 -f 3440//3426 3460//3427 3441//3428 -f 3441//3428 3460//3427 3461//3428 -f 3441//3429 3461//3429 3442//3430 -f 3442//3430 3461//3429 3462//3430 -f 3442//3431 3462//3432 3443//3433 -f 3443//3433 3462//3432 3463//3434 -f 3443//3435 3463//3436 3444//3437 -f 3444//3437 3463//3436 3464//3438 -f 3444//3439 3464//3439 3445//3440 -f 3445//3440 3464//3439 3465//3440 -f 3445//3441 3465//3441 3446//3442 -f 3446//3442 3465//3441 3466//3442 -f 3446//3443 3466//3444 3447//3444 -f 3447//3444 3466//3444 3467//3445 -f 3447//3446 3467//3446 3448//3447 -f 3448//3447 3467//3446 3468//3448 -f 3448//3449 3468//3449 3449//3450 -f 3449//3450 3468//3449 3469//3451 -f 3449//3452 3469//3452 3450//3453 -f 3450//3453 3469//3452 3470//3453 -f 3450//3454 3470//3455 3451//3456 -f 3451//3456 3470//3455 3471//3456 -f 3451//3457 3471//3457 3452//3458 -f 3452//3458 3471//3457 3472//3458 -f 3452//3459 3472//3460 3453//3461 -f 3453//3461 3472//3460 3473//3461 -f 3453//3462 3473//3462 3454//3462 -f 3454//3462 3473//3462 3474//3462 -f 3454//3463 3474//3463 3455//3464 -f 3455//3464 3474//3463 3475//3465 -f 3455//3466 3475//3467 3456//3468 -f 3456//3468 3475//3467 3476//3469 -f 3456//3470 3476//3470 3457//3470 -f 3457//3471 3476//3471 3389//3471 -f 3389//3472 3476//3472 3387//3472 -f 3387//3473 3476//3473 3475//3473 -f 3387//3474 3475//3474 3477//3474 -f 3477//3475 3475//3475 3474//3475 -f 3477//3475 3474//3475 3478//3475 -f 3478//3476 3474//3476 3473//3476 -f 3478//3477 3473//3477 3479//3477 -f 3479//3478 3473//3478 3472//3478 -f 3479//3479 3472//3479 3480//3479 -f 3480//3480 3472//3480 3471//3480 -f 3480//3481 3471//3481 3481//3481 -f 3481//3482 3471//3482 3470//3482 -f 3481//3483 3470//3483 3482//3483 -f 3482//3484 3470//3484 3469//3484 -f 3482//3485 3469//3485 3483//3485 -f 3483//3486 3469//3486 3468//3486 -f 3483//3487 3468//3487 3484//3487 -f 3484//3488 3468//3488 3467//3488 -f 3484//3489 3467//3489 3485//3489 -f 3485//3490 3467//3490 3466//3490 -f 3485//3491 3466//3491 3486//3491 -f 3486//3492 3466//3492 3465//3492 -f 3486//3493 3465//3493 3487//3493 -f 3487//3494 3465//3494 3464//3494 -f 3487//3495 3464//3495 3488//3495 -f 3488//3496 3464//3496 3463//3496 -f 3488//3497 3463//3497 3489//3497 -f 3489//3498 3463//3498 3462//3498 -f 3489//3498 3462//3498 3490//3498 -f 3490//3499 3462//3499 3461//3499 -f 3490//3500 3461//3500 3491//3500 -f 3491//3501 3461//3501 3460//3501 -f 3491//3502 3460//3502 3492//3502 -f 3492//3503 3460//3503 3459//3503 -f 3492//3504 3459//3504 3493//3504 -f 3493//3505 3459//3505 3458//3505 -f 3493//3506 3458//3506 3494//3506 -f 3494//3507 3458//3507 3392//3507 -f 3494//3508 3392//3508 3495//3508 -f 3495//3509 3392//3509 3394//3509 -f 3495//3510 3394//3510 3496//3510 -f 3497//3511 3498//3511 3499//3511 -f 3500//3512 3501//3512 3502//3512 -f 3503//19 3504//2119 3505//3513 -f 3503//3514 3506//3514 3507//3514 -f 3507//3515 3506//3515 3508//3515 -f 3507//3516 3508//3516 3509//3516 -f 3510//3517 3511//3517 3512//3517 -f 3513//3518 3514//3518 3515//3518 -f 3516//3519 3517//3519 3518//3519 -f 3518//3520 3517//3520 3519//3520 -f 3503//3521 3505//3521 3506//3521 -f 3506//3522 3505//3522 3520//3523 -f 3506//3522 3520//3523 3521//3523 -f 3521//3524 3520//3525 3522//3524 -f 3521//3524 3522//3524 3523//3524 -f 3523//3526 3522//3526 3524//3526 -f 3523//3526 3524//3526 3525//3527 -f 3525//3528 3524//3528 3526//3528 -f 3525//3528 3526//3528 3527//3528 -f 3527//3529 3526//3529 3528//3529 -f 3527//3529 3528//3529 3529//3529 -f 3529//3530 3528//3530 3530//3531 -f 3529//3530 3530//3531 3531//3531 -f 3531//3532 3530//3532 3532//3533 -f 3531//3532 3532//3533 3533//3533 -f 3533//3534 3532//3534 3534//3535 -f 3533//3534 3534//3535 3535//3536 -f 3535//3537 3534//3538 3536//3539 -f 3535//3537 3536//3539 3537//3539 -f 3537//3540 3536//3540 3538//3541 -f 3537//3540 3538//3541 3539//3541 -f 3539//3542 3538//3542 3540//3543 -f 3539//3542 3540//3543 3541//3543 -f 3541//3544 3540//3544 3542//3544 -f 3541//3544 3542//3544 3543//3544 -f 3543//3545 3542//3546 3544//3547 -f 3543//3545 3544//3547 3545//3547 -f 3545//3548 3544//3548 3546//3549 -f 3545//3548 3546//3549 3547//3549 -f 3547//3550 3546//3550 3548//3550 -f 3547//3550 3548//3550 3549//3551 -f 3549//3552 3548//3552 3517//3552 -f 3549//3552 3517//3552 3550//3553 -f 3550//3554 3517//3554 3516//3554 -f 3550//3555 3516//3555 3551//3555 -f 3551//3556 3497//3556 3550//3556 -f 3550//3557 3497//3557 3499//3557 -f 3550//3558 3499//3559 3549//3560 -f 3549//3560 3499//3559 3552//3561 -f 3549//3562 3552//3562 3547//3563 -f 3547//3563 3552//3562 3553//3563 -f 3547//3564 3553//3564 3545//3565 -f 3545//3565 3553//3564 3554//3565 -f 3545//3566 3554//3566 3543//3566 -f 3543//3566 3554//3566 3555//3566 -f 3543//3567 3555//3568 3541//3569 -f 3541//3569 3555//3568 3556//3570 -f 3541//3571 3556//3571 3539//3571 -f 3539//3571 3556//3571 3557//3571 -f 3539//3572 3557//3573 3537//3574 -f 3537//3574 3557//3573 3558//3575 -f 3537//3576 3558//3576 3535//3576 -f 3535//3576 3558//3576 3559//3576 -f 3535//3577 3559//3577 3533//3578 -f 3533//3578 3559//3577 3560//3578 -f 3533//3579 3560//3579 3531//3579 -f 3531//3579 3560//3579 3561//3580 -f 3531//3581 3561//3582 3529//3583 -f 3529//3583 3561//3582 3562//3584 -f 3529//3585 3562//3585 3527//3586 -f 3527//3586 3562//3585 3563//3587 -f 3527//3588 3563//3588 3525//3589 -f 3525//3589 3563//3588 3564//3590 -f 3525//3591 3564//3591 3523//3592 -f 3523//3592 3564//3591 3565//3593 -f 3523//3594 3565//3595 3521//3596 -f 3521//3596 3565//3595 3566//3597 -f 3521//3598 3566//3599 3506//3600 -f 3506//3600 3566//3599 3567//3601 -f 3506//3602 3567//3603 3508//3604 -f 3508//3604 3567//3603 3502//3604 -f 3508//3605 3502//3605 3509//3605 -f 3509//3606 3502//3606 3501//3606 -f 3498//3607 3514//3607 3499//3607 -f 3499//3608 3514//3608 3513//3608 -f 3499//3609 3513//3609 3552//3610 -f 3552//3610 3513//3609 3568//3610 -f 3552//3611 3568//3611 3553//3611 -f 3553//3611 3568//3611 3569//3611 -f 3553//3612 3569//3612 3554//3612 -f 3554//3612 3569//3612 3570//3612 -f 3554//3613 3570//3614 3555//3614 -f 3555//3614 3570//3614 3571//3615 -f 3555//3616 3571//3617 3556//3618 -f 3556//3618 3571//3617 3572//3619 -f 3556//3620 3572//3621 3557//3622 -f 3557//3622 3572//3621 3573//3623 -f 3557//3624 3573//3625 3558//3626 -f 3558//3626 3573//3625 3574//3627 -f 3558//3628 3574//3629 3559//3630 -f 3559//3630 3574//3629 3575//3631 -f 3559//3632 3575//3632 3560//3632 -f 3560//3632 3575//3632 3576//3633 -f 3560//3634 3576//3635 3561//3636 -f 3561//3636 3576//3635 3577//3636 -f 3561//3637 3577//3637 3562//3638 -f 3562//3638 3577//3637 3578//3639 -f 3562//3640 3578//3641 3563//3642 -f 3563//3642 3578//3641 3579//3643 -f 3563//3644 3579//3645 3564//3646 -f 3564//3646 3579//3645 3580//3646 -f 3564//3647 3580//3647 3565//3648 -f 3565//3648 3580//3647 3581//3648 -f 3565//3649 3581//3650 3566//3651 -f 3566//3651 3581//3650 3582//3652 -f 3566//3653 3582//3653 3567//3653 -f 3567//3653 3582//3653 3583//3653 -f 3567//3654 3583//3654 3502//3654 -f 3502//3654 3583//3654 3584//3655 -f 3502//3656 3584//3656 3500//3656 -f 3500//3657 3584//3657 3585//3657 -f 3515//3658 3586//3658 3513//3658 -f 3513//3659 3586//3659 3587//3659 -f 3513//3660 3587//3660 3568//3660 -f 3568//3661 3587//3661 3588//3661 -f 3568//3662 3588//3662 3569//3662 -f 3569//3663 3588//3663 3589//3663 -f 3569//3664 3589//3664 3570//3664 -f 3570//3665 3589//3665 3590//3665 -f 3570//3666 3590//3666 3571//3666 -f 3571//3667 3590//3667 3591//3667 -f 3571//3668 3591//3668 3572//3668 -f 3572//3669 3591//3669 3592//3669 -f 3572//3670 3592//3670 3573//3670 -f 3573//3671 3592//3671 3593//3671 -f 3573//3672 3593//3672 3574//3672 -f 3574//3673 3593//3673 3594//3673 -f 3574//3674 3594//3674 3575//3674 -f 3575//3675 3594//3675 3595//3675 -f 3575//3675 3595//3675 3576//3675 -f 3576//3676 3595//3676 3596//3676 -f 3576//3677 3596//3677 3577//3677 -f 3577//3678 3596//3678 3597//3678 -f 3577//3679 3597//3679 3578//3679 -f 3578//3680 3597//3680 3598//3680 -f 3578//3681 3598//3681 3579//3681 -f 3579//3682 3598//3682 3599//3682 -f 3579//3683 3599//3683 3580//3683 -f 3580//3684 3599//3684 3600//3684 -f 3580//3685 3600//3685 3581//3685 -f 3581//3686 3600//3686 3601//3686 -f 3581//3687 3601//3687 3582//3687 -f 3582//3688 3601//3688 3602//3688 -f 3582//3689 3602//3689 3583//3689 -f 3583//3690 3602//3690 3510//3690 -f 3583//3691 3510//3691 3584//3691 -f 3584//3692 3510//3692 3512//3692 -f 3584//3693 3512//3693 3585//3693 -f 3603//3694 3604//3694 3605//3694 -f 3604//3695 3606//3695 3607//3695 -f 3607//3696 3606//3696 3608//3696 -f 3607//3697 3608//3697 3609//3697 -f 3603//3698 3605//3698 3610//3698 -f 3611//3699 3612//3699 3613//3699 -f 3614//3700 3615//3701 3616//3702 -f 3616//3703 3615//3703 3617//3703 -f 3616//3704 3617//3704 3618//3704 -f 3619//3705 3620//3706 3621//3705 -f 3621//3707 3620//3708 3622//3707 -f 3604//3709 3607//3710 3605//3711 -f 3605//3711 3607//3710 3623//3711 -f 3605//3711 3623//3711 3624//3711 -f 3624//3712 3623//3712 3625//3712 -f 3624//3712 3625//3712 3626//3712 -f 3626//3713 3625//3713 3627//3713 -f 3626//3713 3627//3713 3628//3714 -f 3628//3715 3627//3715 3629//3716 -f 3628//3715 3629//3716 3630//3717 -f 3630//3717 3629//3716 3631//3717 -f 3630//3717 3631//3717 3632//3718 -f 3632//3718 3631//3717 3633//3719 -f 3632//3718 3633//3719 3634//3719 -f 3634//3720 3633//3720 3635//3720 -f 3634//3720 3635//3720 3636//3720 -f 3636//3721 3635//3722 3637//3723 -f 3636//3721 3637//3723 3638//3724 -f 3638//3725 3637//3725 3639//3725 -f 3638//3725 3639//3725 3640//3725 -f 3640//3726 3639//3726 3641//3726 -f 3640//3726 3641//3726 3642//3727 -f 3642//3727 3641//3726 3643//3727 -f 3642//3727 3643//3727 3644//3728 -f 3644//3728 3643//3727 3645//3729 -f 3644//3728 3645//3729 3646//3729 -f 3646//3730 3645//3731 3647//3732 -f 3646//3730 3647//3732 3648//3733 -f 3648//3734 3647//3734 3649//3734 -f 3648//3734 3649//3734 3650//3735 -f 3650//3736 3649//3736 3651//3737 -f 3650//3736 3651//3737 3652//3738 -f 3652//3739 3651//3739 3653//3739 -f 3652//3739 3653//3739 3654//3739 -f 3654//3740 3653//3740 3655//3741 -f 3654//3740 3655//3741 3656//3742 -f 3656//3743 3655//3743 3620//3743 -f 3656//3743 3620//3743 3657//3744 -f 3657//3745 3620//3745 3619//3745 -f 3657//3746 3619//3747 3658//3748 -f 3658//3749 3659//3749 3657//3749 -f 3657//3750 3659//3750 3660//3750 -f 3657//3751 3660//3751 3656//3751 -f 3656//3751 3660//3751 3661//3752 -f 3656//3753 3661//3754 3654//3755 -f 3654//3755 3661//3754 3662//3756 -f 3654//3757 3662//3758 3652//3759 -f 3652//3759 3662//3758 3663//3759 -f 3652//3760 3663//3760 3650//3761 -f 3650//3761 3663//3760 3664//3761 -f 3650//3762 3664//3762 3648//3762 -f 3648//3762 3664//3762 3665//3762 -f 3648//3763 3665//3764 3646//3764 -f 3646//3764 3665//3764 3666//3764 -f 3646//3765 3666//3765 3644//3766 -f 3644//3766 3666//3765 3667//3767 -f 3644//3768 3667//3769 3642//3769 -f 3642//3769 3667//3769 3668//3770 -f 3642//3771 3668//3772 3640//3772 -f 3640//3772 3668//3772 3669//3772 -f 3640//3773 3669//3774 3638//3774 -f 3638//3774 3669//3774 3670//3775 -f 3638//3776 3670//3776 3636//3776 -f 3636//3776 3670//3776 3671//3776 -f 3636//3777 3671//3778 3634//3778 -f 3634//3778 3671//3778 3672//3778 -f 3634//3779 3672//3780 3632//3781 -f 3632//3781 3672//3780 3673//3781 -f 3632//3782 3673//3783 3630//3782 -f 3630//3782 3673//3783 3674//3783 -f 3630//3784 3674//3785 3628//3786 -f 3628//3786 3674//3785 3675//3786 -f 3628//3787 3675//3787 3626//3787 -f 3626//3787 3675//3787 3676//3787 -f 3626//3788 3676//3788 3624//3789 -f 3624//3789 3676//3788 3677//3790 -f 3624//3791 3677//3791 3605//3792 -f 3605//3792 3677//3791 3678//3793 -f 3605//3792 3678//3793 3610//3794 -f 3659//3795 3614//3795 3660//3795 -f 3660//3796 3614//3700 3616//3702 -f 3660//3797 3616//3797 3661//3797 -f 3661//3797 3616//3797 3679//3797 -f 3661//3798 3679//3798 3662//3798 -f 3662//3798 3679//3798 3680//3798 -f 3662//3799 3680//3799 3663//3800 -f 3663//3800 3680//3799 3681//3800 -f 3663//3801 3681//3802 3664//3802 -f 3664//3802 3681//3802 3682//3802 -f 3664//3803 3682//3803 3665//3804 -f 3665//3804 3682//3803 3683//3805 -f 3665//3806 3683//3806 3666//3806 -f 3666//3806 3683//3806 3684//3807 -f 3666//3808 3684//3809 3667//3809 -f 3667//3809 3684//3809 3685//3809 -f 3667//3810 3685//3810 3668//3810 -f 3668//3810 3685//3810 3686//3810 -f 3668//3811 3686//3812 3669//3813 -f 3669//3813 3686//3812 3687//3814 -f 3669//3815 3687//3816 3670//3817 -f 3670//3817 3687//3816 3688//3817 -f 3670//3818 3688//3819 3671//3820 -f 3671//3820 3688//3819 3689//3821 -f 3671//3822 3689//3822 3672//3822 -f 3672//3822 3689//3822 3690//3822 -f 3672//3823 3690//3823 3673//3824 -f 3673//3824 3690//3823 3691//3824 -f 3673//3825 3691//3826 3674//3827 -f 3674//3827 3691//3826 3692//3828 -f 3674//3829 3692//3829 3675//3830 -f 3675//3830 3692//3829 3693//3830 -f 3675//3831 3693//3831 3676//3831 -f 3676//3831 3693//3831 3694//3831 -f 3676//3832 3694//3833 3677//3834 -f 3677//3834 3694//3833 3695//3835 -f 3677//3836 3695//3836 3678//3837 -f 3678//3837 3695//3836 3696//3838 -f 3678//3839 3696//3839 3610//3839 -f 3618//3840 3697//3840 3616//3840 -f 3616//3841 3697//3841 3698//3841 -f 3616//3842 3698//3842 3679//3842 -f 3679//3843 3698//3843 3699//3843 -f 3679//3844 3699//3844 3680//3844 -f 3680//3845 3699//3845 3700//3845 -f 3680//3845 3700//3845 3681//3845 -f 3681//3846 3700//3846 3701//3846 -f 3681//3847 3701//3847 3682//3847 -f 3682//3848 3701//3848 3702//3848 -f 3682//3849 3702//3849 3683//3849 -f 3683//3850 3702//3850 3703//3850 -f 3683//3850 3703//3850 3684//3850 -f 3684//3851 3703//3851 3704//3851 -f 3684//3852 3704//3852 3685//3852 -f 3685//3853 3704//3853 3705//3853 -f 3685//3854 3705//3854 3686//3854 -f 3686//3855 3705//3855 3706//3855 -f 3686//3856 3706//3856 3687//3856 -f 3687//3857 3706//3857 3707//3857 -f 3687//3858 3707//3858 3688//3858 -f 3688//3859 3707//3859 3708//3859 -f 3688//3860 3708//3860 3689//3860 -f 3689//3861 3708//3861 3709//3861 -f 3689//3861 3709//3861 3690//3861 -f 3690//3862 3709//3862 3710//3862 -f 3690//3863 3710//3863 3691//3863 -f 3691//3864 3710//3864 3711//3864 -f 3691//3865 3711//3865 3692//3865 -f 3692//3866 3711//3866 3712//3866 -f 3692//3867 3712//3867 3693//3867 -f 3693//3868 3712//3868 3713//3868 -f 3693//3869 3713//3869 3694//3869 -f 3694//3870 3713//3870 3714//3870 -f 3694//3871 3714//3871 3695//3871 -f 3695//3872 3714//3872 3611//3872 -f 3695//3873 3611//3873 3696//3873 -f 3696//3874 3611//3874 3613//3874 -f 3696//3875 3613//3875 3610//3875 -f 3617//3876 3615//3876 3715//3876 -f 3659//3877 3658//3877 3716//3877 -f 3717//3878 3718//3878 3719//3878 -f 3719//3879 3718//3879 3720//3879 -f 3719//3880 3720//3880 3721//3880 -f 3722//3881 3723//3881 3724//3881 -f 3724//3882 3723//3882 3725//3882 -f 3658//3748 3619//3747 3726//3883 -f 3726//3884 3619//3705 3621//3705 -f 3726//3885 3621//3707 3622//3707 -f 3659//3886 3716//3886 3614//3886 -f 3617//3887 3715//3887 3618//3887 -f 3658//3888 3726//3888 3716//3888 -f 3716//3889 3726//3889 3727//3889 -f 3716//3889 3727//3889 3728//3889 -f 3728//3890 3727//3890 3729//3890 -f 3728//3890 3729//3890 3730//3891 -f 3730//3892 3729//3892 3731//3893 -f 3730//3892 3731//3893 3732//3894 -f 3732//3895 3731//3895 3733//3895 -f 3732//3895 3733//3895 3734//3896 -f 3734//3897 3733//3898 3735//3899 -f 3734//3897 3735//3899 3736//3899 -f 3736//3900 3735//3901 3737//3902 -f 3736//3900 3737//3902 3738//3903 -f 3738//3904 3737//3905 3739//3906 -f 3738//3904 3739//3906 3740//3906 -f 3740//3907 3739//3907 3741//3907 -f 3740//3907 3741//3907 3742//3907 -f 3742//3908 3741//3909 3743//3908 -f 3742//3908 3743//3908 3744//3908 -f 3744//3910 3743//3911 3745//3910 -f 3744//3910 3745//3910 3746//3910 -f 3746//3912 3745//3913 3747//3912 -f 3746//3912 3747//3912 3748//3912 -f 3748//3914 3747//3914 3749//3914 -f 3748//3914 3749//3914 3750//3914 -f 3750//3915 3749//3915 3751//3916 -f 3750//3915 3751//3916 3752//3916 -f 3752//3917 3751//3918 3753//3917 -f 3752//3917 3753//3917 3754//3917 -f 3754//3919 3753//3919 3755//3919 -f 3754//3919 3755//3919 3756//3920 -f 3756//3921 3755//3921 3757//3921 -f 3756//3921 3757//3921 3758//3922 -f 3758//3923 3757//3923 3723//3924 -f 3758//3923 3723//3924 3759//3925 -f 3759//3926 3723//3926 3722//3926 -f 3759//3927 3722//3927 3760//3927 -f 3760//3928 3717//3928 3759//3928 -f 3759//3929 3717//3929 3719//3929 -f 3759//3930 3719//3931 3758//3932 -f 3758//3932 3719//3931 3761//3933 -f 3758//3934 3761//3934 3756//3934 -f 3756//3934 3761//3934 3762//3935 -f 3756//3936 3762//3936 3754//3937 -f 3754//3937 3762//3936 3763//3937 -f 3754//3938 3763//3939 3752//3940 -f 3752//3940 3763//3939 3764//3941 -f 3752//3942 3764//3942 3750//3943 -f 3750//3943 3764//3942 3765//3943 -f 3750//3944 3765//3945 3748//3946 -f 3748//3946 3765//3945 3766//3946 -f 3748//3947 3766//3947 3746//3948 -f 3746//3948 3766//3947 3767//3948 -f 3746//3949 3767//3950 3744//3950 -f 3744//3950 3767//3950 3768//3951 -f 3744//3952 3768//3952 3742//3953 -f 3742//3953 3768//3952 3769//3953 -f 3742//3954 3769//3955 3740//3956 -f 3740//3956 3769//3955 3770//3957 -f 3740//3958 3770//3959 3738//3960 -f 3738//3960 3770//3959 3771//3961 -f 3738//3962 3771//3962 3736//3963 -f 3736//3963 3771//3962 3772//3963 -f 3736//3964 3772//3964 3734//3964 -f 3734//3964 3772//3964 3773//3965 -f 3734//3966 3773//3967 3732//3967 -f 3732//3967 3773//3967 3774//3968 -f 3732//3969 3774//3969 3730//3969 -f 3730//3969 3774//3969 3775//3970 -f 3730//3971 3775//3972 3728//3973 -f 3728//3973 3775//3972 3776//3974 -f 3728//3975 3776//3976 3716//3977 -f 3716//3977 3776//3976 3715//3977 -f 3716//3978 3715//3978 3614//3978 -f 3614//3979 3715//3979 3615//3979 -f 3618//3980 3715//3980 3777//3980 -f 3777//3981 3715//3981 3776//3981 -f 3777//3982 3776//3982 3778//3982 -f 3778//3983 3776//3983 3775//3983 -f 3778//3984 3775//3984 3779//3984 -f 3779//3985 3775//3985 3774//3985 -f 3779//3986 3774//3986 3780//3986 -f 3780//3987 3774//3987 3773//3987 -f 3780//3988 3773//3988 3781//3988 -f 3781//3989 3773//3989 3772//3989 -f 3781//3990 3772//3990 3782//3990 -f 3782//3991 3772//3991 3771//3991 -f 3782//3992 3771//3992 3783//3992 -f 3783//3993 3771//3993 3770//3993 -f 3783//3994 3770//3994 3784//3994 -f 3784//3995 3770//3995 3769//3995 -f 3784//3996 3769//3996 3785//3996 -f 3785//3997 3769//3997 3768//3997 -f 3785//3998 3768//3998 3786//3998 -f 3786//3999 3768//3999 3767//3999 -f 3786//4000 3767//4000 3787//4000 -f 3787//4001 3767//4001 3766//4001 -f 3787//4002 3766//4002 3788//4002 -f 3788//4003 3766//4003 3765//4003 -f 3788//4004 3765//4004 3789//4004 -f 3789//4005 3765//4005 3764//4005 -f 3789//4006 3764//4006 3790//4006 -f 3790//4007 3764//4007 3763//4007 -f 3790//4008 3763//4008 3791//4008 -f 3791//4009 3763//4009 3762//4009 -f 3791//4010 3762//4010 3792//4010 -f 3792//4011 3762//4011 3761//4011 -f 3792//4012 3761//4012 3793//4012 -f 3793//4013 3761//4013 3719//4013 -f 3793//4014 3719//4014 3794//4014 -f 3794//4015 3719//4015 3721//4015 -f 3794//4016 3721//4016 3795//4016 -f 3796//19 3797//4017 3798//4018 -f 3798//4018 3797//4017 3799//19 -f 3798//4019 3799//4019 3800//4019 -f 3799//4020 3801//4020 3800//4020 -f 3800//4021 3801//4021 3802//4021 -f 3800//4022 3802//4022 3803//4022 -f 3803//4023 3802//4024 3804//4025 -f 3803//4023 3804//4025 3805//4026 -f 3806//4027 3807//4027 3808//4027 -f 3805//4028 3809//4028 3803//4028 -f 3803//4029 3809//4030 3808//4031 -f 3803//4032 3808//4032 3810//4032 -f 3810//4033 3808//4033 3807//4033 -f 3811//4034 3812//4034 3813//4034 -f 3813//4035 3814//4035 3815//4035 -f 3815//4036 3814//4036 3816//4036 -f 3816//4037 3817//4037 3815//4037 -f 3815//4038 3817//4038 3818//4038 -f 3815//4039 3818//4040 3819//4041 -f 3820//4042 3821//4042 3822//4042 -f 3822//4043 3821//4043 3823//4043 -f 3824//4044 3825//4044 3826//4044 -f 3827//4045 3828//4045 3829//4045 -f 3829//4046 3828//4046 3830//4046 -f 3809//4030 3831//4047 3808//4031 -f 3808//4031 3831//4047 3832//4048 -f 3808//4031 3832//4048 3833//4049 -f 3833//4049 3832//4048 3834//4050 -f 3833//4049 3834//4050 3835//4051 -f 3835//4052 3834//4053 3836//4052 -f 3835//4052 3836//4052 3837//4054 -f 3837//4055 3836//4055 3838//4055 -f 3837//4055 3838//4055 3839//4055 -f 3839//4056 3838//4057 3840//4056 -f 3839//4056 3840//4056 3841//4058 -f 3841//4059 3840//4059 3842//4059 -f 3841//4059 3842//4059 3843//4059 -f 3843//4060 3842//4060 3844//4060 -f 3843//4060 3844//4060 3845//4061 -f 3845//4062 3844//4062 3846//4062 -f 3845//4062 3846//4062 3847//4062 -f 3847//4063 3846//4063 3848//4063 -f 3847//4063 3848//4063 3849//4063 -f 3849//4064 3848//4064 3850//4065 -f 3849//4064 3850//4065 3851//4066 -f 3851//4066 3850//4065 3852//4067 -f 3851//4066 3852//4067 3853//4068 -f 3853//4068 3852//4067 3854//4069 -f 3853//4068 3854//4069 3855//4069 -f 3855//4070 3854//4071 3856//4072 -f 3855//4070 3856//4072 3857//4073 -f 3857//4074 3856//4074 3858//4075 -f 3857//4074 3858//4075 3859//4076 -f 3859//4076 3858//4075 3829//4077 -f 3859//4076 3829//4077 3824//4078 -f 3824//4079 3829//4079 3830//4079 -f 3824//4080 3830//4080 3825//4080 -f 3826//4081 3820//4081 3824//4081 -f 3824//4082 3820//4083 3822//4084 -f 3824//4082 3822//4084 3859//4085 -f 3859//4085 3822//4084 3860//4084 -f 3859//4086 3860//4087 3857//4087 -f 3857//4087 3860//4087 3861//4088 -f 3857//4089 3861//4090 3855//4091 -f 3855//4091 3861//4090 3862//4091 -f 3855//4092 3862//4092 3853//4092 -f 3853//4092 3862//4092 3863//4093 -f 3853//4094 3863//4095 3851//4094 -f 3851//4094 3863//4095 3864//4095 -f 3851//4096 3864//4096 3849//4097 -f 3849//4097 3864//4096 3865//4097 -f 3849//4098 3865//4099 3847//4100 -f 3847//4100 3865//4099 3866//4101 -f 3847//4102 3866//4102 3845//4102 -f 3845//4102 3866//4102 3867//4102 -f 3845//4103 3867//4104 3843//4104 -f 3843//4104 3867//4104 3868//4105 -f 3843//4106 3868//4106 3841//4106 -f 3841//4106 3868//4106 3869//4106 -f 3841//4107 3869//4108 3839//4108 -f 3839//4108 3869//4108 3870//4109 -f 3839//4110 3870//4110 3837//4111 -f 3837//4111 3870//4110 3871//4112 -f 3837//4113 3871//4114 3835//4114 -f 3835//4114 3871//4114 3872//4115 -f 3835//4116 3872//4117 3833//4118 -f 3833//4118 3872//4117 3815//4119 -f 3833//4120 3815//4121 3808//4122 -f 3808//4122 3815//4121 3819//4123 -f 3808//4122 3819//4123 3806//4124 -f 3806//4125 3819//4041 3818//4040 -f 3813//4126 3815//4126 3811//4126 -f 3811//4127 3815//4127 3872//4127 -f 3811//4128 3872//4128 3873//4128 -f 3873//4129 3872//4129 3871//4129 -f 3873//4130 3871//4130 3874//4130 -f 3874//4131 3871//4131 3870//4131 -f 3874//4132 3870//4132 3875//4132 -f 3875//4133 3870//4133 3869//4133 -f 3875//4134 3869//4134 3876//4134 -f 3876//4135 3869//4135 3868//4135 -f 3876//4136 3868//4136 3877//4136 -f 3877//4137 3868//4137 3867//4137 -f 3877//4137 3867//4137 3878//4137 -f 3878//4138 3867//4138 3866//4138 -f 3878//4139 3866//4139 3879//4139 -f 3879//4140 3866//4140 3865//4140 -f 3879//4141 3865//4141 3880//4141 -f 3880//4142 3865//4142 3864//4142 -f 3880//4143 3864//4143 3881//4143 -f 3881//4144 3864//4144 3863//4144 -f 3881//4145 3863//4145 3882//4145 -f 3882//4146 3863//4146 3862//4146 -f 3882//4147 3862//4147 3883//4147 -f 3883//4148 3862//4148 3861//4148 -f 3883//4149 3861//4149 3884//4149 -f 3884//4150 3861//4150 3860//4150 -f 3884//4151 3860//4151 3885//4151 -f 3885//4152 3860//4152 3822//4152 -f 3885//4153 3822//4154 3886//4155 -f 3886//4155 3822//4154 3823//4156 -f 3886//4157 3823//4157 1021//4157 -f 3609//19 3797//4017 3796//19 -f 3887//19 3888//19 3842//19 -f 3889//19 3850//2120 3890//19 -f 3890//19 3850//2120 3848//19 -f 3890//19 3848//19 3891//19 -f 3891//19 3848//19 3846//19 -f 3891//19 3846//19 3888//19 -f 3888//19 3846//19 3844//19 -f 3888//19 3844//19 3842//19 -f 3504//2119 3437//2119 3505//3513 -f 3505//19 3437//19 3436//19 -f 3505//19 3436//19 3520//19 -f 3520//19 3436//19 3434//19 -f 3520//19 3434//19 3522//19 -f 3809//19 3892//19 3831//19 -f 3831//19 3892//19 3893//19 -f 3831//19 3893//19 3832//19 -f 3832//19 3893//19 3894//19 -f 3842//19 3840//19 3887//19 -f 3887//19 3840//19 3838//19 -f 3887//19 3838//19 3895//19 -f 3895//19 3838//19 3836//19 -f 3895//19 3836//19 3894//19 -f 3894//19 3836//19 3834//19 -f 3894//19 3834//19 3832//19 -f 3896//19 3897//19 3653//19 -f 3653//19 3897//19 3898//19 -f 3653//19 3898//19 3655//19 -f 3655//19 3898//19 3899//19 -f 3655//19 3899//19 3620//19 -f 3620//19 3899//19 3900//19 -f 3620//19 3900//19 3622//19 -f 3622//19 3900//19 3269//19 -f 3622//19 3269//19 3726//19 -f 3726//19 3269//19 3271//19 -f 3726//19 3271//19 3727//19 -f 3629//2120 3627//19 3901//19 -f 3902//2119 3903//19 3904//19 -f 3904//19 3903//19 3905//19 -f 3904//19 3905//19 3796//19 -f 3796//19 3905//19 3906//19 -f 3434//19 3432//19 3522//19 -f 3522//19 3432//19 3430//19 -f 3522//19 3430//19 3524//19 -f 3524//19 3430//19 3428//19 -f 3524//19 3428//19 3526//19 -f 3526//19 3428//19 3426//19 -f 3526//19 3426//19 3528//19 -f 3528//19 3426//19 3424//19 -f 3528//19 3424//19 3530//19 -f 3530//19 3424//19 3422//19 -f 3530//19 3422//19 3532//19 -f 3532//19 3422//19 3420//19 -f 3532//19 3420//19 3534//19 -f 3534//19 3420//19 3418//19 -f 3534//19 3418//19 3536//19 -f 3536//19 3418//19 3416//19 -f 3536//19 3416//19 3538//19 -f 3538//19 3416//19 3414//19 -f 3538//19 3414//19 3540//19 -f 3540//19 3414//19 3412//19 -f 3540//19 3412//19 3542//19 -f 3542//19 3412//19 3410//19 -f 3542//19 3410//19 3544//19 -f 3544//19 3410//19 3408//19 -f 3544//19 3408//19 3546//19 -f 3546//19 3408//19 3406//19 -f 3546//19 3406//19 3548//19 -f 3653//19 3651//19 3896//19 -f 3896//19 3651//19 3649//19 -f 3896//19 3649//19 3907//19 -f 3907//19 3649//19 3647//19 -f 3907//19 3647//19 3908//19 -f 3908//19 3647//19 3645//19 -f 3908//19 3645//19 3909//19 -f 3909//19 3645//19 3643//19 -f 3909//19 3643//19 3910//19 -f 3910//19 3643//19 3641//19 -f 3910//19 3641//19 3911//19 -f 3911//19 3641//19 3639//19 -f 3911//19 3639//19 3912//19 -f 3912//19 3639//19 3637//19 -f 3912//19 3637//19 3913//19 -f 3913//19 3637//19 3635//19 -f 3913//19 3635//19 3914//19 -f 3914//19 3635//19 3633//19 -f 3914//19 3633//19 3915//19 -f 3915//19 3633//19 3901//19 -f 3901//19 3633//19 3631//2120 -f 3901//19 3631//2120 3629//2120 -f 3627//19 3625//19 3901//19 -f 3901//19 3625//19 3623//19 -f 3901//19 3623//19 3607//19 -f 3906//19 3916//19 3796//19 -f 3796//19 3916//19 3917//19 -f 3796//19 3917//19 3918//19 -f 3607//19 3609//19 3901//19 -f 3901//19 3609//19 3796//19 -f 3901//19 3796//19 3919//19 -f 3919//19 3796//19 3918//19 -f 3920//19 3856//19 3921//19 -f 3921//19 3856//19 3854//19 -f 3921//19 3854//19 3889//19 -f 3889//19 3854//19 3852//2120 -f 3889//19 3852//2120 3850//2120 -f 3406//19 3404//19 3548//19 -f 3548//19 3404//19 3402//19 -f 3548//19 3402//19 3517//19 -f 3517//19 3402//19 3382//19 -f 3517//19 3382//19 3519//19 -f 3519//19 3382//19 3381//19 -f 3519//19 3381//19 3922//19 -f 3922//19 3381//19 3923//19 -f 3922//19 3923//19 3924//19 -f 3924//19 3923//19 3925//19 -f 3924//19 3925//19 3926//19 -f 3926//19 3925//19 3927//19 -f 3926//19 3927//19 3928//19 -f 3928//19 3927//19 3929//19 -f 3928//19 3929//19 3930//19 -f 3930//19 3929//19 3931//19 -f 3930//19 3931//19 3932//19 -f 3932//19 3931//19 3933//19 -f 3932//19 3933//19 3934//19 -f 3934//19 3933//19 3935//19 -f 3934//19 3935//19 3936//19 -f 3936//19 3935//19 3937//19 -f 3936//19 3937//19 3938//19 -f 3938//19 3937//19 3939//19 -f 3938//19 3939//19 3940//19 -f 3940//19 3939//19 3941//19 -f 3940//19 3941//19 3942//19 -f 3942//19 3941//19 3943//19 -f 3942//19 3943//19 3944//19 -f 3944//19 3943//19 3945//19 -f 3944//19 3945//19 3946//19 -f 3946//19 3945//19 3947//19 -f 3946//19 3947//19 3948//19 -f 3948//19 3947//19 3949//19 -f 3948//19 3949//19 3950//19 -f 3950//19 3949//19 3951//19 -f 3950//19 3951//19 3952//19 -f 3952//19 3951//19 3953//19 -f 3952//19 3953//19 3954//2119 -f 3954//2119 3953//19 3955//19 -f 3954//2119 3955//19 3902//2119 -f 3902//2119 3955//19 3956//19 -f 3902//2119 3956//19 3903//19 -f 3271//19 3315//19 3727//19 -f 3727//19 3315//19 3313//19 -f 3727//19 3313//19 3729//19 -f 3729//19 3313//19 3311//19 -f 3729//19 3311//19 3731//19 -f 3731//19 3311//19 3309//19 -f 3731//19 3309//19 3733//19 -f 3733//19 3309//19 3307//19 -f 3733//19 3307//19 3735//19 -f 3735//19 3307//19 3305//19 -f 3735//19 3305//19 3737//19 -f 3957//19 3958//19 3959//19 -f 3959//19 3958//19 3827//19 -f 3959//19 3827//19 3960//19 -f 3960//19 3827//19 3829//19 -f 3960//19 3829//19 3920//19 -f 3920//19 3829//19 3858//19 -f 3920//19 3858//19 3856//19 -f 3305//19 3303//19 3737//19 -f 3737//19 3303//19 3301//19 -f 3737//19 3301//19 3739//19 -f 3739//19 3301//19 3299//19 -f 3739//19 3299//19 3741//19 -f 3299//19 3297//19 3741//19 -f 3741//19 3297//19 3295//19 -f 3741//19 3295//19 3743//19 -f 3743//19 3295//19 3293//19 -f 3743//19 3293//19 3745//19 -f 3745//19 3293//19 3291//19 -f 3745//19 3291//19 3747//19 -f 3747//19 3291//19 3289//19 -f 3747//19 3289//19 3749//19 -f 3749//19 3289//19 3287//19 -f 3749//19 3287//19 3751//19 -f 3751//19 3287//19 3285//19 -f 3751//19 3285//19 3753//19 -f 3753//19 3285//19 3283//19 -f 3753//19 3283//19 3755//19 -f 3755//19 3283//19 3281//19 -f 3755//19 3281//19 3757//19 -f 3757//19 3281//19 3279//19 -f 3757//19 3279//19 3723//2119 -f 3723//2119 3279//19 3262//19 -f 3723//2119 3262//19 3725//2119 -f 3725//2119 3262//19 3261//19 -f 3725//19 3261//19 3961//19 -f 3961//19 3261//19 3962//19 -f 3961//19 3962//19 3963//19 -f 3963//19 3962//19 3964//19 -f 3963//19 3964//19 3965//19 -f 3965//19 3964//19 3966//19 -f 3965//19 3966//19 3967//19 -f 3967//19 3966//19 3968//19 -f 3967//19 3968//19 3969//19 -f 3969//19 3968//19 3970//19 -f 3969//19 3970//19 3971//19 -f 3971//19 3970//19 3972//19 -f 3971//19 3972//19 3973//19 -f 3973//19 3972//19 3974//19 -f 3973//19 3974//19 3975//19 -f 3975//19 3974//19 3976//19 -f 3975//19 3976//19 3977//19 -f 3977//19 3976//19 3978//19 -f 3977//19 3978//19 3979//19 -f 3979//19 3978//19 3980//19 -f 3979//19 3980//19 3981//19 -f 3981//19 3980//19 3982//19 -f 3981//19 3982//19 3983//19 -f 3983//19 3982//19 3984//19 -f 3983//19 3984//19 3985//19 -f 3985//19 3984//19 3986//19 -f 3985//19 3986//19 3987//19 -f 3987//19 3986//19 3988//19 -f 3987//19 3988//19 3989//19 -f 3989//19 3988//19 3990//19 -f 3989//19 3990//19 3991//19 -f 3991//19 3990//19 3992//19 -f 3991//19 3992//19 3993//19 -f 3993//19 3992//19 3994//19 -f 3993//19 3994//19 3957//19 -f 3957//19 3994//19 3995//19 -f 3957//19 3995//19 3958//19 -f 3996//4158 3997//4158 3998//4158 -f 3999//4159 4000//4160 4001//4161 -f 4002//4162 4003//4163 4004//4164 -f 4004//4164 4003//4163 4005//4165 -f 4004//4164 4005//4165 3999//4159 -f 4000//4160 4006//4166 4001//4161 -f 4001//4161 4006//4166 4007//4167 -f 4001//4168 4007//4168 4008//4168 -f 4008//4169 4007//4169 4009//4169 -f 4008//4170 4009//4171 4010//4172 -f 4011//4173 4012//4174 4013//4175 -f 4013//4175 4012//4174 4014//4176 -f 4013//4177 4014//4178 4015//4179 -f 4013//4180 4016//4180 4011//4180 -f 4011//4181 4016//4181 4017//4181 -f 4011//4182 4017//4183 4018//4184 -f 4018//4184 4017//4183 4019//4185 -f 4018//4186 4019//4187 4020//4188 -f 4004//4164 4021//4189 4002//4162 -f 4002//4162 4021//4189 4013//4190 -f 4002//4191 4013//4177 4022//4192 -f 4022//4192 4013//4177 4015//4179 -f 4020//4188 4019//4187 4023//4193 -f 4023//4193 4019//4187 4024//4194 -f 4023//4195 4024//4196 4025//4197 -f 4025//4197 4024//4196 4026//4198 -f 4025//4199 4026//4200 4027//4201 -f 4027//4201 4026//4200 4028//4202 -f 4027//4203 4028//4204 4029//4205 -f 4029//4205 4028//4204 4030//4206 -f 4029//4207 4030//4207 4031//4207 -f 4031//4208 4030//4209 4032//4210 -f 4032//4210 4030//4209 4033//4211 -f 4032//4212 4033//4213 4034//4214 -f 4034//4214 4033//4213 4035//4215 -f 4034//4216 4035//4217 4036//4218 -f 4035//4217 4037//4219 4036//4218 -f 4036//4220 4037//4220 4038//4220 -f 4036//4221 4038//4222 4039//4223 -f 4038//4222 4040//4224 4039//4223 -f 4039//4225 4040//4225 4041//4225 -f 4039//4226 4041//4226 4042//4226 -f 4042//4227 4041//4227 4043//4227 -f 4042//4228 4043//4228 4044//4228 -f 4044//4229 4043//4229 4045//4229 -f 4044//4230 4045//4231 4046//4232 -f 4046//4232 4045//4231 4047//4233 -f 4046//4234 4047//4235 4048//4236 -f 4048//4236 4047//4235 4049//4237 -f 4048//4238 4049//4239 4050//4240 -f 4050//4240 4049//4239 4051//4241 -f 4050//4242 4051//4242 4052//4242 -f 4053//4243 4054//4244 4055//4245 -f 4055//4245 4054//4244 4056//4246 -f 4055//4247 4056//4247 4057//4247 -f 4057//4248 4056//4248 4052//4248 -f 4057//4249 4052//4249 4058//4249 -f 4058//4250 4052//4250 4051//4250 -f 4059//4251 4060//4252 4061//4253 -f 4061//4253 4060//4252 4062//4254 -f 4061//4255 4062//4255 4063//4255 -f 4063//4256 4062//4256 4053//4256 -f 4063//4257 4053//4257 4064//4257 -f 4064//4258 4053//4258 4055//4258 -f 4065//4259 4066//4260 4067//4261 -f 4067//4261 4066//4260 4068//4262 -f 4067//4263 4068//4263 4069//4263 -f 4067//4261 4070//4264 4065//4259 -f 4065//4259 4070//4264 4071//4265 -f 4065//4259 4071//4265 4072//4266 -f 4072//4266 4073//4267 4074//4268 -f 4074//4268 4073//4267 4075//4269 -f 4074//4270 4075//4270 4076//4270 -f 4076//4271 4075//4272 4077//4273 -f 4076//4271 4077//4273 4061//4274 -f 4061//4275 4077//4276 4078//4277 -f 4061//4275 4078//4277 4059//4278 -f 4079//4279 4080//4280 4081//4281 -f 4082//4282 4083//4283 4069//4284 -f 4069//4284 4083//4283 4084//4285 -f 4069//4286 4084//4286 4067//4286 -f 4079//4279 4081//4281 4085//4287 -f 4085//4288 4081//4288 4086//4288 -f 4085//4289 4086//4289 4069//4289 -f 4069//4290 4086//4290 4087//4290 -f 4069//4284 4087//4291 4082//4282 -f 3998//4292 3997//4293 4088//4294 -f 4088//4294 3997//4293 4089//4295 -f 4088//4296 4089//4297 4080//4298 -f 4080//4298 4089//4297 4090//4299 -f 4080//4298 4090//4299 4081//4300 -f 3996//4301 3998//4301 4091//4301 -f 4091//4302 3998//4302 4092//4302 -f 4091//4303 4092//4304 4093//4305 -f 4093//4305 4092//4304 4094//4306 -f 4093//4307 4094//4308 4095//4309 -f 4095//4309 4094//4308 4096//4310 -f 4095//4311 4096//4312 4097//4312 -f 4097//4312 4096//4312 4098//4313 -f 4097//4314 4098//4315 4099//4316 -f 4099//4316 4098//4315 4100//4317 -f 4099//4318 4100//4319 4101//4320 -f 4101//4320 4100//4319 4102//4321 -f 4101//4322 4102//4323 4103//4324 -f 4103//4324 4102//4323 4104//4325 -f 4103//4326 4104//4327 4105//4328 -f 4105//4328 4104//4327 4106//4329 -f 4105//4330 4106//4330 4107//4330 -f 4107//4331 4106//4332 4108//4333 -f 4108//4333 4106//4332 4109//4334 -f 4108//4335 4109//4336 4110//4337 -f 4110//4337 4109//4336 4111//4338 -f 4110//4339 4111//4340 4112//4341 -f 4111//4340 4113//4342 4112//4341 -f 4112//4343 4113//4343 4114//4343 -f 4112//4344 4114//4344 4115//4344 -f 4115//4345 4114//4345 4116//4345 -f 4115//4346 4116//4346 4117//4346 -f 4117//4347 4116//4347 4118//4347 -f 4117//4348 4118//4348 4119//4348 -f 4119//4349 4118//4349 4120//4349 -f 4119//4350 4120//4350 4121//4350 -f 4122//4351 4123//4352 4124//4353 -f 4124//4354 4125//4355 4122//4356 -f 4122//4356 4125//4355 4126//4357 -f 4122//4358 4126//4358 4127//4358 -f 4127//4359 4126//4359 4121//4359 -f 4127//4360 4121//4361 4128//4362 -f 4128//4362 4121//4361 4120//4363 -f 4010//4172 4009//4171 4129//4364 -f 4129//4365 4009//4365 4130//4365 -f 4129//4366 4130//4367 4131//4368 -f 4131//4368 4132//4369 4129//4366 -f 4129//4366 4132//4369 4133//4370 -f 4129//4371 4133//4371 4134//4371 -f 4134//4372 4133//4372 4123//4372 -f 4134//4373 4123//4373 4135//4373 -f 4135//4374 4123//4352 4122//4351 -f 4136//4375 4137//4376 4004//4377 -f 3999//4159 4001//4161 4004//4164 -f 4004//4378 4001//4378 4138//4378 -f 4004//4377 4138//4379 4136//4375 -f 4137//4376 4139//4380 4004//4377 -f 4004//4377 4139//4380 4140//4381 -f 4004//4377 4140//4381 4141//4382 -f 4142//4383 4143//4384 4144//4385 -f 4141//4382 4143//4386 4004//4377 -f 4004//4387 4143//4387 4142//4387 -f 4004//4388 4142//4389 4145//4390 -f 4146//4391 4147//4392 4142//4393 -f 4142//4393 4147//4392 4148//4394 -f 4142//4389 4148//4395 4145//4390 -f 4144//4385 4149//4396 4142//4383 -f 4142//4393 4149//4397 4150//4398 -f 4142//4393 4150//4398 4151//4399 -f 4151//4399 4152//4400 4142//4393 -f 4142//4393 4152//4400 4153//4401 -f 4142//4393 4153//4401 4146//4391 -f 4154//4402 4155//4403 4065//4404 -f 4154//4402 4065//4404 4156//4405 -f 4072//4266 4074//4268 4065//4259 -f 4065//4406 4074//4407 4157//4408 -f 4065//4406 4157//4408 4156//4409 -f 4155//4403 4158//4410 4065//4404 -f 4065//4404 4158//4410 4159//4411 -f 4065//4404 4159//4411 4160//4412 -f 4161//4413 4162//4414 4163//4415 -f 4160//4412 4162//4416 4065//4404 -f 4065//4417 4162//4417 4161//4417 -f 4065//4418 4161//4419 4164//4420 -f 4164//4420 4161//4419 4165//4421 -f 4163//4415 4166//4422 4161//4413 -f 4161//4413 4166//4422 4167//4423 -f 4161//4413 4167//4423 4168//4424 -f 4168//4424 4169//4425 4161//4413 -f 4161//4413 4169//4425 4170//4426 -f 4161//4413 4170//4426 4165//4427 -f 4171//4428 4172//4428 4173//4428 -f 4174//4429 4175//4429 4176//4429 -f 4177//4430 4178//4430 4179//4430 -f 4180//4431 4181//4431 4182//4431 -f 4177//4432 4179//4432 4183//4432 -f 4103//4433 4105//4433 4184//4433 -f 4175//4434 4185//4434 4070//4434 -f 4185//4435 4186//4435 4070//4435 -f 4070//4436 4186//4436 4187//4436 -f 4070//4437 4187//4437 4071//4437 -f 4174//4438 4176//4439 4188//4440 -f 4189//4441 4190//4441 4191//4441 -f 4190//4442 4192//4442 4193//4442 -f 4193//4443 4192//4443 4194//4443 -f 4193//4444 4194//4444 4195//4444 -f 4175//4445 4070//4446 4176//4447 -f 4176//4447 4070//4446 4067//4448 -f 4176//4447 4067//4448 4196//4449 -f 4196//4450 4067//4451 4084//4452 -f 4196//4450 4084//4452 4197//4453 -f 4197//4454 4084//4455 4083//4456 -f 4197//4454 4083//4456 4198//4457 -f 4198//4458 4083//4459 4082//4460 -f 4198//4458 4082//4460 4199//4461 -f 4199//4462 4082//4463 4087//4464 -f 4199//4462 4087//4464 4200//4465 -f 4200//4466 4087//4467 4086//4468 -f 4200//4466 4086//4468 4201//4469 -f 4201//4470 4086//4471 4081//4472 -f 4201//4470 4081//4472 4202//4473 -f 4202//4474 4081//4475 4090//4476 -f 4202//4474 4090//4476 4203//4477 -f 4203//4477 4090//4476 4089//4478 -f 4203//4477 4089//4478 4204//4479 -f 4204//4479 4089//4478 3997//4480 -f 4204//4479 3997//4480 4205//4481 -f 4205//4481 3997//4480 3996//4482 -f 4205//4481 3996//4482 4206//4483 -f 4206//4483 3996//4482 4091//4484 -f 4206//4483 4091//4484 4207//4485 -f 4207//4485 4091//4484 4093//4486 -f 4207//4485 4093//4486 4208//4487 -f 4208//4487 4093//4486 4095//4488 -f 4208//4487 4095//4488 4209//4489 -f 4209//4489 4095//4488 4097//4490 -f 4209//4489 4097//4490 4210//4491 -f 4210//4492 4097//4493 4099//4494 -f 4210//4492 4099//4494 4211//4495 -f 4211//4496 4099//4497 4101//4498 -f 4211//4496 4101//4498 4212//4499 -f 4212//4500 4101//4501 4103//4502 -f 4212//4500 4103//4502 4213//4503 -f 4213//4503 4103//4502 4184//4504 -f 4213//4505 4184//4505 4214//4505 -f 4214//4506 4215//4506 4213//4506 -f 4213//4507 4215//4508 4216//4509 -f 4213//4507 4216//4509 4212//4510 -f 4212//4510 4216//4509 4217//4511 -f 4212//4510 4217//4511 4211//4512 -f 4211//4512 4217//4511 4218//4513 -f 4211//4512 4218//4513 4210//4514 -f 4210//4514 4218//4513 4219//4515 -f 4210//4514 4219//4515 4209//4516 -f 4209//4516 4219//4515 4220//4517 -f 4209//4516 4220//4517 4208//4517 -f 4208//4517 4220//4517 4221//4518 -f 4208//4517 4221//4518 4207//4519 -f 4207//4519 4221//4518 4222//4520 -f 4207//4521 4222//4522 4206//4523 -f 4206//4523 4222//4522 4223//4524 -f 4206//4525 4223//4526 4205//4527 -f 4205//4527 4223//4526 4224//4528 -f 4205//4529 4224//4530 4204//4531 -f 4204//4531 4224//4530 4225//4532 -f 4204//4533 4225//4534 4203//4535 -f 4203//4535 4225//4534 4226//4536 -f 4203//4537 4226//4538 4202//4539 -f 4202//4539 4226//4538 4227//4540 -f 4202//4541 4227//4542 4201//4543 -f 4201//4543 4227//4542 4228//4544 -f 4201//4545 4228//4546 4200//4547 -f 4200//4547 4228//4546 4229//4548 -f 4200//4549 4229//4550 4199//4551 -f 4199//4551 4229//4550 4230//4552 -f 4199//4553 4230//4554 4198//4555 -f 4198//4555 4230//4554 4231//4556 -f 4198//4557 4231//4558 4197//4559 -f 4197//4559 4231//4558 4232//4560 -f 4197//4561 4232//4562 4196//4563 -f 4196//4563 4232//4562 4233//4564 -f 4196//4565 4233//4566 4176//4567 -f 4176//4567 4233//4566 4173//4568 -f 4176//4439 4173//4569 4188//4440 -f 4188//4570 4173//4570 4172//4570 -f 4215//4571 4183//4571 4216//4571 -f 4216//4572 4183//4573 4179//4574 -f 4216//4572 4179//4574 4217//4575 -f 4217//4575 4179//4574 4234//4576 -f 4217//4575 4234//4576 4218//4577 -f 4218//4577 4234//4576 4235//4578 -f 4218//4579 4235//4580 4219//4581 -f 4219//4581 4235//4580 4236//4582 -f 4219//4583 4236//4584 4220//4585 -f 4220//4585 4236//4584 4237//4586 -f 4220//4587 4237//4588 4221//4589 -f 4221//4589 4237//4588 4238//4590 -f 4221//4591 4238//4592 4222//4593 -f 4222//4593 4238//4592 4239//4594 -f 4222//4595 4239//4596 4223//4597 -f 4223//4597 4239//4596 4240//4598 -f 4223//4599 4240//4600 4224//4601 -f 4224//4601 4240//4600 4241//4602 -f 4224//4603 4241//4604 4225//4605 -f 4225//4605 4241//4604 4242//4606 -f 4225//4607 4242//4607 4226//4607 -f 4226//4608 4242//4608 4243//4608 -f 4226//4609 4243//4609 4227//4609 -f 4227//4610 4243//4610 4244//4610 -f 4227//4611 4244//4611 4228//4611 -f 4228//4612 4244//4612 4245//4612 -f 4228//4613 4245//4613 4229//4613 -f 4229//4614 4245//4614 4246//4614 -f 4229//4615 4246//4615 4230//4615 -f 4230//4616 4246//4616 4247//4616 -f 4230//4617 4247//4617 4231//4617 -f 4231//4618 4247//4618 4248//4618 -f 4231//4619 4248//4619 4232//4619 -f 4232//4620 4248//4620 4249//4620 -f 4232//4621 4249//4621 4233//4621 -f 4233//4622 4249//4622 4250//4622 -f 4233//4623 4250//4623 4173//4623 -f 4173//4624 4250//4624 4193//4624 -f 4173//4625 4193//4625 4171//4625 -f 4171//4626 4193//4626 4195//4626 -f 4190//4627 4193//4627 4191//4627 -f 4191//4628 4193//4628 4250//4628 -f 4191//4629 4250//4629 4251//4629 -f 4251//4630 4250//4630 4249//4630 -f 4251//4631 4249//4631 4252//4631 -f 4252//4632 4249//4632 4248//4632 -f 4252//4633 4248//4633 4253//4633 -f 4253//4634 4248//4634 4247//4634 -f 4253//4635 4247//4635 4254//4635 -f 4254//4636 4247//4636 4246//4636 -f 4254//4637 4246//4637 4255//4637 -f 4255//4638 4246//4638 4245//4638 -f 4255//4639 4245//4639 4256//4639 -f 4256//4640 4245//4640 4244//4640 -f 4256//4641 4244//4641 4257//4641 -f 4257//4642 4244//4642 4243//4642 -f 4257//4643 4243//4643 4258//4643 -f 4258//4644 4243//4644 4242//4644 -f 4258//4645 4242//4645 4259//4645 -f 4259//4646 4242//4646 4241//4646 -f 4259//4647 4241//4647 4260//4647 -f 4260//4648 4241//4648 4240//4648 -f 4260//4649 4240//4649 4261//4649 -f 4261//4650 4240//4650 4239//4650 -f 4261//4651 4239//4651 4262//4651 -f 4262//4652 4239//4652 4238//4652 -f 4262//4653 4238//4653 4263//4653 -f 4263//4654 4238//4654 4237//4654 -f 4263//4655 4237//4655 4264//4655 -f 4264//4656 4237//4656 4236//4656 -f 4264//4657 4236//4657 4265//4657 -f 4265//4658 4236//4658 4235//4658 -f 4265//4659 4235//4659 4266//4659 -f 4266//4660 4235//4660 4234//4660 -f 4266//4661 4234//4661 4267//4661 -f 4267//4662 4234//4662 4179//4662 -f 4267//4663 4179//4663 4181//4663 -f 4181//4664 4179//4664 4178//4664 -f 4181//4665 4178//4665 4182//4665 -f 4268//4666 4269//4666 4270//4666 -f 4271//4667 4272//4668 4273//4669 -f 4273//4670 4272//4670 4274//4670 -f 4273//4671 4274//4671 4275//4671 -f 4275//4672 4274//4672 4276//4672 -f 4275//4673 4276//4673 4180//4673 -f 4273//4669 4277//4674 4271//4667 -f 4271//4675 4277//4675 4278//4675 -f 4271//4676 4278//4676 4279//4676 -f 4279//4677 4278//4677 4280//4677 -f 4279//4678 4280//4678 4281//4678 -f 4281//4679 4280//4679 4282//4679 -f 4281//4680 4282//4680 4283//4680 -f 4283//4681 4282//4681 4284//4681 -f 4285//4682 4286//4682 4287//4682 -f 4285//4683 4287//4683 4288//4683 -f 4288//4684 4287//4684 4289//4684 -f 4288//4685 4289//4685 4290//4685 -f 4290//4686 4289//4686 4291//4686 -f 4290//4687 4291//4687 4292//4687 -f 4292//4688 4291//4688 4293//4688 -f 4292//4689 4293//4689 4294//4689 -f 4294//4690 4293//4690 4295//4690 -f 4294//4691 4295//4691 4284//4691 -f 4284//4692 4295//4692 4296//4692 -f 4284//4693 4296//4693 4283//4693 -f 4285//4694 4297//4694 4286//4694 -f 4286//4695 4297//4695 4298//4695 -f 4286//4696 4298//4696 4299//4696 -f 4299//4697 4298//4697 4300//4697 -f 4299//4698 4300//4698 4301//4698 -f 4301//4699 4300//4699 4302//4699 -f 4301//4700 4302//4700 4303//4700 -f 4303//4701 4302//4701 4304//4701 -f 4303//4702 4304//4702 4305//4702 -f 4305//4703 4304//4703 4306//4703 -f 4305//4704 4306//4704 4269//4704 -f 4269//4705 4306//4705 4307//4705 -f 4269//4706 4307//4706 4270//4706 -f 4308//4707 4309//4708 4310//4709 -f 4268//4710 4270//4710 4311//4710 -f 4311//4711 4270//4711 4312//4711 -f 4311//4712 4312//4712 4313//4712 -f 4313//4713 4312//4713 4314//4713 -f 4313//4713 4314//4713 4315//4713 -f 4315//4714 4314//4714 4308//4714 -f 4315//4715 4308//4715 4316//4715 -f 4316//4716 4308//4707 4310//4709 -f 4316//4716 4310//4709 4317//4717 -f 4318//4718 4319//4718 4320//4718 -f 4321//4719 4322//4720 4274//4721 -f 4274//4722 4322//4723 4276//4724 -f 4274//4721 4272//4725 4321//4719 -f 4321//4726 4272//4726 4271//4726 -f 4321//4727 4271//4727 4323//4727 -f 4323//4728 4271//4728 4279//4728 -f 4323//4729 4279//4729 4324//4729 -f 4324//4730 4279//4730 4281//4730 -f 4324//4731 4281//4732 4325//4733 -f 4281//4732 4283//4734 4325//4733 -f 4325//4735 4283//4736 4296//4737 -f 4325//4735 4296//4737 4295//4738 -f 4295//4739 4293//4740 4325//4741 -f 4325//4741 4293//4740 4291//4742 -f 4325//4743 4291//4743 4326//4743 -f 4326//4744 4291//4744 4289//4744 -f 4326//4745 4289//4745 4327//4745 -f 4327//4746 4289//4746 4287//4746 -f 4286//4747 4328//4748 4287//4749 -f 4287//4749 4328//4748 4329//4750 -f 4287//4751 4329//4751 4327//4751 -f 4286//4747 4299//4752 4328//4748 -f 4328//4753 4299//4754 4301//4755 -f 4328//4753 4301//4755 4303//4756 -f 4303//4757 4305//4758 4328//4759 -f 4328//4759 4305//4758 4269//4760 -f 4328//4759 4269//4760 4268//4761 -f 4268//4761 4311//4762 4328//4759 -f 4328//4759 4311//4762 4313//4763 -f 4328//4764 4313//4764 4330//4764 -f 4330//4765 4313//4765 4315//4765 -f 4330//4766 4315//4767 4331//4768 -f 4331//4769 4315//4770 4316//4771 -f 4331//4769 4316//4771 4317//4772 -f 4317//4772 4332//4773 4331//4769 -f 4331//4774 4332//4775 4333//4776 -f 4331//4774 4333//4776 4334//4777 -f 4335//4778 4336//4779 4331//4774 -f 4331//4774 4336//4779 4337//4780 -f 4331//4768 4337//4781 4330//4766 -f 4334//4777 4338//4782 4331//4774 -f 4331//4774 4338//4782 4339//4783 -f 4331//4774 4339//4783 4335//4778 -f 4322//4723 4340//4784 4276//4724 -f 4276//4785 4340//4785 4341//4785 -f 4276//4786 4341//4786 4342//4786 -f 4342//4787 4341//4787 4343//4787 -f 4342//4788 4343//4788 4344//4788 -f 4343//4789 4345//4790 4344//4791 -f 4344//4791 4345//4790 4346//4792 -f 4344//4793 4346//4793 4319//4793 -f 4319//4794 4346//4795 4347//4796 -f 4319//4794 4347//4796 4320//4797 -f 4318//4798 4320//4798 4348//4798 -f 4348//4799 4320//4799 4349//4799 -f 4348//4800 4349//4800 4350//4800 -f 4349//4801 4351//4802 4350//4803 -f 4350//4803 4351//4802 4352//4804 -f 4350//4805 4352//4806 4353//4807 -f 4353//4807 4352//4806 4354//4808 -f 4352//4806 4355//4809 4354//4808 -f 4354//4808 4355//4809 4356//4810 -f 4354//4808 4356//4810 4357//4811 -f 4357//4812 4356//4812 4358//4812 -f 4357//4813 4358//4813 4359//4813 -f 4358//4814 4360//4815 4359//4816 -f 4359//4816 4360//4815 4361//4817 -f 4359//4816 4361//4817 4362//4818 -f 4362//4819 4363//4820 4359//4821 -f 4359//4821 4363//4820 4364//4822 -f 4359//4821 4364//4822 4365//4823 -f 4365//4823 4366//4824 4359//4821 -f 4359//4821 4366//4824 4367//4825 -f 4359//4821 4367//4825 4368//4826 -f 4369//4827 4370//4828 4371//4829 -f 4369//4827 4371//4829 4372//4830 -f 4368//4826 4373//4831 4359//4821 -f 4359//4821 4373//4831 4374//4832 -f 4359//4833 4374//4833 4371//4833 -f 4371//4829 4374//4834 4375//4835 -f 4371//4829 4375//4835 4372//4830 -f 4376//4836 4377//4837 4371//4838 -f 4371//4838 4377//4837 4378//4839 -f 4371//4838 4378//4839 4379//4840 -f 4379//4840 4380//4841 4371//4838 -f 4371//4842 4380//4843 4381//4844 -f 4371//4842 4381//4844 4359//4845 -f 4370//4828 4382//4846 4371//4829 -f 4371//4838 4382//4847 4383//4848 -f 4371//4838 4383//4848 4376//4836 -f 4340//4849 4384//4850 4341//4851 -f 4341//4851 4384//4850 4385//4852 -f 4341//4853 4385//4854 4343//4855 -f 4343//4855 4385//4854 4386//4856 -f 4343//4857 4386//4858 4345//4859 -f 4345//4859 4386//4858 4387//4860 -f 4345//4861 4387//4861 4346//4861 -f 4346//4862 4387//4862 4388//4862 -f 4346//4863 4388//4863 4347//4863 -f 4347//4864 4388//4864 4389//4864 -f 4347//4865 4389//4865 4320//4865 -f 4320//4866 4389//4867 4349//4868 -f 4389//4867 4390//4869 4349//4868 -f 4349//4870 4390//4870 4391//4870 -f 4349//4871 4391//4871 4351//4871 -f 4351//4872 4391//4872 4392//4872 -f 4351//4873 4392//4873 4352//4873 -f 4352//4874 4392//4874 4393//4874 -f 4352//4875 4393//4876 4355//4877 -f 4355//4877 4393//4876 4394//4878 -f 4355//4879 4394//4880 4356//4881 -f 4394//4880 4395//4882 4356//4881 -f 4356//4883 4395//4883 4396//4883 -f 4356//4884 4396//4884 4358//4884 -f 4358//4885 4396//4885 4397//4885 -f 4358//4886 4397//4886 4360//4886 -f 4360//4887 4397//4887 4398//4887 -f 4375//4888 4374//4888 4399//4888 -f 4399//4889 4374//4889 4373//4889 -f 4399//4890 4373//4891 4400//4892 -f 4400//4892 4373//4891 4368//4893 -f 4400//4894 4368//4895 4401//4896 -f 4401//4896 4368//4895 4367//4896 -f 4401//4897 4367//4898 4402//4899 -f 4402//4899 4367//4898 4366//4900 -f 4402//4901 4366//4902 4403//4903 -f 4403//4903 4366//4902 4365//4904 -f 4403//4905 4365//4906 4404//4907 -f 4404//4907 4365//4906 4364//4908 -f 4404//4909 4364//4910 4405//4911 -f 4405//4911 4364//4910 4363//4912 -f 4405//4913 4363//4913 4406//4913 -f 4406//4914 4363//4914 4362//4914 -f 4406//4915 4362//4916 4398//4917 -f 4398//4917 4362//4916 4361//4918 -f 4398//4919 4361//4919 4360//4919 -f 4399//4920 4407//4920 4375//4920 -f 4375//4921 4407//4921 4408//4921 -f 4375//4922 4408//4922 4372//4922 -f 4372//4923 4408//4923 4409//4923 -f 4372//4924 4409//4924 4369//4924 -f 4369//4925 4409//4925 4410//4925 -f 4369//4926 4410//4926 4411//4926 -f 4412//4927 4413//4927 4414//4927 -f 4414//4928 4413//4928 4415//4928 -f 4414//4928 4415//4928 4416//4928 -f 4416//4929 4415//4929 4417//4929 -f 4416//4929 4417//4929 4418//4929 -f 4418//4930 4417//4930 4419//4930 -f 4418//4930 4419//4930 4420//4930 -f 4420//4931 4419//4931 4421//4931 -f 4420//4931 4421//4931 4422//4931 -f 4422//4932 4421//4932 4423//4932 -f 4422//4932 4423//4932 4424//4932 -f 4424//4933 4423//4933 4425//4933 -f 4424//4933 4425//4933 4426//4933 -f 4426//4934 4425//4934 4427//4934 -f 4426//4934 4427//4934 4428//4934 -f 4428//4935 4427//4935 4429//4935 -f 4428//4935 4429//4935 4430//4935 -f 4430//4936 4429//4936 4431//4936 -f 4430//4936 4431//4936 4432//4936 -f 4432//4937 4431//4937 4433//4937 -f 4432//4937 4433//4937 4434//4937 -f 4434//4938 4433//4938 4435//4938 -f 4434//4938 4435//4938 4436//4938 -f 4436//4939 4435//4939 4437//4939 -f 4436//4939 4437//4939 4438//4939 -f 4438//4940 4437//4940 4439//4940 -f 4438//4940 4439//4940 4440//4940 -f 4440//4941 4439//4941 4441//4941 -f 4440//4941 4441//4941 4442//4941 -f 4442//4942 4441//4942 4443//4942 -f 4442//4942 4443//4942 4444//4942 -f 4444//4943 4443//4943 4445//4943 -f 4444//4943 4445//4943 4446//4943 -f 4446//4944 4445//4944 4447//4944 -f 4446//4944 4447//4944 4448//4944 -f 4448//4945 4447//4945 4449//4945 -f 4448//4945 4449//4945 4450//4945 -f 4450//504 4449//504 4451//504 -f 4450//504 4451//504 4452//504 -f 4452//4946 4451//4946 4453//4946 -f 4452//4946 4453//4946 4454//4946 -f 4454//4947 4453//4947 4455//4947 -f 4454//4947 4455//4947 4456//4947 -f 4456//4948 4455//4948 4457//4948 -f 4456//4948 4457//4948 4458//4948 -f 4458//4949 4457//4949 4459//4949 -f 4458//4949 4459//4949 4460//4949 -f 4460//4950 4459//4950 4461//4950 -f 4460//4950 4461//4950 4462//4950 -f 4462//4951 4461//4951 4463//4951 -f 4462//4952 4463//4952 4464//4952 -f 4464//4953 4463//4953 4465//4953 -f 4464//4953 4465//4953 4466//4953 -f 4466//4954 4465//4954 4467//4954 -f 4466//4954 4467//4954 4468//4954 -f 4468//4955 4467//4955 4469//4955 -f 4468//4955 4469//4955 4470//4955 -f 4470//4956 4469//4956 4471//4956 -f 4470//4956 4471//4956 4472//4956 -f 4472//4957 4471//4957 4473//4957 -f 4472//4957 4473//4957 4474//4957 -f 4474//4958 4473//4958 4475//4958 -f 4474//4958 4475//4958 4476//4958 -f 4476//4959 4475//4959 4477//4959 -f 4476//4959 4477//4959 4478//4959 -f 4478//4960 4477//4960 4479//4960 -f 4478//4960 4479//4960 4480//4960 -f 4480//4961 4479//4961 4481//4961 -f 4480//4961 4481//4961 4482//4961 -f 4482//4962 4481//4962 4483//4962 -f 4482//4962 4483//4962 4484//4962 -f 4484//4963 4483//4963 4485//4963 -f 4484//4963 4485//4963 4486//4963 -f 4486//4964 4485//4964 4487//4964 -f 4486//4964 4487//4964 4488//4964 -f 4488//4965 4487//4965 4489//4965 -f 4488//4965 4489//4965 4412//4965 -f 4412//4927 4489//4927 4413//4927 -f 4486//19 4488//19 4490//19 -f 4490//19 4488//19 4412//19 -f 4490//19 4412//19 4414//19 -f 4480//19 4482//19 4490//19 -f 4490//19 4482//19 4484//19 -f 4490//19 4484//19 4486//19 -f 4474//19 4476//19 4490//19 -f 4490//19 4476//19 4478//19 -f 4490//19 4478//19 4480//19 -f 4468//19 4470//19 4490//19 -f 4490//19 4470//19 4472//19 -f 4490//19 4472//19 4474//19 -f 4462//19 4464//19 4490//19 -f 4490//19 4464//19 4466//19 -f 4490//19 4466//19 4468//19 -f 4456//19 4458//19 4490//19 -f 4490//19 4458//19 4460//19 -f 4490//19 4460//19 4462//19 -f 4450//19 4452//19 4490//19 -f 4490//19 4452//19 4454//19 -f 4490//19 4454//19 4456//19 -f 4444//19 4446//19 4490//19 -f 4490//19 4446//19 4448//19 -f 4490//19 4448//19 4450//19 -f 4438//19 4440//19 4490//19 -f 4490//19 4440//19 4442//19 -f 4490//19 4442//19 4444//19 -f 4432//19 4434//19 4490//19 -f 4490//19 4434//19 4436//19 -f 4490//19 4436//19 4438//19 -f 4426//19 4428//19 4490//19 -f 4490//19 4428//19 4430//19 -f 4490//19 4430//19 4432//19 -f 4420//19 4422//19 4490//19 -f 4490//19 4422//19 4424//19 -f 4490//19 4424//19 4426//19 -f 4414//19 4416//19 4490//19 -f 4490//19 4416//19 4418//19 -f 4490//19 4418//19 4420//19 -f 4491//19 4492//19 4493//19 -f 4493//19 4492//19 4494//19 -f 4493//19 4494//19 4495//19 -f 4493//19 4496//19 4497//19 -f 4497//19 4496//19 4498//19 -f 4497//19 4498//19 4499//19 -f 4495//19 4500//19 4493//19 -f 4493//19 4500//19 4501//19 -f 4493//19 4501//19 4496//19 -f 4502//19 4503//19 4504//19 -f 4505//19 4506//19 4507//19 -f 4508//19 4509//19 4510//19 -f 4510//19 4509//19 4511//19 -f 4512//19 4513//19 4514//19 -f 4514//19 4513//19 4515//19 -f 4514//19 4515//19 4516//19 -f 4511//19 4517//19 4510//19 -f 4510//19 4517//19 4514//19 -f 4510//19 4514//19 4518//19 -f 4518//19 4514//19 4516//19 -f 4502//19 4504//19 4514//19 -f 4514//19 4504//19 4519//19 -f 4514//19 4519//19 4512//19 -f 4520//19 4521//19 4493//19 -f 4493//19 4521//19 4522//19 -f 4493//19 4522//19 4491//19 -f 4499//19 4498//19 4507//19 -f 4507//19 4498//19 4523//19 -f 4507//19 4523//19 4505//19 -f 4508//19 4510//19 4493//19 -f 4493//19 4510//19 4524//19 -f 4493//19 4524//19 4520//19 -f 4525//19 4526//19 4527//19 -f 4527//19 4526//19 4528//19 -f 4528//19 4529//19 4527//19 -f 4527//19 4529//19 4530//19 -f 4527//4966 4530//4966 4531//4966 -f 4506//19 4532//19 4507//19 -f 4507//19 4532//19 4526//19 -f 4507//19 4526//19 4533//2119 -f 4533//2119 4526//19 4525//19 -f 4534//4967 4514//4967 4535//4967 -f 4535//4968 4514//4968 4517//4968 -f 4535//4969 4517//4969 4536//4969 -f 4536//4970 4517//4970 4537//4970 -f 4538//4971 4539//4971 4511//4971 -f 4511//4972 4539//4972 4540//4972 -f 4511//4973 4540//4973 4517//4973 -f 4517//4974 4540//4974 4541//4974 -f 4517//4975 4541//4975 4537//4975 -f 4538//4976 4511//4976 4542//4976 -f 4542//4977 4511//4977 4509//4977 -f 4542//4978 4509//4979 4543//4980 -f 4508//4981 4544//4981 4509//4981 -f 4509//4982 4544//4982 4545//4982 -f 4509//4979 4545//4983 4543//4980 -f 4546//4984 4547//4984 4493//4984 -f 4493//4985 4547//4985 4548//4985 -f 4493//4986 4548//4986 4508//4986 -f 4508//4987 4548//4987 4549//4987 -f 4508//4988 4549//4988 4544//4988 -f 4546//4989 4493//4990 4550//4991 -f 4550//4991 4493//4990 4497//4992 -f 4550//4993 4497//4993 4551//4993 -f 4551//4994 4497//4994 4552//4994 -f 4552//4995 4497//4995 4499//4995 -f 4552//4996 4499//4996 4553//4996 -f 4507//4997 4554//4997 4499//4997 -f 4499//4998 4554//4998 4555//4998 -f 4499//4999 4555//4999 4553//4999 -f 4556//5000 4557//5000 4533//5000 -f 4533//5001 4557//5002 4558//5003 -f 4533//5001 4558//5003 4507//5004 -f 4507//5005 4558//5005 4559//5005 -f 4507//5006 4559//5006 4554//5006 -f 4556//5007 4533//5007 4560//5007 -f 4560//5008 4533//5009 4525//5010 -f 4560//5008 4525//5010 4561//5011 -f 4562//5012 4563//5012 4527//5012 -f 4527//5013 4563//5013 4564//5013 -f 4527//5014 4564//5014 4525//5014 -f 4525//5015 4564//5015 4565//5015 -f 4525//5016 4565//5016 4561//5016 -f 4566//5017 4545//5017 4544//5018 -f 4567//5019 4568//5019 4569//5019 -f 4570//5020 4534//5020 4535//5020 -f 4571//5021 4572//5021 4573//5021 -f 4574//5022 4575//5022 4573//5022 -f 4575//5023 4576//5023 4573//5023 -f 4573//5024 4576//5024 4577//5024 -f 4573//5025 4577//5025 4571//5025 -f 4578//5026 4579//5026 4580//5026 -f 4567//5027 4569//5027 4581//5027 -f 4580//5028 4581//5028 4578//5028 -f 4578//5029 4581//5029 4569//5029 -f 4578//5030 4569//5030 4582//5030 -f 4582//5031 4569//5031 4583//5031 -f 4569//5032 4584//5032 4583//5032 -f 4583//5033 4584//5033 4585//5033 -f 4583//5034 4585//5034 4586//5034 -f 4586//5035 4585//5035 4587//5035 -f 4586//5036 4587//5036 4588//5036 -f 4588//5037 4587//5037 4589//5037 -f 4588//5038 4589//5038 4590//5038 -f 4590//5039 4589//5039 4591//5039 -f 4590//5040 4591//5041 4592//5042 -f 4592//5042 4591//5041 4593//5043 -f 4593//5044 4591//5045 4594//5046 -f 4595//5047 4596//5047 4597//5047 -f 4596//5048 4598//5048 4597//5048 -f 4597//5049 4598//5049 4599//5049 -f 4597//5050 4599//5050 4600//5050 -f 4601//5051 4602//5051 4603//5051 -f 4603//5052 4602//5052 4604//5052 -f 4603//5053 4604//5053 4595//5053 -f 4605//5054 4606//5054 4607//5054 -f 4607//5055 4606//5055 4608//5055 -f 4607//5056 4608//5056 4609//5056 -f 4610//5057 4563//5057 4607//5058 -f 4607//5059 4563//5059 4562//5059 -f 4607//5060 4562//5060 4605//5060 -f 4561//5061 4565//5061 4610//5061 -f 4610//5062 4565//5062 4564//5062 -f 4610//5057 4564//5063 4563//5057 -f 4610//5064 4611//5064 4561//5064 -f 4561//5065 4611//5066 4612//5067 -f 4561//5065 4612//5067 4560//5068 -f 4560//5069 4612//5069 4556//5069 -f 4556//5070 4612//5070 4557//5070 -f 4557//5071 4612//5071 4613//5071 -f 4557//5072 4613//5073 4614//5072 -f 4615//5074 4554//5074 4616//5074 -f 4616//5075 4554//5075 4559//5075 -f 4616//5076 4559//5077 4614//5078 -f 4614//5078 4559//5077 4558//5079 -f 4614//5072 4558//5072 4557//5072 -f 4617//5080 4551//5080 4618//5080 -f 4618//5081 4551//5082 4552//5083 -f 4618//5081 4552//5083 4619//5084 -f 4619//5085 4552//5085 4553//5085 -f 4619//5086 4553//5087 4615//5088 -f 4615//5088 4553//5087 4555//5089 -f 4615//5074 4555//5090 4554//5074 -f 4547//5091 4546//5091 4617//5091 -f 4617//5092 4546//5092 4550//5092 -f 4617//5080 4550//5080 4551//5080 -f 4617//5093 4620//5093 4547//5093 -f 4547//5094 4620//5095 4621//5096 -f 4547//5094 4621//5096 4548//5097 -f 4548//5098 4621//5098 4549//5098 -f 4595//5099 4597//5099 4603//5099 -f 4603//5100 4597//5101 4622//5100 -f 4603//5100 4622//5100 4623//5102 -f 4623//5103 4622//5103 4624//5103 -f 4623//5103 4624//5103 4625//5104 -f 4625//5105 4624//5105 4626//5105 -f 4625//5105 4626//5105 4627//5105 -f 4627//5106 4626//5106 4628//5106 -f 4627//5106 4628//5106 4629//5107 -f 4629//5108 4628//5108 4630//5108 -f 4629//5108 4630//5108 4631//5108 -f 4631//5109 4630//5110 4632//5109 -f 4631//5109 4632//5109 4633//5111 -f 4633//5112 4632//5112 4634//5112 -f 4633//5112 4634//5112 4635//5112 -f 4635//5113 4634//5113 4636//5113 -f 4635//5113 4636//5113 4637//5113 -f 4637//5114 4636//5114 4638//5115 -f 4637//5114 4638//5115 4639//5115 -f 4639//5116 4638//5116 4640//5116 -f 4639//5116 4640//5116 4641//5116 -f 4641//5117 4640//5117 4642//5117 -f 4641//5117 4642//5117 4643//5117 -f 4643//5118 4642//5118 4644//5118 -f 4643//5118 4644//5118 4645//5119 -f 4645//5120 4644//5120 4646//5120 -f 4645//5120 4646//5120 4647//5121 -f 4647//5122 4646//5122 4648//5123 -f 4647//5122 4648//5123 4594//5046 -f 4594//5046 4648//5123 4593//5044 -f 4549//5124 4621//5124 4544//5124 -f 4544//5125 4621//5125 4649//5125 -f 4544//5018 4649//5018 4566//5017 -f 4545//5126 4566//5127 4543//5128 -f 4543//5128 4566//5127 4650//5129 -f 4543//5128 4650//5129 4542//5130 -f 4542//5131 4650//5132 4651//5131 -f 4542//5131 4651//5131 4538//5131 -f 4538//5133 4651//5134 4539//5135 -f 4539//5135 4651//5134 4652//5136 -f 4539//5137 4652//5137 4540//5137 -f 4540//5138 4652//5138 4653//5138 -f 4540//5138 4653//5138 4541//5138 -f 4568//5139 4574//5139 4569//5139 -f 4569//5140 4574//5140 4573//5140 -f 4569//5141 4573//5142 4584//5143 -f 4584//5143 4573//5142 4654//5144 -f 4584//5145 4654//5146 4585//5146 -f 4585//5146 4654//5146 4653//5147 -f 4585//5148 4653//5148 4587//5148 -f 4587//5148 4653//5148 4652//5148 -f 4587//5149 4652//5150 4589//5150 -f 4589//5150 4652//5150 4651//5150 -f 4589//5151 4651//5151 4591//5152 -f 4591//5152 4651//5151 4650//5153 -f 4591//5154 4650//5155 4594//5156 -f 4594//5156 4650//5155 4566//5157 -f 4594//5158 4566//5158 4647//5159 -f 4647//5159 4566//5158 4649//5159 -f 4647//5160 4649//5161 4645//5162 -f 4645//5162 4649//5161 4621//5162 -f 4645//5163 4621//5163 4643//5163 -f 4643//5163 4621//5163 4620//5164 -f 4643//5165 4620//5166 4641//5166 -f 4641//5166 4620//5166 4617//5166 -f 4641//5167 4617//5167 4639//5168 -f 4639//5168 4617//5167 4618//5168 -f 4639//5169 4618//5170 4637//5171 -f 4637//5171 4618//5170 4619//5172 -f 4637//5173 4619//5174 4635//5175 -f 4635//5175 4619//5174 4615//5176 -f 4635//5177 4615//5178 4633//5178 -f 4633//5178 4615//5178 4616//5178 -f 4633//5179 4616//5180 4631//5181 -f 4631//5181 4616//5180 4614//5182 -f 4631//5183 4614//5184 4629//5184 -f 4629//5184 4614//5184 4613//5185 -f 4629//5186 4613//5186 4627//5186 -f 4627//5186 4613//5186 4612//5186 -f 4627//5187 4612//5188 4625//5188 -f 4625//5188 4612//5188 4611//5189 -f 4625//5190 4611//5191 4623//5191 -f 4623//5191 4611//5191 4610//5192 -f 4623//5193 4610//5194 4603//5194 -f 4603//5194 4610//5194 4607//5195 -f 4603//5196 4607//5196 4601//5196 -f 4601//5197 4607//5197 4609//5197 -f 4541//5198 4653//5199 4537//5200 -f 4537//5200 4653//5199 4654//5201 -f 4537//5202 4654//5202 4536//5202 -f 4536//5203 4654//5204 4573//5203 -f 4536//5203 4573//5203 4535//5205 -f 4535//5206 4573//5206 4572//5206 -f 4535//5207 4572//5207 4570//5207 -f 4655//19 4656//19 4657//19 -f 4657//19 4656//19 4658//19 -f 4658//19 4659//19 4657//19 -f 4657//19 4659//19 4660//19 -f 4657//19 4660//19 4661//2121 -f 4661//2121 4662//2120 4657//19 -f 4657//19 4662//2120 4663//19 -f 4657//19 4663//19 4664//19 -f 4665//19 4666//19 4664//19 -f 4664//19 4666//19 4667//19 -f 4664//19 4667//19 4668//19 -f 4593//5208 4648//5209 4669//5210 -f 4669//5210 4648//5209 4646//19 -f 4669//5210 4646//19 4670//19 -f 4671//19 4672//19 4673//19 -f 4668//19 4674//19 4664//19 -f 4664//19 4674//19 4579//19 -f 4664//19 4579//19 4657//19 -f 4657//19 4579//19 4578//5211 -f 4657//19 4578//5211 4582//19 -f 4675//19 4638//19 4636//19 -f 4671//19 4673//19 4676//19 -f 4676//19 4673//19 4677//19 -f 4676//19 4677//19 4678//19 -f 4678//19 4677//19 4679//19 -f 4678//19 4679//19 4680//19 -f 4680//19 4679//19 4681//19 -f 4680//19 4681//19 4682//19 -f 4683//19 4684//19 4626//19 -f 4672//19 4671//19 4685//19 -f 4685//19 4671//19 4686//19 -f 4685//19 4686//19 4687//19 -f 4687//19 4686//19 4688//19 -f 4687//19 4688//19 4600//19 -f 4689//19 4690//19 4691//19 -f 4692//19 4693//19 4694//19 -f 4694//19 4693//19 4695//19 -f 4694//19 4695//19 4696//19 -f 4696//19 4695//19 4697//19 -f 4696//19 4697//19 4698//19 -f 4698//19 4697//19 4699//19 -f 4698//19 4699//19 4700//19 -f 4632//19 4701//19 4634//19 -f 4634//19 4701//19 4702//19 -f 4634//19 4702//19 4636//19 -f 4636//19 4702//19 4703//19 -f 4636//19 4703//19 4675//19 -f 4626//19 4684//19 4628//19 -f 4628//19 4684//19 4704//19 -f 4628//19 4704//19 4630//19 -f 4630//19 4704//19 4705//19 -f 4630//19 4705//19 4632//19 -f 4632//19 4705//19 4706//19 -f 4632//19 4706//19 4701//19 -f 4646//19 4644//19 4670//19 -f 4670//19 4644//19 4642//19 -f 4670//19 4642//19 4707//19 -f 4707//19 4642//19 4640//19 -f 4707//19 4640//19 4708//2120 -f 4675//19 4709//19 4638//19 -f 4638//19 4709//19 4710//19 -f 4638//19 4710//19 4640//19 -f 4640//19 4710//19 4711//2120 -f 4640//19 4711//2120 4708//2120 -f 4626//19 4624//19 4683//19 -f 4683//19 4624//19 4622//19 -f 4683//19 4622//19 4712//19 -f 4712//19 4622//19 4597//19 -f 4712//19 4597//19 4713//19 -f 4713//19 4597//19 4600//19 -f 4713//19 4600//19 4714//19 -f 4714//19 4600//19 4688//19 -f 4699//19 4715//2119 4700//19 -f 4700//19 4715//2119 4716//19 -f 4700//19 4716//19 4717//19 -f 4717//19 4716//19 4718//19 -f 4717//19 4718//19 4719//19 -f 4719//19 4718//19 4720//19 -f 4719//19 4720//19 4721//19 -f 4721//19 4720//19 4722//19 -f 4721//19 4722//19 4723//19 -f 4723//19 4722//19 4724//19 -f 4723//19 4724//19 4725//19 -f 4725//19 4724//19 4726//19 -f 4725//19 4726//19 4727//19 -f 4727//19 4726//19 4728//19 -f 4727//19 4728//19 4729//19 -f 4729//19 4728//19 4730//19 -f 4729//19 4730//19 4731//19 -f 4731//19 4730//19 4732//19 -f 4731//19 4732//19 4733//19 -f 4733//19 4732//19 4734//19 -f 4733//19 4734//19 4735//19 -f 4735//19 4734//19 4736//19 -f 4735//19 4736//19 4737//19 -f 4737//19 4736//19 4738//19 -f 4737//19 4738//19 4739//19 -f 4739//19 4738//19 4740//19 -f 4739//19 4740//19 4741//19 -f 4741//19 4740//19 4742//19 -f 4741//19 4742//19 4743//19 -f 4743//19 4742//19 4744//19 -f 4743//19 4744//19 4745//19 -f 4745//19 4744//19 4746//19 -f 4745//19 4746//19 4747//19 -f 4747//19 4746//19 4748//19 -f 4747//19 4748//19 4749//19 -f 4691//19 4690//19 4750//19 -f 4748//19 4751//19 4749//19 -f 4749//19 4751//19 4752//19 -f 4749//19 4752//19 4753//19 -f 4753//19 4752//19 4754//19 -f 4753//19 4754//19 4755//19 -f 4755//19 4754//19 4756//19 -f 4755//19 4756//19 4757//19 -f 4757//19 4756//19 4758//19 -f 4757//19 4758//19 4759//19 -f 4665//19 4664//19 4760//19 -f 4760//19 4664//19 4761//19 -f 4760//19 4761//19 4762//19 -f 4762//19 4761//19 4763//19 -f 4762//19 4763//19 4764//19 -f 4764//19 4763//19 4765//19 -f 4764//19 4765//19 4766//19 -f 4766//19 4765//19 4767//19 -f 4766//19 4767//19 4768//19 -f 4768//19 4767//19 4769//19 -f 4768//19 4769//19 4692//19 -f 4692//19 4769//19 4770//19 -f 4692//19 4770//19 4693//19 -f 4682//19 4681//19 4771//19 -f 4771//19 4681//19 4772//19 -f 4771//19 4772//19 4773//19 -f 4773//19 4772//19 4774//19 -f 4773//19 4774//19 4775//19 -f 4775//19 4774//19 4776//19 -f 4775//19 4776//19 4777//19 -f 4777//19 4776//19 4778//19 -f 4777//19 4778//19 4779//19 -f 4779//19 4778//19 4780//19 -f 4779//19 4780//19 4781//19 -f 4781//19 4780//19 4782//19 -f 4781//19 4782//19 4783//19 -f 4783//19 4782//19 4784//19 -f 4783//19 4784//19 4785//19 -f 4785//19 4784//19 4786//19 -f 4785//19 4786//19 4787//19 -f 4787//19 4786//19 4788//19 -f 4788//19 4786//19 4789//19 -f 4788//19 4789//19 4790//19 -f 4790//19 4789//19 4791//19 -f 4790//19 4791//19 4792//19 -f 4792//19 4791//19 4793//19 -f 4792//19 4793//19 4794//19 -f 4690//19 4795//2120 4750//19 -f 4750//19 4795//2120 4796//2120 -f 4750//19 4796//2120 4797//19 -f 4797//19 4796//2120 4759//19 -f 4797//19 4759//19 4798//19 -f 4798//19 4759//19 4758//19 -f 4691//19 4799//19 4689//19 -f 4689//19 4799//19 4800//19 -f 4689//19 4800//19 4801//19 -f 4801//19 4800//19 4802//19 -f 4801//19 4802//19 4803//19 -f 4803//19 4802//19 4804//19 -f 4803//19 4804//19 4805//19 -f 4805//19 4804//19 4806//19 -f 4805//19 4806//19 4807//19 -f 4807//19 4806//19 4808//19 -f 4807//19 4808//19 4809//19 -f 4809//19 4808//19 4794//19 -f 4809//19 4794//19 4810//19 -f 4810//19 4794//19 4793//19 -f 4811//5212 4812//5212 4813//5212 -f 4813//5213 4812//5213 4814//5213 -f 4815//5214 4816//5214 4817//5214 -f 4818//5215 4819//5215 4813//5215 -f 4813//5216 4819//5216 4820//5216 -f 4813//5217 4820//5217 4811//5217 -f 4728//5218 4821//5218 4730//5218 -f 4730//5219 4821//5219 4822//5219 -f 4730//5220 4822//5220 4823//5220 -f 4824//5221 4825//5222 4804//5223 -f 4804//5224 4825//5224 4826//5224 -f 4804//5225 4826//5225 4806//5225 -f 4827//5226 4828//5226 4829//5226 -f 4829//5227 4828//5227 4830//5227 -f 4829//5228 4830//5228 4824//5228 -f 4831//5229 4832//5229 4833//5229 -f 4834//5230 4835//5230 4831//5230 -f 4831//5231 4835//5231 4836//5231 -f 4831//5232 4836//5232 4832//5232 -f 4837//5233 4838//5233 4834//5233 -f 4824//5221 4804//5223 4829//5234 -f 4829//5235 4804//5235 4802//5235 -f 4829//5235 4802//5235 4839//5236 -f 4839//5237 4802//5238 4800//5237 -f 4839//5237 4800//5237 4840//5237 -f 4840//5239 4800//5239 4799//5239 -f 4840//5239 4799//5239 4841//5239 -f 4841//5240 4799//5240 4691//5241 -f 4841//5240 4691//5241 4842//5241 -f 4842//5242 4691//5242 4750//5242 -f 4842//5242 4750//5242 4843//5243 -f 4843//5244 4750//5244 4797//5245 -f 4843//5244 4797//5245 4844//5246 -f 4844//5246 4797//5245 4798//5246 -f 4844//5246 4798//5246 4845//5247 -f 4845//5247 4798//5246 4758//5248 -f 4845//5247 4758//5248 4846//5248 -f 4846//5249 4758//5249 4756//5250 -f 4846//5249 4756//5250 4847//5250 -f 4847//5251 4756//5251 4754//5251 -f 4847//5251 4754//5251 4848//5252 -f 4848//5253 4754//5254 4752//5253 -f 4848//5253 4752//5253 4849//5253 -f 4849//5255 4752//5256 4751//5255 -f 4849//5255 4751//5255 4850//5257 -f 4850//5258 4751//5259 4748//5258 -f 4850//5258 4748//5258 4851//5258 -f 4851//5260 4748//5260 4746//5261 -f 4851//5260 4746//5261 4852//5261 -f 4852//5262 4746//5263 4744//5262 -f 4852//5262 4744//5262 4853//5264 -f 4853//5264 4744//5262 4742//5265 -f 4853//5264 4742//5265 4854//5265 -f 4854//5266 4742//5266 4740//5266 -f 4854//5266 4740//5266 4855//5267 -f 4855//5268 4740//5268 4738//5268 -f 4855//5268 4738//5268 4856//5268 -f 4856//5269 4738//5269 4736//5269 -f 4856//5269 4736//5269 4857//5270 -f 4857//5270 4736//5269 4734//5271 -f 4857//5270 4734//5271 4858//5272 -f 4858//5272 4734//5271 4732//5273 -f 4858//5272 4732//5273 4859//5273 -f 4859//5274 4732//5274 4730//5275 -f 4859//5274 4730//5275 4815//5275 -f 4815//5276 4730//5276 4823//5276 -f 4815//5277 4823//5277 4816//5277 -f 4817//5278 4818//5278 4815//5278 -f 4815//5279 4818//5280 4813//5281 -f 4815//5279 4813//5281 4859//5282 -f 4859//5282 4813//5281 4860//5282 -f 4859//5283 4860//5283 4858//5283 -f 4858//5283 4860//5283 4861//5283 -f 4858//5284 4861//5285 4857//5285 -f 4857//5285 4861//5285 4862//5286 -f 4857//5287 4862//5287 4856//5287 -f 4856//5287 4862//5287 4863//5288 -f 4856//5289 4863//5290 4855//5291 -f 4855//5291 4863//5290 4864//5291 -f 4855//5292 4864//5292 4854//5292 -f 4854//5292 4864//5292 4865//5293 -f 4854//5294 4865//5295 4853//5296 -f 4853//5296 4865//5295 4866//5296 -f 4853//5297 4866//5298 4852//5298 -f 4852//5298 4866//5298 4867//5299 -f 4852//5300 4867//5301 4851//5301 -f 4851//5301 4867//5301 4868//5302 -f 4851//5303 4868//5304 4850//5305 -f 4850//5305 4868//5304 4869//5305 -f 4850//5306 4869//5306 4849//5306 -f 4849//5306 4869//5306 4870//5306 -f 4849//5307 4870//5307 4848//5307 -f 4848//5307 4870//5307 4871//5307 -f 4848//5308 4871//5308 4847//5308 -f 4847//5308 4871//5308 4872//5308 -f 4847//5309 4872//5310 4846//5311 -f 4846//5311 4872//5310 4873//5311 -f 4846//5312 4873//5313 4845//5313 -f 4845//5313 4873//5313 4874//5313 -f 4845//5314 4874//5315 4844//5315 -f 4844//5315 4874//5315 4875//5315 -f 4844//5316 4875//5317 4843//5317 -f 4843//5317 4875//5317 4876//5317 -f 4843//5318 4876//5319 4842//5319 -f 4842//5319 4876//5319 4877//5320 -f 4842//5321 4877//5321 4841//5321 -f 4841//5321 4877//5321 4878//5322 -f 4841//5323 4878//5323 4840//5323 -f 4840//5323 4878//5323 4879//5324 -f 4840//5325 4879//5326 4839//5326 -f 4839//5326 4879//5326 4880//5326 -f 4839//5327 4880//5328 4829//5329 -f 4829//5329 4880//5328 4831//5330 -f 4829//5331 4831//5331 4827//5331 -f 4827//5332 4831//5332 4833//5332 -f 4834//5333 4831//5333 4837//5333 -f 4837//5334 4831//5334 4880//5334 -f 4837//5334 4880//5334 4881//5334 -f 4881//5335 4880//5335 4879//5335 -f 4881//5336 4879//5336 4882//5336 -f 4882//5337 4879//5337 4878//5337 -f 4882//5337 4878//5337 4883//5337 -f 4883//5338 4878//5338 4877//5338 -f 4883//5339 4877//5339 4884//5339 -f 4884//5340 4877//5340 4876//5340 -f 4884//5341 4876//5341 4885//5341 -f 4885//5342 4876//5342 4875//5342 -f 4885//5343 4875//5343 4886//5343 -f 4886//5344 4875//5344 4874//5344 -f 4886//5345 4874//5345 4887//5345 -f 4887//5346 4874//5346 4873//5346 -f 4887//5347 4873//5347 4888//5347 -f 4888//5348 4873//5348 4872//5348 -f 4888//5349 4872//5349 4889//5349 -f 4889//5350 4872//5350 4871//5350 -f 4889//5351 4871//5351 4890//5351 -f 4890//5352 4871//5352 4870//5352 -f 4890//5353 4870//5353 4891//5353 -f 4891//5354 4870//5354 4869//5354 -f 4891//5355 4869//5355 4892//5355 -f 4892//5356 4869//5356 4868//5356 -f 4892//5357 4868//5357 4893//5357 -f 4893//5358 4868//5358 4867//5358 -f 4893//5359 4867//5359 4894//5359 -f 4894//5360 4867//5360 4866//5360 -f 4894//5361 4866//5361 4895//5361 -f 4895//5362 4866//5362 4865//5362 -f 4895//5363 4865//5363 4896//5363 -f 4896//5364 4865//5364 4864//5364 -f 4896//5365 4864//5365 4897//5365 -f 4897//5366 4864//5366 4863//5366 -f 4897//5366 4863//5366 4898//5366 -f 4898//5367 4863//5367 4862//5367 -f 4898//5368 4862//5368 4899//5368 -f 4899//5369 4862//5369 4861//5369 -f 4899//5370 4861//5370 4900//5370 -f 4900//5371 4861//5371 4860//5371 -f 4900//5372 4860//5372 4901//5372 -f 4901//5373 4860//5373 4813//5373 -f 4901//5374 4813//5374 4902//5374 -f 4902//5375 4813//5375 4814//5375 -f 4902//5376 4814//5376 4903//5376 -f 4904//19 4905//19 4906//19 -f 4904//19 4907//2119 4905//19 -f 4905//19 4907//2119 4908//19 -f 4905//19 4908//19 4909//19 -f 4910//19 4911//19 4912//19 -f 4912//19 4911//19 4913//19 -f 4914//19 4915//19 4911//19 -f 4916//19 4917//19 4918//19 -f 4919//19 4920//19 4911//19 -f 4911//19 4920//19 4921//19 -f 4911//19 4921//19 4913//19 -f 4922//19 4923//19 4924//19 -f 4924//19 4923//19 4911//19 -f 4924//19 4911//19 4925//19 -f 4925//19 4911//19 4915//19 -f 4922//19 4926//19 4923//19 -f 4923//19 4926//19 4927//19 -f 4923//19 4927//19 4928//19 -f 4929//19 4930//19 4931//19 -f 4931//19 4930//19 4932//19 -f 4906//19 4933//19 4904//19 -f 4904//19 4933//19 4934//19 -f 4904//19 4934//19 4935//19 -f 4935//19 4936//19 4904//19 -f 4904//19 4936//19 4923//19 -f 4904//19 4923//19 4937//19 -f 4909//19 4908//19 4931//19 -f 4931//19 4908//19 4938//19 -f 4931//19 4938//19 4929//19 -f 4919//19 4911//19 4918//19 -f 4918//19 4911//19 4939//19 -f 4918//19 4939//19 4940//19 -f 4941//19 4942//5377 4943//2121 -f 4910//19 4944//19 4911//19 -f 4911//19 4944//19 4945//19 -f 4911//19 4945//19 4914//19 -f 4928//19 4946//19 4923//19 -f 4923//19 4946//19 4947//19 -f 4923//19 4947//19 4937//19 -f 4948//19 4949//19 4932//19 -f 4932//19 4949//19 4950//19 -f 4932//19 4950//19 4931//19 -f 4940//19 4951//19 4918//19 -f 4918//19 4951//19 4952//19 -f 4918//19 4952//19 4916//19 -f 4917//19 4953//2119 4918//19 -f 4918//19 4953//2119 4941//19 -f 4918//19 4941//19 4954//2120 -f 4954//2120 4941//19 4943//2121 -f 4955//5378 4956//5379 4957//5380 -f 4958//5381 4959//5381 4960//5381 -f 4960//5382 4959//5383 4961//5384 -f 4960//5385 4961//5386 4962//5387 -f 4962//5387 4961//5386 4963//5386 -f 4962//5388 4963//5389 4964//5390 -f 4964//5391 4963//5392 4965//5392 -f 4966//5393 4967//5394 4965//5395 -f 4965//5396 4967//5396 4968//5396 -f 4965//5397 4968//5397 4964//5397 -f 4969//5398 4970//5399 4971//5400 -f 4971//5401 4970//5401 4972//5401 -f 4971//5402 4972//5403 4973//5404 -f 4973//5404 4972//5403 4974//5405 -f 4973//5406 4974//5407 4966//5406 -f 4966//5406 4974//5407 4975//5407 -f 4966//5408 4975//5408 4967//5408 -f 4957//5380 4976//5409 4955//5378 -f 4955//5410 4976//5410 4977//5410 -f 4955//5411 4977//5412 4969//5413 -f 4969//5414 4977//5414 4978//5414 -f 4969//5415 4978//5415 4970//5415 -f 4979//5416 4956//5379 4980//5417 -f 4980//5417 4956//5379 4955//5378 -f 4980//5418 4955//5411 4981//5418 -f 4981//5418 4955//5411 4969//5413 -f 4981//5419 4969//5398 4982//5420 -f 4982//5420 4969//5398 4971//5400 -f 4982//5421 4971//5402 4983//5421 -f 4983//5421 4971//5402 4973//5404 -f 4983//5422 4973//5406 4984//5422 -f 4984//5422 4973//5406 4966//5406 -f 4984//5423 4966//5393 4985//5423 -f 4985//5423 4966//5393 4965//5395 -f 4985//5424 4965//5392 4986//5425 -f 4986//5425 4965//5392 4963//5392 -f 4986//5426 4963//5386 4987//5426 -f 4987//5426 4963//5386 4961//5386 -f 4987//5427 4961//5384 4988//5428 -f 4988//5428 4961//5384 4959//5383 -f 4989//5429 4990//5429 4991//5429 -f 4978//5430 4977//5430 4992//5430 -f 4993//5431 4994//5432 4995//5433 -f 4996//5434 4997//5434 4998//5434 -f 4999//5435 5000//5435 5001//5435 -f 5002//5436 5003//5437 5004//5438 -f 5005//5439 4958//5439 4960//5439 -f 5006//5440 5007//5440 4964//5440 -f 4964//5441 5007//5441 5005//5441 -f 4964//5390 5005//5442 4962//5388 -f 4962//5443 5005//5443 4960//5443 -f 5008//5444 5009//5444 5006//5444 -f 5006//5445 5009//5445 5010//5445 -f 5006//5446 5010//5446 5007//5446 -f 5011//5447 5012//5447 5008//5447 -f 5008//5448 5012//5448 5013//5448 -f 5008//5449 5013//5449 5009//5449 -f 5014//5450 5015//5450 5016//5450 -f 5016//5451 5015//5451 5011//5451 -f 5016//5452 5011//5452 5017//5452 -f 5017//5453 5011//5453 5008//5453 -f 5014//5454 5016//5455 5018//5456 -f 5018//5456 5016//5455 5019//5456 -f 5018//5457 5019//5458 5020//5459 -f 5020//5459 5019//5458 5021//5460 -f 5020//5459 5021//5460 5022//5461 -f 5003//5462 5002//5462 5021//5462 -f 5021//5460 5002//5463 5023//5464 -f 5021//5460 5023//5464 5022//5461 -f 5024//5465 5025//5465 5004//5465 -f 5004//5438 5025//5466 5026//5467 -f 5004//5438 5026//5467 5002//5436 -f 5027//5468 5028//5469 5029//5470 -f 5029//5470 5028//5469 5024//5471 -f 5029//5470 5024//5471 5030//5472 -f 5030//5473 5024//5473 5004//5473 -f 5027//5468 5029//5470 5031//5474 -f 5031//5474 5029//5470 5032//5475 -f 5031//5474 5032//5475 5033//5476 -f 5033//5477 5032//5478 5034//5479 -f 5033//5477 5034//5479 5035//5480 -f 5036//5481 5037//5481 5034//5481 -f 5034//5482 5037//5482 5038//5482 -f 5034//5479 5038//5483 5035//5480 -f 5039//5484 5040//5484 5036//5484 -f 5036//5485 5040//5485 5041//5485 -f 5036//5486 5041//5486 5037//5486 -f 5042//5487 5043//5487 5044//5487 -f 4996//5488 4998//5488 5045//5488 -f 5046//5489 5047//5489 5048//5489 -f 5048//5490 5047//5490 5049//5490 -f 5048//5491 5049//5491 5050//5491 -f 5050//5492 5049//5492 5051//5492 -f 5050//5493 5051//5493 5052//5493 -f 5052//5494 5051//5494 5053//5494 -f 5052//5495 5053//5495 5054//5495 -f 5054//5496 5053//5496 5045//5496 -f 5054//5497 5045//5497 5055//5497 -f 5055//5498 5045//5498 4998//5498 -f 5056//5499 5057//5499 5046//5499 -f 5046//5500 5057//5500 5058//5500 -f 5046//5501 5058//5501 5047//5501 -f 5046//5502 5059//5502 5056//5502 -f 5056//5503 5059//5504 5060//5505 -f 5056//5503 5060//5505 5061//5506 -f 5061//5507 5060//5507 5062//5507 -f 5061//5508 5062//5508 5063//5508 -f 5063//5509 5062//5509 5064//5509 -f 5063//5510 5064//5510 5065//5510 -f 5066//5511 5067//5512 5065//5513 -f 5065//5514 5067//5514 5068//5514 -f 5065//5515 5068//5515 5063//5515 -f 5065//5513 5069//5516 5066//5511 -f 5066//5517 5069//5517 5070//5517 -f 5066//5518 5070//5518 5071//5518 -f 5071//5519 5070//5519 5072//5519 -f 5071//5520 5072//5520 5073//5520 -f 5072//5521 5074//5521 5073//5521 -f 5073//5522 5074//5522 5075//5522 -f 5073//5523 5075//5523 5076//5523 -f 5076//5524 5075//5524 5077//5524 -f 5076//5525 5077//5525 5078//5525 -f 5078//5526 5077//5526 5079//5526 -f 5078//5527 5079//5527 5080//5527 -f 5080//5528 5079//5528 5081//5528 -f 5080//5529 5081//5529 5082//5529 -f 5082//5530 5081//5530 5083//5530 -f 5082//5531 5083//5531 5084//5531 -f 5084//5532 5083//5532 4976//5532 -f 5084//5533 4976//5533 4957//5533 -f 5085//5534 5086//5534 5087//5534 -f 5087//5535 5086//5535 5088//5535 -f 5089//5536 5087//5537 5042//5538 -f 5042//5539 5087//5539 5088//5539 -f 5042//5540 5088//5540 5043//5540 -f 5090//5541 5091//5542 5092//5543 -f 5092//5544 5091//5545 5093//5546 -f 5092//5544 5093//5546 5094//5547 -f 5094//5548 5093//5549 4991//5550 -f 5094//5548 4991//5550 5095//5551 -f 5095//5552 4991//5552 4990//5552 -f 5095//5553 4990//5553 5085//5553 -f 5096//5554 5097//5554 5089//5554 -f 5089//5555 5097//5555 5098//5555 -f 5089//5536 5098//5556 5087//5537 -f 5099//5557 5100//5557 5090//5557 -f 5090//5558 5100//5558 5101//5558 -f 5090//5541 5101//5559 5091//5542 -f 5090//5560 5102//5560 5099//5560 -f 5099//5561 5102//5562 5103//5563 -f 5099//5561 5103//5563 5104//5564 -f 5104//5565 5103//5566 5105//5567 -f 5104//5565 5105//5567 5106//5568 -f 5106//5569 5105//5570 5107//5569 -f 5106//5569 5107//5569 5108//5571 -f 5108//5572 5107//5572 5109//5573 -f 5108//5572 5109//5573 5110//5573 -f 5110//5574 5109//5574 5111//5575 -f 5110//5574 5111//5575 5112//5575 -f 5112//5576 5111//5577 5113//5578 -f 5112//5576 5113//5578 5114//5579 -f 5114//5580 5113//5581 5115//5582 -f 5114//5580 5115//5582 5116//5583 -f 5116//5584 5115//5585 5117//5586 -f 5118//5587 5119//5587 5120//5587 -f 5120//5588 5119//5588 5121//5588 -f 5120//5589 5121//5589 5117//5589 -f 5117//5590 5121//5590 5122//5590 -f 5117//5586 5122//5591 5116//5584 -f 5118//5592 5120//5592 4995//5592 -f 4995//5593 5120//5593 5123//5593 -f 4995//5433 5123//5594 4993//5431 -f 5085//5595 5087//5595 5095//5595 -f 5095//5596 5087//5597 5098//5598 -f 5095//5596 5098//5598 5094//5599 -f 5094//5600 5098//5601 5097//5602 -f 5094//5600 5097//5602 5092//5603 -f 5092//5604 5097//5605 5096//5606 -f 5092//5604 5096//5606 5090//5607 -f 5090//5608 5096//5609 5124//5610 -f 5090//5608 5124//5610 5102//5611 -f 5102//5612 5124//5613 5125//5614 -f 5102//5612 5125//5614 5103//5615 -f 5103//5616 5125//5617 5126//5618 -f 5103//5616 5126//5618 5105//5619 -f 5105//5620 5126//5621 5127//5622 -f 5105//5620 5127//5622 5107//5622 -f 5107//5623 5127//5623 5128//5624 -f 5107//5623 5128//5624 5109//5624 -f 5109//5625 5128//5626 5129//5627 -f 5109//5625 5129//5627 5111//5628 -f 5111//5629 5129//5630 5130//5631 -f 5111//5629 5130//5631 5113//5632 -f 5113//5633 5130//5634 5131//5635 -f 5113//5633 5131//5635 5115//5636 -f 5115//5637 5131//5638 5132//5639 -f 5115//5637 5132//5639 5117//5640 -f 5117//5641 5132//5642 5133//5643 -f 5117//5641 5133//5643 5120//5644 -f 5120//5645 5133//5646 5134//5647 -f 5120//5645 5134//5647 5123//5648 -f 5123//5649 5134//5650 5135//5651 -f 5123//5649 5135//5651 4993//5652 -f 4964//5653 5135//5653 5006//5653 -f 5006//5654 5135//5655 5134//5656 -f 5006//5654 5134//5656 5008//5657 -f 5008//5658 5134//5659 5133//5660 -f 5008//5658 5133//5660 5017//5661 -f 5017//5662 5133//5663 5132//5664 -f 5017//5662 5132//5664 5016//5665 -f 5016//5666 5132//5666 5131//5667 -f 5016//5666 5131//5667 5019//5668 -f 5019//5669 5131//5670 5130//5669 -f 5019//5669 5130//5669 5021//5669 -f 5021//5671 5130//5671 5129//5672 -f 5021//5671 5129//5672 5003//5673 -f 5003//5674 5129//5674 5128//5674 -f 5003//5674 5128//5674 5004//5674 -f 5004//5675 5128//5675 5127//5676 -f 5004//5675 5127//5676 5030//5676 -f 5030//5677 5127//5677 5126//5677 -f 5030//5677 5126//5677 5029//5677 -f 5029//5678 5126//5678 5125//5679 -f 5029//5678 5125//5679 5032//5679 -f 5032//5680 5125//5680 5124//5681 -f 5032//5680 5124//5681 5034//5682 -f 5034//5683 5124//5684 5096//5685 -f 5034//5683 5096//5685 5036//5686 -f 5036//5687 5096//5687 5089//5687 -f 5036//5688 5089//5688 5039//5688 -f 5039//5689 5089//5689 5042//5689 -f 5039//5690 5042//5690 5001//5690 -f 5001//5691 5042//5691 5044//5691 -f 5001//5692 5044//5692 4999//5692 -f 5136//5693 5137//5694 5138//5695 -f 5136//5693 5138//5695 5139//5696 -f 5139//5697 5138//5698 5140//5699 -f 5139//5697 5140//5699 5141//5700 -f 5141//5701 5140//5702 5142//5702 -f 5141//5701 5142//5702 5143//5703 -f 5143//5704 5142//5705 5144//5706 -f 5143//5704 5144//5706 5145//5707 -f 5145//5708 5144//5709 5146//5710 -f 5145//5708 5146//5710 5147//5711 -f 5147//5712 5146//5713 5148//5714 -f 5147//5712 5148//5714 5149//5715 -f 5149//5716 5148//5717 5150//5718 -f 5149//5716 5150//5718 5151//5719 -f 5151//5720 5150//5720 5152//5721 -f 5151//5720 5152//5721 5153//5721 -f 5153//5722 5152//5722 5154//5723 -f 5153//5722 5154//5723 5155//5723 -f 5155//5724 5154//5724 5156//5725 -f 5155//5724 5156//5725 5157//5726 -f 5157//5727 5156//5728 5158//5729 -f 5157//5727 5158//5729 5159//5730 -f 5159//5731 5158//5732 5160//5733 -f 5159//5731 5160//5733 5161//5734 -f 5161//5735 5160//5736 5162//5737 -f 5161//5735 5162//5737 5163//5738 -f 5163//5739 5162//5740 5164//5741 -f 5163//5739 5164//5741 5165//5742 -f 5165//5743 5164//5744 5166//5745 -f 5165//5743 5166//5745 5167//5746 -f 5167//5747 5166//5748 5168//5749 -f 5167//5747 5168//5749 5169//5750 -f 5169//5751 5168//5752 5170//5753 -f 5169//5751 5170//5753 5171//5751 -f 4970//5754 4978//5754 5172//5754 -f 5172//5755 4978//5755 4992//5755 -f 5172//5756 4992//5756 5170//5756 -f 5170//5757 4992//5757 5173//5757 -f 5170//5758 5173//5758 5171//5758 -f 4998//5759 5136//5759 5055//5759 -f 5055//5760 5136//5761 5139//5762 -f 5055//5760 5139//5762 5054//5763 -f 5054//5764 5139//5765 5141//5766 -f 5054//5764 5141//5766 5052//5767 -f 5052//5768 5141//5769 5143//5770 -f 5052//5768 5143//5770 5050//5771 -f 5050//5772 5143//5773 5145//5774 -f 5050//5772 5145//5774 5048//5775 -f 5048//5776 5145//5777 5147//5778 -f 5048//5776 5147//5778 5046//5779 -f 5046//5779 5147//5778 5149//5780 -f 5046//5779 5149//5780 5059//5780 -f 5059//5781 5149//5781 5151//5782 -f 5059//5781 5151//5782 5060//5782 -f 5060//5783 5151//5783 5153//5783 -f 5060//5783 5153//5783 5062//5783 -f 5062//5784 5153//5784 5155//5784 -f 5062//5784 5155//5784 5064//5784 -f 5064//5785 5155//5785 5157//5786 -f 5064//5785 5157//5786 5065//5786 -f 5065//5787 5157//5787 5159//5788 -f 5065//5787 5159//5788 5069//5788 -f 5069//5789 5159//5790 5161//5791 -f 5069//5789 5161//5791 5070//5791 -f 5070//5792 5161//5792 5163//5793 -f 5070//5792 5163//5793 5072//5794 -f 5072//5794 5163//5793 5165//5795 -f 5072//5794 5165//5795 5074//5796 -f 5074//5797 5165//5798 5167//5799 -f 5074//5797 5167//5799 5075//5800 -f 5075//5801 5167//5802 5169//5803 -f 5075//5801 5169//5803 5077//5804 -f 5077//5805 5169//5806 5171//5807 -f 5077//5805 5171//5807 5079//5808 -f 5079//5809 5171//5810 5173//5811 -f 5079//5809 5173//5811 5081//5812 -f 5081//5813 5173//5814 4992//5815 -f 5081//5813 4992//5815 5083//5816 -f 5083//5817 4992//5817 4977//5817 -f 5083//5818 4977//5818 4976//5818 -f 4998//5819 5174//5819 5136//5819 -f 5136//5820 5174//5820 5175//5820 -f 5136//5821 5175//5821 5137//5821 -f 5137//5822 5175//5822 5176//5822 -f 5137//5823 5176//5823 4989//5823 -f 4964//5824 4968//5824 5135//5824 -f 5135//5825 4968//5825 4967//5825 -f 5135//5826 4967//5826 4993//5826 -f 4993//5827 4967//5827 4975//5827 -f 4993//5828 4975//5828 4994//5828 -f 4994//5829 4975//5829 4974//5829 -f 4994//5830 4974//5830 4972//5830 -f 4989//5831 4991//5831 5137//5831 -f 5137//5832 4991//5833 5093//5834 -f 5137//5832 5093//5834 5138//5835 -f 5138//5836 5093//5837 5091//5838 -f 5138//5836 5091//5838 5140//5839 -f 5140//5839 5091//5838 5101//5840 -f 5140//5839 5101//5840 5142//5840 -f 5142//5841 5101//5841 5100//5842 -f 5142//5841 5100//5842 5144//5843 -f 5144//5844 5100//5845 5099//5846 -f 5144//5844 5099//5846 5146//5847 -f 5146//5848 5099//5849 5104//5850 -f 5146//5848 5104//5850 5148//5851 -f 5148//5852 5104//5853 5106//5853 -f 5148//5852 5106//5853 5150//5854 -f 5150//5855 5106//5855 5108//5856 -f 5150//5855 5108//5856 5152//5856 -f 5152//5857 5108//5857 5110//5857 -f 5152//5857 5110//5857 5154//5857 -f 5154//5858 5110//5858 5112//5859 -f 5154//5858 5112//5859 5156//5859 -f 5156//5860 5112//5861 5114//5861 -f 5156//5860 5114//5861 5158//5862 -f 5158//5863 5114//5864 5116//5865 -f 5158//5863 5116//5865 5160//5866 -f 5160//5867 5116//5868 5122//5869 -f 5160//5867 5122//5869 5162//5870 -f 5162//5871 5122//5872 5121//5873 -f 5162//5871 5121//5873 5164//5874 -f 5164//5875 5121//5876 5119//5877 -f 5164//5875 5119//5877 5166//5877 -f 5166//5878 5119//5878 5118//5879 -f 5166//5878 5118//5879 5168//5880 -f 5168//5880 5118//5879 4995//5880 -f 5168//5880 4995//5880 5170//5880 -f 5170//5881 4995//5882 4994//5883 -f 5170//5881 4994//5883 5172//5884 -f 5172//5885 4994//5885 4972//5885 -f 5172//5886 4972//5886 4970//5886 -f 5177//5887 5178//5888 5179//5889 -f 5180//5890 5181//5891 5182//5892 -f 5182//5892 5181//5891 5183//5893 -f 5182//5894 5183//5895 5184//5896 -f 5185//5897 5186//5898 5187//5899 -f 5187//5900 5186//5901 5188//5901 -f 5187//5902 5188//5903 5189//5904 -f 5189//5904 5188//5903 5190//5905 -f 5189//5906 5190//5907 5191//5908 -f 5179//5909 5178//5910 5192//5911 -f 5192//5911 5178//5910 5193//5912 -f 5192//5913 5193//5914 5194//5915 -f 5185//5916 5000//5916 5186//5916 -f 5186//5917 5000//5917 4999//5917 -f 5186//5901 4999//5918 5188//5901 -f 5188//5901 4999//5918 5044//5918 -f 5188//5903 5044//5905 5190//5905 -f 5190//5919 5044//5919 5043//5919 -f 5043//5920 5088//5920 5190//5920 -f 5190//5907 5088//5921 5177//5921 -f 5190//5907 5177//5921 5191//5908 -f 5191//5922 5177//5887 5179//5889 -f 4989//5923 5193//5912 4990//5923 -f 4990//5923 5193//5912 5178//5910 -f 4990//5924 5178//5888 5085//5924 -f 5085//5924 5178//5888 5177//5887 -f 5085//5925 5177//5925 5086//5925 -f 5086//5926 5177//5926 5088//5926 -f 4989//5927 5176//5927 5193//5927 -f 5193//5914 5176//5928 5184//5929 -f 5193//5914 5184//5929 5194//5915 -f 5194//5930 5184//5896 5183//5895 -f 4997//5931 5180//5890 4998//5932 -f 4998//5932 5180//5890 5182//5892 -f 4998//5933 5182//5933 5174//5933 -f 5174//5934 5182//5894 5184//5896 -f 5174//5935 5184//5935 5175//5935 -f 5175//5936 5184//5936 5176//5936 -f 5195//5937 5185//5897 5187//5899 -f 5195//5938 5187//5938 5196//5938 -f 5197//5939 5198//5939 5199//5939 -f 5199//5940 5198//5940 5200//5940 -f 5199//5941 5200//5941 5201//5941 -f 5202//5942 5201//5942 5203//5942 -f 5203//5943 5201//5943 5200//5943 -f 5203//5944 5200//5944 5204//5944 -f 5204//5945 5200//5945 5205//5945 -f 5204//5946 5205//5946 5206//5946 -f 5206//5947 5205//5947 5207//5947 -f 5206//5948 5207//5948 5208//5948 -f 5208//5949 5207//5950 5209//5951 -f 5208//5952 5209//5953 5210//5954 -f 5210//5954 5209//5953 5211//5955 -f 5210//5956 5211//5956 5212//5956 -f 5212//5957 5211//5957 5213//5957 -f 5212//5958 5213//5958 5214//5958 -f 5214//5959 5213//5959 5215//5959 -f 5214//5960 5215//5960 5216//5960 -f 5216//5961 5215//5961 5217//5961 -f 5181//5962 5202//5963 5183//5964 -f 5183//5964 5202//5963 5203//5965 -f 5183//5966 5203//5967 5194//5968 -f 5194//5968 5203//5967 5204//5969 -f 5194//5970 5204//5971 5192//5971 -f 5192//5971 5204//5971 5206//5972 -f 5192//5973 5206//5974 5179//5975 -f 5179//5975 5206//5974 5208//5976 -f 5179//5977 5208//5978 5191//5977 -f 5191//5977 5208//5978 5210//5978 -f 5191//5979 5210//5980 5189//5981 -f 5189//5981 5210//5980 5212//5982 -f 5189//5983 5212//5984 5187//5985 -f 5187//5985 5212//5984 5214//5986 -f 5187//5987 5214//5987 5196//5987 -f 5196//5988 5214//5988 5216//5988 -f 5218//5989 5219//5989 5220//5990 -f 5221//5991 5222//5991 5223//5991 -f 5224//5992 5225//5992 5226//5993 -f 5226//5993 5225//5992 5227//5994 -f 5226//5993 5227//5994 5228//5995 -f 5229//5996 5230//5996 5231//5996 -f 5231//5997 5230//5997 5232//5997 -f 5231//5998 5232//5998 5233//5998 -f 5234//5999 5235//5999 5236//5999 -f 5236//6000 5235//6000 5237//6000 -f 5236//6001 5237//6002 5238//6003 -f 5238//6004 5237//6004 5239//6004 -f 5238//6005 5239//6006 5240//6007 -f 5240//6007 5239//6006 5241//6006 -f 5240//6008 5241//6008 5242//6008 -f 5243//6009 5244//6009 5218//6009 -f 5218//6010 5244//6010 5245//6010 -f 5218//6011 5245//6011 5219//6011 -f 5219//6012 5245//6013 5246//6013 -f 5219//6014 5246//6014 5234//6014 -f 5242//6015 5247//6015 5240//6015 -f 5240//6016 5247//6017 5248//6018 -f 5240//6007 5248//6019 5238//6005 -f 5238//6005 5248//6019 5249//6020 -f 5238//6003 5249//6001 5236//6001 -f 5236//6001 5249//6001 5250//6021 -f 5251//6022 5229//6022 5252//6022 -f 5252//6023 5229//6023 5231//6023 -f 5252//6024 5231//6024 5253//6024 -f 5247//6017 5224//6025 5248//6018 -f 5248//6026 5224//6026 5226//6026 -f 5248//6019 5226//6027 5249//6020 -f 5249//6020 5226//6027 5254//6028 -f 5249//6001 5254//6029 5250//6021 -f 5250//6021 5254//6029 5255//6030 -f 5250//6031 5255//6031 5256//6031 -f 5234//6032 5236//6033 5219//6034 -f 5219//6034 5236//6033 5250//6034 -f 5219//6034 5250//6034 5220//6035 -f 5220//6036 5250//6036 5256//6036 -f 5220//6037 5256//6037 5257//6037 -f 5257//6038 5258//6038 5220//6038 -f 5220//6039 5258//6039 5259//6039 -f 5220//5990 5259//5990 5218//5989 -f 5218//6040 5259//6040 5223//6040 -f 5218//6041 5223//6041 5243//6041 -f 5243//6042 5223//6042 5222//6042 -f 5258//6043 5260//6043 5259//6043 -f 5259//6044 5260//6044 5253//6044 -f 5259//6040 5253//6040 5223//6040 -f 5223//6024 5253//6024 5231//6024 -f 5223//6045 5231//6045 5221//6045 -f 5221//6046 5231//6046 5233//6046 -f 5261//6047 5251//6047 5262//6047 -f 5262//6048 5251//6048 5252//6048 -f 5262//6049 5252//6050 5263//6051 -f 5263//6051 5252//6050 5253//6052 -f 5263//6053 5253//6053 5264//6053 -f 5264//6054 5253//6054 5260//6054 -f 5265//6055 5266//6055 5262//6055 -f 5262//6056 5266//6057 5267//6058 -f 5262//6056 5267//6058 5261//6059 -f 5268//6060 5198//6061 5265//6062 -f 5265//6062 5198//6061 5197//6063 -f 5269//6064 5270//6065 5258//6066 -f 5258//6067 5257//6067 5269//6067 -f 5269//6068 5257//6068 5256//6068 -f 5269//6069 5256//6070 5271//6071 -f 5271//6072 5256//6072 5255//6072 -f 5271//6073 5255//6073 5272//6073 -f 5272//6074 5255//6030 5254//6029 -f 5272//6075 5254//6075 5273//6075 -f 5273//6076 5254//6076 5226//6076 -f 5273//6077 5226//6077 5228//6077 -f 5265//6062 5262//6078 5268//6060 -f 5268//6079 5262//6079 5263//6079 -f 5268//6080 5263//6080 5274//6080 -f 5274//6081 5263//6081 5264//6081 -f 5274//6082 5264//6083 5270//6084 -f 5270//6085 5264//6085 5260//6085 -f 5270//6086 5260//6086 5258//6086 -f 5228//6087 5217//6088 5273//6089 -f 5273//6089 5217//6088 5215//6090 -f 5273//6091 5215//6091 5272//6091 -f 5272//6091 5215//6091 5213//6091 -f 5272//6092 5213//6092 5271//6092 -f 5271//6092 5213//6092 5211//6093 -f 5271//6071 5211//6094 5269//6069 -f 5269//6069 5211//6094 5209//6094 -f 5269//6064 5209//5951 5270//6065 -f 5270//6065 5209//5951 5207//5950 -f 5270//6084 5207//6095 5274//6082 -f 5274//6082 5207//6095 5205//6096 -f 5274//6097 5205//6097 5268//6097 -f 5268//6098 5205//6098 5200//6098 -f 5268//6099 5200//6099 5198//6099 -f 5275//6100 5276//6101 5277//6102 -f 5277//6102 5278//6103 5275//6100 -f 5275//6104 5278//6104 5279//6104 -f 5275//6105 5279//6105 5280//6105 -f 5280//6106 5279//6106 5281//6106 -f 5280//6107 5281//6107 5282//6107 -f 5282//6108 5281//6108 5283//6108 -f 5284//6109 5285//6110 5283//6111 -f 5283//6111 5285//6110 5286//6112 -f 5283//6113 5286//6113 5282//6113 -f 5287//6114 5288//6114 5289//6114 -f 5289//6115 5288//6115 5290//6115 -f 5289//6116 5290//6117 5284//6118 -f 5284//6118 5290//6117 5291//6119 -f 5284//6120 5291//6120 5285//6120 -f 5292//6121 5293//6121 5287//6121 -f 5287//6122 5293//6122 5294//6122 -f 5287//6123 5294//6123 5288//6123 -f 5292//6124 5295//6125 5293//6126 -f 5293//6126 5295//6125 5296//6127 -f 5293//6128 5296//6128 5297//6128 -f 5298//6129 5299//6129 5300//6129 -f 5301//6130 5302//6130 5303//6130 -f 5303//6131 5304//6131 5301//6131 -f 5301//6132 5304//6132 5305//6132 -f 5301//6133 5305//6133 5306//6133 -f 5306//6134 5305//6134 5307//6134 -f 5306//6135 5307//6135 5308//6135 -f 5308//6136 5307//6136 5309//6136 -f 5308//6137 5309//6137 5310//6137 -f 5310//6138 5309//6138 5311//6138 -f 5310//6139 5311//6139 5312//6139 -f 5313//6140 5314//6140 5302//6140 -f 5302//6140 5314//6140 5315//6141 -f 5302//6142 5315//6142 5303//6142 -f 5316//6143 5317//6143 5318//6143 -f 5318//6144 5317//6144 5319//6144 -f 5318//6145 5319//6146 5320//6146 -f 5320//6146 5319//6146 5321//6147 -f 5320//6148 5321//6148 5322//6148 -f 5322//6149 5321//6149 5323//6149 -f 5322//6150 5323//6150 5313//6150 -f 5313//6151 5323//6151 5324//6151 -f 5313//6152 5324//6152 5314//6152 -f 5297//6153 5296//6153 5325//6153 -f 5298//6154 5300//6154 5326//6154 -f 5297//6155 5325//6155 5327//6155 -f 5327//6156 5325//6156 5328//6156 -f 5327//6157 5328//6157 5329//6157 -f 5329//6158 5328//6158 5330//6158 -f 5329//6159 5330//6159 5331//6159 -f 5331//6160 5330//6160 5332//6160 -f 5331//6161 5332//6161 5333//6161 -f 5333//6162 5332//6162 5334//6162 -f 5333//6163 5334//6163 5299//6163 -f 5299//6164 5334//6164 5335//6164 -f 5299//6165 5335//6165 5300//6165 -f 5300//6166 5336//6166 5326//6166 -f 5326//6167 5336//6167 5337//6167 -f 5326//6168 5337//6168 5338//6168 -f 5338//6169 5337//6169 5339//6169 -f 5338//6170 5339//6170 5340//6170 -f 5341//6171 5342//6171 5343//6171 -f 5343//6172 5342//6172 5312//6172 -f 5343//6173 5312//6173 5344//6173 -f 5344//6174 5312//6174 5311//6174 -f 5339//6175 5345//6175 5340//6175 -f 5340//6176 5345//6176 5346//6176 -f 5340//6177 5346//6177 5347//6177 -f 5347//6178 5346//6178 5348//6178 -f 5347//6179 5348//6180 5349//6181 -f 5349//6181 5348//6180 5350//6182 -f 5349//6183 5350//6184 5351//6185 -f 5351//6185 5350//6184 5352//6186 -f 5351//6187 5352//6187 5353//6187 -f 5353//6188 5352//6188 5354//6188 -f 5353//6189 5354//6190 5316//6190 -f 5316//6190 5354//6190 5355//6191 -f 5316//6192 5355//6192 5317//6192 -f 5356//6193 5342//6193 5341//6193 -f 5357//6194 5358//6194 5359//6194 -f 5359//6195 5358//6195 5360//6195 -f 5359//6196 5360//6197 5361//6198 -f 5361//6198 5360//6197 5362//6199 -f 5361//6200 5362//6200 5363//6200 -f 5363//6201 5362//6202 5364//6203 -f 5362//6202 5365//6204 5364//6203 -f 5364//6205 5365//6205 5366//6205 -f 5364//6206 5366//6206 5367//6206 -f 5367//6207 5366//6207 5368//6207 -f 5367//6208 5368//6208 5369//6208 -f 5369//6209 5368//6209 5370//6209 -f 5369//6210 5370//6210 5371//6210 -f 5371//6211 5370//6211 5372//6211 -f 5371//6212 5372//6212 5373//6212 -f 5373//6213 5372//6213 5356//6213 -f 5373//6214 5356//6215 5374//6216 -f 5374//6216 5356//6215 5341//6217 -f 5375//6218 5376//6218 5377//6218 -f 5358//6219 5357//6219 5378//6219 -f 5358//6220 5378//6220 5379//6220 -f 5379//6221 5378//6221 5380//6221 -f 5379//6222 5380//6222 5381//6222 -f 5381//6223 5380//6224 5382//6225 -f 5382//6225 5380//6224 5383//6226 -f 5382//6227 5383//6228 5384//6229 -f 5384//6229 5383//6228 5385//6230 -f 5384//6231 5385//6231 5386//6231 -f 5386//6232 5385//6232 5387//6232 -f 5386//6233 5387//6233 5388//6233 -f 5387//6234 5389//6234 5388//6234 -f 5388//6235 5389//6235 5390//6235 -f 5388//6236 5390//6236 5391//6236 -f 5392//6237 5393//6237 5394//6237 -f 5394//6238 5393//6238 5395//6238 -f 5394//6239 5395//6239 5396//6239 -f 5396//6240 5395//6240 5397//6240 -f 5396//6241 5397//6241 5398//6241 -f 5398//6242 5397//6242 5399//6242 -f 5398//6243 5399//6243 5400//6243 -f 5400//6244 5399//6244 5401//6244 -f 5400//6245 5401//6245 5402//6245 -f 5402//6246 5401//6246 5391//6246 -f 5402//6247 5391//6247 5403//6247 -f 5403//6248 5391//6248 5390//6248 -f 5392//6249 5404//6249 5393//6249 -f 5393//6250 5404//6250 5405//6250 -f 5393//6251 5405//6251 5406//6251 -f 5405//6252 5407//6252 5406//6252 -f 5406//6253 5407//6253 5408//6253 -f 5406//6254 5408//6254 5409//6254 -f 5409//6255 5408//6255 5410//6255 -f 5409//6256 5410//6256 5411//6256 -f 5411//6257 5410//6257 5412//6257 -f 5411//6258 5412//6258 5413//6258 -f 5413//6259 5412//6259 5414//6259 -f 5413//6260 5414//6260 5415//6260 -f 5414//6261 5416//6261 5415//6261 -f 5415//6262 5416//6262 5417//6262 -f 5415//6263 5417//6263 5418//6263 -f 5418//6264 5417//6264 5419//6264 -f 5418//6265 5419//6265 5420//6265 -f 5419//6266 5421//6266 5420//6266 -f 5420//6267 5421//6267 5422//6267 -f 5420//6268 5422//6268 5423//6268 -f 5423//6269 5422//6270 5424//6271 -f 5424//6271 5422//6270 5425//6272 -f 5424//6273 5425//6273 5426//6273 -f 5426//6274 5425//6274 5427//6274 -f 5426//6275 5427//6275 5428//6275 -f 5427//6276 5429//6276 5428//6276 -f 5428//6277 5429//6277 5430//6277 -f 5428//6278 5430//6279 5431//6280 -f 5431//6280 5430//6279 5432//6281 -f 5431//6282 5432//6283 5433//6284 -f 5433//6284 5432//6283 5434//6285 -f 5433//6286 5434//6287 5435//6288 -f 5434//6287 5436//6289 5435//6288 -f 5435//6290 5436//6290 5437//6290 -f 5435//6291 5437//6291 5438//6291 -f 5437//6292 5439//6292 5438//6292 -f 5438//6293 5439//6293 5440//6293 -f 5438//6294 5440//6295 5441//6296 -f 5441//6296 5440//6295 5442//6297 -f 5441//6298 5442//6298 5443//6298 -f 5443//6299 5442//6299 5444//6299 -f 5443//6300 5444//6301 5445//6302 -f 5444//6301 5446//6303 5445//6302 -f 5445//6304 5446//6304 5447//6304 -f 5445//6305 5447//6305 5448//6305 -f 5448//6306 5447//6307 5449//6308 -f 5449//6308 5447//6307 5450//6309 -f 5449//6310 5450//6310 5451//6310 -f 5452//6311 5453//6311 5454//6311 -f 5450//6312 5455//6312 5451//6312 -f 5451//6313 5455//6313 5456//6313 -f 5451//6314 5456//6314 5457//6314 -f 5457//6315 5456//6315 5458//6315 -f 5457//6316 5458//6317 5459//6318 -f 5459//6318 5458//6317 5460//6319 -f 5459//6320 5460//6320 5461//6320 -f 5461//6321 5460//6321 5462//6321 -f 5461//6322 5462//6323 5454//6324 -f 5454//6324 5462//6323 5463//6325 -f 5454//6326 5463//6326 5452//6326 -f 5452//6327 5464//6327 5453//6327 -f 5453//6328 5464//6328 5465//6328 -f 5453//6329 5465//6329 5466//6329 -f 5466//6330 5465//6330 5467//6330 -f 5466//6331 5467//6332 5468//6333 -f 5467//6332 5469//6334 5468//6333 -f 5468//6335 5469//6335 5470//6335 -f 5468//6336 5470//6336 5471//6336 -f 5471//6337 5470//6337 5472//6337 -f 5471//6338 5472//6338 5473//6338 -f 5473//6339 5472//6339 5474//6339 -f 5474//6340 5475//6340 5473//6340 -f 5473//6341 5475//6341 5476//6341 -f 5473//6342 5476//6342 5477//6342 -f 5476//6343 5478//6343 5477//6343 -f 5477//6344 5478//6344 5479//6344 -f 5477//6345 5479//6345 5480//6345 -f 5480//6346 5479//6346 5481//6346 -f 5480//6347 5481//6347 5482//6347 -f 5482//6348 5481//6348 5483//6348 -f 5482//6349 5483//6349 5484//6349 -f 5484//6350 5483//6350 5485//6350 -f 5484//6351 5485//6351 5486//6351 -f 5486//6352 5485//6352 5487//6352 -f 5485//6353 5488//6353 5487//6353 -f 5487//6354 5488//6354 5489//6354 -f 5487//6355 5489//6355 5375//6355 -f 5375//6356 5489//6356 5490//6356 -f 5375//6357 5490//6357 5376//6357 -f 5491//6358 5492//6358 5377//6358 -f 5377//6359 5492//6360 5493//6361 -f 5377//6359 5493//6361 5375//6362 -f 5377//6363 5494//6363 5491//6363 -f 5491//6364 5494//6364 5495//6364 -f 5491//6365 5495//6365 5496//6365 -f 5496//6366 5495//6366 5497//6366 -f 5496//6367 5497//6367 5498//6367 -f 5498//6368 5497//6368 5499//6368 -f 5499//6369 5497//6369 5277//6369 -f 5499//6370 5277//6370 5276//6370 -f 5500//21 5501//21 5502//21 -f 5503//21 5504//21 5505//21 -f 5505//21 5504//21 5501//21 -f 5502//21 5501//21 5506//21 -f 5507//21 5508//21 5502//21 -f 5502//21 5508//21 5509//21 -f 5502//21 5509//21 5500//21 -f 5505//21 5510//21 5503//21 -f 5503//21 5510//21 5511//21 -f 5503//21 5511//21 5512//21 -f 5503//21 5513//21 5514//21 -f 5514//21 5513//21 5515//21 -f 5514//21 5515//21 5516//21 -f 5512//21 5517//21 5503//21 -f 5503//21 5517//21 5518//21 -f 5503//21 5518//21 5513//21 -f 5519//21 5520//21 5521//21 -f 5522//21 5523//21 5502//21 -f 5502//21 5523//21 5524//21 -f 5502//21 5524//21 5507//21 -f 5525//21 5526//21 5527//21 -f 5527//21 5526//21 5514//21 -f 5527//21 5514//21 5528//21 -f 5528//21 5514//21 5516//21 -f 5504//21 5529//21 5501//21 -f 5501//21 5529//21 5530//21 -f 5501//21 5530//21 5506//21 -f 5506//21 5530//21 5531//21 -f 5506//21 5531//21 5519//21 -f 5519//21 5531//21 5532//21 -f 5519//21 5532//21 5533//21 -f 5533//21 5534//21 5519//21 -f 5519//21 5534//21 5535//21 -f 5519//21 5535//21 5520//21 -f 5521//21 5536//21 5519//21 -f 5519//21 5536//21 5537//21 -f 5519//21 5537//21 5538//6371 -f 5539//6372 5540//6372 5506//6372 -f 5506//6372 5540//6372 5502//6372 -f 5540//6373 5541//6373 5502//6373 -f 5502//6374 5541//6374 5542//6374 -f 5502//6375 5542//6375 5522//6375 -f 5542//6376 5543//6376 5522//6376 -f 5522//6377 5543//6377 5544//6377 -f 5522//6378 5544//6378 5523//6378 -f 5544//6379 5545//6379 5523//6379 -f 5523//6380 5545//6380 5546//6380 -f 5523//6381 5546//6382 5524//6383 -f 5524//6383 5546//6382 5547//6384 -f 5524//6385 5547//6385 5507//6385 -f 5547//6386 5548//6386 5507//6386 -f 5507//6387 5548//6387 5549//6387 -f 5507//6388 5549//6388 5508//6388 -f 5508//6389 5549//6389 5550//6389 -f 5508//6390 5550//6390 5509//6390 -f 5550//6391 5551//6391 5509//6391 -f 5509//6392 5551//6392 5552//6392 -f 5509//6393 5552//6394 5500//6395 -f 5552//6394 5553//6396 5500//6395 -f 5500//6397 5553//6397 5554//6397 -f 5500//6398 5554//6398 5501//6398 -f 5554//6399 5555//6399 5501//6399 -f 5501//6400 5555//6400 5556//6400 -f 5501//6401 5556//6401 5505//6401 -f 5556//6402 5557//6402 5505//6402 -f 5505//6403 5557//6403 5558//6403 -f 5505//6404 5558//6405 5510//6406 -f 5558//6405 5559//6407 5510//6406 -f 5510//6408 5559//6408 5560//6408 -f 5510//6409 5560//6409 5511//6409 -f 5560//6410 5561//6410 5511//6410 -f 5511//6411 5561//6411 5562//6411 -f 5511//6412 5562//6413 5512//6414 -f 5562//6413 5563//6415 5512//6414 -f 5512//6416 5563//6416 5564//6416 -f 5512//6417 5564//6417 5517//6417 -f 5564//6418 5565//6418 5517//6418 -f 5517//6419 5565//6419 5566//6419 -f 5517//6420 5566//6420 5518//6420 -f 5566//6421 5567//6421 5518//6421 -f 5518//6422 5567//6423 5568//6424 -f 5518//6422 5568//6424 5513//6425 -f 5568//6424 5569//6426 5513//6425 -f 5513//6427 5569//6428 5570//6429 -f 5513//6427 5570//6429 5515//6430 -f 5571//6431 5516//6431 5572//6431 -f 5572//6432 5516//6433 5515//6434 -f 5572//6432 5515//6434 5573//6435 -f 5573//6436 5515//6436 5570//6436 -f 5571//6437 5574//6437 5516//6437 -f 5516//6438 5574//6438 5528//6438 -f 5574//6439 5575//6439 5528//6439 -f 5528//6440 5575//6440 5576//6440 -f 5528//6441 5576//6441 5527//6441 -f 5576//6442 5577//6442 5527//6442 -f 5527//6443 5577//6443 5578//6443 -f 5527//6444 5578//6444 5525//6444 -f 5578//6445 5579//6445 5525//6445 -f 5525//6446 5579//6446 5580//6446 -f 5525//6447 5580//6448 5526//6449 -f 5580//6448 5581//6450 5526//6449 -f 5526//6451 5581//6451 5582//6451 -f 5526//6452 5582//6452 5514//6452 -f 5514//6453 5582//6453 5583//6453 -f 5514//6454 5583//6455 5503//6455 -f 5503//6455 5583//6455 5504//6456 -f 5504//6457 5583//6457 5584//6457 -f 5504//6458 5584//6458 5529//6458 -f 5584//6458 5585//6458 5529//6458 -f 5529//6458 5585//6458 5586//6458 -f 5529//6458 5586//6458 5530//6458 -f 5530//6459 5586//6459 5587//6459 -f 5530//6460 5587//6460 5531//6460 -f 5587//6461 5588//6461 5531//6461 -f 5531//6462 5588//6462 5589//6462 -f 5531//6463 5589//6463 5532//6463 -f 5532//6464 5589//6464 5590//6464 -f 5532//6465 5590//6465 5533//6465 -f 5590//6466 5591//6466 5533//6466 -f 5533//6467 5591//6467 5592//6467 -f 5533//6468 5592//6468 5534//6468 -f 5534//6469 5592//6469 5593//6469 -f 5534//6470 5593//6470 5535//6470 -f 5535//6471 5593//6471 5594//6471 -f 5535//6472 5594//6473 5520//6474 -f 5520//6474 5594//6473 5595//6475 -f 5520//6476 5595//6477 5521//6478 -f 5521//6478 5595//6477 5596//6479 -f 5521//6480 5596//6481 5536//6482 -f 5536//6482 5596//6481 5597//6483 -f 5536//6484 5597//6485 5537//6486 -f 5537//6486 5597//6485 5598//6487 -f 5537//6488 5598//6489 5538//6490 -f 5538//6490 5598//6489 5599//6491 -f 5538//6492 5599//6493 5519//6494 -f 5539//6495 5506//6495 5600//6495 -f 5600//6496 5506//6496 5519//6496 -f 5600//6497 5519//6497 5601//6497 -f 5601//6498 5519//6494 5599//6493 -f 5464//6499 5452//6499 5552//6499 -f 5455//6500 5556//6501 5555//6502 -f 5410//6503 5574//6503 5412//6503 -f 5412//6504 5574//6504 5571//6504 -f 5412//6505 5571//6505 5414//6505 -f 5414//6506 5571//6507 5572//6508 -f 5414//6506 5572//6508 5416//6509 -f 5416//6510 5572//6510 5417//6510 -f 5417//6511 5572//6511 5573//6511 -f 5417//6512 5573//6512 5419//6512 -f 5419//6513 5573//6513 5570//6513 -f 5419//6514 5570//6514 5421//6514 -f 5421//6515 5570//6515 5569//6515 -f 5421//6516 5569//6516 5422//6516 -f 5422//6517 5569//6518 5568//6519 -f 5422//6517 5568//6519 5425//6520 -f 5425//6521 5568//6521 5567//6521 -f 5425//6522 5567//6523 5427//6522 -f 5427//6522 5567//6523 5566//6523 -f 5427//6524 5566//6524 5429//6524 -f 5429//6525 5566//6526 5565//6527 -f 5429//6525 5565//6527 5430//6528 -f 5430//6529 5565//6529 5432//6529 -f 5432//6530 5565//6530 5564//6530 -f 5432//6531 5564//6531 5434//6531 -f 5434//6532 5564//6533 5563//6534 -f 5434//6532 5563//6534 5436//6535 -f 5436//6536 5563//6537 5437//6538 -f 5437//6538 5563//6537 5562//6539 -f 5437//6540 5562//6540 5439//6540 -f 5439//6541 5562//6542 5440//6543 -f 5440//6543 5562//6542 5561//6544 -f 5440//6545 5561//6546 5442//6547 -f 5446//6548 5444//6548 5559//6548 -f 5559//6549 5444//6550 5442//6551 -f 5559//6549 5442//6551 5560//6552 -f 5560//6553 5442//6547 5561//6546 -f 5446//6554 5559//6555 5447//6556 -f 5447//6556 5559//6555 5558//6557 -f 5447//6558 5558//6558 5450//6558 -f 5450//6559 5558//6560 5455//6561 -f 5455//6561 5558//6560 5557//6562 -f 5455//6563 5557//6563 5556//6563 -f 5460//6564 5458//6564 5555//6564 -f 5555//6565 5458//6565 5456//6565 -f 5555//6502 5456//6566 5455//6500 -f 5460//6567 5555//6567 5462//6567 -f 5462//6568 5555//6568 5554//6568 -f 5462//6569 5554//6569 5463//6569 -f 5463//6570 5554//6570 5452//6570 -f 5452//6571 5554//6571 5553//6571 -f 5452//6572 5553//6572 5552//6572 -f 5464//6573 5552//6573 5465//6573 -f 5465//6574 5552//6574 5551//6574 -f 5465//6575 5551//6575 5467//6575 -f 5467//6576 5551//6577 5469//6578 -f 5469//6578 5551//6577 5550//6579 -f 5469//6580 5550//6580 5470//6580 -f 5470//6581 5550//6581 5472//6581 -f 5472//6582 5550//6582 5549//6582 -f 5472//6583 5549//6583 5548//6583 -f 5547//6584 5475//6584 5548//6584 -f 5548//6585 5475//6585 5474//6585 -f 5548//6586 5474//6586 5472//6586 -f 5546//6587 5478//6587 5547//6587 -f 5547//6588 5478//6588 5476//6588 -f 5547//6589 5476//6589 5475//6589 -f 5542//6590 5488//6591 5543//6592 -f 5543//6593 5488//6593 5485//6593 -f 5543//6594 5485//6594 5544//6594 -f 5544//6595 5485//6595 5483//6595 -f 5544//6596 5483//6596 5545//6596 -f 5545//6597 5483//6598 5481//6599 -f 5545//6597 5481//6599 5546//6600 -f 5546//6601 5481//6601 5479//6601 -f 5546//6602 5479//6602 5478//6602 -f 5539//6603 5602//6603 5277//6603 -f 5277//6603 5497//6604 5539//6604 -f 5539//6604 5497//6604 5495//6604 -f 5539//6604 5495//6604 5540//6604 -f 5540//6604 5495//6604 5494//6603 -f 5494//6603 5377//6603 5540//6604 -f 5540//6604 5377//6603 5376//6603 -f 5540//6605 5376//6605 5541//6605 -f 5541//6606 5376//6606 5490//6606 -f 5541//6607 5490//6607 5542//6607 -f 5542//6608 5490//6608 5489//6608 -f 5542//6590 5489//6609 5488//6591 -f 5389//6610 5387//6610 5583//6610 -f 5583//6611 5387//6611 5584//6611 -f 5084//6612 4957//6612 5601//6612 -f 5603//6613 5604//6614 4979//6615 -f 4979//6615 5604//6614 4956//6616 -f 5603//6617 5605//6618 5604//6619 -f 5604//6619 5605//6618 5606//6620 -f 5604//6619 5606//6620 5607//6621 -f 5607//6622 5606//6623 5608//6624 -f 5607//6622 5608//6624 5609//6625 -f 5609//6625 5608//6624 5610//6626 -f 5609//6625 5610//6626 5611//6627 -f 5084//6628 5601//6628 5082//6628 -f 5082//6629 5601//6629 5080//6629 -f 5080//6630 5601//6630 5599//6630 -f 5080//6631 5599//6631 5078//6631 -f 5078//6632 5599//6633 5598//6634 -f 5078//6632 5598//6634 5076//6635 -f 5076//6636 5598//6636 5073//6636 -f 5073//6637 5598//6637 5597//6637 -f 5073//6638 5597//6638 5071//6638 -f 5071//6639 5597//6639 5066//6639 -f 5066//6640 5597//6640 5596//6640 -f 5066//6641 5596//6641 5067//6641 -f 5067//6642 5596//6642 5068//6642 -f 5068//6643 5596//6644 5595//6645 -f 5068//6643 5595//6645 5063//6646 -f 5063//6647 5595//6647 5061//6647 -f 5061//6648 5595//6648 5594//6648 -f 5061//6649 5594//6649 5056//6649 -f 5056//6650 5594//6650 5593//6650 -f 5056//6651 5593//6651 5057//6651 -f 5057//6652 5593//6652 5058//6652 -f 5058//6653 5593//6653 5592//6653 -f 5058//6654 5592//6654 5047//6654 -f 5047//6655 5592//6656 5591//6657 -f 5047//6655 5591//6657 5049//6658 -f 5590//6659 5053//6659 5591//6659 -f 5591//6659 5053//6659 5051//6659 -f 5591//6660 5051//6660 5049//6660 -f 5197//6661 5199//6662 5612//6663 -f 5199//6662 5613//6664 5612//6663 -f 5612//6665 5613//6665 5202//6665 -f 5612//6666 5202//6667 5181//6668 -f 5180//6669 4997//6670 5589//6671 -f 5589//6671 4997//6670 4996//6672 -f 5589//6673 4996//6673 5590//6673 -f 5590//6674 4996//6674 5045//6674 -f 5590//6675 5045//6675 5053//6675 -f 5612//6663 5614//6676 5197//6661 -f 5197//6677 5614//6678 5615//6679 -f 5197//6677 5615//6679 5265//6680 -f 5265//6680 5615//6679 5266//6681 -f 5587//6682 5586//6682 5357//6682 -f 5387//6683 5385//6683 5584//6683 -f 5584//6683 5385//6683 5383//6683 -f 5584//6683 5383//6683 5585//6683 -f 5585//6683 5383//6683 5380//6683 -f 5585//6683 5380//6683 5586//6684 -f 5586//6684 5380//6683 5378//6683 -f 5586//6684 5378//6683 5357//6683 -f 5582//6685 5403//6685 5583//6685 -f 5583//6686 5403//6686 5390//6686 -f 5583//6687 5390//6687 5389//6687 -f 5581//6688 5400//6688 5582//6688 -f 5582//6689 5400//6689 5402//6689 -f 5582//6690 5402//6690 5403//6690 -f 5396//6691 5398//6691 5579//6691 -f 5579//6692 5398//6692 5400//6692 -f 5579//6693 5400//6693 5580//6693 -f 5580//6694 5400//6694 5581//6694 -f 5578//6695 5392//6695 5579//6695 -f 5579//6696 5392//6696 5394//6696 -f 5579//6697 5394//6697 5396//6697 -f 5408//6698 5407//6698 5577//6698 -f 5577//6699 5407//6699 5405//6699 -f 5577//6700 5405//6700 5578//6700 -f 5578//6701 5405//6701 5404//6701 -f 5578//6702 5404//6702 5392//6702 -f 5574//6703 5410//6703 5575//6703 -f 5575//6704 5410//6704 5408//6704 -f 5575//6705 5408//6705 5576//6705 -f 5576//6706 5408//6706 5577//6706 -f 5602//6707 5539//6708 5616//6707 -f 5616//6707 5539//6708 5600//6708 -f 4957//6709 4956//6709 5601//6709 -f 5601//6710 4956//6616 5604//6614 -f 5601//6711 5604//6712 5600//6713 -f 5600//6713 5604//6712 5617//6714 -f 5600//6715 5617//6715 5616//6715 -f 5181//6668 5180//6716 5612//6666 -f 5612//6666 5180//6716 5589//6717 -f 5612//6718 5589//6718 5618//6718 -f 5618//6718 5589//6718 5588//6718 -f 5618//6719 5588//6720 5619//6721 -f 5619//6721 5588//6720 5587//6722 -f 5619//6723 5587//6723 5620//6723 -f 5620//6724 5587//6724 5357//6724 -f 5603//6725 4979//5416 4980//5417 -f 5621//6726 5622//6726 5623//6726 -f 5621//6727 5623//6727 5624//6727 -f 4988//6728 5625//6728 4987//6728 -f 4987//6729 5625//6729 5626//6729 -f 5603//6730 4980//6730 5605//6730 -f 5606//6731 5605//6731 5627//6731 -f 5627//6732 5605//6732 4980//6732 -f 5627//6733 4980//6734 5628//6735 -f 5628//6735 4980//6734 4981//6736 -f 5628//6737 4981//6738 5629//6739 -f 5629//6739 4981//6738 4982//6740 -f 5629//6741 4982//6742 5630//6743 -f 5630//6743 4982//6742 4983//6744 -f 5630//6745 4983//6746 5631//6747 -f 5631//6747 4983//6746 4984//6748 -f 5631//6749 4984//6750 5632//6751 -f 5632//6751 4984//6750 4985//6752 -f 5632//6753 4985//6754 5626//6755 -f 5626//6755 4985//6754 4986//6756 -f 5626//6757 4986//6757 4987//6757 -f 5608//6758 5606//6759 5633//6760 -f 5633//6760 5606//6759 5627//6761 -f 5633//6762 5627//6763 5634//6764 -f 5634//6764 5627//6763 5628//6765 -f 5634//6766 5628//6767 5635//6768 -f 5635//6768 5628//6767 5629//6769 -f 5635//6770 5629//6771 5636//6772 -f 5636//6772 5629//6771 5630//6773 -f 5636//6774 5630//6775 5637//6776 -f 5637//6776 5630//6775 5631//6777 -f 5637//6778 5631//6779 5638//6780 -f 5638//6780 5631//6779 5632//6781 -f 5638//6782 5632//6783 5623//6784 -f 5623//6784 5632//6783 5626//6785 -f 5623//6786 5626//6786 5624//6786 -f 5624//6787 5626//6787 5625//6787 -f 5010//6788 5009//6788 5639//6788 -f 5000//6789 5217//6789 5228//6789 -f 5640//6790 5641//6791 5000//6792 -f 5000//6792 5228//6793 5640//6790 -f 5640//6794 5228//6795 5227//6796 -f 5640//6794 5227//6796 5225//6797 -f 5217//6798 5000//6799 5642//6800 -f 5642//6800 5000//6801 5185//6802 -f 5642//6800 5185//6802 5195//6803 -f 5195//6803 5196//6804 5642//6800 -f 5642//6800 5196//6804 5216//6805 -f 5642//6800 5216//6805 5217//6798 -f 5037//6806 5041//6806 5643//6806 -f 5643//6807 5041//6808 5040//6809 -f 5643//6807 5040//6809 5640//6810 -f 5640//6811 5040//6811 5039//6811 -f 5640//6812 5039//6812 5641//6812 -f 5641//6791 5039//6813 5001//6814 -f 5641//6791 5001//6814 5000//6792 -f 5037//6815 5643//6815 5038//6815 -f 5038//6816 5643//6817 5644//6818 -f 5038//6816 5644//6818 5035//6819 -f 5035//6820 5644//6820 5033//6820 -f 5033//6821 5644//6822 5645//6823 -f 5033//6821 5645//6823 5031//6824 -f 5031//6825 5645//6826 5646//6827 -f 5031//6825 5646//6827 5027//6828 -f 5027//6829 5646//6829 5028//6829 -f 5028//6830 5646//6831 5647//6832 -f 5028//6833 5647//6833 5024//6833 -f 5024//6834 5647//6834 5025//6834 -f 5025//6835 5647//6836 5648//6837 -f 5025//6838 5648//6838 5026//6838 -f 5026//6839 5648//6840 5649//6841 -f 5026//6839 5649//6841 5002//6842 -f 5002//6843 5649//6844 5650//6845 -f 5002//6843 5650//6845 5023//6846 -f 5651//6847 5020//6848 5650//6849 -f 5650//6850 5020//6850 5022//6850 -f 5650//6851 5022//6851 5023//6851 -f 5012//6852 5011//6852 5652//6852 -f 5652//6853 5011//6853 5015//6853 -f 5652//6854 5015//6855 5653//6856 -f 5653//6856 5015//6855 5014//6857 -f 5653//6858 5014//6859 5651//6860 -f 5651//6861 5014//6861 5018//6861 -f 5651//6862 5018//6862 5020//6862 -f 5639//6863 5009//6863 5652//6863 -f 5652//6864 5009//6864 5013//6864 -f 5652//6865 5013//6865 5012//6865 -f 5639//6866 5654//6867 5655//6868 -f 5655//6868 5656//6869 5639//6866 -f 5639//6870 5656//6870 5622//6870 -f 5639//6871 5622//6871 5621//6871 -f 5007//6872 5657//6873 5005//6874 -f 5005//6874 5657//6873 4958//6875 -f 5007//6872 5010//6876 5657//6873 -f 5657//6873 5010//6876 5639//6877 -f 5657//6873 5639//6877 4958//6875 -f 4958//6875 5639//6877 5621//6878 -f 4958//6879 5621//6879 4959//6879 -f 4959//6880 5621//6881 5624//6882 -f 4959//6880 5624//6882 4988//6883 -f 4988//6883 5624//6882 5625//6884 -f 5658//6885 5659//6885 5660//6885 -f 5661//6886 5662//6886 5663//6886 -f 5654//6887 5664//6888 5665//6889 -f 5665//6889 5664//6888 5666//6890 -f 5665//6889 5666//6890 5661//6891 -f 5667//6892 5656//6893 5655//6892 -f 5668//6894 5669//6895 5670//6896 -f 5668//6897 5670//6897 5671//6897 -f 5655//6892 5654//6898 5667//6892 -f 5667//6892 5654//6898 5665//6899 -f 5667//6900 5665//6901 5672//6900 -f 5672//6900 5665//6901 5673//6902 -f 5672//6903 5673//6904 5674//6905 -f 5674//6905 5673//6904 5675//6906 -f 5674//6907 5675//6908 5676//6909 -f 5676//6909 5675//6908 5677//6910 -f 5676//6911 5677//6912 5678//6913 -f 5669//6895 5658//6914 5670//6896 -f 5670//6915 5658//6915 5660//6915 -f 5670//6916 5660//6917 5679//6916 -f 5679//6916 5660//6917 5680//6917 -f 5679//6918 5680//6919 5681//6920 -f 5661//6921 5663//6921 5665//6921 -f 5665//6922 5663//6922 5682//6922 -f 5665//6901 5682//6923 5673//6902 -f 5682//6924 5683//6924 5673//6924 -f 5673//6925 5683//6925 5684//6925 -f 5673//6904 5684//6926 5675//6906 -f 5675//6927 5684//6927 5685//6927 -f 5675//6928 5685//6928 5677//6928 -f 5677//6929 5685//6930 5686//6931 -f 5686//6932 5687//6933 5677//6934 -f 5677//6935 5687//6935 5681//6935 -f 5677//6912 5681//6912 5678//6913 -f 5678//6919 5681//6920 5680//6919 -f 5687//6936 5688//6936 5681//6936 -f 5681//6937 5688//6937 5689//6937 -f 5681//6938 5689//6938 5679//6938 -f 5679//6939 5689//6939 5690//6939 -f 5690//6940 5691//6940 5679//6940 -f 5679//6941 5691//6941 5692//6941 -f 5679//6942 5692//6942 5670//6942 -f 5670//6943 5692//6943 5693//6943 -f 5670//6944 5693//6944 5671//6944 -f 5671//6945 5693//6946 5694//6947 -f 5671//6948 5694//6948 5695//6948 -f 5653//6949 5696//6949 5697//6949 -f 5662//6950 5653//6950 5698//6950 -f 5698//6951 5653//6951 5697//6951 -f 5698//6952 5697//6952 5699//6952 -f 5662//6953 5661//6953 5653//6953 -f 5653//6954 5661//6954 5666//6954 -f 5653//6955 5666//6955 5652//6955 -f 5652//6956 5666//6956 5664//6956 -f 5652//6957 5664//6957 5639//6957 -f 5639//6958 5664//6958 5654//6958 -f 5696//6959 5653//6959 5700//6959 -f 5700//6960 5653//6858 5651//6860 -f 5700//6961 5651//6961 5701//6961 -f 5701//6962 5651//6962 5702//6962 -f 5702//6963 5651//6847 5650//6849 -f 5702//6964 5650//6964 5703//6964 -f 5703//6965 5650//6845 5649//6844 -f 5703//6966 5649//6966 5704//6966 -f 5705//6967 5706//6967 5644//6967 -f 5644//6968 5706//6969 5645//6970 -f 5706//6969 5707//6971 5645//6970 -f 5645//6972 5707//6972 5708//6972 -f 5645//6826 5708//6973 5646//6827 -f 5646//6974 5708//6974 5709//6974 -f 5646//6831 5709//6975 5647//6832 -f 5647//6832 5709//6975 5710//6976 -f 5647//6836 5710//6977 5648//6837 -f 5648//6837 5710//6977 5711//6978 -f 5648//6840 5711//6840 5649//6841 -f 5649//6979 5711//6979 5712//6979 -f 5649//6980 5712//6980 5704//6980 -f 5644//6981 5713//6982 5714//6983 -f 5714//6983 5713//6984 5715//6985 -f 5713//6984 5716//6986 5715//6985 -f 5715//6987 5716//6987 5717//6987 -f 5715//6985 5717//6988 5714//6983 -f 5714//6983 5717//6988 5718//6989 -f 5714//6983 5718//6989 5644//6981 -f 5644//6990 5718//6990 5719//6990 -f 5644//6991 5719//6991 5705//6991 -f 5225//6992 5224//6992 5640//6992 -f 5640//6993 5224//6993 5247//6993 -f 5640//6994 5247//6994 5643//6994 -f 5643//6995 5247//6995 5242//6995 -f 5643//6996 5242//6997 5644//6981 -f 5644//6981 5242//6997 5720//6998 -f 5644//6981 5720//6998 5713//6982 -f 5693//6999 5692//6999 5721//6999 -f 5691//7000 5690//7000 5722//7000 -f 5689//7001 5688//7001 5723//7001 -f 5712//7002 5711//7002 5724//7002 -f 5695//7003 5694//7003 5725//7003 -f 5725//7004 5694//7004 5726//7004 -f 5725//7005 5726//7005 5727//7005 -f 5728//7006 5727//7006 5729//7006 -f 5729//7007 5730//7007 5728//7007 -f 5728//7008 5730//7008 5731//7008 -f 5728//7009 5731//7009 5732//7009 -f 5732//7010 5731//7010 5733//7010 -f 5732//7011 5733//7011 5734//7011 -f 5734//7012 5733//7013 5735//7014 -f 5734//7012 5735//7014 5736//7015 -f 5736//7016 5735//7016 5737//7016 -f 5736//7017 5737//7017 5738//7017 -f 5738//7018 5737//7018 5739//7018 -f 5738//7019 5739//7019 5740//7019 -f 5740//7020 5739//7020 5741//7020 -f 5740//7021 5741//7021 5742//7021 -f 5742//7022 5741//7022 5743//7022 -f 5742//7023 5743//7023 5744//7023 -f 5744//7024 5743//7024 5745//7024 -f 5744//7025 5745//7025 5746//7025 -f 5704//7026 5747//7027 5703//7028 -f 5703//7029 5747//7030 5748//7031 -f 5703//7029 5748//7031 5702//7032 -f 5702//7033 5748//7033 5701//7033 -f 5701//7034 5748//7034 5749//7034 -f 5701//7035 5749//7035 5700//7035 -f 5700//7036 5749//7036 5750//7036 -f 5700//7037 5750//7037 5696//7037 -f 5662//7038 5698//7038 5663//7038 -f 5663//7039 5698//7039 5751//7039 -f 5752//7040 5753//7041 5754//7042 -f 5754//7043 5753//7044 5755//7045 -f 5756//7046 5757//7046 5758//7046 -f 5758//7047 5759//7047 5760//7047 -f 5760//7048 5759//7048 5761//7048 -f 5762//7049 5683//7049 5751//7049 -f 5751//7050 5683//7050 5682//7050 -f 5751//7051 5682//7051 5663//7051 -f 5698//7052 5699//7052 5751//7052 -f 5751//7053 5699//7053 5763//7053 -f 5751//7054 5763//7054 5762//7054 -f 5762//7055 5763//7055 5764//7055 -f 5762//7056 5764//7056 5765//7056 -f 5704//7026 5712//7057 5747//7027 -f 5747//7058 5712//7058 5724//7058 -f 5747//7059 5724//7059 5766//7059 -f 5766//7060 5724//7060 5767//7060 -f 5766//7061 5767//7061 5752//7061 -f 5687//6933 5686//6932 5765//7062 -f 5765//7063 5686//6931 5685//6930 -f 5765//7064 5685//7064 5762//7064 -f 5762//7065 5685//7065 5684//7065 -f 5762//7066 5684//7066 5683//7066 -f 5752//7067 5754//7067 5766//7067 -f 5766//7068 5754//7069 5768//7070 -f 5766//7071 5768//7071 5747//7071 -f 5747//7072 5768//7073 5769//7074 -f 5747//7072 5769//7074 5748//7075 -f 5748//7076 5769//7077 5770//7078 -f 5748//7076 5770//7078 5749//7079 -f 5749//7080 5770//7080 5771//7080 -f 5749//7081 5771//7081 5750//7081 -f 5750//7082 5771//7082 5772//7082 -f 5750//7083 5772//7083 5696//7083 -f 5688//7084 5687//7084 5723//7084 -f 5723//7085 5687//7085 5765//7085 -f 5723//7086 5765//7087 5773//7088 -f 5773//7089 5765//7089 5764//7089 -f 5773//7090 5764//7090 5774//7090 -f 5774//7091 5764//7091 5763//7091 -f 5774//7092 5763//7092 5775//7092 -f 5775//7093 5763//7093 5699//7093 -f 5776//7094 5777//7095 5778//7096 -f 5697//7097 5696//7097 5779//7097 -f 5779//7098 5696//7098 5772//7098 -f 5779//7099 5772//7099 5780//7099 -f 5780//7100 5772//7100 5771//7100 -f 5780//7101 5771//7101 5781//7101 -f 5781//7102 5771//7102 5770//7102 -f 5781//7103 5770//7103 5782//7103 -f 5782//7104 5770//7105 5769//7106 -f 5782//7104 5769//7106 5783//7107 -f 5783//7108 5769//7109 5768//7110 -f 5783//7108 5768//7110 5784//7111 -f 5784//7112 5768//7070 5754//7069 -f 5784//7113 5754//7114 5756//7113 -f 5756//7115 5754//7115 5755//7115 -f 5756//7116 5755//7116 5757//7116 -f 5690//7117 5689//7117 5722//7117 -f 5722//7118 5689//7118 5723//7118 -f 5722//7119 5723//7120 5778//7121 -f 5778//7122 5723//7086 5773//7088 -f 5778//7096 5773//7123 5776//7094 -f 5776//7124 5773//7124 5774//7124 -f 5776//7125 5774//7125 5785//7125 -f 5785//7126 5774//7126 5775//7126 -f 5786//7127 5787//7127 5777//7127 -f 5777//7128 5787//7128 5788//7128 -f 5777//7129 5788//7129 5778//7129 -f 5758//7130 5760//7130 5756//7130 -f 5756//7131 5760//7132 5789//7133 -f 5756//7113 5789//7134 5784//7113 -f 5784//7135 5789//7136 5790//7137 -f 5784//7135 5790//7137 5783//7138 -f 5783//7139 5790//7140 5791//7141 -f 5783//7139 5791//7141 5782//7142 -f 5782//7143 5791//7144 5792//7145 -f 5782//7143 5792//7145 5781//7146 -f 5692//7147 5691//7147 5721//7147 -f 5721//7148 5691//7148 5722//7148 -f 5721//7149 5722//7149 5793//7149 -f 5793//7150 5722//7119 5778//7121 -f 5793//7151 5778//7151 5794//7151 -f 5794//7152 5778//7152 5788//7152 -f 5795//7153 5796//7154 5797//7155 -f 5797//7156 5796//7156 5798//7156 -f 5797//7157 5798//7157 5799//7157 -f 5799//7158 5798//7159 5800//7160 -f 5799//7158 5800//7160 5801//7161 -f 5801//7162 5800//7162 5786//7162 -f 5699//7163 5697//7163 5775//7163 -f 5775//7164 5697//7164 5779//7164 -f 5775//7165 5779//7165 5785//7165 -f 5785//7166 5779//7166 5780//7166 -f 5785//7167 5780//7167 5776//7167 -f 5776//7168 5780//7168 5781//7168 -f 5776//7169 5781//7170 5777//7171 -f 5777//7171 5781//7170 5792//7172 -f 5777//7173 5792//7174 5786//7175 -f 5786//7175 5792//7174 5791//7176 -f 5786//7175 5791//7176 5801//7177 -f 5801//7178 5791//7179 5790//7180 -f 5801//7178 5790//7180 5799//7181 -f 5799//7182 5790//7183 5789//7184 -f 5799//7182 5789//7184 5797//7185 -f 5797//7186 5789//7133 5760//7132 -f 5797//7155 5760//7187 5795//7153 -f 5795//7188 5760//7188 5761//7188 -f 5795//7189 5761//7189 5802//7189 -f 5727//7190 5726//7190 5729//7190 -f 5729//7191 5726//7191 5803//7191 -f 5729//7192 5803//7192 5730//7192 -f 5730//7193 5803//7193 5804//7193 -f 5730//7194 5804//7194 5731//7194 -f 5731//7195 5804//7195 5805//7195 -f 5731//7196 5805//7196 5733//7196 -f 5733//7197 5805//7197 5806//7197 -f 5733//7198 5806//7198 5735//7198 -f 5735//7199 5806//7199 5807//7199 -f 5735//7200 5807//7200 5737//7200 -f 5737//7201 5807//7201 5808//7201 -f 5737//7202 5808//7203 5739//7204 -f 5802//7205 5745//7205 5795//7205 -f 5795//7206 5745//7206 5743//7206 -f 5795//7207 5743//7207 5796//7207 -f 5796//7208 5743//7209 5741//7210 -f 5796//7208 5741//7210 5798//7211 -f 5798//7212 5741//7213 5739//7214 -f 5798//7212 5739//7214 5800//7215 -f 5800//7216 5739//7204 5808//7203 -f 5800//7217 5808//7217 5786//7217 -f 5786//7218 5808//7218 5807//7218 -f 5786//7219 5807//7219 5787//7219 -f 5787//7220 5807//7220 5806//7220 -f 5787//7221 5806//7221 5788//7221 -f 5788//7222 5806//7222 5805//7222 -f 5788//7223 5805//7223 5794//7223 -f 5794//7224 5805//7224 5804//7224 -f 5794//7225 5804//7225 5793//7225 -f 5793//7226 5804//7226 5803//7226 -f 5793//7227 5803//7227 5721//7227 -f 5721//7228 5803//7228 5726//7228 -f 5721//7229 5726//7229 5693//7229 -f 5693//6946 5726//7230 5694//6947 -f 5809//7231 5810//7231 5811//7231 -f 5724//7232 5711//7232 5812//7232 -f 5812//7233 5711//7233 5710//7233 -f 5813//7234 5710//7234 5709//7234 -f 5708//7235 5707//7236 5814//7237 -f 5242//7238 5815//7238 5720//7238 -f 5720//7239 5815//7239 5816//7239 -f 5720//7240 5816//7240 5713//7240 -f 5717//7241 5716//7241 5817//7241 -f 5718//7242 5717//7242 5818//7242 -f 5818//7243 5717//7243 5819//7243 -f 5818//7244 5819//7244 5820//7244 -f 5821//7245 5822//7245 5823//7245 -f 5823//7246 5822//7247 5824//7248 -f 5825//7249 5826//7250 5827//7251 -f 5826//7250 5828//7252 5827//7251 -f 5827//7251 5828//7252 5829//7253 -f 5827//7251 5829//7253 5830//7254 -f 5809//7255 5811//7255 5831//7255 -f 5831//7256 5811//7256 5832//7256 -f 5831//7257 5832//7257 5833//7257 -f 5833//7258 5832//7258 5834//7258 -f 5833//7259 5834//7259 5835//7259 -f 5835//7260 5834//7260 5836//7260 -f 5835//7261 5836//7261 5837//7261 -f 5836//7262 5838//7262 5837//7262 -f 5837//7263 5838//7263 5233//7263 -f 5837//7264 5233//7264 5232//7264 -f 5237//7265 5839//7265 5239//7265 -f 5239//7266 5839//7266 5817//7266 -f 5716//7267 5713//7267 5817//7267 -f 5817//7268 5713//7268 5816//7268 -f 5817//7269 5816//7269 5239//7269 -f 5239//7270 5816//7270 5815//7270 -f 5239//7271 5815//7271 5241//7271 -f 5241//7272 5815//7272 5242//7272 -f 5709//7273 5840//7274 5813//7275 -f 5813//7276 5840//7277 5841//7278 -f 5813//7276 5841//7278 5842//7279 -f 5842//7280 5841//7281 5843//7282 -f 5842//7280 5843//7282 5844//7283 -f 5844//7284 5843//7285 5845//7286 -f 5844//7284 5845//7286 5846//7287 -f 5846//7288 5845//7289 5847//7289 -f 5846//7288 5847//7289 5848//7288 -f 5848//7290 5847//7291 5849//7292 -f 5848//7290 5849//7292 5850//7293 -f 5850//7294 5849//7295 5823//7296 -f 5850//7294 5823//7296 5851//7297 -f 5851//7298 5823//7246 5824//7248 -f 5851//7299 5824//7299 5852//7299 -f 5724//7300 5812//7300 5767//7300 -f 5767//7301 5812//7302 5853//7303 -f 5767//7304 5853//7304 5752//7304 -f 5820//7305 5854//7305 5818//7305 -f 5818//7306 5854//7306 5855//7306 -f 5818//7307 5855//7307 5718//7307 -f 5718//7308 5855//7308 5719//7308 -f 5856//7309 5857//7309 5858//7309 -f 5858//7310 5857//7310 5859//7310 -f 5858//7311 5859//7311 5860//7311 -f 5820//7312 5861//7312 5854//7312 -f 5854//7313 5861//7313 5862//7313 -f 5854//7314 5862//7314 5855//7314 -f 5855//7315 5862//7315 5863//7315 -f 5855//7316 5863//7316 5719//7316 -f 5719//7317 5863//7317 5705//7317 -f 5717//7318 5817//7318 5819//7318 -f 5819//7319 5817//7319 5839//7319 -f 5819//7320 5839//7321 5820//7322 -f 5820//7322 5839//7321 5237//7323 -f 5820//7324 5237//7324 5861//7324 -f 5861//7325 5237//7325 5235//7325 -f 5861//7326 5235//7326 5234//7326 -f 5752//7040 5853//7327 5753//7041 -f 5753//7328 5853//7328 5864//7328 -f 5753//7044 5864//7329 5755//7045 -f 5755//7330 5864//7330 5865//7330 -f 5755//7331 5865//7331 5757//7331 -f 5707//7236 5706//7332 5814//7237 -f 5814//7333 5706//7333 5856//7333 -f 5814//7334 5856//7334 5866//7334 -f 5866//7335 5856//7335 5858//7335 -f 5866//7336 5858//7336 5867//7336 -f 5867//7337 5858//7337 5860//7337 -f 5867//7338 5860//7339 5868//7340 -f 5868//7340 5860//7339 5869//7341 -f 5868//7342 5869//7343 5870//7344 -f 5871//7345 5872//7345 5859//7345 -f 5859//7346 5872//7346 5873//7346 -f 5859//7347 5873//7347 5860//7347 -f 5860//7348 5873//7348 5874//7348 -f 5860//7349 5874//7349 5869//7349 -f 5706//7350 5705//7350 5856//7350 -f 5856//7351 5705//7351 5863//7351 -f 5856//7352 5863//7352 5857//7352 -f 5857//7353 5863//7353 5862//7353 -f 5857//7354 5862//7354 5859//7354 -f 5859//7355 5862//7355 5861//7355 -f 5859//7356 5861//7356 5871//7356 -f 5871//7357 5861//7357 5234//7357 -f 5871//7358 5234//7358 5246//7358 -f 5757//7359 5865//7359 5758//7359 -f 5758//7360 5865//7360 5875//7360 -f 5758//7361 5875//7361 5759//7361 -f 5876//7362 5870//7362 5877//7362 -f 5877//7363 5870//7344 5869//7343 -f 5877//7363 5869//7343 5878//7364 -f 5878//7364 5869//7343 5874//7365 -f 5878//7364 5874//7365 5879//7366 -f 5879//7366 5874//7365 5873//7367 -f 5879//7368 5873//7369 5880//7370 -f 5880//7370 5873//7369 5872//7371 -f 5880//7372 5872//7373 5881//7374 -f 5881//7374 5872//7373 5871//7375 -f 5759//7376 5875//7376 5761//7376 -f 5761//7377 5875//7377 5882//7377 -f 5761//7378 5882//7378 5802//7378 -f 5827//7379 5876//7379 5883//7379 -f 5883//7380 5876//7380 5877//7380 -f 5883//7381 5877//7381 5884//7381 -f 5884//7382 5877//7382 5878//7382 -f 5884//7383 5878//7383 5885//7383 -f 5885//7384 5878//7384 5879//7384 -f 5885//7385 5879//7385 5886//7385 -f 5886//7386 5879//7386 5880//7386 -f 5886//7387 5880//7387 5887//7387 -f 5887//7388 5880//7388 5881//7388 -f 5246//6013 5245//6013 5871//7389 -f 5871//7390 5245//7390 5244//7390 -f 5871//7391 5244//7391 5881//7391 -f 5881//7392 5244//7392 5243//7392 -f 5881//7393 5243//7393 5887//7393 -f 5887//7394 5243//7394 5222//7394 -f 5887//7395 5222//7395 5888//7395 -f 5888//7396 5222//7396 5221//7396 -f 5802//7397 5882//7397 5745//7397 -f 5745//7398 5882//7398 5889//7398 -f 5745//7399 5889//7399 5746//7399 -f 5710//7400 5813//7400 5812//7400 -f 5812//7302 5813//7401 5842//7402 -f 5812//7302 5842//7402 5853//7303 -f 5853//7403 5842//7404 5844//7405 -f 5853//7403 5844//7405 5864//7406 -f 5864//7407 5844//7408 5846//7409 -f 5864//7407 5846//7409 5865//7410 -f 5865//7411 5846//7412 5848//7412 -f 5865//7411 5848//7412 5875//7411 -f 5875//7413 5848//7414 5850//7415 -f 5875//7413 5850//7415 5882//7416 -f 5882//7417 5850//7418 5851//7419 -f 5882//7417 5851//7419 5889//7420 -f 5889//7421 5851//7421 5852//7421 -f 5889//7422 5852//7422 5746//7422 -f 5709//7273 5708//7423 5840//7274 -f 5840//7424 5708//7424 5814//7424 -f 5840//7425 5814//7425 5841//7425 -f 5841//7426 5814//7426 5866//7426 -f 5841//7427 5866//7427 5843//7427 -f 5843//7428 5866//7428 5867//7428 -f 5843//7429 5867//7430 5845//7431 -f 5845//7431 5867//7430 5868//7432 -f 5845//7433 5868//7434 5847//7435 -f 5847//7435 5868//7434 5870//7436 -f 5847//7437 5870//7438 5849//7439 -f 5849//7439 5870//7438 5876//7440 -f 5849//7441 5876//7442 5823//7443 -f 5823//7443 5876//7442 5827//7444 -f 5823//7445 5827//7445 5821//7445 -f 5821//7446 5827//7251 5830//7254 -f 5221//7447 5233//7448 5888//7449 -f 5888//7449 5233//7448 5838//7450 -f 5888//7451 5838//7451 5887//7451 -f 5887//7452 5838//7452 5836//7452 -f 5887//7453 5836//7453 5886//7453 -f 5886//7454 5836//7454 5834//7454 -f 5886//7455 5834//7455 5885//7455 -f 5885//7456 5834//7456 5832//7456 -f 5885//7457 5832//7457 5884//7457 -f 5884//7458 5832//7458 5811//7458 -f 5884//7459 5811//7459 5883//7459 -f 5883//7460 5811//7460 5810//7460 -f 5883//7461 5810//7461 5827//7461 -f 5827//7462 5810//7462 5809//7462 -f 5827//7463 5809//7463 5825//7463 -f 5364//7464 5367//7464 5619//7464 -f 5740//7465 5742//7466 5346//7467 -f 5346//7468 5742//7468 5348//7468 -f 5348//7469 5742//7470 5744//7471 -f 5348//7469 5744//7471 5350//7472 -f 5725//7473 5727//7474 5335//7475 -f 5725//7473 5335//7475 5695//7476 -f 5346//7467 5345//7477 5740//7465 -f 5740//7478 5345//7478 5339//7478 -f 5740//7479 5339//7479 5738//7479 -f 5738//7480 5339//7481 5337//7482 -f 5738//7480 5337//7482 5736//7483 -f 5736//7484 5337//7484 5734//7484 -f 5727//7485 5728//7485 5335//7485 -f 5335//7486 5728//7486 5732//7486 -f 5335//7487 5732//7487 5300//7487 -f 5300//7488 5732//7488 5734//7488 -f 5300//7489 5734//7489 5336//7489 -f 5336//7490 5734//7490 5337//7490 -f 5334//7491 5332//7491 5890//7491 -f 5890//7492 5332//7493 5330//7494 -f 5890//7492 5330//7494 5328//7495 -f 5334//7496 5890//7496 5335//7496 -f 5335//7497 5890//7497 5671//7497 -f 5335//7498 5671//7498 5695//7498 -f 5658//7499 5292//7499 5659//7499 -f 5659//7500 5292//7500 5609//7500 -f 5659//7501 5609//7502 5891//7503 -f 5891//7503 5609//7502 5611//7504 -f 5328//7495 5325//7505 5890//7492 -f 5890//7492 5325//7505 5296//7506 -f 5890//7492 5296//7506 5671//7507 -f 5671//7508 5296//7508 5295//7508 -f 5671//7509 5295//7509 5668//7509 -f 5668//7510 5295//7510 5292//7510 -f 5668//7511 5292//7511 5669//7511 -f 5669//7512 5292//7512 5658//7512 -f 5279//7513 5602//7513 5281//7513 -f 5281//7514 5602//7515 5616//7516 -f 5281//7514 5616//7516 5283//7517 -f 5292//7518 5287//7518 5609//7518 -f 5609//7519 5287//7519 5289//7519 -f 5609//7520 5289//7520 5607//7520 -f 5283//7521 5616//7522 5284//7523 -f 5284//7523 5616//7522 5617//7524 -f 5284//7525 5617//7525 5289//7525 -f 5289//7526 5617//7526 5604//7526 -f 5289//7527 5604//7527 5607//7527 -f 5350//7528 5744//7529 5352//7530 -f 5352//7530 5744//7529 5746//7531 -f 5352//7532 5746//7533 5354//7534 -f 5354//7534 5746//7533 5852//7535 -f 5354//7536 5852//7537 5355//7538 -f 5355//7538 5852//7537 5824//7539 -f 5355//7540 5824//7541 5317//7542 -f 5317//7542 5824//7541 5822//7543 -f 5317//7544 5822//7545 5319//7546 -f 5822//7545 5821//7547 5319//7546 -f 5319//7548 5821//7549 5830//7549 -f 5319//7548 5830//7549 5321//7548 -f 5321//7550 5830//7551 5829//7552 -f 5321//7550 5829//7552 5828//7553 -f 5828//7553 5826//7554 5321//7550 -f 5321//7550 5826//7554 5825//7555 -f 5321//7556 5825//7557 5323//7558 -f 5323//7558 5825//7557 5809//7559 -f 5323//7560 5809//7560 5324//7560 -f 5324//7561 5809//7561 5831//7561 -f 5324//7562 5831//7562 5314//7562 -f 5305//7563 5304//7564 5833//7565 -f 5833//7565 5304//7564 5303//7566 -f 5833//7567 5303//7567 5831//7567 -f 5831//7568 5303//7568 5315//7568 -f 5831//7569 5315//7569 5314//7569 -f 5833//7570 5835//7570 5305//7570 -f 5305//7571 5835//7571 5837//7571 -f 5305//7572 5837//7572 5232//7572 -f 5230//7573 5229//7574 5373//7575 -f 5251//7576 5261//7576 5615//7576 -f 5615//7577 5261//7578 5267//7579 -f 5615//7577 5267//7579 5266//7580 -f 5344//7581 5311//7582 5892//7583 -f 5892//7583 5311//7582 5309//7584 -f 5232//7585 5230//7585 5305//7585 -f 5305//7586 5230//7587 5892//7588 -f 5305//7586 5892//7588 5307//7589 -f 5307//7590 5892//7590 5309//7590 -f 5373//7591 5374//7591 5230//7591 -f 5230//7592 5374//7592 5341//7592 -f 5230//7593 5341//7594 5892//7583 -f 5892//7583 5341//7594 5343//7595 -f 5892//7583 5343//7595 5344//7581 -f 5615//7596 5614//7596 5369//7596 -f 5369//7597 5614//7597 5612//7597 -f 5369//7598 5612//7598 5367//7598 -f 5367//7599 5612//7599 5618//7599 -f 5367//7600 5618//7600 5619//7600 -f 5229//7574 5251//7601 5373//7575 -f 5373//7602 5251//7602 5615//7602 -f 5373//7603 5615//7603 5371//7603 -f 5371//7604 5615//7604 5369//7604 -f 5620//7605 5361//7605 5619//7605 -f 5619//7606 5361//7606 5363//7606 -f 5619//7607 5363//7607 5364//7607 -f 5361//7608 5620//7608 5359//7608 -f 5359//7608 5620//7608 5357//7608 -f 5893//21 5894//21 5895//21 -f 5896//21 5897//21 5898//21 -f 5898//21 5897//21 5894//21 -f 5895//21 5894//21 5899//21 -f 5900//21 5901//21 5895//21 -f 5895//21 5901//21 5902//21 -f 5895//21 5902//21 5893//21 -f 5898//21 5903//21 5896//21 -f 5896//21 5903//21 5904//21 -f 5896//21 5904//21 5905//21 -f 5896//21 5906//21 5907//21 -f 5907//21 5906//21 5908//21 -f 5907//21 5908//21 5909//21 -f 5905//21 5910//21 5896//21 -f 5896//21 5910//21 5911//21 -f 5896//21 5911//21 5906//21 -f 5912//21 5913//21 5914//21 -f 5915//21 5916//21 5895//21 -f 5895//21 5916//21 5917//21 -f 5895//21 5917//21 5900//21 -f 5918//21 5919//21 5920//21 -f 5920//21 5919//21 5907//21 -f 5920//21 5907//21 5921//21 -f 5921//21 5907//21 5909//21 -f 5897//21 5922//21 5894//21 -f 5894//21 5922//21 5923//21 -f 5894//21 5923//21 5899//21 -f 5899//21 5923//21 5924//21 -f 5899//21 5924//21 5912//21 -f 5912//21 5924//21 5925//21 -f 5912//21 5925//21 5926//21 -f 5926//21 5927//21 5912//21 -f 5912//21 5927//21 5928//21 -f 5912//21 5928//21 5913//21 -f 5914//21 5929//21 5912//21 -f 5912//21 5929//21 5930//21 -f 5912//21 5930//21 5931//21 -f 5932//7609 5933//7609 5899//7609 -f 5899//7609 5933//7609 5895//7609 -f 5933//7610 5934//7610 5895//7610 -f 5895//7611 5934//7611 5935//7611 -f 5895//7612 5935//7612 5915//7612 -f 5935//7613 5936//7613 5915//7613 -f 5915//7614 5936//7614 5937//7614 -f 5915//7615 5937//7615 5916//7615 -f 5937//7616 5938//7616 5916//7616 -f 5916//7617 5938//7617 5939//7617 -f 5916//7618 5939//7619 5917//7620 -f 5917//7620 5939//7619 5940//7621 -f 5917//7622 5940//7622 5900//7622 -f 5940//7623 5941//7623 5900//7623 -f 5900//7624 5941//7624 5942//7624 -f 5900//7625 5942//7625 5901//7625 -f 5901//7626 5942//7626 5943//7626 -f 5901//7627 5943//7627 5902//7627 -f 5943//7628 5944//7628 5902//7628 -f 5902//7629 5944//7629 5945//7629 -f 5902//7630 5945//7631 5893//7630 -f 5945//7631 5946//7632 5893//7630 -f 5893//7633 5946//7633 5947//7633 -f 5893//7634 5947//7634 5894//7634 -f 5947//7635 5948//7635 5894//7635 -f 5894//7636 5948//7636 5949//7636 -f 5894//7637 5949//7637 5898//7637 -f 5949//7638 5950//7638 5898//7638 -f 5898//7639 5950//7639 5951//7639 -f 5898//7640 5951//7641 5903//7642 -f 5951//7641 5952//7643 5903//7642 -f 5903//7644 5952//7644 5953//7644 -f 5903//7645 5953//7645 5904//7645 -f 5953//7646 5954//7646 5904//7646 -f 5904//7647 5954//7647 5955//7647 -f 5904//7648 5955//7649 5905//7650 -f 5955//7649 5956//7651 5905//7650 -f 5905//7652 5956//7652 5957//7652 -f 5905//7653 5957//7653 5910//7653 -f 5957//7654 5958//7654 5910//7654 -f 5910//7655 5958//7655 5959//7655 -f 5910//7656 5959//7656 5911//7656 -f 5959//7657 5960//7657 5911//7657 -f 5911//7658 5960//7659 5961//7660 -f 5911//7658 5961//7660 5906//7661 -f 5961//7660 5962//7662 5906//7661 -f 5906//7663 5962//7664 5963//7665 -f 5906//7663 5963//7665 5908//7666 -f 5964//7667 5909//7667 5965//7667 -f 5965//7668 5909//7669 5908//7670 -f 5965//7668 5908//7670 5966//7671 -f 5966//7672 5908//7672 5963//7672 -f 5967//7673 5968//7673 5969//7673 -f 5970//7674 5971//7674 5972//7674 -f 5973//7675 5974//7676 5970//7677 -f 5970//7677 5972//7678 5973//7675 -f 5973//7679 5972//7679 5975//7679 -f 5973//7680 5975//7680 5976//7680 -f 5971//7681 5970//7682 5977//7683 -f 5977//7683 5970//7682 5978//7684 -f 5977//7683 5978//7684 5979//7685 -f 5979//7685 5980//7686 5977//7683 -f 5977//7683 5980//7686 5981//7687 -f 5977//7683 5981//7687 5971//7681 -f 5982//7688 5983//7688 5984//7688 -f 5984//7689 5983//7689 5985//7689 -f 5984//7690 5985//7690 5973//7690 -f 5973//7691 5985//7691 5986//7691 -f 5973//7692 5986//7692 5974//7692 -f 5974//7676 5986//7693 5987//7694 -f 5974//7676 5987//7694 5970//7677 -f 5982//7695 5984//7695 5988//7695 -f 5988//7696 5984//7697 5989//7698 -f 5988//7696 5989//7698 5990//7699 -f 5990//7700 5989//7700 5991//7700 -f 5991//7701 5989//7702 5992//7703 -f 5991//7701 5992//7703 5993//7704 -f 5993//7705 5992//7706 5994//7707 -f 5993//7705 5994//7707 5995//7707 -f 5995//7708 5994//7708 5996//7708 -f 5996//7709 5994//7710 5997//7711 -f 5996//7712 5997//7712 5998//7712 -f 5998//7713 5997//7713 5999//7713 -f 5999//7714 5997//7715 6000//7716 -f 5999//7717 6000//7717 6001//7717 -f 6001//7718 6000//7719 6002//7719 -f 6001//7718 6002//7719 6003//7720 -f 6003//7721 6002//7722 6004//7723 -f 6003//7721 6004//7723 6005//7724 -f 6006//7725 6007//7726 6004//7727 -f 6004//7728 6007//7728 6008//7728 -f 6004//7729 6008//7729 6005//7729 -f 6009//7730 6010//7730 6011//7730 -f 6011//7731 6010//7731 6012//7731 -f 6011//7732 6012//7733 6013//7734 -f 6013//7734 6012//7733 6014//7735 -f 6013//7736 6014//7737 6006//7738 -f 6006//7739 6014//7739 6015//7739 -f 6006//7740 6015//7740 6007//7740 -f 5969//7741 5968//7741 6011//7741 -f 6011//7742 5968//7742 6016//7742 -f 6011//7743 6016//7743 6009//7743 -f 5969//7744 6017//7745 6018//7746 -f 6018//7746 6019//7747 5969//7744 -f 5969//7748 6019//7749 6020//7750 -f 5969//7748 6020//7750 6021//7751 -f 6022//7752 6023//7753 6024//7754 -f 6024//7754 6023//7753 6025//7755 -f 6022//7752 5967//7756 6023//7753 -f 6023//7753 5967//7756 5969//7757 -f 6023//7753 5969//7757 6025//7755 -f 6025//7755 5969//7757 6021//7758 -f 6025//7759 6021//7759 6026//7759 -f 6026//7760 6021//7761 6027//7762 -f 6026//7760 6027//7762 6028//7763 -f 6028//7763 6027//7762 6029//7764 -f 6030//7765 6031//7765 6032//7765 -f 6033//7766 6034//7766 6035//7766 -f 6036//7767 6037//7768 6038//7769 -f 6039//7770 5976//7771 6040//7772 -f 6040//7772 5976//7771 5975//7773 -f 6040//7772 5975//7773 5972//7774 -f 6036//7775 6038//7775 6041//7775 -f 6042//7776 6043//7777 6044//7777 -f 6044//7777 6043//7777 6045//7778 -f 6032//7779 6031//7780 6046//7781 -f 6031//7782 6047//7782 6046//7782 -f 6046//7783 6047//7783 6048//7783 -f 6046//7784 6048//7785 6038//7786 -f 6038//7786 6048//7785 6049//7785 -f 6038//7787 6049//7787 6041//7787 -f 6050//7788 6051//7789 6052//7790 -f 6052//7791 6051//7791 6053//7791 -f 6052//7792 6053//7792 6054//7792 -f 6054//7793 6053//7793 6055//7793 -f 6055//7794 6053//7794 6056//7794 -f 6055//7795 6056//7795 6057//7795 -f 6057//7796 6056//7796 6058//7796 -f 6058//7797 6056//7797 6044//7797 -f 6058//7798 6044//7798 6035//7798 -f 6035//7799 6044//7799 6045//7799 -f 6035//7800 6045//7800 6033//7800 -f 6059//7801 6032//7779 6060//7802 -f 6060//7802 6032//7779 6046//7781 -f 6060//7803 6046//7784 6040//7803 -f 6040//7803 6046//7784 6038//7786 -f 6040//7804 6038//7804 6039//7804 -f 6039//7805 6038//7769 6037//7768 -f 6059//7806 6061//7806 6032//7806 -f 6032//7807 6061//7807 6051//7807 -f 6032//7808 6051//7808 6030//7808 -f 6030//7809 6051//7809 6050//7809 -f 6061//7810 6062//7810 6051//7810 -f 6051//7811 6062//7811 6063//7811 -f 6051//7812 6063//7812 6053//7812 -f 6053//7813 6063//7813 6064//7813 -f 6053//7814 6064//7814 6056//7814 -f 6065//7815 6042//7815 6066//7815 -f 6066//7816 6042//7816 6044//7816 -f 6066//7817 6044//7818 6067//7819 -f 6067//7819 6044//7818 6056//7820 -f 6067//7821 6056//7821 6068//7821 -f 6068//7822 6056//7822 6064//7822 -f 6069//7823 6070//7823 6066//7823 -f 6066//7824 6070//7825 6071//7826 -f 6066//7824 6071//7826 6065//7827 -f 6072//7828 6073//7829 6069//7830 -f 6069//7830 6073//7829 6074//7831 -f 6075//7832 6076//7833 6063//7834 -f 6063//7835 6062//7835 6075//7835 -f 6075//7836 6062//7836 6061//7836 -f 6075//7837 6061//7838 6077//7839 -f 6077//7840 6061//7840 6059//7840 -f 6077//7841 6059//7841 6078//7841 -f 6078//7842 6059//7801 6060//7802 -f 6078//7843 6060//7843 6079//7843 -f 6079//7844 6060//7844 6040//7844 -f 6079//7845 6040//7845 5972//7845 -f 6069//7830 6066//7846 6072//7828 -f 6072//7847 6066//7847 6067//7847 -f 6072//7848 6067//7848 6080//7848 -f 6080//7849 6067//7849 6068//7849 -f 6080//7850 6068//7851 6076//7852 -f 6076//7853 6068//7853 6064//7853 -f 6076//7854 6064//7854 6063//7854 -f 5972//7855 5971//7856 6079//7857 -f 6079//7857 5971//7856 6081//7858 -f 6079//7859 6081//7860 6078//7859 -f 6078//7859 6081//7860 6082//7861 -f 6078//7862 6082//7863 6077//7864 -f 6077//7864 6082//7863 6083//7863 -f 6077//7839 6083//7837 6075//7837 -f 6075//7837 6083//7837 6084//7837 -f 6075//7832 6084//7865 6076//7833 -f 6076//7833 6084//7865 6085//7866 -f 6076//7852 6085//7850 6080//7850 -f 6080//7850 6085//7850 6086//7850 -f 6080//7867 6086//7867 6072//7867 -f 6072//7868 6086//7868 6087//7868 -f 6072//7869 6087//7869 6073//7869 -f 5979//7870 5978//7871 6088//7872 -f 5979//7873 6088//7873 5980//7873 -f 6074//7874 6073//7874 6089//7874 -f 6089//7875 6073//7875 6087//7875 -f 6089//7876 6087//7876 6090//7876 -f 6091//7877 6090//7877 6092//7877 -f 6092//7878 6090//7878 6087//7878 -f 6092//7879 6087//7879 6093//7879 -f 6093//7880 6087//7880 6086//7880 -f 6093//7881 6086//7881 6094//7881 -f 6094//7882 6086//7882 6085//7882 -f 6094//7883 6085//7883 6095//7883 -f 6095//7884 6085//7866 6084//7865 -f 6095//7885 6084//7886 6096//7887 -f 6096//7887 6084//7886 6083//7888 -f 6096//7889 6083//7889 6097//7889 -f 6097//7890 6083//7890 6082//7890 -f 6097//7891 6082//7891 6098//7891 -f 6098//7892 6082//7892 6081//7892 -f 6098//7893 6081//7893 5981//7893 -f 5981//7894 6081//7894 5971//7894 -f 6099//7895 6091//7896 6100//7897 -f 6100//7897 6091//7896 6092//7898 -f 6100//7899 6092//7900 6101//7901 -f 6101//7901 6092//7900 6093//7902 -f 6101//7903 6093//7904 6102//7905 -f 6102//7905 6093//7904 6094//7906 -f 6102//7907 6094//7908 6103//7907 -f 6103//7907 6094//7908 6095//7908 -f 6103//7909 6095//7910 6104//7910 -f 6104//7910 6095//7910 6096//7910 -f 6104//7911 6096//7912 6105//7913 -f 6105//7913 6096//7912 6097//7914 -f 6105//7915 6097//7916 6088//7917 -f 6088//7917 6097//7916 6098//7918 -f 6088//7919 6098//7919 5980//7919 -f 5980//7920 6098//7920 5981//7920 -f 6106//7921 6107//7922 6103//7923 -f 6108//7924 6099//7925 6109//7926 -f 6109//7926 6099//7925 6100//7927 -f 6109//7928 6100//7929 6110//7930 -f 5978//7871 6111//7931 6088//7872 -f 6088//7932 6111//7933 6112//7934 -f 6088//7935 6112//7936 6105//7937 -f 6105//7937 6112//7936 6113//7938 -f 6105//7939 6113//7940 6104//7941 -f 6103//7942 6107//7943 6102//7944 -f 6102//7944 6107//7943 6114//7945 -f 6102//7946 6114//7947 6101//7948 -f 5978//7949 5970//7949 6111//7949 -f 6111//7950 5970//7950 6115//7950 -f 6111//7933 6115//7951 6112//7934 -f 6112//7934 6115//7951 6116//7952 -f 6112//7936 6116//7953 6113//7938 -f 6113//7954 6116//7954 6117//7954 -f 6117//7955 6118//7955 6113//7955 -f 6113//7940 6118//7956 6106//7956 -f 6113//7940 6106//7956 6104//7941 -f 6104//7957 6106//7921 6103//7923 -f 6119//7958 6114//7945 6120//7958 -f 6120//7958 6114//7945 6107//7943 -f 6120//7959 6107//7922 6121//7959 -f 6121//7959 6107//7922 6106//7921 -f 6121//7960 6106//7960 6122//7960 -f 6122//7961 6106//7961 6118//7961 -f 6119//7962 6123//7962 6114//7962 -f 6114//7947 6123//7963 6110//7964 -f 6114//7947 6110//7964 6101//7948 -f 6101//7965 6110//7930 6100//7929 -f 6124//7966 6108//7924 6125//7967 -f 6125//7967 6108//7924 6109//7926 -f 6125//7968 6109//7968 6126//7968 -f 6126//7969 6109//7928 6110//7930 -f 6126//7970 6110//7970 6127//7970 -f 6127//7971 6110//7971 6123//7971 -f 6119//7972 6120//7972 6128//7972 -f 6129//7973 6124//7973 6125//7973 -f 6115//7974 5970//7974 5987//7974 -f 6003//7975 6130//7976 6131//7977 -f 6024//7978 6025//7978 6132//7978 -f 6133//7979 6022//7979 6134//7979 -f 6134//7980 6022//7980 6024//7980 -f 6134//7981 6024//7982 6135//7983 -f 6135//7984 6024//7984 6132//7984 -f 6136//7985 5968//7985 6133//7985 -f 6133//7986 5968//7986 5967//7986 -f 6133//7987 5967//7987 6022//7987 -f 6010//7988 6009//7988 6136//7988 -f 6136//7989 6009//7989 6016//7989 -f 6136//7990 6016//7990 5968//7990 -f 6014//7991 6012//7991 6137//7991 -f 6137//7992 6012//7992 6010//7992 -f 6137//7993 6010//7993 6138//7993 -f 6138//7994 6010//7994 6136//7994 -f 6014//7995 6137//7996 6015//7997 -f 6015//7997 6137//7996 6139//7997 -f 6015//7998 6139//7999 6007//8000 -f 6007//8000 6139//7999 6140//8001 -f 6007//8000 6140//8001 6008//8002 -f 6130//8003 6003//8003 6140//8003 -f 6140//8001 6003//8004 6005//8005 -f 6140//8001 6005//8005 6008//8002 -f 5998//8006 5999//8006 6131//8006 -f 6131//7977 5999//8007 6001//8008 -f 6131//7977 6001//8008 6003//7975 -f 5995//8009 5996//8010 6141//8011 -f 6141//8011 5996//8010 5998//8012 -f 6141//8011 5998//8012 6142//8013 -f 6142//8014 5998//8014 6131//8014 -f 5995//8009 6141//8011 5993//8015 -f 5993//8015 6141//8011 6143//8016 -f 5993//8015 6143//8016 5991//8017 -f 5991//8018 6143//8019 6144//8020 -f 5991//8018 6144//8020 5990//8021 -f 6145//8022 5982//8022 6144//8022 -f 6144//8023 5982//8023 5988//8023 -f 6144//8020 5988//8024 5990//8021 -f 5986//8025 5985//8025 6145//8025 -f 6145//8026 5985//8026 5983//8026 -f 6145//8027 5983//8027 5982//8027 -f 6146//8028 6117//8028 6116//8028 -f 6129//8029 6125//8029 6147//8029 -f 6148//8030 6149//8030 6150//8030 -f 6150//8031 6149//8031 6151//8031 -f 6150//8032 6151//8032 6152//8032 -f 6152//8033 6151//8033 6153//8033 -f 6152//8034 6153//8034 6154//8034 -f 6154//8035 6153//8035 6155//8035 -f 6154//8036 6155//8036 6156//8036 -f 6156//8037 6155//8037 6147//8037 -f 6156//8038 6147//8038 6157//8038 -f 6157//8039 6147//8039 6125//8039 -f 6158//8040 6159//8040 6148//8040 -f 6148//8041 6159//8041 6160//8041 -f 6148//8042 6160//8042 6149//8042 -f 6148//8043 6161//8043 6158//8043 -f 6158//8044 6161//8045 6162//8046 -f 6158//8044 6162//8046 6163//8047 -f 6163//8048 6162//8048 6164//8048 -f 6163//8049 6164//8049 6165//8049 -f 6165//8050 6164//8050 6166//8050 -f 6165//8051 6166//8051 6167//8051 -f 6168//8052 6169//8053 6167//8054 -f 6167//8055 6169//8055 6170//8055 -f 6167//8056 6170//8056 6165//8056 -f 6167//8054 6171//8057 6168//8052 -f 6168//8058 6171//8058 6172//8058 -f 6168//8059 6172//8059 6173//8059 -f 6173//8060 6172//8060 6174//8060 -f 6173//8061 6174//8061 6175//8061 -f 6174//8062 6176//8062 6175//8062 -f 6175//8063 6176//8063 6177//8063 -f 6175//8064 6177//8064 6178//8064 -f 6178//8065 6177//8065 6179//8065 -f 6178//8066 6179//8066 6180//8066 -f 6180//8067 6179//8067 6181//8067 -f 6180//8068 6181//8068 6182//8068 -f 6182//8069 6181//8069 6183//8069 -f 6182//8070 6183//8070 6184//8070 -f 6184//8071 6183//8071 6185//8071 -f 6184//8072 6185//8072 6186//8072 -f 6186//8073 6185//8073 6187//8073 -f 6186//8074 6187//8074 6188//8074 -f 6121//8075 6122//8075 6189//8075 -f 6189//8076 6122//8076 6118//8076 -f 6190//8077 6189//8078 6146//8079 -f 6146//8080 6189//8080 6118//8080 -f 6146//8081 6118//8081 6117//8081 -f 6191//8082 6192//8083 6193//8084 -f 6193//8085 6192//8086 6194//8087 -f 6193//8085 6194//8087 6195//8088 -f 6195//8089 6194//8090 6128//8091 -f 6195//8089 6128//8091 6196//8092 -f 6196//8093 6128//8093 6120//8093 -f 6196//8094 6120//8094 6121//8094 -f 6197//8095 6198//8095 6190//8095 -f 6190//8096 6198//8096 6199//8096 -f 6190//8077 6199//8097 6189//8078 -f 6200//8098 6201//8098 6191//8098 -f 6191//8099 6201//8099 6202//8099 -f 6191//8082 6202//8100 6192//8083 -f 6191//8101 6203//8101 6200//8101 -f 6200//8102 6203//8103 6204//8104 -f 6200//8102 6204//8104 6205//8105 -f 6205//8106 6204//8107 6206//8106 -f 6205//8106 6206//8106 6207//8108 -f 6207//8109 6206//8109 6208//8110 -f 6207//8109 6208//8110 6209//8110 -f 6209//8111 6208//8111 6210//8112 -f 6209//8111 6210//8112 6211//8112 -f 6211//8113 6210//8113 6212//8114 -f 6211//8113 6212//8114 6213//8114 -f 6213//8115 6212//8116 6214//8117 -f 6213//8115 6214//8117 6215//8118 -f 6215//8119 6214//8120 6216//8121 -f 6215//8119 6216//8121 6217//8122 -f 6217//8123 6216//8124 6218//8125 -f 6219//8126 6220//8126 6221//8126 -f 6221//8127 6220//8127 6222//8127 -f 6221//8128 6222//8128 6218//8128 -f 6218//8129 6222//8129 6223//8129 -f 6218//8125 6223//8130 6217//8123 -f 6219//8131 6221//8131 6224//8131 -f 6224//8132 6221//8132 6225//8132 -f 6224//8133 6225//8133 6226//8133 -f 6226//8134 6225//8134 6227//8134 -f 6226//8135 6227//8135 6228//8135 -f 6121//8136 6189//8136 6196//8136 -f 6196//8137 6189//8138 6199//8139 -f 6196//8137 6199//8139 6195//8140 -f 6195//8141 6199//8142 6198//8143 -f 6195//8141 6198//8143 6193//8144 -f 6193//8145 6198//8146 6197//8147 -f 6193//8145 6197//8147 6191//8148 -f 6191//8149 6197//8150 6229//8151 -f 6191//8149 6229//8151 6203//8152 -f 6203//8153 6229//8154 6230//8155 -f 6203//8153 6230//8155 6204//8156 -f 6204//8157 6230//8157 6231//8158 -f 6204//8157 6231//8158 6206//8159 -f 6206//8160 6231//8160 6232//8161 -f 6206//8160 6232//8161 6208//8162 -f 6208//8163 6232//8163 6233//8164 -f 6208//8163 6233//8164 6210//8164 -f 6210//8165 6233//8166 6234//8167 -f 6210//8165 6234//8167 6212//8167 -f 6212//8168 6234//8169 6235//8170 -f 6212//8168 6235//8170 6214//8170 -f 6214//8171 6235//8172 6236//8173 -f 6214//8171 6236//8173 6216//8171 -f 6216//8174 6236//8175 6237//8176 -f 6216//8174 6237//8176 6218//8177 -f 6218//8178 6237//8179 6238//8180 -f 6218//8178 6238//8180 6221//8181 -f 6221//8182 6238//8183 6239//8184 -f 6221//8182 6239//8184 6225//8185 -f 6225//8186 6239//8187 6240//8188 -f 6225//8186 6240//8188 6227//8189 -f 6134//8190 6240//8190 6133//8190 -f 6133//8191 6240//8192 6239//8193 -f 6133//8191 6239//8193 6136//8194 -f 6136//8195 6239//8196 6238//8197 -f 6136//8195 6238//8197 6138//8198 -f 6138//8199 6238//8200 6237//8201 -f 6138//8199 6237//8201 6137//8202 -f 6137//8203 6237//8204 6236//8203 -f 6137//8203 6236//8203 6139//8205 -f 6139//8206 6236//8206 6235//8207 -f 6139//8206 6235//8207 6140//8207 -f 6140//8208 6235//8209 6234//8210 -f 6140//8208 6234//8210 6130//8210 -f 6130//8211 6234//8212 6233//8211 -f 6130//8211 6233//8211 6131//8213 -f 6131//8214 6233//8214 6232//8214 -f 6131//8214 6232//8214 6142//8214 -f 6142//8215 6232//8215 6231//8216 -f 6142//8215 6231//8216 6141//8217 -f 6141//8218 6231//8218 6230//8218 -f 6141//8218 6230//8218 6143//8218 -f 6143//8219 6230//8219 6229//8220 -f 6143//8219 6229//8220 6144//8220 -f 6144//8221 6229//8222 6197//8223 -f 6144//8221 6197//8223 6145//8224 -f 6145//8225 6197//8225 6190//8225 -f 6145//8226 6190//8226 5986//8226 -f 5986//8227 6190//8227 6146//8227 -f 5986//8228 6146//8228 5987//8228 -f 5987//8229 6146//8229 6116//8229 -f 5987//8230 6116//8230 6115//8230 -f 6241//8231 6242//8232 6243//8233 -f 6244//8234 6245//8234 6246//8234 -f 6241//8231 6243//8233 6247//8235 -f 6247//8236 6243//8237 6248//8238 -f 6247//8236 6248//8238 6249//8239 -f 6249//8240 6248//8241 6250//8242 -f 6249//8240 6250//8242 6251//8243 -f 6251//8244 6250//8245 6252//8246 -f 6251//8244 6252//8246 6253//8247 -f 6253//8248 6252//8249 6254//8250 -f 6253//8248 6254//8250 6255//8251 -f 6255//8252 6254//8253 6256//8254 -f 6255//8252 6256//8254 6257//8255 -f 6257//8256 6256//8257 6258//8258 -f 6257//8256 6258//8258 6259//8259 -f 6259//8260 6258//8260 6260//8261 -f 6259//8260 6260//8261 6261//8262 -f 6261//8263 6260//8263 6262//8263 -f 6261//8263 6262//8263 6263//8263 -f 6263//8264 6262//8264 6264//8265 -f 6263//8264 6264//8265 6265//8265 -f 6265//8266 6264//8267 6266//8268 -f 6265//8266 6266//8268 6267//8269 -f 6267//8270 6266//8271 6268//8272 -f 6267//8270 6268//8272 6269//8273 -f 6269//8274 6268//8274 6270//8275 -f 6269//8274 6270//8275 6271//8276 -f 6271//8277 6270//8278 6272//8279 -f 6271//8277 6272//8279 6273//8280 -f 6273//8281 6272//8282 6274//8283 -f 6273//8281 6274//8283 6275//8284 -f 6275//8285 6274//8286 6276//8287 -f 6275//8285 6276//8287 6277//8288 -f 6277//8289 6276//8290 6278//8291 -f 6277//8289 6278//8291 6279//8292 -f 6279//8293 6278//8294 6280//8295 -f 6279//8293 6280//8295 6281//8296 -f 6281//8297 6280//8298 6244//8299 -f 6281//8297 6244//8299 6282//8300 -f 6282//8301 6244//8301 6246//8301 -f 6282//8302 6246//8302 6283//8302 -f 6125//8303 6241//8303 6157//8303 -f 6157//8304 6241//8305 6247//8306 -f 6157//8304 6247//8306 6156//8307 -f 6156//8308 6247//8309 6249//8310 -f 6156//8308 6249//8310 6154//8311 -f 6154//8312 6249//8313 6251//8314 -f 6154//8312 6251//8314 6152//8315 -f 6152//8316 6251//8317 6253//8318 -f 6152//8316 6253//8318 6150//8319 -f 6150//8320 6253//8321 6255//8322 -f 6150//8320 6255//8322 6148//8323 -f 6148//8323 6255//8322 6257//8324 -f 6148//8323 6257//8324 6161//8324 -f 6161//8325 6257//8325 6259//8326 -f 6161//8325 6259//8326 6162//8326 -f 6162//8327 6259//8327 6261//8327 -f 6162//8327 6261//8327 6164//8327 -f 6164//8328 6261//8328 6263//8329 -f 6164//8328 6263//8329 6166//8329 -f 6166//8330 6263//8330 6265//8331 -f 6166//8330 6265//8331 6167//8331 -f 6167//8332 6265//8333 6267//8334 -f 6167//8332 6267//8334 6171//8334 -f 6171//8335 6267//8336 6269//8335 -f 6171//8335 6269//8335 6172//8337 -f 6172//8338 6269//8339 6271//8340 -f 6172//8338 6271//8340 6174//8341 -f 6174//8341 6271//8340 6273//8342 -f 6174//8341 6273//8342 6176//8343 -f 6176//8344 6273//8345 6275//8346 -f 6176//8344 6275//8346 6177//8347 -f 6177//8348 6275//8349 6277//8350 -f 6177//8348 6277//8350 6179//8351 -f 6179//8352 6277//8353 6279//8352 -f 6179//8352 6279//8352 6181//8354 -f 6181//8355 6279//8356 6281//8357 -f 6181//8355 6281//8357 6183//8358 -f 6183//8359 6281//8360 6282//8361 -f 6183//8359 6282//8361 6185//8362 -f 6185//8363 6282//8363 6283//8363 -f 6185//8364 6283//8364 6187//8364 -f 6125//8365 6126//8365 6241//8365 -f 6241//8366 6126//8366 6127//8366 -f 6241//8367 6127//8367 6242//8367 -f 6242//8368 6127//8368 6123//8368 -f 6242//8369 6123//8369 6119//8369 -f 6134//8370 6284//8370 6240//8370 -f 6240//8371 6284//8371 6285//8371 -f 6240//8372 6285//8372 6227//8372 -f 6227//8373 6285//8373 6286//8373 -f 6227//8374 6286//8374 6228//8374 -f 6228//8375 6286//8375 6287//8375 -f 6228//8376 6287//8376 6288//8376 -f 6119//8377 6128//8377 6242//8377 -f 6242//8378 6128//8379 6194//8380 -f 6242//8378 6194//8380 6243//8381 -f 6243//8382 6194//8382 6192//8383 -f 6243//8382 6192//8383 6248//8383 -f 6248//8383 6192//8383 6202//8384 -f 6248//8383 6202//8384 6250//8385 -f 6250//8386 6202//8387 6201//8388 -f 6250//8386 6201//8388 6252//8389 -f 6252//8390 6201//8391 6200//8392 -f 6252//8390 6200//8392 6254//8393 -f 6254//8394 6200//8395 6205//8396 -f 6254//8394 6205//8396 6256//8397 -f 6256//8398 6205//8399 6207//8400 -f 6256//8398 6207//8400 6258//8401 -f 6258//8402 6207//8403 6209//8404 -f 6258//8402 6209//8404 6260//8405 -f 6260//8406 6209//8406 6211//8407 -f 6260//8406 6211//8407 6262//8407 -f 6262//8408 6211//8408 6213//8409 -f 6262//8408 6213//8409 6264//8410 -f 6264//8411 6213//8412 6215//8413 -f 6264//8411 6215//8413 6266//8414 -f 6266//8415 6215//8416 6217//8417 -f 6266//8415 6217//8417 6268//8418 -f 6268//8419 6217//8420 6223//8421 -f 6268//8419 6223//8421 6270//8422 -f 6270//8423 6223//8424 6222//8425 -f 6270//8423 6222//8425 6272//8426 -f 6272//8427 6222//8428 6220//8429 -f 6272//8427 6220//8429 6274//8430 -f 6274//8431 6220//8431 6219//8432 -f 6274//8431 6219//8432 6276//8433 -f 6276//8433 6219//8432 6224//8434 -f 6276//8433 6224//8434 6278//8435 -f 6278//8435 6224//8434 6226//8436 -f 6278//8435 6226//8436 6280//8436 -f 6280//8437 6226//8438 6228//8439 -f 6280//8437 6228//8439 6244//8440 -f 6244//8441 6228//8441 6288//8441 -f 6244//8442 6288//8442 6245//8442 -f 6289//8443 6290//8444 6188//8445 -f 6025//8446 6026//8446 6132//8446 -f 6132//8447 6026//8448 6291//8449 -f 6132//8450 6291//8451 6135//8452 -f 6135//8452 6291//8451 6292//8451 -f 6135//7983 6292//8453 6134//7981 -f 6134//8454 6292//8455 6293//8455 -f 6294//8456 6285//8457 6293//8458 -f 6293//8459 6285//8459 6284//8459 -f 6293//8460 6284//8460 6134//8460 -f 6295//8461 6245//8462 6296//8463 -f 6296//8464 6245//8464 6288//8464 -f 6296//8465 6288//8466 6297//8465 -f 6297//8465 6288//8466 6287//8466 -f 6297//8467 6287//8468 6294//8467 -f 6294//8467 6287//8468 6286//8468 -f 6294//8469 6286//8469 6285//8469 -f 6188//8445 6187//8470 6289//8443 -f 6289//8471 6187//8471 6283//8471 -f 6289//8472 6283//8473 6295//8474 -f 6295//8475 6283//8475 6246//8475 -f 6295//8476 6246//8476 6245//8476 -f 6298//8477 6290//8444 6299//8478 -f 6299//8478 6290//8444 6289//8443 -f 6299//8479 6289//8472 6300//8479 -f 6300//8479 6289//8472 6295//8474 -f 6300//8480 6295//8461 6301//8480 -f 6301//8480 6295//8461 6296//8463 -f 6301//8481 6296//8465 6302//8481 -f 6302//8481 6296//8465 6297//8465 -f 6302//8482 6297//8467 6303//8483 -f 6303//8483 6297//8467 6294//8467 -f 6303//8456 6294//8456 6304//8456 -f 6304//8456 6294//8456 6293//8458 -f 6304//8484 6293//8455 6305//8485 -f 6305//8485 6293//8455 6292//8455 -f 6305//8486 6292//8451 6306//8486 -f 6306//8486 6292//8451 6291//8451 -f 6306//8487 6291//8449 6028//8488 -f 6028//8488 6291//8449 6026//8448 -f 6307//8489 6298//8489 6299//8489 -f 6021//8490 6020//8491 6308//8492 -f 6021//8493 6308//8493 6027//8493 -f 6028//8494 6029//8494 6306//8494 -f 6306//8495 6029//8495 6309//8495 -f 6307//8496 6299//8496 6310//8496 -f 6311//8497 6310//8497 6312//8497 -f 6312//8498 6310//8498 6299//8498 -f 6312//8499 6299//8500 6313//8501 -f 6313//8501 6299//8500 6300//8502 -f 6313//8503 6300//8504 6314//8505 -f 6314//8505 6300//8504 6301//8506 -f 6314//8507 6301//8508 6315//8509 -f 6315//8509 6301//8508 6302//8510 -f 6315//8511 6302//8512 6316//8513 -f 6316//8513 6302//8512 6303//8514 -f 6316//8515 6303//8516 6317//8517 -f 6317//8517 6303//8516 6304//8518 -f 6317//8519 6304//8520 6309//8521 -f 6309//8521 6304//8520 6305//8522 -f 6309//8523 6305//8523 6306//8523 -f 6318//8524 6311//8525 6319//8526 -f 6319//8526 6311//8525 6312//8527 -f 6319//8528 6312//8529 6320//8530 -f 6320//8530 6312//8529 6313//8531 -f 6320//8532 6313//8533 6321//8534 -f 6321//8534 6313//8533 6314//8535 -f 6321//8536 6314//8537 6322//8538 -f 6322//8538 6314//8537 6315//8539 -f 6322//8540 6315//8541 6323//8542 -f 6323//8542 6315//8541 6316//8543 -f 6323//8544 6316//8545 6324//8546 -f 6324//8546 6316//8545 6317//8547 -f 6324//8548 6317//8549 6308//8550 -f 6308//8550 6317//8549 6309//8551 -f 6308//8552 6309//8552 6027//8552 -f 6027//8553 6309//8553 6029//8553 -f 6020//8491 6325//8554 6308//8492 -f 6326//8555 6327//8555 6328//8555 -f 6326//8556 6328//8556 6329//8556 -f 6329//8557 6328//8558 6330//8559 -f 6329//8557 6330//8559 6331//8560 -f 6308//8561 6325//8561 6324//8561 -f 6324//8562 6325//8562 6332//8562 -f 6324//8563 6332//8563 6323//8563 -f 6331//8560 6318//8564 6329//8557 -f 6329//8565 6318//8565 6319//8565 -f 6329//8566 6319//8566 6333//8566 -f 6333//8567 6319//8567 6320//8567 -f 6333//8568 6320//8568 6334//8568 -f 6334//8569 6320//8569 6321//8569 -f 6334//8570 6321//8570 6335//8570 -f 6335//8571 6321//8536 6322//8538 -f 6335//8572 6322//8573 6336//8574 -f 6337//8575 6332//8575 6338//8575 -f 6338//8575 6332//8575 6325//8575 -f 6338//8576 6325//8577 6019//8578 -f 6019//8578 6325//8577 6020//8579 -f 6337//8580 6339//8581 6332//8582 -f 6332//8583 6339//8583 6336//8583 -f 6332//8584 6336//8584 6323//8584 -f 6323//8585 6336//8574 6322//8573 -f 6339//8586 6340//8586 6336//8586 -f 6336//8587 6340//8587 6341//8587 -f 6336//8588 6341//8588 6335//8588 -f 6335//8589 6341//8589 6342//8589 -f 6335//8590 6342//8590 6334//8590 -f 6334//8590 6342//8590 6343//8590 -f 6334//8591 6343//8592 6333//8592 -f 6333//8592 6343//8592 6344//8592 -f 6333//8593 6344//8593 6329//8593 -f 6329//8593 6344//8593 6345//8594 -f 6329//8595 6345//8595 6326//8595 -f 6346//8596 6347//8596 6344//8596 -f 6017//8597 6348//8597 6349//8597 -f 6350//8598 6351//8598 6352//8598 -f 6348//8599 6353//8600 6349//8601 -f 6349//8601 6353//8600 6350//8602 -f 6349//8603 6350//8603 6354//8603 -f 6338//8604 6019//8605 6018//8606 -f 6355//8607 6356//8607 6357//8607 -f 6357//8608 6356//8609 6358//8610 -f 6357//8608 6358//8610 6359//8611 -f 6018//8606 6017//8612 6338//8604 -f 6338//8604 6017//8612 6349//8613 -f 6338//8614 6349//8614 6337//8614 -f 6337//8615 6349//8615 6354//8615 -f 6337//8580 6354//8616 6339//8581 -f 6339//8617 6354//8618 6360//8618 -f 6339//8619 6360//8619 6340//8619 -f 6340//8620 6360//8620 6341//8620 -f 6341//8621 6360//8622 6361//8623 -f 6341//8624 6361//8624 6342//8624 -f 6342//8625 6361//8625 6362//8625 -f 6342//8626 6362//8626 6343//8626 -f 6344//8627 6347//8627 6345//8627 -f 6345//8628 6347//8628 6357//8628 -f 6345//8629 6357//8629 6326//8629 -f 6326//8630 6357//8630 6359//8630 -f 6326//8631 6359//8631 6327//8631 -f 6350//8632 6352//8632 6354//8632 -f 6354//8633 6352//8633 6363//8633 -f 6354//8618 6363//8634 6360//8618 -f 6363//8635 6364//8635 6360//8635 -f 6360//8636 6364//8636 6365//8636 -f 6360//8622 6365//8637 6361//8623 -f 6361//8638 6365//8638 6366//8638 -f 6361//8639 6366//8639 6362//8639 -f 6362//8640 6366//8641 6367//8642 -f 6367//8643 6368//8644 6362//8645 -f 6362//8646 6368//8646 6346//8646 -f 6362//8647 6346//8647 6343//8647 -f 6343//8648 6346//8648 6344//8648 -f 6368//8649 6369//8649 6346//8649 -f 6346//8650 6369//8650 6370//8650 -f 6346//8651 6370//8651 6347//8651 -f 6347//8652 6370//8652 6371//8652 -f 6371//8653 6372//8653 6347//8653 -f 6347//8654 6372//8654 6373//8654 -f 6347//8655 6373//8655 6357//8655 -f 6357//8656 6373//8656 6374//8656 -f 6357//8657 6374//8657 6355//8657 -f 6355//8658 6374//8659 6375//8660 -f 6355//8661 6375//8661 6376//8661 -f 6013//8662 6377//8662 6378//8662 -f 6351//8663 6013//8663 6379//8663 -f 6379//8664 6013//8664 6378//8664 -f 6379//8665 6378//8665 6380//8665 -f 6351//8666 6350//8666 6013//8666 -f 6013//8667 6350//8667 6353//8667 -f 6013//8668 6353//8668 6011//8668 -f 6011//8669 6353//8670 6348//8671 -f 6011//8669 6348//8671 5969//8672 -f 5969//8673 6348//8673 6017//8673 -f 6377//8674 6013//8674 6381//8674 -f 6381//8675 6013//7736 6006//7738 -f 6381//8676 6006//8676 6382//8676 -f 6382//8677 6006//8677 6383//8677 -f 6383//8678 6006//7725 6004//7727 -f 6383//8679 6004//8679 6384//8679 -f 6384//8680 6004//7723 6002//7722 -f 6384//8681 6002//8681 6385//8681 -f 6386//8682 6387//8682 5989//8682 -f 5989//8683 6387//8684 5992//8685 -f 6387//8684 6388//8686 5992//8685 -f 5992//8687 6388//8687 6389//8687 -f 5992//7706 6389//8688 5994//7707 -f 5994//8689 6389//8689 6390//8689 -f 5994//7710 6390//8690 5997//7711 -f 5997//7711 6390//8690 6391//8691 -f 5997//7715 6391//8692 6000//7716 -f 6000//7716 6391//8692 6392//8693 -f 6000//7719 6392//7719 6002//7719 -f 6002//8694 6392//8694 6393//8694 -f 6002//8695 6393//8695 6385//8695 -f 6394//8696 6395//8697 6396//8698 -f 6396//8698 6395//8697 5989//8699 -f 6396//8698 5989//8699 6397//8700 -f 6396//8698 6398//8701 6394//8696 -f 6394//8702 6398//8702 6399//8702 -f 6394//8696 6399//8703 6395//8697 -f 6395//8697 6399//8703 6400//8704 -f 6395//8697 6400//8704 5989//8699 -f 5989//8705 6400//8705 6401//8705 -f 5989//8706 6401//8706 6386//8706 -f 5976//8707 6039//8707 6402//8707 -f 6402//8708 6039//8708 6037//8708 -f 6402//8709 6037//8710 5984//8711 -f 5984//8711 6037//8710 6036//8712 -f 5984//8713 6036//8713 5989//8713 -f 5989//8714 6036//8714 6041//8714 -f 5989//8699 6041//8715 6397//8700 -f 6374//8716 6373//8716 6403//8716 -f 6372//8717 6371//8717 6404//8717 -f 6370//8718 6369//8718 6405//8718 -f 6393//8719 6392//8719 6406//8719 -f 6376//8720 6375//8720 6407//8720 -f 6407//8721 6375//8721 6408//8721 -f 6407//8722 6408//8722 6409//8722 -f 6410//8723 6409//8723 6411//8723 -f 6411//8724 6412//8724 6410//8724 -f 6410//8725 6412//8725 6413//8725 -f 6410//8726 6413//8726 6414//8726 -f 6414//8727 6413//8727 6415//8727 -f 6414//8728 6415//8728 6416//8728 -f 6416//8729 6415//8730 6417//8731 -f 6416//8729 6417//8731 6418//8732 -f 6418//8733 6417//8733 6419//8733 -f 6418//8734 6419//8734 6420//8734 -f 6420//8735 6419//8735 6421//8735 -f 6420//8736 6421//8736 6422//8736 -f 6422//8737 6421//8737 6423//8737 -f 6422//8738 6423//8738 6424//8738 -f 6424//8739 6423//8739 6425//8739 -f 6424//8740 6425//8740 6426//8740 -f 6426//8741 6425//8741 6427//8741 -f 6426//8742 6427//8742 6428//8742 -f 6385//8743 6429//8744 6384//8745 -f 6384//8746 6429//8747 6430//8748 -f 6384//8746 6430//8748 6383//8749 -f 6383//8750 6430//8750 6382//8750 -f 6382//8751 6430//8751 6431//8751 -f 6382//8752 6431//8752 6381//8752 -f 6381//8753 6431//8753 6432//8753 -f 6381//8754 6432//8754 6377//8754 -f 6351//8755 6379//8755 6352//8755 -f 6352//8756 6379//8756 6433//8756 -f 6434//8757 6435//8758 6436//8759 -f 6436//8760 6435//8761 6437//8762 -f 6438//8763 6439//8763 6440//8763 -f 6440//8764 6441//8764 6442//8764 -f 6442//8765 6441//8766 6443//8767 -f 6444//8768 6364//8768 6433//8768 -f 6433//8769 6364//8769 6363//8769 -f 6433//8770 6363//8770 6352//8770 -f 6379//8771 6380//8771 6433//8771 -f 6433//8772 6380//8772 6445//8772 -f 6433//8773 6445//8773 6444//8773 -f 6444//8774 6445//8774 6446//8774 -f 6444//8775 6446//8775 6447//8775 -f 6385//8743 6393//8776 6429//8744 -f 6429//8777 6393//8777 6406//8777 -f 6429//8778 6406//8778 6448//8778 -f 6448//8779 6406//8779 6449//8779 -f 6448//8780 6449//8780 6434//8780 -f 6368//8644 6367//8643 6447//8781 -f 6447//8782 6367//8642 6366//8641 -f 6447//8783 6366//8783 6444//8783 -f 6444//8784 6366//8784 6365//8784 -f 6444//8785 6365//8785 6364//8785 -f 6434//8786 6436//8786 6448//8786 -f 6448//8787 6436//8788 6450//8789 -f 6448//8790 6450//8790 6429//8790 -f 6429//8791 6450//8792 6451//8793 -f 6429//8791 6451//8793 6430//8794 -f 6430//8795 6451//8796 6452//8797 -f 6430//8795 6452//8797 6431//8798 -f 6431//8799 6452//8799 6453//8799 -f 6431//8800 6453//8800 6432//8800 -f 6432//8801 6453//8801 6454//8801 -f 6432//8802 6454//8802 6377//8802 -f 6369//8803 6368//8803 6405//8803 -f 6405//8804 6368//8804 6447//8804 -f 6405//8805 6447//8806 6455//8807 -f 6455//8808 6447//8808 6446//8808 -f 6455//8809 6446//8809 6456//8809 -f 6456//8810 6446//8810 6445//8810 -f 6456//8811 6445//8811 6457//8811 -f 6457//8812 6445//8812 6380//8812 -f 6458//8813 6459//8814 6460//8815 -f 6378//8816 6377//8816 6461//8816 -f 6461//8817 6377//8817 6454//8817 -f 6461//8818 6454//8818 6462//8818 -f 6462//8819 6454//8819 6453//8819 -f 6462//8820 6453//8820 6463//8820 -f 6463//8821 6453//8822 6452//8823 -f 6463//8821 6452//8823 6464//8824 -f 6464//8825 6452//8826 6451//8827 -f 6464//8825 6451//8827 6465//8828 -f 6465//8829 6451//8830 6450//8831 -f 6465//8829 6450//8831 6466//8832 -f 6466//8833 6450//8789 6436//8788 -f 6466//8834 6436//8835 6438//8836 -f 6438//8837 6436//8837 6437//8837 -f 6438//8838 6437//8838 6439//8838 -f 6371//8839 6370//8839 6404//8839 -f 6404//8840 6370//8840 6405//8840 -f 6404//8841 6405//8842 6460//8843 -f 6460//8844 6405//8805 6455//8807 -f 6460//8815 6455//8845 6458//8813 -f 6458//8846 6455//8846 6456//8846 -f 6458//8847 6456//8847 6467//8847 -f 6467//8848 6456//8848 6457//8848 -f 6468//8849 6469//8849 6459//8849 -f 6459//8850 6469//8850 6470//8850 -f 6459//8851 6470//8851 6460//8851 -f 6440//8852 6442//8852 6438//8852 -f 6438//8853 6442//8854 6471//8855 -f 6438//8836 6471//8856 6466//8834 -f 6466//8857 6471//8858 6472//8859 -f 6466//8857 6472//8859 6465//8860 -f 6465//8861 6472//8862 6473//8863 -f 6465//8861 6473//8863 6464//8864 -f 6464//8865 6473//8866 6474//8867 -f 6464//8865 6474//8867 6463//8868 -f 6373//8869 6372//8869 6403//8869 -f 6403//8870 6372//8870 6404//8870 -f 6403//8871 6404//8871 6475//8871 -f 6475//8872 6404//8841 6460//8843 -f 6475//8873 6460//8873 6476//8873 -f 6476//8874 6460//8874 6470//8874 -f 6477//8875 6478//8876 6479//8877 -f 6479//8878 6478//8878 6480//8878 -f 6479//8879 6480//8879 6481//8879 -f 6481//8880 6480//8881 6482//8882 -f 6481//8880 6482//8882 6483//8883 -f 6483//8884 6482//8884 6468//8884 -f 6380//8885 6378//8885 6457//8885 -f 6457//8886 6378//8886 6461//8886 -f 6457//8887 6461//8887 6467//8887 -f 6467//8888 6461//8888 6462//8888 -f 6467//8889 6462//8889 6458//8889 -f 6458//8890 6462//8890 6463//8890 -f 6458//8891 6463//8892 6459//8893 -f 6459//8893 6463//8892 6474//8894 -f 6459//8895 6474//8896 6468//8897 -f 6468//8897 6474//8896 6473//8898 -f 6468//8897 6473//8898 6483//8899 -f 6483//8900 6473//8901 6472//8902 -f 6483//8900 6472//8902 6481//8903 -f 6481//8904 6472//8905 6471//8906 -f 6481//8904 6471//8906 6479//8907 -f 6479//8908 6471//8855 6442//8854 -f 6479//8877 6442//8909 6477//8875 -f 6477//8910 6442//8910 6443//8910 -f 6477//8911 6443//8911 6484//8911 -f 6409//8912 6408//8912 6411//8912 -f 6411//8913 6408//8913 6485//8913 -f 6411//8914 6485//8914 6412//8914 -f 6412//8915 6485//8915 6486//8915 -f 6412//8916 6486//8916 6413//8916 -f 6413//8917 6486//8917 6487//8917 -f 6413//8918 6487//8918 6415//8918 -f 6415//8919 6487//8919 6488//8919 -f 6415//8920 6488//8920 6417//8920 -f 6417//8921 6488//8921 6489//8921 -f 6417//8922 6489//8922 6419//8922 -f 6419//8923 6489//8923 6490//8923 -f 6419//8924 6490//8925 6421//8926 -f 6484//8927 6427//8927 6477//8927 -f 6477//8928 6427//8928 6425//8928 -f 6477//8929 6425//8929 6478//8929 -f 6478//8930 6425//8931 6423//8932 -f 6478//8930 6423//8932 6480//8933 -f 6480//8934 6423//8935 6421//8936 -f 6480//8934 6421//8936 6482//8937 -f 6482//8938 6421//8926 6490//8925 -f 6482//8939 6490//8939 6468//8939 -f 6468//8940 6490//8940 6489//8940 -f 6468//8941 6489//8941 6469//8941 -f 6469//8942 6489//8942 6488//8942 -f 6469//8943 6488//8943 6470//8943 -f 6470//8944 6488//8944 6487//8944 -f 6470//8945 6487//8945 6476//8945 -f 6476//8946 6487//8946 6486//8946 -f 6476//8947 6486//8947 6475//8947 -f 6475//8948 6486//8948 6485//8948 -f 6475//8949 6485//8949 6403//8949 -f 6403//8950 6485//8950 6408//8950 -f 6403//8951 6408//8951 6374//8951 -f 6374//8659 6408//8952 6375//8660 -f 6050//7788 6052//7790 6491//8953 -f 6406//8954 6392//8954 6492//8954 -f 6492//8955 6392//8955 6391//8955 -f 6493//8956 6391//8956 6390//8956 -f 6389//8957 6388//8958 6494//8959 -f 6041//8960 6495//8960 6397//8960 -f 6397//8961 6495//8961 6496//8961 -f 6397//8962 6496//8962 6396//8962 -f 6399//8963 6398//8963 6497//8963 -f 6400//8964 6399//8964 6498//8964 -f 6498//8965 6399//8965 6499//8965 -f 6498//8966 6499//8966 6500//8966 -f 6501//8967 6502//8967 6503//8967 -f 6503//8968 6502//8969 6504//8970 -f 6505//8971 6506//8972 6507//8973 -f 6507//8973 6506//8972 6508//8974 -f 6509//8975 6510//8975 6511//8975 -f 6511//8976 6510//8976 6512//8976 -f 6511//8977 6512//8977 6513//8977 -f 6513//8978 6512//8978 6514//8978 -f 6513//8979 6514//8979 6515//8979 -f 6515//8980 6514//8980 6516//8980 -f 6515//8981 6516//8981 6517//8981 -f 6517//8982 6516//8982 6518//8982 -f 6517//8983 6518//8983 6519//8983 -f 6518//8984 6520//8984 6519//8984 -f 6519//8985 6520//8985 6035//8985 -f 6519//8986 6035//8986 6034//8986 -f 6047//8987 6521//8987 6048//8987 -f 6048//8988 6521//8988 6497//8988 -f 6398//8989 6396//8989 6497//8989 -f 6497//8990 6396//8990 6496//8990 -f 6497//8991 6496//8991 6048//8991 -f 6048//8992 6496//8992 6495//8992 -f 6048//8993 6495//8993 6049//8993 -f 6049//8994 6495//8994 6041//8994 -f 6390//8995 6522//8996 6493//8997 -f 6493//8998 6522//8999 6523//9000 -f 6493//8998 6523//9000 6524//9001 -f 6524//9002 6523//9003 6525//9004 -f 6524//9002 6525//9004 6526//9005 -f 6526//9006 6525//9007 6527//9008 -f 6526//9006 6527//9008 6528//9009 -f 6528//9010 6527//9011 6529//9012 -f 6528//9010 6529//9012 6530//9013 -f 6530//9014 6529//9015 6531//9016 -f 6530//9014 6531//9016 6532//9017 -f 6532//9018 6531//9019 6503//9020 -f 6532//9018 6503//9020 6533//9021 -f 6533//9022 6503//8968 6504//8970 -f 6533//9023 6504//9023 6534//9023 -f 6406//9024 6492//9024 6449//9024 -f 6449//9025 6492//9026 6535//9027 -f 6449//9028 6535//9028 6434//9028 -f 6500//9029 6536//9029 6498//9029 -f 6498//9030 6536//9030 6537//9030 -f 6498//9031 6537//9031 6400//9031 -f 6400//9032 6537//9032 6401//9032 -f 6538//9033 6539//9033 6540//9033 -f 6540//9034 6539//9034 6541//9034 -f 6540//9035 6541//9035 6542//9035 -f 6500//9036 6543//9036 6536//9036 -f 6536//9037 6543//9037 6544//9037 -f 6536//9038 6544//9038 6537//9038 -f 6537//9039 6544//9039 6545//9039 -f 6537//9040 6545//9040 6401//9040 -f 6401//9041 6545//9041 6386//9041 -f 6399//9042 6497//9042 6499//9042 -f 6499//9043 6497//9043 6521//9043 -f 6499//9044 6521//9045 6500//9046 -f 6500//9046 6521//9045 6047//9047 -f 6500//9048 6047//9048 6543//9048 -f 6543//9049 6047//9049 6031//9049 -f 6543//9050 6031//9050 6030//9050 -f 6434//8757 6535//9051 6435//8758 -f 6435//9052 6535//9052 6546//9052 -f 6435//8761 6546//9053 6437//8762 -f 6437//9054 6546//9054 6547//9054 -f 6437//9055 6547//9055 6439//9055 -f 6388//8958 6387//9056 6494//8959 -f 6494//9057 6387//9057 6538//9057 -f 6494//9058 6538//9058 6548//9058 -f 6548//9059 6538//9059 6540//9059 -f 6548//9060 6540//9060 6549//9060 -f 6549//9061 6540//9061 6542//9061 -f 6549//9062 6542//9063 6550//9064 -f 6550//9064 6542//9063 6551//9065 -f 6550//9066 6551//9067 6552//9068 -f 6491//9069 6553//9069 6541//9069 -f 6541//9070 6553//9070 6554//9070 -f 6541//9071 6554//9071 6542//9071 -f 6542//9072 6554//9072 6555//9072 -f 6542//9073 6555//9073 6551//9073 -f 6387//9074 6386//9074 6538//9074 -f 6538//9075 6386//9075 6545//9075 -f 6538//9076 6545//9076 6539//9076 -f 6539//9077 6545//9077 6544//9077 -f 6539//9078 6544//9078 6541//9078 -f 6541//9079 6544//9079 6543//9079 -f 6541//9080 6543//9080 6491//9080 -f 6491//9081 6543//9081 6030//9081 -f 6491//9082 6030//9082 6050//9082 -f 6439//9083 6547//9083 6440//9083 -f 6440//9084 6547//9084 6556//9084 -f 6440//9085 6556//9085 6441//9085 -f 6052//9086 6054//9086 6491//9086 -f 6491//9087 6054//9087 6557//9087 -f 6491//9088 6557//9089 6553//9090 -f 6553//9090 6557//9089 6558//9091 -f 6553//9092 6558//9093 6554//9094 -f 6554//9094 6558//9093 6559//9095 -f 6554//9096 6559//9097 6555//9098 -f 6555//9098 6559//9097 6560//9099 -f 6555//9098 6560//9099 6551//9067 -f 6551//9067 6560//9099 6561//9100 -f 6551//9067 6561//9100 6552//9068 -f 6552//9101 6561//9101 6562//9101 -f 6441//8766 6556//9102 6443//8767 -f 6443//9103 6556//9103 6563//9103 -f 6443//9104 6563//9104 6484//9104 -f 6058//9105 6564//9105 6057//9105 -f 6057//9106 6564//9106 6565//9106 -f 6057//9107 6565//9107 6055//9107 -f 6484//9108 6563//9108 6427//9108 -f 6427//9109 6563//9109 6566//9109 -f 6427//9110 6566//9110 6428//9110 -f 6391//9111 6493//9111 6492//9111 -f 6492//9026 6493//9112 6524//9113 -f 6492//9026 6524//9113 6535//9027 -f 6535//9114 6524//9115 6526//9116 -f 6535//9114 6526//9116 6546//9117 -f 6546//9118 6526//9119 6528//9120 -f 6546//9118 6528//9120 6547//9121 -f 6547//9122 6528//9123 6530//9123 -f 6547//9122 6530//9123 6556//9124 -f 6556//9125 6530//9126 6532//9127 -f 6556//9125 6532//9127 6563//9128 -f 6563//9129 6532//9130 6533//9131 -f 6563//9129 6533//9131 6566//9132 -f 6566//9133 6533//9133 6534//9133 -f 6566//9134 6534//9134 6428//9134 -f 6390//8995 6389//9135 6522//8996 -f 6522//9136 6389//9136 6494//9136 -f 6522//9137 6494//9137 6523//9137 -f 6523//9138 6494//9138 6548//9138 -f 6523//9139 6548//9139 6525//9139 -f 6525//9140 6548//9140 6549//9140 -f 6525//9141 6549//9142 6527//9143 -f 6527//9143 6549//9142 6550//9144 -f 6527//9145 6550//9146 6529//9147 -f 6529//9147 6550//9146 6552//9148 -f 6529//9149 6552//9150 6531//9151 -f 6531//9151 6552//9150 6562//9152 -f 6531//9153 6562//9154 6503//9155 -f 6503//9155 6562//9154 6506//9156 -f 6503//9157 6506//9157 6501//9157 -f 6501//9158 6506//8972 6505//8971 -f 6054//9159 6055//9159 6557//9159 -f 6557//9160 6055//9160 6565//9160 -f 6557//9161 6565//9161 6558//9161 -f 6558//9162 6565//9162 6567//9162 -f 6558//9163 6567//9163 6559//9163 -f 6559//9164 6567//9164 6568//9164 -f 6559//9165 6568//9165 6560//9165 -f 6560//9166 6568//9166 6569//9166 -f 6560//9167 6569//9167 6561//9167 -f 6561//9168 6569//9168 6570//9168 -f 6561//9169 6570//9169 6562//9169 -f 6562//9170 6570//9170 6571//9170 -f 6562//9171 6571//9171 6506//9171 -f 6058//9172 6035//9173 6564//9174 -f 6564//9174 6035//9173 6520//9175 -f 6564//9176 6520//9176 6565//9176 -f 6565//9177 6520//9177 6518//9177 -f 6565//9178 6518//9178 6567//9178 -f 6567//9179 6518//9179 6516//9179 -f 6567//9180 6516//9180 6568//9180 -f 6568//9181 6516//9181 6514//9181 -f 6568//9182 6514//9182 6569//9182 -f 6569//9183 6514//9183 6512//9183 -f 6569//9184 6512//9184 6570//9184 -f 6570//9185 6512//9185 6510//9185 -f 6570//9186 6510//9186 6571//9186 -f 6571//9187 6510//9187 6509//9187 -f 6571//9188 6509//9188 6506//9188 -f 6506//8972 6509//9189 6572//9190 -f 6506//8972 6572//9190 6508//8974 -f 6573//9191 6574//9191 6575//9191 -f 6422//9192 6424//9193 6576//9194 -f 6576//9195 6424//9195 6577//9195 -f 6577//9196 6424//9197 6426//9198 -f 6577//9196 6426//9198 6578//9199 -f 6407//9200 6409//9201 6579//9202 -f 6407//9200 6579//9202 6376//9203 -f 6576//9194 6580//9204 6422//9192 -f 6422//9205 6580//9205 6581//9205 -f 6422//9206 6581//9206 6420//9206 -f 6420//9207 6581//9208 6582//9209 -f 6420//9207 6582//9209 6418//9210 -f 6418//9211 6582//9211 6416//9211 -f 6409//9212 6410//9212 6579//9212 -f 6579//9213 6410//9213 6414//9213 -f 6579//9214 6414//9214 6583//9214 -f 6583//9215 6414//9215 6416//9215 -f 6583//9216 6416//9216 6584//9216 -f 6584//9217 6416//9217 6582//9217 -f 6585//9218 6586//9218 6587//9218 -f 6587//9219 6586//9220 6588//9221 -f 6587//9219 6588//9221 6589//9222 -f 6585//9223 6587//9223 6579//9223 -f 6579//9224 6587//9224 6355//9224 -f 6579//9225 6355//9225 6376//9225 -f 6327//9226 6359//9226 6590//9226 -f 6330//9227 6328//9227 6574//9228 -f 6574//9228 6328//9227 6327//9229 -f 6589//9222 6591//9230 6587//9219 -f 6587//9219 6591//9230 6592//9231 -f 6587//9219 6592//9231 6355//9232 -f 6355//9233 6592//9233 6593//9233 -f 6355//9234 6593//9234 6356//9234 -f 6356//9235 6593//9235 6590//9235 -f 6356//9236 6590//9236 6358//9236 -f 6358//9237 6590//9237 6359//9237 -f 6594//9238 6595//9239 6596//9240 -f 6596//9241 6595//9242 6597//9243 -f 6596//9241 6597//9243 6598//9244 -f 6327//9229 6590//9245 6574//9228 -f 6574//9246 6590//9246 6599//9246 -f 6574//9247 6599//9247 6575//9247 -f 6598//9248 6597//9249 6600//9250 -f 6600//9250 6597//9249 6601//9251 -f 6600//9252 6601//9252 6575//9252 -f 6575//9253 6601//9253 6602//9253 -f 6575//9254 6602//9254 6573//9254 -f 6578//9255 6426//9256 6603//9257 -f 6603//9257 6426//9256 6428//9258 -f 6603//9259 6428//9260 6604//9261 -f 6604//9261 6428//9260 6534//9262 -f 6604//9263 6534//9264 6605//9265 -f 6605//9265 6534//9264 6504//9266 -f 6605//9267 6504//9268 6606//9269 -f 6606//9269 6504//9268 6502//9270 -f 6606//9271 6502//9272 6607//9273 -f 6502//9272 6501//9274 6607//9273 -f 6607//9275 6501//9276 6505//9275 -f 6607//9275 6505//9275 6608//9277 -f 6608//9278 6505//9279 6507//9280 -f 6608//9278 6507//9280 6508//9281 -f 6508//9281 6572//9282 6608//9278 -f 6608//9278 6572//9282 6509//9283 -f 6608//9284 6509//9285 6609//9286 -f 6609//9286 6509//9285 6511//9287 -f 6609//9288 6511//9288 6610//9288 -f 6610//9289 6511//9289 6513//9289 -f 6610//9290 6513//9290 6611//9290 -f 6612//9291 6613//9291 6515//9291 -f 6515//9292 6613//9292 6614//9292 -f 6515//9293 6614//9293 6513//9293 -f 6513//9294 6614//9294 6615//9294 -f 6513//9295 6615//9295 6611//9295 -f 6515//9296 6517//9296 6612//9296 -f 6612//9297 6517//9297 6519//9297 -f 6612//9298 6519//9298 6034//9298 -f 6033//9299 6045//9300 6616//9301 -f 6616//9301 6045//9300 6043//9302 -f 6042//9303 6065//9303 6617//9303 -f 6617//9304 6065//9305 6071//9306 -f 6617//9304 6071//9306 6070//9307 -f 6618//9308 6619//9309 6620//9310 -f 6620//9310 6619//9309 6621//9311 -f 6034//9312 6033//9312 6612//9312 -f 6612//9313 6033//9314 6620//9315 -f 6612//9313 6620//9315 6622//9316 -f 6622//9317 6620//9317 6621//9317 -f 6616//9318 6623//9318 6033//9318 -f 6033//9319 6623//9319 6624//9319 -f 6033//9320 6624//9321 6620//9310 -f 6620//9310 6624//9321 6625//9322 -f 6620//9310 6625//9322 6618//9308 -f 6626//9323 6617//9323 6627//9323 -f 6627//9324 6617//9324 6628//9324 -f 6627//9325 6628//9325 6629//9325 -f 6629//9326 6630//9326 6627//9326 -f 6627//9327 6630//9327 6631//9327 -f 6627//9328 6631//9328 6632//9328 -f 6043//9329 6042//9329 6616//9329 -f 6616//9330 6042//9330 6617//9330 -f 6616//9331 6617//9331 6633//9331 -f 6633//9332 6617//9332 6626//9332 -f 6634//9333 6635//9333 6631//9333 -f 6631//9334 6635//9334 6636//9334 -f 6631//9335 6636//9335 6632//9335 -f 6637//9336 6638//9337 6639//9338 -f 6639//9338 6640//9339 6637//9336 -f 6637//9340 6640//9340 6594//9340 -f 6637//9341 6594//9341 6641//9341 -f 6641//9342 6594//9342 6596//9342 -f 6641//9343 6596//9343 6642//9343 -f 6642//9344 6596//9344 6598//9344 -f 6600//9345 6643//9346 6598//9347 -f 6598//9347 6643//9346 6644//9348 -f 6598//9349 6644//9349 6642//9349 -f 6599//9350 6645//9350 6575//9350 -f 6575//9351 6645//9351 6646//9351 -f 6575//9352 6646//9353 6600//9354 -f 6600//9354 6646//9353 6647//9355 -f 6600//9356 6647//9356 6643//9356 -f 6590//9357 6648//9357 6599//9357 -f 6599//9358 6648//9358 6649//9358 -f 6599//9359 6649//9359 6645//9359 -f 6590//9360 6593//9361 6648//9362 -f 6648//9362 6593//9361 6592//9363 -f 6648//9364 6592//9364 6650//9364 -f 6651//9365 6652//9365 6583//9365 -f 6653//9366 6654//9366 6614//9366 -f 6614//9367 6613//9367 6653//9367 -f 6653//9368 6613//9368 6612//9368 -f 6653//9369 6612//9369 6655//9369 -f 6655//9370 6612//9370 6622//9370 -f 6655//9371 6622//9371 6656//9371 -f 6656//9372 6622//9372 6621//9372 -f 6656//9373 6621//9373 6657//9373 -f 6657//9374 6621//9374 6619//9374 -f 6657//9375 6619//9375 6658//9375 -f 6659//9376 6611//9377 6654//9377 -f 6654//9377 6611//9377 6615//9378 -f 6654//9379 6615//9379 6614//9379 -f 6660//9380 6606//9380 6661//9380 -f 6661//9381 6606//9381 6607//9381 -f 6661//9382 6607//9383 6662//9383 -f 6662//9383 6607//9383 6608//9384 -f 6662//9385 6608//9385 6663//9385 -f 6663//9386 6608//9386 6609//9386 -f 6663//9387 6609//9387 6659//9387 -f 6659//9388 6609//9388 6610//9388 -f 6659//9389 6610//9389 6611//9389 -f 6650//9390 6592//9390 6591//9390 -f 6651//9391 6583//9391 6664//9391 -f 6650//9392 6591//9392 6665//9392 -f 6665//9393 6591//9393 6589//9393 -f 6665//9394 6589//9394 6666//9394 -f 6666//9395 6589//9395 6588//9395 -f 6666//9396 6588//9396 6667//9396 -f 6667//9397 6588//9397 6586//9397 -f 6667//9398 6586//9398 6668//9398 -f 6668//9399 6586//9399 6585//9399 -f 6668//9400 6585//9400 6652//9400 -f 6652//9401 6585//9401 6579//9401 -f 6652//9402 6579//9402 6583//9402 -f 6583//9403 6584//9403 6664//9403 -f 6664//9404 6584//9404 6582//9404 -f 6664//9405 6582//9405 6669//9405 -f 6669//9406 6582//9406 6581//9406 -f 6669//9407 6581//9407 6670//9407 -f 6624//9408 6671//9408 6625//9408 -f 6625//9409 6671//9409 6658//9409 -f 6625//9410 6658//9410 6618//9410 -f 6618//9411 6658//9411 6619//9411 -f 6581//9412 6580//9412 6670//9412 -f 6670//9413 6580//9413 6576//9413 -f 6670//9414 6576//9414 6672//9414 -f 6672//9415 6576//9415 6577//9415 -f 6672//9416 6577//9417 6673//9418 -f 6673//9418 6577//9417 6578//9419 -f 6673//9420 6578//9421 6674//9422 -f 6674//9422 6578//9421 6603//9423 -f 6674//9424 6603//9424 6675//9424 -f 6675//9425 6603//9425 6604//9425 -f 6675//9426 6604//9427 6660//9428 -f 6660//9428 6604//9427 6605//9429 -f 6660//9430 6605//9430 6606//9430 -f 6676//9431 6671//9431 6624//9431 -f 6677//9432 6678//9432 6679//9432 -f 6679//9433 6678//9433 6680//9433 -f 6679//9434 6680//9435 6635//9436 -f 6635//9436 6680//9435 6681//9437 -f 6635//9438 6681//9438 6636//9438 -f 6636//9439 6681//9440 6632//9441 -f 6681//9440 6682//9442 6632//9441 -f 6632//9443 6682//9443 6683//9443 -f 6632//9444 6683//9444 6627//9444 -f 6627//9445 6683//9445 6684//9445 -f 6627//9446 6684//9446 6626//9446 -f 6626//9447 6684//9447 6685//9447 -f 6626//9448 6685//9448 6633//9448 -f 6633//9449 6685//9449 6686//9449 -f 6633//9450 6686//9450 6616//9450 -f 6616//9451 6686//9451 6676//9451 -f 6616//9452 6676//9453 6623//9454 -f 6623//9454 6676//9453 6624//9455 -f 6687//9456 6688//9456 6689//9456 -f 6678//9457 6677//9457 6690//9457 -f 6678//9458 6690//9458 6691//9458 -f 6691//9459 6690//9459 6692//9459 -f 6691//9460 6692//9460 6693//9460 -f 6693//9461 6692//9462 6694//9463 -f 6694//9463 6692//9462 6695//9464 -f 6694//9465 6695//9466 6696//9467 -f 6696//9467 6695//9466 6697//9468 -f 6696//9469 6697//9469 6698//9469 -f 6698//9470 6697//9470 6699//9470 -f 6698//9471 6699//9471 6700//9471 -f 6699//9472 6701//9472 6700//9472 -f 6700//9473 6701//9473 6702//9473 -f 6700//9474 6702//9474 6703//9474 -f 6704//9475 6705//9475 6706//9475 -f 6706//9476 6705//9476 6707//9476 -f 6706//9477 6707//9477 6708//9477 -f 6708//9478 6707//9478 6709//9478 -f 6708//9479 6709//9479 6710//9479 -f 6710//9480 6709//9480 6711//9480 -f 6710//9481 6711//9481 6712//9481 -f 6712//9482 6711//9482 6713//9482 -f 6712//9483 6713//9483 6714//9483 -f 6714//9484 6713//9484 6703//9484 -f 6714//9485 6703//9485 6715//9485 -f 6715//9486 6703//9486 6702//9486 -f 6704//9487 6716//9487 6705//9487 -f 6705//9488 6716//9488 6717//9488 -f 6705//9489 6717//9489 6718//9489 -f 6717//9490 6719//9490 6718//9490 -f 6718//9491 6719//9491 6720//9491 -f 6718//9492 6720//9492 6721//9492 -f 6721//9493 6720//9493 6722//9493 -f 6721//9494 6722//9494 6723//9494 -f 6723//9495 6722//9495 6724//9495 -f 6723//9496 6724//9496 6725//9496 -f 6725//9497 6724//9497 6726//9497 -f 6725//9498 6726//9498 6727//9498 -f 6726//9499 6728//9499 6727//9499 -f 6727//9500 6728//9500 6729//9500 -f 6727//9501 6729//9501 6730//9501 -f 6730//9502 6729//9502 6731//9502 -f 6730//9503 6731//9503 6732//9503 -f 6731//9504 6733//9504 6732//9504 -f 6732//9505 6733//9505 6734//9505 -f 6732//9506 6734//9506 6735//9506 -f 6735//9507 6734//9508 6736//9509 -f 6736//9509 6734//9508 6737//9510 -f 6736//9511 6737//9511 6738//9511 -f 6738//9512 6737//9512 6739//9512 -f 6738//9513 6739//9513 6740//9513 -f 6739//9514 6741//9514 6740//9514 -f 6740//9515 6741//9515 6742//9515 -f 6740//9516 6742//9517 6743//9518 -f 6743//9518 6742//9517 6744//9519 -f 6743//9520 6744//9521 6745//9522 -f 6745//9522 6744//9521 6746//9523 -f 6745//9524 6746//9525 6747//9526 -f 6748//9527 6749//9528 6750//9529 -f 6750//9530 6749//9530 6747//9530 -f 6750//9531 6747//9531 6751//9531 -f 6751//9532 6747//9526 6746//9525 -f 6750//9529 6752//9533 6748//9527 -f 6748//9534 6752//9534 6753//9534 -f 6748//9535 6753//9536 6754//9537 -f 6754//9537 6753//9536 6755//9538 -f 6754//9539 6755//9539 6756//9539 -f 6756//9540 6755//9540 6757//9540 -f 6756//9541 6757//9542 6758//9543 -f 6757//9542 6759//9544 6758//9543 -f 6758//9545 6759//9545 6760//9545 -f 6758//9546 6760//9546 6761//9546 -f 6761//9547 6760//9548 6762//9549 -f 6762//9549 6760//9548 6763//9550 -f 6762//9551 6763//9551 6764//9551 -f 6765//9552 6766//9552 6767//9552 -f 6763//9553 6768//9553 6764//9553 -f 6764//9554 6768//9554 6769//9554 -f 6764//9555 6769//9555 6770//9555 -f 6770//9556 6769//9556 6771//9556 -f 6770//9557 6771//9558 6772//9559 -f 6772//9559 6771//9558 6773//9560 -f 6772//9561 6773//9561 6774//9561 -f 6774//9562 6773//9562 6775//9562 -f 6774//9563 6775//9564 6767//9565 -f 6767//9565 6775//9564 6776//9566 -f 6767//9567 6776//9567 6765//9567 -f 6765//9568 6777//9568 6766//9568 -f 6766//9569 6777//9569 6778//9569 -f 6766//9570 6778//9570 6779//9570 -f 6779//9571 6778//9571 6780//9571 -f 6779//9572 6780//9572 6781//9572 -f 6780//9573 6782//9573 6781//9573 -f 6781//9574 6782//9574 6783//9574 -f 6781//9575 6783//9575 6784//9575 -f 6784//9576 6783//9576 6785//9576 -f 6784//9577 6785//9577 6786//9577 -f 6786//9578 6785//9578 6787//9578 -f 6787//9579 6788//9579 6786//9579 -f 6786//9580 6788//9580 6789//9580 -f 6786//9581 6789//9581 6790//9581 -f 6790//9582 6789//9582 6791//9582 -f 6790//9583 6791//9583 6792//9583 -f 6792//9584 6791//9584 6793//9584 -f 6792//9585 6793//9585 6794//9585 -f 6794//9586 6793//9586 6795//9586 -f 6794//9587 6795//9587 6796//9587 -f 6796//9588 6795//9588 6797//9588 -f 6796//9589 6797//9589 6798//9589 -f 6798//9590 6797//9590 6799//9590 -f 6797//9591 6800//9591 6799//9591 -f 6799//9592 6800//9592 6801//9592 -f 6799//9593 6801//9593 6687//9593 -f 6687//9594 6801//9594 6802//9594 -f 6687//9595 6802//9595 6688//9595 -f 6803//9596 6804//9596 6689//9596 -f 6689//9597 6804//9598 6805//9599 -f 6689//9597 6805//9599 6687//9600 -f 6689//9601 6806//9601 6803//9601 -f 6803//9602 6806//9602 6807//9602 -f 6803//9603 6807//9603 6808//9603 -f 6808//9604 6807//9604 6809//9604 -f 6808//9605 6809//9605 6810//9605 -f 6810//9606 6809//9606 6811//9606 -f 6811//9607 6809//9607 6639//9607 -f 6811//9608 6639//9608 6638//9608 -f 6701//9609 6699//9609 6812//9609 -f 6812//9610 6699//9610 6813//9610 -f 6186//9611 6188//9611 6814//9611 -f 6815//9612 6602//9613 6298//9614 -f 6298//9614 6602//9613 6290//9615 -f 6815//9616 6310//9616 6602//9616 -f 6602//9617 6310//9618 6311//9619 -f 6602//9617 6311//9619 6573//9620 -f 6573//9621 6311//9622 6318//9623 -f 6573//9621 6318//9623 6574//9624 -f 6574//9624 6318//9623 6816//9625 -f 6574//9624 6816//9625 6330//9626 -f 6186//9627 6814//9627 6184//9627 -f 6184//9628 6814//9628 6182//9628 -f 6182//9629 6814//9629 6817//9629 -f 6182//9630 6817//9630 6180//9630 -f 6180//9631 6817//9632 6818//9633 -f 6180//9631 6818//9633 6178//9634 -f 6178//9635 6818//9635 6175//9635 -f 6175//9636 6818//9636 6819//9636 -f 6175//9637 6819//9637 6173//9637 -f 6173//9638 6819//9638 6168//9638 -f 6168//9639 6819//9639 6820//9639 -f 6168//9640 6820//9640 6169//9640 -f 6169//9641 6820//9641 6170//9641 -f 6170//9642 6820//9643 6821//9644 -f 6170//9642 6821//9644 6165//9645 -f 6165//9646 6821//9646 6163//9646 -f 6163//9647 6821//9647 6822//9647 -f 6163//9648 6822//9648 6158//9648 -f 6158//9649 6822//9649 6823//9649 -f 6158//9650 6823//9650 6159//9650 -f 6159//9651 6823//9651 6160//9651 -f 6160//9652 6823//9652 6824//9652 -f 6160//9653 6824//9653 6149//9653 -f 6149//9654 6824//9655 6825//9656 -f 6149//9654 6825//9656 6151//9657 -f 6826//9658 6155//9659 6825//9658 -f 6825//9658 6155//9659 6153//9660 -f 6825//9661 6153//9661 6151//9661 -f 6074//9662 6089//9663 6629//9664 -f 6089//9663 6090//9665 6629//9664 -f 6629//9666 6090//9667 6091//9668 -f 6629//9666 6091//9668 6099//9669 -f 6108//9670 6124//9671 6827//9672 -f 6827//9672 6124//9671 6129//9673 -f 6827//9674 6129//9674 6826//9674 -f 6826//9675 6129//9675 6147//9675 -f 6826//9676 6147//9676 6155//9676 -f 6629//9664 6628//9677 6074//9662 -f 6074//9678 6628//9679 6617//9680 -f 6074//9678 6617//9680 6069//9681 -f 6069//9681 6617//9680 6070//9682 -f 6828//9683 6829//9683 6677//9683 -f 6699//9684 6697//9685 6813//9684 -f 6813//9684 6697//9685 6695//9685 -f 6813//9684 6695//9685 6830//9685 -f 6830//9685 6695//9685 6692//9684 -f 6830//9685 6692//9684 6829//9685 -f 6829//9685 6692//9684 6690//9684 -f 6829//9685 6690//9684 6677//9684 -f 6831//9686 6715//9686 6812//9686 -f 6812//9687 6715//9687 6702//9687 -f 6812//9688 6702//9688 6701//9688 -f 6832//9689 6712//9689 6831//9689 -f 6831//9690 6712//9690 6714//9690 -f 6831//9691 6714//9691 6715//9691 -f 6708//9692 6710//9692 6833//9692 -f 6833//9693 6710//9693 6712//9693 -f 6833//9694 6712//9694 6834//9694 -f 6834//9695 6712//9695 6832//9695 -f 6835//9696 6704//9696 6833//9696 -f 6833//9697 6704//9697 6706//9697 -f 6833//9698 6706//9698 6708//9698 -f 6720//9699 6719//9699 6836//9699 -f 6836//9700 6719//9700 6717//9700 -f 6836//9701 6717//9701 6835//9701 -f 6835//9702 6717//9702 6716//9702 -f 6835//9703 6716//9703 6704//9703 -f 6837//9704 6722//9704 6838//9704 -f 6838//9705 6722//9705 6720//9705 -f 6838//9706 6720//9706 6839//9706 -f 6839//9707 6720//9707 6836//9707 -f 6595//9708 5932//9709 6597//9708 -f 6597//9708 5932//9709 6840//9709 -f 6188//9710 6290//9710 6814//9710 -f 6814//9711 6290//9615 6602//9613 -f 6814//9712 6602//9713 6840//9714 -f 6840//9714 6602//9713 6601//9715 -f 6840//9716 6601//9716 6597//9716 -f 6099//9669 6108//9717 6629//9666 -f 6629//9666 6108//9717 6827//9718 -f 6629//9719 6827//9719 6630//9719 -f 6630//9719 6827//9719 6841//9719 -f 6630//9720 6841//9721 6631//9722 -f 6631//9722 6841//9721 6828//9723 -f 6631//9724 6828//9724 6634//9724 -f 6634//9725 6828//9725 6677//9725 -f 5964//9726 6837//9726 5909//9726 -f 5909//9727 6837//9727 5921//9727 -f 6837//9728 6838//9728 5921//9728 -f 5921//9729 6838//9729 6839//9729 -f 5921//9730 6839//9730 5920//9730 -f 6839//9731 6836//9731 5920//9731 -f 5920//9732 6836//9732 6835//9732 -f 5920//9733 6835//9733 5918//9733 -f 6835//9734 6833//9734 5918//9734 -f 5918//9735 6833//9735 6834//9735 -f 5918//9736 6834//9737 5919//9738 -f 6834//9737 6832//9739 5919//9738 -f 5919//9740 6832//9740 6831//9740 -f 5919//9741 6831//9741 5907//9741 -f 5907//9742 6831//9742 6812//9742 -f 5907//9743 6812//9743 5896//9743 -f 5896//9743 6812//9743 5897//9744 -f 5897//9745 6812//9745 6813//9745 -f 5897//9746 6813//9747 5922//9746 -f 6813//9747 6830//9747 5922//9746 -f 5922//9746 6830//9747 6829//9746 -f 5922//9746 6829//9746 5923//9746 -f 5923//9748 6829//9748 6828//9748 -f 5923//9749 6828//9749 5924//9749 -f 6828//9750 6841//9750 5924//9750 -f 5924//9751 6841//9751 6827//9751 -f 5924//9752 6827//9752 5925//9752 -f 5925//9753 6827//9753 6826//9753 -f 5925//9754 6826//9754 5926//9754 -f 6826//9755 6825//9755 5926//9755 -f 5926//9756 6825//9756 6824//9756 -f 5926//9757 6824//9757 5927//9757 -f 5927//9758 6824//9758 6823//9758 -f 5927//9759 6823//9759 5928//9759 -f 5928//9760 6823//9760 6822//9760 -f 5928//9761 6822//9762 5913//9763 -f 5913//9763 6822//9762 6821//9764 -f 5913//9765 6821//9766 5914//9767 -f 5914//9767 6821//9766 6820//9768 -f 5914//9769 6820//9770 5929//9771 -f 5929//9771 6820//9770 6819//9772 -f 5929//9773 6819//9774 5930//9775 -f 5930//9775 6819//9774 6818//9776 -f 5930//9777 6818//9778 5931//9779 -f 5931//9779 6818//9778 6817//9780 -f 5931//9781 6817//9782 5912//9783 -f 5932//9784 5899//9784 6840//9784 -f 6840//9785 5899//9785 5912//9785 -f 6840//9786 5912//9786 6814//9786 -f 6814//9787 5912//9783 6817//9782 -f 6789//9788 5940//9788 5939//9788 -f 6768//9789 5949//9790 5948//9791 -f 6722//9792 6837//9792 6724//9792 -f 6724//9793 6837//9793 5964//9793 -f 6724//9794 5964//9794 6726//9794 -f 6726//9795 5964//9796 5965//9797 -f 6726//9795 5965//9797 6728//9798 -f 6728//9799 5965//9799 6729//9799 -f 6729//9800 5965//9800 5966//9800 -f 6729//9801 5966//9801 6731//9801 -f 6731//9802 5966//9802 5963//9802 -f 6731//9803 5963//9803 6733//9803 -f 6733//9804 5963//9804 5962//9804 -f 6733//9805 5962//9805 6734//9805 -f 6734//9806 5962//9807 5961//9808 -f 6734//9806 5961//9808 6737//9809 -f 6737//9810 5961//9810 5960//9810 -f 6737//9811 5960//9812 6739//9811 -f 6739//9811 5960//9812 5959//9812 -f 6739//9813 5959//9813 6741//9813 -f 6741//9814 5959//9815 5958//9816 -f 6741//9814 5958//9816 6742//9817 -f 6742//9818 5958//9818 6744//9818 -f 6744//9819 5958//9819 5957//9819 -f 6744//9820 5957//9820 6746//9820 -f 6746//9821 5957//9822 5956//9823 -f 6746//9821 5956//9823 6751//9824 -f 6751//9825 5956//9826 6750//9827 -f 6750//9827 5956//9826 5955//9828 -f 6750//9829 5955//9829 6752//9829 -f 6752//9830 5955//9831 6753//9832 -f 6753//9832 5955//9831 5954//9833 -f 6753//9834 5954//9835 6755//9836 -f 6759//9837 6757//9837 5952//9837 -f 5952//9838 6757//9839 6755//9840 -f 5952//9838 6755//9840 5953//9841 -f 5953//9842 6755//9836 5954//9835 -f 6759//9843 5952//9844 6760//9845 -f 6760//9845 5952//9844 5951//9846 -f 6760//9847 5951//9847 6763//9847 -f 6763//9848 5951//9849 6768//9850 -f 6768//9850 5951//9849 5950//9851 -f 6768//9852 5950//9852 5949//9852 -f 6773//9853 6771//9853 5948//9853 -f 5948//9854 6771//9854 6769//9854 -f 5948//9791 6769//9855 6768//9789 -f 6773//9856 5948//9856 6775//9856 -f 6775//9857 5948//9857 5947//9857 -f 6775//9858 5947//9858 6776//9858 -f 6776//9859 5947//9859 6765//9859 -f 6765//9860 5947//9860 5946//9860 -f 6765//9861 5946//9861 5945//9861 -f 5944//9862 6778//9862 5945//9862 -f 5945//9863 6778//9863 6777//9863 -f 5945//9864 6777//9864 6765//9864 -f 6785//9865 6783//9865 5943//9865 -f 5943//9866 6783//9866 6782//9866 -f 5943//9867 6782//9868 5944//9869 -f 5944//9869 6782//9868 6780//9870 -f 5944//9871 6780//9871 6778//9871 -f 5943//9872 5942//9872 6785//9872 -f 6785//9873 5942//9873 5941//9873 -f 6785//9874 5941//9874 6787//9874 -f 6787//9875 5941//9875 5940//9875 -f 6787//9876 5940//9876 6788//9876 -f 6788//9877 5940//9877 6789//9877 -f 5935//9878 6800//9878 5936//9878 -f 5936//9879 6800//9879 6797//9879 -f 5936//9880 6797//9880 5937//9880 -f 5937//9881 6797//9881 6795//9881 -f 5937//9882 6795//9882 5938//9882 -f 5938//9883 6795//9884 6793//9885 -f 5938//9883 6793//9885 5939//9886 -f 5939//9887 6793//9887 6791//9887 -f 5939//9888 6791//9888 6789//9888 -f 5932//9889 6595//9889 6639//9889 -f 6639//9889 6809//9889 5932//9889 -f 5932//9889 6809//9889 6807//9889 -f 5932//9889 6807//9889 5933//9889 -f 5933//9889 6807//9889 6806//9889 -f 6806//9889 6689//9889 5933//9889 -f 5933//9889 6689//9889 6688//9889 -f 5933//9890 6688//9890 5934//9890 -f 5934//9891 6688//9891 6802//9891 -f 5934//9892 6802//9892 5935//9892 -f 5935//9893 6802//9893 6801//9893 -f 5935//9894 6801//9894 6800//9894 -f 6639//9895 6595//9239 6640//9896 -f 6640//9896 6595//9239 6594//9238 -f 6842//9897 6843//9897 6844//9897 -f 6845//9898 6846//9899 6847//9900 -f 6847//9900 6846//9899 6848//9901 -f 6847//9902 6848//9902 6849//9902 -f 6850//9903 6851//9903 6852//9903 -f 6852//9904 6851//9905 6853//9904 -f 6852//9904 6853//9904 6854//9906 -f 6855//9907 6856//9907 6857//9907 -f 6857//9908 6856//9908 6858//9908 -f 6857//9909 6858//9910 6859//9909 -f 6859//9909 6858//9910 6860//9911 -f 6859//9912 6860//9912 6861//9912 -f 6861//9913 6860//9913 6862//9913 -f 6862//9914 6860//9915 6863//9916 -f 6862//9917 6863//9917 6864//9917 -f 6864//9918 6863//9918 6865//9918 -f 6864//9919 6865//9919 6866//9919 -f 6866//9920 6865//9921 6867//9922 -f 6867//9923 6865//9923 6868//9923 -f 6867//9924 6868//9924 6869//9924 -f 6869//9925 6868//9925 6870//9925 -f 6870//9926 6868//9926 6871//9926 -f 6870//9927 6871//9927 6872//9927 -f 6872//9928 6871//9928 6873//9928 -f 6873//9929 6871//9929 6852//9929 -f 6873//9930 6852//9930 6844//9930 -f 6844//9931 6852//9931 6854//9931 -f 6844//9932 6854//9932 6842//9932 -f 6874//9933 6850//9933 6875//9933 -f 6875//9934 6850//9934 6852//9934 -f 6875//9935 6852//9936 6876//9935 -f 6876//9935 6852//9936 6871//9936 -f 6876//9937 6871//9938 6877//9937 -f 6877//9937 6871//9938 6868//9938 -f 6877//9939 6868//9940 6878//9941 -f 6878//9941 6868//9940 6865//9942 -f 6878//9943 6865//9944 6879//9943 -f 6879//9943 6865//9944 6863//9944 -f 6879//9916 6863//9916 6880//9916 -f 6880//9916 6863//9916 6860//9915 -f 6880//9945 6860//9911 6847//9945 -f 6847//9945 6860//9911 6858//9910 -f 6847//9946 6858//9946 6845//9946 -f 6845//9947 6858//9947 6856//9947 -f 6881//9948 6882//9949 6883//9950 -f 6884//9951 6885//9952 6886//9953 -f 6886//9953 6885//9952 6887//9954 -f 6886//9955 6887//9956 6888//9957 -f 6889//9958 6890//9958 6891//9958 -f 6891//9959 6890//9960 6892//9961 -f 6891//9962 6892//9963 6893//9964 -f 6893//9964 6892//9963 6894//9965 -f 6893//9966 6894//9967 6895//9968 -f 6883//9969 6882//9970 6896//9971 -f 6896//9971 6882//9970 6897//9972 -f 6896//9973 6897//9974 6898//9975 -f 6889//9976 6899//9976 6890//9976 -f 6890//9977 6899//9977 6900//9977 -f 6890//9960 6900//9978 6892//9961 -f 6892//9961 6900//9978 6901//9978 -f 6892//9963 6901//9979 6894//9965 -f 6894//9980 6901//9980 6902//9980 -f 6902//9981 6903//9981 6894//9981 -f 6894//9967 6903//9982 6881//9983 -f 6894//9967 6881//9983 6895//9968 -f 6895//9984 6881//9948 6883//9950 -f 6904//9985 6897//9972 6905//9986 -f 6905//9986 6897//9972 6882//9970 -f 6905//9987 6882//9949 6906//9988 -f 6906//9988 6882//9949 6881//9948 -f 6906//9989 6881//9989 6907//9989 -f 6907//9990 6881//9990 6903//9990 -f 6904//9991 6908//9991 6897//9991 -f 6897//9974 6908//9992 6888//9993 -f 6897//9974 6888//9993 6898//9975 -f 6898//9994 6888//9957 6887//9956 -f 6909//9995 6884//9951 6910//9996 -f 6910//9996 6884//9951 6886//9953 -f 6910//9997 6886//9997 6911//9997 -f 6911//9998 6886//9955 6888//9957 -f 6911//9999 6888//9999 6912//9999 -f 6912//10000 6888//10000 6908//10000 -f 6904//10001 6905//10001 6913//10001 -f 6914//10002 6915//10002 6916//10002 -f 6917//10003 6918//10004 6919//10005 -f 6920//10006 6909//10006 6910//10006 -f 6900//10007 6899//10007 6921//10007 -f 6922//10008 6923//10009 6924//10010 -f 6925//10011 6926//10011 6927//10011 -f 6928//10012 6929//10012 6930//10012 -f 6930//10013 6929//10013 6925//10013 -f 6930//10014 6925//10015 6931//10016 -f 6931//10017 6925//10017 6927//10017 -f 6932//10018 6933//10018 6928//10018 -f 6928//10019 6933//10019 6934//10019 -f 6928//10020 6934//10020 6929//10020 -f 6935//10021 6936//10021 6932//10021 -f 6932//10022 6936//10022 6937//10022 -f 6932//10023 6937//10023 6933//10023 -f 6938//10024 6939//10024 6940//10024 -f 6940//10025 6939//10025 6935//10025 -f 6940//10026 6935//10026 6941//10026 -f 6941//10027 6935//10027 6932//10027 -f 6938//10028 6940//10029 6942//10030 -f 6942//10030 6940//10029 6943//10031 -f 6942//10032 6943//10033 6944//10034 -f 6944//10034 6943//10033 6945//10035 -f 6944//10034 6945//10035 6946//10036 -f 6923//10037 6922//10037 6945//10037 -f 6945//10035 6922//10038 6947//10039 -f 6945//10035 6947//10039 6946//10036 -f 6948//10040 6949//10040 6924//10040 -f 6924//10010 6949//10041 6950//10042 -f 6924//10010 6950//10042 6922//10008 -f 6951//10043 6952//10044 6953//10045 -f 6953//10045 6952//10044 6948//10046 -f 6953//10045 6948//10046 6954//10047 -f 6954//10048 6948//10048 6924//10048 -f 6951//10043 6953//10045 6955//10049 -f 6955//10049 6953//10045 6956//10050 -f 6955//10049 6956//10050 6957//10051 -f 6957//10052 6956//10053 6958//10054 -f 6957//10052 6958//10054 6959//10055 -f 6960//10056 6961//10056 6958//10056 -f 6958//10057 6961//10057 6962//10057 -f 6958//10054 6962//10058 6959//10055 -f 6963//10059 6964//10059 6960//10059 -f 6960//10060 6964//10060 6965//10060 -f 6960//10061 6965//10061 6961//10061 -f 6966//10062 6902//10062 6901//10062 -f 6960//10063 6967//10063 6963//10063 -f 6963//10064 6967//10064 6966//10064 -f 6963//10065 6966//10065 6921//10065 -f 6921//10066 6966//10066 6901//10066 -f 6921//10067 6901//10067 6900//10067 -f 6920//10068 6910//10068 6968//10068 -f 6968//10069 6910//10069 6969//10069 -f 6968//10070 6969//10070 6970//10070 -f 6970//10071 6969//10071 6971//10071 -f 6971//10072 6969//10072 6972//10072 -f 6971//10073 6972//10073 6973//10073 -f 6974//10074 6975//10074 6972//10074 -f 6972//10075 6975//10075 6976//10075 -f 6972//10076 6976//10076 6973//10076 -f 6974//10077 6977//10077 6975//10077 -f 6975//10078 6977//10078 6978//10078 -f 6975//10079 6978//10079 6979//10079 -f 6979//10080 6978//10080 6980//10080 -f 6979//10081 6980//10081 6981//10081 -f 6981//10082 6980//10082 6982//10082 -f 6981//10083 6982//10083 6983//10083 -f 6983//10084 6982//10084 6984//10084 -f 6983//10085 6984//10085 6985//10085 -f 6985//10086 6984//10087 6986//10088 -f 6985//10086 6986//10088 6987//10089 -f 6987//10090 6986//10091 6988//10092 -f 6987//10090 6988//10092 6989//10093 -f 6989//10094 6988//10094 6990//10094 -f 6989//10095 6990//10095 6991//10095 -f 6991//10096 6990//10096 6992//10096 -f 6991//10097 6992//10097 6993//10097 -f 6993//10098 6992//10099 6994//10100 -f 6993//10098 6994//10100 6995//10101 -f 6995//10102 6994//10102 6996//10102 -f 6995//10103 6996//10103 6997//10103 -f 6996//10104 6998//10104 6997//10104 -f 6997//10105 6998//10105 6999//10105 -f 6997//10106 6999//10106 7000//10106 -f 7000//10107 6999//10107 7001//10107 -f 7000//10108 7001//10108 7002//10108 -f 7002//10109 7001//10109 7003//10109 -f 7002//10110 7003//10110 7004//10110 -f 7004//10111 7003//10111 7005//10111 -f 7004//10112 7005//10112 7006//10112 -f 7006//10113 7005//10113 7007//10113 -f 7006//10114 7007//10114 7008//10114 -f 7008//10115 7007//10115 7009//10115 -f 7008//10116 7009//10116 7010//10116 -f 6906//10117 6907//10117 7011//10117 -f 7011//10118 6907//10118 6903//10118 -f 7012//10119 6913//10120 7013//10121 -f 7013//10122 6913//10122 6905//10122 -f 7013//10123 6905//10123 6906//10123 -f 7014//10124 7015//10124 7012//10124 -f 7012//10125 7015//10125 7016//10125 -f 7012//10119 7016//10126 6913//10120 -f 7017//10127 7018//10127 7014//10127 -f 7014//10128 7018//10128 7019//10128 -f 7014//10129 7019//10129 7015//10129 -f 7014//10130 7020//10130 7017//10130 -f 7017//10131 7020//10132 7021//10133 -f 7017//10131 7021//10133 7022//10134 -f 7022//10135 7021//10136 7023//10137 -f 7022//10135 7023//10137 7024//10138 -f 7024//10139 7023//10139 7025//10140 -f 7024//10139 7025//10140 7026//10140 -f 7026//10141 7025//10141 7027//10142 -f 7026//10141 7027//10142 7028//10143 -f 7028//10144 7027//10144 7029//10145 -f 7028//10144 7029//10145 7030//10146 -f 7030//10147 7029//10147 7031//10148 -f 7030//10147 7031//10148 7032//10149 -f 7032//10150 7031//10151 7033//10152 -f 7032//10150 7033//10152 7034//10153 -f 7034//10154 7033//10155 7035//10156 -f 7036//10157 7037//10157 7038//10157 -f 7038//10158 7037//10158 7039//10158 -f 7038//10159 7039//10159 7035//10159 -f 7035//10160 7039//10160 7040//10160 -f 7035//10156 7040//10161 7034//10154 -f 7036//10162 7038//10162 6919//10162 -f 6919//10163 7038//10163 7041//10163 -f 6919//10005 7041//10164 6917//10003 -f 6906//10165 7011//10165 7013//10165 -f 7013//10166 7011//10167 7042//10168 -f 7013//10166 7042//10168 7012//10169 -f 7012//10170 7042//10171 7043//10172 -f 7012//10170 7043//10172 7014//10173 -f 7014//10174 7043//10175 7044//10176 -f 7014//10174 7044//10176 7020//10177 -f 7020//10178 7044//10179 7045//10180 -f 7020//10178 7045//10180 7021//10181 -f 7021//10182 7045//10183 7046//10184 -f 7021//10182 7046//10184 7023//10185 -f 7023//10186 7046//10186 7047//10187 -f 7023//10186 7047//10187 7025//10187 -f 7025//10188 7047//10188 7048//10189 -f 7025//10188 7048//10189 7027//10189 -f 7027//10190 7048//10191 7049//10190 -f 7027//10190 7049//10190 7029//10192 -f 7029//10193 7049//10193 7050//10194 -f 7029//10193 7050//10194 7031//10195 -f 7031//10196 7050//10197 7051//10198 -f 7031//10196 7051//10198 7033//10199 -f 7033//10200 7051//10201 7052//10202 -f 7033//10200 7052//10202 7035//10203 -f 7035//10204 7052//10205 7053//10206 -f 7035//10204 7053//10206 7038//10207 -f 7038//10208 7053//10209 7054//10210 -f 7038//10208 7054//10210 7041//10211 -f 7041//10212 7054//10213 7055//10214 -f 7041//10212 7055//10214 6917//10215 -f 6930//10216 7055//10216 6928//10216 -f 6928//10217 7055//10218 7054//10219 -f 6928//10217 7054//10219 6932//10220 -f 6932//10221 7054//10222 7053//10223 -f 6932//10221 7053//10223 6941//10224 -f 6941//10225 7053//10226 7052//10227 -f 6941//10225 7052//10227 6940//10228 -f 6940//10229 7052//10229 7051//10230 -f 6940//10229 7051//10230 6943//10230 -f 6943//10231 7051//10232 7050//10233 -f 6943//10231 7050//10233 6945//10233 -f 6945//10234 7050//10234 7049//10235 -f 6945//10234 7049//10235 6923//10236 -f 6923//10237 7049//10237 7048//10238 -f 6923//10237 7048//10238 6924//10238 -f 6924//10239 7048//10239 7047//10240 -f 6924//10239 7047//10240 6954//10241 -f 6954//10242 7047//10242 7046//10243 -f 6954//10242 7046//10243 6953//10243 -f 6953//10244 7046//10244 7045//10245 -f 6953//10244 7045//10245 6956//10245 -f 6956//10246 7045//10247 7044//10248 -f 6956//10246 7044//10248 6958//10248 -f 6958//10249 7044//10250 7043//10251 -f 6958//10249 7043//10251 6960//10252 -f 6960//10253 7043//10254 7042//10255 -f 6960//10253 7042//10255 6967//10256 -f 6967//10257 7042//10258 7011//10259 -f 6967//10257 7011//10259 6966//10260 -f 6966//10261 7011//10261 6903//10261 -f 6966//10262 6903//10262 6902//10262 -f 7056//10263 7057//10264 7058//10265 -f 7056//10263 7058//10265 7059//10266 -f 7059//10267 7058//10268 7060//10269 -f 7059//10267 7060//10269 7061//10270 -f 7061//10271 7060//10272 7062//10273 -f 7061//10271 7062//10273 7063//10274 -f 7063//10275 7062//10276 7064//10277 -f 7063//10275 7064//10277 7065//10278 -f 7065//10279 7064//10280 7066//10281 -f 7065//10279 7066//10281 7067//10282 -f 7067//10283 7066//10284 7068//10285 -f 7067//10283 7068//10285 7069//10286 -f 7069//10287 7068//10288 7070//10289 -f 7069//10287 7070//10289 7071//10290 -f 7071//10291 7070//10291 7072//10292 -f 7071//10291 7072//10292 7073//10293 -f 7073//10294 7072//10294 7074//10295 -f 7073//10294 7074//10295 7075//10296 -f 7075//10297 7074//10297 7076//10298 -f 7075//10297 7076//10298 7077//10298 -f 7077//10299 7076//10300 7078//10300 -f 7077//10299 7078//10300 7079//10301 -f 7079//10302 7078//10303 7080//10304 -f 7079//10302 7080//10304 7081//10305 -f 7081//10306 7080//10307 7082//10308 -f 7081//10306 7082//10308 7083//10306 -f 7083//10309 7082//10310 7084//10311 -f 7083//10309 7084//10311 7085//10312 -f 7085//10313 7084//10314 7086//10315 -f 7085//10313 7086//10315 7087//10316 -f 7087//10317 7086//10318 7088//10319 -f 7087//10317 7088//10319 7089//10320 -f 7089//10321 7088//10322 7090//10323 -f 7089//10321 7090//10323 7091//10324 -f 7092//10325 6914//10325 7093//10325 -f 7093//10326 6914//10326 6916//10326 -f 7093//10327 6916//10327 7090//10327 -f 7090//10328 6916//10328 7094//10328 -f 7090//10329 7094//10329 7091//10329 -f 6910//10330 7056//10330 6969//10330 -f 6969//10331 7056//10332 7059//10333 -f 6969//10331 7059//10333 6972//10334 -f 6972//10335 7059//10336 7061//10337 -f 6972//10335 7061//10337 6974//10338 -f 6974//10339 7061//10340 7063//10341 -f 6974//10339 7063//10341 6977//10339 -f 6977//10342 7063//10342 7065//10343 -f 6977//10342 7065//10343 6978//10344 -f 6978//10345 7065//10346 7067//10347 -f 6978//10345 7067//10347 6980//10348 -f 6980//10348 7067//10347 7069//10349 -f 6980//10348 7069//10349 6982//10350 -f 6982//10351 7069//10351 7071//10352 -f 6982//10351 7071//10352 6984//10352 -f 6984//10353 7071//10353 7073//10353 -f 6984//10353 7073//10353 6986//10353 -f 6986//10354 7073//10354 7075//10354 -f 6986//10354 7075//10354 6988//10355 -f 6988//10356 7075//10356 7077//10357 -f 6988//10356 7077//10357 6990//10358 -f 6990//10359 7077//10360 7079//10359 -f 6990//10359 7079//10359 6992//10359 -f 6992//10361 7079//10361 7081//10362 -f 6992//10361 7081//10362 6994//10362 -f 6994//10363 7081//10363 7083//10364 -f 6994//10363 7083//10364 6996//10365 -f 6996//10365 7083//10364 7085//10366 -f 6996//10365 7085//10366 6998//10367 -f 6998//10368 7085//10369 7087//10370 -f 6998//10368 7087//10370 6999//10371 -f 6999//10372 7087//10373 7089//10374 -f 6999//10372 7089//10374 7001//10375 -f 7001//10376 7089//10377 7091//10378 -f 7001//10376 7091//10378 7003//10379 -f 7003//10380 7091//10381 7094//10382 -f 7003//10380 7094//10382 7005//10383 -f 7005//10384 7094//10385 6916//10386 -f 7005//10384 6916//10386 7007//10387 -f 7007//10388 6916//10388 6915//10388 -f 7007//10389 6915//10389 7009//10389 -f 6910//10390 6911//10390 7056//10390 -f 7056//10391 6911//10391 6912//10391 -f 7056//10392 6912//10392 7057//10392 -f 7057//10393 6912//10393 6908//10393 -f 7057//10394 6908//10394 6904//10394 -f 6930//10395 7095//10395 7055//10395 -f 7055//10396 7095//10396 7096//10396 -f 7055//10397 7096//10397 6917//10397 -f 6917//10398 7096//10398 7097//10398 -f 6917//10399 7097//10399 6918//10399 -f 6918//10400 7097//10400 7098//10400 -f 6918//10401 7098//10401 7099//10401 -f 6904//10402 6913//10402 7057//10402 -f 7057//10403 6913//10404 7016//10405 -f 7057//10403 7016//10405 7058//10406 -f 7058//10407 7016//10407 7015//10408 -f 7058//10407 7015//10408 7060//10408 -f 7060//10408 7015//10408 7019//10409 -f 7060//10408 7019//10409 7062//10409 -f 7062//10410 7019//10410 7018//10410 -f 7062//10410 7018//10410 7064//10411 -f 7064//10412 7018//10413 7017//10414 -f 7064//10412 7017//10414 7066//10415 -f 7066//10416 7017//10417 7022//10418 -f 7066//10416 7022//10418 7068//10419 -f 7068//10420 7022//10420 7024//10421 -f 7068//10420 7024//10421 7070//10422 -f 7070//10423 7024//10424 7026//10425 -f 7070//10423 7026//10425 7072//10426 -f 7072//10427 7026//10428 7028//10429 -f 7072//10427 7028//10429 7074//10430 -f 7074//10431 7028//10431 7030//10432 -f 7074//10431 7030//10432 7076//10432 -f 7076//10433 7030//10434 7032//10435 -f 7076//10433 7032//10435 7078//10436 -f 7078//10437 7032//10438 7034//10438 -f 7078//10437 7034//10438 7080//10437 -f 7080//10439 7034//10440 7040//10441 -f 7080//10439 7040//10441 7082//10442 -f 7082//10443 7040//10444 7039//10445 -f 7082//10443 7039//10445 7084//10446 -f 7084//10447 7039//10447 7037//10448 -f 7084//10447 7037//10448 7086//10449 -f 7086//10450 7037//10451 7036//10452 -f 7086//10450 7036//10452 7088//10453 -f 7088//10453 7036//10452 6919//10454 -f 7088//10453 6919//10454 7090//10454 -f 7090//10455 6919//10456 6918//10457 -f 7090//10455 6918//10457 7093//10458 -f 7093//10459 6918//10459 7099//10459 -f 7093//10460 7099//10460 7092//10460 -f 7100//10461 7101//10462 7010//10463 -f 6926//10464 7102//10464 6927//10464 -f 6927//10465 7102//10466 7103//10467 -f 6927//10468 7103//10469 6931//10470 -f 6931//10470 7103//10469 7104//10471 -f 6931//10016 7104//10472 6930//10014 -f 6930//10473 7104//10474 7105//10474 -f 7106//10475 7096//10476 7105//10475 -f 7105//10477 7096//10477 7095//10477 -f 7105//10478 7095//10478 6930//10478 -f 7107//10479 7092//10480 7108//10481 -f 7108//10482 7092//10482 7099//10482 -f 7108//10483 7099//10484 7109//10485 -f 7109//10485 7099//10484 7098//10486 -f 7109//10487 7098//10488 7106//10487 -f 7106//10487 7098//10488 7097//10489 -f 7106//10490 7097//10490 7096//10490 -f 7010//10463 7009//10491 7100//10461 -f 7100//10492 7009//10492 6915//10492 -f 7100//10493 6915//10494 7107//10495 -f 7107//10496 6915//10496 6914//10496 -f 7107//10497 6914//10497 7092//10497 -f 7110//10498 7101//10462 7111//10499 -f 7111//10499 7101//10462 7100//10461 -f 7111//10500 7100//10493 7112//10500 -f 7112//10500 7100//10493 7107//10495 -f 7112//10479 7107//10479 7113//10479 -f 7113//10479 7107//10479 7108//10481 -f 7113//10501 7108//10483 7114//10501 -f 7114//10501 7108//10483 7109//10485 -f 7114//10502 7109//10487 7115//10503 -f 7115//10503 7109//10487 7106//10487 -f 7115//10504 7106//10475 7116//10504 -f 7116//10504 7106//10475 7105//10475 -f 7116//10505 7105//10474 7117//10505 -f 7117//10505 7105//10474 7104//10474 -f 7117//10506 7104//10471 7118//10506 -f 7118//10506 7104//10471 7103//10469 -f 7118//10507 7103//10467 7119//10508 -f 7119//10508 7103//10467 7102//10466 -f 7120//10509 7110//10498 7111//10499 -f 7121//10510 7122//10511 7123//10512 -f 7121//10513 7123//10513 7124//10513 -f 7119//10514 7125//10514 7118//10514 -f 7118//10515 7125//10515 7126//10515 -f 7120//10516 7111//10516 7127//10516 -f 7128//10517 7127//10517 7129//10517 -f 7129//10518 7127//10518 7111//10518 -f 7129//10519 7111//10520 7130//10521 -f 7130//10521 7111//10520 7112//10522 -f 7130//10523 7112//10524 7131//10525 -f 7131//10525 7112//10524 7113//10526 -f 7131//10527 7113//10528 7132//10529 -f 7132//10529 7113//10528 7114//10530 -f 7132//10531 7114//10532 7133//10533 -f 7133//10533 7114//10532 7115//10534 -f 7133//10535 7115//10536 7134//10537 -f 7134//10537 7115//10536 7116//10538 -f 7134//10539 7116//10540 7126//10541 -f 7126//10541 7116//10540 7117//10542 -f 7126//10543 7117//10543 7118//10543 -f 7135//10544 7128//10545 7136//10546 -f 7136//10546 7128//10545 7129//10547 -f 7136//10548 7129//10549 7137//10550 -f 7137//10550 7129//10549 7130//10551 -f 7137//10552 7130//10553 7138//10554 -f 7138//10554 7130//10553 7131//10555 -f 7138//10556 7131//10557 7139//10558 -f 7139//10558 7131//10557 7132//10558 -f 7139//10559 7132//10560 7140//10561 -f 7140//10561 7132//10560 7133//10562 -f 7140//10563 7133//10564 7141//10565 -f 7141//10565 7133//10564 7134//10566 -f 7141//10567 7134//10568 7123//10569 -f 7123//10569 7134//10568 7126//10570 -f 7123//10571 7126//10571 7124//10571 -f 7124//10572 7126//10572 7125//10572 -f 6934//10573 6933//10574 7142//10575 -f 6899//10576 7143//10576 6849//10576 -f 7144//10577 7145//10578 6899//10579 -f 6899//10579 6849//10580 7144//10577 -f 7144//10581 6849//10582 6848//10583 -f 7144//10581 6848//10583 6846//10584 -f 7143//10585 6899//10586 7146//10587 -f 7146//10588 6899//10589 6889//10590 -f 7146//10588 6889//10590 7147//10591 -f 7147//10591 7148//10592 7146//10588 -f 7146//10587 7148//10593 7149//10594 -f 7146//10587 7149//10594 7143//10585 -f 6961//10595 6965//10595 7150//10595 -f 7150//10596 6965//10597 6964//10598 -f 7150//10596 6964//10598 7144//10599 -f 7144//10600 6964//10600 6963//10600 -f 7144//10601 6963//10601 7145//10601 -f 7145//10578 6963//10602 6921//10603 -f 7145//10578 6921//10603 6899//10579 -f 6961//10604 7150//10604 6962//10604 -f 6962//10605 7150//10606 7151//10607 -f 6962//10605 7151//10607 6959//10608 -f 6959//10609 7151//10609 6957//10609 -f 6957//10610 7151//10611 7152//10612 -f 6957//10610 7152//10612 6955//10613 -f 6955//10614 7152//10615 7153//10616 -f 6955//10614 7153//10616 6951//10617 -f 6951//10618 7153//10618 6952//10618 -f 6952//10619 7153//10620 7154//10621 -f 6952//10622 7154//10622 6948//10622 -f 6948//10623 7154//10624 6949//10625 -f 6949//10625 7154//10624 7155//10626 -f 6949//10627 7155//10627 6950//10627 -f 6950//10628 7155//10629 7156//10630 -f 6950//10628 7156//10630 6922//10631 -f 6922//10632 7156//10633 7157//10634 -f 6922//10632 7157//10634 6947//10635 -f 7158//10636 6944//10637 7157//10638 -f 7157//10639 6944//10639 6946//10639 -f 7157//10640 6946//10640 6947//10640 -f 6936//10641 6935//10641 7159//10641 -f 7159//10642 6935//10642 6939//10642 -f 7159//10643 6939//10644 7160//10645 -f 7160//10645 6939//10644 6938//10646 -f 7160//10647 6938//10648 7158//10649 -f 7158//10650 6938//10650 6942//10650 -f 7158//10651 6942//10651 6944//10651 -f 7142//10652 6933//10652 7159//10652 -f 7159//10653 6933//10653 6937//10653 -f 7159//10654 6937//10654 6936//10654 -f 7142//10655 7161//10656 7162//10656 -f 7162//10656 7163//10657 7142//10655 -f 7142//10658 7163//10659 7122//10660 -f 7142//10658 7122//10660 7121//10661 -f 6929//10662 7164//10663 6925//10664 -f 6925//10664 7164//10663 6926//10665 -f 6929//10662 6934//10573 7164//10663 -f 7164//10663 6934//10573 7142//10575 -f 7164//10663 7142//10575 6926//10665 -f 6926//10665 7142//10575 7121//10666 -f 6926//10667 7121//10667 7102//10667 -f 7102//10668 7121//10669 7124//10670 -f 7102//10668 7124//10670 7119//10671 -f 7119//10671 7124//10670 7125//10672 -f 7165//10673 7166//10673 7167//10673 -f 7168//10674 6889//10674 6891//10674 -f 7168//10675 6891//10675 7148//10675 -f 7165//10676 7167//10676 7169//10676 -f 7170//10677 7169//10677 7171//10677 -f 7171//10678 7169//10678 7167//10678 -f 7171//10679 7167//10680 7172//10681 -f 7172//10681 7167//10680 7173//10682 -f 7172//10683 7173//10684 7174//10685 -f 7174//10685 7173//10684 7175//10686 -f 7174//10687 7175//10688 7176//10689 -f 7176//10689 7175//10688 7177//10690 -f 7176//10691 7177//10692 7178//10693 -f 7178//10693 7177//10692 7179//10694 -f 7178//10695 7179//10696 7180//10697 -f 7180//10697 7179//10696 7181//10698 -f 7180//10699 7181//10700 7182//10701 -f 7182//10701 7181//10700 7183//10702 -f 7182//10703 7183//10703 7149//10703 -f 7149//10704 7183//10704 7143//10704 -f 6885//10705 7170//10706 6887//10707 -f 6887//10707 7170//10706 7171//10708 -f 6887//10709 7171//10710 6898//10711 -f 6898//10711 7171//10710 7172//10712 -f 6898//10713 7172//10714 6896//10715 -f 6896//10715 7172//10714 7174//10716 -f 6896//10717 7174//10718 6883//10717 -f 6883//10717 7174//10718 7176//10718 -f 6883//10719 7176//10720 6895//10721 -f 6895//10721 7176//10720 7178//10722 -f 6895//10723 7178//10724 6893//10725 -f 6893//10725 7178//10724 7180//10726 -f 6893//10727 7180//10728 6891//10729 -f 6891//10729 7180//10728 7182//10730 -f 6891//10731 7182//10731 7148//10731 -f 7148//10732 7182//10732 7149//10732 -f 7184//10733 7185//10734 7186//10735 -f 7186//10735 7187//10736 7184//10733 -f 7184//10737 7187//10737 7188//10737 -f 7184//10738 7188//10738 7189//10738 -f 7189//10739 7188//10739 7190//10739 -f 7189//10740 7190//10740 7191//10740 -f 7191//10741 7190//10741 7192//10741 -f 7193//10742 7194//10743 7192//10744 -f 7192//10744 7194//10743 7195//10745 -f 7192//10746 7195//10746 7191//10746 -f 7196//10747 7197//10748 7198//10749 -f 7198//10750 7197//10750 7199//10750 -f 7198//10751 7199//10751 7200//10751 -f 7200//10752 7199//10752 7201//10752 -f 7200//10753 7201//10753 7202//10753 -f 7202//10754 7201//10754 7203//10754 -f 7202//10755 7203//10755 7204//10755 -f 7204//10756 7203//10756 7205//10756 -f 7204//10757 7205//10758 7193//10759 -f 7193//10759 7205//10758 7206//10760 -f 7193//10761 7206//10761 7194//10761 -f 7207//10762 7208//10762 7209//10762 -f 7210//10763 7211//10763 7212//10763 -f 7212//10764 7211//10764 7213//10764 -f 7214//10765 7215//10765 7216//10765 -f 7216//10766 7215//10766 7217//10766 -f 7216//10767 7217//10768 7218//10769 -f 7219//10770 7220//10770 7221//10770 -f 7221//10771 7220//10771 7222//10771 -f 7221//10772 7222//10772 7223//10772 -f 7223//10773 7222//10773 7224//10773 -f 7223//10774 7224//10774 7214//10774 -f 7214//10775 7224//10775 7225//10775 -f 7214//10776 7225//10776 7215//10776 -f 7218//10769 7217//10768 7226//10777 -f 7226//10778 7217//10778 7227//10778 -f 7226//10779 7227//10779 7228//10779 -f 7228//10780 7227//10780 7229//10780 -f 7229//10781 7227//10781 7230//10781 -f 7229//10782 7230//10782 7231//10782 -f 7231//10783 7230//10783 7232//10783 -f 7231//10784 7232//10784 7210//10784 -f 7210//10785 7232//10785 7233//10785 -f 7210//10786 7233//10786 7211//10786 -f 7197//10748 7196//10747 7234//10787 -f 7197//10788 7234//10788 7235//10788 -f 7235//10789 7234//10789 7236//10789 -f 7235//10790 7236//10790 7237//10790 -f 7237//10791 7236//10791 7238//10791 -f 7237//10792 7238//10792 7239//10792 -f 7239//10793 7238//10793 7240//10793 -f 7239//10794 7240//10794 7241//10794 -f 7241//10795 7240//10795 7242//10795 -f 7241//10796 7242//10796 7208//10796 -f 7208//10797 7242//10797 7243//10797 -f 7208//10798 7243//10798 7209//10798 -f 7244//10799 7245//10799 7246//10799 -f 7246//10800 7245//10800 7247//10800 -f 7246//10801 7247//10801 7248//10801 -f 7209//10802 7249//10802 7207//10802 -f 7207//10803 7249//10803 7250//10803 -f 7207//10804 7250//10804 7251//10804 -f 7251//10805 7250//10805 7252//10805 -f 7251//10806 7252//10806 7244//10806 -f 7244//10807 7252//10807 7253//10807 -f 7244//10808 7253//10808 7245//10808 -f 7221//10809 7254//10809 7219//10809 -f 7219//10810 7254//10810 7255//10810 -f 7219//10811 7255//10811 7256//10811 -f 7256//10812 7255//10812 7257//10812 -f 7256//10813 7257//10813 7258//10813 -f 7247//10814 7259//10814 7248//10814 -f 7248//10815 7259//10815 7260//10815 -f 7248//10816 7260//10816 7261//10816 -f 7261//10817 7260//10817 7262//10817 -f 7261//10818 7262//10819 7263//10820 -f 7263//10820 7262//10819 7264//10821 -f 7263//10822 7264//10822 7213//10822 -f 7213//10823 7264//10823 7265//10823 -f 7213//10824 7265//10824 7212//10824 -f 7266//10825 7267//10825 7268//10825 -f 7268//10826 7267//10826 7269//10826 -f 7268//10827 7269//10828 7270//10829 -f 7270//10829 7269//10828 7271//10830 -f 7270//10831 7271//10831 7272//10831 -f 7272//10832 7271//10833 7273//10834 -f 7271//10833 7274//10835 7273//10834 -f 7273//10836 7274//10836 7275//10836 -f 7273//10837 7275//10837 7276//10837 -f 7276//10838 7275//10838 7277//10838 -f 7276//10839 7277//10839 7278//10839 -f 7278//10840 7277//10840 7279//10840 -f 7278//10841 7279//10841 7280//10841 -f 7280//10842 7279//10842 7281//10842 -f 7280//10843 7281//10843 7282//10843 -f 7282//10844 7281//10844 7283//10844 -f 7282//10845 7283//10846 7284//10847 -f 7284//10847 7283//10846 7258//10848 -f 7284//10849 7258//10849 7257//10849 -f 7266//10850 7285//10850 7267//10850 -f 7267//10851 7285//10851 7286//10851 -f 7286//10852 7285//10852 7287//10852 -f 7287//10853 7285//10853 7288//10853 -f 7287//10854 7288//10854 7289//10854 -f 7289//10855 7288//10855 7290//10855 -f 7289//10856 7290//10856 7291//10856 -f 7291//10857 7290//10857 7292//10857 -f 7291//10858 7292//10858 7293//10858 -f 7293//10859 7292//10859 7294//10859 -f 7293//10860 7294//10860 7295//10860 -f 7294//10861 7296//10861 7295//10861 -f 7295//10862 7296//10862 7297//10862 -f 7295//10863 7297//10863 7298//10863 -f 7297//10864 7299//10864 7298//10864 -f 7298//10865 7299//10865 7300//10865 -f 7298//10866 7300//10866 7301//10866 -f 7301//10867 7300//10867 7302//10867 -f 7301//10868 7302//10868 7303//10868 -f 7304//10869 7305//10869 7306//10869 -f 7306//10870 7305//10870 7307//10870 -f 7306//10871 7307//10871 7308//10871 -f 7308//10872 7307//10872 7309//10872 -f 7308//10873 7309//10873 7310//10873 -f 7310//10874 7309//10874 7303//10874 -f 7310//10875 7303//10875 7311//10875 -f 7311//10876 7303//10876 7302//10876 -f 7304//10877 7312//10877 7305//10877 -f 7305//10878 7312//10878 7313//10878 -f 7305//10879 7313//10879 7314//10879 -f 7313//10880 7315//10880 7314//10880 -f 7314//10881 7315//10881 7316//10881 -f 7314//10882 7316//10883 7317//10884 -f 7317//10884 7316//10883 7318//10885 -f 7317//10886 7318//10886 7319//10886 -f 7319//10887 7318//10887 7320//10887 -f 7319//10888 7320//10888 7321//10888 -f 7321//10889 7320//10889 7322//10889 -f 7321//10890 7322//10890 7323//10890 -f 7322//10891 7324//10891 7323//10891 -f 7323//10892 7324//10892 7325//10892 -f 7323//10893 7325//10893 7326//10893 -f 7326//10894 7325//10894 7327//10894 -f 7326//10895 7327//10895 7328//10895 -f 7327//10896 7329//10896 7328//10896 -f 7328//10897 7329//10897 7330//10897 -f 7328//10898 7330//10898 7331//10898 -f 7331//10899 7330//10900 7332//10901 -f 7332//10901 7330//10900 7333//10902 -f 7332//10903 7333//10903 7334//10903 -f 7334//10904 7333//10904 7335//10904 -f 7334//10905 7335//10906 7336//10907 -f 7335//10906 7337//10908 7336//10907 -f 7336//10909 7337//10909 7338//10909 -f 7336//10910 7338//10910 7339//10910 -f 7339//10911 7338//10911 7340//10911 -f 7339//10912 7340//10913 7341//10914 -f 7341//10914 7340//10913 7342//10915 -f 7341//10916 7342//10916 7343//10916 -f 7342//10916 7344//10917 7343//10916 -f 7343//10918 7344//10918 7345//10918 -f 7343//10919 7345//10919 7346//10919 -f 7346//10920 7345//10920 7347//10920 -f 7346//10921 7347//10921 7348//10921 -f 7348//10922 7347//10922 7349//10922 -f 7348//10923 7349//10924 7350//10924 -f 7350//10924 7349//10924 7351//10925 -f 7350//10926 7351//10927 7352//10928 -f 7351//10927 7353//10929 7352//10928 -f 7352//10930 7353//10930 7354//10930 -f 7352//10931 7354//10931 7355//10931 -f 7354//10932 7356//10932 7355//10932 -f 7355//10933 7356//10933 7357//10933 -f 7355//10934 7357//10934 7358//10934 -f 7357//10935 7359//10935 7358//10935 -f 7358//10936 7359//10936 7360//10936 -f 7358//10937 7360//10937 7361//10937 -f 7360//10938 7362//10938 7361//10938 -f 7361//10939 7362//10939 7363//10939 -f 7361//10940 7363//10940 7364//10940 -f 7365//10941 7366//10941 7367//10941 -f 7364//10942 7363//10943 7367//10944 -f 7367//10944 7363//10943 7368//10945 -f 7367//10946 7368//10946 7365//10946 -f 7365//10947 7369//10947 7366//10947 -f 7366//10948 7369//10948 7370//10948 -f 7366//10949 7370//10949 7371//10949 -f 7371//10950 7370//10950 7372//10950 -f 7371//10951 7372//10952 7373//10953 -f 7372//10952 7374//10954 7373//10953 -f 7373//10955 7374//10955 7375//10955 -f 7373//10956 7375//10956 7376//10956 -f 7375//10957 7377//10957 7376//10957 -f 7376//10958 7377//10958 7378//10958 -f 7376//10959 7378//10959 7379//10959 -f 7379//10960 7378//10960 7380//10960 -f 7379//10961 7380//10961 7381//10961 -f 7381//10962 7380//10962 7382//10962 -f 7381//10963 7382//10963 7383//10963 -f 7382//10964 7384//10964 7383//10964 -f 7383//10965 7384//10965 7385//10965 -f 7383//10966 7385//10966 7386//10966 -f 7386//10967 7385//10967 7387//10967 -f 7386//10968 7387//10968 7388//10968 -f 7388//10969 7387//10969 7389//10969 -f 7388//10970 7389//10970 7390//10970 -f 7390//10971 7389//10971 7391//10971 -f 7392//10972 7393//10972 7394//10972 -f 7394//10973 7393//10973 7391//10973 -f 7394//10974 7391//10974 7395//10974 -f 7395//10975 7391//10975 7389//10975 -f 7396//10976 7397//10976 7398//10976 -f 7398//10977 7397//10977 7399//10977 -f 7398//10978 7399//10978 7400//10978 -f 7400//10979 7399//10979 7401//10979 -f 7400//10980 7401//10980 7402//10980 -f 7402//10981 7401//10981 7393//10981 -f 7402//10982 7393//10982 7403//10982 -f 7403//10983 7393//10983 7392//10983 -f 7396//10984 7398//10984 7404//10984 -f 7404//10985 7398//10985 7405//10985 -f 7404//10986 7405//10986 7406//10986 -f 7406//10987 7405//10987 7186//10987 -f 7406//10988 7186//10988 7185//10988 -f 7407//21 7408//21 7409//21 -f 7410//21 7411//21 7412//21 -f 7412//21 7411//21 7408//21 -f 7409//21 7408//21 7413//21 -f 7414//21 7415//21 7409//21 -f 7409//21 7415//21 7416//21 -f 7409//21 7416//21 7407//21 -f 7412//21 7417//21 7410//21 -f 7410//21 7417//21 7418//21 -f 7410//21 7418//21 7419//21 -f 7410//21 7420//21 7421//21 -f 7421//21 7420//21 7422//21 -f 7421//21 7422//21 7423//21 -f 7419//21 7424//21 7410//21 -f 7410//21 7424//21 7425//21 -f 7410//21 7425//21 7420//21 -f 7426//21 7427//21 7428//21 -f 7429//21 7430//21 7409//21 -f 7409//21 7430//21 7431//21 -f 7409//21 7431//21 7414//21 -f 7432//21 7433//21 7434//21 -f 7434//21 7433//21 7421//21 -f 7434//21 7421//21 7435//21 -f 7435//21 7421//21 7423//21 -f 7411//21 7436//21 7408//21 -f 7408//21 7436//21 7437//21 -f 7408//21 7437//21 7413//21 -f 7413//21 7437//21 7438//21 -f 7413//21 7438//21 7426//21 -f 7426//21 7438//21 7439//21 -f 7426//21 7439//21 7440//21 -f 7440//21 7441//21 7426//21 -f 7426//21 7441//21 7442//21 -f 7426//21 7442//21 7427//21 -f 7428//21 7443//21 7426//21 -f 7426//21 7443//21 7444//21 -f 7426//21 7444//21 7445//21 -f 7446//10989 7447//10989 7413//10989 -f 7413//10989 7447//10989 7409//10989 -f 7447//10990 7448//10990 7409//10990 -f 7409//10991 7448//10991 7449//10991 -f 7409//10992 7449//10992 7429//10992 -f 7449//10993 7450//10993 7429//10993 -f 7429//10994 7450//10994 7451//10994 -f 7429//10995 7451//10995 7430//10995 -f 7451//10996 7452//10996 7430//10996 -f 7430//10997 7452//10997 7453//10997 -f 7430//10998 7453//10999 7431//11000 -f 7431//11000 7453//10999 7454//11001 -f 7431//11002 7454//11002 7414//11002 -f 7454//11003 7455//11003 7414//11003 -f 7414//11004 7455//11004 7456//11004 -f 7414//11005 7456//11005 7415//11005 -f 7415//11006 7456//11006 7457//11006 -f 7415//11007 7457//11007 7416//11007 -f 7457//11008 7458//11008 7416//11008 -f 7416//11009 7458//11009 7459//11009 -f 7416//11010 7459//11011 7407//11012 -f 7459//11011 7460//11013 7407//11012 -f 7407//11014 7460//11014 7461//11014 -f 7407//11015 7461//11015 7408//11015 -f 7461//11016 7462//11016 7408//11016 -f 7408//11017 7462//11017 7463//11017 -f 7408//11018 7463//11019 7412//11020 -f 7463//11019 7464//11021 7412//11020 -f 7412//11022 7464//11022 7465//11022 -f 7412//11023 7465//11024 7417//11025 -f 7465//11024 7466//11026 7417//11025 -f 7417//11027 7466//11027 7467//11027 -f 7417//11028 7467//11028 7418//11028 -f 7467//11029 7468//11029 7418//11029 -f 7418//11030 7468//11030 7469//11030 -f 7418//11031 7469//11032 7419//11033 -f 7469//11032 7470//11034 7419//11033 -f 7419//11035 7470//11035 7471//11035 -f 7419//11036 7471//11036 7424//11036 -f 7471//11037 7472//11037 7424//11037 -f 7424//11038 7472//11038 7473//11038 -f 7424//11039 7473//11039 7425//11039 -f 7473//11040 7474//11040 7425//11040 -f 7425//11041 7474//11042 7475//11043 -f 7425//11041 7475//11043 7420//11044 -f 7476//11045 7423//11045 7477//11045 -f 7477//11046 7423//11046 7422//11046 -f 7477//11047 7422//11047 7478//11047 -f 7478//11048 7422//11049 7420//11050 -f 7478//11048 7420//11050 7479//11051 -f 7479//11052 7420//11044 7475//11043 -f 7476//11053 7480//11053 7423//11053 -f 7423//11054 7480//11054 7435//11054 -f 7480//11055 7481//11055 7435//11055 -f 7435//11056 7481//11056 7482//11056 -f 7435//11057 7482//11057 7434//11057 -f 7482//11058 7483//11058 7434//11058 -f 7434//11059 7483//11059 7484//11059 -f 7434//11060 7484//11060 7432//11060 -f 7484//11061 7485//11061 7432//11061 -f 7432//11062 7485//11062 7486//11062 -f 7432//11063 7486//11064 7433//11065 -f 7486//11064 7487//11066 7433//11065 -f 7433//11067 7487//11067 7488//11067 -f 7433//11068 7488//11068 7421//11068 -f 7421//11069 7488//11069 7489//11069 -f 7421//11070 7489//11070 7410//11070 -f 7410//11070 7489//11070 7411//11070 -f 7411//11071 7489//11071 7490//11071 -f 7411//11072 7490//11072 7436//11073 -f 7490//11072 7491//11073 7436//11073 -f 7436//11073 7491//11073 7492//11073 -f 7436//11073 7492//11073 7437//11073 -f 7437//11074 7492//11074 7493//11074 -f 7437//11075 7493//11075 7438//11075 -f 7438//11076 7493//11076 7494//11076 -f 7438//11077 7494//11077 7439//11077 -f 7494//11078 7495//11078 7439//11078 -f 7439//11079 7495//11079 7496//11079 -f 7439//11080 7496//11080 7440//11080 -f 7440//11081 7496//11081 7497//11081 -f 7440//11082 7497//11082 7441//11082 -f 7441//11083 7497//11083 7498//11083 -f 7441//11084 7498//11084 7442//11084 -f 7498//11085 7499//11085 7442//11085 -f 7442//11086 7499//11086 7500//11086 -f 7442//11087 7500//11087 7427//11087 -f 7427//11088 7500//11088 7501//11088 -f 7427//11089 7501//11090 7428//11091 -f 7428//11091 7501//11090 7502//11092 -f 7428//11093 7502//11094 7443//11095 -f 7443//11095 7502//11094 7503//11096 -f 7443//11097 7503//11098 7444//11099 -f 7444//11099 7503//11098 7504//11100 -f 7444//11101 7504//11102 7445//11103 -f 7445//11103 7504//11102 7505//11104 -f 7445//11105 7505//11106 7426//11107 -f 7446//11108 7413//11108 7506//11108 -f 7506//11109 7413//11109 7426//11109 -f 7506//11110 7426//11110 7507//11110 -f 7507//11111 7426//11107 7505//11106 -f 7325//11112 7324//11112 7477//11112 -f 7477//11113 7324//11113 7322//11113 -f 7477//11114 7322//11114 7476//11114 -f 7476//11115 7322//11115 7320//11115 -f 7476//11116 7320//11116 7480//11116 -f 7480//11117 7320//11117 7318//11117 -f 7325//11118 7477//11118 7327//11118 -f 7327//11119 7477//11119 7478//11119 -f 7327//11120 7478//11120 7329//11120 -f 7329//11121 7478//11121 7479//11121 -f 7329//11122 7479//11122 7330//11122 -f 7330//11123 7479//11124 7475//11125 -f 7330//11123 7475//11125 7333//11126 -f 7333//11127 7475//11127 7474//11127 -f 7333//11128 7474//11128 7335//11128 -f 7335//11129 7474//11129 7337//11129 -f 7337//11130 7474//11130 7473//11130 -f 7337//11131 7473//11132 7338//11133 -f 7338//11133 7473//11132 7472//11134 -f 7338//11135 7472//11135 7340//11135 -f 7340//11136 7472//11136 7471//11136 -f 7340//11137 7471//11137 7342//11137 -f 7342//11138 7471//11139 7470//11140 -f 7342//11138 7470//11140 7344//11141 -f 7344//11142 7470//11143 7469//11144 -f 7344//11142 7469//11144 7345//11145 -f 7345//11146 7469//11147 7347//11148 -f 7347//11148 7469//11147 7468//11149 -f 7347//11150 7468//11151 7349//11150 -f 7353//11152 7351//11152 7466//11152 -f 7466//11153 7351//11154 7349//11155 -f 7466//11153 7349//11155 7467//11156 -f 7467//11151 7349//11150 7468//11151 -f 7353//11157 7466//11158 7354//11157 -f 7354//11157 7466//11158 7465//11158 -f 7354//11159 7465//11159 7356//11159 -f 7356//11160 7465//11161 7464//11162 -f 7356//11160 7464//11162 7357//11163 -f 7357//11164 7464//11164 7359//11164 -f 7359//11165 7464//11165 7463//11165 -f 7359//11166 7463//11166 7360//11166 -f 7360//11167 7463//11167 7462//11167 -f 7360//11168 7462//11168 7362//11168 -f 7362//11169 7462//11169 7363//11169 -f 7363//11170 7462//11170 7461//11170 -f 7363//11171 7461//11171 7368//11171 -f 7368//11172 7461//11172 7365//11172 -f 7365//11173 7461//11173 7460//11173 -f 7365//11174 7460//11174 7459//11174 -f 7458//11175 7370//11175 7459//11175 -f 7459//11176 7370//11176 7369//11176 -f 7459//11177 7369//11177 7365//11177 -f 7377//11178 7375//11178 7457//11178 -f 7457//11179 7375//11179 7374//11179 -f 7457//11180 7374//11181 7458//11182 -f 7458//11182 7374//11181 7372//11183 -f 7458//11184 7372//11184 7370//11184 -f 7457//11185 7456//11185 7377//11185 -f 7377//11186 7456//11186 7455//11186 -f 7377//11187 7455//11187 7378//11187 -f 7378//11188 7455//11188 7454//11188 -f 7453//11189 7382//11189 7454//11189 -f 7454//11190 7382//11190 7380//11190 -f 7454//11191 7380//11191 7378//11191 -f 7449//11192 7395//11193 7450//11194 -f 7450//11195 7395//11195 7389//11195 -f 7450//11196 7389//11196 7451//11196 -f 7451//11197 7389//11197 7387//11197 -f 7451//11198 7387//11198 7452//11198 -f 7452//11199 7387//11200 7385//11201 -f 7452//11199 7385//11201 7453//11202 -f 7453//11203 7385//11203 7384//11203 -f 7453//11204 7384//11204 7382//11204 -f 7446//11205 7508//11205 7186//11205 -f 7186//11205 7405//11205 7446//11205 -f 7446//11205 7405//11205 7398//11205 -f 7446//11205 7398//11205 7447//11205 -f 7447//11205 7398//11205 7400//11205 -f 7400//11205 7402//11205 7447//11205 -f 7447//11205 7402//11205 7403//11205 -f 7447//11206 7403//11206 7448//11206 -f 7448//11207 7403//11207 7392//11207 -f 7448//11208 7392//11208 7449//11208 -f 7449//11209 7392//11209 7394//11209 -f 7449//11192 7394//11210 7395//11193 -f 7509//11211 7510//11211 7511//11211 -f 7008//11212 7010//11212 7507//11212 -f 7512//11213 7513//11214 7514//11215 -f 7120//11216 7515//11217 7110//11218 -f 7110//11218 7515//11217 7101//11219 -f 7120//11220 7127//11221 7515//11222 -f 7515//11222 7127//11221 7128//11223 -f 7515//11222 7128//11223 7514//11224 -f 7514//11215 7128//11225 7135//11226 -f 7514//11215 7135//11226 7512//11213 -f 7008//11227 7507//11227 7006//11227 -f 7006//11228 7507//11228 7004//11228 -f 7004//11229 7507//11229 7505//11229 -f 7004//11230 7505//11230 7002//11230 -f 7002//11231 7505//11232 7504//11233 -f 7002//11231 7504//11233 7000//11234 -f 7000//11235 7504//11235 6997//11235 -f 6997//11236 7504//11237 7503//11238 -f 6997//11236 7503//11238 6995//11239 -f 6995//11240 7503//11240 6993//11240 -f 6993//11241 7503//11241 7502//11241 -f 6993//11242 7502//11242 6991//11242 -f 6991//11243 7502//11243 7501//11243 -f 6991//11244 7501//11244 6989//11244 -f 6989//11245 7501//11245 6987//11245 -f 6987//11246 7501//11246 7500//11246 -f 6987//11247 7500//11247 6985//11247 -f 6985//11248 7500//11248 7499//11248 -f 6985//11249 7499//11249 6983//11249 -f 6983//11250 7499//11250 7498//11250 -f 6983//11251 7498//11251 6981//11251 -f 6981//11252 7498//11253 7497//11254 -f 6981//11252 7497//11254 6979//11255 -f 6979//11256 7497//11256 6975//11256 -f 6975//11257 7497//11258 7496//11259 -f 6975//11257 7496//11259 6976//11260 -f 6976//11261 7496//11261 6973//11261 -f 6973//11262 7496//11263 7495//11264 -f 6973//11262 7495//11264 6971//11265 -f 7510//11266 7509//11266 7516//11266 -f 7516//11267 7509//11267 7166//11267 -f 7516//11268 7166//11269 7165//11270 -f 7165//11270 7169//11271 7516//11268 -f 7516//11272 7169//11273 7170//11274 -f 7516//11272 7170//11274 6885//11275 -f 6884//11276 6909//11276 7494//11276 -f 6909//11277 6920//11277 7494//11277 -f 7494//11278 6920//11278 6968//11278 -f 7494//11279 6968//11279 7495//11279 -f 7495//11280 6968//11281 6970//11282 -f 7495//11280 6970//11282 6971//11283 -f 7493//11284 7492//11284 7266//11284 -f 7490//11285 7290//11285 7491//11286 -f 7491//11286 7290//11285 7288//11285 -f 7491//11286 7288//11285 7492//11286 -f 7492//11286 7288//11285 7285//11285 -f 7492//11286 7285//11285 7266//11285 -f 7297//11287 7296//11287 7489//11287 -f 7489//11288 7296//11288 7294//11288 -f 7489//11289 7294//11289 7490//11289 -f 7490//11285 7294//11285 7292//11285 -f 7490//11285 7292//11285 7290//11285 -f 7297//11290 7489//11290 7299//11290 -f 7299//11291 7489//11291 7488//11291 -f 7299//11292 7488//11292 7300//11292 -f 7300//11293 7488//11293 7302//11293 -f 7302//11294 7488//11294 7487//11294 -f 7302//11295 7487//11295 7311//11295 -f 7308//11296 7310//11296 7485//11296 -f 7485//11297 7310//11297 7311//11297 -f 7485//11298 7311//11298 7486//11298 -f 7486//11299 7311//11299 7487//11299 -f 7484//11300 7304//11300 7485//11300 -f 7485//11301 7304//11301 7306//11301 -f 7485//11302 7306//11302 7308//11302 -f 7316//11303 7315//11303 7483//11303 -f 7483//11304 7315//11304 7313//11304 -f 7483//11305 7313//11305 7484//11305 -f 7484//11306 7313//11306 7312//11306 -f 7484//11307 7312//11307 7304//11307 -f 7480//11308 7318//11308 7481//11308 -f 7481//11309 7318//11309 7316//11309 -f 7481//11310 7316//11310 7482//11310 -f 7482//11311 7316//11311 7483//11311 -f 7010//11312 7101//11312 7507//11312 -f 7507//11313 7101//11219 7515//11217 -f 7507//11314 7515//11315 7506//11316 -f 7506//11316 7515//11315 7517//11317 -f 7506//11318 7517//11319 7446//11320 -f 7446//11320 7517//11319 7508//11321 -f 7266//11322 7518//11322 7493//11322 -f 7493//11323 7518//11323 7519//11323 -f 7493//11324 7519//11324 7494//11324 -f 7494//11325 7519//11325 7516//11325 -f 7494//11326 7516//11272 6884//11327 -f 6884//11327 7516//11272 6885//11275 -f 7122//10511 7520//11328 7123//10512 -f 7521//11329 7522//11329 7523//11329 -f 7521//11330 7523//11330 7524//11330 -f 7524//11331 7523//11332 7513//11333 -f 7524//11331 7513//11333 7525//11334 -f 7123//11335 7520//11335 7141//11335 -f 7141//11336 7520//11336 7526//11336 -f 7141//11337 7526//11337 7140//11337 -f 7525//11334 7135//11338 7524//11331 -f 7524//11339 7135//11339 7136//11339 -f 7524//11340 7136//11340 7527//11340 -f 7527//11341 7136//11341 7137//11341 -f 7527//11342 7137//11342 7528//11342 -f 7528//11343 7137//11343 7138//11343 -f 7528//11344 7138//11344 7529//11344 -f 7529//11345 7138//10556 7139//10558 -f 7529//11346 7139//11347 7530//11348 -f 7531//11349 7526//11350 7532//11350 -f 7532//11350 7526//11350 7520//11351 -f 7532//11352 7520//11353 7163//11354 -f 7163//11354 7520//11353 7122//11355 -f 7531//11356 7533//11356 7526//11357 -f 7526//11358 7533//11358 7530//11358 -f 7526//11359 7530//11359 7140//11359 -f 7140//11360 7530//11348 7139//11347 -f 7533//11361 7534//11361 7530//11361 -f 7530//11362 7534//11362 7535//11362 -f 7530//11363 7535//11363 7529//11363 -f 7529//11364 7535//11364 7536//11364 -f 7529//11365 7536//11366 7528//11365 -f 7528//11365 7536//11366 7537//11367 -f 7528//11368 7537//11369 7527//11369 -f 7527//11369 7537//11369 7538//11370 -f 7527//11371 7538//11372 7524//11372 -f 7524//11372 7538//11372 7539//11372 -f 7524//11373 7539//11373 7521//11373 -f 7540//11374 7541//11374 7538//11374 -f 7542//11375 7522//11375 7521//11375 -f 7543//11376 7544//11376 7545//11376 -f 7161//11377 7546//11378 7547//11379 -f 7547//11380 7546//11380 7543//11380 -f 7547//11381 7543//11381 7548//11381 -f 7532//11382 7163//11383 7549//11384 -f 7550//11385 7551//11386 7552//11387 -f 7551//11386 7550//11385 7553//11388 -f 7549//11384 7161//11389 7532//11382 -f 7532//11390 7161//11377 7547//11379 -f 7532//11391 7547//11391 7531//11391 -f 7531//11392 7547//11392 7548//11392 -f 7531//11356 7548//11393 7533//11356 -f 7533//11394 7548//11395 7554//11395 -f 7533//11396 7554//11396 7534//11396 -f 7534//11397 7554//11397 7535//11397 -f 7535//11398 7554//11399 7555//11400 -f 7535//11401 7555//11401 7536//11401 -f 7536//11402 7555//11402 7556//11402 -f 7536//11403 7556//11403 7537//11403 -f 7538//11404 7541//11404 7539//11404 -f 7539//11405 7541//11405 7550//11405 -f 7539//11406 7550//11406 7521//11406 -f 7521//11407 7550//11407 7552//11407 -f 7521//11408 7552//11408 7542//11408 -f 7543//11409 7545//11409 7548//11409 -f 7548//11410 7545//11410 7557//11410 -f 7548//11395 7557//11411 7554//11395 -f 7557//11412 7558//11412 7554//11412 -f 7554//11413 7558//11413 7559//11413 -f 7554//11399 7559//11414 7555//11400 -f 7555//11415 7559//11415 7560//11415 -f 7555//11416 7560//11416 7556//11416 -f 7556//11417 7560//11418 7561//11419 -f 7561//11420 7562//11421 7556//11422 -f 7556//11423 7562//11423 7540//11423 -f 7556//11424 7540//11424 7537//11424 -f 7537//11425 7540//11425 7538//11425 -f 7562//11426 7563//11426 7540//11426 -f 7540//11427 7563//11427 7564//11427 -f 7540//11428 7564//11428 7541//11428 -f 7541//11429 7564//11429 7565//11429 -f 7566//11430 7567//11430 7568//11430 -f 7568//11431 7567//11431 7553//11431 -f 7568//11432 7553//11433 7569//11434 -f 7569//11435 7553//11435 7550//11435 -f 7569//11436 7550//11436 7570//11436 -f 7570//11437 7550//11437 7541//11437 -f 7570//11438 7541//11438 7571//11438 -f 7571//11439 7541//11439 7565//11439 -f 7156//10630 7155//10629 7572//11440 -f 7573//11441 7574//11441 7575//11441 -f 7575//11442 7574//11442 7160//11442 -f 7574//11443 7544//11443 7160//11443 -f 7160//11444 7544//11444 7543//11444 -f 7160//11445 7543//11445 7159//11445 -f 7159//11446 7543//11447 7546//11448 -f 7159//11446 7546//11448 7142//11449 -f 7142//11450 7546//11450 7161//11450 -f 7158//10649 7576//11451 7160//10647 -f 7160//11452 7576//11452 7577//11452 -f 7160//11453 7577//11453 7575//11453 -f 7572//11454 7578//11454 7156//11454 -f 7156//11455 7578//11455 7579//11455 -f 7156//10633 7579//11456 7157//10634 -f 7157//11457 7579//11457 7580//11457 -f 7157//10638 7580//11458 7158//10636 -f 7158//11459 7580//11459 7581//11459 -f 7158//11460 7581//11460 7576//11460 -f 7582//11461 7583//11461 7151//11461 -f 7151//11462 7583//11463 7152//11464 -f 7583//11463 7584//11465 7152//11464 -f 7152//11466 7584//11466 7585//11466 -f 7152//10615 7585//11467 7153//10616 -f 7153//11468 7585//11468 7586//11468 -f 7153//10620 7586//11469 7154//10621 -f 7154//10621 7586//11469 7587//11470 -f 7154//10624 7587//11471 7155//10626 -f 7155//10626 7587//11471 7588//11472 -f 7155//11473 7588//11473 7572//11473 -f 7151//11474 7589//11475 7590//11476 -f 7590//11476 7589//11475 7591//11477 -f 7589//11475 7592//11478 7591//11477 -f 7591//11479 7592//11479 7593//11479 -f 7591//11477 7593//11480 7590//11476 -f 7590//11476 7593//11480 7594//11481 -f 7590//11476 7594//11481 7151//11482 -f 7151//11482 7594//11481 7595//11483 -f 7151//11484 7595//11484 7582//11484 -f 6846//11485 6845//11485 7144//11485 -f 7144//11486 6845//11486 6856//11486 -f 7144//11487 6856//11487 7150//11487 -f 7150//11488 6856//11488 6855//11488 -f 7150//11489 6855//11490 7151//11474 -f 7151//11474 6855//11490 7596//11491 -f 7151//11474 7596//11491 7589//11475 -f 7569//11492 7570//11492 7597//11492 -f 7571//11493 7565//11493 7598//11493 -f 7564//11494 7563//11494 7599//11494 -f 7579//11495 7578//11496 7600//11497 -f 7572//11498 7588//11498 7601//11498 -f 7566//11499 7568//11499 7602//11499 -f 7602//11500 7568//11500 7603//11500 -f 7602//11501 7603//11501 7604//11501 -f 7605//11502 7604//11502 7606//11502 -f 7606//11503 7607//11503 7605//11503 -f 7605//11504 7607//11504 7608//11504 -f 7605//11505 7608//11505 7609//11505 -f 7609//11506 7608//11506 7610//11506 -f 7609//11507 7610//11507 7611//11507 -f 7611//11508 7610//11509 7612//11510 -f 7611//11508 7612//11510 7613//11511 -f 7613//11512 7612//11513 7614//11514 -f 7613//11512 7614//11514 7615//11515 -f 7615//11516 7614//11516 7616//11516 -f 7615//11517 7616//11518 7617//11519 -f 7617//11519 7616//11518 7618//11520 -f 7618//11520 7616//11518 7619//11521 -f 7618//11522 7619//11522 7620//11522 -f 7620//11523 7619//11523 7621//11523 -f 7620//11524 7621//11525 7622//11526 -f 7623//11527 7624//11527 7621//11527 -f 7621//11528 7624//11528 7625//11528 -f 7621//11525 7625//11529 7622//11526 -f 7579//11530 7600//11531 7580//11532 -f 7580//11532 7600//11531 7626//11533 -f 7580//11534 7626//11535 7581//11536 -f 7581//11536 7626//11535 7627//11537 -f 7581//11538 7627//11538 7576//11538 -f 7576//11539 7627//11539 7628//11539 -f 7576//11540 7628//11540 7577//11540 -f 7544//11541 7574//11541 7545//11541 -f 7545//11542 7574//11542 7629//11542 -f 7630//11543 7631//11544 7632//11545 -f 7632//11546 7631//11546 7633//11546 -f 7634//11547 7635//11548 7636//11549 -f 7636//11550 7637//11550 7638//11551 -f 7638//11552 7637//11553 7639//11553 -f 7640//11554 7558//11554 7629//11554 -f 7629//11555 7558//11555 7557//11555 -f 7629//11556 7557//11556 7545//11556 -f 7574//11557 7573//11557 7629//11557 -f 7629//11558 7573//11558 7641//11558 -f 7629//11559 7641//11559 7640//11559 -f 7640//11560 7641//11560 7642//11560 -f 7640//11561 7642//11561 7643//11561 -f 7578//11496 7572//11562 7600//11497 -f 7600//11563 7572//11563 7601//11563 -f 7600//11564 7601//11564 7644//11564 -f 7644//11565 7601//11565 7645//11565 -f 7644//11566 7645//11566 7630//11566 -f 7562//11421 7561//11420 7643//11567 -f 7643//11568 7561//11419 7560//11418 -f 7643//11569 7560//11569 7640//11569 -f 7640//11570 7560//11570 7559//11570 -f 7640//11571 7559//11571 7558//11571 -f 7630//11572 7632//11572 7644//11572 -f 7644//11573 7632//11574 7646//11575 -f 7644//11576 7646//11576 7600//11576 -f 7600//11577 7646//11578 7647//11579 -f 7600//11577 7647//11579 7626//11580 -f 7626//11581 7647//11582 7648//11583 -f 7626//11581 7648//11583 7627//11584 -f 7627//11585 7648//11585 7649//11585 -f 7627//11586 7649//11586 7628//11586 -f 7628//11587 7649//11587 7650//11587 -f 7628//11588 7650//11588 7577//11588 -f 7563//11589 7562//11589 7599//11589 -f 7599//11590 7562//11590 7643//11590 -f 7599//11591 7643//11592 7651//11593 -f 7651//11594 7643//11594 7642//11594 -f 7651//11595 7642//11595 7652//11595 -f 7652//11596 7642//11596 7641//11596 -f 7652//11597 7641//11597 7653//11597 -f 7653//11598 7641//11598 7573//11598 -f 7654//11599 7655//11600 7656//11601 -f 7575//11602 7577//11602 7657//11602 -f 7657//11603 7577//11603 7650//11603 -f 7657//11604 7650//11604 7658//11604 -f 7658//11605 7650//11605 7649//11605 -f 7658//11606 7649//11606 7659//11606 -f 7659//11607 7649//11607 7648//11607 -f 7659//11608 7648//11608 7660//11608 -f 7660//11609 7648//11610 7647//11611 -f 7660//11609 7647//11611 7661//11612 -f 7661//11613 7647//11614 7646//11615 -f 7661//11613 7646//11615 7662//11616 -f 7662//11617 7646//11575 7632//11574 -f 7662//11618 7632//11619 7634//11620 -f 7634//11621 7632//11621 7633//11621 -f 7634//11622 7633//11623 7635//11624 -f 7565//11625 7564//11625 7598//11625 -f 7598//11626 7564//11626 7599//11626 -f 7598//11627 7599//11628 7656//11629 -f 7656//11630 7599//11591 7651//11593 -f 7656//11601 7651//11631 7654//11599 -f 7654//11632 7651//11632 7652//11632 -f 7654//11633 7652//11633 7663//11633 -f 7663//11634 7652//11634 7653//11634 -f 7664//11635 7665//11635 7655//11635 -f 7655//11636 7665//11636 7666//11636 -f 7655//11637 7666//11637 7656//11637 -f 7636//11638 7638//11638 7634//11638 -f 7634//11639 7638//11640 7667//11641 -f 7634//11620 7667//11642 7662//11618 -f 7662//11643 7667//11644 7668//11645 -f 7662//11643 7668//11645 7661//11646 -f 7661//11647 7668//11648 7669//11649 -f 7661//11647 7669//11649 7660//11650 -f 7660//11651 7669//11652 7670//11653 -f 7660//11651 7670//11653 7659//11654 -f 7570//11655 7571//11655 7597//11655 -f 7597//11656 7571//11656 7598//11656 -f 7597//11657 7598//11657 7671//11657 -f 7671//11658 7598//11627 7656//11629 -f 7671//11659 7656//11659 7672//11659 -f 7672//11660 7656//11660 7666//11660 -f 7673//11661 7674//11662 7675//11663 -f 7675//11664 7674//11664 7676//11664 -f 7675//11665 7676//11665 7677//11665 -f 7677//11666 7676//11667 7678//11668 -f 7677//11666 7678//11668 7679//11669 -f 7679//11670 7678//11670 7664//11670 -f 7573//11671 7575//11671 7653//11671 -f 7653//11672 7575//11672 7657//11672 -f 7653//11673 7657//11673 7663//11673 -f 7663//11674 7657//11674 7658//11674 -f 7663//11675 7658//11675 7654//11675 -f 7654//11676 7658//11676 7659//11676 -f 7654//11677 7659//11678 7655//11679 -f 7655//11679 7659//11678 7670//11680 -f 7655//11681 7670//11682 7664//11683 -f 7664//11683 7670//11682 7669//11684 -f 7664//11683 7669//11684 7679//11685 -f 7679//11686 7669//11687 7668//11688 -f 7679//11686 7668//11688 7677//11689 -f 7677//11690 7668//11691 7667//11692 -f 7677//11690 7667//11692 7675//11693 -f 7675//11694 7667//11641 7638//11640 -f 7675//11663 7638//11695 7673//11661 -f 7673//11696 7638//11696 7639//11696 -f 7673//11697 7639//11697 7680//11697 -f 7604//11698 7603//11698 7606//11698 -f 7606//11699 7603//11699 7681//11699 -f 7606//11700 7681//11700 7607//11700 -f 7607//11701 7681//11701 7682//11701 -f 7607//11702 7682//11702 7608//11702 -f 7608//11703 7682//11703 7683//11703 -f 7608//11704 7683//11704 7610//11704 -f 7610//11705 7683//11705 7684//11705 -f 7610//11706 7684//11706 7612//11706 -f 7612//11707 7684//11707 7685//11707 -f 7612//11708 7685//11708 7614//11708 -f 7614//11709 7685//11709 7686//11709 -f 7614//11710 7686//11711 7616//11712 -f 7680//11713 7623//11713 7673//11713 -f 7673//11714 7623//11714 7621//11714 -f 7673//11715 7621//11715 7674//11715 -f 7674//11716 7621//11717 7619//11718 -f 7674//11716 7619//11718 7676//11719 -f 7676//11720 7619//11721 7616//11722 -f 7676//11720 7616//11722 7678//11723 -f 7678//11724 7616//11712 7686//11711 -f 7678//11725 7686//11725 7664//11725 -f 7664//11726 7686//11726 7685//11726 -f 7664//11727 7685//11727 7665//11727 -f 7665//11728 7685//11728 7684//11728 -f 7665//11729 7684//11729 7666//11729 -f 7666//11730 7684//11730 7683//11730 -f 7666//11731 7683//11731 7672//11731 -f 7672//11732 7683//11732 7682//11732 -f 7672//11733 7682//11733 7671//11733 -f 7671//11734 7682//11734 7681//11734 -f 7671//11735 7681//11735 7597//11735 -f 7597//11736 7681//11736 7603//11736 -f 7597//11737 7603//11737 7569//11737 -f 7569//11434 7603//11738 7568//11432 -f 7687//11739 7688//11739 7689//11739 -f 7690//11740 7691//11740 7692//11740 -f 7587//11741 7586//11742 7693//11743 -f 7585//11744 7584//11745 7694//11746 -f 6855//11747 7695//11747 7596//11747 -f 7596//11748 7695//11748 7696//11748 -f 7596//11749 7696//11749 7589//11749 -f 7593//11750 7592//11750 7697//11750 -f 7594//11751 7593//11751 7698//11751 -f 7698//11752 7593//11752 7699//11752 -f 7698//11753 7699//11753 7700//11753 -f 7701//11754 7702//11755 7703//11756 -f 7703//11756 7702//11755 7704//11757 -f 7705//11758 7706//11759 7707//11760 -f 7705//11758 7707//11760 7708//11761 -f 7706//11759 7709//11762 7707//11760 -f 7707//11760 7709//11762 7710//11763 -f 7707//11760 7710//11763 7711//11764 -f 7687//11765 7689//11765 7712//11765 -f 7712//11766 7689//11766 7713//11766 -f 7712//11767 7713//11767 7714//11767 -f 7714//11768 7713//11768 7715//11768 -f 7714//11769 7715//11769 7716//11769 -f 7716//11770 7715//11770 7717//11770 -f 7716//11771 7717//11771 7718//11771 -f 7717//11772 7719//11772 7718//11772 -f 7718//11773 7719//11773 6844//11773 -f 7718//11774 6844//11774 6843//11774 -f 6861//11775 7720//11775 6859//11775 -f 6859//11776 7720//11776 7697//11776 -f 7592//11777 7589//11777 7697//11777 -f 7697//11778 7589//11778 7696//11778 -f 7697//11779 7696//11779 6859//11779 -f 6859//11780 7696//11780 7695//11780 -f 6859//11781 7695//11781 6857//11781 -f 6857//11782 7695//11782 6855//11782 -f 7721//11783 7645//11783 7722//11783 -f 7722//11784 7645//11784 7601//11784 -f 7722//11785 7601//11785 7588//11785 -f 7700//11786 7723//11786 7698//11786 -f 7698//11787 7723//11787 7724//11787 -f 7698//11788 7724//11788 7594//11788 -f 7594//11789 7724//11789 7595//11789 -f 7725//11790 7726//11790 7727//11790 -f 7727//11791 7726//11791 7728//11791 -f 7727//11792 7728//11792 7729//11792 -f 7700//11793 7730//11793 7723//11793 -f 7723//11794 7730//11794 7731//11794 -f 7723//11795 7731//11795 7724//11795 -f 7724//11796 7731//11796 7732//11796 -f 7724//11797 7732//11797 7595//11797 -f 7595//11798 7732//11798 7582//11798 -f 7593//11799 7697//11799 7699//11799 -f 7699//11800 7697//11800 7720//11800 -f 7699//11801 7720//11802 7700//11803 -f 7700//11803 7720//11802 6861//11804 -f 7700//11805 6861//11805 7730//11805 -f 7730//11806 6861//11806 6862//11806 -f 7730//11807 6862//11807 6864//11807 -f 7733//11808 7633//11623 7734//11809 -f 7734//11810 7633//11810 7631//11810 -f 7734//11811 7631//11811 7721//11811 -f 7721//11812 7631//11544 7630//11543 -f 7721//11813 7630//11813 7645//11813 -f 7584//11745 7583//11814 7694//11746 -f 7694//11815 7583//11815 7725//11815 -f 7694//11816 7725//11816 7735//11816 -f 7735//11817 7725//11817 7727//11817 -f 7735//11818 7727//11818 7736//11818 -f 7736//11819 7727//11819 7729//11819 -f 7736//11820 7729//11821 7737//11822 -f 7737//11822 7729//11821 7738//11823 -f 7737//11824 7738//11825 7739//11826 -f 7740//11827 7741//11827 7728//11827 -f 7728//11828 7741//11828 7742//11828 -f 7728//11829 7742//11829 7729//11829 -f 7729//11830 7742//11830 7743//11830 -f 7729//11831 7743//11831 7738//11831 -f 7583//11832 7582//11832 7725//11832 -f 7725//11833 7582//11833 7732//11833 -f 7725//11834 7732//11834 7726//11834 -f 7726//11835 7732//11835 7731//11835 -f 7726//11836 7731//11836 7728//11836 -f 7728//11837 7731//11837 7730//11837 -f 7728//11838 7730//11838 7740//11838 -f 7740//11839 7730//11839 6864//11839 -f 7740//11840 6864//11840 6866//11840 -f 7744//11841 7636//11841 7733//11841 -f 7733//11842 7636//11549 7635//11548 -f 7733//11808 7635//11624 7633//11623 -f 7745//11843 7739//11843 7746//11843 -f 7746//11844 7739//11826 7738//11825 -f 7746//11844 7738//11825 7747//11845 -f 7747//11845 7738//11825 7743//11846 -f 7747//11845 7743//11846 7748//11847 -f 7748//11847 7743//11846 7742//11848 -f 7748//11849 7742//11850 7749//11851 -f 7749//11851 7742//11850 7741//11852 -f 7749//11853 7741//11854 7750//11855 -f 7750//11855 7741//11854 7740//11856 -f 7751//11857 7639//11857 7744//11857 -f 7744//11858 7639//11553 7637//11553 -f 7744//11859 7637//11550 7636//11550 -f 7707//11860 7745//11860 7752//11860 -f 7752//11861 7745//11861 7746//11861 -f 7752//11862 7746//11862 7753//11862 -f 7753//11863 7746//11863 7747//11863 -f 7753//11864 7747//11864 7754//11864 -f 7754//11865 7747//11865 7748//11865 -f 7754//11866 7748//11866 7755//11866 -f 7755//11867 7748//11867 7749//11867 -f 7755//11868 7749//11868 7756//11868 -f 7756//11869 7749//11869 7750//11869 -f 6866//9920 6867//9922 7740//11870 -f 7740//11871 6867//11871 6869//11871 -f 7740//11872 6869//11872 7750//11872 -f 7750//11873 6869//11873 6870//11873 -f 7750//11874 6870//11874 7756//11874 -f 7756//11875 6870//11875 6872//11875 -f 7756//11876 6872//11876 7757//11876 -f 7757//11877 6872//11877 6873//11877 -f 7691//11878 7624//11878 7692//11878 -f 7692//11879 7624//11879 7623//11879 -f 7692//11880 7623//11880 7751//11880 -f 7751//11881 7623//11881 7680//11881 -f 7751//11882 7680//11882 7639//11882 -f 7588//11883 7587//11883 7722//11883 -f 7722//11884 7587//11741 7693//11743 -f 7722//11885 7693//11885 7721//11885 -f 7721//11886 7693//11886 7758//11886 -f 7721//11887 7758//11887 7734//11887 -f 7734//11888 7758//11888 7759//11888 -f 7734//11889 7759//11890 7733//11891 -f 7733//11891 7759//11890 7760//11892 -f 7733//11893 7760//11894 7744//11895 -f 7744//11895 7760//11894 7761//11896 -f 7744//11897 7761//11898 7751//11899 -f 7751//11899 7761//11898 7762//11900 -f 7751//11901 7762//11902 7692//11903 -f 7692//11903 7762//11902 7703//11904 -f 7692//11905 7703//11905 7690//11905 -f 7690//11906 7703//11906 7704//11906 -f 7586//11907 7585//11907 7693//11907 -f 7693//11908 7585//11908 7694//11908 -f 7693//11909 7694//11909 7758//11909 -f 7758//11910 7694//11910 7735//11910 -f 7758//11911 7735//11911 7759//11911 -f 7759//11912 7735//11912 7736//11912 -f 7759//11913 7736//11914 7760//11915 -f 7760//11915 7736//11914 7737//11916 -f 7760//11917 7737//11918 7761//11919 -f 7761//11919 7737//11918 7739//11920 -f 7761//11921 7739//11922 7762//11923 -f 7762//11923 7739//11922 7745//11924 -f 7762//11925 7745//11926 7703//11927 -f 7703//11927 7745//11926 7707//11928 -f 7703//11929 7707//11929 7701//11929 -f 7701//11930 7707//11760 7711//11764 -f 6873//11931 6844//11932 7757//11933 -f 7757//11933 6844//11932 7719//11934 -f 7757//11935 7719//11935 7756//11935 -f 7756//11936 7719//11936 7717//11936 -f 7756//11937 7717//11937 7755//11937 -f 7755//11938 7717//11938 7715//11938 -f 7755//11939 7715//11939 7754//11939 -f 7754//11940 7715//11940 7713//11940 -f 7754//11941 7713//11941 7753//11941 -f 7753//11942 7713//11942 7689//11942 -f 7753//11943 7689//11943 7752//11943 -f 7752//11944 7689//11944 7688//11944 -f 7752//11945 7688//11945 7707//11945 -f 7707//11946 7688//11946 7687//11946 -f 7707//11947 7687//11947 7708//11947 -f 7247//11948 7245//11948 7618//11948 -f 7260//11949 7625//11950 7262//11951 -f 7262//11952 7625//11953 7624//11954 -f 7262//11952 7624//11954 7264//11955 -f 7264//11956 7624//11957 7265//11958 -f 7265//11958 7624//11957 7691//11959 -f 7265//11960 7691//11961 7212//11962 -f 7247//11963 7618//11963 7259//11963 -f 7259//11964 7618//11964 7620//11964 -f 7259//11965 7620//11966 7260//11967 -f 7260//11967 7620//11966 7622//11968 -f 7260//11949 7622//11969 7625//11950 -f 7566//11970 7602//11971 7250//11972 -f 7250//11972 7602//11971 7604//11973 -f 7250//11974 7604//11974 7605//11974 -f 7605//11975 7609//11975 7250//11975 -f 7250//11976 7609//11976 7611//11976 -f 7250//11977 7611//11977 7252//11977 -f 7252//11978 7611//11978 7613//11978 -f 7252//11979 7613//11979 7253//11979 -f 7253//11980 7613//11980 7615//11980 -f 7253//11981 7615//11982 7245//11983 -f 7245//11983 7615//11982 7617//11984 -f 7245//11985 7617//11985 7618//11985 -f 7249//11986 7209//11987 7763//11988 -f 7763//11989 7209//11989 7243//11989 -f 7763//11990 7243//11990 7242//11990 -f 7242//11991 7240//11991 7763//11991 -f 7763//11992 7240//11993 7238//11994 -f 7763//11992 7238//11994 7236//11995 -f 7249//11986 7763//11988 7250//11996 -f 7250//11997 7763//11997 7567//11997 -f 7250//11972 7567//11998 7566//11970 -f 7236//11995 7234//11999 7763//11992 -f 7763//11992 7234//11999 7196//12000 -f 7763//11992 7196//12000 7567//12001 -f 7567//12001 7196//12000 7198//12002 -f 7567//12003 7198//12003 7553//12003 -f 7553//12004 7198//12004 7551//12004 -f 7513//12005 7523//12006 7514//12007 -f 7514//12007 7523//12006 7522//12008 -f 7514//12007 7522//12008 7542//12009 -f 7193//12010 7517//12010 7204//12010 -f 7204//12011 7517//12011 7515//12011 -f 7204//12012 7515//12012 7202//12012 -f 7202//12013 7515//12013 7514//12013 -f 7202//12014 7514//12014 7200//12014 -f 7200//12015 7514//12016 7542//12017 -f 7200//12015 7542//12017 7198//12018 -f 7198//12019 7542//12019 7552//12019 -f 7198//12020 7552//12020 7551//12020 -f 7188//12021 7508//12021 7190//12021 -f 7190//12022 7508//12023 7517//12024 -f 7190//12022 7517//12024 7192//12025 -f 7192//12026 7517//12026 7193//12026 -f 7711//12027 7229//12028 7701//12029 -f 7701//12029 7229//12028 7231//12030 -f 7701//12031 7231//12032 7702//12033 -f 7702//12033 7231//12032 7210//12034 -f 7702//12035 7210//12035 7704//12035 -f 7704//12036 7210//12037 7212//12038 -f 7704//12036 7212//12038 7690//12039 -f 7690//12040 7212//11962 7691//11961 -f 7711//12041 7710//12042 7229//12043 -f 7229//12043 7710//12042 7709//12044 -f 7229//12043 7709//12044 7706//12045 -f 7706//12045 7705//12046 7229//12043 -f 7229//12043 7705//12046 7708//12047 -f 7229//12048 7708//12048 7228//12048 -f 7228//12049 7708//12049 7687//12049 -f 7228//12050 7687//12050 7226//12050 -f 7226//12051 7687//12051 7712//12051 -f 7712//12052 7714//12052 7226//12052 -f 7226//12053 7714//12053 7716//12053 -f 7226//12054 7716//12054 7718//12054 -f 7718//12055 6843//12055 7226//12055 -f 7226//12056 6843//12057 6842//12058 -f 7226//12056 6842//12058 7218//12059 -f 7218//12060 6842//12060 7216//12060 -f 7257//12061 6842//12062 7284//12063 -f 7284//12064 6842//12064 6854//12064 -f 7284//12065 6854//12065 6853//12065 -f 7257//12061 7255//12066 6842//12062 -f 6842//12062 7255//12066 7254//12067 -f 6842//12062 7254//12067 7221//12068 -f 7221//12068 7223//12069 6842//12062 -f 6842//12070 7223//12070 7214//12070 -f 6842//12071 7214//12071 7216//12071 -f 6850//12072 6874//12073 7510//12074 -f 7510//12074 6874//12073 7764//12075 -f 7510//12074 7764//12075 7511//12076 -f 7518//12077 7270//12077 7519//12077 -f 7519//12078 7270//12078 7272//12078 -f 7519//12079 7272//12079 7273//12079 -f 6853//12080 6851//12080 7284//12080 -f 7284//12081 6851//12081 6850//12081 -f 7284//12082 6850//12083 7282//12084 -f 7282//12084 6850//12083 7510//12085 -f 7282//12086 7510//12086 7280//12086 -f 7280//12087 7510//12087 7516//12087 -f 7280//12088 7516//12089 7278//12090 -f 7278//12090 7516//12089 7519//12091 -f 7278//12092 7519//12092 7276//12092 -f 7276//12093 7519//12093 7273//12093 -f 7270//12094 7518//12095 7268//12095 -f 7268//12095 7518//12095 7266//12096 diff --git a/resources/meshes/dagoma_sigma.stl b/resources/meshes/dagoma_sigma.stl new file mode 100644 index 0000000000..d980da86a2 Binary files /dev/null and b/resources/meshes/dagoma_sigma.stl differ diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 6e36587b23..669fd1041e 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -17,6 +17,12 @@ UM.MainWindow { id: base + Item + { + id: mainWindow + anchors.fill: parent + } + // Cura application window title title: { diff --git a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml index 8dbe18ccff..c2ec1ed308 100644 --- a/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml +++ b/resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml @@ -107,7 +107,7 @@ UM.Dialog [ Cura.ComboBox { - visible: buttonState == DiscardOrKeepProfileChangesDialog.ButtonsType.DiscardOrKeep + visible: buttonState === DiscardOrKeepProfileChangesDialog.ButtonsType.DiscardOrKeep implicitHeight: UM.Theme.getSize("combobox").height implicitWidth: UM.Theme.getSize("combobox").width @@ -128,20 +128,22 @@ UM.Dialog onActivated: { - var code = model.get(index).code; + const code = model.get(index).code; UM.Preferences.setValue("cura/choice_on_profile_override", code); - if (code == "always_keep") { - keepButton.enabled = true; - discardButton.enabled = false; - } - else if (code == "always_discard") { - keepButton.enabled = false; - discardButton.enabled = true; - } - else { - keepButton.enabled = true; - discardButton.enabled = true; + switch (code) { + case "always_keep": + keepButton.enabled = true; + discardButton.enabled = false; + break; + case "always_discard": + keepButton.enabled = false; + discardButton.enabled = true; + break; + default: + keepButton.enabled = true; + discardButton.enabled = true; + break; } } } diff --git a/resources/qml/ExtruderIcon.qml b/resources/qml/ExtruderIcon.qml index c59521cdc3..3231d924ee 100644 --- a/resources/qml/ExtruderIcon.qml +++ b/resources/qml/ExtruderIcon.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2021 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.11 @@ -12,7 +12,7 @@ Item property color materialColor property alias textColor: extruderNumberText.color property bool extruderEnabled: true - property var iconSize: UM.Theme.getSize("extruder_icon").width + property int iconSize: UM.Theme.getSize("extruder_icon").width property string iconVariant: "medium" property alias font: extruderNumberText.font @@ -36,7 +36,6 @@ Item } UM.ColorImage { - id: mainIcon anchors.fill: parent width: iconSize height: iconSize @@ -48,12 +47,14 @@ Item UM.Label { id: extruderNumberText - anchors.centerIn: parent - text: index + 1 - font: UM.Theme.getFont("small_emphasis") width: contentWidth height: contentHeight + anchors.verticalCenter: parent.verticalCenter + anchors.left: parent.left + anchors.right: parent.right horizontalAlignment: Text.AlignHCenter + text: (index + 1).toString() + font: UM.Theme.getFont("small_emphasis") } } } diff --git a/resources/qml/Menus/MaterialBrandMenu.qml b/resources/qml/Menus/MaterialBrandMenu.qml index e256e75904..deb1021cf5 100644 --- a/resources/qml/Menus/MaterialBrandMenu.qml +++ b/resources/qml/Menus/MaterialBrandMenu.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2022 Ultimaker B.V. +// Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.7 @@ -14,6 +14,7 @@ Instead we'll use a pop-up which doesn't seem to have that problem. */ Cura.MenuItem { id: materialBrandMenu + height: UM.Theme.getSize("menu").height + UM.Theme.getSize("narrow_margin").height overrideShowArrow: true property var materialTypesModel @@ -36,6 +37,7 @@ Cura.MenuItem UM.Label { + id: brandLabelText text: replaceText(materialBrandMenu.text) Layout.fillWidth: true Layout.fillHeight:true @@ -84,33 +86,15 @@ Cura.MenuItem onTriggered: menuPopup.close() } - Popup + MaterialBrandSubMenu { id: menuPopup - width: materialTypesList.width + padding * 2 - height: materialTypesList.height + padding * 2 - property var flipped: false - - x: parent.width - UM.Theme.getSize("default_lining").width - y: { - // Checks if popup is more than halfway down the screen AND further than 400 down (this avoids popup going off the top of screen) - // If it is then the popup will push up instead of down - // This fixes the popups appearing bellow the bottom of the screen. - - if (materialBrandMenu.parent.height / 2 < parent.y && parent.y > 400) { - flipped = true - return -UM.Theme.getSize("default_lining").width - height + UM.Theme.getSize("menu").height - } - flipped = false - return -UM.Theme.getSize("default_lining").width - } - - padding: background.border.width // Nasty hack to ensure that we can keep track if the popup contains the mouse. // Since we also want a hover for the sub items (and these events are sent async) // We have to keep a count of itemHovered (instead of just a bool) property int itemHovered: 0 + MouseArea { id: submenuArea @@ -120,16 +104,11 @@ Cura.MenuItem onEntered: hideTimer.restartTimer() } - background: Rectangle - { - color: UM.Theme.getColor("main_background") - border.color: UM.Theme.getColor("lining") - border.width: UM.Theme.getSize("default_lining").width - } - Column { id: materialTypesList + width: UM.Theme.getSize("menu").width + height: childrenRect.height spacing: 0 property var brandMaterials: materialTypesModel.material_types @@ -146,9 +125,7 @@ Cura.MenuItem height: UM.Theme.getSize("menu").height width: UM.Theme.getSize("menu").width - color: materialTypeButton.containsMouse ? UM.Theme.getColor("background_2") : UM.Theme.getColor("background_1") - - property var isFlipped: menuPopup.flipped + color: materialTypeButton.containsMouse ? UM.Theme.getColor("background_2") : "transparent" RowLayout { @@ -185,7 +162,7 @@ Cura.MenuItem source: UM.Theme.getIcon("ChevronSingleRight") } - Item + Item { // Right side margin width: UM.Theme.getSize("default_margin").width @@ -236,34 +213,19 @@ Cura.MenuItem onTriggered: colorPopup.close() } - Popup + MaterialBrandSubMenu { id: colorPopup - width: materialColorsList.width + padding * 2 - height: materialColorsList.height + padding * 2 - x: parent.width - y: { - // If flipped the popup should push up rather than down from the parent - if (brandMaterialBase.isFlipped) { - return -height + UM.Theme.getSize("menu").height + UM.Theme.getSize("default_lining").width - } - return -UM.Theme.getSize("default_lining").width - } + implicitX: parent.width property int itemHovered: 0 - padding: background.border.width - - background: Rectangle - { - color: UM.Theme.getColor("main_background") - border.color: UM.Theme.getColor("lining") - border.width: UM.Theme.getSize("default_lining").width - } Column { id: materialColorsList property var brandColors: model.colors + width: UM.Theme.getSize("menu").width + height: childrenRect.height spacing: 0 Repeater @@ -273,12 +235,38 @@ Cura.MenuItem delegate: Rectangle { height: UM.Theme.getSize("menu").height - width: UM.Theme.getSize("menu").width + width: parent.width - color: materialColorButton.containsMouse ? UM.Theme.getColor("background_2") : UM.Theme.getColor("background_1") + color: materialColorButton.containsMouse ? UM.Theme.getColor("background_2") : UM.Theme.getColor("main_background") + + MouseArea + { + id: materialColorButton + anchors.fill: parent + hoverEnabled: true + onClicked: + { + Cura.MachineManager.setMaterial(extruderIndex, model.container_node); + menuPopup.close(); + colorPopup.close(); + materialMenu.close(); + } + onEntered: + { + menuPopup.itemHovered += 1; + colorPopup.itemHovered += 1; + } + onExited: + { + menuPopup.itemHovered -= 1; + colorPopup.itemHovered -= 1; + } + } Item { + height: parent.height + width: parent.width opacity: materialBrandMenu.enabled ? 1 : 0.5 anchors.fill: parent @@ -309,31 +297,6 @@ Cura.MenuItem wrapMode: Text.NoWrap } } - - MouseArea - { - id: materialColorButton - anchors.fill: parent - - hoverEnabled: true - onClicked: - { - Cura.MachineManager.setMaterial(extruderIndex, model.container_node); - menuPopup.close(); - colorPopup.close(); - materialMenu.close(); - } - onEntered: - { - menuPopup.itemHovered += 1; - colorPopup.itemHovered += 1; - } - onExited: - { - menuPopup.itemHovered -= 1; - colorPopup.itemHovered -= 1; - } - } } } } diff --git a/resources/qml/Menus/MaterialBrandSubMenu.qml b/resources/qml/Menus/MaterialBrandSubMenu.qml new file mode 100644 index 0000000000..318afd9c60 --- /dev/null +++ b/resources/qml/Menus/MaterialBrandSubMenu.qml @@ -0,0 +1,124 @@ +// Copyright (c) 2022 UltiMaker +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.7 +import QtQuick.Controls 2.4 +import QtQuick.Layouts 2.7 + +import UM 1.5 as UM +import Cura 1.7 as Cura + +Popup +{ + id: materialBrandSubMenu + + // There is a bug where hovering the bottom half of the last element causes the popup to close. + // Undo this commit if you find a fix. + bottomPadding: -UM.Theme.getSize("thin_margin").height + topPadding: UM.Theme.getSize("thin_margin").height + + implicitWidth: scrollViewContent.width + scrollbar.width + leftPadding + rightPadding + implicitHeight: scrollViewContent.height + bottomPadding + topPadding + (2 * UM.Theme.getSize("thin_margin").height) + + // offset position relative to the parent + property int implicitX: parent.width - UM.Theme.getSize("default_lining").width + property int implicitY: -UM.Theme.getSize("thin_margin").height + + default property alias contents: scrollViewContent.children + + x: implicitX + y: implicitY + + // needed for the `mapToItem` function to work; apparently a Popup is not an Item + Item + { + id: materialBrandSubMenuItem + anchors.fill: parent + } + + onOpened: + { + // we want to make sure here that the popup never goes out side the window so we adjust the x and y position + // based on the width/height of the mainWindow/popup. QML is a bit weird here though, as the globalPosition + // is in absolute coordinates relative to the origin of the mainWindow while setting the x and y coordinates + // of the popup only changes the position relative to the parent. + + // reset position, the remainder of the function asumes this position and size + materialBrandSubMenu.x = implicitX; + materialBrandSubMenu.y = implicitY; + materialBrandSubMenu.width = implicitWidth; + materialBrandSubMenu.height = implicitHeight; + + const globalPosition = materialBrandSubMenuItem.mapToItem(null, 0, 0); + + if (globalPosition.y > mainWindow.height - materialBrandSubMenu.height) + { + if (mainWindow.height > materialBrandSubMenu.height) + { + const targetY = mainWindow.height - materialBrandSubMenu.height; + const deltaY = globalPosition.y - targetY; + materialBrandSubMenu.y = implicitY - deltaY; + } + else + { + // if popup is taller then the the component, limit + // the components height and set the position to + // y = 0 (in absolute coordinates) + materialBrandSubMenu.y = implicitY - globalPosition.y; + materialBrandSubMenu.height = mainWindow.height; + } + } + + // Changing the height causes implicitWidth to change because of the scrollbar appearing/disappearing + // Reassign it here to update the value + materialBrandSubMenu.width = implicitWidth; + + if (globalPosition.x > mainWindow.width - materialBrandSubMenu.width) + { + if (mainWindow.width > materialBrandSubMenu.width) + { + const targetX = mainWindow.width - materialBrandSubMenu.width; + const deltaX = globalPosition.x - targetX; + materialBrandSubMenu.x = implicitX - deltaX; + } + else + { + materialBrandSubMenu.x = implicitX - globalPosition.x; + materialBrandSubMenu.width = mainWindow.width; + } + } + } + + padding: background.border.width + + background: Rectangle + { + color: UM.Theme.getColor("main_background") + border.color: UM.Theme.getColor("lining") + border.width: UM.Theme.getSize("default_lining").width + } + + ScrollView + { + id: scrollView + anchors.fill: parent + contentHeight: scrollViewContent.height + clip: true + + ScrollBar.vertical: UM.ScrollBar + { + id: scrollbar + anchors.right: parent.right + anchors.top: parent.top + anchors.bottom: parent.bottom + } + + Rectangle + { + id: scrollViewContent + width: childrenRect.width + height: childrenRect.height + color: UM.Theme.getColor("main_background") + } + } +} \ No newline at end of file diff --git a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml index 9d3da51356..05407e6e0e 100644 --- a/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml +++ b/resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml @@ -67,6 +67,11 @@ Item top: parent.top } visible: currentModeIndex == PrintSetupSelectorContents.Mode.Recommended + height: { + const height = base.height - (customPrintSetup.mapToItem(null, 0, 0).y + buttonRow.height + UM.Theme.getSize("default_margin").height); + const maxHeight = UM.Preferences.getValue("view/settings_list_height"); + return Math.min(implicitHeight, height, maxHeight); + } function onModeChanged() { diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml index f78ae38dce..80e171bed4 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml @@ -2,34 +2,41 @@ //Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 +import QtQuick.Controls 2.15 import QtQuick.Layouts 1.1 import UM 1.6 as UM import Cura 1.6 as Cura import ".." -Item +ScrollView { id: recommendedPrintSetup - height: childrenRect.height + 2 * padding + implicitHeight: settingsColumn.height + 2 * padding property bool settingsEnabled: Cura.ExtruderManager.activeExtruderStackId || extrudersEnabledCount.properties.value == 1 - property real padding: UM.Theme.getSize("default_margin").width + + padding: UM.Theme.getSize("default_margin").width function onModeChanged() {} - Column - { - spacing: UM.Theme.getSize("default_margin").height - + ScrollBar.vertical: UM.ScrollBar { + id: scroll anchors { - left: parent.left - right: parent.right top: parent.top - margins: parent.padding + right: parent.right + bottom: parent.bottom } + } + + Column + { + id: settingsColumn + spacing: UM.Theme.getSize("default_margin").height + + width: recommendedPrintSetup.width - 2 * recommendedPrintSetup.padding - (scroll.visible ? scroll.width : 0) // TODO property real firstColumnWidth: Math.round(width / 3) diff --git a/resources/qml/Widgets/SingleSettingTextField.qml b/resources/qml/Widgets/SingleSettingTextField.qml index 5bff7fdb5a..12d24d285d 100644 --- a/resources/qml/Widgets/SingleSettingTextField.qml +++ b/resources/qml/Widgets/SingleSettingTextField.qml @@ -87,15 +87,17 @@ UM.TextField function parseValueUpdateSetting() { - if (propertyProvider.properties.value === text || (parseFloat(propertyProvider.properties.value) === parseFloat(text))) + // User convenience. We use dots for decimal values + const modified_text = text.replace(",", "."); + if (propertyProvider.properties.value === modified_text || (parseFloat(propertyProvider.properties.value) === parseFloat(modified_text))) { // Don't set the property value from the control. It already has the same value return } - if (propertyProvider && text !== propertyProvider.properties.value) + if (propertyProvider && modified_text !== propertyProvider.properties.value) { - updateSetting(text); + updateSetting(modified_text); } } @@ -138,7 +140,7 @@ UM.TextField color: UM.Theme.getColor("setting_validation_warning_background") } }, - State + State { name: "disabled" when: !control.enabled diff --git a/resources/quality/Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg index 16768fab87..c5e9635254 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/Leapfrog_Bolt_Pro_global_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard definition = leapfrog_bolt_pro +name = Standard +version = 4 [metadata] +global_quality = True +quality_type = standard setting_version = 20 type = quality -quality_type = standard weight = 0 -global_quality = True [values] layer_height = 0.15 + diff --git a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg index 6b700280b8..9816ccee74 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg @@ -1,100 +1,92 @@ [general] -version = 4 -name = Standard definition = leapfrog_bolt_pro +name = Standard +version = 4 [metadata] +material = leapfrog_abs_natural +quality_type = standard setting_version = 20 type = quality -quality_type = standard -weight = 0 -material = leapfrog_abs_natural variant = Brass 0.4 +weight = 0 [values] -layer_height_0 = 0.3 -line_width = 0.4 -initial_layer_line_width_factor = 120 - -wall_thickness = 0.8 -wall_0_wipe_dist = 0.2 -top_bottom_thickness = 0.8 -top_bottom_pattern = lines -optimize_wall_printing_order = True -z_seam_type = sharpest_corner -z_seam_corner = hide_seam -skin_outline_count = 1 - -infill_sparse_density = 20 -infill_pattern = grid -connect_infill_polygons = True -infill_overlap = 0 -infill_wipe_dist = 0 -infill_before_walls = True -min_infill_area = 0 - -retraction_enable = True -retract_at_layer_change = False -retraction_amount = 2 -retraction_speed = 25 -switch_extruder_retraction_amount = 15 -switch_extruder_retraction_speeds = 20 - -speed_print = 35 -speed_wall = 25 -speed_wall_0 = 25 -speed_wall_x = 35 -speed_topbottom = 25 -speed_travel = 200 -speed_layer_0 = 25 -speed_support = 40 -speed_travel_layer_0 = 45 -speed_slowdown_layers = 1 - -retraction_combing = all -travel_avoid_other_parts = True -travel_avoid_supports = True -retraction_hop_enabled = True -retraction_hop_only_when_collides = True -retraction_hop = 2 -retraction_hop_after_extruder_switch = True -retraction_hop_after_extruder_switch_height = 2 - -cool_fan_enabled = True -cool_fan_speed = 30 -cool_fan_speed_min = 0 -cool_fan_speed_max = 30 -cool_min_layer_time_fan_speed_max = 5 -cool_fan_speed_0 = 0 -cool_fan_full_at_height = 0.5 -cool_fan_full_layer = 3 -cool_min_layer_time = 5 -cool_min_speed = 10 - -support_interface_enable = False -support_angle = 50 -support_pattern = zigzag -support_connect_zigzags = False -support_infill_rate = 20 -support_z_distance = 0.3 -support_xy_distance = 0.7 -support_xy_distance_overhang = 0.4 -support_bottom_stair_step_height = 0.3 -support_bottom_stair_step_width = 5 -support_join_distance = 2 -support_tower_diameter = 3 -support_tower_roof_angle = 65 - adhesion_type = brim -brim_width = 8 brim_line_count = 14 brim_outside_only = True -skirt_brim_minimal_length = 250 - +brim_width = 8 +connect_infill_polygons = True +cool_fan_enabled = True +cool_fan_full_at_height = 0.5 +cool_fan_full_layer = 3 +cool_fan_speed = 30 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 30 +cool_fan_speed_min = 0 +cool_min_layer_time = 5 +cool_min_layer_time_fan_speed_max = 5 +cool_min_speed = 10 +infill_before_walls = True +infill_overlap = 0 +infill_pattern = grid +infill_sparse_density = 20 +infill_wipe_dist = 0 +initial_layer_line_width_factor = 120 +layer_height_0 = 0.3 +line_width = 0.4 +min_infill_area = 0 +optimize_wall_printing_order = True +prime_tower_brim_enable = True prime_tower_enable = True -prime_tower_size = 20 prime_tower_min_volume = 6 prime_tower_position_x = 169 prime_tower_position_y = 25 +prime_tower_size = 20 prime_tower_wipe_enabled = True -prime_tower_brim_enable = True +retract_at_layer_change = False +retraction_amount = 2 +retraction_combing = all +retraction_enable = True +retraction_hop = 2 +retraction_hop_after_extruder_switch = True +retraction_hop_after_extruder_switch_height = 2 +retraction_hop_enabled = True +retraction_hop_only_when_collides = True +retraction_speed = 25 +skin_outline_count = 1 +skirt_brim_minimal_length = 250 +speed_layer_0 = 25 +speed_print = 35 +speed_slowdown_layers = 1 +speed_support = 40 +speed_topbottom = 25 +speed_travel = 200 +speed_travel_layer_0 = 45 +speed_wall = 25 +speed_wall_0 = 25 +speed_wall_x = 35 +support_angle = 50 +support_bottom_stair_step_height = 0.3 +support_bottom_stair_step_width = 5 +support_connect_zigzags = False +support_infill_rate = 20 +support_interface_enable = False +support_join_distance = 2 +support_pattern = zigzag +support_tower_diameter = 3 +support_tower_roof_angle = 65 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.4 +support_z_distance = 0.3 +switch_extruder_retraction_amount = 15 +switch_extruder_retraction_speeds = 20 +top_bottom_pattern = lines +top_bottom_thickness = 0.8 +travel_avoid_other_parts = True +travel_avoid_supports = True +wall_0_wipe_dist = 0.2 +wall_thickness = 0.8 +z_seam_corner = hide_seam +z_seam_type = sharpest_corner + diff --git a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg index 472bfee50e..a37cfe7379 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg @@ -1,100 +1,92 @@ [general] -version = 4 -name = Standard definition = leapfrog_bolt_pro +name = Standard +version = 4 [metadata] +material = leapfrog_abs_natural +quality_type = standard setting_version = 20 type = quality -quality_type = standard -weight = 0 -material = leapfrog_abs_natural variant = NozzleX 0.4 +weight = 0 [values] -layer_height_0 = 0.3 -line_width = 0.4 -initial_layer_line_width_factor = 120 - -wall_thickness = 0.8 -wall_0_wipe_dist = 0.2 -top_bottom_thickness = 0.8 -top_bottom_pattern = lines -optimize_wall_printing_order = True -z_seam_type = sharpest_corner -z_seam_corner = hide_seam -skin_outline_count = 1 - -infill_sparse_density = 20 -infill_pattern = grid -connect_infill_polygons = True -infill_overlap = 0 -infill_wipe_dist = 0 -infill_before_walls = True -min_infill_area = 0 - -retraction_enable = True -retract_at_layer_change = False -retraction_amount = 2 -retraction_speed = 25 -switch_extruder_retraction_amount = 15 -switch_extruder_retraction_speeds = 20 - -speed_print = 35 -speed_wall = 25 -speed_wall_0 = 25 -speed_wall_x = 35 -speed_topbottom = 25 -speed_travel = 200 -speed_layer_0 = 25 -speed_support = 40 -speed_travel_layer_0 = 45 -speed_slowdown_layers = 1 - -retraction_combing = all -travel_avoid_other_parts = True -travel_avoid_supports = True -retraction_hop_enabled = True -retraction_hop_only_when_collides = True -retraction_hop = 2 -retraction_hop_after_extruder_switch = True -retraction_hop_after_extruder_switch_height = 2 - -cool_fan_enabled = True -cool_fan_speed = 30 -cool_fan_speed_min = 0 -cool_fan_speed_max = 30 -cool_min_layer_time_fan_speed_max = 5 -cool_fan_speed_0 = 0 -cool_fan_full_at_height = 0.5 -cool_fan_full_layer = 3 -cool_min_layer_time = 5 -cool_min_speed = 10 - -support_interface_enable = False -support_angle = 50 -support_pattern = zigzag -support_connect_zigzags = False -support_infill_rate = 20 -support_z_distance = 0.3 -support_xy_distance = 0.7 -support_xy_distance_overhang = 0.4 -support_bottom_stair_step_height = 0.3 -support_bottom_stair_step_width = 5 -support_join_distance = 2 -support_tower_diameter = 3 -support_tower_roof_angle = 65 - adhesion_type = brim -brim_width = 8 brim_line_count = 14 brim_outside_only = True -skirt_brim_minimal_length = 250 - +brim_width = 8 +connect_infill_polygons = True +cool_fan_enabled = True +cool_fan_full_at_height = 0.5 +cool_fan_full_layer = 3 +cool_fan_speed = 30 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 30 +cool_fan_speed_min = 0 +cool_min_layer_time = 5 +cool_min_layer_time_fan_speed_max = 5 +cool_min_speed = 10 +infill_before_walls = True +infill_overlap = 0 +infill_pattern = grid +infill_sparse_density = 20 +infill_wipe_dist = 0 +initial_layer_line_width_factor = 120 +layer_height_0 = 0.3 +line_width = 0.4 +min_infill_area = 0 +optimize_wall_printing_order = True +prime_tower_brim_enable = True prime_tower_enable = True -prime_tower_size = 20 prime_tower_min_volume = 6 prime_tower_position_x = 169 prime_tower_position_y = 25 +prime_tower_size = 20 prime_tower_wipe_enabled = True -prime_tower_brim_enable = True +retract_at_layer_change = False +retraction_amount = 2 +retraction_combing = all +retraction_enable = True +retraction_hop = 2 +retraction_hop_after_extruder_switch = True +retraction_hop_after_extruder_switch_height = 2 +retraction_hop_enabled = True +retraction_hop_only_when_collides = True +retraction_speed = 25 +skin_outline_count = 1 +skirt_brim_minimal_length = 250 +speed_layer_0 = 25 +speed_print = 35 +speed_slowdown_layers = 1 +speed_support = 40 +speed_topbottom = 25 +speed_travel = 200 +speed_travel_layer_0 = 45 +speed_wall = 25 +speed_wall_0 = 25 +speed_wall_x = 35 +support_angle = 50 +support_bottom_stair_step_height = 0.3 +support_bottom_stair_step_width = 5 +support_connect_zigzags = False +support_infill_rate = 20 +support_interface_enable = False +support_join_distance = 2 +support_pattern = zigzag +support_tower_diameter = 3 +support_tower_roof_angle = 65 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.4 +support_z_distance = 0.3 +switch_extruder_retraction_amount = 15 +switch_extruder_retraction_speeds = 20 +top_bottom_pattern = lines +top_bottom_thickness = 0.8 +travel_avoid_other_parts = True +travel_avoid_supports = True +wall_0_wipe_dist = 0.2 +wall_thickness = 0.8 +z_seam_corner = hide_seam +z_seam_type = sharpest_corner + diff --git a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_brass0.4_epla_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_brass0.4_epla_natural_standard.inst.cfg index f766a3e4eb..571f8b425b 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_brass0.4_epla_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_brass0.4_epla_natural_standard.inst.cfg @@ -1,100 +1,92 @@ [general] -version = 4 -name = Standard definition = leapfrog_bolt_pro +name = Standard +version = 4 [metadata] +material = leapfrog_epla_natural +quality_type = standard setting_version = 20 type = quality -quality_type = standard -weight = 0 -material = leapfrog_epla_natural variant = Brass 0.4 +weight = 0 [values] -layer_height_0 = 0.3 -line_width = 0.4 -initial_layer_line_width_factor = 120 - -wall_thickness = 0.8 -wall_0_wipe_dist = 0.2 -top_bottom_thickness = 0.8 -top_bottom_pattern = lines -optimize_wall_printing_order = True -z_seam_type = sharpest_corner -z_seam_corner = hide_seam -skin_outline_count = 1 - -infill_sparse_density = 20 -infill_pattern = grid -connect_infill_polygons = True -infill_overlap = 0 -infill_wipe_dist = 0 -infill_before_walls = True -min_infill_area = 0 - -retraction_enable = True -retract_at_layer_change = False -retraction_amount = 2 -retraction_speed = 25 -switch_extruder_retraction_amount = 15 -switch_extruder_retraction_speeds = 20 - -speed_print = 50 -speed_wall = 25 -speed_wall_0 = 25 -speed_wall_x = 40 -speed_topbottom = 25 -speed_travel = 200 -speed_layer_0 = 25 -speed_support = 50 -speed_travel_layer_0 = 45 -speed_slowdown_layers = 1 acceleration_enabled = False - -retraction_combing = all -travel_avoid_other_parts = True -travel_avoid_supports = True -retraction_hop_enabled = False -retraction_hop_only_when_collides = True -retraction_hop = 2 -retraction_hop_after_extruder_switch = True -retraction_hop_after_extruder_switch_height = 2 - +adhesion_type = skirt +connect_infill_polygons = True cool_fan_enabled = True -cool_fan_speed = 100 -cool_fan_speed_min = 100 -cool_fan_speed_max = 100 -cool_min_layer_time_fan_speed_max = 5 -cool_fan_speed_0 = 0 cool_fan_full_at_height = 0.5 cool_fan_full_layer = 4 +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 100 +cool_fan_speed_min = 100 cool_min_layer_time = 5 +cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 5 - -support_interface_enable = False -support_angle = 50 -support_pattern = zigzag -support_connect_zigzags = False -support_infill_rate = 20 -support_z_distance = 0.3 -support_xy_distance = 0.7 -support_xy_distance_overhang = 0.4 -support_bottom_stair_step_height = 0.3 -support_bottom_stair_step_width = 5 -support_join_distance = 2 -support_tower_diameter = 3 -support_tower_roof_angle = 65 - -adhesion_type = skirt -skirt_line_count = 3 -skirt_gap = 1 -skirt_brim_minimal_length = 250 - +infill_before_walls = True +infill_overlap = 0 +infill_pattern = grid +infill_sparse_density = 20 +infill_wipe_dist = 0 +initial_layer_line_width_factor = 120 +layer_height_0 = 0.3 +line_width = 0.4 +min_infill_area = 0 +optimize_wall_printing_order = True +prime_tower_brim_enable = True prime_tower_enable = True -prime_tower_size = 20 prime_tower_min_volume = 6 prime_tower_position_x = 169 prime_tower_position_y = 25 +prime_tower_size = 20 prime_tower_wipe_enabled = True -prime_tower_brim_enable = True +retract_at_layer_change = False +retraction_amount = 2 +retraction_combing = all +retraction_enable = True +retraction_hop = 2 +retraction_hop_after_extruder_switch = True +retraction_hop_after_extruder_switch_height = 2 +retraction_hop_enabled = False +retraction_hop_only_when_collides = True +retraction_speed = 25 +skin_outline_count = 1 +skirt_brim_minimal_length = 250 +skirt_gap = 1 +skirt_line_count = 3 +speed_layer_0 = 25 +speed_print = 50 +speed_slowdown_layers = 1 +speed_support = 50 +speed_topbottom = 25 +speed_travel = 200 +speed_travel_layer_0 = 45 +speed_wall = 25 +speed_wall_0 = 25 +speed_wall_x = 40 +support_angle = 50 +support_bottom_stair_step_height = 0.3 +support_bottom_stair_step_width = 5 +support_connect_zigzags = False +support_infill_rate = 20 +support_interface_enable = False +support_join_distance = 2 +support_pattern = zigzag +support_tower_diameter = 3 +support_tower_roof_angle = 65 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.4 +support_z_distance = 0.3 +switch_extruder_retraction_amount = 15 +switch_extruder_retraction_speeds = 20 +top_bottom_pattern = lines +top_bottom_thickness = 0.8 +travel_avoid_other_parts = True +travel_avoid_supports = True +wall_0_wipe_dist = 0.2 +wall_thickness = 0.8 +z_seam_corner = hide_seam +z_seam_type = sharpest_corner + diff --git a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_nozzlex0.4_epla_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_nozzlex0.4_epla_natural_standard.inst.cfg index 59c67e7ed7..234a6e861b 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_nozzlex0.4_epla_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_nozzlex0.4_epla_natural_standard.inst.cfg @@ -1,100 +1,92 @@ [general] -version = 4 -name = Standard definition = leapfrog_bolt_pro +name = Standard +version = 4 [metadata] +material = leapfrog_epla_natural +quality_type = standard setting_version = 20 type = quality -quality_type = standard -weight = 0 -material = leapfrog_epla_natural variant = NozzleX 0.4 +weight = 0 [values] -layer_height_0 = 0.3 -line_width = 0.4 -initial_layer_line_width_factor = 120 - -wall_thickness = 0.8 -wall_0_wipe_dist = 0.2 -top_bottom_thickness = 0.8 -top_bottom_pattern = lines -optimize_wall_printing_order = True -z_seam_type = sharpest_corner -z_seam_corner = hide_seam -skin_outline_count = 1 - -infill_sparse_density = 20 -infill_pattern = grid -connect_infill_polygons = True -infill_overlap = 0 -infill_wipe_dist = 0 -infill_before_walls = True -min_infill_area = 0 - -retraction_enable = True -retract_at_layer_change = False -retraction_amount = 2 -retraction_speed = 25 -switch_extruder_retraction_amount = 15 -switch_extruder_retraction_speeds = 20 - -speed_print = 50 -speed_wall = 25 -speed_wall_0 = 25 -speed_wall_x = 40 -speed_topbottom = 25 -speed_travel = 200 -speed_layer_0 = 25 -speed_support = 50 -speed_travel_layer_0 = 45 -speed_slowdown_layers = 1 acceleration_enabled = False - -retraction_combing = all -travel_avoid_other_parts = True -travel_avoid_supports = True -retraction_hop_enabled = False -retraction_hop_only_when_collides = True -retraction_hop = 2 -retraction_hop_after_extruder_switch = True -retraction_hop_after_extruder_switch_height = 2 - +adhesion_type = skirt +connect_infill_polygons = True cool_fan_enabled = True -cool_fan_speed = 100 -cool_fan_speed_min = 100 -cool_fan_speed_max = 100 -cool_min_layer_time_fan_speed_max = 5 -cool_fan_speed_0 = 0 cool_fan_full_at_height = 0.5 cool_fan_full_layer = 4 +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 100 +cool_fan_speed_min = 100 cool_min_layer_time = 5 +cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 5 - -support_interface_enable = False -support_angle = 50 -support_pattern = zigzag -support_connect_zigzags = False -support_infill_rate = 20 -support_z_distance = 0.3 -support_xy_distance = 0.7 -support_xy_distance_overhang = 0.4 -support_bottom_stair_step_height = 0.3 -support_bottom_stair_step_width = 5 -support_join_distance = 2 -support_tower_diameter = 3 -support_tower_roof_angle = 65 - -adhesion_type = skirt -skirt_line_count = 3 -skirt_gap = 1 -skirt_brim_minimal_length = 250 - +infill_before_walls = True +infill_overlap = 0 +infill_pattern = grid +infill_sparse_density = 20 +infill_wipe_dist = 0 +initial_layer_line_width_factor = 120 +layer_height_0 = 0.3 +line_width = 0.4 +min_infill_area = 0 +optimize_wall_printing_order = True +prime_tower_brim_enable = True prime_tower_enable = True -prime_tower_size = 20 prime_tower_min_volume = 6 prime_tower_position_x = 169 prime_tower_position_y = 25 +prime_tower_size = 20 prime_tower_wipe_enabled = True -prime_tower_brim_enable = True +retract_at_layer_change = False +retraction_amount = 2 +retraction_combing = all +retraction_enable = True +retraction_hop = 2 +retraction_hop_after_extruder_switch = True +retraction_hop_after_extruder_switch_height = 2 +retraction_hop_enabled = False +retraction_hop_only_when_collides = True +retraction_speed = 25 +skin_outline_count = 1 +skirt_brim_minimal_length = 250 +skirt_gap = 1 +skirt_line_count = 3 +speed_layer_0 = 25 +speed_print = 50 +speed_slowdown_layers = 1 +speed_support = 50 +speed_topbottom = 25 +speed_travel = 200 +speed_travel_layer_0 = 45 +speed_wall = 25 +speed_wall_0 = 25 +speed_wall_x = 40 +support_angle = 50 +support_bottom_stair_step_height = 0.3 +support_bottom_stair_step_width = 5 +support_connect_zigzags = False +support_infill_rate = 20 +support_interface_enable = False +support_join_distance = 2 +support_pattern = zigzag +support_tower_diameter = 3 +support_tower_roof_angle = 65 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.4 +support_z_distance = 0.3 +switch_extruder_retraction_amount = 15 +switch_extruder_retraction_speeds = 20 +top_bottom_pattern = lines +top_bottom_thickness = 0.8 +travel_avoid_other_parts = True +travel_avoid_supports = True +wall_0_wipe_dist = 0.2 +wall_thickness = 0.8 +z_seam_corner = hide_seam +z_seam_type = sharpest_corner + diff --git a/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_brass0.4_pva_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_brass0.4_pva_natural_standard.inst.cfg index d9c83b9991..a72f07c25a 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_brass0.4_pva_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_brass0.4_pva_natural_standard.inst.cfg @@ -1,97 +1,88 @@ [general] -version = 4 -name = Standard definition = leapfrog_bolt_pro +name = Standard +version = 4 [metadata] +material = leapfrog_pva_natural +quality_type = standard setting_version = 20 type = quality -quality_type = standard -weight = 0 -material = leapfrog_pva_natural variant = Brass 0.4 +weight = 0 [values] -layer_height_0 = 0.3 -line_width = 0.4 -initial_layer_line_width_factor = 120 - -wall_thickness = 0.8 -wall_0_wipe_dist = 0.2 -top_bottom_thickness = 0.8 -top_bottom_pattern = lines -optimize_wall_printing_order = True -z_seam_type = sharpest_corner -z_seam_corner = hide_seam -skin_outline_count = 1 - -infill_sparse_density = 20 -infill_pattern = grid +adhesion_type = skirt connect_infill_polygons = True -infill_overlap = 0 -infill_wipe_dist = 0 -infill_before_walls = True -min_infill_area = 0 - -retraction_enable = True -retract_at_layer_change = False -retraction_amount = 2 -retraction_speed = 25 -switch_extruder_retraction_amount = 15 -switch_extruder_retraction_speeds = 20 - -speed_print = 50 -speed_wall = 20 -speed_wall_0 = 20 -speed_wall_x = 20 -speed_topbottom = 25 -speed_travel = 200 -speed_layer_0 = 25 -speed_support = 40 -speed_travel_layer_0 = 45 -speed_slowdown_layers = 1 - -retraction_combing = all -travel_avoid_other_parts = True -travel_avoid_supports = True -retraction_hop_enabled = False - -retraction_hop_after_extruder_switch_height = 2 - cool_fan_enabled = True -cool_fan_speed = 100 -cool_fan_speed_min = 100 -cool_fan_speed_max = 100 -cool_min_layer_time_fan_speed_max = 5 -cool_fan_speed_0 = 0 cool_fan_full_at_height = 0.5 cool_fan_full_layer = 4 +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 100 +cool_fan_speed_min = 100 cool_min_layer_time = 5 +cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 5 - -support_interface_enable = False -support_angle = 50 -support_pattern = zigzag -support_connect_zigzags = False -support_infill_rate = 20 -support_z_distance = 0.3 -support_xy_distance = 0.7 -support_xy_distance_overhang = 0.4 -support_bottom_stair_step_height = 0.3 -support_bottom_stair_step_width = 5 -support_join_distance = 2 -support_tower_diameter = 3 -support_tower_roof_angle = 65 - -adhesion_type = skirt -skirt_line_count = 3 -skirt_gap = 1 -skirt_brim_minimal_length = 250 - +infill_before_walls = True +infill_overlap = 0 +infill_pattern = grid +infill_sparse_density = 20 +infill_wipe_dist = 0 +initial_layer_line_width_factor = 120 +layer_height_0 = 0.3 +line_width = 0.4 +min_infill_area = 0 +optimize_wall_printing_order = True +prime_tower_brim_enable = True prime_tower_enable = True -prime_tower_size = 20 prime_tower_min_volume = 6 prime_tower_position_x = 169 prime_tower_position_y = 25 +prime_tower_size = 20 prime_tower_wipe_enabled = True -prime_tower_brim_enable = True +retract_at_layer_change = False +retraction_amount = 2 +retraction_combing = all +retraction_enable = True +retraction_hop_after_extruder_switch_height = 2 +retraction_hop_enabled = False +retraction_speed = 25 +skin_outline_count = 1 +skirt_brim_minimal_length = 250 +skirt_gap = 1 +skirt_line_count = 3 +speed_layer_0 = 25 +speed_print = 50 +speed_slowdown_layers = 1 +speed_support = 40 +speed_topbottom = 25 +speed_travel = 200 +speed_travel_layer_0 = 45 +speed_wall = 20 +speed_wall_0 = 20 +speed_wall_x = 20 +support_angle = 50 +support_bottom_stair_step_height = 0.3 +support_bottom_stair_step_width = 5 +support_connect_zigzags = False +support_infill_rate = 20 +support_interface_enable = False +support_join_distance = 2 +support_pattern = zigzag +support_tower_diameter = 3 +support_tower_roof_angle = 65 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.4 +support_z_distance = 0.3 +switch_extruder_retraction_amount = 15 +switch_extruder_retraction_speeds = 20 +top_bottom_pattern = lines +top_bottom_thickness = 0.8 +travel_avoid_other_parts = True +travel_avoid_supports = True +wall_0_wipe_dist = 0.2 +wall_thickness = 0.8 +z_seam_corner = hide_seam +z_seam_type = sharpest_corner + diff --git a/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_nozzlex0.4_pva_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_nozzlex0.4_pva_natural_standard.inst.cfg index 0cb2c77719..4413cba742 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_nozzlex0.4_pva_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_nozzlex0.4_pva_natural_standard.inst.cfg @@ -1,97 +1,88 @@ [general] -version = 4 -name = Standard definition = leapfrog_bolt_pro +name = Standard +version = 4 [metadata] +material = leapfrog_pva_natural +quality_type = standard setting_version = 20 type = quality -quality_type = standard -weight = 0 -material = leapfrog_pva_natural variant = NozzleX 0.4 +weight = 0 [values] -layer_height_0 = 0.3 -line_width = 0.4 -initial_layer_line_width_factor = 120 - -wall_thickness = 0.8 -wall_0_wipe_dist = 0.2 -top_bottom_thickness = 0.8 -top_bottom_pattern = lines -optimize_wall_printing_order = True -z_seam_type = sharpest_corner -z_seam_corner = hide_seam -skin_outline_count = 1 - -infill_sparse_density = 20 -infill_pattern = grid +adhesion_type = skirt connect_infill_polygons = True -infill_overlap = 0 -infill_wipe_dist = 0 -infill_before_walls = True -min_infill_area = 0 - -retraction_enable = True -retract_at_layer_change = False -retraction_amount = 2 -retraction_speed = 25 -switch_extruder_retraction_amount = 15 -switch_extruder_retraction_speeds = 20 - -speed_print = 50 -speed_wall = 20 -speed_wall_0 = 20 -speed_wall_x = 20 -speed_topbottom = 25 -speed_travel = 200 -speed_layer_0 = 25 -speed_support = 40 -speed_travel_layer_0 = 45 -speed_slowdown_layers = 1 - -retraction_combing = all -travel_avoid_other_parts = True -travel_avoid_supports = True -retraction_hop_enabled = False - -retraction_hop_after_extruder_switch_height = 2 - cool_fan_enabled = True -cool_fan_speed = 100 -cool_fan_speed_min = 100 -cool_fan_speed_max = 100 -cool_min_layer_time_fan_speed_max = 5 -cool_fan_speed_0 = 0 cool_fan_full_at_height = 0.5 cool_fan_full_layer = 4 +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_fan_speed_max = 100 +cool_fan_speed_min = 100 cool_min_layer_time = 5 +cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 5 - -support_interface_enable = False -support_angle = 50 -support_pattern = zigzag -support_connect_zigzags = False -support_infill_rate = 20 -support_z_distance = 0.3 -support_xy_distance = 0.7 -support_xy_distance_overhang = 0.4 -support_bottom_stair_step_height = 0.3 -support_bottom_stair_step_width = 5 -support_join_distance = 2 -support_tower_diameter = 3 -support_tower_roof_angle = 65 - -adhesion_type = skirt -skirt_line_count = 3 -skirt_gap = 1 -skirt_brim_minimal_length = 250 - +infill_before_walls = True +infill_overlap = 0 +infill_pattern = grid +infill_sparse_density = 20 +infill_wipe_dist = 0 +initial_layer_line_width_factor = 120 +layer_height_0 = 0.3 +line_width = 0.4 +min_infill_area = 0 +optimize_wall_printing_order = True +prime_tower_brim_enable = True prime_tower_enable = True -prime_tower_size = 20 prime_tower_min_volume = 6 prime_tower_position_x = 169 prime_tower_position_y = 25 +prime_tower_size = 20 prime_tower_wipe_enabled = True -prime_tower_brim_enable = True +retract_at_layer_change = False +retraction_amount = 2 +retraction_combing = all +retraction_enable = True +retraction_hop_after_extruder_switch_height = 2 +retraction_hop_enabled = False +retraction_speed = 25 +skin_outline_count = 1 +skirt_brim_minimal_length = 250 +skirt_gap = 1 +skirt_line_count = 3 +speed_layer_0 = 25 +speed_print = 50 +speed_slowdown_layers = 1 +speed_support = 40 +speed_topbottom = 25 +speed_travel = 200 +speed_travel_layer_0 = 45 +speed_wall = 20 +speed_wall_0 = 20 +speed_wall_x = 20 +support_angle = 50 +support_bottom_stair_step_height = 0.3 +support_bottom_stair_step_width = 5 +support_connect_zigzags = False +support_infill_rate = 20 +support_interface_enable = False +support_join_distance = 2 +support_pattern = zigzag +support_tower_diameter = 3 +support_tower_roof_angle = 65 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.4 +support_z_distance = 0.3 +switch_extruder_retraction_amount = 15 +switch_extruder_retraction_speeds = 20 +top_bottom_pattern = lines +top_bottom_thickness = 0.8 +travel_avoid_other_parts = True +travel_avoid_supports = True +wall_0_wipe_dist = 0.2 +wall_thickness = 0.8 +z_seam_corner = hide_seam +z_seam_type = sharpest_corner + diff --git a/resources/quality/abax_pri3/apri3_pla_fast.inst.cfg b/resources/quality/abax_pri3/apri3_pla_fast.inst.cfg index 3e8e09032d..6dc297c0f0 100644 --- a/resources/quality/abax_pri3/apri3_pla_fast.inst.cfg +++ b/resources/quality/abax_pri3/apri3_pla_fast.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Fine definition = abax_pri3 +name = Fine +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = generic_pla [values] -wall_thickness = 1.05 -top_bottom_thickness = 0.8 -infill_sparse_density = 20 -speed_print = 80 -speed_layer_0 = =round(speed_print * 30 / 50) -speed_topbottom = =math.ceil(speed_print * 20 / 80) cool_min_layer_time = 5 cool_min_speed = 10 +infill_sparse_density = 20 +speed_layer_0 = =round(speed_print * 30 / 50) +speed_print = 80 +speed_topbottom = =math.ceil(speed_print * 20 / 80) +top_bottom_thickness = 0.8 +wall_thickness = 1.05 + diff --git a/resources/quality/abax_pri3/apri3_pla_high.inst.cfg b/resources/quality/abax_pri3/apri3_pla_high.inst.cfg index 808ec25a37..e05804f1d3 100644 --- a/resources/quality/abax_pri3/apri3_pla_high.inst.cfg +++ b/resources/quality/abax_pri3/apri3_pla_high.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Extra Fine definition = abax_pri3 +name = Extra Fine +version = 4 [metadata] +material = generic_pla +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -material = generic_pla [values] -wall_thickness = 1.05 -top_bottom_thickness = 0.8 -infill_sparse_density = 20 -speed_print = 50 -speed_layer_0 = =round(speed_print * 30 / 50) -speed_topbottom = =math.ceil(speed_print * 20 / 50) cool_min_layer_time = 5 cool_min_speed = 10 +infill_sparse_density = 20 +speed_layer_0 = =round(speed_print * 30 / 50) +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 20 / 50) +top_bottom_thickness = 0.8 +wall_thickness = 1.05 + diff --git a/resources/quality/abax_pri3/apri3_pla_normal.inst.cfg b/resources/quality/abax_pri3/apri3_pla_normal.inst.cfg index 526493b90b..36763f8d72 100644 --- a/resources/quality/abax_pri3/apri3_pla_normal.inst.cfg +++ b/resources/quality/abax_pri3/apri3_pla_normal.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Fine definition = abax_pri3 +name = Fine +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = generic_pla [values] -wall_thickness = 1.05 -top_bottom_thickness = 0.8 -infill_sparse_density = 20 -speed_print = 50 -speed_layer_0 = =round(speed_print * 30 / 50) -speed_topbottom = =math.ceil(speed_print * 20 / 50) cool_min_layer_time = 5 cool_min_speed = 10 +infill_sparse_density = 20 +speed_layer_0 = =round(speed_print * 30 / 50) +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 20 / 50) +top_bottom_thickness = 0.8 +wall_thickness = 1.05 + diff --git a/resources/quality/abax_pri5/apri5_pla_fast.inst.cfg b/resources/quality/abax_pri5/apri5_pla_fast.inst.cfg index f582449a8e..8d6803e29f 100644 --- a/resources/quality/abax_pri5/apri5_pla_fast.inst.cfg +++ b/resources/quality/abax_pri5/apri5_pla_fast.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Fine definition = abax_pri5 +name = Fine +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = generic_pla [values] -wall_thickness = 1.05 -top_bottom_thickness = 0.8 -infill_sparse_density = 20 -speed_print = 80 -speed_layer_0 = =round(speed_print * 30 / 50) -speed_topbottom = =math.ceil(speed_print * 20 / 80) cool_min_layer_time = 5 cool_min_speed = 10 +infill_sparse_density = 20 +speed_layer_0 = =round(speed_print * 30 / 50) +speed_print = 80 +speed_topbottom = =math.ceil(speed_print * 20 / 80) +top_bottom_thickness = 0.8 +wall_thickness = 1.05 + diff --git a/resources/quality/abax_pri5/apri5_pla_high.inst.cfg b/resources/quality/abax_pri5/apri5_pla_high.inst.cfg index 08d86375c9..a17e68eec1 100644 --- a/resources/quality/abax_pri5/apri5_pla_high.inst.cfg +++ b/resources/quality/abax_pri5/apri5_pla_high.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Extra Fine definition = abax_pri5 +name = Extra Fine +version = 4 [metadata] +material = generic_pla +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -material = generic_pla [values] -wall_thickness = 1.05 -top_bottom_thickness = 0.8 -infill_sparse_density = 20 -speed_print = 50 -speed_layer_0 = =round(speed_print * 30 / 50) -speed_topbottom = =math.ceil(speed_print * 20 / 50) cool_min_layer_time = 5 cool_min_speed = 10 +infill_sparse_density = 20 +speed_layer_0 = =round(speed_print * 30 / 50) +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 20 / 50) +top_bottom_thickness = 0.8 +wall_thickness = 1.05 + diff --git a/resources/quality/abax_pri5/apri5_pla_normal.inst.cfg b/resources/quality/abax_pri5/apri5_pla_normal.inst.cfg index 6bb5667a30..eebb1a88c9 100644 --- a/resources/quality/abax_pri5/apri5_pla_normal.inst.cfg +++ b/resources/quality/abax_pri5/apri5_pla_normal.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Fine definition = abax_pri5 +name = Fine +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = generic_pla [values] -wall_thickness = 1.05 -top_bottom_thickness = 0.8 -infill_sparse_density = 20 -speed_print = 50 -speed_layer_0 = =round(speed_print * 30 / 50) -speed_topbottom = =math.ceil(speed_print * 20 / 50) cool_min_layer_time = 5 cool_min_speed = 10 +infill_sparse_density = 20 +speed_layer_0 = =round(speed_print * 30 / 50) +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 20 / 50) +top_bottom_thickness = 0.8 +wall_thickness = 1.05 + diff --git a/resources/quality/abax_titan/atitan_pla_fast.inst.cfg b/resources/quality/abax_titan/atitan_pla_fast.inst.cfg index 901aeef930..9ae4fd2fca 100644 --- a/resources/quality/abax_titan/atitan_pla_fast.inst.cfg +++ b/resources/quality/abax_titan/atitan_pla_fast.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Fine definition = abax_titan +name = Fine +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = generic_pla [values] -layer_height = 0.2 -wall_thickness = 1.05 -top_bottom_thickness = 0.8 -infill_sparse_density = 20 -speed_print = 80 -speed_layer_0 = =round(speed_print * 30 / 50) -speed_topbottom = =math.ceil(speed_print * 20 / 80) cool_min_layer_time = 5 cool_min_speed = 10 +infill_sparse_density = 20 +layer_height = 0.2 +speed_layer_0 = =round(speed_print * 30 / 50) +speed_print = 80 +speed_topbottom = =math.ceil(speed_print * 20 / 80) +top_bottom_thickness = 0.8 +wall_thickness = 1.05 + diff --git a/resources/quality/abax_titan/atitan_pla_high.inst.cfg b/resources/quality/abax_titan/atitan_pla_high.inst.cfg index da6af89d27..f544fe5c29 100644 --- a/resources/quality/abax_titan/atitan_pla_high.inst.cfg +++ b/resources/quality/abax_titan/atitan_pla_high.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Extra Fine definition = abax_titan +name = Extra Fine +version = 4 [metadata] +material = generic_pla +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -material = generic_pla [values] -layer_height = 0.1 -wall_thickness = 1.05 -top_bottom_thickness = 0.8 -infill_sparse_density = 20 -speed_print = 50 -speed_layer_0 = =round(speed_print * 30 / 50) -speed_topbottom = =math.ceil(speed_print * 20 / 50) cool_min_layer_time = 5 cool_min_speed = 10 +infill_sparse_density = 20 +layer_height = 0.1 +speed_layer_0 = =round(speed_print * 30 / 50) +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 20 / 50) +top_bottom_thickness = 0.8 +wall_thickness = 1.05 + diff --git a/resources/quality/abax_titan/atitan_pla_normal.inst.cfg b/resources/quality/abax_titan/atitan_pla_normal.inst.cfg index 294610484e..1649772ab4 100644 --- a/resources/quality/abax_titan/atitan_pla_normal.inst.cfg +++ b/resources/quality/abax_titan/atitan_pla_normal.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Fine definition = abax_titan +name = Fine +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = generic_pla [values] -layer_height = 0.2 -wall_thickness = 1.05 -top_bottom_thickness = 0.8 -infill_sparse_density = 20 -speed_print = 50 -speed_layer_0 = =round(speed_print * 30 / 50) -speed_topbottom = =math.ceil(speed_print * 20 / 50) cool_min_layer_time = 5 cool_min_speed = 10 +infill_sparse_density = 20 +layer_height = 0.2 +speed_layer_0 = =round(speed_print * 30 / 50) +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 20 / 50) +top_bottom_thickness = 0.8 +wall_thickness = 1.05 + diff --git a/resources/quality/anycubic_4max/abs/anycubic_4max_abs_draft.inst.cfg b/resources/quality/anycubic_4max/abs/anycubic_4max_abs_draft.inst.cfg index fb24a6665b..e383a08d72 100644 --- a/resources/quality/anycubic_4max/abs/anycubic_4max_abs_draft.inst.cfg +++ b/resources/quality/anycubic_4max/abs/anycubic_4max_abs_draft.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Draft definition = anycubic_4max +name = Draft +version = 4 [metadata] +material = generic_abs +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -material = generic_abs [values] -cool_fan_enabled = False adhesion_type = brim +cool_fan_enabled = False + diff --git a/resources/quality/anycubic_4max/abs/anycubic_4max_abs_high.inst.cfg b/resources/quality/anycubic_4max/abs/anycubic_4max_abs_high.inst.cfg index 8492a10f5b..cef3a5beff 100644 --- a/resources/quality/anycubic_4max/abs/anycubic_4max_abs_high.inst.cfg +++ b/resources/quality/anycubic_4max/abs/anycubic_4max_abs_high.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = High definition = anycubic_4max +name = High +version = 4 [metadata] +material = generic_abs +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -material = generic_abs [values] -cool_fan_enabled = False adhesion_type = brim +cool_fan_enabled = False + diff --git a/resources/quality/anycubic_4max/abs/anycubic_4max_abs_normal.inst.cfg b/resources/quality/anycubic_4max/abs/anycubic_4max_abs_normal.inst.cfg index 411924ceb5..20899c36b8 100644 --- a/resources/quality/anycubic_4max/abs/anycubic_4max_abs_normal.inst.cfg +++ b/resources/quality/anycubic_4max/abs/anycubic_4max_abs_normal.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Normal definition = anycubic_4max +name = Normal +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = generic_abs [values] -cool_fan_enabled = False adhesion_type = brim +cool_fan_enabled = False diff --git a/resources/quality/anycubic_4max/anycubic_4max_draft.inst.cfg b/resources/quality/anycubic_4max/anycubic_4max_draft.inst.cfg index 482493039e..c447cb581b 100644 --- a/resources/quality/anycubic_4max/anycubic_4max_draft.inst.cfg +++ b/resources/quality/anycubic_4max/anycubic_4max_draft.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Draft definition = anycubic_4max +name = Draft +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] layer_height = 0.3 diff --git a/resources/quality/anycubic_4max/anycubic_4max_high.inst.cfg b/resources/quality/anycubic_4max/anycubic_4max_high.inst.cfg index 68b16cdc51..a635bbabbc 100644 --- a/resources/quality/anycubic_4max/anycubic_4max_high.inst.cfg +++ b/resources/quality/anycubic_4max/anycubic_4max_high.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = High definition = anycubic_4max +name = High +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -global_quality = True [values] layer_height = 0.15 diff --git a/resources/quality/anycubic_4max/anycubic_4max_normal.inst.cfg b/resources/quality/anycubic_4max/anycubic_4max_normal.inst.cfg index 04240b4f44..8f7a122eda 100644 --- a/resources/quality/anycubic_4max/anycubic_4max_normal.inst.cfg +++ b/resources/quality/anycubic_4max/anycubic_4max_normal.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Normal definition = anycubic_4max +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] layer_height = 0.2 + diff --git a/resources/quality/anycubic_4max/hips/anycubic_4max_hips_draft.inst.cfg b/resources/quality/anycubic_4max/hips/anycubic_4max_hips_draft.inst.cfg index c756d8df6b..e995631b79 100644 --- a/resources/quality/anycubic_4max/hips/anycubic_4max_hips_draft.inst.cfg +++ b/resources/quality/anycubic_4max/hips/anycubic_4max_hips_draft.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Draft definition = anycubic_4max +name = Draft +version = 4 [metadata] +material = generic_hips +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -material = generic_hips [values] diff --git a/resources/quality/anycubic_4max/hips/anycubic_4max_hips_high.inst.cfg b/resources/quality/anycubic_4max/hips/anycubic_4max_hips_high.inst.cfg index 8e9697099c..4b5670934b 100644 --- a/resources/quality/anycubic_4max/hips/anycubic_4max_hips_high.inst.cfg +++ b/resources/quality/anycubic_4max/hips/anycubic_4max_hips_high.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = High definition = anycubic_4max +name = High +version = 4 [metadata] +material = generic_hips +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -material = generic_hips [values] diff --git a/resources/quality/anycubic_4max/hips/anycubic_4max_hips_normal.inst.cfg b/resources/quality/anycubic_4max/hips/anycubic_4max_hips_normal.inst.cfg index 46e76a79bc..c69070b785 100644 --- a/resources/quality/anycubic_4max/hips/anycubic_4max_hips_normal.inst.cfg +++ b/resources/quality/anycubic_4max/hips/anycubic_4max_hips_normal.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Normal definition = anycubic_4max +name = Normal +version = 4 [metadata] +material = generic_hips +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = generic_hips [values] diff --git a/resources/quality/anycubic_4max/petg/anycubic_4max_petg_draft.inst.cfg b/resources/quality/anycubic_4max/petg/anycubic_4max_petg_draft.inst.cfg index ffb2a7a579..fb2084343f 100644 --- a/resources/quality/anycubic_4max/petg/anycubic_4max_petg_draft.inst.cfg +++ b/resources/quality/anycubic_4max/petg/anycubic_4max_petg_draft.inst.cfg @@ -1,17 +1,17 @@ [general] -version = 4 -name = Draft definition = anycubic_4max +name = Draft +version = 4 [metadata] +material = generic_petg +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -material = generic_petg [values] -material_print_temperature = =default_material_print_temperature + 35 cool_fan_enabled = False - +material_print_temperature = =default_material_print_temperature + 35 speed_print = 30 + diff --git a/resources/quality/anycubic_4max/petg/anycubic_4max_petg_high.inst.cfg b/resources/quality/anycubic_4max/petg/anycubic_4max_petg_high.inst.cfg index a2efa29188..70d3c384ae 100644 --- a/resources/quality/anycubic_4max/petg/anycubic_4max_petg_high.inst.cfg +++ b/resources/quality/anycubic_4max/petg/anycubic_4max_petg_high.inst.cfg @@ -1,17 +1,17 @@ [general] -version = 4 -name = High definition = anycubic_4max +name = High +version = 4 [metadata] +material = generic_petg +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -material = generic_petg [values] -material_print_temperature = =default_material_print_temperature + 35 cool_fan_enabled = False - +material_print_temperature = =default_material_print_temperature + 35 speed_print = 30 + diff --git a/resources/quality/anycubic_4max/petg/anycubic_4max_petg_normal.inst.cfg b/resources/quality/anycubic_4max/petg/anycubic_4max_petg_normal.inst.cfg index 6909ac0585..f9618aa6fe 100644 --- a/resources/quality/anycubic_4max/petg/anycubic_4max_petg_normal.inst.cfg +++ b/resources/quality/anycubic_4max/petg/anycubic_4max_petg_normal.inst.cfg @@ -1,17 +1,17 @@ [general] -version = 4 -name = Normal definition = anycubic_4max +name = Normal +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = generic_petg [values] -material_print_temperature = =default_material_print_temperature + 35 cool_fan_enabled = False - +material_print_temperature = =default_material_print_temperature + 35 speed_print = 30 + diff --git a/resources/quality/anycubic_4max/pla/anycubic_4max_pla_draft.inst.cfg b/resources/quality/anycubic_4max/pla/anycubic_4max_pla_draft.inst.cfg index 2ed986ce47..996d17568c 100644 --- a/resources/quality/anycubic_4max/pla/anycubic_4max_pla_draft.inst.cfg +++ b/resources/quality/anycubic_4max/pla/anycubic_4max_pla_draft.inst.cfg @@ -1,15 +1,14 @@ [general] -version = 4 -name = Draft definition = anycubic_4max +name = Draft +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -material = generic_pla [values] - diff --git a/resources/quality/anycubic_4max/pla/anycubic_4max_pla_high.inst.cfg b/resources/quality/anycubic_4max/pla/anycubic_4max_pla_high.inst.cfg index eaee019ab2..08f2711cf8 100644 --- a/resources/quality/anycubic_4max/pla/anycubic_4max_pla_high.inst.cfg +++ b/resources/quality/anycubic_4max/pla/anycubic_4max_pla_high.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = High definition = anycubic_4max +name = High +version = 4 [metadata] +material = generic_pla +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -material = generic_pla [values] diff --git a/resources/quality/anycubic_4max/pla/anycubic_4max_pla_normal.inst.cfg b/resources/quality/anycubic_4max/pla/anycubic_4max_pla_normal.inst.cfg index a244983ebc..aef506a221 100644 --- a/resources/quality/anycubic_4max/pla/anycubic_4max_pla_normal.inst.cfg +++ b/resources/quality/anycubic_4max/pla/anycubic_4max_pla_normal.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Normal definition = anycubic_4max +name = Normal +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = generic_pla [values] diff --git a/resources/quality/anycubic_chiron/anycubic_chiron_draft.inst.cfg b/resources/quality/anycubic_chiron/anycubic_chiron_draft.inst.cfg index 9c3a44ccf7..a7314ec685 100644 --- a/resources/quality/anycubic_chiron/anycubic_chiron_draft.inst.cfg +++ b/resources/quality/anycubic_chiron/anycubic_chiron_draft.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Draft definition = anycubic_chiron +name = Draft +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] acceleration_enabled = True @@ -58,3 +58,4 @@ support_use_towers = False support_xy_distance = 0.7 top_bottom_thickness = 1.2 wall_thickness = 1.2 + diff --git a/resources/quality/anycubic_chiron/anycubic_chiron_high.inst.cfg b/resources/quality/anycubic_chiron/anycubic_chiron_high.inst.cfg index c5711ade6b..49f5f447f3 100644 --- a/resources/quality/anycubic_chiron/anycubic_chiron_high.inst.cfg +++ b/resources/quality/anycubic_chiron/anycubic_chiron_high.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = High definition = anycubic_chiron +name = High +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -global_quality = True [values] acceleration_enabled = True @@ -58,3 +58,4 @@ support_use_towers = False support_xy_distance = 0.7 top_bottom_thickness = 1.2 wall_thickness = 1.2 + diff --git a/resources/quality/anycubic_chiron/anycubic_chiron_normal.inst.cfg b/resources/quality/anycubic_chiron/anycubic_chiron_normal.inst.cfg index 0fd03b32d8..7db3469248 100644 --- a/resources/quality/anycubic_chiron/anycubic_chiron_normal.inst.cfg +++ b/resources/quality/anycubic_chiron/anycubic_chiron_normal.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Normal definition = anycubic_chiron +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] acceleration_enabled = True @@ -58,3 +58,4 @@ support_use_towers = False support_xy_distance = 0.7 top_bottom_thickness = 1.2 wall_thickness = 1.2 + diff --git a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_draft.inst.cfg b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_draft.inst.cfg index 599c26ab25..0b5b4144bc 100644 --- a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_draft.inst.cfg +++ b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_draft.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Draft definition = anycubic_i3_mega +name = Draft +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] acceleration_enabled = True @@ -54,3 +54,4 @@ support_use_towers = False support_xy_distance = 0.7 top_bottom_thickness = 1.2 wall_thickness = 1.2 + diff --git a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_high.inst.cfg b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_high.inst.cfg index a1ef55deb9..fed9b2e1d9 100644 --- a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_high.inst.cfg +++ b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_high.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = High definition = anycubic_i3_mega +name = High +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -global_quality = True [values] acceleration_enabled = True @@ -54,3 +54,4 @@ support_use_towers = False support_xy_distance = 0.7 top_bottom_thickness = 1.2 wall_thickness = 1.2 + diff --git a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_normal.inst.cfg b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_normal.inst.cfg index 6546d07927..49fb79930e 100644 --- a/resources/quality/anycubic_i3_mega/anycubic_i3_mega_normal.inst.cfg +++ b/resources/quality/anycubic_i3_mega/anycubic_i3_mega_normal.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Normal definition = anycubic_i3_mega +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] acceleration_enabled = True @@ -54,3 +54,4 @@ support_use_towers = False support_xy_distance = 0.7 top_bottom_thickness = 1.2 wall_thickness = 1.2 + diff --git a/resources/quality/anycubic_i3_mega_s/anycubic_i3_mega_s_draft.inst.cfg b/resources/quality/anycubic_i3_mega_s/anycubic_i3_mega_s_draft.inst.cfg index 4cbc6462dc..a72a31b89e 100644 --- a/resources/quality/anycubic_i3_mega_s/anycubic_i3_mega_s_draft.inst.cfg +++ b/resources/quality/anycubic_i3_mega_s/anycubic_i3_mega_s_draft.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft definition = anycubic_i3_mega_s +name = Draft +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] -layer_height = 0.3 \ No newline at end of file +layer_height = 0.3 + diff --git a/resources/quality/anycubic_i3_mega_s/anycubic_i3_mega_s_high.inst.cfg b/resources/quality/anycubic_i3_mega_s/anycubic_i3_mega_s_high.inst.cfg index 6c92a036fc..6fc6e0b723 100644 --- a/resources/quality/anycubic_i3_mega_s/anycubic_i3_mega_s_high.inst.cfg +++ b/resources/quality/anycubic_i3_mega_s/anycubic_i3_mega_s_high.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = High definition = anycubic_i3_mega_s +name = High +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -global_quality = True [values] -layer_height = 0.1 \ No newline at end of file +layer_height = 0.1 + diff --git a/resources/quality/anycubic_i3_mega_s/anycubic_i3_mega_s_normal.inst.cfg b/resources/quality/anycubic_i3_mega_s/anycubic_i3_mega_s_normal.inst.cfg index 91fc63f365..24a718d67e 100644 --- a/resources/quality/anycubic_i3_mega_s/anycubic_i3_mega_s_normal.inst.cfg +++ b/resources/quality/anycubic_i3_mega_s/anycubic_i3_mega_s_normal.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Normal definition = anycubic_i3_mega_s +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] -layer_height = 0.2 \ No newline at end of file +layer_height = 0.2 + diff --git a/resources/quality/anycubic_kobra/anycubic_kobra_abs.inst.cfg b/resources/quality/anycubic_kobra/anycubic_kobra_abs.inst.cfg index 7a2c9ac824..88a8bb1151 100644 --- a/resources/quality/anycubic_kobra/anycubic_kobra_abs.inst.cfg +++ b/resources/quality/anycubic_kobra/anycubic_kobra_abs.inst.cfg @@ -1,38 +1,38 @@ [general] -version = 4 -name = Suggested parameters for ABS_V1.0 definition = anycubic_kobra +name = Suggested parameters for ABS_V1.0 +version = 4 [metadata] +global_quality = True +quality_type = abs setting_version = 20 type = quality -quality_type = abs weight = 0 -global_quality = True [values] -layer_height = 0.2 acceleration_enabled = True -default_material_bed_temperature = 80 -jerk_enabled = True -layer_height_0 = 0.2 acceleration_print = 800 acceleration_travel = 3000 acceleration_travel_layer_0 = 3000.0 bottom_layers = 6 brim_width = 7.0 +default_material_bed_temperature = 80 default_material_print_temperature = 230 infill_overlap = 15 infill_sparse_density = 20 initial_layer_line_width_factor = 140 +inset_direction = outside_in +jerk_enabled = True jerk_print = 8 jerk_travel = 10 +layer_height = 0.2 +layer_height_0 = 0.2 material_final_print_temperature = 230 material_flow = 100 material_flow_layer_0 = 120 material_initial_print_temperature = 230 optimize_wall_printing_order = True -inset_direction = outside_in retraction_amount = 6 retraction_min_travel = =line_width * 2 retraction_speed = 40 @@ -43,4 +43,5 @@ top_bottom_thickness = 1.2 wall_thickness = 1.2 z_seam_type = sharpest_corner z_seam_x = 110 -z_seam_y = 220 \ No newline at end of file +z_seam_y = 220 + diff --git a/resources/quality/anycubic_kobra/anycubic_kobra_pla.inst.cfg b/resources/quality/anycubic_kobra/anycubic_kobra_pla.inst.cfg index 32ea58a93f..4820d4f06a 100644 --- a/resources/quality/anycubic_kobra/anycubic_kobra_pla.inst.cfg +++ b/resources/quality/anycubic_kobra/anycubic_kobra_pla.inst.cfg @@ -1,20 +1,17 @@ [general] -version = 4 -name = Suggested parameters for PLA_V1.0 definition = anycubic_kobra +name = Suggested parameters for PLA_V1.0 +version = 4 [metadata] +global_quality = True +quality_type = pla setting_version = 20 type = quality -quality_type = pla weight = -2 -global_quality = True [values] -layer_height = 0.2 acceleration_enabled = True -jerk_enabled = True -layer_height_0 = 0.2 acceleration_print = 1000 acceleration_travel_layer_0 = 2000.0 bottom_layers = 6 @@ -22,12 +19,15 @@ brim_width = 4.0 infill_overlap = 15 infill_sparse_density = 15 initial_layer_line_width_factor = 100 +inset_direction = outside_in +jerk_enabled = True jerk_print = 8 jerk_travel = 10 +layer_height = 0.2 +layer_height_0 = 0.2 material_final_print_temperature = 200 material_initial_print_temperature = 200 optimize_wall_printing_order = True -inset_direction = outside_in retraction_amount = 6 retraction_min_travel = 1.5 retraction_speed = 40 @@ -38,4 +38,5 @@ top_bottom_thickness = 1.2 wall_thickness = 1.2 z_seam_type = sharpest_corner z_seam_x = 110 -z_seam_y = 220 \ No newline at end of file +z_seam_y = 220 + diff --git a/resources/quality/anycubic_kobra/anycubic_kobra_tpu.inst.cfg b/resources/quality/anycubic_kobra/anycubic_kobra_tpu.inst.cfg index 432eeb4bb6..50e04ecbc0 100644 --- a/resources/quality/anycubic_kobra/anycubic_kobra_tpu.inst.cfg +++ b/resources/quality/anycubic_kobra/anycubic_kobra_tpu.inst.cfg @@ -1,20 +1,17 @@ [general] -version = 4 -name = Suggested parameters for TPU_V1.0 definition = anycubic_kobra +name = Suggested parameters for TPU_V1.0 +version = 4 [metadata] +global_quality = True +quality_type = tpu setting_version = 20 type = quality -quality_type = tpu weight = 1 -global_quality = True [values] -layer_height = 0.2 acceleration_enabled = True -jerk_enabled = True -layer_height_0 = 0.2 acceleration_print = 800 acceleration_travel = 3000 acceleration_travel_layer_0 = 3000.0 @@ -24,14 +21,17 @@ default_material_print_temperature = 190 infill_overlap = 15 infill_sparse_density = 25 initial_layer_line_width_factor = 140 +inset_direction = outside_in +jerk_enabled = True jerk_print = 8 jerk_travel = 10 +layer_height = 0.2 +layer_height_0 = 0.2 material_final_print_temperature = 190 material_flow = 90 material_flow_layer_0 = 120 material_initial_print_temperature = 190 optimize_wall_printing_order = True -inset_direction = outside_in retraction_amount = 8 retraction_min_travel = =line_width * 2 retraction_speed = 60 @@ -42,4 +42,5 @@ top_bottom_thickness = 1.2 wall_thickness = 1.2 z_seam_type = sharpest_corner z_seam_x = 110 -z_seam_y = 220 \ No newline at end of file +z_seam_y = 220 + diff --git a/resources/quality/anycubic_kobra_max/anycubic_kobra_max_pla.inst.cfg b/resources/quality/anycubic_kobra_max/anycubic_kobra_max_pla.inst.cfg index d4434c6b79..fd5ef02afb 100644 --- a/resources/quality/anycubic_kobra_max/anycubic_kobra_max_pla.inst.cfg +++ b/resources/quality/anycubic_kobra_max/anycubic_kobra_max_pla.inst.cfg @@ -1,28 +1,28 @@ [general] -version = 4 -name = Suggested parameters for PLA_V1.0 definition = anycubic_kobra_max +name = Suggested parameters for PLA_V1.0 +version = 4 [metadata] +global_quality = True +quality_type = pla setting_version = 20 type = quality -quality_type = pla weight = -2 -global_quality = True [values] -layer_height = 0.2 acceleration_enabled = True -jerk_enabled = True -layer_height_0 = 0.2 acceleration_print = 1000 acceleration_travel = 3000 brim_width = 7 default_material_print_temperature = 195 infill_sparse_density = 15 initial_layer_line_width_factor = 140 +jerk_enabled = True jerk_print = 8 jerk_travel = 10 +layer_height = 0.2 +layer_height_0 = 0.2 material_final_print_temperature = 195 material_flow = 95 material_flow_layer_0 = 120 @@ -50,4 +50,5 @@ top_thickness = 1.2 wall_thickness = 1.2 z_seam_type = sharpest_corner z_seam_x = 110 -z_seam_y = 220 \ No newline at end of file +z_seam_y = 220 + diff --git a/resources/quality/anycubic_kobra_max/anycubic_kobra_max_tpu.inst.cfg b/resources/quality/anycubic_kobra_max/anycubic_kobra_max_tpu.inst.cfg index 94ea7f8579..5952132e59 100644 --- a/resources/quality/anycubic_kobra_max/anycubic_kobra_max_tpu.inst.cfg +++ b/resources/quality/anycubic_kobra_max/anycubic_kobra_max_tpu.inst.cfg @@ -1,20 +1,17 @@ [general] -version = 4 -name = Suggested parameters for TPU_V1.0 definition = anycubic_kobra_max +name = Suggested parameters for TPU_V1.0 +version = 4 [metadata] +global_quality = True +quality_type = tpu setting_version = 20 type = quality -quality_type = tpu weight = 1 -global_quality = True [values] -layer_height = 0.2 acceleration_enabled = True -jerk_enabled = False -layer_height_0 = 0.3 acceleration_print = 1000 acceleration_travel = 3000 brim_width = 5 @@ -23,8 +20,11 @@ default_material_print_temperature = 210 infill_overlap = 15 infill_sparse_density = 15 initial_layer_line_width_factor = 130 +jerk_enabled = False jerk_print = 8 jerk_travel = 10 +layer_height = 0.2 +layer_height_0 = 0.3 material_final_print_temperature = 210 material_flow = 90 material_flow_layer_0 = 100 @@ -51,4 +51,5 @@ top_bottom_thickness = 1.2 wall_thickness = 1.2 z_seam_type = sharpest_corner z_seam_x = 110 -z_seam_y = 220 \ No newline at end of file +z_seam_y = 220 + diff --git a/resources/quality/anycubic_mega_zero/anycubic_mega_zero_draft.inst.cfg b/resources/quality/anycubic_mega_zero/anycubic_mega_zero_draft.inst.cfg index 7cc6d25c4d..9a509da375 100644 --- a/resources/quality/anycubic_mega_zero/anycubic_mega_zero_draft.inst.cfg +++ b/resources/quality/anycubic_mega_zero/anycubic_mega_zero_draft.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Draft definition = anycubic_mega_zero +name = Draft +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] layer_height = 0.3 layer_height_0 = 0.3 speed_print = 60 speed_travel = 100 + diff --git a/resources/quality/anycubic_mega_zero/anycubic_mega_zero_high.inst.cfg b/resources/quality/anycubic_mega_zero/anycubic_mega_zero_high.inst.cfg index c539a9ac18..f13b288653 100644 --- a/resources/quality/anycubic_mega_zero/anycubic_mega_zero_high.inst.cfg +++ b/resources/quality/anycubic_mega_zero/anycubic_mega_zero_high.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = High definition = anycubic_mega_zero +name = High +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -global_quality = True [values] layer_height = 0.1 layer_height_0 = 0.1 speed_print = 30 speed_travel = 50 + diff --git a/resources/quality/anycubic_mega_zero/anycubic_mega_zero_normal.inst.cfg b/resources/quality/anycubic_mega_zero/anycubic_mega_zero_normal.inst.cfg index b1a5917e8f..90adb538a8 100644 --- a/resources/quality/anycubic_mega_zero/anycubic_mega_zero_normal.inst.cfg +++ b/resources/quality/anycubic_mega_zero/anycubic_mega_zero_normal.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Normal definition = anycubic_mega_zero +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] layer_height = 0.2 layer_height_0 = 0.2 speed_print = 40 speed_travel = 100 + diff --git a/resources/quality/anycubic_predator/predator_coarse.inst.cfg b/resources/quality/anycubic_predator/predator_coarse.inst.cfg index fbc5e7cd6a..73d0e5a8f6 100644 --- a/resources/quality/anycubic_predator/predator_coarse.inst.cfg +++ b/resources/quality/anycubic_predator/predator_coarse.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Coarse definition = predator +name = Coarse +version = 4 [metadata] +global_quality = True +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = -3 -global_quality = True [values] layer_height = 0.4 -layer_height_0 = 0.45 \ No newline at end of file +layer_height_0 = 0.45 + diff --git a/resources/quality/anycubic_predator/predator_draft.inst.cfg b/resources/quality/anycubic_predator/predator_draft.inst.cfg index e97411ecac..92e178160e 100644 --- a/resources/quality/anycubic_predator/predator_draft.inst.cfg +++ b/resources/quality/anycubic_predator/predator_draft.inst.cfg @@ -1,15 +1,16 @@ -[general] -version = 4 -name = Draft -definition = predator - -[metadata] -setting_version = 20 -type = quality -quality_type = draft -weight = -2 -global_quality = True - -[values] -layer_height = 0.30 -layer_height_0 = 0.35 \ No newline at end of file +[general] +definition = predator +name = Draft +version = 4 + +[metadata] +global_quality = True +quality_type = draft +setting_version = 20 +type = quality +weight = -2 + +[values] +layer_height = 0.30 +layer_height_0 = 0.35 + diff --git a/resources/quality/anycubic_predator/predator_extra_coarse.inst.cfg b/resources/quality/anycubic_predator/predator_extra_coarse.inst.cfg index 73e897e981..88f8cfeee8 100644 --- a/resources/quality/anycubic_predator/predator_extra_coarse.inst.cfg +++ b/resources/quality/anycubic_predator/predator_extra_coarse.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Extra Coarse definition = predator +name = Extra Coarse +version = 4 [metadata] +global_quality = True +quality_type = Xcoarse setting_version = 20 type = quality -quality_type = Xcoarse weight = -4 -global_quality = True [values] layer_height = 0.5 layer_height_0 = 0.55 + diff --git a/resources/quality/anycubic_predator/predator_extra_fine.inst.cfg b/resources/quality/anycubic_predator/predator_extra_fine.inst.cfg index 3801f5f95a..390c11fdec 100644 --- a/resources/quality/anycubic_predator/predator_extra_fine.inst.cfg +++ b/resources/quality/anycubic_predator/predator_extra_fine.inst.cfg @@ -1,15 +1,16 @@ -[general] -version = 4 -name = Extra Fine -definition = predator - -[metadata] -setting_version = 20 -type = quality -quality_type = Xfine -weight = 1 -global_quality = True - -[values] -layer_height = 0.05 -layer_height_0 = 0.10 +[general] +definition = predator +name = Extra Fine +version = 4 + +[metadata] +global_quality = True +quality_type = Xfine +setting_version = 20 +type = quality +weight = 1 + +[values] +layer_height = 0.05 +layer_height_0 = 0.10 + diff --git a/resources/quality/anycubic_predator/predator_fine.inst.cfg b/resources/quality/anycubic_predator/predator_fine.inst.cfg index e3dd6bf539..864b3e4abf 100644 --- a/resources/quality/anycubic_predator/predator_fine.inst.cfg +++ b/resources/quality/anycubic_predator/predator_fine.inst.cfg @@ -1,15 +1,16 @@ -[general] -version = 4 -name = Fine -definition = predator - -[metadata] -setting_version = 20 -type = quality -quality_type = fine -weight = 1 -global_quality = True - -[values] -layer_height = 0.1 -layer_height_0 = 0.15 +[general] +definition = predator +name = Fine +version = 4 + +[metadata] +global_quality = True +quality_type = fine +setting_version = 20 +type = quality +weight = 1 + +[values] +layer_height = 0.1 +layer_height_0 = 0.15 + diff --git a/resources/quality/anycubic_predator/predator_normal.inst.cfg b/resources/quality/anycubic_predator/predator_normal.inst.cfg index 115f1677d8..e40ce7ef94 100644 --- a/resources/quality/anycubic_predator/predator_normal.inst.cfg +++ b/resources/quality/anycubic_predator/predator_normal.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Normal definition = predator +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] layer_height = 0.2 -layer_height_0 = 0.25 \ No newline at end of file +layer_height_0 = 0.25 + diff --git a/resources/quality/artillery/ABS/artillery_0.2_ABS_super.inst.cfg b/resources/quality/artillery/ABS/artillery_0.2_ABS_super.inst.cfg index 8e6102859a..722b6ccfd1 100644 --- a/resources/quality/artillery/ABS/artillery_0.2_ABS_super.inst.cfg +++ b/resources/quality/artillery/ABS/artillery_0.2_ABS_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = artillery_base +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super 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/artillery/ABS/artillery_0.2_ABS_ultra.inst.cfg b/resources/quality/artillery/ABS/artillery_0.2_ABS_ultra.inst.cfg index 4dfd839916..fde26f5a48 100644 --- a/resources/quality/artillery/ABS/artillery_0.2_ABS_ultra.inst.cfg +++ b/resources/quality/artillery/ABS/artillery_0.2_ABS_ultra.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Ultra Quality definition = artillery_base +name = Ultra Quality +version = 4 [metadata] +material = generic_abs +quality_type = ultra 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/artillery/ABS/artillery_0.3_ABS_adaptive.inst.cfg b/resources/quality/artillery/ABS/artillery_0.3_ABS_adaptive.inst.cfg index 45831ce958..d3d32952a4 100644 --- a/resources/quality/artillery/ABS/artillery_0.3_ABS_adaptive.inst.cfg +++ b/resources/quality/artillery/ABS/artillery_0.3_ABS_adaptive.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = artillery_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_abs +quality_type = adaptive 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/artillery/ABS/artillery_0.3_ABS_low.inst.cfg b/resources/quality/artillery/ABS/artillery_0.3_ABS_low.inst.cfg index 658244f086..fcaae73b43 100644 --- a/resources/quality/artillery/ABS/artillery_0.3_ABS_low.inst.cfg +++ b/resources/quality/artillery/ABS/artillery_0.3_ABS_low.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = artillery_base +name = Low Quality +version = 4 [metadata] +material = generic_abs +quality_type = low 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/artillery/ABS/artillery_0.3_ABS_standard.inst.cfg b/resources/quality/artillery/ABS/artillery_0.3_ABS_standard.inst.cfg index b3fa935293..164f7bfa27 100644 --- a/resources/quality/artillery/ABS/artillery_0.3_ABS_standard.inst.cfg +++ b/resources/quality/artillery/ABS/artillery_0.3_ABS_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = artillery_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = standard 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/artillery/ABS/artillery_0.3_ABS_super.inst.cfg b/resources/quality/artillery/ABS/artillery_0.3_ABS_super.inst.cfg index 9961933aac..fb196dca62 100644 --- a/resources/quality/artillery/ABS/artillery_0.3_ABS_super.inst.cfg +++ b/resources/quality/artillery/ABS/artillery_0.3_ABS_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = artillery_base +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super 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/artillery/ABS/artillery_0.4_ABS_adaptive.inst.cfg b/resources/quality/artillery/ABS/artillery_0.4_ABS_adaptive.inst.cfg index ccaecb1ff6..4ebe790b18 100644 --- a/resources/quality/artillery/ABS/artillery_0.4_ABS_adaptive.inst.cfg +++ b/resources/quality/artillery/ABS/artillery_0.4_ABS_adaptive.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = artillery_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_abs +quality_type = adaptive 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/artillery/ABS/artillery_0.4_ABS_low.inst.cfg b/resources/quality/artillery/ABS/artillery_0.4_ABS_low.inst.cfg index b7f2d54030..3772a21a54 100644 --- a/resources/quality/artillery/ABS/artillery_0.4_ABS_low.inst.cfg +++ b/resources/quality/artillery/ABS/artillery_0.4_ABS_low.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = artillery_base +name = Low Quality +version = 4 [metadata] +material = generic_abs +quality_type = low 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/artillery/ABS/artillery_0.4_ABS_standard.inst.cfg b/resources/quality/artillery/ABS/artillery_0.4_ABS_standard.inst.cfg index ef83cf14db..bbdf86bc72 100644 --- a/resources/quality/artillery/ABS/artillery_0.4_ABS_standard.inst.cfg +++ b/resources/quality/artillery/ABS/artillery_0.4_ABS_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = artillery_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = standard 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/artillery/ABS/artillery_0.4_ABS_super.inst.cfg b/resources/quality/artillery/ABS/artillery_0.4_ABS_super.inst.cfg index fe98a1ca49..f0b3a61566 100644 --- a/resources/quality/artillery/ABS/artillery_0.4_ABS_super.inst.cfg +++ b/resources/quality/artillery/ABS/artillery_0.4_ABS_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = artillery_base +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super 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/artillery/ABS/artillery_0.5_ABS_adaptive.inst.cfg b/resources/quality/artillery/ABS/artillery_0.5_ABS_adaptive.inst.cfg index 535b12a8ef..47f7cb2a16 100644 --- a/resources/quality/artillery/ABS/artillery_0.5_ABS_adaptive.inst.cfg +++ b/resources/quality/artillery/ABS/artillery_0.5_ABS_adaptive.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = artillery_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_abs +quality_type = adaptive 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/artillery/ABS/artillery_0.5_ABS_low.inst.cfg b/resources/quality/artillery/ABS/artillery_0.5_ABS_low.inst.cfg index 4e82055aa4..2eb479e144 100644 --- a/resources/quality/artillery/ABS/artillery_0.5_ABS_low.inst.cfg +++ b/resources/quality/artillery/ABS/artillery_0.5_ABS_low.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = artillery_base +name = Low Quality +version = 4 [metadata] +material = generic_abs +quality_type = low 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/artillery/ABS/artillery_0.5_ABS_standard.inst.cfg b/resources/quality/artillery/ABS/artillery_0.5_ABS_standard.inst.cfg index 28467ddc41..e3f9752320 100644 --- a/resources/quality/artillery/ABS/artillery_0.5_ABS_standard.inst.cfg +++ b/resources/quality/artillery/ABS/artillery_0.5_ABS_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = artillery_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = standard 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/artillery/ABS/artillery_0.5_ABS_super.inst.cfg b/resources/quality/artillery/ABS/artillery_0.5_ABS_super.inst.cfg index a23dfe7a46..720a734a8a 100644 --- a/resources/quality/artillery/ABS/artillery_0.5_ABS_super.inst.cfg +++ b/resources/quality/artillery/ABS/artillery_0.5_ABS_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = artillery_base +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super 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/artillery/ABS/artillery_0.6_ABS_standard.inst.cfg b/resources/quality/artillery/ABS/artillery_0.6_ABS_standard.inst.cfg index 0f1b2258cc..52eb2d56a0 100644 --- a/resources/quality/artillery/ABS/artillery_0.6_ABS_standard.inst.cfg +++ b/resources/quality/artillery/ABS/artillery_0.6_ABS_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = artillery_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = standard 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/artillery/ABS/artillery_0.8_ABS_draft.inst.cfg b/resources/quality/artillery/ABS/artillery_0.8_ABS_draft.inst.cfg index 542903fa78..c3fe02a62f 100644 --- a/resources/quality/artillery/ABS/artillery_0.8_ABS_draft.inst.cfg +++ b/resources/quality/artillery/ABS/artillery_0.8_ABS_draft.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = artillery_base +name = Draft Quality +version = 4 [metadata] +material = generic_abs +quality_type = draft 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/artillery/ABS/artillery_1.0_ABS_draft.inst.cfg b/resources/quality/artillery/ABS/artillery_1.0_ABS_draft.inst.cfg index 8458f9ebc8..fcf603642b 100644 --- a/resources/quality/artillery/ABS/artillery_1.0_ABS_draft.inst.cfg +++ b/resources/quality/artillery/ABS/artillery_1.0_ABS_draft.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = artillery_base +name = Draft Quality +version = 4 [metadata] +material = generic_abs +quality_type = draft 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/artillery/PETG/artillery_0.2_PETG_super.inst.cfg b/resources/quality/artillery/PETG/artillery_0.2_PETG_super.inst.cfg index ea6176cf16..87253cd169 100644 --- a/resources/quality/artillery/PETG/artillery_0.2_PETG_super.inst.cfg +++ b/resources/quality/artillery/PETG/artillery_0.2_PETG_super.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Super Quality definition = artillery_base +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super 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 + diff --git a/resources/quality/artillery/PETG/artillery_0.2_PETG_ultra.inst.cfg b/resources/quality/artillery/PETG/artillery_0.2_PETG_ultra.inst.cfg index 9283500697..9c92d015d6 100644 --- a/resources/quality/artillery/PETG/artillery_0.2_PETG_ultra.inst.cfg +++ b/resources/quality/artillery/PETG/artillery_0.2_PETG_ultra.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Ultra Quality definition = artillery_base +name = Ultra Quality +version = 4 [metadata] +material = generic_petg +quality_type = ultra 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 + diff --git a/resources/quality/artillery/PETG/artillery_0.3_PETG_adaptive.inst.cfg b/resources/quality/artillery/PETG/artillery_0.3_PETG_adaptive.inst.cfg index 9d26ff64de..8aa1aee3ae 100644 --- a/resources/quality/artillery/PETG/artillery_0.3_PETG_adaptive.inst.cfg +++ b/resources/quality/artillery/PETG/artillery_0.3_PETG_adaptive.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = artillery_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_petg +quality_type = adaptive 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 + diff --git a/resources/quality/artillery/PETG/artillery_0.3_PETG_low.inst.cfg b/resources/quality/artillery/PETG/artillery_0.3_PETG_low.inst.cfg index c6cd6113bf..b5c4c89b30 100644 --- a/resources/quality/artillery/PETG/artillery_0.3_PETG_low.inst.cfg +++ b/resources/quality/artillery/PETG/artillery_0.3_PETG_low.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Low Quality definition = artillery_base +name = Low Quality +version = 4 [metadata] +material = generic_petg +quality_type = low 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 + diff --git a/resources/quality/artillery/PETG/artillery_0.3_PETG_standard.inst.cfg b/resources/quality/artillery/PETG/artillery_0.3_PETG_standard.inst.cfg index b5435f5fc9..d1c69ac87b 100644 --- a/resources/quality/artillery/PETG/artillery_0.3_PETG_standard.inst.cfg +++ b/resources/quality/artillery/PETG/artillery_0.3_PETG_standard.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = artillery_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = standard 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/artillery/PETG/artillery_0.3_PETG_super.inst.cfg b/resources/quality/artillery/PETG/artillery_0.3_PETG_super.inst.cfg index 3ecfea70c4..b47934e463 100644 --- a/resources/quality/artillery/PETG/artillery_0.3_PETG_super.inst.cfg +++ b/resources/quality/artillery/PETG/artillery_0.3_PETG_super.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Super Quality definition = artillery_base +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super 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/artillery/PETG/artillery_0.4_PETG_adaptive.inst.cfg b/resources/quality/artillery/PETG/artillery_0.4_PETG_adaptive.inst.cfg index 81e0ecab5e..8ee6f52779 100644 --- a/resources/quality/artillery/PETG/artillery_0.4_PETG_adaptive.inst.cfg +++ b/resources/quality/artillery/PETG/artillery_0.4_PETG_adaptive.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = artillery_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_petg +quality_type = adaptive 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/artillery/PETG/artillery_0.4_PETG_low.inst.cfg b/resources/quality/artillery/PETG/artillery_0.4_PETG_low.inst.cfg index 85757b3316..944467ddf6 100644 --- a/resources/quality/artillery/PETG/artillery_0.4_PETG_low.inst.cfg +++ b/resources/quality/artillery/PETG/artillery_0.4_PETG_low.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Low Quality definition = artillery_base +name = Low Quality +version = 4 [metadata] +material = generic_petg +quality_type = low 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/artillery/PETG/artillery_0.4_PETG_standard.inst.cfg b/resources/quality/artillery/PETG/artillery_0.4_PETG_standard.inst.cfg index 5c06f98af7..dd50d76a8b 100644 --- a/resources/quality/artillery/PETG/artillery_0.4_PETG_standard.inst.cfg +++ b/resources/quality/artillery/PETG/artillery_0.4_PETG_standard.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = artillery_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = standard 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/artillery/PETG/artillery_0.4_PETG_super.inst.cfg b/resources/quality/artillery/PETG/artillery_0.4_PETG_super.inst.cfg index 4ee1a34a76..b57835ae3d 100644 --- a/resources/quality/artillery/PETG/artillery_0.4_PETG_super.inst.cfg +++ b/resources/quality/artillery/PETG/artillery_0.4_PETG_super.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Super Quality definition = artillery_base +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super 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/artillery/PETG/artillery_0.5_PETG_adaptive.inst.cfg b/resources/quality/artillery/PETG/artillery_0.5_PETG_adaptive.inst.cfg index d57899dee6..0dff19021e 100644 --- a/resources/quality/artillery/PETG/artillery_0.5_PETG_adaptive.inst.cfg +++ b/resources/quality/artillery/PETG/artillery_0.5_PETG_adaptive.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = artillery_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_petg +quality_type = adaptive 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/artillery/PETG/artillery_0.5_PETG_low.inst.cfg b/resources/quality/artillery/PETG/artillery_0.5_PETG_low.inst.cfg index 28da7ee1c6..8507158c47 100644 --- a/resources/quality/artillery/PETG/artillery_0.5_PETG_low.inst.cfg +++ b/resources/quality/artillery/PETG/artillery_0.5_PETG_low.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Low Quality definition = artillery_base +name = Low Quality +version = 4 [metadata] +material = generic_petg +quality_type = low 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/artillery/PETG/artillery_0.5_PETG_standard.inst.cfg b/resources/quality/artillery/PETG/artillery_0.5_PETG_standard.inst.cfg index 35f3ef677f..0b43321241 100644 --- a/resources/quality/artillery/PETG/artillery_0.5_PETG_standard.inst.cfg +++ b/resources/quality/artillery/PETG/artillery_0.5_PETG_standard.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = artillery_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = standard 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/artillery/PETG/artillery_0.5_PETG_super.inst.cfg b/resources/quality/artillery/PETG/artillery_0.5_PETG_super.inst.cfg index 9629b377fc..9de8c8940c 100644 --- a/resources/quality/artillery/PETG/artillery_0.5_PETG_super.inst.cfg +++ b/resources/quality/artillery/PETG/artillery_0.5_PETG_super.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Super Quality definition = artillery_base +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super 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/artillery/PETG/artillery_0.6_PETG_standard.inst.cfg b/resources/quality/artillery/PETG/artillery_0.6_PETG_standard.inst.cfg index 7c407becc3..8a843c3aa1 100644 --- a/resources/quality/artillery/PETG/artillery_0.6_PETG_standard.inst.cfg +++ b/resources/quality/artillery/PETG/artillery_0.6_PETG_standard.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = artillery_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = standard 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/artillery/PETG/artillery_0.8_PETG_draft.inst.cfg b/resources/quality/artillery/PETG/artillery_0.8_PETG_draft.inst.cfg index 78a2ac9457..b4123081b6 100644 --- a/resources/quality/artillery/PETG/artillery_0.8_PETG_draft.inst.cfg +++ b/resources/quality/artillery/PETG/artillery_0.8_PETG_draft.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Draft Quality definition = artillery_base +name = Draft Quality +version = 4 [metadata] +material = generic_petg +quality_type = draft 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/artillery/PETG/artillery_1.0_PETG_draft.inst.cfg b/resources/quality/artillery/PETG/artillery_1.0_PETG_draft.inst.cfg index c84206bf0f..b985684a2d 100644 --- a/resources/quality/artillery/PETG/artillery_1.0_PETG_draft.inst.cfg +++ b/resources/quality/artillery/PETG/artillery_1.0_PETG_draft.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Draft Quality definition = artillery_base +name = Draft Quality +version = 4 [metadata] +material = generic_petg +quality_type = draft 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/artillery/PLA/artillery_0.2_PLA_super.inst.cfg b/resources/quality/artillery/PLA/artillery_0.2_PLA_super.inst.cfg index 4f95eb4b16..2f7139c479 100644 --- a/resources/quality/artillery/PLA/artillery_0.2_PLA_super.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.2_PLA_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = artillery_base +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla variant = 0.2mm Nozzle [values] + diff --git a/resources/quality/artillery/PLA/artillery_0.2_PLA_ultra.inst.cfg b/resources/quality/artillery/PLA/artillery_0.2_PLA_ultra.inst.cfg index f882647e9e..f0fe2b0c48 100644 --- a/resources/quality/artillery/PLA/artillery_0.2_PLA_ultra.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.2_PLA_ultra.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Ultra Quality definition = artillery_base +name = Ultra Quality +version = 4 [metadata] +material = generic_pla +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra -material = generic_pla variant = 0.2mm Nozzle [values] + diff --git a/resources/quality/artillery/PLA/artillery_0.3_PLA_adaptive.inst.cfg b/resources/quality/artillery/PLA/artillery_0.3_PLA_adaptive.inst.cfg index 26d685cb4f..e6a383b4dc 100644 --- a/resources/quality/artillery/PLA/artillery_0.3_PLA_adaptive.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.3_PLA_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = artillery_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_pla +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_pla variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/artillery/PLA/artillery_0.3_PLA_low.inst.cfg b/resources/quality/artillery/PLA/artillery_0.3_PLA_low.inst.cfg index 62e7056187..a6229bff35 100644 --- a/resources/quality/artillery/PLA/artillery_0.3_PLA_low.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.3_PLA_low.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low Quality definition = artillery_base +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/artillery/PLA/artillery_0.3_PLA_standard.inst.cfg b/resources/quality/artillery/PLA/artillery_0.3_PLA_standard.inst.cfg index a71f011577..cab271d555 100644 --- a/resources/quality/artillery/PLA/artillery_0.3_PLA_standard.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.3_PLA_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = artillery_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_pla variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/artillery/PLA/artillery_0.3_PLA_super.inst.cfg b/resources/quality/artillery/PLA/artillery_0.3_PLA_super.inst.cfg index a310cea80e..e30843f130 100644 --- a/resources/quality/artillery/PLA/artillery_0.3_PLA_super.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.3_PLA_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = artillery_base +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/artillery/PLA/artillery_0.4_PLA_adaptive.inst.cfg b/resources/quality/artillery/PLA/artillery_0.4_PLA_adaptive.inst.cfg index 8d715ad216..ee7a0704df 100644 --- a/resources/quality/artillery/PLA/artillery_0.4_PLA_adaptive.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.4_PLA_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = artillery_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_pla +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_pla variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/artillery/PLA/artillery_0.4_PLA_low.inst.cfg b/resources/quality/artillery/PLA/artillery_0.4_PLA_low.inst.cfg index e9a29012bd..72ecce1e7c 100644 --- a/resources/quality/artillery/PLA/artillery_0.4_PLA_low.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.4_PLA_low.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low Quality definition = artillery_base +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/artillery/PLA/artillery_0.4_PLA_standard.inst.cfg b/resources/quality/artillery/PLA/artillery_0.4_PLA_standard.inst.cfg index 2793ce688b..95985db08d 100644 --- a/resources/quality/artillery/PLA/artillery_0.4_PLA_standard.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.4_PLA_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = artillery_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_pla variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/artillery/PLA/artillery_0.4_PLA_super.inst.cfg b/resources/quality/artillery/PLA/artillery_0.4_PLA_super.inst.cfg index 2a3626ebdb..6fdd354f7c 100644 --- a/resources/quality/artillery/PLA/artillery_0.4_PLA_super.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.4_PLA_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = artillery_base +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/artillery/PLA/artillery_0.5_PLA_adaptive.inst.cfg b/resources/quality/artillery/PLA/artillery_0.5_PLA_adaptive.inst.cfg index 79db39723b..5e1482c5ac 100644 --- a/resources/quality/artillery/PLA/artillery_0.5_PLA_adaptive.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.5_PLA_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = artillery_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_pla +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_pla variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/artillery/PLA/artillery_0.5_PLA_low.inst.cfg b/resources/quality/artillery/PLA/artillery_0.5_PLA_low.inst.cfg index b5badd6ad3..303576764c 100644 --- a/resources/quality/artillery/PLA/artillery_0.5_PLA_low.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.5_PLA_low.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low Quality definition = artillery_base +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/artillery/PLA/artillery_0.5_PLA_standard.inst.cfg b/resources/quality/artillery/PLA/artillery_0.5_PLA_standard.inst.cfg index 9db33ac6ec..1f11863578 100644 --- a/resources/quality/artillery/PLA/artillery_0.5_PLA_standard.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.5_PLA_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = artillery_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_pla variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/artillery/PLA/artillery_0.5_PLA_super.inst.cfg b/resources/quality/artillery/PLA/artillery_0.5_PLA_super.inst.cfg index 483a4b476a..7829be9e8d 100644 --- a/resources/quality/artillery/PLA/artillery_0.5_PLA_super.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.5_PLA_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = artillery_base +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/artillery/PLA/artillery_0.6_PLA_draft.inst.cfg b/resources/quality/artillery/PLA/artillery_0.6_PLA_draft.inst.cfg index 569aa8bf6c..90ebe6d77a 100644 --- a/resources/quality/artillery/PLA/artillery_0.6_PLA_draft.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.6_PLA_draft.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = artillery_base +name = Draft Quality +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_pla variant = 0.6mm Nozzle [values] + diff --git a/resources/quality/artillery/PLA/artillery_0.6_PLA_low.inst.cfg b/resources/quality/artillery/PLA/artillery_0.6_PLA_low.inst.cfg index 0afc0f1e3f..e7e840e192 100644 --- a/resources/quality/artillery/PLA/artillery_0.6_PLA_low.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.6_PLA_low.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low Quality definition = artillery_base +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla variant = 0.6mm Nozzle [values] + diff --git a/resources/quality/artillery/PLA/artillery_0.6_PLA_standard.inst.cfg b/resources/quality/artillery/PLA/artillery_0.6_PLA_standard.inst.cfg index 5fba73d305..36c4e2216a 100644 --- a/resources/quality/artillery/PLA/artillery_0.6_PLA_standard.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.6_PLA_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = artillery_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_pla variant = 0.6mm Nozzle [values] + diff --git a/resources/quality/artillery/PLA/artillery_0.8_PLA_draft.inst.cfg b/resources/quality/artillery/PLA/artillery_0.8_PLA_draft.inst.cfg index 63f4b04f71..5b7613d5ba 100644 --- a/resources/quality/artillery/PLA/artillery_0.8_PLA_draft.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_0.8_PLA_draft.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = artillery_base +name = Draft Quality +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_pla variant = 0.8mm Nozzle [values] + diff --git a/resources/quality/artillery/PLA/artillery_1.0_PLA_draft.inst.cfg b/resources/quality/artillery/PLA/artillery_1.0_PLA_draft.inst.cfg index 7bc3f64a45..d7b7b8433b 100644 --- a/resources/quality/artillery/PLA/artillery_1.0_PLA_draft.inst.cfg +++ b/resources/quality/artillery/PLA/artillery_1.0_PLA_draft.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = artillery_base +name = Draft Quality +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_pla variant = 1.0mm Nozzle [values] + diff --git a/resources/quality/artillery/TPU/artillery_0.3_TPU_adaptive.inst.cfg b/resources/quality/artillery/TPU/artillery_0.3_TPU_adaptive.inst.cfg index e26b9381b6..dd4dbcd3e5 100644 --- a/resources/quality/artillery/TPU/artillery_0.3_TPU_adaptive.inst.cfg +++ b/resources/quality/artillery/TPU/artillery_0.3_TPU_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = artillery_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_tpu +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_tpu variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/artillery/TPU/artillery_0.3_TPU_standard.inst.cfg b/resources/quality/artillery/TPU/artillery_0.3_TPU_standard.inst.cfg index 19e18ea27c..7cadfda4b2 100644 --- a/resources/quality/artillery/TPU/artillery_0.3_TPU_standard.inst.cfg +++ b/resources/quality/artillery/TPU/artillery_0.3_TPU_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = artillery_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_tpu variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/artillery/TPU/artillery_0.3_TPU_super.inst.cfg b/resources/quality/artillery/TPU/artillery_0.3_TPU_super.inst.cfg index ce229418a6..2e4a3ca7cc 100644 --- a/resources/quality/artillery/TPU/artillery_0.3_TPU_super.inst.cfg +++ b/resources/quality/artillery/TPU/artillery_0.3_TPU_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = artillery_base +name = Super Quality +version = 4 [metadata] +material = generic_tpu +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_tpu variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/artillery/TPU/artillery_0.4_TPU_adaptive.inst.cfg b/resources/quality/artillery/TPU/artillery_0.4_TPU_adaptive.inst.cfg index b4e211ce64..866e192368 100644 --- a/resources/quality/artillery/TPU/artillery_0.4_TPU_adaptive.inst.cfg +++ b/resources/quality/artillery/TPU/artillery_0.4_TPU_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = artillery_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_tpu +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_tpu variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/artillery/TPU/artillery_0.4_TPU_standard.inst.cfg b/resources/quality/artillery/TPU/artillery_0.4_TPU_standard.inst.cfg index c466d0e03b..ed1b956f5a 100644 --- a/resources/quality/artillery/TPU/artillery_0.4_TPU_standard.inst.cfg +++ b/resources/quality/artillery/TPU/artillery_0.4_TPU_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = artillery_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_tpu variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/artillery/TPU/artillery_0.4_TPU_super.inst.cfg b/resources/quality/artillery/TPU/artillery_0.4_TPU_super.inst.cfg index 1dcacb3155..e13a5e415d 100644 --- a/resources/quality/artillery/TPU/artillery_0.4_TPU_super.inst.cfg +++ b/resources/quality/artillery/TPU/artillery_0.4_TPU_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = artillery_base +name = Super Quality +version = 4 [metadata] +material = generic_tpu +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_tpu variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/artillery/TPU/artillery_0.5_TPU_adaptive.inst.cfg b/resources/quality/artillery/TPU/artillery_0.5_TPU_adaptive.inst.cfg index a6e383b655..8b95ad1d8d 100644 --- a/resources/quality/artillery/TPU/artillery_0.5_TPU_adaptive.inst.cfg +++ b/resources/quality/artillery/TPU/artillery_0.5_TPU_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = artillery_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_tpu +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_tpu variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/artillery/TPU/artillery_0.5_TPU_standard.inst.cfg b/resources/quality/artillery/TPU/artillery_0.5_TPU_standard.inst.cfg index 6eade56ffa..e8f104a1ea 100644 --- a/resources/quality/artillery/TPU/artillery_0.5_TPU_standard.inst.cfg +++ b/resources/quality/artillery/TPU/artillery_0.5_TPU_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = artillery_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_tpu variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/artillery/TPU/artillery_0.5_TPU_super.inst.cfg b/resources/quality/artillery/TPU/artillery_0.5_TPU_super.inst.cfg index d20cdf1f8d..581d9d7f56 100644 --- a/resources/quality/artillery/TPU/artillery_0.5_TPU_super.inst.cfg +++ b/resources/quality/artillery/TPU/artillery_0.5_TPU_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = artillery_base +name = Super Quality +version = 4 [metadata] +material = generic_tpu +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_tpu variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/artillery/TPU/artillery_0.6_TPU_standard.inst.cfg b/resources/quality/artillery/TPU/artillery_0.6_TPU_standard.inst.cfg index 50a4ea4083..69300dc8de 100644 --- a/resources/quality/artillery/TPU/artillery_0.6_TPU_standard.inst.cfg +++ b/resources/quality/artillery/TPU/artillery_0.6_TPU_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = artillery_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_tpu variant = 0.6mm Nozzle [values] + diff --git a/resources/quality/artillery/TPU/artillery_0.8_TPU_draft.inst.cfg b/resources/quality/artillery/TPU/artillery_0.8_TPU_draft.inst.cfg index 5b3086475b..8315b6bbce 100644 --- a/resources/quality/artillery/TPU/artillery_0.8_TPU_draft.inst.cfg +++ b/resources/quality/artillery/TPU/artillery_0.8_TPU_draft.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = artillery_base +name = Draft Quality +version = 4 [metadata] +material = generic_tpu +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_tpu variant = 0.8mm Nozzle [values] + diff --git a/resources/quality/artillery/TPU/artillery_1.0_TPU_draft.inst.cfg b/resources/quality/artillery/TPU/artillery_1.0_TPU_draft.inst.cfg index 849f845dd2..adcc8b7e81 100644 --- a/resources/quality/artillery/TPU/artillery_1.0_TPU_draft.inst.cfg +++ b/resources/quality/artillery/TPU/artillery_1.0_TPU_draft.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = artillery_base +name = Draft Quality +version = 4 [metadata] +material = generic_tpu +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_tpu variant = 1.0mm Nozzle [values] + diff --git a/resources/quality/artillery/artillery_global_adaptive.inst.cfg b/resources/quality/artillery/artillery_global_adaptive.inst.cfg index accde6de2d..47fcd2476f 100644 --- a/resources/quality/artillery/artillery_global_adaptive.inst.cfg +++ b/resources/quality/artillery/artillery_global_adaptive.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Dynamic Quality definition = artillery_base +name = Dynamic Quality +version = 4 [metadata] +global_quality = True +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive weight = -2 -global_quality = True [values] +adaptive_layer_height_enabled = true layer_height = 0.16 layer_height_0 = 0.20 +support_interface_height = =layer_height*6 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/artillery/artillery_global_draft.inst.cfg b/resources/quality/artillery/artillery_global_draft.inst.cfg index d339675de1..2536e00e6d 100644 --- a/resources/quality/artillery/artillery_global_draft.inst.cfg +++ b/resources/quality/artillery/artillery_global_draft.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Draft Quality definition = artillery_base +name = Draft Quality +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -5 -global_quality = True [values] layer_height = 0.32 layer_height_0 = 0.32 +support_interface_height = =layer_height*4 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/artillery/artillery_global_low.inst.cfg b/resources/quality/artillery/artillery_global_low.inst.cfg index 1b694a7a12..001f1fd7b8 100644 --- a/resources/quality/artillery/artillery_global_low.inst.cfg +++ b/resources/quality/artillery/artillery_global_low.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Low Quality definition = artillery_base +name = Low Quality +version = 4 [metadata] +global_quality = True +quality_type = low setting_version = 20 type = quality -quality_type = low weight = -4 -global_quality = True [values] layer_height = 0.28 layer_height_0 = 0.28 +support_interface_height = =layer_height*4 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/artillery/artillery_global_standard.inst.cfg b/resources/quality/artillery/artillery_global_standard.inst.cfg index 753004c302..027e5323d7 100644 --- a/resources/quality/artillery/artillery_global_standard.inst.cfg +++ b/resources/quality/artillery/artillery_global_standard.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Standard Quality definition = artillery_base +name = Standard Quality +version = 4 [metadata] +global_quality = True +quality_type = standard setting_version = 20 type = quality -quality_type = standard weight = -3 -global_quality = True [values] layer_height = 0.2 layer_height_0 = 0.2 +support_interface_height = =layer_height*5 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/artillery/artillery_global_super.inst.cfg b/resources/quality/artillery/artillery_global_super.inst.cfg index 51973f48d9..fce729eb6b 100644 --- a/resources/quality/artillery/artillery_global_super.inst.cfg +++ b/resources/quality/artillery/artillery_global_super.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Super Quality definition = artillery_base +name = Super Quality +version = 4 [metadata] +global_quality = True +quality_type = super setting_version = 20 type = quality -quality_type = super weight = -1 -global_quality = True [values] layer_height = 0.12 layer_height_0 = 0.12 +support_interface_height = =layer_height*8 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/artillery/artillery_global_ultra.inst.cfg b/resources/quality/artillery/artillery_global_ultra.inst.cfg index 561e10b2df..34c834740b 100644 --- a/resources/quality/artillery/artillery_global_ultra.inst.cfg +++ b/resources/quality/artillery/artillery_global_ultra.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Ultra Quality definition = artillery_base +name = Ultra Quality +version = 4 [metadata] +global_quality = True +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra weight = 0 -global_quality = True [values] layer_height = 0.08 layer_height_0 = 0.12 +support_interface_height = =layer_height*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/artillery/nylon/artillery_0.2_Nylon_super.inst.cfg b/resources/quality/artillery/nylon/artillery_0.2_Nylon_super.inst.cfg index b42785269d..a000327db5 100644 --- a/resources/quality/artillery/nylon/artillery_0.2_Nylon_super.inst.cfg +++ b/resources/quality/artillery/nylon/artillery_0.2_Nylon_super.inst.cfg @@ -1,14 +1,15 @@ -[general] -version = 4 -name = Super Quality -definition = artillery_base - -[metadata] -setting_version = 20 -type = quality -quality_type = super -material = generic_nylon -variant = 0.2mm Nozzle - -[values] -wall_thickness = =line_width*8 +[general] +definition = artillery_base +name = Super Quality +version = 4 + +[metadata] +material = generic_nylon +quality_type = super +setting_version = 20 +type = quality +variant = 0.2mm Nozzle + +[values] +wall_thickness = =line_width*8 + diff --git a/resources/quality/artillery/nylon/artillery_0.2_Nylon_ultra.inst.cfg b/resources/quality/artillery/nylon/artillery_0.2_Nylon_ultra.inst.cfg index 7c81c04978..3986c9dc03 100644 --- a/resources/quality/artillery/nylon/artillery_0.2_Nylon_ultra.inst.cfg +++ b/resources/quality/artillery/nylon/artillery_0.2_Nylon_ultra.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Ultra Quality definition = artillery_base +name = Ultra Quality +version = 4 [metadata] +material = generic_nylon +quality_type = ultra 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/artillery/nylon/artillery_0.3_Nylon_adaptive.inst.cfg b/resources/quality/artillery/nylon/artillery_0.3_Nylon_adaptive.inst.cfg index 9015d6a029..c40ae79b24 100644 --- a/resources/quality/artillery/nylon/artillery_0.3_Nylon_adaptive.inst.cfg +++ b/resources/quality/artillery/nylon/artillery_0.3_Nylon_adaptive.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = artillery_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_nylon +quality_type = adaptive 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/artillery/nylon/artillery_0.3_Nylon_low.inst.cfg b/resources/quality/artillery/nylon/artillery_0.3_Nylon_low.inst.cfg index d0330f37ca..a9768585dc 100644 --- a/resources/quality/artillery/nylon/artillery_0.3_Nylon_low.inst.cfg +++ b/resources/quality/artillery/nylon/artillery_0.3_Nylon_low.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = artillery_base +name = Low Quality +version = 4 [metadata] +material = generic_nylon +quality_type = low 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/artillery/nylon/artillery_0.3_Nylon_standard.inst.cfg b/resources/quality/artillery/nylon/artillery_0.3_Nylon_standard.inst.cfg index 34467e4402..2642194f7b 100644 --- a/resources/quality/artillery/nylon/artillery_0.3_Nylon_standard.inst.cfg +++ b/resources/quality/artillery/nylon/artillery_0.3_Nylon_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = artillery_base +name = Standard Quality +version = 4 [metadata] +material = generic_nylon +quality_type = standard 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/artillery/nylon/artillery_0.3_Nylon_super.inst.cfg b/resources/quality/artillery/nylon/artillery_0.3_Nylon_super.inst.cfg index f616c4445d..1270c4b4f0 100644 --- a/resources/quality/artillery/nylon/artillery_0.3_Nylon_super.inst.cfg +++ b/resources/quality/artillery/nylon/artillery_0.3_Nylon_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = artillery_base +name = Super Quality +version = 4 [metadata] +material = generic_nylon +quality_type = super 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/artillery/nylon/artillery_0.4_Nylon_adaptive.inst.cfg b/resources/quality/artillery/nylon/artillery_0.4_Nylon_adaptive.inst.cfg index 7aba6d1056..73a55eb0a2 100644 --- a/resources/quality/artillery/nylon/artillery_0.4_Nylon_adaptive.inst.cfg +++ b/resources/quality/artillery/nylon/artillery_0.4_Nylon_adaptive.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = artillery_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_nylon +quality_type = adaptive 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/artillery/nylon/artillery_0.4_Nylon_low.inst.cfg b/resources/quality/artillery/nylon/artillery_0.4_Nylon_low.inst.cfg index 8108a72100..6b42f03717 100644 --- a/resources/quality/artillery/nylon/artillery_0.4_Nylon_low.inst.cfg +++ b/resources/quality/artillery/nylon/artillery_0.4_Nylon_low.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = artillery_base +name = Low Quality +version = 4 [metadata] +material = generic_nylon +quality_type = low 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/artillery/nylon/artillery_0.4_Nylon_standard.inst.cfg b/resources/quality/artillery/nylon/artillery_0.4_Nylon_standard.inst.cfg index 3e42cdd8c6..9a7b0fcc54 100644 --- a/resources/quality/artillery/nylon/artillery_0.4_Nylon_standard.inst.cfg +++ b/resources/quality/artillery/nylon/artillery_0.4_Nylon_standard.inst.cfg @@ -1,14 +1,15 @@ -[general] -version = 4 -name = Standard Quality -definition = artillery_base - -[metadata] -setting_version = 20 -type = quality -quality_type = standard -material = generic_nylon -variant = 0.4mm Nozzle - -[values] -wall_thickness = =line_width*4 +[general] +definition = artillery_base +name = Standard Quality +version = 4 + +[metadata] +material = generic_nylon +quality_type = standard +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 + diff --git a/resources/quality/artillery/nylon/artillery_0.4_Nylon_super.inst.cfg b/resources/quality/artillery/nylon/artillery_0.4_Nylon_super.inst.cfg index 8ba9bc408d..68ddd2f0d3 100644 --- a/resources/quality/artillery/nylon/artillery_0.4_Nylon_super.inst.cfg +++ b/resources/quality/artillery/nylon/artillery_0.4_Nylon_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = artillery_base +name = Super Quality +version = 4 [metadata] +material = generic_nylon +quality_type = super 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/artillery/nylon/artillery_0.5_Nylon_adaptive.inst.cfg b/resources/quality/artillery/nylon/artillery_0.5_Nylon_adaptive.inst.cfg index 63d34a3220..278e5673cd 100644 --- a/resources/quality/artillery/nylon/artillery_0.5_Nylon_adaptive.inst.cfg +++ b/resources/quality/artillery/nylon/artillery_0.5_Nylon_adaptive.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = artillery_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_nylon +quality_type = adaptive 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/artillery/nylon/artillery_0.5_Nylon_low.inst.cfg b/resources/quality/artillery/nylon/artillery_0.5_Nylon_low.inst.cfg index fbff8330d9..2ca49ee308 100644 --- a/resources/quality/artillery/nylon/artillery_0.5_Nylon_low.inst.cfg +++ b/resources/quality/artillery/nylon/artillery_0.5_Nylon_low.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = artillery_base +name = Low Quality +version = 4 [metadata] +material = generic_nylon +quality_type = low 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/artillery/nylon/artillery_0.5_Nylon_standard.inst.cfg b/resources/quality/artillery/nylon/artillery_0.5_Nylon_standard.inst.cfg index da3cf828bc..7892675a28 100644 --- a/resources/quality/artillery/nylon/artillery_0.5_Nylon_standard.inst.cfg +++ b/resources/quality/artillery/nylon/artillery_0.5_Nylon_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = artillery_base +name = Standard Quality +version = 4 [metadata] +material = generic_nylon +quality_type = standard 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/artillery/nylon/artillery_0.5_Nylon_super.inst.cfg b/resources/quality/artillery/nylon/artillery_0.5_Nylon_super.inst.cfg index 6a1f6e285c..4500e34417 100644 --- a/resources/quality/artillery/nylon/artillery_0.5_Nylon_super.inst.cfg +++ b/resources/quality/artillery/nylon/artillery_0.5_Nylon_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = artillery_base +name = Super Quality +version = 4 [metadata] +material = generic_nylon +quality_type = super 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/artillery/nylon/artillery_0.6_Nylon_standard.inst.cfg b/resources/quality/artillery/nylon/artillery_0.6_Nylon_standard.inst.cfg index 16c25272f4..240048d3f3 100644 --- a/resources/quality/artillery/nylon/artillery_0.6_Nylon_standard.inst.cfg +++ b/resources/quality/artillery/nylon/artillery_0.6_Nylon_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = artillery_base +name = Standard Quality +version = 4 [metadata] +material = generic_nylon +quality_type = standard 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/artillery/nylon/artillery_0.8_Nylon_draft.inst.cfg b/resources/quality/artillery/nylon/artillery_0.8_Nylon_draft.inst.cfg index 23c4a9dd59..5ee2435e7d 100644 --- a/resources/quality/artillery/nylon/artillery_0.8_Nylon_draft.inst.cfg +++ b/resources/quality/artillery/nylon/artillery_0.8_Nylon_draft.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = artillery_base +name = Draft Quality +version = 4 [metadata] +material = generic_nylon +quality_type = draft 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/artillery/nylon/artillery_1.0_Nylon_draft.inst.cfg b/resources/quality/artillery/nylon/artillery_1.0_Nylon_draft.inst.cfg index 84eb99c35b..d0287c0b9a 100644 --- a/resources/quality/artillery/nylon/artillery_1.0_Nylon_draft.inst.cfg +++ b/resources/quality/artillery/nylon/artillery_1.0_Nylon_draft.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = artillery_base +name = Draft Quality +version = 4 [metadata] +material = generic_nylon +quality_type = draft 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/atmat_signal_pro/signal_pro_global_extrafast_quality.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_global_extrafast_quality.inst.cfg index 44224b2bb6..9c0ed88900 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_global_extrafast_quality.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_global_extrafast_quality.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = atmat_signal_pro_base +name = Extra Fast +version = 4 [metadata] +global_quality = True +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -global_quality = True [values] layer_height = 0.3 diff --git a/resources/quality/atmat_signal_pro/signal_pro_global_extrafine_quality.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_global_extrafine_quality.inst.cfg index 3044e414a0..59836061ed 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_global_extrafine_quality.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_global_extrafine_quality.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fine definition = atmat_signal_pro_base +name = Extra Fine +version = 4 [metadata] +global_quality = True +quality_type = extrafine setting_version = 20 type = quality -quality_type = extrafine -global_quality = True [values] layer_height = 0.06 diff --git a/resources/quality/atmat_signal_pro/signal_pro_global_fast_quality.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_global_fast_quality.inst.cfg index 2ab4597ce2..0ebcfa51f1 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_global_fast_quality.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_global_fast_quality.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = atmat_signal_pro_base +name = Fast +version = 4 [metadata] +global_quality = True +quality_type = fast setting_version = 20 type = quality -quality_type = fast -global_quality = True [values] layer_height = 0.2 diff --git a/resources/quality/atmat_signal_pro/signal_pro_global_fine_quality.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_global_fine_quality.inst.cfg index 59a32d1bd3..91cceba0ff 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_global_fine_quality.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_global_fine_quality.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fine definition = atmat_signal_pro_base +name = Fine +version = 4 [metadata] +global_quality = True +quality_type = fine setting_version = 20 type = quality -quality_type = fine -global_quality = True [values] layer_height = 0.1 diff --git a/resources/quality/atmat_signal_pro/signal_pro_global_normal_quality.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_global_normal_quality.inst.cfg index f93a063828..c0de78f651 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_global_normal_quality.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_global_normal_quality.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Normal definition = atmat_signal_pro_base +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal -global_quality = True [values] layer_height = 0.15 diff --git a/resources/quality/atmat_signal_pro/signal_pro_global_sprint_quality.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_global_sprint_quality.inst.cfg index 2f5f624d96..f392ded58c 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_global_sprint_quality.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_global_sprint_quality.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = atmat_signal_pro_base +name = Sprint +version = 4 [metadata] +global_quality = True +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -global_quality = True [values] layer_height = 0.4 diff --git a/resources/quality/atmat_signal_pro/signal_pro_global_supersprint_quality.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_global_supersprint_quality.inst.cfg index e9fb443fec..63e97737ba 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_global_supersprint_quality.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_global_supersprint_quality.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Super Sprint definition = atmat_signal_pro_base +name = Super Sprint +version = 4 [metadata] +global_quality = True +quality_type = supersprint setting_version = 20 type = quality -quality_type = supersprint -global_quality = True [values] layer_height = 0.5 diff --git a/resources/quality/atmat_signal_pro/signal_pro_global_ultrasprint_quality.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_global_ultrasprint_quality.inst.cfg index d67ec9abf5..e5b5c12ed2 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_global_ultrasprint_quality.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_global_ultrasprint_quality.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Ultra Sprint definition = atmat_signal_pro_base +name = Ultra Sprint +version = 4 [metadata] +global_quality = True +quality_type = ultrasprint setting_version = 20 type = quality -quality_type = ultrasprint -global_quality = True [values] layer_height = 0.6 diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_ABS_extrafast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_ABS_extrafast.inst.cfg index 0c4760e559..11c7d92dd0 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_ABS_extrafast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_ABS_extrafast.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Extra Fast definition = atmat_signal_pro_base +name = Extra Fast +version = 4 [metadata] +material = generic_abs_175 +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_abs_175 variant = V6 0.40mm [values] +build_volume_temperature = 40 +cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 20 material_print_temperature = =default_material_print_temperature + 25 -build_volume_temperature = 40 -speed_print = 50 retraction_amount = 1.2 -cool_fan_enabled = False \ No newline at end of file +speed_print = 50 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_ABS_fast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_ABS_fast.inst.cfg index c8944878d6..7bc7b37ef1 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_ABS_fast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_ABS_fast.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Fast definition = atmat_signal_pro_base +name = Fast +version = 4 [metadata] +material = generic_abs_175 +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_abs_175 variant = V6 0.40mm [values] +build_volume_temperature = 40 +cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 20 material_print_temperature = =default_material_print_temperature + 25 -build_volume_temperature = 40 -speed_print = 50 retraction_amount = 1.2 -cool_fan_enabled = False \ No newline at end of file +speed_print = 50 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_ABS_fine.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_ABS_fine.inst.cfg index 68a257e64d..4b7753aaca 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_ABS_fine.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_ABS_fine.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Fine definition = atmat_signal_pro_base +name = Fine +version = 4 [metadata] +material = generic_abs_175 +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_abs_175 variant = V6 0.40mm [values] +build_volume_temperature = 40 +cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 20 material_print_temperature = =default_material_print_temperature + 25 -build_volume_temperature = 40 -speed_print = 50 retraction_amount = 1.2 -cool_fan_enabled = False \ No newline at end of file +speed_print = 50 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_ABS_normal.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_ABS_normal.inst.cfg index fa0420560b..deedc5691c 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_ABS_normal.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_ABS_normal.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Normal definition = atmat_signal_pro_base +name = Normal +version = 4 [metadata] +material = generic_abs_175 +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_abs_175 variant = V6 0.40mm [values] +build_volume_temperature = 40 +cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 20 material_print_temperature = =default_material_print_temperature + 25 -build_volume_temperature = 40 -speed_print = 50 retraction_amount = 1.2 -cool_fan_enabled = False \ No newline at end of file +speed_print = 50 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_HIPS_extrafast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_HIPS_extrafast.inst.cfg index 79052dbb28..2b5ad83bfb 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_HIPS_extrafast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_HIPS_extrafast.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Extra Fast definition = atmat_signal_pro_base +name = Extra Fast +version = 4 [metadata] +material = generic_hips_175 +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_hips_175 variant = V6 0.40mm [values] +build_volume_temperature = 40 +cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 25 material_print_temperature = =default_material_print_temperature + 50 -build_volume_temperature = 40 -speed_print = 40 retraction_amount = 1 -cool_fan_enabled = False \ No newline at end of file +speed_print = 40 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_HIPS_fast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_HIPS_fast.inst.cfg index 01ec8c4c88..6f278fe535 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_HIPS_fast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_HIPS_fast.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Fast definition = atmat_signal_pro_base +name = Fast +version = 4 [metadata] +material = generic_hips_175 +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_hips_175 variant = V6 0.40mm [values] +build_volume_temperature = 40 +cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 25 material_print_temperature = =default_material_print_temperature + 50 -build_volume_temperature = 40 -speed_print = 40 retraction_amount = 1 -cool_fan_enabled = False \ No newline at end of file +speed_print = 40 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_HIPS_fine.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_HIPS_fine.inst.cfg index f379582627..6138cfc239 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_HIPS_fine.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_HIPS_fine.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Fine definition = atmat_signal_pro_base +name = Fine +version = 4 [metadata] +material = generic_hips_175 +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_hips_175 variant = V6 0.40mm [values] +build_volume_temperature = 40 +cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 25 material_print_temperature = =default_material_print_temperature + 50 -build_volume_temperature = 40 -speed_print = 40 retraction_amount = 1 -cool_fan_enabled = False \ No newline at end of file +speed_print = 40 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_HIPS_normal.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_HIPS_normal.inst.cfg index b0e35d59f7..b4ef060bf0 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_HIPS_normal.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_HIPS_normal.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Normal definition = atmat_signal_pro_base +name = Normal +version = 4 [metadata] +material = generic_hips_175 +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_hips_175 variant = V6 0.40mm [values] +build_volume_temperature = 40 +cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 25 material_print_temperature = =default_material_print_temperature + 50 -build_volume_temperature = 40 -speed_print = 40 retraction_amount = 1 -cool_fan_enabled = False +speed_print = 40 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PA_extrafast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PA_extrafast.inst.cfg index a4d67992fd..3d305dbf13 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PA_extrafast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PA_extrafast.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Extra Fast definition = atmat_signal_pro_base +name = Extra Fast +version = 4 [metadata] +material = generic_nylon_175 +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_nylon_175 variant = V6 0.40mm [values] +build_volume_temperature = 40 +cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 10 material_print_temperature = =default_material_print_temperature + 20 -build_volume_temperature = 40 -speed_print = 30 retraction_amount = 1 -cool_fan_enabled = False \ No newline at end of file +speed_print = 30 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PA_fast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PA_fast.inst.cfg index 94628518c8..62189c2f85 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PA_fast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PA_fast.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Fast definition = atmat_signal_pro_base +name = Fast +version = 4 [metadata] +material = generic_nylon_175 +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_nylon_175 variant = V6 0.40mm [values] +build_volume_temperature = 40 +cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 10 material_print_temperature = =default_material_print_temperature + 20 -build_volume_temperature = 40 -speed_print = 30 retraction_amount = 1 -cool_fan_enabled = False \ No newline at end of file +speed_print = 30 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PA_fine.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PA_fine.inst.cfg index 025e3eff12..a5fa668eb4 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PA_fine.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PA_fine.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Fine definition = atmat_signal_pro_base +name = Fine +version = 4 [metadata] +material = generic_nylon_175 +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_nylon_175 variant = V6 0.40mm [values] +build_volume_temperature = 40 +cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 10 material_print_temperature = =default_material_print_temperature + 20 -build_volume_temperature = 40 -speed_print = 30 retraction_amount = 1 -cool_fan_enabled = False \ No newline at end of file +speed_print = 30 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PA_normal.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PA_normal.inst.cfg index 7a66890003..7153ee22ab 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PA_normal.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PA_normal.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Normal definition = atmat_signal_pro_base +name = Normal +version = 4 [metadata] +material = generic_nylon_175 +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_nylon_175 variant = V6 0.40mm [values] +build_volume_temperature = 40 +cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 10 material_print_temperature = =default_material_print_temperature + 20 -build_volume_temperature = 40 -speed_print = 30 retraction_amount = 1 -cool_fan_enabled = False +speed_print = 30 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PC_extrafast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PC_extrafast.inst.cfg index 88b29987b7..7714661b60 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PC_extrafast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PC_extrafast.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Extra Fast definition = atmat_signal_pro_base +name = Extra Fast +version = 4 [metadata] +material = generic_pc_175 +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_pc_175 variant = V6 0.40mm [values] +build_volume_temperature = 45 +cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 20 material_print_temperature = =default_material_print_temperature + 13 -build_volume_temperature = 45 -speed_print = 25 retraction_amount = 1 -cool_fan_enabled = False \ No newline at end of file +speed_print = 25 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PC_fast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PC_fast.inst.cfg index 91d1a06fef..d7f915c09c 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PC_fast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PC_fast.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Fast definition = atmat_signal_pro_base +name = Fast +version = 4 [metadata] +material = generic_pc_175 +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_pc_175 variant = V6 0.40mm [values] +build_volume_temperature = 45 +cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 20 material_print_temperature = =default_material_print_temperature + 13 -build_volume_temperature = 45 -speed_print = 25 retraction_amount = 1 -cool_fan_enabled = False \ No newline at end of file +speed_print = 25 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PC_fine.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PC_fine.inst.cfg index 1bd97ba58f..023d5880c5 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PC_fine.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PC_fine.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Fine definition = atmat_signal_pro_base +name = Fine +version = 4 [metadata] +material = generic_pc_175 +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_pc_175 variant = V6 0.40mm [values] +build_volume_temperature = 45 +cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 20 material_print_temperature = =default_material_print_temperature + 13 -build_volume_temperature = 45 -speed_print = 25 retraction_amount = 1 -cool_fan_enabled = False \ No newline at end of file +speed_print = 25 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PC_normal.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PC_normal.inst.cfg index 8b2ef9d8bb..2a57b9767e 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PC_normal.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PC_normal.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Normal definition = atmat_signal_pro_base +name = Normal +version = 4 [metadata] +material = generic_pc_175 +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_pc_175 variant = V6 0.40mm [values] +build_volume_temperature = 45 +cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 20 material_print_temperature = =default_material_print_temperature + 13 -build_volume_temperature = 45 -speed_print = 25 retraction_amount = 1 -cool_fan_enabled = False +speed_print = 25 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PETG_extrafast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PETG_extrafast.inst.cfg index 2b50eaea1a..8ccd5f2f9e 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PETG_extrafast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PETG_extrafast.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Extra Fast definition = atmat_signal_pro_base +name = Extra Fast +version = 4 [metadata] +material = generic_petg_175 +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_petg_175 variant = V6 0.40mm [values] -material_bed_temperature = =default_material_bed_temperature - 5 -material_print_temperature = =default_material_print_temperature + 30 -speed_print = 60 -retraction_amount = 1 cool_fan_speed = 30 cool_fan_speed_max = 50 +material_bed_temperature = =default_material_bed_temperature - 5 +material_print_temperature = =default_material_print_temperature + 30 +retraction_amount = 1 +speed_print = 60 support_fan_enable = True support_supported_skin_fan_speed = 100 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PETG_fast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PETG_fast.inst.cfg index cabc3b7465..6d01d1512b 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PETG_fast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PETG_fast.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Fast definition = atmat_signal_pro_base +name = Fast +version = 4 [metadata] +material = generic_petg_175 +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_petg_175 variant = V6 0.40mm [values] -material_bed_temperature = =default_material_bed_temperature - 5 -material_print_temperature = =default_material_print_temperature + 30 -speed_print = 60 -retraction_amount = 1 cool_fan_speed = 30 cool_fan_speed_max = 50 +material_bed_temperature = =default_material_bed_temperature - 5 +material_print_temperature = =default_material_print_temperature + 30 +retraction_amount = 1 +speed_print = 60 support_fan_enable = True support_supported_skin_fan_speed = 100 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PETG_fine.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PETG_fine.inst.cfg index e082d86d6e..7f473e9ffe 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PETG_fine.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PETG_fine.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Fine definition = atmat_signal_pro_base +name = Fine +version = 4 [metadata] +material = generic_petg_175 +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_petg_175 variant = V6 0.40mm [values] -material_bed_temperature = =default_material_bed_temperature - 5 -material_print_temperature = =default_material_print_temperature + 30 -speed_print = 60 -retraction_amount = 1 cool_fan_speed = 30 cool_fan_speed_max = 50 +material_bed_temperature = =default_material_bed_temperature - 5 +material_print_temperature = =default_material_print_temperature + 30 +retraction_amount = 1 +speed_print = 60 support_fan_enable = True support_supported_skin_fan_speed = 100 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PETG_normal.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PETG_normal.inst.cfg index 83648b751b..0df38c458b 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PETG_normal.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PETG_normal.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Normal definition = atmat_signal_pro_base +name = Normal +version = 4 [metadata] +material = generic_petg_175 +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_petg_175 variant = V6 0.40mm [values] -material_bed_temperature = =default_material_bed_temperature - 5 -material_print_temperature = =default_material_print_temperature + 30 -speed_print = 60 -retraction_amount = 1 cool_fan_speed = 30 cool_fan_speed_max = 50 +material_bed_temperature = =default_material_bed_temperature - 5 +material_print_temperature = =default_material_print_temperature + 30 +retraction_amount = 1 +speed_print = 60 support_fan_enable = True support_supported_skin_fan_speed = 100 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PLA_extrafast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PLA_extrafast.inst.cfg index fc4859fdd9..531b10bb47 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PLA_extrafast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PLA_extrafast.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Extra Fast definition = atmat_signal_pro_base +name = Extra Fast +version = 4 [metadata] +material = generic_pla_175 +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_pla_175 variant = V6 0.40mm [values] -material_print_temperature = =default_material_print_temperature + 20 -speed_print = 70 -retraction_amount = 0.75 cool_fan_speed = 75 cool_fan_speed_max = 100 +material_print_temperature = =default_material_print_temperature + 20 +retraction_amount = 0.75 +speed_print = 70 support_fan_enable = True -support_supported_skin_fan_speed = 100 \ No newline at end of file +support_supported_skin_fan_speed = 100 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PLA_fast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PLA_fast.inst.cfg index 663077a320..85f22227e5 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PLA_fast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PLA_fast.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Fast definition = atmat_signal_pro_base +name = Fast +version = 4 [metadata] +material = generic_pla_175 +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_pla_175 variant = V6 0.40mm [values] -material_print_temperature = =default_material_print_temperature + 15 -speed_print = 70 -retraction_amount = 0.75 cool_fan_speed = 75 cool_fan_speed_max = 100 +material_print_temperature = =default_material_print_temperature + 15 +retraction_amount = 0.75 +speed_print = 70 support_fan_enable = True -support_supported_skin_fan_speed = 100 \ No newline at end of file +support_supported_skin_fan_speed = 100 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PLA_fine.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PLA_fine.inst.cfg index fe603bf350..3b82f2bd44 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PLA_fine.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PLA_fine.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Fine definition = atmat_signal_pro_base +name = Fine +version = 4 [metadata] +material = generic_pla_175 +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_pla_175 variant = V6 0.40mm [values] -material_print_temperature = =default_material_print_temperature + 5 -speed_print = 70 -retraction_amount = 0.75 cool_fan_speed = 75 cool_fan_speed_max = 100 +material_print_temperature = =default_material_print_temperature + 5 +retraction_amount = 0.75 +speed_print = 70 support_fan_enable = True -support_supported_skin_fan_speed = 100 \ No newline at end of file +support_supported_skin_fan_speed = 100 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PLA_normal.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PLA_normal.inst.cfg index a8fe76ff25..539c2abc9c 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PLA_normal.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PLA_normal.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Normal definition = atmat_signal_pro_base +name = Normal +version = 4 [metadata] +material = generic_pla_175 +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_pla_175 variant = V6 0.40mm [values] -material_print_temperature = =default_material_print_temperature + 10 -speed_print = 70 -retraction_amount = 0.75 cool_fan_speed = 75 cool_fan_speed_max = 100 +material_print_temperature = =default_material_print_temperature + 10 +retraction_amount = 0.75 +speed_print = 70 support_fan_enable = True -support_supported_skin_fan_speed = 100 \ No newline at end of file +support_supported_skin_fan_speed = 100 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PVA_extrafast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PVA_extrafast.inst.cfg index fb75df154a..667ff1ff8e 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PVA_extrafast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PVA_extrafast.inst.cfg @@ -1,24 +1,25 @@ [general] -version = 4 -name = Extra Fast definition = atmat_signal_pro_base +name = Extra Fast +version = 4 [metadata] +material = generic_pva_175 +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_pva_175 variant = V6 0.40mm [values] -material_print_temperature = =default_material_print_temperature -speed_print = 30 -retraction_amount = 1 -cool_fan_enabled = False brim_replaces_support = False +cool_fan_enabled = False +material_print_temperature = =default_material_print_temperature +retraction_amount = 1 +speed_print = 30 +support_bottom_distance = =support_z_distance support_brim_enable = True support_pattern = triangles -support_xy_distance_overhang = 0 -support_bottom_distance = =support_z_distance support_use_towers = False -support_z_distance = 0 \ No newline at end of file +support_xy_distance_overhang = 0 +support_z_distance = 0 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PVA_fast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PVA_fast.inst.cfg index 2c39163f24..252f475131 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PVA_fast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PVA_fast.inst.cfg @@ -1,24 +1,25 @@ [general] -version = 4 -name = Fast definition = atmat_signal_pro_base +name = Fast +version = 4 [metadata] +material = generic_pva_175 +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_pva_175 variant = V6 0.40mm [values] -material_print_temperature = =default_material_print_temperature -speed_print = 30 -retraction_amount = 1 -cool_fan_enabled = False brim_replaces_support = False +cool_fan_enabled = False +material_print_temperature = =default_material_print_temperature +retraction_amount = 1 +speed_print = 30 +support_bottom_distance = =support_z_distance support_brim_enable = True support_pattern = triangles -support_xy_distance_overhang = 0 -support_bottom_distance = =support_z_distance support_use_towers = False -support_z_distance = 0 \ No newline at end of file +support_xy_distance_overhang = 0 +support_z_distance = 0 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PVA_fine.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PVA_fine.inst.cfg index c516cd2fb6..9ffa1f2e8d 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PVA_fine.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PVA_fine.inst.cfg @@ -1,24 +1,25 @@ [general] -version = 4 -name = Fine definition = atmat_signal_pro_base +name = Fine +version = 4 [metadata] +material = generic_pva_175 +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_pva_175 variant = V6 0.40mm [values] -material_print_temperature = =default_material_print_temperature -speed_print = 30 -retraction_amount = 1 -cool_fan_enabled = False brim_replaces_support = False +cool_fan_enabled = False +material_print_temperature = =default_material_print_temperature +retraction_amount = 1 +speed_print = 30 +support_bottom_distance = =support_z_distance support_brim_enable = True support_pattern = triangles -support_xy_distance_overhang = 0 -support_bottom_distance = =support_z_distance support_use_towers = False -support_z_distance = 0 \ No newline at end of file +support_xy_distance_overhang = 0 +support_z_distance = 0 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PVA_normal.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PVA_normal.inst.cfg index 606e9c8a97..7d255df79d 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PVA_normal.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_PVA_normal.inst.cfg @@ -1,24 +1,25 @@ [general] -version = 4 -name = Normal definition = atmat_signal_pro_base +name = Normal +version = 4 [metadata] +material = generic_pva_175 +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_pva_175 variant = V6 0.40mm [values] -material_print_temperature = =default_material_print_temperature -speed_print = 30 -retraction_amount = 1 -cool_fan_enabled = False brim_replaces_support = False +cool_fan_enabled = False +material_print_temperature = =default_material_print_temperature +retraction_amount = 1 +speed_print = 30 +support_bottom_distance = =support_z_distance support_brim_enable = True support_pattern = triangles -support_xy_distance_overhang = 0 -support_bottom_distance = =support_z_distance support_use_towers = False -support_z_distance = 0 \ No newline at end of file +support_xy_distance_overhang = 0 +support_z_distance = 0 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_TPU_extrafast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_TPU_extrafast.inst.cfg index ab2447cea4..396b5d3a86 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_TPU_extrafast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_TPU_extrafast.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Extra Fast definition = atmat_signal_pro_base +name = Extra Fast +version = 4 [metadata] +material = generic_tpu_175 +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_tpu_175 variant = V6 0.40mm [values] +build_volume_temperature = 30 +cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 60 material_print_temperature = =default_material_print_temperature + 20 -build_volume_temperature = 30 -speed_print = 30 retraction_amount = 1 -cool_fan_enabled = False \ No newline at end of file +speed_print = 30 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_TPU_fast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_TPU_fast.inst.cfg index 1e458711a1..a6e2c9dc0e 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_TPU_fast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_TPU_fast.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Fast definition = atmat_signal_pro_base +name = Fast +version = 4 [metadata] +material = generic_tpu_175 +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_tpu_175 variant = V6 0.40mm [values] +build_volume_temperature = 30 +cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 60 material_print_temperature = =default_material_print_temperature + 20 -build_volume_temperature = 30 -speed_print = 30 retraction_amount = 1 -cool_fan_enabled = False \ No newline at end of file +speed_print = 30 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_TPU_fine.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_TPU_fine.inst.cfg index 1241210061..946049b368 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_TPU_fine.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_TPU_fine.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Fine definition = atmat_signal_pro_base +name = Fine +version = 4 [metadata] +material = generic_tpu_175 +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_tpu_175 variant = V6 0.40mm [values] +build_volume_temperature = 30 +cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 60 material_print_temperature = =default_material_print_temperature + 20 -build_volume_temperature = 30 -speed_print = 30 retraction_amount = 1 -cool_fan_enabled = False \ No newline at end of file +speed_print = 30 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_TPU_normal.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_TPU_normal.inst.cfg index ea7d673557..b3b4dbb165 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_TPU_normal.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.40_TPU_normal.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Normal definition = atmat_signal_pro_base +name = Normal +version = 4 [metadata] +material = generic_tpu_175 +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_tpu_175 variant = V6 0.40mm [values] +build_volume_temperature = 30 +cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 60 material_print_temperature = =default_material_print_temperature + 20 -build_volume_temperature = 30 -speed_print = 30 retraction_amount = 1 -cool_fan_enabled = False +speed_print = 30 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_ABS_extrafast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_ABS_extrafast.inst.cfg index 997def5b71..f7dce9aae7 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_ABS_extrafast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_ABS_extrafast.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Extra Fast definition = atmat_signal_pro_base +name = Extra Fast +version = 4 [metadata] +material = generic_abs_175 +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_abs_175 variant = V6 0.80mm [values] +build_volume_temperature = 40 +cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 20 material_print_temperature = =default_material_print_temperature + 25 -build_volume_temperature = 40 -speed_print = 50 retraction_amount = 1.2 -cool_fan_enabled = False \ No newline at end of file +speed_print = 50 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_ABS_sprint.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_ABS_sprint.inst.cfg index 9c87913270..24fe41589c 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_ABS_sprint.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_ABS_sprint.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Sprint definition = atmat_signal_pro_base +name = Sprint +version = 4 [metadata] +material = generic_abs_175 +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_abs_175 variant = V6 0.80mm [values] +build_volume_temperature = 40 +cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 20 material_print_temperature = =default_material_print_temperature + 25 -build_volume_temperature = 40 -speed_print = 50 retraction_amount = 1.2 -cool_fan_enabled = False \ No newline at end of file +speed_print = 50 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_ABS_supersprint.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_ABS_supersprint.inst.cfg index 73f6b96141..223990e16d 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_ABS_supersprint.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_ABS_supersprint.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Super Sprint definition = atmat_signal_pro_base +name = Super Sprint +version = 4 [metadata] +material = generic_abs_175 +quality_type = supersprint setting_version = 20 type = quality -quality_type = supersprint -material = generic_abs_175 variant = V6 0.80mm [values] +build_volume_temperature = 40 +cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 20 material_print_temperature = =default_material_print_temperature + 25 -build_volume_temperature = 40 -speed_print = 50 retraction_amount = 1.2 -cool_fan_enabled = False \ No newline at end of file +speed_print = 50 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_HIPS_extrafast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_HIPS_extrafast.inst.cfg index 7c41f52e26..7c9f29aeb2 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_HIPS_extrafast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_HIPS_extrafast.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Extra Fast definition = atmat_signal_pro_base +name = Extra Fast +version = 4 [metadata] +material = generic_hips_175 +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_hips_175 variant = V6 0.80mm [values] +build_volume_temperature = 40 +cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 35 material_print_temperature = =default_material_print_temperature + 50 -build_volume_temperature = 40 -speed_print = 40 retraction_amount = 1.2 -cool_fan_enabled = False \ No newline at end of file +speed_print = 40 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_HIPS_sprint.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_HIPS_sprint.inst.cfg index 376b4cace3..33980ca46c 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_HIPS_sprint.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_HIPS_sprint.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Sprint definition = atmat_signal_pro_base +name = Sprint +version = 4 [metadata] +material = generic_hips_175 +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_hips_175 variant = V6 0.80mm [values] +build_volume_temperature = 40 +cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 35 material_print_temperature = =default_material_print_temperature + 50 -build_volume_temperature = 40 -speed_print = 40 retraction_amount = 1.2 -cool_fan_enabled = False \ No newline at end of file +speed_print = 40 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_HIPS_supersprint.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_HIPS_supersprint.inst.cfg index ab2de5ac5b..bb66f149c1 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_HIPS_supersprint.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_HIPS_supersprint.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Super Sprint definition = atmat_signal_pro_base +name = Super Sprint +version = 4 [metadata] +material = generic_hips_175 +quality_type = supersprint setting_version = 20 type = quality -quality_type = supersprint -material = generic_hips_175 variant = V6 0.80mm [values] +build_volume_temperature = 40 +cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 35 material_print_temperature = =default_material_print_temperature + 50 -build_volume_temperature = 40 -speed_print = 40 retraction_amount = 1.2 -cool_fan_enabled = False \ No newline at end of file +speed_print = 40 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PA_extrafast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PA_extrafast.inst.cfg index fd5e55f93c..775cef3720 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PA_extrafast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PA_extrafast.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Extra Fast definition = atmat_signal_pro_base +name = Extra Fast +version = 4 [metadata] +material = generic_nylon_175 +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_nylon_175 variant = V6 0.80mm [values] +build_volume_temperature = 40 +cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 20 material_print_temperature = =default_material_print_temperature + 20 -build_volume_temperature = 40 -speed_print = 30 retraction_amount = 1.2 -cool_fan_enabled = False \ No newline at end of file +speed_print = 30 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PA_sprint.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PA_sprint.inst.cfg index 115ad1d75f..38505bfe54 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PA_sprint.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PA_sprint.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Sprint definition = atmat_signal_pro_base +name = Sprint +version = 4 [metadata] +material = generic_nylon_175 +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_nylon_175 variant = V6 0.80mm [values] +build_volume_temperature = 40 +cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 20 material_print_temperature = =default_material_print_temperature + 20 -build_volume_temperature = 40 -speed_print = 30 retraction_amount = 1.2 -cool_fan_enabled = False \ No newline at end of file +speed_print = 30 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PA_supersprint.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PA_supersprint.inst.cfg index 81f204cb4c..8010123617 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PA_supersprint.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PA_supersprint.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Super Sprint definition = atmat_signal_pro_base +name = Super Sprint +version = 4 [metadata] +material = generic_nylon_175 +quality_type = supersprint setting_version = 20 type = quality -quality_type = supersprint -material = generic_nylon_175 variant = V6 0.80mm [values] +build_volume_temperature = 40 +cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 20 material_print_temperature = =default_material_print_temperature + 20 -build_volume_temperature = 40 -speed_print = 30 retraction_amount = 1.2 -cool_fan_enabled = False \ No newline at end of file +speed_print = 30 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PC_extrafast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PC_extrafast.inst.cfg index 0c9351a2b5..5a69c7b216 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PC_extrafast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PC_extrafast.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Extra Fast definition = atmat_signal_pro_base +name = Extra Fast +version = 4 [metadata] +material = generic_pc_175 +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_pc_175 variant = V6 0.80mm [values] +build_volume_temperature = 45 +cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 20 material_print_temperature = =default_material_print_temperature + 13 -build_volume_temperature = 45 -speed_print = 25 retraction_amount = 1.2 -cool_fan_enabled = False \ No newline at end of file +speed_print = 25 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PC_sprint.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PC_sprint.inst.cfg index 36e42c60a5..21559b984e 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PC_sprint.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PC_sprint.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Sprint definition = atmat_signal_pro_base +name = Sprint +version = 4 [metadata] +material = generic_pc_175 +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_pc_175 variant = V6 0.80mm [values] +build_volume_temperature = 45 +cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 20 material_print_temperature = =default_material_print_temperature + 13 -build_volume_temperature = 45 -speed_print = 25 retraction_amount = 1.2 -cool_fan_enabled = False \ No newline at end of file +speed_print = 25 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PC_supersprint.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PC_supersprint.inst.cfg index 62eb141b74..51f985aab7 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PC_supersprint.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PC_supersprint.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Super Sprint definition = atmat_signal_pro_base +name = Super Sprint +version = 4 [metadata] +material = generic_pc_175 +quality_type = supersprint setting_version = 20 type = quality -quality_type = supersprint -material = generic_pc_175 variant = V6 0.80mm [values] +build_volume_temperature = 45 +cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 20 material_print_temperature = =default_material_print_temperature + 13 -build_volume_temperature = 45 -speed_print = 25 retraction_amount = 1.2 -cool_fan_enabled = False \ No newline at end of file +speed_print = 25 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PETG_extrafast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PETG_extrafast.inst.cfg index e566f98433..f7b9b645a4 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PETG_extrafast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PETG_extrafast.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Extra Fast definition = atmat_signal_pro_base +name = Extra Fast +version = 4 [metadata] +material = generic_petg_175 +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_petg_175 variant = V6 0.80mm [values] -material_bed_temperature = =default_material_bed_temperature - 5 -material_print_temperature = =default_material_print_temperature + 40 -speed_print = 40 -retraction_amount = 1.2 cool_fan_speed = 30 cool_fan_speed_max = 50 +material_bed_temperature = =default_material_bed_temperature - 5 +material_print_temperature = =default_material_print_temperature + 40 +retraction_amount = 1.2 +speed_print = 40 support_fan_enable = True support_supported_skin_fan_speed = 100 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PETG_sprint.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PETG_sprint.inst.cfg index a101e61906..4f88ea6ae9 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PETG_sprint.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PETG_sprint.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Sprint definition = atmat_signal_pro_base +name = Sprint +version = 4 [metadata] +material = generic_petg_175 +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_petg_175 variant = V6 0.80mm [values] -material_bed_temperature = =default_material_bed_temperature - 5 -material_print_temperature = =default_material_print_temperature + 40 -speed_print = 30 -retraction_amount = 1.2 cool_fan_speed = 30 cool_fan_speed_max = 50 +material_bed_temperature = =default_material_bed_temperature - 5 +material_print_temperature = =default_material_print_temperature + 40 +retraction_amount = 1.2 +speed_print = 30 support_fan_enable = True support_supported_skin_fan_speed = 100 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PETG_supersprint.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PETG_supersprint.inst.cfg index 273420de1d..2a00625892 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PETG_supersprint.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PETG_supersprint.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Super Sprint definition = atmat_signal_pro_base +name = Super Sprint +version = 4 [metadata] +material = generic_petg_175 +quality_type = supersprint setting_version = 20 type = quality -quality_type = supersprint -material = generic_petg_175 variant = V6 0.80mm [values] -material_bed_temperature = =default_material_bed_temperature - 5 -material_print_temperature = =default_material_print_temperature + 40 -speed_print = 24 -retraction_amount = 1.2 cool_fan_speed = 30 cool_fan_speed_max = 50 +material_bed_temperature = =default_material_bed_temperature - 5 +material_print_temperature = =default_material_print_temperature + 40 +retraction_amount = 1.2 +speed_print = 24 support_fan_enable = True support_supported_skin_fan_speed = 100 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PLA_extrafast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PLA_extrafast.inst.cfg index abe0defbc4..7751ccc1c3 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PLA_extrafast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PLA_extrafast.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Extra Fast definition = atmat_signal_pro_base +name = Extra Fast +version = 4 [metadata] +material = generic_pla_175 +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_pla_175 variant = V6 0.80mm [values] -material_print_temperature = =default_material_print_temperature + 25 -speed_print = 40 -retraction_amount = 1 cool_fan_speed = 75 cool_fan_speed_max = 100 +material_print_temperature = =default_material_print_temperature + 25 +retraction_amount = 1 +speed_print = 40 support_fan_enable = True -support_supported_skin_fan_speed = 100 \ No newline at end of file +support_supported_skin_fan_speed = 100 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PLA_sprint.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PLA_sprint.inst.cfg index 28901100c6..278b4c13b1 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PLA_sprint.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PLA_sprint.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Sprint definition = atmat_signal_pro_base +name = Sprint +version = 4 [metadata] +material = generic_pla_175 +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_pla_175 variant = V6 0.80mm [values] -material_print_temperature = =default_material_print_temperature + 30 -speed_print = 30 -retraction_amount = 1 cool_fan_speed = 75 cool_fan_speed_max = 100 +material_print_temperature = =default_material_print_temperature + 30 +retraction_amount = 1 +speed_print = 30 support_fan_enable = True -support_supported_skin_fan_speed = 100 \ No newline at end of file +support_supported_skin_fan_speed = 100 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PLA_supersprint.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PLA_supersprint.inst.cfg index 116b399abc..ab5c4eebae 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PLA_supersprint.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PLA_supersprint.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Super Sprint definition = atmat_signal_pro_base +name = Super Sprint +version = 4 [metadata] +material = generic_pla_175 +quality_type = supersprint setting_version = 20 type = quality -quality_type = supersprint -material = generic_pla_175 variant = V6 0.80mm [values] -material_print_temperature = =default_material_print_temperature + 30 -speed_print = 24 -retraction_amount = 1 cool_fan_speed = 75 cool_fan_speed_max = 100 +material_print_temperature = =default_material_print_temperature + 30 +retraction_amount = 1 +speed_print = 24 support_fan_enable = True -support_supported_skin_fan_speed = 100 \ No newline at end of file +support_supported_skin_fan_speed = 100 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PVA_extrafast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PVA_extrafast.inst.cfg index 5e26677f4b..0f92a0b554 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PVA_extrafast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PVA_extrafast.inst.cfg @@ -1,24 +1,25 @@ [general] -version = 4 -name = Extra Fast definition = atmat_signal_pro_base +name = Extra Fast +version = 4 [metadata] +material = generic_pva_175 +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_pva_175 variant = V6 0.80mm [values] -material_print_temperature = =default_material_print_temperature -speed_print = 30 -retraction_amount = 1.2 -cool_fan_enabled = False brim_replaces_support = False +cool_fan_enabled = False +material_print_temperature = =default_material_print_temperature +retraction_amount = 1.2 +speed_print = 30 +support_bottom_distance = =support_z_distance support_brim_enable = True support_pattern = triangles -support_xy_distance_overhang = 0 -support_bottom_distance = =support_z_distance support_use_towers = False -support_z_distance = 0 \ No newline at end of file +support_xy_distance_overhang = 0 +support_z_distance = 0 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PVA_sprint.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PVA_sprint.inst.cfg index 19961cc8e9..8dfb226b73 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PVA_sprint.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PVA_sprint.inst.cfg @@ -1,24 +1,25 @@ [general] -version = 4 -name = Sprint definition = atmat_signal_pro_base +name = Sprint +version = 4 [metadata] +material = generic_pva_175 +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_pva_175 variant = V6 0.80mm [values] -material_print_temperature = =default_material_print_temperature -speed_print = 30 -retraction_amount = 1.2 -cool_fan_enabled = False brim_replaces_support = False +cool_fan_enabled = False +material_print_temperature = =default_material_print_temperature +retraction_amount = 1.2 +speed_print = 30 +support_bottom_distance = =support_z_distance support_brim_enable = True support_pattern = triangles -support_xy_distance_overhang = 0 -support_bottom_distance = =support_z_distance support_use_towers = False -support_z_distance = 0 \ No newline at end of file +support_xy_distance_overhang = 0 +support_z_distance = 0 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PVA_supersprint.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PVA_supersprint.inst.cfg index cb48da4f12..eeaeac4a00 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PVA_supersprint.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_PVA_supersprint.inst.cfg @@ -1,24 +1,25 @@ [general] -version = 4 -name = Super Sprint definition = atmat_signal_pro_base +name = Super Sprint +version = 4 [metadata] +material = generic_pva_175 +quality_type = supersprint setting_version = 20 type = quality -quality_type = supersprint -material = generic_pva_175 variant = V6 0.80mm [values] -material_print_temperature = =default_material_print_temperature -speed_print = 30 -retraction_amount = 1.2 -cool_fan_enabled = False brim_replaces_support = False +cool_fan_enabled = False +material_print_temperature = =default_material_print_temperature +retraction_amount = 1.2 +speed_print = 30 +support_bottom_distance = =support_z_distance support_brim_enable = True support_pattern = triangles -support_xy_distance_overhang = 0 -support_bottom_distance = =support_z_distance support_use_towers = False -support_z_distance = 0 \ No newline at end of file +support_xy_distance_overhang = 0 +support_z_distance = 0 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_TPU_extrafast.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_TPU_extrafast.inst.cfg index 7db0650783..0e4a7fcb9a 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_TPU_extrafast.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_TPU_extrafast.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Extra Fast definition = atmat_signal_pro_base +name = Extra Fast +version = 4 [metadata] +material = generic_tpu_175 +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_tpu_175 variant = V6 0.80mm [values] +build_volume_temperature = 30 +cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 60 material_print_temperature = =default_material_print_temperature + 25 -build_volume_temperature = 30 -speed_print = 30 retraction_amount = 1.2 -cool_fan_enabled = False \ No newline at end of file +speed_print = 30 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_TPU_sprint.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_TPU_sprint.inst.cfg index d0c45f0c38..dcd33af5c0 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_TPU_sprint.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_TPU_sprint.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Sprint definition = atmat_signal_pro_base +name = Sprint +version = 4 [metadata] +material = generic_tpu_175 +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_tpu_175 variant = V6 0.80mm [values] +build_volume_temperature = 30 +cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 60 material_print_temperature = =default_material_print_temperature + 25 -build_volume_temperature = 30 -speed_print = 30 retraction_amount = 1.2 -cool_fan_enabled = False \ No newline at end of file +speed_print = 30 + diff --git a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_TPU_supersprint.inst.cfg b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_TPU_supersprint.inst.cfg index 22a14d1444..103234a604 100644 --- a/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_TPU_supersprint.inst.cfg +++ b/resources/quality/atmat_signal_pro/signal_pro_v6_0.80_TPU_supersprint.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Super Sprint definition = atmat_signal_pro_base +name = Super Sprint +version = 4 [metadata] +material = generic_tpu_175 +quality_type = supersprint setting_version = 20 type = quality -quality_type = supersprint -material = generic_tpu_175 variant = V6 0.80mm [values] +build_volume_temperature = 30 +cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 60 material_print_temperature = =default_material_print_temperature + 25 -build_volume_temperature = 30 -speed_print = 30 retraction_amount = 1.2 -cool_fan_enabled = False \ No newline at end of file +speed_print = 30 + diff --git a/resources/quality/beamup_l/beamup_l_coarse.inst.cfg b/resources/quality/beamup_l/beamup_l_coarse.inst.cfg index 2bbd56060f..7381e394e0 100644 --- a/resources/quality/beamup_l/beamup_l_coarse.inst.cfg +++ b/resources/quality/beamup_l/beamup_l_coarse.inst.cfg @@ -1,40 +1,41 @@ -[general] -version = 4 -name = BeamUp L Coarse -definition = beamup_l - -[metadata] -setting_version = 20 -type = quality -quality_type = coarse -weight = -3 -material = generic_pla - -[values] -layer_height = 0.30 -adhesion_type = brim -brim_line_count = 8 -infill_before_walls = False -initial_layer_line_width_factor = 120.0 -material_print_temperature = 215 -material_print_temperature_layer_0 = 235 -retraction_amount = 2 -retraction_speed = 30 -speed_infill = 55 -speed_layer_0 = 25 -speed_print = 55 -speed_support_interface = 55 -speed_topbottom = 55 -speed_wall_0 = 45 -speed_wall_x = 55 -support_enable = True -support_angle = 60 -support_infill_rate = 20 -support_interface_enable = True -support_interface_height = 0.60 -support_interface_pattern = zigzag -support_interface_skip_height = 0.30 -support_offset = 0.8 -support_z_distance = 0.4 -wall_thickness = 1.6 -zig_zaggify_infill = True +[general] +definition = beamup_l +name = BeamUp L Coarse +version = 4 + +[metadata] +material = generic_pla +quality_type = coarse +setting_version = 20 +type = quality +weight = -3 + +[values] +adhesion_type = brim +brim_line_count = 8 +infill_before_walls = False +initial_layer_line_width_factor = 120.0 +layer_height = 0.30 +material_print_temperature = 215 +material_print_temperature_layer_0 = 235 +retraction_amount = 2 +retraction_speed = 30 +speed_infill = 55 +speed_layer_0 = 25 +speed_print = 55 +speed_support_interface = 55 +speed_topbottom = 55 +speed_wall_0 = 45 +speed_wall_x = 55 +support_angle = 60 +support_enable = True +support_infill_rate = 20 +support_interface_enable = True +support_interface_height = 0.60 +support_interface_pattern = zigzag +support_interface_skip_height = 0.30 +support_offset = 0.8 +support_z_distance = 0.4 +wall_thickness = 1.6 +zig_zaggify_infill = True + diff --git a/resources/quality/beamup_l/beamup_l_draft.inst.cfg b/resources/quality/beamup_l/beamup_l_draft.inst.cfg index f3207ce0cc..adbe5a4183 100644 --- a/resources/quality/beamup_l/beamup_l_draft.inst.cfg +++ b/resources/quality/beamup_l/beamup_l_draft.inst.cfg @@ -1,40 +1,41 @@ -[general] -version = 4 -name = BeamUp L Draft -definition = beamup_l - -[metadata] -setting_version = 20 -type = quality -quality_type = draft -weight = -2 -material = generic_pla - -[values] -layer_height = 0.2 -adhesion_type = brim -brim_line_count = 8 -infill_before_walls = False -initial_layer_line_width_factor = 120.0 -material_print_temperature = 210 -material_print_temperature_layer_0 = 235 -retraction_amount = 2 -retraction_speed = 30 -speed_infill = 55 -speed_layer_0 = 25 -speed_print = 55 -speed_support_interface = 55 -speed_topbottom = 55 -speed_wall_0 = 45 -speed_wall_x = 55 -support_enable = True -support_angle = 60 -support_infill_rate = 20 -support_interface_enable = True -support_interface_height = 0.60 -support_interface_pattern = zigzag -support_interface_skip_height = 0.20 -support_offset = 0.8 -support_z_distance = 0.3 -wall_thickness = 1.6 -zig_zaggify_infill = True +[general] +definition = beamup_l +name = BeamUp L Draft +version = 4 + +[metadata] +material = generic_pla +quality_type = draft +setting_version = 20 +type = quality +weight = -2 + +[values] +adhesion_type = brim +brim_line_count = 8 +infill_before_walls = False +initial_layer_line_width_factor = 120.0 +layer_height = 0.2 +material_print_temperature = 210 +material_print_temperature_layer_0 = 235 +retraction_amount = 2 +retraction_speed = 30 +speed_infill = 55 +speed_layer_0 = 25 +speed_print = 55 +speed_support_interface = 55 +speed_topbottom = 55 +speed_wall_0 = 45 +speed_wall_x = 55 +support_angle = 60 +support_enable = True +support_infill_rate = 20 +support_interface_enable = True +support_interface_height = 0.60 +support_interface_pattern = zigzag +support_interface_skip_height = 0.20 +support_offset = 0.8 +support_z_distance = 0.3 +wall_thickness = 1.6 +zig_zaggify_infill = True + diff --git a/resources/quality/beamup_l/beamup_l_extra_fine.inst.cfg b/resources/quality/beamup_l/beamup_l_extra_fine.inst.cfg index 679d7d6e34..c84ffad7c6 100644 --- a/resources/quality/beamup_l/beamup_l_extra_fine.inst.cfg +++ b/resources/quality/beamup_l/beamup_l_extra_fine.inst.cfg @@ -1,40 +1,41 @@ -[general] -version = 4 -name = BeamUp L Extra Fine -definition = beamup_l - -[metadata] -setting_version = 20 -type = quality -quality_type = high -weight = 1 -material = generic_pla - -[values] -layer_height = 0.06 -adhesion_type = brim -brim_line_count = 8 -infill_before_walls = False -initial_layer_line_width_factor = 120.0 -material_print_temperature = 195 -material_print_temperature_layer_0 = 235 -retraction_amount = 2 -retraction_speed = 30 -speed_infill = 45 -speed_layer_0 = 25 -speed_print = 45 -speed_support_interface = 45 -speed_topbottom = 45 -speed_wall_0 = 35 -speed_wall_x = 45 -support_enable = True -support_angle = 60 -support_infill_rate = 20 -support_interface_enable = True -support_interface_height = 0.30 -support_interface_pattern = zigzag -support_interface_skip_height = 0.06 -support_offset = 0.8 -support_z_distance = 0.12 -wall_thickness = 1.6 -zig_zaggify_infill = True +[general] +definition = beamup_l +name = BeamUp L Extra Fine +version = 4 + +[metadata] +material = generic_pla +quality_type = high +setting_version = 20 +type = quality +weight = 1 + +[values] +adhesion_type = brim +brim_line_count = 8 +infill_before_walls = False +initial_layer_line_width_factor = 120.0 +layer_height = 0.06 +material_print_temperature = 195 +material_print_temperature_layer_0 = 235 +retraction_amount = 2 +retraction_speed = 30 +speed_infill = 45 +speed_layer_0 = 25 +speed_print = 45 +speed_support_interface = 45 +speed_topbottom = 45 +speed_wall_0 = 35 +speed_wall_x = 45 +support_angle = 60 +support_enable = True +support_infill_rate = 20 +support_interface_enable = True +support_interface_height = 0.30 +support_interface_pattern = zigzag +support_interface_skip_height = 0.06 +support_offset = 0.8 +support_z_distance = 0.12 +wall_thickness = 1.6 +zig_zaggify_infill = True + diff --git a/resources/quality/beamup_l/beamup_l_fine.inst.cfg b/resources/quality/beamup_l/beamup_l_fine.inst.cfg index 55e584feb4..862d86e0ed 100644 --- a/resources/quality/beamup_l/beamup_l_fine.inst.cfg +++ b/resources/quality/beamup_l/beamup_l_fine.inst.cfg @@ -1,40 +1,41 @@ -[general] -version = 4 -name = BeamUp L Fine -definition = beamup_l - -[metadata] -setting_version = 20 -type = quality -quality_type = normal -weight = 0 -material = generic_pla - -[values] -layer_height = 0.1 -adhesion_type = brim -brim_line_count = 8 -infill_before_walls = False -initial_layer_line_width_factor = 120.0 -material_print_temperature = 200 -material_print_temperature_layer_0 = 235 -retraction_amount = 2 -retraction_speed = 30 -speed_infill = 50 -speed_layer_0 = 25 -speed_print = 50 -speed_support_interface = 50 -speed_topbottom = 50 -speed_wall_0 = 40 -speed_wall_x = 50 -support_enable = True -support_angle = 60 -support_infill_rate = 20 -support_interface_enable = True -support_interface_height = 0.30 -support_interface_pattern = zigzag -support_interface_skip_height = 0.10 -support_offset = 0.8 -support_z_distance = 0.2 -wall_thickness = 1.6 -zig_zaggify_infill = True +[general] +definition = beamup_l +name = BeamUp L Fine +version = 4 + +[metadata] +material = generic_pla +quality_type = normal +setting_version = 20 +type = quality +weight = 0 + +[values] +adhesion_type = brim +brim_line_count = 8 +infill_before_walls = False +initial_layer_line_width_factor = 120.0 +layer_height = 0.1 +material_print_temperature = 200 +material_print_temperature_layer_0 = 235 +retraction_amount = 2 +retraction_speed = 30 +speed_infill = 50 +speed_layer_0 = 25 +speed_print = 50 +speed_support_interface = 50 +speed_topbottom = 50 +speed_wall_0 = 40 +speed_wall_x = 50 +support_angle = 60 +support_enable = True +support_infill_rate = 20 +support_interface_enable = True +support_interface_height = 0.30 +support_interface_pattern = zigzag +support_interface_skip_height = 0.10 +support_offset = 0.8 +support_z_distance = 0.2 +wall_thickness = 1.6 +zig_zaggify_infill = True + diff --git a/resources/quality/beamup_l/beamup_l_normal.inst.cfg b/resources/quality/beamup_l/beamup_l_normal.inst.cfg index 8fe422893a..5193d36614 100644 --- a/resources/quality/beamup_l/beamup_l_normal.inst.cfg +++ b/resources/quality/beamup_l/beamup_l_normal.inst.cfg @@ -1,40 +1,41 @@ -[general] -version = 4 -name = BeamUp L Normal -definition = beamup_l - -[metadata] -setting_version = 20 -type = quality -quality_type = fast -weight = -1 -material = generic_pla - -[values] -layer_height = 0.15 -adhesion_type = brim -brim_line_count = 8 -infill_before_walls = False -initial_layer_line_width_factor = 120.0 -material_print_temperature = 205 -material_print_temperature_layer_0 = 235 -retraction_amount = 2 -retraction_speed = 30 -speed_infill = 50 -speed_layer_0 = 25 -speed_print = 50 -speed_support_interface = 50 -speed_topbottom = 50 -speed_wall_0 = 40 -speed_wall_x = 50 -support_enable = True -support_angle = 60 -support_infill_rate = 20 -support_interface_enable = True -support_interface_height = 0.45 -support_interface_pattern = zigzag -support_interface_skip_height = 0.15 -support_offset = 0.8 -support_z_distance = 0.25 -wall_thickness = 1.6 -zig_zaggify_infill = True +[general] +definition = beamup_l +name = BeamUp L Normal +version = 4 + +[metadata] +material = generic_pla +quality_type = fast +setting_version = 20 +type = quality +weight = -1 + +[values] +adhesion_type = brim +brim_line_count = 8 +infill_before_walls = False +initial_layer_line_width_factor = 120.0 +layer_height = 0.15 +material_print_temperature = 205 +material_print_temperature_layer_0 = 235 +retraction_amount = 2 +retraction_speed = 30 +speed_infill = 50 +speed_layer_0 = 25 +speed_print = 50 +speed_support_interface = 50 +speed_topbottom = 50 +speed_wall_0 = 40 +speed_wall_x = 50 +support_angle = 60 +support_enable = True +support_infill_rate = 20 +support_interface_enable = True +support_interface_height = 0.45 +support_interface_pattern = zigzag +support_interface_skip_height = 0.15 +support_offset = 0.8 +support_z_distance = 0.25 +wall_thickness = 1.6 +zig_zaggify_infill = True + diff --git a/resources/quality/beamup_s/beamup_s_coarse.inst.cfg b/resources/quality/beamup_s/beamup_s_coarse.inst.cfg index bb23893f75..1c1d5ff3f4 100644 --- a/resources/quality/beamup_s/beamup_s_coarse.inst.cfg +++ b/resources/quality/beamup_s/beamup_s_coarse.inst.cfg @@ -1,40 +1,41 @@ -[general] -version = 4 -name = BeamUp S Coarse -definition = beamup_s - -[metadata] -setting_version = 20 -type = quality -quality_type = coarse -weight = -3 -material = generic_pla - -[values] -layer_height = 0.30 -adhesion_type = brim -brim_line_count = 5 -infill_before_walls = False -initial_layer_line_width_factor = 120.0 -material_print_temperature = 215 -material_print_temperature_layer_0 = 230 -retraction_amount = 1.5 -retraction_speed = 30 -speed_infill = 50 -speed_layer_0 = 25 -speed_print = 50 -speed_support_interface = 50 -speed_topbottom = 50 -speed_wall_0 = 35 -speed_wall_x = 50 -support_enable = True -support_angle = 60 -support_infill_rate = 20 -support_interface_enable = True -support_interface_height = 0.60 -support_interface_pattern = zigzag -support_interface_skip_height = 0.30 -support_offset = 0.8 -support_z_distance = 0.2 -wall_thickness = 0.8 -zig_zaggify_infill = True +[general] +definition = beamup_s +name = BeamUp S Coarse +version = 4 + +[metadata] +material = generic_pla +quality_type = coarse +setting_version = 20 +type = quality +weight = -3 + +[values] +adhesion_type = brim +brim_line_count = 5 +infill_before_walls = False +initial_layer_line_width_factor = 120.0 +layer_height = 0.30 +material_print_temperature = 215 +material_print_temperature_layer_0 = 230 +retraction_amount = 1.5 +retraction_speed = 30 +speed_infill = 50 +speed_layer_0 = 25 +speed_print = 50 +speed_support_interface = 50 +speed_topbottom = 50 +speed_wall_0 = 35 +speed_wall_x = 50 +support_angle = 60 +support_enable = True +support_infill_rate = 20 +support_interface_enable = True +support_interface_height = 0.60 +support_interface_pattern = zigzag +support_interface_skip_height = 0.30 +support_offset = 0.8 +support_z_distance = 0.2 +wall_thickness = 0.8 +zig_zaggify_infill = True + diff --git a/resources/quality/beamup_s/beamup_s_draft.inst.cfg b/resources/quality/beamup_s/beamup_s_draft.inst.cfg index 68c146d47c..8fc9f96841 100644 --- a/resources/quality/beamup_s/beamup_s_draft.inst.cfg +++ b/resources/quality/beamup_s/beamup_s_draft.inst.cfg @@ -1,40 +1,41 @@ -[general] -version = 4 -name = BeamUp S Draft -definition = beamup_s - -[metadata] -setting_version = 20 -type = quality -quality_type = draft -weight = -2 -material = generic_pla - -[values] -layer_height = 0.2 -adhesion_type = brim -brim_line_count = 5 -infill_before_walls = False -initial_layer_line_width_factor = 120.0 -material_print_temperature = 210 -material_print_temperature_layer_0 = 230 -retraction_amount = 1.5 -retraction_speed = 30 -speed_infill = 45 -speed_layer_0 = 25 -speed_print = 45 -speed_support_interface = 45 -speed_topbottom = 45 -speed_wall_0 = 35 -speed_wall_x = 45 -support_enable = True -support_angle = 60 -support_infill_rate = 20 -support_interface_enable = True -support_interface_height = 0.40 -support_interface_pattern = zigzag -support_interface_skip_height = 0.20 -support_offset = 0.8 -support_z_distance = 0.2 -wall_thickness = 0.8 -zig_zaggify_infill = True +[general] +definition = beamup_s +name = BeamUp S Draft +version = 4 + +[metadata] +material = generic_pla +quality_type = draft +setting_version = 20 +type = quality +weight = -2 + +[values] +adhesion_type = brim +brim_line_count = 5 +infill_before_walls = False +initial_layer_line_width_factor = 120.0 +layer_height = 0.2 +material_print_temperature = 210 +material_print_temperature_layer_0 = 230 +retraction_amount = 1.5 +retraction_speed = 30 +speed_infill = 45 +speed_layer_0 = 25 +speed_print = 45 +speed_support_interface = 45 +speed_topbottom = 45 +speed_wall_0 = 35 +speed_wall_x = 45 +support_angle = 60 +support_enable = True +support_infill_rate = 20 +support_interface_enable = True +support_interface_height = 0.40 +support_interface_pattern = zigzag +support_interface_skip_height = 0.20 +support_offset = 0.8 +support_z_distance = 0.2 +wall_thickness = 0.8 +zig_zaggify_infill = True + diff --git a/resources/quality/beamup_s/beamup_s_extra_fine.inst.cfg b/resources/quality/beamup_s/beamup_s_extra_fine.inst.cfg index 975c19fe8e..e0fc377124 100644 --- a/resources/quality/beamup_s/beamup_s_extra_fine.inst.cfg +++ b/resources/quality/beamup_s/beamup_s_extra_fine.inst.cfg @@ -1,40 +1,41 @@ -[general] -version = 4 -name = BeamUp S Extra Fine -definition = beamup_s - -[metadata] -setting_version = 20 -type = quality -quality_type = high -weight = 1 -material = generic_pla - -[values] -layer_height = 0.06 -adhesion_type = brim -brim_line_count = 5 -infill_before_walls = False -initial_layer_line_width_factor = 120.0 -material_print_temperature = 195 -material_print_temperature_layer_0 = 230 -retraction_amount = 1.5 -retraction_speed = 30 -speed_infill = 40 -speed_layer_0 = 25 -speed_print = 40 -speed_support_interface = 40 -speed_topbottom = 40 -speed_wall_0 = 30 -speed_wall_x = 40 -support_enable = True -support_angle = 60 -support_infill_rate = 20 -support_interface_enable = True -support_interface_height = 0.30 -support_interface_pattern = zigzag -support_interface_skip_height = 0.06 -support_offset = 0.8 -support_z_distance = 0.2 -wall_thickness = 0.8 -zig_zaggify_infill = True +[general] +definition = beamup_s +name = BeamUp S Extra Fine +version = 4 + +[metadata] +material = generic_pla +quality_type = high +setting_version = 20 +type = quality +weight = 1 + +[values] +adhesion_type = brim +brim_line_count = 5 +infill_before_walls = False +initial_layer_line_width_factor = 120.0 +layer_height = 0.06 +material_print_temperature = 195 +material_print_temperature_layer_0 = 230 +retraction_amount = 1.5 +retraction_speed = 30 +speed_infill = 40 +speed_layer_0 = 25 +speed_print = 40 +speed_support_interface = 40 +speed_topbottom = 40 +speed_wall_0 = 30 +speed_wall_x = 40 +support_angle = 60 +support_enable = True +support_infill_rate = 20 +support_interface_enable = True +support_interface_height = 0.30 +support_interface_pattern = zigzag +support_interface_skip_height = 0.06 +support_offset = 0.8 +support_z_distance = 0.2 +wall_thickness = 0.8 +zig_zaggify_infill = True + diff --git a/resources/quality/beamup_s/beamup_s_fine.inst.cfg b/resources/quality/beamup_s/beamup_s_fine.inst.cfg index 9024298285..ec336216a4 100644 --- a/resources/quality/beamup_s/beamup_s_fine.inst.cfg +++ b/resources/quality/beamup_s/beamup_s_fine.inst.cfg @@ -1,40 +1,41 @@ -[general] -version = 4 -name = BeamUp S Fine -definition = beamup_s - -[metadata] -setting_version = 20 -type = quality -quality_type = normal -weight = 0 -material = generic_pla - -[values] -layer_height = 0.1 -adhesion_type = brim -brim_line_count = 5 -infill_before_walls = False -initial_layer_line_width_factor = 120.0 -material_print_temperature = 200 -material_print_temperature_layer_0 = 230 -retraction_amount = 1.5 -retraction_speed = 30 -speed_infill = 40 -speed_layer_0 = 25 -speed_print = 40 -speed_support_interface = 40 -speed_topbottom = 40 -speed_wall_0 = 30 -speed_wall_x = 40 -support_enable = True -support_angle = 60 -support_infill_rate = 20 -support_interface_enable = True -support_interface_height = 0.30 -support_interface_pattern = zigzag -support_interface_skip_height = 0.10 -support_offset = 0.8 -support_z_distance = 0.2 -wall_thickness = 0.8 -zig_zaggify_infill = True +[general] +definition = beamup_s +name = BeamUp S Fine +version = 4 + +[metadata] +material = generic_pla +quality_type = normal +setting_version = 20 +type = quality +weight = 0 + +[values] +adhesion_type = brim +brim_line_count = 5 +infill_before_walls = False +initial_layer_line_width_factor = 120.0 +layer_height = 0.1 +material_print_temperature = 200 +material_print_temperature_layer_0 = 230 +retraction_amount = 1.5 +retraction_speed = 30 +speed_infill = 40 +speed_layer_0 = 25 +speed_print = 40 +speed_support_interface = 40 +speed_topbottom = 40 +speed_wall_0 = 30 +speed_wall_x = 40 +support_angle = 60 +support_enable = True +support_infill_rate = 20 +support_interface_enable = True +support_interface_height = 0.30 +support_interface_pattern = zigzag +support_interface_skip_height = 0.10 +support_offset = 0.8 +support_z_distance = 0.2 +wall_thickness = 0.8 +zig_zaggify_infill = True + diff --git a/resources/quality/beamup_s/beamup_s_normal.inst.cfg b/resources/quality/beamup_s/beamup_s_normal.inst.cfg index f476ab0eac..1aa9e46ac4 100644 --- a/resources/quality/beamup_s/beamup_s_normal.inst.cfg +++ b/resources/quality/beamup_s/beamup_s_normal.inst.cfg @@ -1,40 +1,41 @@ -[general] -version = 4 -name = BeamUp S Normal -definition = beamup_s - -[metadata] -setting_version = 20 -type = quality -quality_type = fast -weight = -1 -material = generic_pla - -[values] -layer_height = 0.15 -adhesion_type = brim -brim_line_count = 5 -infill_before_walls = False -initial_layer_line_width_factor = 120.0 -material_print_temperature = 205 -material_print_temperature_layer_0 = 230 -retraction_amount = 1.5 -retraction_speed = 30 -speed_infill = 45 -speed_layer_0 = 25 -speed_print = 45 -speed_support_interface = 45 -speed_topbottom = 45 -speed_wall_0 = 35 -speed_wall_x = 45 -support_enable = True -support_angle = 60 -support_infill_rate = 20 -support_interface_enable = True -support_interface_height = 0.45 -support_interface_pattern = zigzag -support_interface_skip_height = 0.15 -support_offset = 0.8 -support_z_distance = 0.2 -wall_thickness = 0.8 -zig_zaggify_infill = True +[general] +definition = beamup_s +name = BeamUp S Normal +version = 4 + +[metadata] +material = generic_pla +quality_type = fast +setting_version = 20 +type = quality +weight = -1 + +[values] +adhesion_type = brim +brim_line_count = 5 +infill_before_walls = False +initial_layer_line_width_factor = 120.0 +layer_height = 0.15 +material_print_temperature = 205 +material_print_temperature_layer_0 = 230 +retraction_amount = 1.5 +retraction_speed = 30 +speed_infill = 45 +speed_layer_0 = 25 +speed_print = 45 +speed_support_interface = 45 +speed_topbottom = 45 +speed_wall_0 = 35 +speed_wall_x = 45 +support_angle = 60 +support_enable = True +support_infill_rate = 20 +support_interface_enable = True +support_interface_height = 0.45 +support_interface_pattern = zigzag +support_interface_skip_height = 0.15 +support_offset = 0.8 +support_z_distance = 0.2 +wall_thickness = 0.8 +zig_zaggify_infill = True + diff --git a/resources/quality/biqu/base/biqu_base_0.2_ABS_super.inst.cfg b/resources/quality/biqu/base/biqu_base_0.2_ABS_super.inst.cfg index cbe0e54f0c..8b733f4795 100644 --- a/resources/quality/biqu/base/biqu_base_0.2_ABS_super.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.2_ABS_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = biqu_base +name = Super Quality +version = 4 [metadata] +material = generic_abs_175 +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_abs_175 variant = 0.2mm Nozzle [values] wall_thickness = =line_width*8 + diff --git a/resources/quality/biqu/base/biqu_base_0.2_ABS_ultra.inst.cfg b/resources/quality/biqu/base/biqu_base_0.2_ABS_ultra.inst.cfg index d809fb1d48..5bd1c6e40d 100644 --- a/resources/quality/biqu/base/biqu_base_0.2_ABS_ultra.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.2_ABS_ultra.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Ultra Quality definition = biqu_base +name = Ultra Quality +version = 4 [metadata] +material = generic_abs_175 +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra -material = generic_abs_175 variant = 0.2mm Nozzle [values] wall_thickness = =line_width*8 + diff --git a/resources/quality/biqu/base/biqu_base_0.2_PETG_super.inst.cfg b/resources/quality/biqu/base/biqu_base_0.2_PETG_super.inst.cfg index 29b2f1bedf..b555cf8ef6 100644 --- a/resources/quality/biqu/base/biqu_base_0.2_PETG_super.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.2_PETG_super.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Super Quality definition = biqu_base +name = Super Quality +version = 4 [metadata] +material = generic_petg_175 +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_petg_175 variant = 0.2mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*8 + diff --git a/resources/quality/biqu/base/biqu_base_0.2_PETG_ultra.inst.cfg b/resources/quality/biqu/base/biqu_base_0.2_PETG_ultra.inst.cfg index 795257e1cb..6ee66d0520 100644 --- a/resources/quality/biqu/base/biqu_base_0.2_PETG_ultra.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.2_PETG_ultra.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Ultra Quality definition = biqu_base +name = Ultra Quality +version = 4 [metadata] +material = generic_petg_175 +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra -material = generic_petg_175 variant = 0.2mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*8 + diff --git a/resources/quality/biqu/base/biqu_base_0.2_PLA_super.inst.cfg b/resources/quality/biqu/base/biqu_base_0.2_PLA_super.inst.cfg index d5d598885f..8eddb60894 100644 --- a/resources/quality/biqu/base/biqu_base_0.2_PLA_super.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.2_PLA_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = biqu_base +name = Super Quality +version = 4 [metadata] +material = generic_pla_175 +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla_175 variant = 0.2mm Nozzle [values] + diff --git a/resources/quality/biqu/base/biqu_base_0.2_PLA_ultra.inst.cfg b/resources/quality/biqu/base/biqu_base_0.2_PLA_ultra.inst.cfg index da21ce6836..c2f99be739 100644 --- a/resources/quality/biqu/base/biqu_base_0.2_PLA_ultra.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.2_PLA_ultra.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Ultra Quality definition = biqu_base +name = Ultra Quality +version = 4 [metadata] +material = generic_pla_175 +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra -material = generic_pla_175 variant = 0.2mm Nozzle [values] + diff --git a/resources/quality/biqu/base/biqu_base_0.3_ABS_adaptive.inst.cfg b/resources/quality/biqu/base/biqu_base_0.3_ABS_adaptive.inst.cfg index 732e3b1cf0..ae26122154 100644 --- a/resources/quality/biqu/base/biqu_base_0.3_ABS_adaptive.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.3_ABS_adaptive.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = biqu_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_abs_175 +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_abs_175 variant = 0.3mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/biqu/base/biqu_base_0.3_ABS_low.inst.cfg b/resources/quality/biqu/base/biqu_base_0.3_ABS_low.inst.cfg index dca85994d1..24de81a96a 100644 --- a/resources/quality/biqu/base/biqu_base_0.3_ABS_low.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.3_ABS_low.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = biqu_base +name = Low Quality +version = 4 [metadata] +material = generic_abs_175 +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_abs_175 variant = 0.3mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/biqu/base/biqu_base_0.3_ABS_standard.inst.cfg b/resources/quality/biqu/base/biqu_base_0.3_ABS_standard.inst.cfg index 70fd01d6be..d29e1204c5 100644 --- a/resources/quality/biqu/base/biqu_base_0.3_ABS_standard.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.3_ABS_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = biqu_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs_175 +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_abs_175 variant = 0.3mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/biqu/base/biqu_base_0.3_ABS_super.inst.cfg b/resources/quality/biqu/base/biqu_base_0.3_ABS_super.inst.cfg index c5830de118..1a380df544 100644 --- a/resources/quality/biqu/base/biqu_base_0.3_ABS_super.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.3_ABS_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = biqu_base +name = Super Quality +version = 4 [metadata] +material = generic_abs_175 +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_abs_175 variant = 0.3mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/biqu/base/biqu_base_0.3_PETG_adaptive.inst.cfg b/resources/quality/biqu/base/biqu_base_0.3_PETG_adaptive.inst.cfg index 9d21249ef9..87d3786361 100644 --- a/resources/quality/biqu/base/biqu_base_0.3_PETG_adaptive.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.3_PETG_adaptive.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = biqu_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_petg_175 +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_petg_175 variant = 0.3mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*4 + diff --git a/resources/quality/biqu/base/biqu_base_0.3_PETG_low.inst.cfg b/resources/quality/biqu/base/biqu_base_0.3_PETG_low.inst.cfg index f8767e1eb0..cc9e91b04a 100644 --- a/resources/quality/biqu/base/biqu_base_0.3_PETG_low.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.3_PETG_low.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Low Quality definition = biqu_base +name = Low Quality +version = 4 [metadata] +material = generic_petg_175 +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_petg_175 variant = 0.3mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*4 + diff --git a/resources/quality/biqu/base/biqu_base_0.3_PETG_standard.inst.cfg b/resources/quality/biqu/base/biqu_base_0.3_PETG_standard.inst.cfg index 0b97230f28..a2267037eb 100644 --- a/resources/quality/biqu/base/biqu_base_0.3_PETG_standard.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.3_PETG_standard.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = biqu_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg_175 +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_petg_175 variant = 0.3mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*4 + diff --git a/resources/quality/biqu/base/biqu_base_0.3_PETG_super.inst.cfg b/resources/quality/biqu/base/biqu_base_0.3_PETG_super.inst.cfg index 3958775b98..8a2a08d835 100644 --- a/resources/quality/biqu/base/biqu_base_0.3_PETG_super.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.3_PETG_super.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Super Quality definition = biqu_base +name = Super Quality +version = 4 [metadata] +material = generic_petg_175 +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_petg_175 variant = 0.3mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*4 + diff --git a/resources/quality/biqu/base/biqu_base_0.3_PLA_adaptive.inst.cfg b/resources/quality/biqu/base/biqu_base_0.3_PLA_adaptive.inst.cfg index 53ce3a9d9d..f1c399c4e6 100644 --- a/resources/quality/biqu/base/biqu_base_0.3_PLA_adaptive.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.3_PLA_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = biqu_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_pla_175 +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_pla_175 variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/biqu/base/biqu_base_0.3_PLA_low.inst.cfg b/resources/quality/biqu/base/biqu_base_0.3_PLA_low.inst.cfg index 6572df292f..0e37432fd7 100644 --- a/resources/quality/biqu/base/biqu_base_0.3_PLA_low.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.3_PLA_low.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low Quality definition = biqu_base +name = Low Quality +version = 4 [metadata] +material = generic_pla_175 +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla_175 variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/biqu/base/biqu_base_0.3_PLA_standard.inst.cfg b/resources/quality/biqu/base/biqu_base_0.3_PLA_standard.inst.cfg index da8ce636a6..c357ffe41f 100644 --- a/resources/quality/biqu/base/biqu_base_0.3_PLA_standard.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.3_PLA_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = biqu_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla_175 +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_pla_175 variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/biqu/base/biqu_base_0.3_PLA_super.inst.cfg b/resources/quality/biqu/base/biqu_base_0.3_PLA_super.inst.cfg index 1d752cbd56..f31ec2e520 100644 --- a/resources/quality/biqu/base/biqu_base_0.3_PLA_super.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.3_PLA_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = biqu_base +name = Super Quality +version = 4 [metadata] +material = generic_pla_175 +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla_175 variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/biqu/base/biqu_base_0.4_ABS_adaptive.inst.cfg b/resources/quality/biqu/base/biqu_base_0.4_ABS_adaptive.inst.cfg index 484bc56d55..4cfa72fe42 100644 --- a/resources/quality/biqu/base/biqu_base_0.4_ABS_adaptive.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.4_ABS_adaptive.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = biqu_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_abs_175 +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_abs_175 variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/biqu/base/biqu_base_0.4_ABS_low.inst.cfg b/resources/quality/biqu/base/biqu_base_0.4_ABS_low.inst.cfg index 9cf4298150..b977b8fdd5 100644 --- a/resources/quality/biqu/base/biqu_base_0.4_ABS_low.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.4_ABS_low.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = biqu_base +name = Low Quality +version = 4 [metadata] +material = generic_abs_175 +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_abs_175 variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/biqu/base/biqu_base_0.4_ABS_standard.inst.cfg b/resources/quality/biqu/base/biqu_base_0.4_ABS_standard.inst.cfg index c48a9071b4..0c7b8ae052 100644 --- a/resources/quality/biqu/base/biqu_base_0.4_ABS_standard.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.4_ABS_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = biqu_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs_175 +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_abs_175 variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/biqu/base/biqu_base_0.4_ABS_super.inst.cfg b/resources/quality/biqu/base/biqu_base_0.4_ABS_super.inst.cfg index fd1d8ae1e7..c39aaa5493 100644 --- a/resources/quality/biqu/base/biqu_base_0.4_ABS_super.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.4_ABS_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = biqu_base +name = Super Quality +version = 4 [metadata] +material = generic_abs_175 +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_abs_175 variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/biqu/base/biqu_base_0.4_PETG_adaptive.inst.cfg b/resources/quality/biqu/base/biqu_base_0.4_PETG_adaptive.inst.cfg index 3b0633ef5e..dae2376cfb 100644 --- a/resources/quality/biqu/base/biqu_base_0.4_PETG_adaptive.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.4_PETG_adaptive.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = biqu_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_petg_175 +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_petg_175 variant = 0.4mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*4 + diff --git a/resources/quality/biqu/base/biqu_base_0.4_PETG_low.inst.cfg b/resources/quality/biqu/base/biqu_base_0.4_PETG_low.inst.cfg index 5153a084df..f6f607a646 100644 --- a/resources/quality/biqu/base/biqu_base_0.4_PETG_low.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.4_PETG_low.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Low Quality definition = biqu_base +name = Low Quality +version = 4 [metadata] +material = generic_petg_175 +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_petg_175 variant = 0.4mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*4 + diff --git a/resources/quality/biqu/base/biqu_base_0.4_PETG_standard.inst.cfg b/resources/quality/biqu/base/biqu_base_0.4_PETG_standard.inst.cfg index fea8ea0344..582cc0eafb 100644 --- a/resources/quality/biqu/base/biqu_base_0.4_PETG_standard.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.4_PETG_standard.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = biqu_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg_175 +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_petg_175 variant = 0.4mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*4 + diff --git a/resources/quality/biqu/base/biqu_base_0.4_PETG_super.inst.cfg b/resources/quality/biqu/base/biqu_base_0.4_PETG_super.inst.cfg index 561dc2089e..aa35b255d0 100644 --- a/resources/quality/biqu/base/biqu_base_0.4_PETG_super.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.4_PETG_super.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Super Quality definition = biqu_base +name = Super Quality +version = 4 [metadata] +material = generic_petg_175 +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_petg_175 variant = 0.4mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*4 + diff --git a/resources/quality/biqu/base/biqu_base_0.4_PLA_adaptive.inst.cfg b/resources/quality/biqu/base/biqu_base_0.4_PLA_adaptive.inst.cfg index 1f6e612a27..70b1af0d2a 100644 --- a/resources/quality/biqu/base/biqu_base_0.4_PLA_adaptive.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.4_PLA_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = biqu_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_pla_175 +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_pla_175 variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/biqu/base/biqu_base_0.4_PLA_low.inst.cfg b/resources/quality/biqu/base/biqu_base_0.4_PLA_low.inst.cfg index b9055cef20..24d831f975 100644 --- a/resources/quality/biqu/base/biqu_base_0.4_PLA_low.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.4_PLA_low.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low Quality definition = biqu_base +name = Low Quality +version = 4 [metadata] +material = generic_pla_175 +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla_175 variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/biqu/base/biqu_base_0.4_PLA_standard.inst.cfg b/resources/quality/biqu/base/biqu_base_0.4_PLA_standard.inst.cfg index c886bc50b3..fecd7b6134 100644 --- a/resources/quality/biqu/base/biqu_base_0.4_PLA_standard.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.4_PLA_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = biqu_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla_175 +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_pla_175 variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/biqu/base/biqu_base_0.4_PLA_super.inst.cfg b/resources/quality/biqu/base/biqu_base_0.4_PLA_super.inst.cfg index e5d64e640e..6870183bd9 100644 --- a/resources/quality/biqu/base/biqu_base_0.4_PLA_super.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.4_PLA_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = biqu_base +name = Super Quality +version = 4 [metadata] +material = generic_pla_175 +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla_175 variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/biqu/base/biqu_base_0.5_ABS_adaptive.inst.cfg b/resources/quality/biqu/base/biqu_base_0.5_ABS_adaptive.inst.cfg index 844780cdc7..64b2832c7b 100644 --- a/resources/quality/biqu/base/biqu_base_0.5_ABS_adaptive.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.5_ABS_adaptive.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = biqu_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_abs_175 +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_abs_175 variant = 0.5mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/biqu/base/biqu_base_0.5_ABS_low.inst.cfg b/resources/quality/biqu/base/biqu_base_0.5_ABS_low.inst.cfg index c589304fde..6b6664560d 100644 --- a/resources/quality/biqu/base/biqu_base_0.5_ABS_low.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.5_ABS_low.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = biqu_base +name = Low Quality +version = 4 [metadata] +material = generic_abs_175 +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_abs_175 variant = 0.5mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/biqu/base/biqu_base_0.5_ABS_standard.inst.cfg b/resources/quality/biqu/base/biqu_base_0.5_ABS_standard.inst.cfg index 7f5b904f77..23e80c5919 100644 --- a/resources/quality/biqu/base/biqu_base_0.5_ABS_standard.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.5_ABS_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = biqu_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs_175 +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_abs_175 variant = 0.5mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/biqu/base/biqu_base_0.5_ABS_super.inst.cfg b/resources/quality/biqu/base/biqu_base_0.5_ABS_super.inst.cfg index 17e02b70ac..89b2df281b 100644 --- a/resources/quality/biqu/base/biqu_base_0.5_ABS_super.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.5_ABS_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = biqu_base +name = Super Quality +version = 4 [metadata] +material = generic_abs_175 +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_abs_175 variant = 0.5mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/biqu/base/biqu_base_0.5_PETG_adaptive.inst.cfg b/resources/quality/biqu/base/biqu_base_0.5_PETG_adaptive.inst.cfg index 95850a4b2e..9487281d25 100644 --- a/resources/quality/biqu/base/biqu_base_0.5_PETG_adaptive.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.5_PETG_adaptive.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = biqu_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_petg_175 +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_petg_175 variant = 0.5mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*4 + diff --git a/resources/quality/biqu/base/biqu_base_0.5_PETG_low.inst.cfg b/resources/quality/biqu/base/biqu_base_0.5_PETG_low.inst.cfg index 546edb9107..b3cb936f9c 100644 --- a/resources/quality/biqu/base/biqu_base_0.5_PETG_low.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.5_PETG_low.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Low Quality definition = biqu_base +name = Low Quality +version = 4 [metadata] +material = generic_petg_175 +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_petg_175 variant = 0.5mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*4 + diff --git a/resources/quality/biqu/base/biqu_base_0.5_PETG_standard.inst.cfg b/resources/quality/biqu/base/biqu_base_0.5_PETG_standard.inst.cfg index 5171730526..46c8494b4f 100644 --- a/resources/quality/biqu/base/biqu_base_0.5_PETG_standard.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.5_PETG_standard.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = biqu_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg_175 +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_petg_175 variant = 0.5mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*4 + diff --git a/resources/quality/biqu/base/biqu_base_0.5_PETG_super.inst.cfg b/resources/quality/biqu/base/biqu_base_0.5_PETG_super.inst.cfg index 8b45e6d0a4..58533e2c22 100644 --- a/resources/quality/biqu/base/biqu_base_0.5_PETG_super.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.5_PETG_super.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Super Quality definition = biqu_base +name = Super Quality +version = 4 [metadata] +material = generic_petg_175 +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_petg_175 variant = 0.5mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*4 + diff --git a/resources/quality/biqu/base/biqu_base_0.5_PLA_adaptive.inst.cfg b/resources/quality/biqu/base/biqu_base_0.5_PLA_adaptive.inst.cfg index bd6bfa719a..71eca700d1 100644 --- a/resources/quality/biqu/base/biqu_base_0.5_PLA_adaptive.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.5_PLA_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = biqu_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_pla_175 +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_pla_175 variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/biqu/base/biqu_base_0.5_PLA_low.inst.cfg b/resources/quality/biqu/base/biqu_base_0.5_PLA_low.inst.cfg index bbdf5161e5..5a7b978d0a 100644 --- a/resources/quality/biqu/base/biqu_base_0.5_PLA_low.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.5_PLA_low.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low Quality definition = biqu_base +name = Low Quality +version = 4 [metadata] +material = generic_pla_175 +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla_175 variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/biqu/base/biqu_base_0.5_PLA_standard.inst.cfg b/resources/quality/biqu/base/biqu_base_0.5_PLA_standard.inst.cfg index fd0635f872..a874d2e68f 100644 --- a/resources/quality/biqu/base/biqu_base_0.5_PLA_standard.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.5_PLA_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = biqu_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla_175 +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_pla_175 variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/biqu/base/biqu_base_0.5_PLA_super.inst.cfg b/resources/quality/biqu/base/biqu_base_0.5_PLA_super.inst.cfg index da005cee5e..d693a0035e 100644 --- a/resources/quality/biqu/base/biqu_base_0.5_PLA_super.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.5_PLA_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = biqu_base +name = Super Quality +version = 4 [metadata] +material = generic_pla_175 +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla_175 variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/biqu/base/biqu_base_0.6_ABS_standard.inst.cfg b/resources/quality/biqu/base/biqu_base_0.6_ABS_standard.inst.cfg index 8078c2596e..a8adb35719 100644 --- a/resources/quality/biqu/base/biqu_base_0.6_ABS_standard.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.6_ABS_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = biqu_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs_175 +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_abs_175 variant = 0.6mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/biqu/base/biqu_base_0.6_PETG_standard.inst.cfg b/resources/quality/biqu/base/biqu_base_0.6_PETG_standard.inst.cfg index c506022cf9..68bb50b086 100644 --- a/resources/quality/biqu/base/biqu_base_0.6_PETG_standard.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.6_PETG_standard.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = biqu_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg_175 +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_petg_175 variant = 0.6mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*3 + diff --git a/resources/quality/biqu/base/biqu_base_0.6_PLA_draft.inst.cfg b/resources/quality/biqu/base/biqu_base_0.6_PLA_draft.inst.cfg index 972ab33265..14fb054bcf 100644 --- a/resources/quality/biqu/base/biqu_base_0.6_PLA_draft.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.6_PLA_draft.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = biqu_base +name = Draft Quality +version = 4 [metadata] +material = generic_pla_175 +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_pla_175 variant = 0.6mm Nozzle [values] + diff --git a/resources/quality/biqu/base/biqu_base_0.6_PLA_low.inst.cfg b/resources/quality/biqu/base/biqu_base_0.6_PLA_low.inst.cfg index f17e185de6..be80d59e15 100644 --- a/resources/quality/biqu/base/biqu_base_0.6_PLA_low.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.6_PLA_low.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low Quality definition = biqu_base +name = Low Quality +version = 4 [metadata] +material = generic_pla_175 +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla_175 variant = 0.6mm Nozzle [values] + diff --git a/resources/quality/biqu/base/biqu_base_0.6_PLA_standard.inst.cfg b/resources/quality/biqu/base/biqu_base_0.6_PLA_standard.inst.cfg index 19c7320b97..e5b8792a88 100644 --- a/resources/quality/biqu/base/biqu_base_0.6_PLA_standard.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.6_PLA_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = biqu_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla_175 +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_pla_175 variant = 0.6mm Nozzle [values] + diff --git a/resources/quality/biqu/base/biqu_base_0.8_ABS_draft.inst.cfg b/resources/quality/biqu/base/biqu_base_0.8_ABS_draft.inst.cfg index ae30edb9ec..9e49df9370 100644 --- a/resources/quality/biqu/base/biqu_base_0.8_ABS_draft.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.8_ABS_draft.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = biqu_base +name = Draft Quality +version = 4 [metadata] +material = generic_abs_175 +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_abs_175 variant = 0.8mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/biqu/base/biqu_base_0.8_PETG_draft.inst.cfg b/resources/quality/biqu/base/biqu_base_0.8_PETG_draft.inst.cfg index 8a57d332bd..1145ed0a19 100644 --- a/resources/quality/biqu/base/biqu_base_0.8_PETG_draft.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.8_PETG_draft.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Draft Quality definition = biqu_base +name = Draft Quality +version = 4 [metadata] +material = generic_petg_175 +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_petg_175 variant = 0.8mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*3 + diff --git a/resources/quality/biqu/base/biqu_base_0.8_PLA_draft.inst.cfg b/resources/quality/biqu/base/biqu_base_0.8_PLA_draft.inst.cfg index 37630b91e4..4ae5d92b8c 100644 --- a/resources/quality/biqu/base/biqu_base_0.8_PLA_draft.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_0.8_PLA_draft.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = biqu_base +name = Draft Quality +version = 4 [metadata] +material = generic_pla_175 +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_pla_175 variant = 0.8mm Nozzle [values] + diff --git a/resources/quality/biqu/base/biqu_base_1.0_ABS_draft.inst.cfg b/resources/quality/biqu/base/biqu_base_1.0_ABS_draft.inst.cfg index 613211eef7..2905b0ce57 100644 --- a/resources/quality/biqu/base/biqu_base_1.0_ABS_draft.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_1.0_ABS_draft.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = biqu_base +name = Draft Quality +version = 4 [metadata] +material = generic_abs_175 +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_abs_175 variant = 1.0mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/biqu/base/biqu_base_1.0_PETG_draft.inst.cfg b/resources/quality/biqu/base/biqu_base_1.0_PETG_draft.inst.cfg index 0ef2632dfe..b2c4d9185a 100644 --- a/resources/quality/biqu/base/biqu_base_1.0_PETG_draft.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_1.0_PETG_draft.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Draft Quality definition = biqu_base +name = Draft Quality +version = 4 [metadata] +material = generic_petg_175 +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_petg_175 variant = 1.0mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*3 + diff --git a/resources/quality/biqu/base/biqu_base_1.0_PLA_draft.inst.cfg b/resources/quality/biqu/base/biqu_base_1.0_PLA_draft.inst.cfg index 0ed1eca26e..0f1efebfda 100644 --- a/resources/quality/biqu/base/biqu_base_1.0_PLA_draft.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_1.0_PLA_draft.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = biqu_base +name = Draft Quality +version = 4 [metadata] +material = generic_pla_175 +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_pla_175 variant = 1.0mm Nozzle [values] + diff --git a/resources/quality/biqu/base/biqu_base_global_adaptive.inst.cfg b/resources/quality/biqu/base/biqu_base_global_adaptive.inst.cfg index a2e31de3ff..4a305e17cc 100644 --- a/resources/quality/biqu/base/biqu_base_global_adaptive.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_global_adaptive.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Dynamic Quality definition = biqu_base +name = Dynamic Quality +version = 4 [metadata] +global_quality = True +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive weight = -2 -global_quality = True [values] +adaptive_layer_height_enabled = true layer_height = 0.16 layer_height_0 = 0.20 +support_interface_height = =layer_height*6 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/biqu/base/biqu_base_global_draft.inst.cfg b/resources/quality/biqu/base/biqu_base_global_draft.inst.cfg index ea750db3ff..e213762d1c 100644 --- a/resources/quality/biqu/base/biqu_base_global_draft.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_global_draft.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Draft Quality definition = biqu_base +name = Draft Quality +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -5 -global_quality = True [values] layer_height = 0.32 layer_height_0 = 0.32 +support_interface_height = =layer_height*4 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/biqu/base/biqu_base_global_low.inst.cfg b/resources/quality/biqu/base/biqu_base_global_low.inst.cfg index 9431e9493e..59a374c763 100644 --- a/resources/quality/biqu/base/biqu_base_global_low.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_global_low.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Low Quality definition = biqu_base +name = Low Quality +version = 4 [metadata] +global_quality = True +quality_type = low setting_version = 20 type = quality -quality_type = low weight = -4 -global_quality = True [values] layer_height = 0.28 layer_height_0 = 0.28 +support_interface_height = =layer_height*4 top_bottom_thickness = =layer_height_0+layer_height*3 wall_thickness = =line_width*3 -support_interface_height = =layer_height*4 + diff --git a/resources/quality/biqu/base/biqu_base_global_standard.inst.cfg b/resources/quality/biqu/base/biqu_base_global_standard.inst.cfg index a88777bc9a..8b28fe4138 100644 --- a/resources/quality/biqu/base/biqu_base_global_standard.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_global_standard.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Standard Quality definition = biqu_base +name = Standard Quality +version = 4 [metadata] +global_quality = True +quality_type = standard setting_version = 20 type = quality -quality_type = standard weight = -3 -global_quality = True [values] layer_height = 0.2 layer_height_0 = 0.2 +support_interface_height = =layer_height*4 top_bottom_thickness = =layer_height_0+layer_height*3 wall_thickness = =line_width*3 -support_interface_height = =layer_height*4 + diff --git a/resources/quality/biqu/base/biqu_base_global_super.inst.cfg b/resources/quality/biqu/base/biqu_base_global_super.inst.cfg index 6d67ab894f..d01d50f118 100644 --- a/resources/quality/biqu/base/biqu_base_global_super.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_global_super.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Super Quality definition = biqu_base +name = Super Quality +version = 4 [metadata] +global_quality = True +quality_type = super setting_version = 20 type = quality -quality_type = super weight = -1 -global_quality = True [values] layer_height = 0.12 layer_height_0 = 0.12 +support_interface_height = =layer_height*8 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/biqu/base/biqu_base_global_ultra.inst.cfg b/resources/quality/biqu/base/biqu_base_global_ultra.inst.cfg index 20621df056..44893ec27c 100644 --- a/resources/quality/biqu/base/biqu_base_global_ultra.inst.cfg +++ b/resources/quality/biqu/base/biqu_base_global_ultra.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Ultra Quality definition = biqu_base +name = Ultra Quality +version = 4 [metadata] +global_quality = True +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra weight = 0 -global_quality = True [values] layer_height = 0.08 layer_height_0 = 0.12 +support_interface_height = =layer_height*12 top_bottom_thickness = =layer_height_0+layer_height*10 wall_thickness = =line_width*4 -support_interface_height = =layer_height*12 + diff --git a/resources/quality/blocks/Nozzle/blocks_global_0.20_draft.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_0.20_draft.inst.cfg new file mode 100644 index 0000000000..4f1cbd301b --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_0.20_draft.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Draft Quality +version = 4 + +[metadata] +global_quality = True +quality_type = low 0.2 +setting_version = 20 +type = quality +variant = 0.2mm Nozzle +weight = -5 + +[values] +layer_height = 0.15 +layer_height_0 = 0.15 + diff --git a/resources/quality/blocks/Nozzle/blocks_global_0.20_standard.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_0.20_standard.inst.cfg new file mode 100644 index 0000000000..7b5adec7ce --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_0.20_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Standard Quality +version = 4 + +[metadata] +global_quality = True +quality_type = normal 0.2 +setting_version = 20 +type = quality +variant = 0.2mm Nozzle +weight = -3 + +[values] +layer_height = 0.1 +layer_height_0 = 0.15 + diff --git a/resources/quality/blocks/Nozzle/blocks_global_0.30_draft.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_0.30_draft.inst.cfg new file mode 100644 index 0000000000..863e33e388 --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_0.30_draft.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Draft Quality +version = 4 + +[metadata] +global_quality = True +quality_type = draft +setting_version = 20 +type = quality +variant = 0.3mm Nozzle +weight = -5 + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Nozzle/blocks_global_0.30_standard.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_0.30_standard.inst.cfg new file mode 100644 index 0000000000..dfd31ed136 --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_0.30_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Standard Quality +version = 4 + +[metadata] +global_quality = True +quality_type = normal 0.3 +setting_version = 20 +type = quality +variant = 0.3mm Nozzle +weight = -3 + +[values] +layer_height = 0.16 +layer_height_0 = 0.16 + diff --git a/resources/quality/blocks/Nozzle/blocks_global_0.30_ultra.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_0.30_ultra.inst.cfg new file mode 100644 index 0000000000..a65fe2774b --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_0.30_ultra.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Ultra Quality +version = 4 + +[metadata] +global_quality = True +quality_type = ultra +setting_version = 20 +type = quality +variant = 0.3mm Nozzle +weight = 0 + +[values] +layer_height = 0.10 +layer_height_0 = 0.16 + diff --git a/resources/quality/blocks/Nozzle/blocks_global_0.40_adaptive.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_0.40_adaptive.inst.cfg new file mode 100644 index 0000000000..c531bb3a86 --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_0.40_adaptive.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = blocks_base +name = Dynamic Quality +version = 4 + +[metadata] +global_quality = True +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = -2 + +[values] +adaptive_layer_height_enabled = true +layer_height = 0.16 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Nozzle/blocks_global_0.40_draft.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_0.40_draft.inst.cfg new file mode 100644 index 0000000000..73dd1b42f9 --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_0.40_draft.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Draft Quality +version = 4 + +[metadata] +global_quality = True +quality_type = draft +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = -5 + +[values] +layer_height = 0.30 +layer_height_0 = 0.20 + diff --git a/resources/quality/blocks/Nozzle/blocks_global_0.40_standard.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_0.40_standard.inst.cfg new file mode 100644 index 0000000000..2320efea9c --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_0.40_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Standard Quality +version = 4 + +[metadata] +global_quality = True +quality_type = normal +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = -3 + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Nozzle/blocks_global_0.40_ultra.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_0.40_ultra.inst.cfg new file mode 100644 index 0000000000..b3fb23451a --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_0.40_ultra.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Ultra Quality +version = 4 + +[metadata] +global_quality = True +quality_type = ultra +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 0 + +[values] +layer_height = 0.10 +layer_height_0 = 0.16 + diff --git a/resources/quality/blocks/Nozzle/blocks_global_0.50_adaptive.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_0.50_adaptive.inst.cfg new file mode 100644 index 0000000000..4e23c50596 --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_0.50_adaptive.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = blocks_base +name = Dynamic Quality +version = 4 + +[metadata] +global_quality = True +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.5mm Nozzle +weight = -2 + +[values] +adaptive_layer_height_enabled = true +layer_height = 0.16 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Nozzle/blocks_global_0.50_draft.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_0.50_draft.inst.cfg new file mode 100644 index 0000000000..da912df79c --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_0.50_draft.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Draft Quality +version = 4 + +[metadata] +global_quality = True +quality_type = draft +setting_version = 20 +type = quality +variant = 0.5mm Nozzle +weight = -5 + +[values] +layer_height = 0.30 +layer_height_0 = 0.20 + diff --git a/resources/quality/blocks/Nozzle/blocks_global_0.50_standard.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_0.50_standard.inst.cfg new file mode 100644 index 0000000000..584e8c0681 --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_0.50_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Standard Quality +version = 4 + +[metadata] +global_quality = True +quality_type = normal +setting_version = 20 +type = quality +variant = 0.5mm Nozzle +weight = -3 + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Nozzle/blocks_global_0.50_ultra.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_0.50_ultra.inst.cfg new file mode 100644 index 0000000000..1e8ea6146d --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_0.50_ultra.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Ultra Quality +version = 4 + +[metadata] +global_quality = True +quality_type = ultra +setting_version = 20 +type = quality +variant = 0.5mm Nozzle +weight = 0 + +[values] +layer_height = 0.10 +layer_height_0 = 0.16 + diff --git a/resources/quality/blocks/Nozzle/blocks_global_0.60_adaptive.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_0.60_adaptive.inst.cfg new file mode 100644 index 0000000000..74ed467aff --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_0.60_adaptive.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = blocks_base +name = Dynamic Quality +version = 4 + +[metadata] +global_quality = True +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = -2 + +[values] +adaptive_layer_height_enabled = true +layer_height = 0.16 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Nozzle/blocks_global_0.60_draft.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_0.60_draft.inst.cfg new file mode 100644 index 0000000000..438333b157 --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_0.60_draft.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Draft Quality +version = 4 + +[metadata] +global_quality = True +quality_type = draft +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = -5 + +[values] +layer_height = 0.30 +layer_height_0 = 0.20 + diff --git a/resources/quality/blocks/Nozzle/blocks_global_0.60_low.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_0.60_low.inst.cfg new file mode 100644 index 0000000000..82e07657b0 --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_0.60_low.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Low Quality +version = 4 + +[metadata] +global_quality = True +quality_type = low +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = -5 + +[values] +layer_height = 0.40 +layer_height_0 = 0.20 + diff --git a/resources/quality/blocks/Nozzle/blocks_global_0.60_standard.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_0.60_standard.inst.cfg new file mode 100644 index 0000000000..f115542e9b --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_0.60_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Standard Quality +version = 4 + +[metadata] +global_quality = True +quality_type = normal +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = -3 + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Nozzle/blocks_global_0.60_ultra.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_0.60_ultra.inst.cfg new file mode 100644 index 0000000000..1aad590e7a --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_0.60_ultra.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Ultra Quality +version = 4 + +[metadata] +global_quality = True +quality_type = ultra +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = 0 + +[values] +layer_height = 0.10 +layer_height_0 = 0.16 + diff --git a/resources/quality/blocks/Nozzle/blocks_global_0.80_adaptive.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_0.80_adaptive.inst.cfg new file mode 100644 index 0000000000..8c84d3de77 --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_0.80_adaptive.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = blocks_base +name = Dynamic Quality +version = 4 + +[metadata] +global_quality = True +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.8mm Nozzle +weight = -2 + +[values] +adaptive_layer_height_enabled = true +layer_height = 0.16 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Nozzle/blocks_global_0.80_draft.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_0.80_draft.inst.cfg new file mode 100644 index 0000000000..b4e5108e3a --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_0.80_draft.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Draft Quality +version = 4 + +[metadata] +global_quality = True +quality_type = draft +setting_version = 20 +type = quality +variant = 0.8mm Nozzle +weight = -5 + +[values] +layer_height = 0.30 +layer_height_0 = 0.20 + diff --git a/resources/quality/blocks/Nozzle/blocks_global_0.80_low.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_0.80_low.inst.cfg new file mode 100644 index 0000000000..55a7aeb751 --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_0.80_low.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Super low Quality +version = 4 + +[metadata] +global_quality = True +quality_type = low +setting_version = 20 +type = quality +variant = 0.8mm Nozzle +weight = -5 + +[values] +layer_height = 0.50 +layer_height_0 = 0.20 + diff --git a/resources/quality/blocks/Nozzle/blocks_global_0.80_standard.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_0.80_standard.inst.cfg new file mode 100644 index 0000000000..ca5a3a6228 --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_0.80_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Standard Quality +version = 4 + +[metadata] +global_quality = True +quality_type = normal +setting_version = 20 +type = quality +variant = 0.8mm Nozzle +weight = -3 + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Nozzle/blocks_global_0.80_superlow.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_0.80_superlow.inst.cfg new file mode 100644 index 0000000000..3daebb5631 --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_0.80_superlow.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Super low Quality +version = 4 + +[metadata] +global_quality = True +quality_type = superlow +setting_version = 20 +type = quality +variant = 0.8mm Nozzle +weight = -5 + +[values] +layer_height = 0.50 +layer_height_0 = 0.20 + diff --git a/resources/quality/blocks/Nozzle/blocks_global_0.80_ultra.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_0.80_ultra.inst.cfg new file mode 100644 index 0000000000..6776d8908c --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_0.80_ultra.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Ultra Quality +version = 4 + +[metadata] +global_quality = True +quality_type = ultra +setting_version = 20 +type = quality +variant = 0.8mm Nozzle +weight = 0 + +[values] +layer_height = 0.10 +layer_height_0 = 0.16 + diff --git a/resources/quality/blocks/Nozzle/blocks_global_1.0_adaptive.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_1.0_adaptive.inst.cfg new file mode 100644 index 0000000000..660d1d9091 --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_1.0_adaptive.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = blocks_base +name = Dynamic Quality +version = 4 + +[metadata] +global_quality = True +quality_type = adaptive +setting_version = 20 +type = quality +variant = 1.0mm Nozzle +weight = -2 + +[values] +adaptive_layer_height_enabled = true +layer_height = 0.16 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Nozzle/blocks_global_1.0_draft.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_1.0_draft.inst.cfg new file mode 100644 index 0000000000..b44aa16b5c --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_1.0_draft.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = blocks_base +name = Draft Quality +version = 4 + +[metadata] +global_quality = True +quality_type = draft +setting_version = 20 +type = quality +variant = 1.0mm Nozzle +weight = -5 + +[values] +layer_height = 0.30 +layer_height_0 = 0.20 +speed_infill = =speed_print + diff --git a/resources/quality/blocks/Nozzle/blocks_global_1.0_low.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_1.0_low.inst.cfg new file mode 100644 index 0000000000..e726f39e91 --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_1.0_low.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Low Quality +version = 4 + +[metadata] +global_quality = True +quality_type = low +setting_version = 20 +type = quality +variant = 1.0mm Nozzle +weight = -5 + +[values] +layer_height = 0.40 +layer_height_0 = 0.20 + diff --git a/resources/quality/blocks/Nozzle/blocks_global_1.0_standard.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_1.0_standard.inst.cfg new file mode 100644 index 0000000000..8fc1b41ab7 --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_1.0_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Standard Quality +version = 4 + +[metadata] +global_quality = True +quality_type = normal +setting_version = 20 +type = quality +variant = 1.0mm Nozzle +weight = -3 + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Nozzle/blocks_global_1.0_superlow.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_1.0_superlow.inst.cfg new file mode 100644 index 0000000000..08c46f984e --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_1.0_superlow.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Super low Quality +version = 4 + +[metadata] +global_quality = True +quality_type = superlow +setting_version = 20 +type = quality +variant = 1.0mm Nozzle +weight = -5 + +[values] +layer_height = 0.50 +layer_height_0 = 0.20 + diff --git a/resources/quality/blocks/Nozzle/blocks_global_1.0_ultra.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_1.0_ultra.inst.cfg new file mode 100644 index 0000000000..e5d1ae3853 --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_1.0_ultra.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Ultra Quality +version = 4 + +[metadata] +global_quality = True +quality_type = ultra +setting_version = 20 +type = quality +variant = 1.0mm Nozzle +weight = 0 + +[values] +layer_height = 0.10 +layer_height_0 = 0.16 + diff --git a/resources/quality/blocks/Nozzle/blocks_global_1.2_adaptive.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_1.2_adaptive.inst.cfg new file mode 100644 index 0000000000..2adb850a30 --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_1.2_adaptive.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = blocks_base +name = Dynamic Quality +version = 4 + +[metadata] +global_quality = True +quality_type = adaptive +setting_version = 20 +type = quality +variant = 1.2mm Nozzle +weight = -2 + +[values] +adaptive_layer_height_enabled = true +layer_height = 0.16 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Nozzle/blocks_global_1.2_draft.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_1.2_draft.inst.cfg new file mode 100644 index 0000000000..0c58998b28 --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_1.2_draft.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Draft Quality +version = 4 + +[metadata] +global_quality = True +quality_type = draft +setting_version = 20 +type = quality +variant = 1.2mm Nozzle +weight = -5 + +[values] +layer_height = 0.30 +layer_height_0 = 0.20 + diff --git a/resources/quality/blocks/Nozzle/blocks_global_1.2_low.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_1.2_low.inst.cfg new file mode 100644 index 0000000000..87df5e6116 --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_1.2_low.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Low Quality +version = 4 + +[metadata] +global_quality = True +quality_type = low +setting_version = 20 +type = quality +variant = 1.2mm Nozzle +weight = -5 + +[values] +layer_height = 0.40 +layer_height_0 = 0.20 + diff --git a/resources/quality/blocks/Nozzle/blocks_global_1.2_standard.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_1.2_standard.inst.cfg new file mode 100644 index 0000000000..f0de0c78eb --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_1.2_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Standard Quality +version = 4 + +[metadata] +global_quality = True +quality_type = normal +setting_version = 20 +type = quality +variant = 1.2mm Nozzle +weight = -3 + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Nozzle/blocks_global_1.2_superlow.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_1.2_superlow.inst.cfg new file mode 100644 index 0000000000..48f1e02bf9 --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_1.2_superlow.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Super low Quality +version = 4 + +[metadata] +global_quality = True +quality_type = superlow +setting_version = 20 +type = quality +variant = 1.2mm Nozzle +weight = -5 + +[values] +layer_height = 0.50 +layer_height_0 = 0.20 + diff --git a/resources/quality/blocks/Nozzle/blocks_global_1.2_ultra.inst.cfg b/resources/quality/blocks/Nozzle/blocks_global_1.2_ultra.inst.cfg new file mode 100644 index 0000000000..1d48b168e0 --- /dev/null +++ b/resources/quality/blocks/Nozzle/blocks_global_1.2_ultra.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Ultra Quality +version = 4 + +[metadata] +global_quality = True +quality_type = ultra +setting_version = 20 +type = quality +variant = 1.2mm Nozzle +weight = 0 + +[values] +layer_height = 0.10 +layer_height_0 = 0.16 + diff --git a/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.40_adaptive.inst.cfg b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.40_adaptive.inst.cfg new file mode 100644 index 0000000000..518e773ed5 --- /dev/null +++ b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.40_adaptive.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = blocks_base +name = Dynamic Quality +version = 4 + +[metadata] +global_quality = True +quality_type = adaptive +setting_version = 20 +type = quality +variant = HT - 0.4mm +weight = -2 + +[values] +adaptive_layer_height_enabled = true +layer_height = 0.16 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.40_draft.inst.cfg b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.40_draft.inst.cfg new file mode 100644 index 0000000000..710519cea2 --- /dev/null +++ b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.40_draft.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Draft Quality +version = 4 + +[metadata] +global_quality = True +quality_type = draft +setting_version = 20 +type = quality +variant = HT - 0.4mm +weight = -5 + +[values] +layer_height = 0.30 +layer_height_0 = 0.20 + diff --git a/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.40_standard.inst.cfg b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.40_standard.inst.cfg new file mode 100644 index 0000000000..623c063b8e --- /dev/null +++ b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.40_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Standard Quality +version = 4 + +[metadata] +global_quality = True +quality_type = normal +setting_version = 20 +type = quality +variant = HT - 0.4mm +weight = -3 + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.40_ultra.inst.cfg b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.40_ultra.inst.cfg new file mode 100644 index 0000000000..5e20cf4054 --- /dev/null +++ b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.40_ultra.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Ultra Quality +version = 4 + +[metadata] +global_quality = True +quality_type = ultra +setting_version = 20 +type = quality +variant = HT - 0.4mm +weight = 0 + +[values] +layer_height = 0.10 +layer_height_0 = 0.16 + diff --git a/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.50_adaptive.inst.cfg b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.50_adaptive.inst.cfg new file mode 100644 index 0000000000..14c2723fc6 --- /dev/null +++ b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.50_adaptive.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = blocks_base +name = Dynamic Quality +version = 4 + +[metadata] +global_quality = True +quality_type = adaptive +setting_version = 20 +type = quality +variant = HT - 0.5mm +weight = -2 + +[values] +adaptive_layer_height_enabled = true +layer_height = 0.16 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.50_draft.inst.cfg b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.50_draft.inst.cfg new file mode 100644 index 0000000000..9f99c8c10f --- /dev/null +++ b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.50_draft.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Draft Quality +version = 4 + +[metadata] +global_quality = True +quality_type = draft +setting_version = 20 +type = quality +variant = HT - 0.5mm +weight = -5 + +[values] +layer_height = 0.30 +layer_height_0 = 0.20 + diff --git a/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.50_standard.inst.cfg b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.50_standard.inst.cfg new file mode 100644 index 0000000000..0eaf385a7c --- /dev/null +++ b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.50_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Standard Quality +version = 4 + +[metadata] +global_quality = True +quality_type = normal +setting_version = 20 +type = quality +variant = HT - 0.5mm +weight = -3 + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.50_ultra.inst.cfg b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.50_ultra.inst.cfg new file mode 100644 index 0000000000..7c58392565 --- /dev/null +++ b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.50_ultra.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Ultra Quality +version = 4 + +[metadata] +global_quality = True +quality_type = ultra +setting_version = 20 +type = quality +variant = HT - 0.5mm +weight = 0 + +[values] +layer_height = 0.10 +layer_height_0 = 0.16 + diff --git a/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.60_adaptive.inst.cfg b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.60_adaptive.inst.cfg new file mode 100644 index 0000000000..65c779ad43 --- /dev/null +++ b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.60_adaptive.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = blocks_base +name = Dynamic Quality +version = 4 + +[metadata] +global_quality = True +quality_type = adaptive +setting_version = 20 +type = quality +variant = HT - 0.6mm +weight = -2 + +[values] +adaptive_layer_height_enabled = true +layer_height = 0.16 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.60_draft.inst.cfg b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.60_draft.inst.cfg new file mode 100644 index 0000000000..cc8da09310 --- /dev/null +++ b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.60_draft.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Draft Quality +version = 4 + +[metadata] +global_quality = True +quality_type = draft +setting_version = 20 +type = quality +variant = HT - 0.6mm +weight = -5 + +[values] +layer_height = 0.30 +layer_height_0 = 0.20 + diff --git a/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.60_low.inst.cfg b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.60_low.inst.cfg new file mode 100644 index 0000000000..198aa49190 --- /dev/null +++ b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.60_low.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Low Quality +version = 4 + +[metadata] +global_quality = True +quality_type = low +setting_version = 20 +type = quality +variant = HT - 0.6mm +weight = 0 + +[values] +layer_height = 0.4 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.60_standard.inst.cfg b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.60_standard.inst.cfg new file mode 100644 index 0000000000..5285689301 --- /dev/null +++ b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.60_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Standard Quality +version = 4 + +[metadata] +global_quality = True +quality_type = normal +setting_version = 20 +type = quality +variant = HT - 0.6mm +weight = -3 + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.60_ultra.inst.cfg b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.60_ultra.inst.cfg new file mode 100644 index 0000000000..162c2643fc --- /dev/null +++ b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.60_ultra.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Ultra Quality +version = 4 + +[metadata] +global_quality = True +quality_type = ultra +setting_version = 20 +type = quality +variant = HT - 0.6mm +weight = 0 + +[values] +layer_height = 0.10 +layer_height_0 = 0.16 + diff --git a/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.80_adaptive.inst.cfg b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.80_adaptive.inst.cfg new file mode 100644 index 0000000000..f8ca1bb69c --- /dev/null +++ b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.80_adaptive.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = blocks_base +name = Dynamic Quality +version = 4 + +[metadata] +global_quality = True +quality_type = adaptive +setting_version = 20 +type = quality +variant = HT - 0.8mm +weight = -2 + +[values] +adaptive_layer_height_enabled = true +layer_height = 0.16 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.80_draft.inst.cfg b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.80_draft.inst.cfg new file mode 100644 index 0000000000..69a5db75dd --- /dev/null +++ b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.80_draft.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Draft Quality +version = 4 + +[metadata] +global_quality = True +quality_type = draft +setting_version = 20 +type = quality +variant = HT - 0.8mm +weight = -5 + +[values] +layer_height = 0.30 +layer_height_0 = 0.20 + diff --git a/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.80_low.inst.cfg b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.80_low.inst.cfg new file mode 100644 index 0000000000..5dc99b475d --- /dev/null +++ b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.80_low.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Low Quality +version = 4 + +[metadata] +global_quality = True +quality_type = low +setting_version = 20 +type = quality +variant = HT - 0.8mm +weight = 0 + +[values] +layer_height = 0.4 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.80_standard.inst.cfg b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.80_standard.inst.cfg new file mode 100644 index 0000000000..7ce40bd851 --- /dev/null +++ b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.80_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Standard Quality +version = 4 + +[metadata] +global_quality = True +quality_type = normal +setting_version = 20 +type = quality +variant = HT - 0.8mm +weight = -3 + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.80_superlow.inst.cfg b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.80_superlow.inst.cfg new file mode 100644 index 0000000000..62b0feefb5 --- /dev/null +++ b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.80_superlow.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Super Low Quality +version = 4 + +[metadata] +global_quality = True +quality_type = superlow +setting_version = 20 +type = quality +variant = HT - 0.8mm +weight = 0 + +[values] +layer_height = 0.5 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.80_ultra.inst.cfg b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.80_ultra.inst.cfg new file mode 100644 index 0000000000..a1d67e5cec --- /dev/null +++ b/resources/quality/blocks/Printcore/HT/blocks_global_ht_0.80_ultra.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Ultra Quality +version = 4 + +[metadata] +global_quality = True +quality_type = ultra +setting_version = 20 +type = quality +variant = HT - 0.8mm +weight = 0 + +[values] +layer_height = 0.10 +layer_height_0 = 0.16 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_0.20_adaptive.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.20_adaptive.inst.cfg new file mode 100644 index 0000000000..632fb0c9c7 --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.20_adaptive.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = blocks_base +name = Dynamic Quality +version = 4 + +[metadata] +global_quality = True +quality_type = adaptive +setting_version = 20 +type = quality +variant = ST - 0.2mm +weight = -2 + +[values] +adaptive_layer_height_enabled = true +layer_height = 0.15 +layer_height_0 = 0.15 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_0.20_ultra.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.20_ultra.inst.cfg new file mode 100644 index 0000000000..2e530e79b5 --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.20_ultra.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Ultra Quality +version = 4 + +[metadata] +global_quality = True +quality_type = ultra +setting_version = 20 +type = quality +variant = ST - 0.2mm +weight = 0 + +[values] +layer_height = 0.10 +layer_height_0 = 0.15 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_0.30_adaptive.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.30_adaptive.inst.cfg new file mode 100644 index 0000000000..6149b1a0ac --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.30_adaptive.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = blocks_base +name = Dynamic Quality +version = 4 + +[metadata] +global_quality = True +quality_type = adaptive +setting_version = 20 +type = quality +variant = ST - 0.3mm +weight = -2 + +[values] +adaptive_layer_height_enabled = true +layer_height = 0.16 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_0.30_standard.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.30_standard.inst.cfg new file mode 100644 index 0000000000..25b4dd3530 --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.30_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Standard Quality +version = 4 + +[metadata] +global_quality = True +quality_type = normal +setting_version = 20 +type = quality +variant = ST - 0.3mm +weight = -3 + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_0.30_ultra.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.30_ultra.inst.cfg new file mode 100644 index 0000000000..7112fcc231 --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.30_ultra.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Ultra Quality +version = 4 + +[metadata] +global_quality = True +quality_type = ultra +setting_version = 20 +type = quality +variant = ST - 0.3mm +weight = 0 + +[values] +layer_height = 0.10 +layer_height_0 = 0.16 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_0.40_adaptive.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.40_adaptive.inst.cfg new file mode 100644 index 0000000000..d64b5038d1 --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.40_adaptive.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = blocks_base +name = Dynamic Quality +version = 4 + +[metadata] +global_quality = True +quality_type = adaptive +setting_version = 20 +type = quality +variant = ST - 0.4mm +weight = -2 + +[values] +adaptive_layer_height_enabled = true +layer_height = 0.16 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_0.40_draft.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.40_draft.inst.cfg new file mode 100644 index 0000000000..21eee48d02 --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.40_draft.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Draft Quality +version = 4 + +[metadata] +global_quality = True +quality_type = draft +setting_version = 20 +type = quality +variant = ST - 0.4mm +weight = -5 + +[values] +layer_height = 0.30 +layer_height_0 = 0.20 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_0.40_standard.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.40_standard.inst.cfg new file mode 100644 index 0000000000..20c8c80769 --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.40_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Standard Quality +version = 4 + +[metadata] +global_quality = True +quality_type = normal +setting_version = 20 +type = quality +variant = ST - 0.4mm +weight = -3 + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_0.40_ultra.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.40_ultra.inst.cfg new file mode 100644 index 0000000000..aa495e9b65 --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.40_ultra.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Ultra Quality +version = 4 + +[metadata] +global_quality = True +quality_type = ultra +setting_version = 20 +type = quality +variant = ST - 0.4mm +weight = 0 + +[values] +layer_height = 0.10 +layer_height_0 = 0.16 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_0.50_adaptive.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.50_adaptive.inst.cfg new file mode 100644 index 0000000000..e8de7c1641 --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.50_adaptive.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = blocks_base +name = Dynamic Quality +version = 4 + +[metadata] +global_quality = True +quality_type = adaptive +setting_version = 20 +type = quality +variant = ST - 0.5mm +weight = -2 + +[values] +adaptive_layer_height_enabled = true +layer_height = 0.16 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_0.50_draft.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.50_draft.inst.cfg new file mode 100644 index 0000000000..2ad389aa06 --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.50_draft.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Draft Quality +version = 4 + +[metadata] +global_quality = True +quality_type = draft +setting_version = 20 +type = quality +variant = ST - 0.5mm +weight = -5 + +[values] +layer_height = 0.30 +layer_height_0 = 0.20 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_0.50_standard.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.50_standard.inst.cfg new file mode 100644 index 0000000000..b20762c698 --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.50_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Standard Quality +version = 4 + +[metadata] +global_quality = True +quality_type = normal +setting_version = 20 +type = quality +variant = ST - 0.5mm +weight = -3 + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_0.50_ultra.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.50_ultra.inst.cfg new file mode 100644 index 0000000000..b4e83d6bf5 --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.50_ultra.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Ultra Quality +version = 4 + +[metadata] +global_quality = True +quality_type = ultra +setting_version = 20 +type = quality +variant = ST - 0.5mm +weight = 0 + +[values] +layer_height = 0.10 +layer_height_0 = 0.16 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_0.60_adaptive.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.60_adaptive.inst.cfg new file mode 100644 index 0000000000..92ff61ceac --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.60_adaptive.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = blocks_base +name = Dynamic Quality +version = 4 + +[metadata] +global_quality = True +quality_type = adaptive +setting_version = 20 +type = quality +variant = ST - 0.6mm +weight = -2 + +[values] +adaptive_layer_height_enabled = true +layer_height = 0.16 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_0.60_draft.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.60_draft.inst.cfg new file mode 100644 index 0000000000..a7af19ad2b --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.60_draft.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Draft Quality +version = 4 + +[metadata] +global_quality = True +quality_type = draft +setting_version = 20 +type = quality +variant = ST - 0.6mm +weight = -5 + +[values] +layer_height = 0.30 +layer_height_0 = 0.20 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_0.60_low.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.60_low.inst.cfg new file mode 100644 index 0000000000..2caefe61b4 --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.60_low.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Low Quality +version = 4 + +[metadata] +global_quality = True +quality_type = low +setting_version = 20 +type = quality +variant = ST - 0.6mm +weight = 0 + +[values] +layer_height = 0.4 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_0.60_standard.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.60_standard.inst.cfg new file mode 100644 index 0000000000..edaa070d64 --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.60_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Standard Quality +version = 4 + +[metadata] +global_quality = True +quality_type = normal +setting_version = 20 +type = quality +variant = ST - 0.6mm +weight = -3 + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_0.60_ultra.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.60_ultra.inst.cfg new file mode 100644 index 0000000000..bd6a6c6c40 --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.60_ultra.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Ultra Quality +version = 4 + +[metadata] +global_quality = True +quality_type = ultra +setting_version = 20 +type = quality +variant = ST - 0.6mm +weight = 0 + +[values] +layer_height = 0.10 +layer_height_0 = 0.16 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_0.80_adaptive.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.80_adaptive.inst.cfg new file mode 100644 index 0000000000..c443157a5b --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.80_adaptive.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = blocks_base +name = Dynamic Quality +version = 4 + +[metadata] +global_quality = True +quality_type = adaptive +setting_version = 20 +type = quality +variant = ST - 0.8mm +weight = -2 + +[values] +adaptive_layer_height_enabled = true +layer_height = 0.16 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_0.80_draft.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.80_draft.inst.cfg new file mode 100644 index 0000000000..b307bd22bd --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.80_draft.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Draft Quality +version = 4 + +[metadata] +global_quality = True +quality_type = draft +setting_version = 20 +type = quality +variant = ST - 0.8mm +weight = -5 + +[values] +layer_height = 0.30 +layer_height_0 = 0.20 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_0.80_low.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.80_low.inst.cfg new file mode 100644 index 0000000000..7158c41bfb --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.80_low.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Low Quality +version = 4 + +[metadata] +global_quality = True +quality_type = low +setting_version = 20 +type = quality +variant = ST - 0.8mm +weight = 0 + +[values] +layer_height = 0.4 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_0.80_standard.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.80_standard.inst.cfg new file mode 100644 index 0000000000..57a34b6ac1 --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.80_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Standard Quality +version = 4 + +[metadata] +global_quality = True +quality_type = normal +setting_version = 20 +type = quality +variant = ST - 0.8mm +weight = -3 + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_0.80_superlow.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.80_superlow.inst.cfg new file mode 100644 index 0000000000..4eb1bd89b9 --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.80_superlow.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Super Low Quality +version = 4 + +[metadata] +global_quality = True +quality_type = superlow +setting_version = 20 +type = quality +variant = ST - 0.8mm +weight = 0 + +[values] +layer_height = 0.5 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_0.80_ultra.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.80_ultra.inst.cfg new file mode 100644 index 0000000000..c70777bb73 --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_0.80_ultra.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Ultra Quality +version = 4 + +[metadata] +global_quality = True +quality_type = ultra +setting_version = 20 +type = quality +variant = ST - 0.8mm +weight = 0 + +[values] +layer_height = 0.10 +layer_height_0 = 0.16 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_1.0_adaptive.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_1.0_adaptive.inst.cfg new file mode 100644 index 0000000000..88e5f48ee2 --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_1.0_adaptive.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = blocks_base +name = Dynamic Quality +version = 4 + +[metadata] +global_quality = True +quality_type = adaptive +setting_version = 20 +type = quality +variant = ST - 1.0mm +weight = -2 + +[values] +adaptive_layer_height_enabled = true +layer_height = 0.16 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_1.0_draft.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_1.0_draft.inst.cfg new file mode 100644 index 0000000000..7c63856c9e --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_1.0_draft.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Draft Quality +version = 4 + +[metadata] +global_quality = True +quality_type = draft +setting_version = 20 +type = quality +variant = ST - 1.0mm +weight = -5 + +[values] +layer_height = 0.30 +layer_height_0 = 0.20 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_1.0_low.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_1.0_low.inst.cfg new file mode 100644 index 0000000000..ff4b1e6c98 --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_1.0_low.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Low Quality +version = 4 + +[metadata] +global_quality = True +quality_type = low +setting_version = 20 +type = quality +variant = ST - 1.0mm +weight = 0 + +[values] +layer_height = 0.4 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_1.0_standard.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_1.0_standard.inst.cfg new file mode 100644 index 0000000000..76eb51dbac --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_1.0_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Standard Quality +version = 4 + +[metadata] +global_quality = True +quality_type = normal +setting_version = 20 +type = quality +variant = ST - 1.0mm +weight = -3 + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_1.0_superlow.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_1.0_superlow.inst.cfg new file mode 100644 index 0000000000..c0d9a8069c --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_1.0_superlow.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Super Low Quality +version = 4 + +[metadata] +global_quality = True +quality_type = superlow +setting_version = 20 +type = quality +variant = ST - 1.0mm +weight = 0 + +[values] +layer_height = 0.5 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_1.0_ultra.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_1.0_ultra.inst.cfg new file mode 100644 index 0000000000..90437cda44 --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_1.0_ultra.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Ultra Quality +version = 4 + +[metadata] +global_quality = True +quality_type = ultra +setting_version = 20 +type = quality +variant = ST - 1.0mm +weight = 0 + +[values] +layer_height = 0.10 +layer_height_0 = 0.16 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_1.2_adaptive.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_1.2_adaptive.inst.cfg new file mode 100644 index 0000000000..1cb7710e8d --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_1.2_adaptive.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = blocks_base +name = Dynamic Quality +version = 4 + +[metadata] +global_quality = True +quality_type = adaptive +setting_version = 20 +type = quality +variant = ST - 1.2mm +weight = -2 + +[values] +adaptive_layer_height_enabled = true +layer_height = 0.16 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_1.2_draft.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_1.2_draft.inst.cfg new file mode 100644 index 0000000000..74ab2638d8 --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_1.2_draft.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Draft Quality +version = 4 + +[metadata] +global_quality = True +quality_type = draft +setting_version = 20 +type = quality +variant = ST - 1.2mm +weight = -5 + +[values] +layer_height = 0.30 +layer_height_0 = 0.20 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_1.2_low.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_1.2_low.inst.cfg new file mode 100644 index 0000000000..79c41c1b1d --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_1.2_low.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Low Quality +version = 4 + +[metadata] +global_quality = True +quality_type = low +setting_version = 20 +type = quality +variant = ST - 1.2mm +weight = 0 + +[values] +layer_height = 0.4 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_1.2_standard.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_1.2_standard.inst.cfg new file mode 100644 index 0000000000..ceca730b3a --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_1.2_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Standard Quality +version = 4 + +[metadata] +global_quality = True +quality_type = normal +setting_version = 20 +type = quality +variant = ST - 1.2mm +weight = -3 + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_1.2_superlow.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_1.2_superlow.inst.cfg new file mode 100644 index 0000000000..e4cc9b69d7 --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_1.2_superlow.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Super Low Quality +version = 4 + +[metadata] +global_quality = True +quality_type = superlow +setting_version = 20 +type = quality +variant = ST - 1.2mm +weight = 0 + +[values] +layer_height = 0.5 +layer_height_0 = 0.2 + diff --git a/resources/quality/blocks/Printcore/ST/blocks_global_st_1.2_ultra.inst.cfg b/resources/quality/blocks/Printcore/ST/blocks_global_st_1.2_ultra.inst.cfg new file mode 100644 index 0000000000..3cf71fc5a2 --- /dev/null +++ b/resources/quality/blocks/Printcore/ST/blocks_global_st_1.2_ultra.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = blocks_base +name = Ultra Quality +version = 4 + +[metadata] +global_quality = True +quality_type = ultra +setting_version = 20 +type = quality +variant = ST - 1.2mm +weight = 0 + +[values] +layer_height = 0.10 +layer_height_0 = 0.16 + diff --git a/resources/quality/builder_premium/bp_BVOH_Coarse_Quality.inst.cfg b/resources/quality/builder_premium/bp_BVOH_Coarse_Quality.inst.cfg index 44b051ef44..2975872b8e 100644 --- a/resources/quality/builder_premium/bp_BVOH_Coarse_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_BVOH_Coarse_Quality.inst.cfg @@ -1,23 +1,24 @@ [general] -version = 4 -name = Coarse definition = builder_premium_small +name = Coarse +version = 4 [metadata] +material = verbatim_bvoh_175 +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = -1 -material = verbatim_bvoh_175 [values] +bottom_thickness = =layer_height * 3 +layer_height = 0.3 +material_bed_temperature = 45 +material_bed_temperature_layer_0 = =material_bed_temperature +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature + 5 material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature -material_bed_temperature = 45 -material_bed_temperature_layer_0= =material_bed_temperature -layer_height = 0.3 -top_thickness = =layer_height * 5 -bottom_thickness = =layer_height * 3 speed_print = 40 +top_thickness = =layer_height * 5 + diff --git a/resources/quality/builder_premium/bp_BVOH_High_Quality.inst.cfg b/resources/quality/builder_premium/bp_BVOH_High_Quality.inst.cfg index c41ba95997..b28e526841 100644 --- a/resources/quality/builder_premium/bp_BVOH_High_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_BVOH_High_Quality.inst.cfg @@ -1,25 +1,26 @@ [general] -version = 4 -name = High Quality definition = builder_premium_small +name = High Quality +version = 4 [metadata] +material = verbatim_bvoh_175 +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -material = verbatim_bvoh_175 [values] acceleration_print = 2000 +bottom_thickness = =layer_height * 5 +layer_height = 0.1 +layer_height_0 = 0.2 +material_bed_temperature = 45 +material_bed_temperature_layer_0 = =material_bed_temperature +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature + 5 material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature -material_bed_temperature = 45 -material_bed_temperature_layer_0= =material_bed_temperature -layer_height = 0.1 -top_thickness = =layer_height * 7 -bottom_thickness = =layer_height * 5 speed_print = 40 -layer_height_0 = 0.2 +top_thickness = =layer_height * 7 + diff --git a/resources/quality/builder_premium/bp_BVOH_Normal_Quality.inst.cfg b/resources/quality/builder_premium/bp_BVOH_Normal_Quality.inst.cfg index 3611121da2..3758e6c06b 100644 --- a/resources/quality/builder_premium/bp_BVOH_Normal_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_BVOH_Normal_Quality.inst.cfg @@ -1,23 +1,24 @@ [general] -version = 4 -name = Normal definition = builder_premium_small +name = Normal +version = 4 [metadata] +material = verbatim_bvoh_175 +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = verbatim_bvoh_175 [values] +bottom_thickness = =layer_height * 3 +layer_height = 0.2 +material_bed_temperature = 45 +material_bed_temperature_layer_0 = =material_bed_temperature +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature + 5 material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature -material_bed_temperature = 45 -material_bed_temperature_layer_0= =material_bed_temperature -layer_height = 0.2 -top_thickness = =layer_height * 5 -bottom_thickness = =layer_height * 3 speed_print = 40 +top_thickness = =layer_height * 5 + diff --git a/resources/quality/builder_premium/bp_Innoflex60_Coarse_Quality.inst.cfg b/resources/quality/builder_premium/bp_Innoflex60_Coarse_Quality.inst.cfg index abebb020e1..6431d0fb40 100644 --- a/resources/quality/builder_premium/bp_Innoflex60_Coarse_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_Innoflex60_Coarse_Quality.inst.cfg @@ -1,23 +1,24 @@ [general] -version = 4 -name = Coarse definition = builder_premium_small +name = Coarse +version = 4 [metadata] +material = innofill_innoflex60_175 +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = -1 -material = innofill_innoflex60_175 [values] +bottom_thickness = =layer_height * 3 +layer_height = 0.3 +material_bed_temperature = 45 +material_bed_temperature_layer_0 = =material_bed_temperature +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature -material_bed_temperature = 45 -material_bed_temperature_layer_0= =material_bed_temperature -layer_height = 0.3 -top_thickness = =layer_height * 5 -bottom_thickness = =layer_height * 3 speed_print = 30 +top_thickness = =layer_height * 5 + diff --git a/resources/quality/builder_premium/bp_Innoflex60_High_Quality.inst.cfg b/resources/quality/builder_premium/bp_Innoflex60_High_Quality.inst.cfg index b0ae18808c..d6b89e5d7e 100644 --- a/resources/quality/builder_premium/bp_Innoflex60_High_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_Innoflex60_High_Quality.inst.cfg @@ -1,25 +1,26 @@ [general] -version = 4 -name = High Quality definition = builder_premium_small +name = High Quality +version = 4 [metadata] +material = innofill_innoflex60_175 +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -material = innofill_innoflex60_175 [values] acceleration_print = 2000 +bottom_thickness = =layer_height * 5 +layer_height = 0.1 +layer_height_0 = 0.2 +material_bed_temperature = 45 +material_bed_temperature_layer_0 = =material_bed_temperature +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature -material_bed_temperature = 45 -material_bed_temperature_layer_0= =material_bed_temperature -layer_height = 0.1 -top_thickness = =layer_height * 7 -bottom_thickness = =layer_height * 5 speed_print = 30 -layer_height_0 = 0.2 +top_thickness = =layer_height * 7 + diff --git a/resources/quality/builder_premium/bp_Innoflex60_Normal_Quality.inst.cfg b/resources/quality/builder_premium/bp_Innoflex60_Normal_Quality.inst.cfg index c8f666953d..ec14d80c43 100644 --- a/resources/quality/builder_premium/bp_Innoflex60_Normal_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_Innoflex60_Normal_Quality.inst.cfg @@ -1,23 +1,24 @@ [general] -version = 4 -name = Normal definition = builder_premium_small +name = Normal +version = 4 [metadata] +material = innofill_innoflex60_175 +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = innofill_innoflex60_175 [values] +bottom_thickness = =layer_height * 3 +layer_height = 0.2 +material_bed_temperature = 45 +material_bed_temperature_layer_0 = =material_bed_temperature +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature -material_bed_temperature = 45 -material_bed_temperature_layer_0= =material_bed_temperature -layer_height = 0.2 -top_thickness = =layer_height * 5 -bottom_thickness = =layer_height * 3 speed_print = 30 +top_thickness = =layer_height * 5 + diff --git a/resources/quality/builder_premium/bp_PET_Coarse_Quality.inst.cfg b/resources/quality/builder_premium/bp_PET_Coarse_Quality.inst.cfg index c772b10f6e..6daed5e7bc 100644 --- a/resources/quality/builder_premium/bp_PET_Coarse_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PET_Coarse_Quality.inst.cfg @@ -1,23 +1,24 @@ [general] -version = 4 -name = Coarse definition = builder_premium_small +name = Coarse +version = 4 [metadata] +material = generic_petg +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = -1 -material = generic_petg [values] +bottom_thickness = =layer_height * 3 +layer_height = 0.3 +material_bed_temperature = 45 +material_bed_temperature_layer_0 = =material_bed_temperature +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature -material_bed_temperature = 45 -material_bed_temperature_layer_0= =material_bed_temperature -layer_height = 0.3 -top_thickness = =layer_height * 5 -bottom_thickness = =layer_height * 3 speed_print = 60 +top_thickness = =layer_height * 5 + diff --git a/resources/quality/builder_premium/bp_PET_High_Quality.inst.cfg b/resources/quality/builder_premium/bp_PET_High_Quality.inst.cfg index 7c1b544277..7dff76ff92 100644 --- a/resources/quality/builder_premium/bp_PET_High_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PET_High_Quality.inst.cfg @@ -1,25 +1,26 @@ [general] -version = 4 -name = High Quality definition = builder_premium_small +name = High Quality +version = 4 [metadata] +material = generic_petg +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -material = generic_petg [values] acceleration_print = 2000 +bottom_thickness = =layer_height * 5 +layer_height = 0.1 +layer_height_0 = 0.2 +material_bed_temperature = 45 +material_bed_temperature_layer_0 = =material_bed_temperature +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature -material_bed_temperature = 45 -material_bed_temperature_layer_0= =material_bed_temperature -layer_height = 0.1 -top_thickness = =layer_height * 7 -bottom_thickness = =layer_height * 5 speed_print = 40 -layer_height_0 = 0.2 +top_thickness = =layer_height * 7 + diff --git a/resources/quality/builder_premium/bp_PET_Normal_Quality.inst.cfg b/resources/quality/builder_premium/bp_PET_Normal_Quality.inst.cfg index 80ce5c34af..eb39bb0834 100644 --- a/resources/quality/builder_premium/bp_PET_Normal_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PET_Normal_Quality.inst.cfg @@ -1,23 +1,24 @@ [general] -version = 4 -name = Normal definition = builder_premium_small +name = Normal +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = generic_petg [values] +bottom_thickness = =layer_height * 3 +layer_height = 0.2 +material_bed_temperature = 45 +material_bed_temperature_layer_0 = =material_bed_temperature +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature -material_bed_temperature = 45 -material_bed_temperature_layer_0= =material_bed_temperature -layer_height = 0.2 -top_thickness = =layer_height * 5 -bottom_thickness = =layer_height * 3 speed_print = 50 +top_thickness = =layer_height * 5 + diff --git a/resources/quality/builder_premium/bp_PLA_Coarse_Quality.inst.cfg b/resources/quality/builder_premium/bp_PLA_Coarse_Quality.inst.cfg index 56ac081a34..e6cc4cf635 100644 --- a/resources/quality/builder_premium/bp_PLA_Coarse_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PLA_Coarse_Quality.inst.cfg @@ -1,23 +1,24 @@ [general] -version = 4 -name = Coarse definition = builder_premium_small +name = Coarse +version = 4 [metadata] +material = generic_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = -1 -material = generic_pla [values] +bottom_thickness = =layer_height * 3 +layer_height = 0.3 +material_bed_temperature = 45 +material_bed_temperature_layer_0 = =material_bed_temperature +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature + 15 material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature -material_bed_temperature = 45 -material_bed_temperature_layer_0= =material_bed_temperature -layer_height = 0.3 -top_thickness = =layer_height * 5 -bottom_thickness = =layer_height * 3 speed_print = 60 +top_thickness = =layer_height * 5 + diff --git a/resources/quality/builder_premium/bp_PLA_High_Quality.inst.cfg b/resources/quality/builder_premium/bp_PLA_High_Quality.inst.cfg index 495327bcc6..407923b12d 100644 --- a/resources/quality/builder_premium/bp_PLA_High_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PLA_High_Quality.inst.cfg @@ -1,25 +1,26 @@ [general] -version = 4 -name = High Quality definition = builder_premium_small +name = High Quality +version = 4 [metadata] +material = generic_pla +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -material = generic_pla [values] acceleration_print = 2000 +bottom_thickness = =layer_height * 5 +layer_height = 0.1 +layer_height_0 = 0.2 +material_bed_temperature = 45 +material_bed_temperature_layer_0 = =material_bed_temperature +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature + 15 material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature -material_bed_temperature = 45 -material_bed_temperature_layer_0= =material_bed_temperature -layer_height = 0.1 -top_thickness = =layer_height * 7 -bottom_thickness = =layer_height * 5 speed_print = 40 -layer_height_0 = 0.2 +top_thickness = =layer_height * 7 + diff --git a/resources/quality/builder_premium/bp_PLA_Normal_Quality.inst.cfg b/resources/quality/builder_premium/bp_PLA_Normal_Quality.inst.cfg index 0546c1bc7f..12fd4e0c92 100644 --- a/resources/quality/builder_premium/bp_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PLA_Normal_Quality.inst.cfg @@ -1,23 +1,24 @@ [general] -version = 4 -name = Normal definition = builder_premium_small +name = Normal +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = generic_pla [values] +bottom_thickness = =layer_height * 3 +layer_height = 0.2 +material_bed_temperature = 45 +material_bed_temperature_layer_0 = =material_bed_temperature +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature + 15 material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature -material_bed_temperature = 45 -material_bed_temperature_layer_0= =material_bed_temperature -layer_height = 0.2 -top_thickness = =layer_height * 5 -bottom_thickness = =layer_height * 3 speed_print = 50 +top_thickness = =layer_height * 5 + diff --git a/resources/quality/builder_premium/bp_PVA_Coarse_Quality.inst.cfg b/resources/quality/builder_premium/bp_PVA_Coarse_Quality.inst.cfg index 1c0620e8b9..d6affb4063 100644 --- a/resources/quality/builder_premium/bp_PVA_Coarse_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PVA_Coarse_Quality.inst.cfg @@ -1,23 +1,24 @@ [general] -version = 4 -name = Coarse definition = builder_premium_small +name = Coarse +version = 4 [metadata] +material = generic_pva +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = -1 -material = generic_pva [values] +bottom_thickness = =layer_height * 3 +layer_height = 0.3 +material_bed_temperature = 45 +material_bed_temperature_layer_0 = =material_bed_temperature +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature + 10 material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature -material_bed_temperature = 45 -material_bed_temperature_layer_0= =material_bed_temperature -layer_height = 0.3 -top_thickness = =layer_height * 5 -bottom_thickness = =layer_height * 3 speed_print = 40 +top_thickness = =layer_height * 5 + diff --git a/resources/quality/builder_premium/bp_PVA_High_Quality.inst.cfg b/resources/quality/builder_premium/bp_PVA_High_Quality.inst.cfg index 2d7c54d80a..f1e726a377 100644 --- a/resources/quality/builder_premium/bp_PVA_High_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PVA_High_Quality.inst.cfg @@ -1,25 +1,26 @@ [general] -version = 4 -name = High Quality definition = builder_premium_small +name = High Quality +version = 4 [metadata] +material = generic_pva +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -material = generic_pva [values] acceleration_print = 2000 +bottom_thickness = =layer_height * 5 +layer_height = 0.1 +layer_height_0 = 0.2 +material_bed_temperature = 45 +material_bed_temperature_layer_0 = =material_bed_temperature +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature + 10 material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature -material_bed_temperature = 45 -material_bed_temperature_layer_0= =material_bed_temperature -layer_height = 0.1 -top_thickness = =layer_height * 7 -bottom_thickness = =layer_height * 5 speed_print = 40 -layer_height_0 = 0.2 +top_thickness = =layer_height * 7 + diff --git a/resources/quality/builder_premium/bp_PVA_Normal_Quality.inst.cfg b/resources/quality/builder_premium/bp_PVA_Normal_Quality.inst.cfg index 9388a930bf..c9a25c3afe 100644 --- a/resources/quality/builder_premium/bp_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_PVA_Normal_Quality.inst.cfg @@ -1,23 +1,24 @@ [general] -version = 4 -name = Normal definition = builder_premium_small +name = Normal +version = 4 [metadata] +material = generic_pva +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = generic_pva [values] +bottom_thickness = =layer_height * 3 +layer_height = 0.2 +material_bed_temperature = 45 +material_bed_temperature_layer_0 = =material_bed_temperature +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature + 10 material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature -material_bed_temperature = 45 -material_bed_temperature_layer_0= =material_bed_temperature -layer_height = 0.2 -top_thickness = =layer_height * 5 -bottom_thickness = =layer_height * 3 speed_print = 40 +top_thickness = =layer_height * 5 + diff --git a/resources/quality/builder_premium/bp_global_Coarse_Quality.inst.cfg b/resources/quality/builder_premium/bp_global_Coarse_Quality.inst.cfg index 90bd08ba86..d1c3707a0e 100644 --- a/resources/quality/builder_premium/bp_global_Coarse_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_global_Coarse_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Coarse definition = builder_premium_small +name = Coarse +version = 4 [metadata] +global_quality = True +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = -1 -global_quality = True [values] layer_height = 0.3 + diff --git a/resources/quality/builder_premium/bp_global_High_Quality.inst.cfg b/resources/quality/builder_premium/bp_global_High_Quality.inst.cfg index c41665f0f1..de1de8151e 100644 --- a/resources/quality/builder_premium/bp_global_High_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_global_High_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = High Quality definition = builder_premium_small +name = High Quality +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -global_quality = True [values] layer_height = 0.1 + diff --git a/resources/quality/builder_premium/bp_global_Normal_Quality.inst.cfg b/resources/quality/builder_premium/bp_global_Normal_Quality.inst.cfg index 3548b1e505..a291a41d07 100644 --- a/resources/quality/builder_premium/bp_global_Normal_Quality.inst.cfg +++ b/resources/quality/builder_premium/bp_global_Normal_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Normal definition = builder_premium_small +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] layer_height = 0.2 + diff --git a/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg index 748f6239e8..681b16abda 100644 --- a/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = High definition = cartesio +name = High +version = 4 [metadata] +material = generic_abs +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_abs variant = 0.25mm thermoplastic extruder +weight = 1 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.3 - -wall_thickness = 1 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else 15 +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else 15 +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 1 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg index 2afddc1905..695075d457 100644 --- a/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = Normal definition = cartesio +name = Normal +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_abs variant = 0.25mm thermoplastic extruder +weight = 0 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.3 - -wall_thickness = 1 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 1 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg index 6596695add..a50c052701 100644 --- a/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = High definition = cartesio +name = High +version = 4 [metadata] +material = generic_abs +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_abs variant = 0.4mm thermoplastic extruder +weight = 1 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.5 - -wall_thickness = 1.2 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else 15 +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else 15 +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 1.2 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg index 82e8c9a3c0..d63ef88c34 100644 --- a/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = Normal definition = cartesio +name = Normal +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_abs variant = 0.4mm thermoplastic extruder +weight = 0 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.5 - -wall_thickness = 1.2 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 1.2 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg index 92d92027bb..cf33d3b130 100644 --- a/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = Coarse definition = cartesio +name = Coarse +version = 4 [metadata] +material = generic_abs +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = 3 -material = generic_abs variant = 0.8mm thermoplastic extruder +weight = 3 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.9 - -wall_thickness = 2.4 -top_bottom_thickness = =layer_height * 3 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 30 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 30 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = =layer_height * 3 +wall_0_inset = -0.05 +wall_thickness = 2.4 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg index 30d7ddfccf..4cfb08f77f 100644 --- a/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = Extra Coarse definition = cartesio +name = Extra Coarse +version = 4 [metadata] +material = generic_abs +quality_type = extra coarse setting_version = 20 type = quality -quality_type = extra coarse -weight = 4 -material = generic_abs variant = 0.8mm thermoplastic extruder +weight = 4 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.9 - -wall_thickness = 2.4 -top_bottom_thickness = =layer_height * 3 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 25 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 25 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = =layer_height * 3 +wall_0_inset = -0.05 +wall_thickness = 2.4 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg index 6e13ff8ce9..92ef8f69ce 100644 --- a/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = High definition = cartesio +name = High +version = 4 [metadata] +material = generic_abs +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_abs variant = 0.8mm thermoplastic extruder +weight = 1 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.9 - -wall_thickness = 2.4 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else 15 +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else 15 +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 2.4 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg index 721730fab8..87ff0b8098 100644 --- a/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = Normal definition = cartesio +name = Normal +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_abs variant = 0.8mm thermoplastic extruder +weight = 0 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.9 - -wall_thickness = 2.4 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 2.4 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg index bf570690cc..5f7dd96ce2 100644 --- a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg +++ b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg @@ -1,59 +1,51 @@ [general] -version = 4 -name = High definition = cartesio +name = High +version = 4 [metadata] +material = dsm_arnitel2045_175 +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = dsm_arnitel2045_175 variant = 0.4mm thermoplastic extruder +weight = 1 [values] +acceleration_enabled = True +acceleration_print = 100 +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.5 - -wall_thickness = 1.2 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 +jerk_enabled = True +jerk_print = 5 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 2 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 25 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else 15 +speed_print = 25 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else 15 +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 1.2 -acceleration_enabled = True -acceleration_print = 100 -jerk_enabled = True -jerk_print = 5 - -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg index 5c0092404f..da78b6f4ea 100644 --- a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg +++ b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg @@ -1,59 +1,51 @@ [general] -version = 4 -name = Normal definition = cartesio +name = Normal +version = 4 [metadata] +material = dsm_arnitel2045_175 +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = dsm_arnitel2045_175 variant = 0.4mm thermoplastic extruder +weight = 0 [values] +acceleration_enabled = True +acceleration_print = 100 +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.5 - -wall_thickness = 1.2 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 +jerk_enabled = True +jerk_print = 5 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 2 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 25 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 25 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 1.2 -acceleration_enabled = True -acceleration_print = 100 -jerk_enabled = True -jerk_print = 5 - -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/cartesio_global_Coarse_Quality.inst.cfg b/resources/quality/cartesio/cartesio_global_Coarse_Quality.inst.cfg index d0be3665ae..081cbdcdd9 100644 --- a/resources/quality/cartesio/cartesio_global_Coarse_Quality.inst.cfg +++ b/resources/quality/cartesio/cartesio_global_Coarse_Quality.inst.cfg @@ -1,37 +1,32 @@ [general] -version = 4 -name = Coarse definition = cartesio +name = Coarse +version = 4 [metadata] +global_quality = True +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = -3 -global_quality = True [values] -layer_height = 0.4 -layer_height_0 = =layer_height - -skin_angles = [0,90] - -infill_before_walls = False -infill_angles = [0,90] - -speed_slowdown_layers = 1 acceleration_print = 300 acceleration_travel = 300 +adhesion_type = skirt +infill_angles = [0,90] +infill_before_walls = False jerk_print = 10 jerk_travel = 10 - +layer_height = 0.4 +layer_height_0 = =layer_height retraction_combing = off - -support_z_distance = 0 -support_xy_distance = 1 -support_join_distance = 10 +skin_angles = [0,90] +skirt_gap = 1 +speed_slowdown_layers = 1 support_interface_enable = True support_interface_pattern = lines +support_join_distance = 10 +support_xy_distance = 1 +support_z_distance = 0 -adhesion_type = skirt -skirt_gap = 1 diff --git a/resources/quality/cartesio/cartesio_global_Extra_Coarse_Quality.inst.cfg b/resources/quality/cartesio/cartesio_global_Extra_Coarse_Quality.inst.cfg index 9003408f10..fa5af706f8 100644 --- a/resources/quality/cartesio/cartesio_global_Extra_Coarse_Quality.inst.cfg +++ b/resources/quality/cartesio/cartesio_global_Extra_Coarse_Quality.inst.cfg @@ -1,37 +1,32 @@ [general] -version = 4 -name = Extra Coarse definition = cartesio +name = Extra Coarse +version = 4 [metadata] +global_quality = True +quality_type = extra coarse setting_version = 20 type = quality -quality_type = extra coarse weight = -4 -global_quality = True [values] -layer_height = 0.6 -layer_height_0 = =layer_height - -skin_angles = [0,90] - -infill_before_walls = False -infill_angles = [0,90] - -speed_slowdown_layers = 1 acceleration_print = 300 acceleration_travel = 300 +adhesion_type = skirt +infill_angles = [0,90] +infill_before_walls = False jerk_print = 10 jerk_travel = 10 - +layer_height = 0.6 +layer_height_0 = =layer_height retraction_combing = off - -support_z_distance = 0 -support_xy_distance = 1 -support_join_distance = 10 +skin_angles = [0,90] +skirt_gap = 1 +speed_slowdown_layers = 1 support_interface_enable = True support_interface_pattern = lines +support_join_distance = 10 +support_xy_distance = 1 +support_z_distance = 0 -adhesion_type = skirt -skirt_gap = 1 diff --git a/resources/quality/cartesio/cartesio_global_High_Quality.inst.cfg b/resources/quality/cartesio/cartesio_global_High_Quality.inst.cfg index ff565e440e..d93f3f5b06 100644 --- a/resources/quality/cartesio/cartesio_global_High_Quality.inst.cfg +++ b/resources/quality/cartesio/cartesio_global_High_Quality.inst.cfg @@ -1,38 +1,33 @@ [general] -version = 4 -name = High definition = cartesio +name = High +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -global_quality = True [values] -layer_height = 0.1 -layer_height_0 = =0.2 if min(extruderValues('machine_nozzle_size')) < 0.3 else 0.3 - -skin_angles = [0,90] - -infill_before_walls = False -infill_angles = [0,90] - -speed_slowdown_layers = 1 acceleration_print = 300 acceleration_travel = 300 +adhesion_type = skirt +infill_angles = [0,90] +infill_before_walls = False jerk_print = 10 jerk_travel = 10 - +layer_height = 0.1 +layer_height_0 = =0.2 if min(extruderValues('machine_nozzle_size')) < 0.3 else 0.3 retraction_combing = off - -support_z_distance = 0 -support_xy_distance = 1 -support_join_distance = 10 +skin_angles = [0,90] +skirt_gap = 1 +speed_slowdown_layers = 1 support_interface_enable = True support_interface_height = 0.5 support_interface_pattern = lines +support_join_distance = 10 +support_xy_distance = 1 +support_z_distance = 0 -adhesion_type = skirt -skirt_gap = 1 diff --git a/resources/quality/cartesio/cartesio_global_Normal_Quality.inst.cfg b/resources/quality/cartesio/cartesio_global_Normal_Quality.inst.cfg index 68a1cca4ab..936ca2625b 100644 --- a/resources/quality/cartesio/cartesio_global_Normal_Quality.inst.cfg +++ b/resources/quality/cartesio/cartesio_global_Normal_Quality.inst.cfg @@ -1,37 +1,32 @@ [general] -version = 4 -name = Normal definition = cartesio +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] -layer_height = 0.2 -layer_height_0 = =0.2 if min(extruderValues('machine_nozzle_size')) < 0.3 else 0.3 - -skin_angles = [0,90] - -infill_before_walls = False -infill_angles = [0,90] - -speed_slowdown_layers = 1 acceleration_print = 300 acceleration_travel = 300 +adhesion_type = skirt +infill_angles = [0,90] +infill_before_walls = False jerk_print = 10 jerk_travel = 10 - +layer_height = 0.2 +layer_height_0 = =0.2 if min(extruderValues('machine_nozzle_size')) < 0.3 else 0.3 retraction_combing = off - -support_z_distance = 0 -support_xy_distance = 1 -support_join_distance = 10 +skin_angles = [0,90] +skirt_gap = 1 +speed_slowdown_layers = 1 support_interface_enable = True support_interface_pattern = lines +support_join_distance = 10 +support_xy_distance = 1 +support_z_distance = 0 -adhesion_type = skirt -skirt_gap = 1 diff --git a/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg index 289e5d4017..9d8e1292eb 100644 --- a/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = High definition = cartesio +name = High +version = 4 [metadata] +material = generic_hips +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_hips variant = 0.25mm thermoplastic extruder +weight = 1 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.3 - -wall_thickness = 1 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else 15 +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else 15 +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 1 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg index 3321a0995c..a008eb7a1d 100644 --- a/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = Normal definition = cartesio +name = Normal +version = 4 [metadata] +material = generic_hips +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_hips variant = 0.25mm thermoplastic extruder +weight = 0 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.3 - -wall_thickness = 1 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 1 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg index 6bbddc9bfd..566df9cca4 100644 --- a/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = High definition = cartesio +name = High +version = 4 [metadata] +material = generic_hips +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_hips variant = 0.4mm thermoplastic extruder +weight = 1 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.5 - -wall_thickness = 1.2 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else 15 +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else 15 +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 1.2 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg index ebd825933c..e0f1b2e79b 100644 --- a/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = Normal definition = cartesio +name = Normal +version = 4 [metadata] +material = generic_hips +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_hips variant = 0.4mm thermoplastic extruder +weight = 0 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.5 - -wall_thickness = 1.2 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 1.2 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg index cf86269407..2046ecd618 100644 --- a/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = Coarse definition = cartesio +name = Coarse +version = 4 [metadata] +material = generic_hips +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = 3 -material = generic_hips variant = 0.8mm thermoplastic extruder +weight = 3 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.9 - -wall_thickness = 2.4 -top_bottom_thickness = =layer_height * 3 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 30 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 30 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = =layer_height * 3 +wall_0_inset = -0.05 +wall_thickness = 2.4 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg index b1942c6f06..a67bc2c245 100644 --- a/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = Extra Coarse definition = cartesio +name = Extra Coarse +version = 4 [metadata] +material = generic_hips +quality_type = extra coarse setting_version = 20 type = quality -quality_type = extra coarse -weight = 4 -material = generic_hips variant = 0.8mm thermoplastic extruder +weight = 4 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.9 - -wall_thickness = 2.4 -top_bottom_thickness = =layer_height * 3 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 25 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 25 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = =layer_height * 3 +wall_0_inset = -0.05 +wall_thickness = 2.4 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg index 3825154978..be9e8d8e0c 100644 --- a/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = High definition = cartesio +name = High +version = 4 [metadata] +material = generic_hips +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_hips variant = 0.8mm thermoplastic extruder +weight = 1 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.9 - -wall_thickness = 2.4 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else 15 +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else 15 +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 2.4 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg index 37c52c3bd1..e8294550cd 100644 --- a/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = Normal definition = cartesio +name = Normal +version = 4 [metadata] +material = generic_hips +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_hips variant = 0.8mm thermoplastic extruder +weight = 0 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.9 - -wall_thickness = 2.4 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 2.4 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg index 1848df0d50..3f46613a74 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = High definition = cartesio +name = High +version = 4 [metadata] +material = generic_nylon +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_nylon variant = 0.25mm thermoplastic extruder +weight = 1 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.3 - -wall_thickness = 1 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else 15 +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else 15 +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 1 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg index 9ac8807824..8bd2f3846f 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = Normal definition = cartesio +name = Normal +version = 4 [metadata] +material = generic_nylon +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_nylon variant = 0.25mm thermoplastic extruder +weight = 0 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.3 - -wall_thickness = 1 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 1 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg index 5bb9b39c9c..3a461fbb92 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = High definition = cartesio +name = High +version = 4 [metadata] +material = generic_nylon +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_nylon variant = 0.4mm thermoplastic extruder +weight = 1 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.5 - -wall_thickness = 1.2 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else 15 +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else 15 +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 1.2 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg index ed82be22ba..0d6faba1e1 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = Normal definition = cartesio +name = Normal +version = 4 [metadata] +material = generic_nylon +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_nylon variant = 0.4mm thermoplastic extruder +weight = 0 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.5 - -wall_thickness = 1.2 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 1.2 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg index d37daaf206..89af71249f 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = Coarse definition = cartesio +name = Coarse +version = 4 [metadata] +material = generic_nylon +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = 3 -material = generic_nylon variant = 0.8mm thermoplastic extruder +weight = 3 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.9 - -wall_thickness = 2.4 -top_bottom_thickness = =layer_height * 3 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 30 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 30 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = =layer_height * 3 +wall_0_inset = -0.05 +wall_thickness = 2.4 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg index 6f4ff50143..1431e4a643 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = Extra Coarse definition = cartesio +name = Extra Coarse +version = 4 [metadata] +material = generic_nylon +quality_type = extra coarse setting_version = 20 type = quality -quality_type = extra coarse -weight = 4 -material = generic_nylon variant = 0.8mm thermoplastic extruder +weight = 4 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.9 - -wall_thickness = 2.4 -top_bottom_thickness = =layer_height * 3 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 25 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 25 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = =layer_height * 3 +wall_0_inset = -0.05 +wall_thickness = 2.4 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg index fa070ed327..fe890f115c 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = High definition = cartesio +name = High +version = 4 [metadata] +material = generic_nylon +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_nylon variant = 0.8mm thermoplastic extruder +weight = 1 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.9 - -wall_thickness = 2.4 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else 15 +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else 15 +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 2.4 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg index 63e7f9ca83..bdd25adcf8 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = Normal definition = cartesio +name = Normal +version = 4 [metadata] +material = generic_nylon +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_nylon variant = 0.8mm thermoplastic extruder +weight = 0 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.9 - -wall_thickness = 2.4 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 2.4 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg index 1ec56c4fa2..dd76a9d9c5 100644 --- a/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = High definition = cartesio +name = High +version = 4 [metadata] +material = generic_pc +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pc variant = 0.25mm thermoplastic extruder +weight = 1 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.3 - -wall_thickness = 1 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 20 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else 15 +speed_print = 20 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else 15 +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 1 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg index 098bc488cb..507fc63460 100644 --- a/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = Normal definition = cartesio +name = Normal +version = 4 [metadata] +material = generic_pc +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pc variant = 0.25mm thermoplastic extruder +weight = 0 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.3 - -wall_thickness = 1 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 20 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 20 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 1 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg index 58104a23c3..405287f054 100644 --- a/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = High definition = cartesio +name = High +version = 4 [metadata] +material = generic_pc +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pc variant = 0.4mm thermoplastic extruder +weight = 1 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.5 - -wall_thickness = 1.2 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 20 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else 15 +speed_print = 20 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else 15 +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 1.2 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg index fd44d72b0e..5a25d339c9 100644 --- a/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = Normal definition = cartesio +name = Normal +version = 4 [metadata] +material = generic_pc +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pc variant = 0.4mm thermoplastic extruder +weight = 0 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.5 - -wall_thickness = 1.2 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 20 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 20 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 1.2 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg index 9cbd53cc00..4a418ab2c7 100644 --- a/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = Coarse definition = cartesio +name = Coarse +version = 4 [metadata] +material = generic_pc +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = 3 -material = generic_pc variant = 0.8mm thermoplastic extruder +weight = 3 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.9 - -wall_thickness = 2.4 -top_bottom_thickness = =layer_height * 3 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 15 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 15 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = =layer_height * 3 +wall_0_inset = -0.05 +wall_thickness = 2.4 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg index 1fcb9f76a1..d1aa41d696 100644 --- a/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = Extra Coarse definition = cartesio +name = Extra Coarse +version = 4 [metadata] +material = generic_pc +quality_type = extra coarse setting_version = 20 type = quality -quality_type = extra coarse -weight = 4 -material = generic_pc variant = 0.8mm thermoplastic extruder +weight = 4 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.9 - -wall_thickness = 2.4 -top_bottom_thickness = =layer_height * 3 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 15 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 15 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = =layer_height * 3 +wall_0_inset = -0.05 +wall_thickness = 2.4 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg index 7d2c1fd1f2..1dcd516800 100644 --- a/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = High definition = cartesio +name = High +version = 4 [metadata] +material = generic_pc +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pc variant = 0.8mm thermoplastic extruder +weight = 1 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.9 - -wall_thickness = 2.4 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 20 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else 15 +speed_print = 20 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else 15 +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 2.4 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg index d4fa7c937c..cdc8081515 100644 --- a/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = Normal definition = cartesio +name = Normal +version = 4 [metadata] +material = generic_pc +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pc variant = 0.8mm thermoplastic extruder +weight = 0 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.9 - -wall_thickness = 2.4 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 20 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 20 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 2.4 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg index 9f55db9a25..bfed1a5f14 100644 --- a/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = High definition = cartesio +name = High +version = 4 [metadata] +material = generic_petg +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_petg variant = 0.25mm thermoplastic extruder +weight = 1 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.3 - -wall_thickness = 1 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 8 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else 15 +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else 15 +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 1 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg index 0af37462cc..a1b7c7b1c4 100644 --- a/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = Normal definition = cartesio +name = Normal +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_petg variant = 0.25mm thermoplastic extruder +weight = 0 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.3 - -wall_thickness = 1 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 8 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 1 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg index 89c2e18737..ef8986a607 100644 --- a/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = High definition = cartesio +name = High +version = 4 [metadata] +material = generic_petg +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_petg variant = 0.4mm thermoplastic extruder +weight = 1 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.5 - -wall_thickness = 1.2 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 8 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else 15 +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else 15 +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 1.2 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg index 8da62dc2d4..585fbc4708 100644 --- a/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = Normal definition = cartesio +name = Normal +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_petg variant = 0.4mm thermoplastic extruder +weight = 0 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.5 - -wall_thickness = 1.2 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 8 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 1.2 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg index 2544846b63..be487160cc 100644 --- a/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = Coarse definition = cartesio +name = Coarse +version = 4 [metadata] +material = generic_petg +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = 3 -material = generic_petg variant = 0.8mm thermoplastic extruder +weight = 3 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.9 - -wall_thickness = 2.4 -top_bottom_thickness = =layer_height * 3 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 8 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 30 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 30 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = =layer_height * 3 +wall_0_inset = -0.05 +wall_thickness = 2.4 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg index e40f01d2bf..6af6feeb48 100644 --- a/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = Extra Coarse definition = cartesio +name = Extra Coarse +version = 4 [metadata] +material = generic_petg +quality_type = extra coarse setting_version = 20 type = quality -quality_type = extra coarse -weight = 4 -material = generic_petg variant = 0.8mm thermoplastic extruder +weight = 4 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.9 - -wall_thickness = 2.4 -top_bottom_thickness = =layer_height * 3 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 8 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 25 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 25 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = =layer_height * 3 +wall_0_inset = -0.05 +wall_thickness = 2.4 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg index 4cc2356e85..f3512d1f1c 100644 --- a/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = High definition = cartesio +name = High +version = 4 [metadata] +material = generic_petg +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_petg variant = 0.8mm thermoplastic extruder +weight = 1 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.9 - -wall_thickness = 2.4 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 50 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 50 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 8 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else 15 +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else 15 +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 2.4 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg index cdb7e67a46..1dc7fc5242 100644 --- a/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = Normal definition = cartesio +name = Normal +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_petg variant = 0.8mm thermoplastic extruder +weight = 0 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.9 - -wall_thickness = 2.4 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 8 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 2.4 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg index bdce5098bb..45d8ae6d6b 100644 --- a/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = High definition = cartesio +name = High +version = 4 [metadata] +material = generic_pla +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pla variant = 0.25mm thermoplastic extruder +weight = 1 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.3 - -wall_thickness = 1 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else 15 +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else 15 +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 1 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg index 8ac474090e..b6b2f1e3be 100644 --- a/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = Normal definition = cartesio +name = Normal +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pla variant = 0.25mm thermoplastic extruder +weight = 0 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.3 - -wall_thickness = 1 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 1 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg index 1edaf3c7df..53a12fc695 100644 --- a/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = High definition = cartesio +name = High +version = 4 [metadata] +material = generic_pla +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pla variant = 0.4mm thermoplastic extruder +weight = 1 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.5 - -wall_thickness = 1.2 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else 15 +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else 15 +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 1.2 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg index 75df3728ce..436b90600e 100644 --- a/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = Normal definition = cartesio +name = Normal +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pla variant = 0.4mm thermoplastic extruder +weight = 0 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.5 - -wall_thickness = 1.2 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 1.2 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg index d215697257..e62ce8aa39 100644 --- a/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = Coarse definition = cartesio +name = Coarse +version = 4 [metadata] +material = generic_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = generic_pla variant = 0.8mm thermoplastic extruder +weight = -3 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.9 - -wall_thickness = 2.4 -top_bottom_thickness = =layer_height * 3 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 30 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 30 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = =layer_height * 3 +wall_0_inset = -0.05 +wall_thickness = 2.4 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg index fecca6671f..108c27ba02 100644 --- a/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = Extra Coarse definition = cartesio +name = Extra Coarse +version = 4 [metadata] +material = generic_pla +quality_type = extra coarse setting_version = 20 type = quality -quality_type = extra coarse -weight = -4 -material = generic_pla variant = 0.8mm thermoplastic extruder +weight = -4 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.9 - -wall_thickness = 2.4 -top_bottom_thickness = =layer_height * 3 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 25 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 25 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = =layer_height * 3 +wall_0_inset = -0.05 +wall_thickness = 2.4 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg index e720117ec0..4201ceb3da 100644 --- a/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = High definition = cartesio +name = High +version = 4 [metadata] +material = generic_pla +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pla variant = 0.8mm thermoplastic extruder +weight = 1 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.9 - -wall_thickness = 2.4 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else 15 +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else 15 +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 2.4 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg index 532942fcd6..bb4978146e 100644 --- a/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = Normal definition = cartesio +name = Normal +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pla variant = 0.8mm thermoplastic extruder +weight = 0 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.9 - -wall_thickness = 2.4 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 10 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 2.4 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg index e9f15c5437..7190da5491 100644 --- a/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = High definition = cartesio +name = High +version = 4 [metadata] +material = generic_pva +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pva variant = 0.25mm thermoplastic extruder +weight = 1 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.3 - -wall_thickness = 1 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 8 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else 15 +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else 15 +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 1 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg index 09668de1e8..6a2c247a11 100644 --- a/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = Normal definition = cartesio +name = Normal +version = 4 [metadata] +material = generic_pva +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pva variant = 0.25mm thermoplastic extruder +weight = 0 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.3 - -wall_thickness = 1 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 8 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 1 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg index c815cbe1ca..f8baf74451 100644 --- a/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = High definition = cartesio +name = High +version = 4 [metadata] +material = generic_pva +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pva variant = 0.4mm thermoplastic extruder +weight = 1 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.5 - -wall_thickness = 1.2 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 8 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else 15 +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else 15 +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 1.2 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg index 7b4f61a853..e40aba3ac5 100644 --- a/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = Normal definition = cartesio +name = Normal +version = 4 [metadata] +material = generic_pva +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pva variant = 0.4mm thermoplastic extruder +weight = 0 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.5 - -wall_thickness = 1.2 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 8 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 1.2 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg index 6aeec98f71..94952d5a8c 100644 --- a/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = Coarse definition = cartesio +name = Coarse +version = 4 [metadata] +material = generic_pva +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = 3 -material = generic_pva variant = 0.8mm thermoplastic extruder +weight = 3 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.9 - -wall_thickness = 2.4 -top_bottom_thickness = =layer_height * 3 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 8 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 30 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 30 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = =layer_height * 3 +wall_0_inset = -0.05 +wall_thickness = 2.4 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg index e89f175e05..e55d95ccb5 100644 --- a/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = Extra Coarse definition = cartesio +name = Extra Coarse +version = 4 [metadata] +material = generic_pva +quality_type = extra coarse setting_version = 20 type = quality -quality_type = extra coarse -weight = 4 -material = generic_pva variant = 0.8mm thermoplastic extruder +weight = 4 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.9 - -wall_thickness = 2.4 -top_bottom_thickness = =layer_height * 3 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 8 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 25 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 25 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = =layer_height * 3 +wall_0_inset = -0.05 +wall_thickness = 2.4 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg index 0e8181d83c..39177937da 100644 --- a/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = High definition = cartesio +name = High +version = 4 [metadata] +material = generic_pva +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pva variant = 0.8mm thermoplastic extruder +weight = 1 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.9 - -wall_thickness = 2.4 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 8 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else 15 +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else 15 +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 2.4 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg index eeff640f0f..43e742b3e3 100644 --- a/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg @@ -1,54 +1,47 @@ [general] -version = 4 -name = Normal definition = cartesio +name = Normal +version = 4 [metadata] +material = generic_pva +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pva variant = 0.8mm thermoplastic extruder +weight = 0 [values] +coasting_enable = True +coasting_min_volume = 0.17 +coasting_speed = 90 +coasting_volume = 0.1 +cool_min_layer_time = 20 +cool_min_layer_time_fan_speed_max = =cool_min_layer_time infill_line_width = 0.9 - -wall_thickness = 2.4 -top_bottom_thickness = 0.8 -wall_0_inset = -0.05 - -infill_sparse_density = 40 infill_pattern = grid - -material_print_temperature_layer_0 = =material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +infill_sparse_density = 40 material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature_layer_0 + 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 1 +retraction_hop_enabled = True retraction_min_travel = =round(line_width * 10) retraction_prime_speed = 8 -switch_extruder_retraction_amount = 2 -switch_extruder_retraction_speeds = =retraction_speed -switch_extruder_prime_speed = =retraction_prime_speed - -speed_print = 50 +skirt_brim_minimal_length = 50 speed_infill = =speed_print speed_layer_0 = =round(speed_print / 5 * 4) -speed_wall = =round(speed_print / 2) -speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +speed_print = 50 +speed_support_interface = =speed_topbottom speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel -speed_support_interface = =speed_topbottom +speed_wall = =round(speed_print / 2) +speed_wall_0 = =10 if speed_wall < 11 else (speed_print / 5 *3) +switch_extruder_prime_speed = =retraction_prime_speed +switch_extruder_retraction_amount = 2 +switch_extruder_retraction_speeds = =retraction_speed +top_bottom_thickness = 0.8 +wall_0_inset = -0.05 +wall_thickness = 2.4 -retraction_hop_enabled = True -retraction_hop = 1 - -cool_min_layer_time_fan_speed_max = =cool_min_layer_time -cool_min_layer_time = 20 - -skirt_brim_minimal_length = 50 - -coasting_enable = True -coasting_volume = 0.1 -coasting_min_volume = 0.17 -coasting_speed = 90 diff --git a/resources/quality/coarse.inst.cfg b/resources/quality/coarse.inst.cfg index d28e52ace1..37e8d6edad 100644 --- a/resources/quality/coarse.inst.cfg +++ b/resources/quality/coarse.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Coarse definition = fdmprinter +name = Coarse +version = 4 [metadata] +global_quality = True +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = -3 -global_quality = True [values] layer_height = 0.4 + diff --git a/resources/quality/crazy3dprint/abs/crazy3dprint_0.40_abs_coarse.inst.cfg b/resources/quality/crazy3dprint/abs/crazy3dprint_0.40_abs_coarse.inst.cfg index 13f177a9e9..f4c10c5e8b 100644 --- a/resources/quality/crazy3dprint/abs/crazy3dprint_0.40_abs_coarse.inst.cfg +++ b/resources/quality/crazy3dprint/abs/crazy3dprint_0.40_abs_coarse.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Coarse Quality definition = crazy3dprint_base +name = Coarse Quality +version = 4 [metadata] +material = generic_abs +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -material = generic_abs variant = 0.4mm Nozzle [values] @@ -20,4 +20,5 @@ material_print_temperature_layer_0 = 245 speed_infill = =speed_print speed_print = 24 speed_support = 24 -speed_travel = 100 \ No newline at end of file +speed_travel = 100 + diff --git a/resources/quality/crazy3dprint/abs/crazy3dprint_0.40_abs_draft.inst.cfg b/resources/quality/crazy3dprint/abs/crazy3dprint_0.40_abs_draft.inst.cfg index 17bd18fc9d..f2db8e3137 100644 --- a/resources/quality/crazy3dprint/abs/crazy3dprint_0.40_abs_draft.inst.cfg +++ b/resources/quality/crazy3dprint/abs/crazy3dprint_0.40_abs_draft.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Draft Quality definition = crazy3dprint_base +name = Draft Quality +version = 4 [metadata] +material = generic_abs +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_abs variant = 0.4mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 24 speed_support = 24 speed_travel = 100 + diff --git a/resources/quality/crazy3dprint/abs/crazy3dprint_0.40_abs_fine.inst.cfg b/resources/quality/crazy3dprint/abs/crazy3dprint_0.40_abs_fine.inst.cfg index 4fbce7d02d..d437cf65be 100644 --- a/resources/quality/crazy3dprint/abs/crazy3dprint_0.40_abs_fine.inst.cfg +++ b/resources/quality/crazy3dprint/abs/crazy3dprint_0.40_abs_fine.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fine Quality definition = crazy3dprint_base +name = Fine Quality +version = 4 [metadata] +material = generic_abs +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_abs variant = 0.4mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 24 speed_support = 24 speed_travel = 100 + diff --git a/resources/quality/crazy3dprint/abs/crazy3dprint_0.40_abs_normal.inst.cfg b/resources/quality/crazy3dprint/abs/crazy3dprint_0.40_abs_normal.inst.cfg index a55b4d87c9..7e8a29776a 100644 --- a/resources/quality/crazy3dprint/abs/crazy3dprint_0.40_abs_normal.inst.cfg +++ b/resources/quality/crazy3dprint/abs/crazy3dprint_0.40_abs_normal.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Normal Quality definition = crazy3dprint_base +name = Normal Quality +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_abs variant = 0.4mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 24 speed_support = 24 speed_travel = 100 + diff --git a/resources/quality/crazy3dprint/crazy3dprint_global_0.10_fine.inst.cfg b/resources/quality/crazy3dprint/crazy3dprint_global_0.10_fine.inst.cfg index 3818d517dd..74e4563449 100644 --- a/resources/quality/crazy3dprint/crazy3dprint_global_0.10_fine.inst.cfg +++ b/resources/quality/crazy3dprint/crazy3dprint_global_0.10_fine.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Fine Quality definition = crazy3dprint_base +name = Fine Quality +version = 4 [metadata] +global_quality = True +quality_type = fine setting_version = 20 type = quality -quality_type = fine weight = 0 -global_quality = True [values] adhesion_type = brim @@ -24,3 +24,4 @@ speed_infill = =speed_print speed_print = 24 speed_support = 24 speed_travel = 70 + diff --git a/resources/quality/crazy3dprint/crazy3dprint_global_0.20_normal.inst.cfg b/resources/quality/crazy3dprint/crazy3dprint_global_0.20_normal.inst.cfg index 83e2d52b87..a36b135bd6 100644 --- a/resources/quality/crazy3dprint/crazy3dprint_global_0.20_normal.inst.cfg +++ b/resources/quality/crazy3dprint/crazy3dprint_global_0.20_normal.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Normal Quality definition = crazy3dprint_base +name = Normal Quality +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = -1 -global_quality = True [values] adhesion_type = brim @@ -24,3 +24,4 @@ speed_infill = =speed_print speed_print = 24 speed_support = 24 speed_travel = 70 + diff --git a/resources/quality/crazy3dprint/crazy3dprint_global_0.30_draft.inst.cfg b/resources/quality/crazy3dprint/crazy3dprint_global_0.30_draft.inst.cfg index ea97a71051..621ebcd975 100644 --- a/resources/quality/crazy3dprint/crazy3dprint_global_0.30_draft.inst.cfg +++ b/resources/quality/crazy3dprint/crazy3dprint_global_0.30_draft.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = crazy3dprint_base +name = Draft Quality +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] adhesion_type = brim @@ -24,3 +24,4 @@ speed_infill = =speed_print speed_print = 24 speed_support = 24 speed_travel = 70 + diff --git a/resources/quality/crazy3dprint/crazy3dprint_global_0.40_coarse.inst.cfg b/resources/quality/crazy3dprint/crazy3dprint_global_0.40_coarse.inst.cfg index 4f2c9f0074..c11b5fc1e2 100644 --- a/resources/quality/crazy3dprint/crazy3dprint_global_0.40_coarse.inst.cfg +++ b/resources/quality/crazy3dprint/crazy3dprint_global_0.40_coarse.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Coarse Quality definition = crazy3dprint_base +name = Coarse Quality +version = 4 [metadata] +global_quality = True +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = -3 -global_quality = True [values] adhesion_type = brim @@ -24,3 +24,4 @@ speed_infill = =speed_print speed_print = 24 speed_support = 24 speed_travel = 70 + diff --git a/resources/quality/crazy3dprint/pla/crazy3dprint_0.40_pla_coarse.inst.cfg b/resources/quality/crazy3dprint/pla/crazy3dprint_0.40_pla_coarse.inst.cfg index ac5aeadfbe..bb72fe12d0 100644 --- a/resources/quality/crazy3dprint/pla/crazy3dprint_0.40_pla_coarse.inst.cfg +++ b/resources/quality/crazy3dprint/pla/crazy3dprint_0.40_pla_coarse.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Coarse Quality definition = crazy3dprint_base +name = Coarse Quality +version = 4 [metadata] +material = generic_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -material = generic_pla variant = 0.4mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 24 speed_support = 24 speed_travel = 70 + diff --git a/resources/quality/crazy3dprint/pla/crazy3dprint_0.40_pla_draft.inst.cfg b/resources/quality/crazy3dprint/pla/crazy3dprint_0.40_pla_draft.inst.cfg index c973ff04c2..8305dfe76c 100644 --- a/resources/quality/crazy3dprint/pla/crazy3dprint_0.40_pla_draft.inst.cfg +++ b/resources/quality/crazy3dprint/pla/crazy3dprint_0.40_pla_draft.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Draft Quality definition = crazy3dprint_base +name = Draft Quality +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_pla variant = 0.4mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 24 speed_support = 24 speed_travel = 70 + diff --git a/resources/quality/crazy3dprint/pla/crazy3dprint_0.40_pla_fine.inst.cfg b/resources/quality/crazy3dprint/pla/crazy3dprint_0.40_pla_fine.inst.cfg index f4fc51e31b..cbc4d88b1f 100644 --- a/resources/quality/crazy3dprint/pla/crazy3dprint_0.40_pla_fine.inst.cfg +++ b/resources/quality/crazy3dprint/pla/crazy3dprint_0.40_pla_fine.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fine Quality definition = crazy3dprint_base +name = Fine Quality +version = 4 [metadata] +material = generic_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_pla variant = 0.4mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 24 speed_support = 24 speed_travel = 70 + diff --git a/resources/quality/crazy3dprint/pla/crazy3dprint_0.40_pla_normal.inst.cfg b/resources/quality/crazy3dprint/pla/crazy3dprint_0.40_pla_normal.inst.cfg index 6290daa51d..5d8628edef 100644 --- a/resources/quality/crazy3dprint/pla/crazy3dprint_0.40_pla_normal.inst.cfg +++ b/resources/quality/crazy3dprint/pla/crazy3dprint_0.40_pla_normal.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Normal Quality definition = crazy3dprint_base +name = Normal Quality +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_pla variant = 0.4mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 24 speed_support = 24 speed_travel = 70 + diff --git a/resources/quality/creality/base/base_0.2_ABS_super.inst.cfg b/resources/quality/creality/base/base_0.2_ABS_super.inst.cfg index 79d230e8f4..e2d531f66b 100644 --- a/resources/quality/creality/base/base_0.2_ABS_super.inst.cfg +++ b/resources/quality/creality/base/base_0.2_ABS_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = creality_base +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super 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/creality/base/base_0.2_ABS_ultra.inst.cfg b/resources/quality/creality/base/base_0.2_ABS_ultra.inst.cfg index fda63a4ac6..8ff83a455b 100644 --- a/resources/quality/creality/base/base_0.2_ABS_ultra.inst.cfg +++ b/resources/quality/creality/base/base_0.2_ABS_ultra.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Ultra Quality definition = creality_base +name = Ultra Quality +version = 4 [metadata] +material = generic_abs +quality_type = ultra 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/creality/base/base_0.2_PETG_super.inst.cfg b/resources/quality/creality/base/base_0.2_PETG_super.inst.cfg index cf8fa595ee..4bc9f9a579 100644 --- a/resources/quality/creality/base/base_0.2_PETG_super.inst.cfg +++ b/resources/quality/creality/base/base_0.2_PETG_super.inst.cfg @@ -1,17 +1,16 @@ [general] -version = 4 -name = Super Quality definition = creality_base +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super 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/creality/base/base_0.2_PETG_ultra.inst.cfg b/resources/quality/creality/base/base_0.2_PETG_ultra.inst.cfg index 4daaba88d0..c818c510e5 100644 --- a/resources/quality/creality/base/base_0.2_PETG_ultra.inst.cfg +++ b/resources/quality/creality/base/base_0.2_PETG_ultra.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Ultra Quality definition = creality_base +name = Ultra Quality +version = 4 [metadata] +material = generic_petg +quality_type = ultra 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/creality/base/base_0.2_PLA_super.inst.cfg b/resources/quality/creality/base/base_0.2_PLA_super.inst.cfg index 4f9b865902..74349a23bf 100644 --- a/resources/quality/creality/base/base_0.2_PLA_super.inst.cfg +++ b/resources/quality/creality/base/base_0.2_PLA_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = creality_base +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla variant = 0.2mm Nozzle [values] + diff --git a/resources/quality/creality/base/base_0.2_PLA_ultra.inst.cfg b/resources/quality/creality/base/base_0.2_PLA_ultra.inst.cfg index e8ad2fd9a9..c5843b2c3b 100644 --- a/resources/quality/creality/base/base_0.2_PLA_ultra.inst.cfg +++ b/resources/quality/creality/base/base_0.2_PLA_ultra.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Ultra Quality definition = creality_base +name = Ultra Quality +version = 4 [metadata] +material = generic_pla +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra -material = generic_pla variant = 0.2mm Nozzle [values] + diff --git a/resources/quality/creality/base/base_0.3_ABS_adaptive.inst.cfg b/resources/quality/creality/base/base_0.3_ABS_adaptive.inst.cfg index ed9a81330f..1574388ea8 100644 --- a/resources/quality/creality/base/base_0.3_ABS_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.3_ABS_adaptive.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = creality_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_abs +quality_type = adaptive 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/creality/base/base_0.3_ABS_low.inst.cfg b/resources/quality/creality/base/base_0.3_ABS_low.inst.cfg index 2f279a1b2d..43b855e12a 100644 --- a/resources/quality/creality/base/base_0.3_ABS_low.inst.cfg +++ b/resources/quality/creality/base/base_0.3_ABS_low.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = creality_base +name = Low Quality +version = 4 [metadata] +material = generic_abs +quality_type = low 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/creality/base/base_0.3_ABS_standard.inst.cfg b/resources/quality/creality/base/base_0.3_ABS_standard.inst.cfg index 4881d78d5d..eac5cb8014 100644 --- a/resources/quality/creality/base/base_0.3_ABS_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.3_ABS_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = creality_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = standard 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/creality/base/base_0.3_ABS_super.inst.cfg b/resources/quality/creality/base/base_0.3_ABS_super.inst.cfg index 2c498f0111..d057e077f5 100644 --- a/resources/quality/creality/base/base_0.3_ABS_super.inst.cfg +++ b/resources/quality/creality/base/base_0.3_ABS_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = creality_base +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super 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/creality/base/base_0.3_PETG_adaptive.inst.cfg b/resources/quality/creality/base/base_0.3_PETG_adaptive.inst.cfg index 3e461150e5..cf67e57c68 100644 --- a/resources/quality/creality/base/base_0.3_PETG_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.3_PETG_adaptive.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = creality_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_petg +quality_type = adaptive 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/creality/base/base_0.3_PETG_low.inst.cfg b/resources/quality/creality/base/base_0.3_PETG_low.inst.cfg index ca163341bb..e03f91c7c9 100644 --- a/resources/quality/creality/base/base_0.3_PETG_low.inst.cfg +++ b/resources/quality/creality/base/base_0.3_PETG_low.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Low Quality definition = creality_base +name = Low Quality +version = 4 [metadata] +material = generic_petg +quality_type = low 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/creality/base/base_0.3_PETG_standard.inst.cfg b/resources/quality/creality/base/base_0.3_PETG_standard.inst.cfg index ea032a5d29..a35f9e4e42 100644 --- a/resources/quality/creality/base/base_0.3_PETG_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.3_PETG_standard.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = creality_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = standard 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/creality/base/base_0.3_PETG_super.inst.cfg b/resources/quality/creality/base/base_0.3_PETG_super.inst.cfg index df502fea89..3b18534051 100644 --- a/resources/quality/creality/base/base_0.3_PETG_super.inst.cfg +++ b/resources/quality/creality/base/base_0.3_PETG_super.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Super Quality definition = creality_base +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super 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/creality/base/base_0.3_PLA_adaptive.inst.cfg b/resources/quality/creality/base/base_0.3_PLA_adaptive.inst.cfg index 55894a79f4..24a419b440 100644 --- a/resources/quality/creality/base/base_0.3_PLA_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.3_PLA_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = creality_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_pla +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_pla variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/creality/base/base_0.3_PLA_low.inst.cfg b/resources/quality/creality/base/base_0.3_PLA_low.inst.cfg index 58a01b030d..69ee2d9a1b 100644 --- a/resources/quality/creality/base/base_0.3_PLA_low.inst.cfg +++ b/resources/quality/creality/base/base_0.3_PLA_low.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low Quality definition = creality_base +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/creality/base/base_0.3_PLA_standard.inst.cfg b/resources/quality/creality/base/base_0.3_PLA_standard.inst.cfg index afa44e2f44..ec4c4134d6 100644 --- a/resources/quality/creality/base/base_0.3_PLA_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.3_PLA_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = creality_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_pla variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/creality/base/base_0.3_PLA_super.inst.cfg b/resources/quality/creality/base/base_0.3_PLA_super.inst.cfg index 03d09baa70..1b2bd5ba63 100644 --- a/resources/quality/creality/base/base_0.3_PLA_super.inst.cfg +++ b/resources/quality/creality/base/base_0.3_PLA_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = creality_base +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/creality/base/base_0.3_TPU_adaptive.inst.cfg b/resources/quality/creality/base/base_0.3_TPU_adaptive.inst.cfg index adae7da4c5..2a397fe8d3 100644 --- a/resources/quality/creality/base/base_0.3_TPU_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.3_TPU_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = creality_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_tpu +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_tpu variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/creality/base/base_0.3_TPU_standard.inst.cfg b/resources/quality/creality/base/base_0.3_TPU_standard.inst.cfg index b40598b31c..55131b5a9f 100644 --- a/resources/quality/creality/base/base_0.3_TPU_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.3_TPU_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = creality_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_tpu variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/creality/base/base_0.3_TPU_super.inst.cfg b/resources/quality/creality/base/base_0.3_TPU_super.inst.cfg index 822b64e03f..6288ad8281 100644 --- a/resources/quality/creality/base/base_0.3_TPU_super.inst.cfg +++ b/resources/quality/creality/base/base_0.3_TPU_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = creality_base +name = Super Quality +version = 4 [metadata] +material = generic_tpu +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_tpu variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/creality/base/base_0.4_ABS_adaptive.inst.cfg b/resources/quality/creality/base/base_0.4_ABS_adaptive.inst.cfg index 0fae9343bf..9083398116 100644 --- a/resources/quality/creality/base/base_0.4_ABS_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.4_ABS_adaptive.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = creality_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_abs +quality_type = adaptive 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/creality/base/base_0.4_ABS_low.inst.cfg b/resources/quality/creality/base/base_0.4_ABS_low.inst.cfg index a3e34f79fb..933d43dc74 100644 --- a/resources/quality/creality/base/base_0.4_ABS_low.inst.cfg +++ b/resources/quality/creality/base/base_0.4_ABS_low.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = creality_base +name = Low Quality +version = 4 [metadata] +material = generic_abs +quality_type = low 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/creality/base/base_0.4_ABS_standard.inst.cfg b/resources/quality/creality/base/base_0.4_ABS_standard.inst.cfg index a12bd480d7..300af176cd 100644 --- a/resources/quality/creality/base/base_0.4_ABS_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.4_ABS_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = creality_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = standard 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/creality/base/base_0.4_ABS_super.inst.cfg b/resources/quality/creality/base/base_0.4_ABS_super.inst.cfg index 6a95104804..19d1413a11 100644 --- a/resources/quality/creality/base/base_0.4_ABS_super.inst.cfg +++ b/resources/quality/creality/base/base_0.4_ABS_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = creality_base +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super 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/creality/base/base_0.4_PETG_adaptive.inst.cfg b/resources/quality/creality/base/base_0.4_PETG_adaptive.inst.cfg index 02eeb19777..e867ada53e 100644 --- a/resources/quality/creality/base/base_0.4_PETG_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.4_PETG_adaptive.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = creality_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_petg +quality_type = adaptive 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/creality/base/base_0.4_PETG_low.inst.cfg b/resources/quality/creality/base/base_0.4_PETG_low.inst.cfg index ed53dce4f0..e5d5420828 100644 --- a/resources/quality/creality/base/base_0.4_PETG_low.inst.cfg +++ b/resources/quality/creality/base/base_0.4_PETG_low.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Low Quality definition = creality_base +name = Low Quality +version = 4 [metadata] +material = generic_petg +quality_type = low 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/creality/base/base_0.4_PETG_standard.inst.cfg b/resources/quality/creality/base/base_0.4_PETG_standard.inst.cfg index 1e308bf074..c391b8f458 100644 --- a/resources/quality/creality/base/base_0.4_PETG_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.4_PETG_standard.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = creality_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = standard 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/creality/base/base_0.4_PETG_super.inst.cfg b/resources/quality/creality/base/base_0.4_PETG_super.inst.cfg index 6d35fadbcb..2f3c95c6a3 100644 --- a/resources/quality/creality/base/base_0.4_PETG_super.inst.cfg +++ b/resources/quality/creality/base/base_0.4_PETG_super.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Super Quality definition = creality_base +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super 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/creality/base/base_0.4_PLA_adaptive.inst.cfg b/resources/quality/creality/base/base_0.4_PLA_adaptive.inst.cfg index a57b065340..7ae6f82771 100644 --- a/resources/quality/creality/base/base_0.4_PLA_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.4_PLA_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = creality_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_pla +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_pla variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/creality/base/base_0.4_PLA_low.inst.cfg b/resources/quality/creality/base/base_0.4_PLA_low.inst.cfg index 29927d4aa0..a99487e4b6 100644 --- a/resources/quality/creality/base/base_0.4_PLA_low.inst.cfg +++ b/resources/quality/creality/base/base_0.4_PLA_low.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low Quality definition = creality_base +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/creality/base/base_0.4_PLA_standard.inst.cfg b/resources/quality/creality/base/base_0.4_PLA_standard.inst.cfg index 831b20131c..982cb9dbbd 100644 --- a/resources/quality/creality/base/base_0.4_PLA_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.4_PLA_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = creality_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_pla variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/creality/base/base_0.4_PLA_super.inst.cfg b/resources/quality/creality/base/base_0.4_PLA_super.inst.cfg index c5a6ea2486..6b7f17c198 100644 --- a/resources/quality/creality/base/base_0.4_PLA_super.inst.cfg +++ b/resources/quality/creality/base/base_0.4_PLA_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = creality_base +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/creality/base/base_0.4_TPU_adaptive.inst.cfg b/resources/quality/creality/base/base_0.4_TPU_adaptive.inst.cfg index 71b054871b..a412f057da 100644 --- a/resources/quality/creality/base/base_0.4_TPU_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.4_TPU_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = creality_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_tpu +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_tpu variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/creality/base/base_0.4_TPU_standard.inst.cfg b/resources/quality/creality/base/base_0.4_TPU_standard.inst.cfg index f33585c844..fff702a8d6 100644 --- a/resources/quality/creality/base/base_0.4_TPU_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.4_TPU_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = creality_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_tpu variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/creality/base/base_0.4_TPU_super.inst.cfg b/resources/quality/creality/base/base_0.4_TPU_super.inst.cfg index 5b35b8c097..e36de6d215 100644 --- a/resources/quality/creality/base/base_0.4_TPU_super.inst.cfg +++ b/resources/quality/creality/base/base_0.4_TPU_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = creality_base +name = Super Quality +version = 4 [metadata] +material = generic_tpu +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_tpu variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/creality/base/base_0.5_ABS_adaptive.inst.cfg b/resources/quality/creality/base/base_0.5_ABS_adaptive.inst.cfg index 835526bd5b..a4e1a6b8d6 100644 --- a/resources/quality/creality/base/base_0.5_ABS_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.5_ABS_adaptive.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = creality_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_abs +quality_type = adaptive 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/creality/base/base_0.5_ABS_low.inst.cfg b/resources/quality/creality/base/base_0.5_ABS_low.inst.cfg index 88e8189b35..eeedc3a3c6 100644 --- a/resources/quality/creality/base/base_0.5_ABS_low.inst.cfg +++ b/resources/quality/creality/base/base_0.5_ABS_low.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = creality_base +name = Low Quality +version = 4 [metadata] +material = generic_abs +quality_type = low 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/creality/base/base_0.5_ABS_standard.inst.cfg b/resources/quality/creality/base/base_0.5_ABS_standard.inst.cfg index 31a123ec42..e7dcc48cae 100644 --- a/resources/quality/creality/base/base_0.5_ABS_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.5_ABS_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = creality_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = standard 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/creality/base/base_0.5_ABS_super.inst.cfg b/resources/quality/creality/base/base_0.5_ABS_super.inst.cfg index 55e9aa3f28..41db3e2cbd 100644 --- a/resources/quality/creality/base/base_0.5_ABS_super.inst.cfg +++ b/resources/quality/creality/base/base_0.5_ABS_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = creality_base +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super 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/creality/base/base_0.5_PETG_adaptive.inst.cfg b/resources/quality/creality/base/base_0.5_PETG_adaptive.inst.cfg index 3965f79706..6cd891a82c 100644 --- a/resources/quality/creality/base/base_0.5_PETG_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.5_PETG_adaptive.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = creality_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_petg +quality_type = adaptive 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/creality/base/base_0.5_PETG_low.inst.cfg b/resources/quality/creality/base/base_0.5_PETG_low.inst.cfg index ac6bbdc24d..27a5222586 100644 --- a/resources/quality/creality/base/base_0.5_PETG_low.inst.cfg +++ b/resources/quality/creality/base/base_0.5_PETG_low.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Low Quality definition = creality_base +name = Low Quality +version = 4 [metadata] +material = generic_petg +quality_type = low 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/creality/base/base_0.5_PETG_standard.inst.cfg b/resources/quality/creality/base/base_0.5_PETG_standard.inst.cfg index 60a3414378..a8533db065 100644 --- a/resources/quality/creality/base/base_0.5_PETG_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.5_PETG_standard.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = creality_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = standard 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/creality/base/base_0.5_PETG_super.inst.cfg b/resources/quality/creality/base/base_0.5_PETG_super.inst.cfg index 4e342ed553..d13d93a072 100644 --- a/resources/quality/creality/base/base_0.5_PETG_super.inst.cfg +++ b/resources/quality/creality/base/base_0.5_PETG_super.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Super Quality definition = creality_base +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super 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/creality/base/base_0.5_PLA_adaptive.inst.cfg b/resources/quality/creality/base/base_0.5_PLA_adaptive.inst.cfg index 456af89b33..61b9880dba 100644 --- a/resources/quality/creality/base/base_0.5_PLA_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.5_PLA_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = creality_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_pla +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_pla variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/creality/base/base_0.5_PLA_low.inst.cfg b/resources/quality/creality/base/base_0.5_PLA_low.inst.cfg index 55cd763bc3..f99dfbdac2 100644 --- a/resources/quality/creality/base/base_0.5_PLA_low.inst.cfg +++ b/resources/quality/creality/base/base_0.5_PLA_low.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low Quality definition = creality_base +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/creality/base/base_0.5_PLA_standard.inst.cfg b/resources/quality/creality/base/base_0.5_PLA_standard.inst.cfg index 1553d03f47..1b465321be 100644 --- a/resources/quality/creality/base/base_0.5_PLA_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.5_PLA_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = creality_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_pla variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/creality/base/base_0.5_PLA_super.inst.cfg b/resources/quality/creality/base/base_0.5_PLA_super.inst.cfg index f85609116e..acdb2f3152 100644 --- a/resources/quality/creality/base/base_0.5_PLA_super.inst.cfg +++ b/resources/quality/creality/base/base_0.5_PLA_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = creality_base +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/creality/base/base_0.5_TPU_adaptive.inst.cfg b/resources/quality/creality/base/base_0.5_TPU_adaptive.inst.cfg index 51e070183d..97ce7d8d9f 100644 --- a/resources/quality/creality/base/base_0.5_TPU_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_0.5_TPU_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = creality_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_tpu +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_tpu variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/creality/base/base_0.5_TPU_standard.inst.cfg b/resources/quality/creality/base/base_0.5_TPU_standard.inst.cfg index b30a73348d..cddea20801 100644 --- a/resources/quality/creality/base/base_0.5_TPU_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.5_TPU_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = creality_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_tpu variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/creality/base/base_0.5_TPU_super.inst.cfg b/resources/quality/creality/base/base_0.5_TPU_super.inst.cfg index 49912b0468..b99db579c2 100644 --- a/resources/quality/creality/base/base_0.5_TPU_super.inst.cfg +++ b/resources/quality/creality/base/base_0.5_TPU_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = creality_base +name = Super Quality +version = 4 [metadata] +material = generic_tpu +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_tpu variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/creality/base/base_0.6_ABS_standard.inst.cfg b/resources/quality/creality/base/base_0.6_ABS_standard.inst.cfg index ff60d28867..1558d95568 100644 --- a/resources/quality/creality/base/base_0.6_ABS_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.6_ABS_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = creality_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = standard 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/creality/base/base_0.6_PETG_standard.inst.cfg b/resources/quality/creality/base/base_0.6_PETG_standard.inst.cfg index 2a861b45b6..26743ed483 100644 --- a/resources/quality/creality/base/base_0.6_PETG_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.6_PETG_standard.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = creality_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = standard 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/creality/base/base_0.6_PLA_draft.inst.cfg b/resources/quality/creality/base/base_0.6_PLA_draft.inst.cfg index df95c12c92..ef313a7b86 100644 --- a/resources/quality/creality/base/base_0.6_PLA_draft.inst.cfg +++ b/resources/quality/creality/base/base_0.6_PLA_draft.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = creality_base +name = Draft Quality +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_pla variant = 0.6mm Nozzle [values] + diff --git a/resources/quality/creality/base/base_0.6_PLA_low.inst.cfg b/resources/quality/creality/base/base_0.6_PLA_low.inst.cfg index 2adc14c1be..ad9433801d 100644 --- a/resources/quality/creality/base/base_0.6_PLA_low.inst.cfg +++ b/resources/quality/creality/base/base_0.6_PLA_low.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low Quality definition = creality_base +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla variant = 0.6mm Nozzle [values] + diff --git a/resources/quality/creality/base/base_0.6_PLA_standard.inst.cfg b/resources/quality/creality/base/base_0.6_PLA_standard.inst.cfg index 67eced1a49..32cf2c66e1 100644 --- a/resources/quality/creality/base/base_0.6_PLA_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.6_PLA_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = creality_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_pla variant = 0.6mm Nozzle [values] + diff --git a/resources/quality/creality/base/base_0.6_TPU_standard.inst.cfg b/resources/quality/creality/base/base_0.6_TPU_standard.inst.cfg index 1d4ed5b13f..23d45505a5 100644 --- a/resources/quality/creality/base/base_0.6_TPU_standard.inst.cfg +++ b/resources/quality/creality/base/base_0.6_TPU_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = creality_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_tpu variant = 0.6mm Nozzle [values] + diff --git a/resources/quality/creality/base/base_0.8_ABS_draft.inst.cfg b/resources/quality/creality/base/base_0.8_ABS_draft.inst.cfg index 83c1324f1b..2176af7490 100644 --- a/resources/quality/creality/base/base_0.8_ABS_draft.inst.cfg +++ b/resources/quality/creality/base/base_0.8_ABS_draft.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = creality_base +name = Draft Quality +version = 4 [metadata] +material = generic_abs +quality_type = draft 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/creality/base/base_0.8_PETG_draft.inst.cfg b/resources/quality/creality/base/base_0.8_PETG_draft.inst.cfg index 6083755607..38b59e50e4 100644 --- a/resources/quality/creality/base/base_0.8_PETG_draft.inst.cfg +++ b/resources/quality/creality/base/base_0.8_PETG_draft.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Draft Quality definition = creality_base +name = Draft Quality +version = 4 [metadata] +material = generic_petg +quality_type = draft 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/creality/base/base_0.8_PLA_draft.inst.cfg b/resources/quality/creality/base/base_0.8_PLA_draft.inst.cfg index 37312d95e5..dd816a8fd6 100644 --- a/resources/quality/creality/base/base_0.8_PLA_draft.inst.cfg +++ b/resources/quality/creality/base/base_0.8_PLA_draft.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = creality_base +name = Draft Quality +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_pla variant = 0.8mm Nozzle [values] + diff --git a/resources/quality/creality/base/base_0.8_TPU_draft.inst.cfg b/resources/quality/creality/base/base_0.8_TPU_draft.inst.cfg index 20fd82a670..4f07b8a147 100644 --- a/resources/quality/creality/base/base_0.8_TPU_draft.inst.cfg +++ b/resources/quality/creality/base/base_0.8_TPU_draft.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = creality_base +name = Draft Quality +version = 4 [metadata] +material = generic_tpu +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_tpu variant = 0.8mm Nozzle [values] + diff --git a/resources/quality/creality/base/base_1.0_ABS_draft.inst.cfg b/resources/quality/creality/base/base_1.0_ABS_draft.inst.cfg index 6678d46039..45429b2cb1 100644 --- a/resources/quality/creality/base/base_1.0_ABS_draft.inst.cfg +++ b/resources/quality/creality/base/base_1.0_ABS_draft.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = creality_base +name = Draft Quality +version = 4 [metadata] +material = generic_abs +quality_type = draft 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/creality/base/base_1.0_PETG_draft.inst.cfg b/resources/quality/creality/base/base_1.0_PETG_draft.inst.cfg index 668663affe..674b292e19 100644 --- a/resources/quality/creality/base/base_1.0_PETG_draft.inst.cfg +++ b/resources/quality/creality/base/base_1.0_PETG_draft.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Draft Quality definition = creality_base +name = Draft Quality +version = 4 [metadata] +material = generic_petg +quality_type = draft 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/creality/base/base_1.0_PLA_draft.inst.cfg b/resources/quality/creality/base/base_1.0_PLA_draft.inst.cfg index 0a560fc243..00c3bce08a 100644 --- a/resources/quality/creality/base/base_1.0_PLA_draft.inst.cfg +++ b/resources/quality/creality/base/base_1.0_PLA_draft.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = creality_base +name = Draft Quality +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_pla variant = 1.0mm Nozzle [values] + diff --git a/resources/quality/creality/base/base_1.0_TPU_draft.inst.cfg b/resources/quality/creality/base/base_1.0_TPU_draft.inst.cfg index 095a832b81..3a123e08da 100644 --- a/resources/quality/creality/base/base_1.0_TPU_draft.inst.cfg +++ b/resources/quality/creality/base/base_1.0_TPU_draft.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = creality_base +name = Draft Quality +version = 4 [metadata] +material = generic_tpu +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_tpu variant = 1.0mm Nozzle [values] + diff --git a/resources/quality/creality/base/base_global_adaptive.inst.cfg b/resources/quality/creality/base/base_global_adaptive.inst.cfg index fea0b82e0c..b8d6a003e1 100644 --- a/resources/quality/creality/base/base_global_adaptive.inst.cfg +++ b/resources/quality/creality/base/base_global_adaptive.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Dynamic Quality definition = creality_base +name = Dynamic Quality +version = 4 [metadata] +global_quality = True +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive weight = -2 -global_quality = True [values] +adaptive_layer_height_enabled = true layer_height = 0.16 layer_height_0 = 0.20 +support_interface_height = =layer_height*6 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/creality/base/base_global_draft.inst.cfg b/resources/quality/creality/base/base_global_draft.inst.cfg index 8c2e65d4fa..6b1d8b23d9 100644 --- a/resources/quality/creality/base/base_global_draft.inst.cfg +++ b/resources/quality/creality/base/base_global_draft.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Draft Quality definition = creality_base +name = Draft Quality +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -5 -global_quality = True [values] layer_height = 0.32 layer_height_0 = 0.32 +support_interface_height = =layer_height*4 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/creality/base/base_global_low.inst.cfg b/resources/quality/creality/base/base_global_low.inst.cfg index 5ff36a4431..2c9aaeddcd 100644 --- a/resources/quality/creality/base/base_global_low.inst.cfg +++ b/resources/quality/creality/base/base_global_low.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Low Quality definition = creality_base +name = Low Quality +version = 4 [metadata] +global_quality = True +quality_type = low setting_version = 20 type = quality -quality_type = low weight = -4 -global_quality = True [values] layer_height = 0.28 layer_height_0 = 0.28 +support_interface_height = =layer_height*4 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/creality/base/base_global_standard.inst.cfg b/resources/quality/creality/base/base_global_standard.inst.cfg index c5ad432dd5..c723196ea8 100644 --- a/resources/quality/creality/base/base_global_standard.inst.cfg +++ b/resources/quality/creality/base/base_global_standard.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Standard Quality definition = creality_base +name = Standard Quality +version = 4 [metadata] +global_quality = True +quality_type = standard setting_version = 20 type = quality -quality_type = standard weight = -3 -global_quality = True [values] layer_height = 0.2 layer_height_0 = 0.2 +support_interface_height = =layer_height*4 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/creality/base/base_global_super.inst.cfg b/resources/quality/creality/base/base_global_super.inst.cfg index ddae2cca9d..46328ce5b6 100644 --- a/resources/quality/creality/base/base_global_super.inst.cfg +++ b/resources/quality/creality/base/base_global_super.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Super Quality definition = creality_base +name = Super Quality +version = 4 [metadata] +global_quality = True +quality_type = super setting_version = 20 type = quality -quality_type = super weight = -1 -global_quality = True [values] layer_height = 0.12 layer_height_0 = 0.12 +support_interface_height = =layer_height*8 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/creality/base/base_global_ultra.inst.cfg b/resources/quality/creality/base/base_global_ultra.inst.cfg index b63d135bdf..b5cb285143 100644 --- a/resources/quality/creality/base/base_global_ultra.inst.cfg +++ b/resources/quality/creality/base/base_global_ultra.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Ultra Quality definition = creality_base +name = Ultra Quality +version = 4 [metadata] +global_quality = True +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra weight = 0 -global_quality = True [values] layer_height = 0.08 layer_height_0 = 0.12 +support_interface_height = =layer_height*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/dagoma/dagoma_discoeasy200_bicolor_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_fast.inst.cfg index 1073729905..83bc70bdee 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_fast.inst.cfg @@ -1,25 +1,24 @@ [general] -version = 4 -name = Fast definition = dagoma_discoeasy200_bicolor +name = Fast +version = 4 [metadata] +material = chromatik_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -material = chromatik_pla [values] line_width = =machine_nozzle_size * 0.875 - -material_print_temperature = =default_material_print_temperature + 10 material_bed_temperature_layer_0 = =default_material_bed_temperature + 10 - -speed_print = 60 -speed_travel = 75 -speed_layer_0 = 17 +material_print_temperature = =default_material_print_temperature + 10 speed_infill = 60 +speed_layer_0 = 17 +speed_print = 60 +speed_topbottom = 60 +speed_travel = 75 speed_wall_0 = 50 speed_wall_x = 60 -speed_topbottom = 60 + 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 e3a5c6eac9..dfef74ffbc 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_fine.inst.cfg @@ -1,22 +1,22 @@ [general] -version = 4 -name = Fine definition = dagoma_discoeasy200_bicolor +name = Fine +version = 4 [metadata] +material = chromatik_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = chromatik_pla [values] line_width = =machine_nozzle_size * 0.875 - -speed_print = 35 -speed_travel = 50 -speed_layer_0 = 15 speed_infill = 40 +speed_layer_0 = 15 +speed_print = 35 +speed_topbottom = 35 +speed_travel = 50 speed_wall_0 = 25 speed_wall_x = 35 -speed_topbottom = 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 e1f8934019..fad35c1aab 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_standard.inst.cfg @@ -1,25 +1,24 @@ [general] -version = 4 -name = Standard definition = dagoma_discoeasy200_bicolor +name = Standard +version = 4 [metadata] +material = chromatik_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -1 -material = chromatik_pla [values] line_width = =machine_nozzle_size * 0.875 - -material_print_temperature = =default_material_print_temperature + 5 material_bed_temperature_layer_0 = =default_material_bed_temperature + 5 - -speed_print = 50 -speed_travel = 60 -speed_layer_0 = 17 +material_print_temperature = =default_material_print_temperature + 5 speed_infill = 50 +speed_layer_0 = 17 +speed_print = 50 +speed_topbottom = 50 +speed_travel = 60 speed_wall_0 = 40 speed_wall_x = 45 -speed_topbottom = 50 + diff --git a/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg index f8635d2cc7..828912446e 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg @@ -1,25 +1,24 @@ [general] -version = 4 -name = Fast definition = dagoma_discoeasy200 +name = Fast +version = 4 [metadata] +material = chromatik_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -material = chromatik_pla [values] line_width = =machine_nozzle_size * 0.875 - -material_print_temperature = =default_material_print_temperature + 10 material_bed_temperature_layer_0 = =default_material_bed_temperature + 10 - -speed_print = 60 -speed_travel = 75 -speed_layer_0 = 17 +material_print_temperature = =default_material_print_temperature + 10 speed_infill = 60 +speed_layer_0 = 17 +speed_print = 60 +speed_topbottom = 60 +speed_travel = 75 speed_wall_0 = 50 speed_wall_x = 60 -speed_topbottom = 60 + diff --git a/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg index 6c0597409c..e7d6a04b58 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg @@ -1,22 +1,22 @@ [general] -version = 4 -name = Fine definition = dagoma_discoeasy200 +name = Fine +version = 4 [metadata] +material = chromatik_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = chromatik_pla [values] line_width = =machine_nozzle_size * 0.875 - -speed_print = 35 -speed_travel = 50 -speed_layer_0 = 15 speed_infill = 40 +speed_layer_0 = 15 +speed_print = 35 +speed_topbottom = 35 +speed_travel = 50 speed_wall_0 = 25 speed_wall_x = 35 -speed_topbottom = 35 + diff --git a/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg index 5254504da5..808bfd510e 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg @@ -1,25 +1,24 @@ [general] -version = 4 -name = Standard definition = dagoma_discoeasy200 +name = Standard +version = 4 [metadata] +material = chromatik_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -1 -material = chromatik_pla [values] line_width = =machine_nozzle_size * 0.875 - -material_print_temperature = =default_material_print_temperature + 5 material_bed_temperature_layer_0 = =default_material_bed_temperature + 5 - -speed_print = 50 -speed_travel = 60 -speed_layer_0 = 17 +material_print_temperature = =default_material_print_temperature + 5 speed_infill = 50 +speed_layer_0 = 17 +speed_print = 50 +speed_topbottom = 50 +speed_travel = 60 speed_wall_0 = 40 speed_wall_x = 45 -speed_topbottom = 50 + 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 5e4467e5ed..fd2af8d8ec 100644 --- a/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_fast.inst.cfg @@ -1,25 +1,24 @@ [general] -version = 4 -name = Fast definition = dagoma_discoultimate_bicolor +name = Fast +version = 4 [metadata] +material = chromatik_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -material = chromatik_pla [values] line_width = =machine_nozzle_size * 0.875 - -material_print_temperature = =default_material_print_temperature + 10 material_bed_temperature_layer_0 = =default_material_bed_temperature + 10 - -speed_print = 60 -speed_travel = 75 -speed_layer_0 = 17 +material_print_temperature = =default_material_print_temperature + 10 speed_infill = 60 +speed_layer_0 = 17 +speed_print = 60 +speed_topbottom = 60 +speed_travel = 75 speed_wall_0 = 50 speed_wall_x = 60 -speed_topbottom = 60 + 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 d5d21af6e2..5bcc2ffcfa 100644 --- a/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_fine.inst.cfg @@ -1,22 +1,22 @@ [general] -version = 4 -name = Fine definition = dagoma_discoultimate_bicolor +name = Fine +version = 4 [metadata] +material = chromatik_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = chromatik_pla [values] line_width = =machine_nozzle_size * 0.875 - -speed_print = 35 -speed_travel = 50 -speed_layer_0 = 15 speed_infill = 40 +speed_layer_0 = 15 +speed_print = 35 +speed_topbottom = 35 +speed_travel = 50 speed_wall_0 = 25 speed_wall_x = 35 -speed_topbottom = 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 4163399ccc..68e71e3f39 100644 --- a/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_standard.inst.cfg @@ -1,25 +1,24 @@ [general] -version = 4 -name = Standard definition = dagoma_discoultimate_bicolor +name = Standard +version = 4 [metadata] +material = chromatik_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -1 -material = chromatik_pla [values] line_width = =machine_nozzle_size * 0.875 - -material_print_temperature = =default_material_print_temperature + 5 material_bed_temperature_layer_0 = =default_material_bed_temperature + 5 - -speed_print = 50 -speed_travel = 60 -speed_layer_0 = 17 +material_print_temperature = =default_material_print_temperature + 5 speed_infill = 50 +speed_layer_0 = 17 +speed_print = 50 +speed_topbottom = 50 +speed_travel = 60 speed_wall_0 = 40 speed_wall_x = 45 -speed_topbottom = 50 + diff --git a/resources/quality/dagoma/dagoma_discoultimate_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_discoultimate_pla_fast.inst.cfg index 90336926f8..01f3cf063f 100644 --- a/resources/quality/dagoma/dagoma_discoultimate_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoultimate_pla_fast.inst.cfg @@ -1,25 +1,24 @@ [general] -version = 4 -name = Fast definition = dagoma_discoultimate +name = Fast +version = 4 [metadata] +material = chromatik_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -material = chromatik_pla [values] line_width = =machine_nozzle_size * 0.875 - -material_print_temperature = =default_material_print_temperature + 10 material_bed_temperature_layer_0 = =default_material_bed_temperature + 10 - -speed_print = 60 -speed_travel = 75 -speed_layer_0 = 17 +material_print_temperature = =default_material_print_temperature + 10 speed_infill = 60 +speed_layer_0 = 17 +speed_print = 60 +speed_topbottom = 60 +speed_travel = 75 speed_wall_0 = 50 speed_wall_x = 60 -speed_topbottom = 60 + diff --git a/resources/quality/dagoma/dagoma_discoultimate_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_discoultimate_pla_fine.inst.cfg index 4b70708d41..7619e9dbab 100644 --- a/resources/quality/dagoma/dagoma_discoultimate_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoultimate_pla_fine.inst.cfg @@ -1,22 +1,22 @@ [general] -version = 4 -name = Fine definition = dagoma_discoultimate +name = Fine +version = 4 [metadata] +material = chromatik_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = chromatik_pla [values] line_width = =machine_nozzle_size * 0.875 - -speed_print = 35 -speed_travel = 50 -speed_layer_0 = 15 speed_infill = 40 +speed_layer_0 = 15 +speed_print = 35 +speed_topbottom = 35 +speed_travel = 50 speed_wall_0 = 25 speed_wall_x = 35 -speed_topbottom = 35 + diff --git a/resources/quality/dagoma/dagoma_discoultimate_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_discoultimate_pla_standard.inst.cfg index 61b8bb8d2d..686c17d072 100644 --- a/resources/quality/dagoma/dagoma_discoultimate_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoultimate_pla_standard.inst.cfg @@ -1,25 +1,24 @@ [general] -version = 4 -name = Standard definition = dagoma_discoultimate +name = Standard +version = 4 [metadata] +material = chromatik_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -1 -material = chromatik_pla [values] line_width = =machine_nozzle_size * 0.875 - -material_print_temperature = =default_material_print_temperature + 5 material_bed_temperature_layer_0 = =default_material_bed_temperature + 5 - -speed_print = 50 -speed_travel = 60 -speed_layer_0 = 17 +material_print_temperature = =default_material_print_temperature + 5 speed_infill = 50 +speed_layer_0 = 17 +speed_print = 50 +speed_topbottom = 50 +speed_travel = 60 speed_wall_0 = 40 speed_wall_x = 45 -speed_topbottom = 50 + diff --git a/resources/quality/dagoma/dagoma_magis_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_magis_pla_fast.inst.cfg index 3fc2e53381..b0299289ef 100644 --- a/resources/quality/dagoma/dagoma_magis_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_magis_pla_fast.inst.cfg @@ -1,25 +1,24 @@ [general] -version = 4 -name = Fast definition = dagoma_magis +name = Fast +version = 4 [metadata] +material = chromatik_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -material = chromatik_pla [values] line_width = =machine_nozzle_size * 0.875 - -material_print_temperature = =default_material_print_temperature + 10 material_bed_temperature_layer_0 = =default_material_bed_temperature + 10 - -speed_print = 40 -speed_travel = 80 -speed_layer_0 = 17 +material_print_temperature = =default_material_print_temperature + 10 speed_infill = 40 +speed_layer_0 = 17 +speed_print = 40 +speed_topbottom = 40 +speed_travel = 80 speed_wall_0 = 30 speed_wall_x = 40 -speed_topbottom = 40 + diff --git a/resources/quality/dagoma/dagoma_magis_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_magis_pla_fine.inst.cfg index ee7fec9712..94ebb46c9d 100644 --- a/resources/quality/dagoma/dagoma_magis_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_magis_pla_fine.inst.cfg @@ -1,22 +1,22 @@ [general] -version = 4 -name = Fine definition = dagoma_magis +name = Fine +version = 4 [metadata] +material = chromatik_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = chromatik_pla [values] line_width = =machine_nozzle_size * 0.875 - -speed_print = 30 -speed_travel = 80 -speed_layer_0 = 17 speed_infill = 30 +speed_layer_0 = 17 +speed_print = 30 +speed_topbottom = 30 +speed_travel = 80 speed_wall_0 = 20 speed_wall_x = 30 -speed_topbottom = 30 + diff --git a/resources/quality/dagoma/dagoma_magis_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_magis_pla_standard.inst.cfg index 6d5890a74c..8924e8844e 100644 --- a/resources/quality/dagoma/dagoma_magis_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_magis_pla_standard.inst.cfg @@ -1,25 +1,24 @@ [general] -version = 4 -name = Standard definition = dagoma_magis +name = Standard +version = 4 [metadata] +material = chromatik_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -1 -material = chromatik_pla [values] line_width = =machine_nozzle_size * 0.875 - -material_print_temperature = =default_material_print_temperature + 5 material_bed_temperature_layer_0 = =default_material_bed_temperature + 5 - -speed_print = 35 -speed_travel = 80 -speed_layer_0 = 17 +material_print_temperature = =default_material_print_temperature + 5 speed_infill = 35 +speed_layer_0 = 17 +speed_print = 35 +speed_topbottom = 35 +speed_travel = 80 speed_wall_0 = 25 speed_wall_x = 35 -speed_topbottom = 35 + diff --git a/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg index d1b723fe0a..c4ef8cdcfd 100644 --- a/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg @@ -1,25 +1,24 @@ [general] -version = 4 -name = Fast definition = dagoma_neva +name = Fast +version = 4 [metadata] +material = chromatik_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -material = chromatik_pla [values] line_width = =machine_nozzle_size * 0.875 - -material_print_temperature = =default_material_print_temperature + 10 material_bed_temperature_layer_0 = =default_material_bed_temperature + 10 - -speed_print = 40 -speed_travel = 80 -speed_layer_0 = 17 +material_print_temperature = =default_material_print_temperature + 10 speed_infill = 40 +speed_layer_0 = 17 +speed_print = 40 +speed_topbottom = 40 +speed_travel = 80 speed_wall_0 = 30 speed_wall_x = 40 -speed_topbottom = 40 + diff --git a/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg index a57a833f5c..53559bf186 100644 --- a/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg @@ -1,22 +1,22 @@ [general] -version = 4 -name = Fine definition = dagoma_neva +name = Fine +version = 4 [metadata] +material = chromatik_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = chromatik_pla [values] line_width = =machine_nozzle_size * 0.875 - -speed_print = 30 -speed_travel = 80 -speed_layer_0 = 17 speed_infill = 30 +speed_layer_0 = 17 +speed_print = 30 +speed_topbottom = 30 +speed_travel = 80 speed_wall_0 = 20 speed_wall_x = 30 -speed_topbottom = 30 + diff --git a/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg index c63ec93a63..1d869966bc 100644 --- a/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg @@ -1,25 +1,24 @@ [general] -version = 4 -name = Standard definition = dagoma_neva +name = Standard +version = 4 [metadata] +material = chromatik_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -1 -material = chromatik_pla [values] line_width = =machine_nozzle_size * 0.875 - -material_print_temperature = =default_material_print_temperature + 5 material_bed_temperature_layer_0 = =default_material_bed_temperature + 5 - -speed_print = 35 -speed_travel = 80 -speed_layer_0 = 17 +material_print_temperature = =default_material_print_temperature + 5 speed_infill = 35 +speed_layer_0 = 17 +speed_print = 35 +speed_topbottom = 35 +speed_travel = 80 speed_wall_0 = 25 speed_wall_x = 35 -speed_topbottom = 35 + diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_A.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_A.inst.cfg index b72db5fb54..3e69cc1e77 100755 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_A.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_A.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = A definition = deltacomb_base +name = A +version = 4 [metadata] +material = generic_abs +quality_type = D005 setting_version = 20 type = quality -quality_type = D005 -material = generic_abs variant = DBE 0.25mm [values] @@ -19,4 +19,5 @@ cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 -speed_print = 80 \ No newline at end of file +speed_print = 80 + diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_B.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_B.inst.cfg index f855bb49f0..89ec6dd0da 100755 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_B.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_B.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = B definition = deltacomb_base +name = B +version = 4 [metadata] +material = generic_abs +quality_type = D010 setting_version = 20 type = quality -quality_type = D010 -material = generic_abs variant = DBE 0.25mm [values] @@ -19,4 +19,5 @@ cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 -speed_print = 55 \ No newline at end of file +speed_print = 55 + diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_C.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_C.inst.cfg index bb3a646e86..96b728af37 100755 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_C.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_C.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = C definition = deltacomb_base +name = C +version = 4 [metadata] +material = generic_abs +quality_type = D015 setting_version = 20 type = quality -quality_type = D015 -material = generic_abs variant = DBE 0.25mm [values] @@ -20,3 +20,4 @@ material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 speed_print = 32 + diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_A.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_A.inst.cfg index ce74dc9933..bfd7361efb 100755 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_A.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_A.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = A definition = deltacomb_base +name = A +version = 4 [metadata] +material = generic_abs +quality_type = D005 setting_version = 20 type = quality -quality_type = D005 -material = generic_abs variant = DBE 0.40mm [values] @@ -18,4 +18,5 @@ cool_fan_speed_max = 50 cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 -material_print_temperature = 240 \ No newline at end of file +material_print_temperature = 240 + diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_B.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_B.inst.cfg index c50ecc0a7d..c3c91ddb50 100755 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_B.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_B.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = B definition = deltacomb_base +name = B +version = 4 [metadata] +material = generic_abs +quality_type = D010 setting_version = 20 type = quality -quality_type = D010 -material = generic_abs variant = DBE 0.40mm [values] @@ -18,4 +18,5 @@ cool_fan_speed_max = 50 cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 -material_print_temperature = 240 \ No newline at end of file +material_print_temperature = 240 + diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_C.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_C.inst.cfg index 7ab1e2382e..000d841249 100755 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_C.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_C.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = C definition = deltacomb_base +name = C +version = 4 [metadata] +material = generic_abs +quality_type = D015 setting_version = 20 type = quality -quality_type = D015 -material = generic_abs variant = DBE 0.40mm [values] @@ -18,4 +18,5 @@ cool_fan_speed_max = 50 cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 -material_print_temperature = 240 \ No newline at end of file +material_print_temperature = 240 + diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_D.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_D.inst.cfg index 6c124959c1..c5950be775 100755 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_D.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_D.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = D definition = deltacomb_base +name = D +version = 4 [metadata] +material = generic_abs +quality_type = D020 setting_version = 20 type = quality -quality_type = D020 -material = generic_abs variant = DBE 0.40mm [values] @@ -19,3 +19,4 @@ cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 + diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_E.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_E.inst.cfg index e096a43c94..76166e19f5 100755 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_E.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_E.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = E definition = deltacomb_base +name = E +version = 4 [metadata] +material = generic_abs +quality_type = D030 setting_version = 20 type = quality -quality_type = D030 -material = generic_abs variant = DBE 0.40mm [values] @@ -18,4 +18,5 @@ cool_fan_speed_max = 50 cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 -material_print_temperature = 240 \ No newline at end of file +material_print_temperature = 240 + diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_C.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_C.inst.cfg index e351592e80..281fc4d7f9 100755 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_C.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_C.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = C definition = deltacomb_base +name = C +version = 4 [metadata] +material = generic_abs +quality_type = D015 setting_version = 20 type = quality -quality_type = D015 -material = generic_abs variant = DBE 0.60mm [values] @@ -18,4 +18,5 @@ cool_fan_speed_max = 50 cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 -material_print_temperature = 240 \ No newline at end of file +material_print_temperature = 240 + diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_D.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_D.inst.cfg index 0982ee6a9f..ec565f4697 100755 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_D.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_D.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = D definition = deltacomb_base +name = D +version = 4 [metadata] +material = generic_abs +quality_type = D020 setting_version = 20 type = quality -quality_type = D020 -material = generic_abs variant = DBE 0.60mm [values] @@ -19,3 +19,4 @@ cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 + diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_E.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_E.inst.cfg index 1cd0249840..8de423bb58 100755 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_E.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_E.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = E definition = deltacomb_base +name = E +version = 4 [metadata] +material = generic_abs +quality_type = D030 setting_version = 20 type = quality -quality_type = D030 -material = generic_abs variant = DBE 0.60mm [values] @@ -19,4 +19,5 @@ cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 -speed_print = 65 \ No newline at end of file +speed_print = 65 + diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_F.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_F.inst.cfg index 0bf2f96b5b..654adbee55 100755 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_F.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_F.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = F definition = deltacomb_base +name = F +version = 4 [metadata] +material = generic_abs +quality_type = D045 setting_version = 20 type = quality -quality_type = D045 -material = generic_abs variant = DBE 0.60mm [values] @@ -20,3 +20,4 @@ material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 speed_print = 45 + diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_A.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_A.inst.cfg index 51bbf3b90e..7dc642fea5 100755 --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_A.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_A.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = A definition = deltacomb_base +name = A +version = 4 [metadata] +material = generic_abs +quality_type = D005 setting_version = 20 type = quality -quality_type = D005 -material = generic_abs variant = FBE 0.25mm [values] @@ -19,4 +19,5 @@ cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 -speed_print = 80 \ No newline at end of file +speed_print = 80 + diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_B.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_B.inst.cfg index 2cb21c5f7b..863f06763e 100755 --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_B.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_B.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = B definition = deltacomb_base +name = B +version = 4 [metadata] +material = generic_abs +quality_type = D010 setting_version = 20 type = quality -quality_type = D010 -material = generic_abs variant = FBE 0.25mm [values] @@ -19,4 +19,5 @@ cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 -speed_print = 55 \ No newline at end of file +speed_print = 55 + diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_C.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_C.inst.cfg index 7787c83ace..a51fc63b24 100755 --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_C.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_C.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = C definition = deltacomb_base +name = C +version = 4 [metadata] +material = generic_abs +quality_type = D015 setting_version = 20 type = quality -quality_type = D015 -material = generic_abs variant = FBE 0.25mm [values] @@ -19,4 +19,5 @@ cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 -speed_print = 32 \ No newline at end of file +speed_print = 32 + diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_A.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_A.inst.cfg index 1f01a7a6e4..961d8fca3c 100755 --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_A.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_A.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = A definition = deltacomb_base +name = A +version = 4 [metadata] +material = generic_abs +quality_type = D005 setting_version = 20 type = quality -quality_type = D005 -material = generic_abs variant = FBE 0.40mm [values] @@ -18,4 +18,5 @@ cool_fan_speed_max = 50 cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 -material_print_temperature = 240 \ No newline at end of file +material_print_temperature = 240 + diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_B.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_B.inst.cfg index 0cad1ad669..efad5cd41b 100755 --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_B.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_B.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = B definition = deltacomb_base +name = B +version = 4 [metadata] +material = generic_abs +quality_type = D010 setting_version = 20 type = quality -quality_type = D010 -material = generic_abs variant = FBE 0.40mm [values] @@ -18,4 +18,5 @@ cool_fan_speed_max = 50 cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 -material_print_temperature = 240 \ No newline at end of file +material_print_temperature = 240 + diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_C.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_C.inst.cfg index 42de9f32b7..1999c3083a 100755 --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_C.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_C.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = C definition = deltacomb_base +name = C +version = 4 [metadata] +material = generic_abs +quality_type = D015 setting_version = 20 type = quality -quality_type = D015 -material = generic_abs variant = FBE 0.40mm [values] @@ -18,4 +18,5 @@ cool_fan_speed_max = 50 cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 -material_print_temperature = 240 \ No newline at end of file +material_print_temperature = 240 + diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_D.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_D.inst.cfg index 92c036da40..e37bc05497 100755 --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_D.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_D.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = D definition = deltacomb_base +name = D +version = 4 [metadata] +material = generic_abs +quality_type = D020 setting_version = 20 type = quality -quality_type = D020 -material = generic_abs variant = FBE 0.40mm [values] @@ -18,4 +18,5 @@ cool_fan_speed_max = 50 cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 -material_print_temperature = 240 \ No newline at end of file +material_print_temperature = 240 + diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_E.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_E.inst.cfg index 9de502fdf8..b23145d5ac 100755 --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_E.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_E.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = E definition = deltacomb_base +name = E +version = 4 [metadata] +material = generic_abs +quality_type = D030 setting_version = 20 type = quality -quality_type = D030 -material = generic_abs variant = FBE 0.40mm [values] @@ -18,4 +18,5 @@ cool_fan_speed_max = 50 cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 -material_print_temperature = 240 \ No newline at end of file +material_print_temperature = 240 + diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_C.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_C.inst.cfg index 9e039fe737..5142e1bfca 100755 --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_C.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_C.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = C definition = deltacomb_base +name = C +version = 4 [metadata] +material = generic_abs +quality_type = D015 setting_version = 20 type = quality -quality_type = D015 -material = generic_abs variant = FBE 0.60mm [values] @@ -18,4 +18,5 @@ cool_fan_speed_max = 50 cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 -material_print_temperature = 240 \ No newline at end of file +material_print_temperature = 240 + diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_D.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_D.inst.cfg index 9737af079c..8ce019eeb0 100755 --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_D.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_D.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = D definition = deltacomb_base +name = D +version = 4 [metadata] +material = generic_abs +quality_type = D020 setting_version = 20 type = quality -quality_type = D020 -material = generic_abs variant = FBE 0.60mm [values] @@ -18,4 +18,5 @@ cool_fan_speed_max = 50 cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 -material_print_temperature = 240 \ No newline at end of file +material_print_temperature = 240 + diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_E.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_E.inst.cfg index 8af0d9acb4..21c716f3c8 100755 --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_E.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_E.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = E definition = deltacomb_base +name = E +version = 4 [metadata] +material = generic_abs +quality_type = D030 setting_version = 20 type = quality -quality_type = D030 -material = generic_abs variant = FBE 0.60mm [values] @@ -19,4 +19,5 @@ cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 -speed_print = 65 \ No newline at end of file +speed_print = 65 + diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_F.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_F.inst.cfg index a337923914..d567a35b78 100755 --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_F.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_F.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = F definition = deltacomb_base +name = F +version = 4 [metadata] +material = generic_abs +quality_type = D045 setting_version = 20 type = quality -quality_type = D045 -material = generic_abs variant = FBE 0.60mm [values] @@ -20,3 +20,4 @@ material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 speed_print = 45 + diff --git a/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_D.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_D.inst.cfg index c87dd44354..56e4a2e629 100755 --- a/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_D.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_D.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = D definition = deltacomb_base +name = D +version = 4 [metadata] +material = generic_abs +quality_type = D020 setting_version = 20 type = quality -quality_type = D020 -material = generic_abs variant = V-DBE 0.80mm [values] @@ -20,3 +20,4 @@ material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 speed_print = 150 + diff --git a/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_E.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_E.inst.cfg index 33e4b9fdf1..7896386d99 100755 --- a/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_E.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_E.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = E definition = deltacomb_base +name = E +version = 4 [metadata] +material = generic_abs +quality_type = D030 setting_version = 20 type = quality -quality_type = D030 -material = generic_abs variant = V-DBE 0.80mm [values] @@ -19,4 +19,5 @@ cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 -speed_print = 110 \ No newline at end of file +speed_print = 110 + diff --git a/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_F.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_F.inst.cfg index 7c5407be50..3e984b8609 100755 --- a/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_F.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_F.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = F definition = deltacomb_base +name = F +version = 4 [metadata] +material = generic_abs +quality_type = D045 setting_version = 20 type = quality -quality_type = D045 -material = generic_abs variant = V-DBE 0.80mm [values] @@ -20,3 +20,4 @@ material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 speed_print = 75 + diff --git a/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_G.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_G.inst.cfg index cad559387a..de34ca1df5 100755 --- a/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_G.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_G.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = G definition = deltacomb_base +name = G +version = 4 [metadata] +material = generic_abs +quality_type = D060 setting_version = 20 type = quality -quality_type = D060 -material = generic_abs variant = V-DBE 0.80mm [values] @@ -20,3 +20,4 @@ material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 speed_print = 55 + diff --git a/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_D.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_D.inst.cfg index 51acbda719..717e412ccf 100755 --- a/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_D.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_D.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = D definition = deltacomb_base +name = D +version = 4 [metadata] +material = generic_abs +quality_type = D020 setting_version = 20 type = quality -quality_type = D020 -material = generic_abs variant = V-FBE 0.80mm [values] @@ -19,4 +19,5 @@ cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 -speed_print = 150 \ No newline at end of file +speed_print = 150 + diff --git a/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_E.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_E.inst.cfg index 4e14b166c5..1edf540584 100755 --- a/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_E.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_E.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = E definition = deltacomb_base +name = E +version = 4 [metadata] +material = generic_abs +quality_type = D030 setting_version = 20 type = quality -quality_type = D030 -material = generic_abs variant = V-FBE 0.80mm [values] @@ -19,4 +19,5 @@ cool_fan_speed_min = 0 material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 -speed_print = 110 \ No newline at end of file +speed_print = 110 + diff --git a/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_F.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_F.inst.cfg index 7f140aeca6..59e5778d4e 100755 --- a/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_F.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_F.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = F definition = deltacomb_base +name = F +version = 4 [metadata] +material = generic_abs +quality_type = D045 setting_version = 20 type = quality -quality_type = D045 -material = generic_abs variant = V-FBE 0.80mm [values] @@ -20,3 +20,4 @@ material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 speed_print = 75 + diff --git a/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_G.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_G.inst.cfg index b2b97ba49d..c2d4e95a3b 100755 --- a/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_G.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_G.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = G definition = deltacomb_base +name = G +version = 4 [metadata] +material = generic_abs +quality_type = D060 setting_version = 20 type = quality -quality_type = D060 -material = generic_abs variant = V-FBE 0.80mm [values] @@ -20,3 +20,4 @@ material_bed_temperature = 100 material_bed_temperature_layer_0 = 80 material_print_temperature = 240 speed_print = 55 + diff --git a/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_A.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_A.inst.cfg index a034c1ad4c..5f28607f36 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_A.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_A.inst.cfg @@ -1,36 +1,37 @@ [general] -version = 4 -name = A definition = deltacomb_base +name = A +version = 4 [metadata] +material = generic_petg +quality_type = D005 setting_version = 20 type = quality -quality_type = D005 -material = generic_petg variant = DBE 0.40mm [values] -material_print_temperature = 225 -layer_height_0 = 0.2 +coasting_enable = True +coasting_min_volume = 3 +coasting_speed = 70 +coasting_volume = 0.256 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 cool_fan_speed_min = 60 -speed_print = 50 -speed_infill = =speed_print -speed_wall_0 = =speed_print * 0.5 -speed_roofing = =speed_print * 0.5 +infill_enable_travel_optimization = True +initial_layer_line_width_factor = 120 +layer_height_0 = 0.2 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 material_flow = 95 -infill_enable_travel_optimization = True -initial_layer_line_width_factor = 120 +material_print_temperature = 225 retraction_amount = 5 -coasting_enable = True -coasting_volume = 0.256 -coasting_min_volume = 3 -coasting_speed = 70 -travel_avoid_other_parts = False retraction_combing_max_distance = 5 -support_z_distance = =layer_height * 2 \ No newline at end of file +speed_infill = =speed_print +speed_print = 50 +speed_roofing = =speed_print * 0.5 +speed_wall_0 = =speed_print * 0.5 +support_z_distance = =layer_height * 2 +travel_avoid_other_parts = False + diff --git a/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_B.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_B.inst.cfg index a507464dac..4c1976bcae 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_B.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_B.inst.cfg @@ -1,36 +1,37 @@ [general] -version = 4 -name = B definition = deltacomb_base +name = B +version = 4 [metadata] +material = generic_petg +quality_type = D010 setting_version = 20 type = quality -quality_type = D010 -material = generic_petg variant = DBE 0.40mm [values] -material_print_temperature = 225 -layer_height_0 = 0.2 +coasting_enable = True +coasting_min_volume = 3 +coasting_speed = 70 +coasting_volume = 0.256 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 cool_fan_speed_min = 60 -speed_print = 50 -speed_infill = =speed_print -speed_wall_0 = =speed_print * 0.5 -speed_roofing = =speed_print * 0.5 +infill_enable_travel_optimization = True +initial_layer_line_width_factor = 120 +layer_height_0 = 0.2 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 material_flow = 95 -infill_enable_travel_optimization = True -initial_layer_line_width_factor = 120 +material_print_temperature = 225 retraction_amount = 5 -coasting_enable = True -coasting_volume = 0.256 -coasting_min_volume = 3 -coasting_speed = 70 -travel_avoid_other_parts = False retraction_combing_max_distance = 5 +speed_infill = =speed_print +speed_print = 50 +speed_roofing = =speed_print * 0.5 +speed_wall_0 = =speed_print * 0.5 support_z_distance = =layer_height * 2 +travel_avoid_other_parts = False + diff --git a/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_C.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_C.inst.cfg index 0349671c2b..bd7769aa11 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_C.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_C.inst.cfg @@ -1,36 +1,37 @@ [general] -version = 4 -name = C definition = deltacomb_base +name = C +version = 4 [metadata] +material = generic_petg +quality_type = D015 setting_version = 20 type = quality -quality_type = D015 -material = generic_petg variant = DBE 0.40mm [values] -material_print_temperature = 225 -layer_height_0 = 0.2 +coasting_enable = True +coasting_min_volume = 3 +coasting_speed = 70 +coasting_volume = 0.256 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 cool_fan_speed_min = 60 -speed_print = 50 -speed_infill = =speed_print -speed_wall_0 = =speed_print * 0.5 -speed_roofing = =speed_print * 0.5 +infill_enable_travel_optimization = True +initial_layer_line_width_factor = 120 +layer_height_0 = 0.2 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 material_flow = 95 -infill_enable_travel_optimization = True -initial_layer_line_width_factor = 120 +material_print_temperature = 225 retraction_amount = 5 -coasting_enable = True -coasting_volume = 0.256 -coasting_min_volume = 3 -coasting_speed = 70 -travel_avoid_other_parts = False retraction_combing_max_distance = 5 -support_z_distance = =layer_height * 2 \ No newline at end of file +speed_infill = =speed_print +speed_print = 50 +speed_roofing = =speed_print * 0.5 +speed_wall_0 = =speed_print * 0.5 +support_z_distance = =layer_height * 2 +travel_avoid_other_parts = False + diff --git a/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_D.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_D.inst.cfg index 2b64b5ff93..b654147bff 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_D.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_D.inst.cfg @@ -1,34 +1,35 @@ [general] -version = 4 -name = D definition = deltacomb_base +name = D +version = 4 [metadata] +material = generic_petg +quality_type = D020 setting_version = 20 type = quality -quality_type = D020 -material = generic_petg variant = DBE 0.40mm [values] -material_print_temperature = 225 +coasting_enable = True +coasting_min_volume = 3 +coasting_speed = 70 +coasting_volume = 0.256 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 cool_fan_speed_min = 60 -speed_print = 50 -speed_infill = =speed_print -speed_wall_0 = =speed_print * 0.5 -speed_roofing = =speed_print * 0.5 +infill_enable_travel_optimization = True +initial_layer_line_width_factor = 120 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 material_flow = 95 -infill_enable_travel_optimization = True -initial_layer_line_width_factor = 120 +material_print_temperature = 225 retraction_amount = 5 -coasting_enable = True -coasting_volume = 0.256 -coasting_min_volume = 3 -coasting_speed = 70 +retraction_combing_max_distance = 5 +speed_infill = =speed_print +speed_print = 50 +speed_roofing = =speed_print * 0.5 +speed_wall_0 = =speed_print * 0.5 travel_avoid_other_parts = False -retraction_combing_max_distance = 5 \ No newline at end of file + diff --git a/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_E.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_E.inst.cfg index 2f07700a4f..e7d5bef1a3 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_E.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_E.inst.cfg @@ -1,34 +1,35 @@ [general] -version = 4 -name = E definition = deltacomb_base +name = E +version = 4 [metadata] +material = generic_petg +quality_type = D030 setting_version = 20 type = quality -quality_type = D030 -material = generic_petg variant = DBE 0.40mm [values] -material_print_temperature = 225 +coasting_enable = True +coasting_min_volume = 3 +coasting_speed = 70 +coasting_volume = 0.256 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 cool_fan_speed_min = 60 -speed_print = 50 -speed_infill = =speed_print -speed_wall_0 = =speed_print * 0.5 -speed_roofing = =speed_print * 0.5 +infill_enable_travel_optimization = True +initial_layer_line_width_factor = 120 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 material_flow = 95 -infill_enable_travel_optimization = True -initial_layer_line_width_factor = 120 +material_print_temperature = 225 retraction_amount = 5 -coasting_enable = True -coasting_volume = 0.256 -coasting_min_volume = 3 -coasting_speed = 70 +retraction_combing_max_distance = 5 +speed_infill = =speed_print +speed_print = 50 +speed_roofing = =speed_print * 0.5 +speed_wall_0 = =speed_print * 0.5 travel_avoid_other_parts = False -retraction_combing_max_distance = 5 \ No newline at end of file + diff --git a/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_C.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_C.inst.cfg index 5b7e3edc50..f351d393fa 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_C.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_C.inst.cfg @@ -1,35 +1,36 @@ [general] -version = 4 -name = C definition = deltacomb_base +name = C +version = 4 [metadata] +material = generic_petg +quality_type = D015 setting_version = 20 type = quality -quality_type = D015 -material = generic_petg variant = DBE 0.60mm [values] -material_print_temperature = 225 +coasting_enable = True +coasting_min_volume = 3 +coasting_speed = 70 +coasting_volume = 0.256 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 cool_fan_speed_min = 60 -speed_print = 50 -speed_infill = =speed_print -speed_wall_0 = =speed_print * 0.5 -speed_roofing = =speed_print * 0.5 +infill_enable_travel_optimization = True +initial_layer_line_width_factor = 120 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 material_flow = 95 -infill_enable_travel_optimization = True -initial_layer_line_width_factor = 120 +material_print_temperature = 225 retraction_amount = 5 -coasting_enable = True -coasting_volume = 0.256 -coasting_min_volume = 3 -coasting_speed = 70 -travel_avoid_other_parts = False retraction_combing_max_distance = 5 -support_z_distance = =layer_height * 2 \ No newline at end of file +speed_infill = =speed_print +speed_print = 50 +speed_roofing = =speed_print * 0.5 +speed_wall_0 = =speed_print * 0.5 +support_z_distance = =layer_height * 2 +travel_avoid_other_parts = False + diff --git a/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_D.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_D.inst.cfg index ab6da9ba12..efdf918693 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_D.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_D.inst.cfg @@ -1,34 +1,35 @@ [general] -version = 4 -name = D definition = deltacomb_base +name = D +version = 4 [metadata] +material = generic_petg +quality_type = D020 setting_version = 20 type = quality -quality_type = D020 -material = generic_petg variant = DBE 0.60mm [values] -material_print_temperature = 225 +coasting_enable = True +coasting_min_volume = 3 +coasting_speed = 70 +coasting_volume = 0.256 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 cool_fan_speed_min = 60 -speed_print = 50 -speed_infill = =speed_print -speed_wall_0 = =speed_print * 0.5 -speed_roofing = =speed_print * 0.5 +infill_enable_travel_optimization = True +initial_layer_line_width_factor = 120 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 material_flow = 95 -infill_enable_travel_optimization = True -initial_layer_line_width_factor = 120 +material_print_temperature = 225 retraction_amount = 5 -coasting_enable = True -coasting_volume = 0.256 -coasting_min_volume = 3 -coasting_speed = 70 +retraction_combing_max_distance = 5 +speed_infill = =speed_print +speed_print = 50 +speed_roofing = =speed_print * 0.5 +speed_wall_0 = =speed_print * 0.5 travel_avoid_other_parts = False -retraction_combing_max_distance = 5 \ No newline at end of file + diff --git a/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_E.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_E.inst.cfg index e014a8d75d..7337df4ace 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_E.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_E.inst.cfg @@ -1,34 +1,35 @@ [general] -version = 4 -name = E definition = deltacomb_base +name = E +version = 4 [metadata] +material = generic_petg +quality_type = D030 setting_version = 20 type = quality -quality_type = D030 -material = generic_petg variant = DBE 0.60mm [values] -material_print_temperature = 225 +coasting_enable = True +coasting_min_volume = 3 +coasting_speed = 70 +coasting_volume = 0.256 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 cool_fan_speed_min = 60 -speed_print = 40 -speed_infill = =speed_print -speed_wall_0 = =speed_print * 0.7 -speed_roofing = =speed_print * 0.7 +infill_enable_travel_optimization = True +initial_layer_line_width_factor = 120 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 material_flow = 95 -infill_enable_travel_optimization = True -initial_layer_line_width_factor = 120 +material_print_temperature = 225 retraction_amount = 5 -coasting_enable = True -coasting_volume = 0.256 -coasting_min_volume = 3 -coasting_speed = 70 +retraction_combing_max_distance = 5 +speed_infill = =speed_print +speed_print = 40 +speed_roofing = =speed_print * 0.7 +speed_wall_0 = =speed_print * 0.7 travel_avoid_other_parts = False -retraction_combing_max_distance = 5 \ No newline at end of file + diff --git a/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_F.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_F.inst.cfg index 0a7131b2f9..3a5eae96b7 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_F.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_F.inst.cfg @@ -1,34 +1,35 @@ [general] -version = 4 -name = F definition = deltacomb_base +name = F +version = 4 [metadata] +material = generic_petg +quality_type = D045 setting_version = 20 type = quality -quality_type = D045 -material = generic_petg variant = DBE 0.60mm [values] -material_print_temperature = 225 +coasting_enable = True +coasting_min_volume = 3 +coasting_speed = 70 +coasting_volume = 0.256 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 cool_fan_speed_min = 60 -speed_print = 26 -speed_infill = =speed_print -speed_wall_0 = =speed_print -speed_roofing = =speed_print +infill_enable_travel_optimization = True +initial_layer_line_width_factor = 120 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 material_flow = 95 -infill_enable_travel_optimization = True -initial_layer_line_width_factor = 120 +material_print_temperature = 225 retraction_amount = 5 -coasting_enable = True -coasting_volume = 0.256 -coasting_min_volume = 3 -coasting_speed = 70 +retraction_combing_max_distance = 5 +speed_infill = =speed_print +speed_print = 26 +speed_roofing = =speed_print +speed_wall_0 = =speed_print travel_avoid_other_parts = False -retraction_combing_max_distance = 5 \ No newline at end of file + diff --git a/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_A.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_A.inst.cfg index 9fde1c8c98..9b3649a15b 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_A.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_A.inst.cfg @@ -1,36 +1,37 @@ [general] -version = 4 -name = A definition = deltacomb_base +name = A +version = 4 [metadata] +material = generic_petg +quality_type = D005 setting_version = 20 type = quality -quality_type = D005 -material = generic_petg variant = FBE 0.40mm [values] -material_print_temperature = 225 -layer_height_0 = 0.2 +coasting_enable = True +coasting_min_volume = 3 +coasting_speed = 70 +coasting_volume = 0.256 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 cool_fan_speed_min = 60 -speed_print = 50 -speed_infill = =speed_print -speed_wall_0 = =speed_print * 0.5 -speed_roofing = =speed_print * 0.5 +infill_enable_travel_optimization = True +initial_layer_line_width_factor = 120 +layer_height_0 = 0.2 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 material_flow = 95 -infill_enable_travel_optimization = True -initial_layer_line_width_factor = 120 +material_print_temperature = 225 retraction_amount = 5 -coasting_enable = True -coasting_volume = 0.256 -coasting_min_volume = 3 -coasting_speed = 70 -travel_avoid_other_parts = False retraction_combing_max_distance = 5 -support_z_distance = =layer_height * 2 \ No newline at end of file +speed_infill = =speed_print +speed_print = 50 +speed_roofing = =speed_print * 0.5 +speed_wall_0 = =speed_print * 0.5 +support_z_distance = =layer_height * 2 +travel_avoid_other_parts = False + diff --git a/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_B.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_B.inst.cfg index baa42d8c1f..db8f8ada97 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_B.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_B.inst.cfg @@ -1,36 +1,37 @@ [general] -version = 4 -name = B definition = deltacomb_base +name = B +version = 4 [metadata] +material = generic_petg +quality_type = D010 setting_version = 20 type = quality -quality_type = D010 -material = generic_petg variant = FBE 0.40mm [values] -material_print_temperature = 225 -layer_height_0 = 0.2 +coasting_enable = True +coasting_min_volume = 3 +coasting_speed = 70 +coasting_volume = 0.256 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 cool_fan_speed_min = 60 -speed_print = 50 -speed_infill = =speed_print -speed_wall_0 = =speed_print * 0.5 -speed_roofing = =speed_print * 0.5 +infill_enable_travel_optimization = True +initial_layer_line_width_factor = 120 +layer_height_0 = 0.2 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 material_flow = 95 -infill_enable_travel_optimization = True -initial_layer_line_width_factor = 120 +material_print_temperature = 225 retraction_amount = 5 -coasting_enable = True -coasting_volume = 0.256 -coasting_min_volume = 3 -coasting_speed = 70 -travel_avoid_other_parts = False retraction_combing_max_distance = 5 -support_z_distance = =layer_height * 2 \ No newline at end of file +speed_infill = =speed_print +speed_print = 50 +speed_roofing = =speed_print * 0.5 +speed_wall_0 = =speed_print * 0.5 +support_z_distance = =layer_height * 2 +travel_avoid_other_parts = False + diff --git a/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_C.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_C.inst.cfg index 5f63182ebc..c5ea419061 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_C.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_C.inst.cfg @@ -1,36 +1,37 @@ [general] -version = 4 -name = C definition = deltacomb_base +name = C +version = 4 [metadata] +material = generic_petg +quality_type = D015 setting_version = 20 type = quality -quality_type = D015 -material = generic_petg variant = FBE 0.40mm [values] -material_print_temperature = 225 -layer_height_0 = 0.2 +coasting_enable = True +coasting_min_volume = 3 +coasting_speed = 70 +coasting_volume = 0.256 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 cool_fan_speed_min = 60 -speed_print = 50 -speed_infill = =speed_print -speed_wall_0 = =speed_print * 0.5 -speed_roofing = =speed_print * 0.5 +infill_enable_travel_optimization = True +initial_layer_line_width_factor = 120 +layer_height_0 = 0.2 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 material_flow = 95 -infill_enable_travel_optimization = True -initial_layer_line_width_factor = 120 +material_print_temperature = 225 retraction_amount = 5 -coasting_enable = True -coasting_volume = 0.256 -coasting_min_volume = 3 -coasting_speed = 70 -travel_avoid_other_parts = False retraction_combing_max_distance = 5 -support_z_distance = =layer_height * 2 \ No newline at end of file +speed_infill = =speed_print +speed_print = 50 +speed_roofing = =speed_print * 0.5 +speed_wall_0 = =speed_print * 0.5 +support_z_distance = =layer_height * 2 +travel_avoid_other_parts = False + diff --git a/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_D.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_D.inst.cfg index 676e214994..6202ddab75 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_D.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_D.inst.cfg @@ -1,34 +1,35 @@ [general] -version = 4 -name = D definition = deltacomb_base +name = D +version = 4 [metadata] +material = generic_petg +quality_type = D020 setting_version = 20 type = quality -quality_type = D020 -material = generic_petg variant = FBE 0.40mm [values] -material_print_temperature = 225 +coasting_enable = True +coasting_min_volume = 3 +coasting_speed = 70 +coasting_volume = 0.256 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 cool_fan_speed_min = 60 -speed_print = 50 -speed_infill = =speed_print -speed_wall_0 = =speed_print * 0.5 -speed_roofing = =speed_print * 0.5 +infill_enable_travel_optimization = True +initial_layer_line_width_factor = 120 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 material_flow = 95 -infill_enable_travel_optimization = True -initial_layer_line_width_factor = 120 +material_print_temperature = 225 retraction_amount = 5 -coasting_enable = True -coasting_volume = 0.256 -coasting_min_volume = 3 -coasting_speed = 70 +retraction_combing_max_distance = 5 +speed_infill = =speed_print +speed_print = 50 +speed_roofing = =speed_print * 0.5 +speed_wall_0 = =speed_print * 0.5 travel_avoid_other_parts = False -retraction_combing_max_distance = 5 \ No newline at end of file + diff --git a/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_E.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_E.inst.cfg index 384dbd09d0..829952a9de 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_E.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_E.inst.cfg @@ -1,34 +1,35 @@ [general] -version = 4 -name = E definition = deltacomb_base +name = E +version = 4 [metadata] +material = generic_petg +quality_type = D030 setting_version = 20 type = quality -quality_type = D030 -material = generic_petg variant = FBE 0.40mm [values] -material_print_temperature = 225 +coasting_enable = True +coasting_min_volume = 3 +coasting_speed = 70 +coasting_volume = 0.256 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 cool_fan_speed_min = 60 -speed_print = 50 -speed_infill = =speed_print -speed_wall_0 = =speed_print * 0.5 -speed_roofing = =speed_print * 0.5 +infill_enable_travel_optimization = True +initial_layer_line_width_factor = 120 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 material_flow = 95 -infill_enable_travel_optimization = True -initial_layer_line_width_factor = 120 +material_print_temperature = 225 retraction_amount = 5 -coasting_enable = True -coasting_volume = 0.256 -coasting_min_volume = 3 -coasting_speed = 70 +retraction_combing_max_distance = 5 +speed_infill = =speed_print +speed_print = 50 +speed_roofing = =speed_print * 0.5 +speed_wall_0 = =speed_print * 0.5 travel_avoid_other_parts = False -retraction_combing_max_distance = 5 \ No newline at end of file + diff --git a/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_C.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_C.inst.cfg index 2587b9c581..b3197ab218 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_C.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_C.inst.cfg @@ -1,35 +1,36 @@ [general] -version = 4 -name = C definition = deltacomb_base +name = C +version = 4 [metadata] +material = generic_petg +quality_type = D015 setting_version = 20 type = quality -quality_type = D015 -material = generic_petg variant = FBE 0.60mm [values] -material_print_temperature = 225 +coasting_enable = True +coasting_min_volume = 3 +coasting_speed = 70 +coasting_volume = 0.256 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 cool_fan_speed_min = 60 -speed_print = 50 -speed_infill = =speed_print -speed_wall_0 = =speed_print * 0.5 -speed_roofing = =speed_print * 0.5 +infill_enable_travel_optimization = True +initial_layer_line_width_factor = 120 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 material_flow = 95 -infill_enable_travel_optimization = True -initial_layer_line_width_factor = 120 +material_print_temperature = 225 retraction_amount = 5 -coasting_enable = True -coasting_volume = 0.256 -coasting_min_volume = 3 -coasting_speed = 70 -travel_avoid_other_parts = False retraction_combing_max_distance = 5 -support_z_distance = =layer_height * 2 \ No newline at end of file +speed_infill = =speed_print +speed_print = 50 +speed_roofing = =speed_print * 0.5 +speed_wall_0 = =speed_print * 0.5 +support_z_distance = =layer_height * 2 +travel_avoid_other_parts = False + diff --git a/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_D.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_D.inst.cfg index 7ef50cc8f4..750a139fbf 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_D.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_D.inst.cfg @@ -1,34 +1,35 @@ [general] -version = 4 -name = D definition = deltacomb_base +name = D +version = 4 [metadata] +material = generic_petg +quality_type = D020 setting_version = 20 type = quality -quality_type = D020 -material = generic_petg variant = FBE 0.60mm [values] -material_print_temperature = 225 +coasting_enable = True +coasting_min_volume = 3 +coasting_speed = 70 +coasting_volume = 0.256 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 cool_fan_speed_min = 60 -speed_print = 50 -speed_infill = =speed_print -speed_wall_0 = =speed_print * 0.5 -speed_roofing = =speed_print * 0.5 +infill_enable_travel_optimization = True +initial_layer_line_width_factor = 120 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 material_flow = 95 -infill_enable_travel_optimization = True -initial_layer_line_width_factor = 120 +material_print_temperature = 225 retraction_amount = 5 -coasting_enable = True -coasting_volume = 0.256 -coasting_min_volume = 3 -coasting_speed = 70 +retraction_combing_max_distance = 5 +speed_infill = =speed_print +speed_print = 50 +speed_roofing = =speed_print * 0.5 +speed_wall_0 = =speed_print * 0.5 travel_avoid_other_parts = False -retraction_combing_max_distance = 5 \ No newline at end of file + diff --git a/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_E.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_E.inst.cfg index 6e75353113..9799fbf411 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_E.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_E.inst.cfg @@ -1,34 +1,35 @@ [general] -version = 4 -name = E definition = deltacomb_base +name = E +version = 4 [metadata] +material = generic_petg +quality_type = D030 setting_version = 20 type = quality -quality_type = D030 -material = generic_petg variant = FBE 0.60mm [values] -material_print_temperature = 225 +coasting_enable = True +coasting_min_volume = 3 +coasting_speed = 70 +coasting_volume = 0.256 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 cool_fan_speed_min = 60 -speed_print = 40 -speed_infill = =speed_print -speed_wall_0 = =speed_print * 0.7 -speed_roofing = =speed_print * 0.7 +infill_enable_travel_optimization = True +initial_layer_line_width_factor = 120 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 material_flow = 95 -infill_enable_travel_optimization = True -initial_layer_line_width_factor = 120 +material_print_temperature = 225 retraction_amount = 5 -coasting_enable = True -coasting_volume = 0.256 -coasting_min_volume = 3 -coasting_speed = 70 +retraction_combing_max_distance = 5 +speed_infill = =speed_print +speed_print = 40 +speed_roofing = =speed_print * 0.7 +speed_wall_0 = =speed_print * 0.7 travel_avoid_other_parts = False -retraction_combing_max_distance = 5 \ No newline at end of file + diff --git a/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_F.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_F.inst.cfg index c69063b5e3..41a0f00ec8 100644 --- a/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_F.inst.cfg +++ b/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_F.inst.cfg @@ -1,34 +1,35 @@ [general] -version = 4 -name = F definition = deltacomb_base +name = F +version = 4 [metadata] +material = generic_petg +quality_type = D045 setting_version = 20 type = quality -quality_type = D045 -material = generic_petg variant = FBE 0.60mm [values] -material_print_temperature = 225 +coasting_enable = True +coasting_min_volume = 3 +coasting_speed = 70 +coasting_volume = 0.256 cool_fan_full_at_height = 1 cool_fan_speed = 60 cool_fan_speed_max = 100 cool_fan_speed_min = 60 -speed_print = 26 -speed_infill = =speed_print -speed_wall_0 = =speed_print -speed_roofing = =speed_print +infill_enable_travel_optimization = True +initial_layer_line_width_factor = 120 material_bed_temperature = 60 material_bed_temperature_layer_0 = 45 material_flow = 95 -infill_enable_travel_optimization = True -initial_layer_line_width_factor = 120 +material_print_temperature = 225 retraction_amount = 5 -coasting_enable = True -coasting_volume = 0.256 -coasting_min_volume = 3 -coasting_speed = 70 -travel_avoid_other_parts = False retraction_combing_max_distance = 5 +speed_infill = =speed_print +speed_print = 26 +speed_roofing = =speed_print +speed_wall_0 = =speed_print +travel_avoid_other_parts = False + diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_A.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_A.inst.cfg index f511700035..598ccab5dd 100755 --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_A.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_A.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = A definition = deltacomb_base +name = A +version = 4 [metadata] +material = generic_pla +quality_type = D005 setting_version = 20 type = quality -quality_type = D005 -material = generic_pla variant = DBE 0.25mm [values] @@ -15,4 +15,5 @@ cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -material_bed_temperature = 45 \ No newline at end of file +material_bed_temperature = 45 + diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_B.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_B.inst.cfg index a2405cf489..a828f18186 100755 --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_B.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_B.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = B definition = deltacomb_base +name = B +version = 4 [metadata] +material = generic_pla +quality_type = D010 setting_version = 20 type = quality -quality_type = D010 -material = generic_pla variant = DBE 0.25mm [values] @@ -15,5 +15,6 @@ cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 +material_bed_temperature = 45 speed_print = 55 -material_bed_temperature = 45 \ No newline at end of file + diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_C.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_C.inst.cfg index dca690724f..b2e5b9d234 100755 --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_C.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_C.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = C definition = deltacomb_base +name = C +version = 4 [metadata] +material = generic_pla +quality_type = D015 setting_version = 20 type = quality -quality_type = D015 -material = generic_pla variant = DBE 0.25mm [values] @@ -15,5 +15,6 @@ cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 +material_bed_temperature = 45 speed_print = 32 -material_bed_temperature = 45 \ No newline at end of file + diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_A.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_A.inst.cfg index 0675684ff1..f2813aab0c 100755 --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_A.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_A.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = A definition = deltacomb_base +name = A +version = 4 [metadata] +material = generic_pla +quality_type = D005 setting_version = 20 type = quality -quality_type = D005 -material = generic_pla variant = DBE 0.40mm [values] @@ -15,4 +15,5 @@ cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -material_bed_temperature = 45 \ No newline at end of file +material_bed_temperature = 45 + diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_B.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_B.inst.cfg index 86151e291b..0f03185561 100755 --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_B.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_B.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = B definition = deltacomb_base +name = B +version = 4 [metadata] +material = generic_pla +quality_type = D010 setting_version = 20 type = quality -quality_type = D010 -material = generic_pla variant = DBE 0.40mm [values] @@ -15,4 +15,5 @@ cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -material_bed_temperature = 45 \ No newline at end of file +material_bed_temperature = 45 + diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_C.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_C.inst.cfg index 755790f6e6..12def78ba0 100755 --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_C.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_C.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = C definition = deltacomb_base +name = C +version = 4 [metadata] +material = generic_pla +quality_type = D015 setting_version = 20 type = quality -quality_type = D015 -material = generic_pla variant = DBE 0.40mm [values] @@ -15,4 +15,5 @@ cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -material_bed_temperature = 45 \ No newline at end of file +material_bed_temperature = 45 + diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_D.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_D.inst.cfg index 560fc90780..072a11171f 100755 --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_D.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_D.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = D definition = deltacomb_base +name = D +version = 4 [metadata] +material = generic_pla +quality_type = D020 setting_version = 20 type = quality -quality_type = D020 -material = generic_pla variant = DBE 0.40mm [values] @@ -15,4 +15,5 @@ cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -material_bed_temperature = 45 \ No newline at end of file +material_bed_temperature = 45 + diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_E.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_E.inst.cfg index 08ec8b65b6..19307d6859 100755 --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_E.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_E.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = E definition = deltacomb_base +name = E +version = 4 [metadata] +material = generic_pla +quality_type = D030 setting_version = 20 type = quality -quality_type = D030 -material = generic_pla variant = DBE 0.40mm [values] @@ -15,4 +15,5 @@ cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -material_bed_temperature = 45 \ No newline at end of file +material_bed_temperature = 45 + diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_C.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_C.inst.cfg index d7052bf577..c56591c99a 100755 --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_C.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_C.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = C definition = deltacomb_base +name = C +version = 4 [metadata] +material = generic_pla +quality_type = D015 setting_version = 20 type = quality -quality_type = D015 -material = generic_pla variant = DBE 0.60mm [values] @@ -15,4 +15,5 @@ cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -material_bed_temperature = 45 \ No newline at end of file +material_bed_temperature = 45 + diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_D.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_D.inst.cfg index 412623cd4f..fd82da04c2 100755 --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_D.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_D.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = D definition = deltacomb_base +name = D +version = 4 [metadata] +material = generic_pla +quality_type = D020 setting_version = 20 type = quality -quality_type = D020 -material = generic_pla variant = DBE 0.60mm [values] @@ -15,4 +15,5 @@ cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -material_bed_temperature = 45 \ No newline at end of file +material_bed_temperature = 45 + diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_E.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_E.inst.cfg index 44eb3227e4..dff21e738c 100755 --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_E.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_E.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = E definition = deltacomb_base +name = E +version = 4 [metadata] +material = generic_pla +quality_type = D030 setting_version = 20 type = quality -quality_type = D030 -material = generic_pla variant = DBE 0.60mm [values] @@ -15,5 +15,6 @@ cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 +material_bed_temperature = 45 speed_print = 65 -material_bed_temperature = 45 \ No newline at end of file + diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_F.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_F.inst.cfg index 3fac5f1b3d..f22c7f8c21 100755 --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_F.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_F.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = F definition = deltacomb_base +name = F +version = 4 [metadata] +material = generic_pla +quality_type = D045 setting_version = 20 type = quality -quality_type = D045 -material = generic_pla variant = DBE 0.60mm [values] @@ -15,5 +15,6 @@ cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 +material_bed_temperature = 45 speed_print = 45 -material_bed_temperature = 45 \ No newline at end of file + diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_A.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_A.inst.cfg index 26992f049f..7876d3f518 100755 --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_A.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_A.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = A definition = deltacomb_base +name = A +version = 4 [metadata] +material = generic_pla +quality_type = D005 setting_version = 20 type = quality -quality_type = D005 -material = generic_pla variant = FBE 0.25mm [values] @@ -15,4 +15,5 @@ cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -material_bed_temperature = 45 \ No newline at end of file +material_bed_temperature = 45 + diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_B.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_B.inst.cfg index d3839a4cbe..e6d4d6b39d 100755 --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_B.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_B.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = B definition = deltacomb_base +name = B +version = 4 [metadata] +material = generic_pla +quality_type = D010 setting_version = 20 type = quality -quality_type = D010 -material = generic_pla variant = FBE 0.25mm [values] @@ -15,5 +15,6 @@ cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 +material_bed_temperature = 45 speed_print = 55 -material_bed_temperature = 45 \ No newline at end of file + diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_C.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_C.inst.cfg index e00fca0e46..85f9a1c70c 100755 --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_C.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_C.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = C definition = deltacomb_base +name = C +version = 4 [metadata] +material = generic_pla +quality_type = D015 setting_version = 20 type = quality -quality_type = D015 -material = generic_pla variant = FBE 0.25mm [values] @@ -15,5 +15,6 @@ cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 +material_bed_temperature = 45 speed_print = 32 -material_bed_temperature = 45 \ No newline at end of file + diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_A.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_A.inst.cfg index 60c111e150..bbc9102bea 100755 --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_A.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_A.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = A definition = deltacomb_base +name = A +version = 4 [metadata] +material = generic_pla +quality_type = D005 setting_version = 20 type = quality -quality_type = D005 -material = generic_pla variant = FBE 0.40mm [values] @@ -15,4 +15,5 @@ cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -material_bed_temperature = 45 \ No newline at end of file +material_bed_temperature = 45 + diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_B.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_B.inst.cfg index 32a549fa5b..b809fb53c0 100755 --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_B.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_B.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = B definition = deltacomb_base +name = B +version = 4 [metadata] +material = generic_pla +quality_type = D010 setting_version = 20 type = quality -quality_type = D010 -material = generic_pla variant = FBE 0.40mm [values] @@ -15,4 +15,5 @@ cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -material_bed_temperature = 45 \ No newline at end of file +material_bed_temperature = 45 + diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_C.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_C.inst.cfg index 315bacc81d..22df42990f 100755 --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_C.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_C.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = C definition = deltacomb_base +name = C +version = 4 [metadata] +material = generic_pla +quality_type = D015 setting_version = 20 type = quality -quality_type = D015 -material = generic_pla variant = FBE 0.40mm [values] @@ -15,4 +15,5 @@ cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -material_bed_temperature = 45 \ No newline at end of file +material_bed_temperature = 45 + diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_D.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_D.inst.cfg index ac7dbe969a..9deb25f0e0 100755 --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_D.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_D.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = D definition = deltacomb_base +name = D +version = 4 [metadata] +material = generic_pla +quality_type = D020 setting_version = 20 type = quality -quality_type = D020 -material = generic_pla variant = FBE 0.40mm [values] @@ -15,4 +15,5 @@ cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -material_bed_temperature = 45 \ No newline at end of file +material_bed_temperature = 45 + diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_E.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_E.inst.cfg index d74a9a1d3a..9fe00dae7e 100755 --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_E.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_E.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = E definition = deltacomb_base +name = E +version = 4 [metadata] +material = generic_pla +quality_type = D030 setting_version = 20 type = quality -quality_type = D030 -material = generic_pla variant = FBE 0.40mm [values] @@ -15,4 +15,5 @@ cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -material_bed_temperature = 45 \ No newline at end of file +material_bed_temperature = 45 + diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_C.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_C.inst.cfg index 4d3b7cc0c2..d8f9465c73 100755 --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_C.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_C.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = C definition = deltacomb_base +name = C +version = 4 [metadata] +material = generic_pla +quality_type = D015 setting_version = 20 type = quality -quality_type = D015 -material = generic_pla variant = FBE 0.60mm [values] @@ -15,4 +15,5 @@ cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -material_bed_temperature = 45 \ No newline at end of file +material_bed_temperature = 45 + diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_D.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_D.inst.cfg index 2b4650e055..a7a2a106a8 100755 --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_D.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_D.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = D definition = deltacomb_base +name = D +version = 4 [metadata] +material = generic_pla +quality_type = D020 setting_version = 20 type = quality -quality_type = D020 -material = generic_pla variant = FBE 0.60mm [values] @@ -15,4 +15,5 @@ cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -material_bed_temperature = 45 \ No newline at end of file +material_bed_temperature = 45 + diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_E.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_E.inst.cfg index 1a448f923b..3d319b8f16 100755 --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_E.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_E.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = E definition = deltacomb_base +name = E +version = 4 [metadata] +material = generic_pla +quality_type = D030 setting_version = 20 type = quality -quality_type = D030 -material = generic_pla variant = FBE 0.60mm [values] @@ -15,5 +15,6 @@ cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 +material_bed_temperature = 45 speed_print = 65 -material_bed_temperature = 45 \ No newline at end of file + diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_F.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_F.inst.cfg index 1f5d55a206..c6bfbef3ed 100755 --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_F.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_F.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = F definition = deltacomb_base +name = F +version = 4 [metadata] +material = generic_pla +quality_type = D045 setting_version = 20 type = quality -quality_type = D045 -material = generic_pla variant = FBE 0.60mm [values] @@ -15,5 +15,6 @@ cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 +material_bed_temperature = 45 speed_print = 45 -material_bed_temperature = 45 \ No newline at end of file + diff --git a/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_D.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_D.inst.cfg index ffa886a8d8..cc14963678 100755 --- a/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_D.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_D.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = D definition = deltacomb_base +name = D +version = 4 [metadata] +material = generic_pla +quality_type = D020 setting_version = 20 type = quality -quality_type = D020 -material = generic_pla variant = V-DBE 0.80mm [values] @@ -15,5 +15,6 @@ cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 +material_bed_temperature = 45 speed_print = 150 -material_bed_temperature = 45 \ No newline at end of file + diff --git a/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_E.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_E.inst.cfg index bb6dc1b1d2..54cc590337 100755 --- a/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_E.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_E.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = E definition = deltacomb_base +name = E +version = 4 [metadata] +material = generic_pla +quality_type = D030 setting_version = 20 type = quality -quality_type = D030 -material = generic_pla variant = V-DBE 0.80mm [values] @@ -15,5 +15,6 @@ cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 +material_bed_temperature = 45 speed_print = 110 -material_bed_temperature = 45 \ No newline at end of file + diff --git a/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_F.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_F.inst.cfg index 2ffd71e191..db61932a8a 100755 --- a/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_F.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_F.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = F definition = deltacomb_base +name = F +version = 4 [metadata] +material = generic_pla +quality_type = D045 setting_version = 20 type = quality -quality_type = D045 -material = generic_pla variant = V-DBE 0.80mm [values] @@ -15,5 +15,6 @@ cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 +material_bed_temperature = 45 speed_print = 75 -material_bed_temperature = 45 \ No newline at end of file + diff --git a/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_G.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_G.inst.cfg index 409e7ac399..79de0b8880 100755 --- a/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_G.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_G.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = G definition = deltacomb_base +name = G +version = 4 [metadata] +material = generic_pla +quality_type = D060 setting_version = 20 type = quality -quality_type = D060 -material = generic_pla variant = V-DBE 0.80mm [values] @@ -15,5 +15,6 @@ cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 +material_bed_temperature = 45 speed_print = 55 -material_bed_temperature = 45 \ No newline at end of file + diff --git a/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_D.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_D.inst.cfg index ac4e098d47..265ce04e9e 100755 --- a/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_D.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_D.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = D definition = deltacomb_base +name = D +version = 4 [metadata] +material = generic_pla +quality_type = D020 setting_version = 20 type = quality -quality_type = D020 -material = generic_pla variant = V-FBE 0.80mm [values] @@ -15,5 +15,6 @@ cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 +material_bed_temperature = 45 speed_print = 150 -material_bed_temperature = 45 \ No newline at end of file + diff --git a/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_E.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_E.inst.cfg index 18bc24706c..d29d5c8bfb 100755 --- a/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_E.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_E.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = E definition = deltacomb_base +name = E +version = 4 [metadata] +material = generic_pla +quality_type = D030 setting_version = 20 type = quality -quality_type = D030 -material = generic_pla variant = V-FBE 0.60mm [values] @@ -15,5 +15,6 @@ cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 +material_bed_temperature = 45 speed_print = 110 -material_bed_temperature = 45 \ No newline at end of file + diff --git a/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_F.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_F.inst.cfg index 012764f64f..9c131f01b5 100755 --- a/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_F.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_F.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = F definition = deltacomb_base +name = F +version = 4 [metadata] +material = generic_pla +quality_type = D045 setting_version = 20 type = quality -quality_type = D045 -material = generic_pla variant = V-FBE 0.80mm [values] @@ -15,5 +15,6 @@ cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 +material_bed_temperature = 45 speed_print = 75 -material_bed_temperature = 45 \ No newline at end of file + diff --git a/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_G.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_G.inst.cfg index 3a6536f03d..a9e12aad81 100755 --- a/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_G.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_G.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = G definition = deltacomb_base +name = G +version = 4 [metadata] +material = generic_pla +quality_type = D060 setting_version = 20 type = quality -quality_type = D060 -material = generic_pla variant = V-FBE 0.80mm [values] @@ -15,5 +15,6 @@ cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 +material_bed_temperature = 45 speed_print = 55 -material_bed_temperature = 45 \ No newline at end of file + diff --git a/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_A.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_A.inst.cfg index 59e8fd1414..93132491a8 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_A.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_A.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = A definition = deltacomb_base +name = A +version = 4 [metadata] +material = generic_pva +quality_type = D005 setting_version = 20 type = quality -quality_type = D005 -material = generic_pva variant = DBE 0.40mm [values] brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False -support_brim_enable = True +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_brim_enable = True +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height + diff --git a/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_B.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_B.inst.cfg index 42b951cccb..a1237204d8 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_B.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_B.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = B definition = deltacomb_base +name = B +version = 4 [metadata] +material = generic_pva +quality_type = D010 setting_version = 20 type = quality -quality_type = D010 -material = generic_pva variant = DBE 0.40mm [values] brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False -support_brim_enable = True +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_brim_enable = True +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height + diff --git a/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_C.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_C.inst.cfg index b2d5f4d05e..6d6a9ce7ae 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_C.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_C.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = C definition = deltacomb_base +name = C +version = 4 [metadata] +material = generic_pva +quality_type = D015 setting_version = 20 type = quality -quality_type = D015 -material = generic_pva variant = DBE 0.40mm [values] brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False -support_brim_enable = True +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_brim_enable = True +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height + diff --git a/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_D.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_D.inst.cfg index c49ba53f36..9cba1aa120 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_D.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_D.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = D definition = deltacomb_base +name = D +version = 4 [metadata] +material = generic_pva +quality_type = D020 setting_version = 20 type = quality -quality_type = D020 -material = generic_pva variant = DBE 0.40mm [values] brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False -support_brim_enable = True +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_brim_enable = True +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height + diff --git a/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_E.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_E.inst.cfg index fb9e59f910..d076bb2997 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_E.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_E.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = E definition = deltacomb_base +name = E +version = 4 [metadata] +material = generic_pva +quality_type = D030 setting_version = 20 type = quality -quality_type = D030 -material = generic_pva variant = DBE 0.40mm [values] brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False -support_brim_enable = True +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_brim_enable = True +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height + diff --git a/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_C.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_C.inst.cfg index 6c4303807e..7c45c6caf1 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_C.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_C.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = C definition = deltacomb_base +name = C +version = 4 [metadata] +material = generic_pva +quality_type = D015 setting_version = 20 type = quality -quality_type = D015 -material = generic_pva variant = DBE 0.60mm [values] brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False -support_brim_enable = True +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_brim_enable = True +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height + diff --git a/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_D.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_D.inst.cfg index 2f4e5ce032..5c319d7b08 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_D.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_D.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = D definition = deltacomb_base +name = D +version = 4 [metadata] +material = generic_pva +quality_type = D020 setting_version = 20 type = quality -quality_type = D020 -material = generic_pva variant = DBE 0.60mm [values] brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False -support_brim_enable = True +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_brim_enable = True +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height + diff --git a/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_E.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_E.inst.cfg index b5f8999bb9..3f86f02228 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_E.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_E.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = E definition = deltacomb_base +name = E +version = 4 [metadata] +material = generic_pva +quality_type = D030 setting_version = 20 type = quality -quality_type = D030 -material = generic_pva variant = DBE 0.60mm [values] brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False -support_brim_enable = True +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_brim_enable = True +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height + diff --git a/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_F.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_F.inst.cfg index 150216f26c..be15d933de 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_F.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_F.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = F definition = deltacomb_base +name = F +version = 4 [metadata] +material = generic_pva +quality_type = D045 setting_version = 20 type = quality -quality_type = D045 -material = generic_pva variant = DBE 0.60mm [values] brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False -support_brim_enable = True +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_brim_enable = True +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height + diff --git a/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_A.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_A.inst.cfg index 81603f50b1..c22f45aebd 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_A.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_A.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = A definition = deltacomb_base +name = A +version = 4 [metadata] +material = generic_pva +quality_type = D005 setting_version = 20 type = quality -quality_type = D005 -material = generic_pva variant = FBE 0.40mm [values] brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False -support_brim_enable = True +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_brim_enable = True +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height + diff --git a/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_B.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_B.inst.cfg index 876e730533..9e342f48c7 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_B.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_B.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = B definition = deltacomb_base +name = B +version = 4 [metadata] +material = generic_pva +quality_type = D010 setting_version = 20 type = quality -quality_type = D010 -material = generic_pva variant = FBE 0.40mm [values] brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False -support_brim_enable = True +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_brim_enable = True +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height + diff --git a/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_C.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_C.inst.cfg index 6bdda17069..50f18398b3 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_C.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_C.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = C definition = deltacomb_base +name = C +version = 4 [metadata] +material = generic_pva +quality_type = D015 setting_version = 20 type = quality -quality_type = D015 -material = generic_pva variant = FBE 0.40mm [values] brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False -support_brim_enable = True +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_brim_enable = True +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height + diff --git a/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_D.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_D.inst.cfg index e7a76a7c94..3921e268a1 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_D.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_D.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = D definition = deltacomb_base +name = D +version = 4 [metadata] +material = generic_pva +quality_type = D020 setting_version = 20 type = quality -quality_type = D020 -material = generic_pva variant = FBE 0.40mm [values] brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False -support_brim_enable = True +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_brim_enable = True +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height + diff --git a/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_E.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_E.inst.cfg index bf649df21a..533597378f 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_E.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_E.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = E definition = deltacomb_base +name = E +version = 4 [metadata] +material = generic_pva +quality_type = D030 setting_version = 20 type = quality -quality_type = D030 -material = generic_pva variant = FBE 0.40mm [values] brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False -support_brim_enable = True +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_brim_enable = True +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height + diff --git a/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_C.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_C.inst.cfg index 23a95e6b45..49c225d78c 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_C.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_C.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = C definition = deltacomb_base +name = C +version = 4 [metadata] +material = generic_pva +quality_type = D015 setting_version = 20 type = quality -quality_type = D015 -material = generic_pva variant = FBE 0.60mm [values] brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False -support_brim_enable = True +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_brim_enable = True +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height + diff --git a/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_D.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_D.inst.cfg index be08e711bc..065c96f3d4 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_D.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_D.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = D definition = deltacomb_base +name = D +version = 4 [metadata] +material = generic_pva +quality_type = D020 setting_version = 20 type = quality -quality_type = D020 -material = generic_pva variant = FBE 0.60mm [values] brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False -support_brim_enable = True +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_brim_enable = True +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height + diff --git a/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_E.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_E.inst.cfg index e085226a2f..7ba424c7b7 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_E.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_E.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = E definition = deltacomb_base +name = E +version = 4 [metadata] +material = generic_pva +quality_type = D030 setting_version = 20 type = quality -quality_type = D030 -material = generic_pva variant = FBE 0.60mm [values] brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False -support_brim_enable = True +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_brim_enable = True +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height + diff --git a/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_F.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_F.inst.cfg index ec8b9401b2..482778628a 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_F.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_FBE0.60_PVA_F.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = F definition = deltacomb_base +name = F +version = 4 [metadata] +material = generic_pva +quality_type = D045 setting_version = 20 type = quality -quality_type = D045 -material = generic_pva variant = FBE 0.60mm [values] brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False -support_brim_enable = True +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_brim_enable = True +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height + diff --git a/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_D.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_D.inst.cfg index 0af34dc7e9..9852f60c9d 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_D.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_D.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = D definition = deltacomb_base +name = D +version = 4 [metadata] +material = generic_pva +quality_type = D020 setting_version = 20 type = quality -quality_type = D020 -material = generic_pva variant = V-DBE 0.80mm [values] brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False -support_brim_enable = True +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_brim_enable = True +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height + diff --git a/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_E.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_E.inst.cfg index cb85c2b893..be443fac40 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_E.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_E.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = E definition = deltacomb_base +name = E +version = 4 [metadata] +material = generic_pva +quality_type = D030 setting_version = 20 type = quality -quality_type = D030 -material = generic_pva variant = V-DBE 0.80mm [values] brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False -support_brim_enable = True +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_brim_enable = True +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height + diff --git a/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_F.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_F.inst.cfg index 58797ff4e6..e363f47c5c 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_F.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_F.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = F definition = deltacomb_base +name = F +version = 4 [metadata] +material = generic_pva +quality_type = D045 setting_version = 20 type = quality -quality_type = D045 -material = generic_pva variant = V-DBE 0.80mm [values] brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False -support_brim_enable = True +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_brim_enable = True +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height + diff --git a/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_G.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_G.inst.cfg index 81a1bb3bf4..1381ea7414 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_G.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_VDBE0.80_PVA_G.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = G definition = deltacomb_base +name = G +version = 4 [metadata] +material = generic_pva +quality_type = D060 setting_version = 20 type = quality -quality_type = D060 -material = generic_pva variant = V-DBE 0.80mm [values] brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False -support_brim_enable = True +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_brim_enable = True +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height + diff --git a/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_D.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_D.inst.cfg index 1f3b9fdc1b..bd6de1b933 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_D.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_D.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = D definition = deltacomb_base +name = D +version = 4 [metadata] +material = generic_pva +quality_type = D020 setting_version = 20 type = quality -quality_type = D020 -material = generic_pva variant = V-FBE 0.80mm [values] brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False -support_brim_enable = True +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_brim_enable = True +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height + diff --git a/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_E.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_E.inst.cfg index 583b715e89..0b268c55f5 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_E.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_E.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = E definition = deltacomb_base +name = E +version = 4 [metadata] +material = generic_pva +quality_type = D030 setting_version = 20 type = quality -quality_type = D030 -material = generic_pva variant = V-FBE 0.60mm [values] brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False -support_brim_enable = True +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_brim_enable = True +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height + diff --git a/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_F.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_F.inst.cfg index 00f5c73b32..27c456fcfe 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_F.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_F.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = F definition = deltacomb_base +name = F +version = 4 [metadata] +material = generic_pva +quality_type = D045 setting_version = 20 type = quality -quality_type = D045 -material = generic_pva variant = V-FBE 0.80mm [values] brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False -support_brim_enable = True +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_brim_enable = True +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height + diff --git a/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_G.inst.cfg b/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_G.inst.cfg index a1b3f04205..333fb68aa8 100644 --- a/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_G.inst.cfg +++ b/resources/quality/deltacomb/PVA/deltacomb_VFBE0.80_PVA_G.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = G definition = deltacomb_base +name = G +version = 4 [metadata] +material = generic_pva +quality_type = D060 setting_version = 20 type = quality -quality_type = D060 -material = generic_pva variant = V-FBE 0.80mm [values] brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False -support_brim_enable = True +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_brim_enable = True +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height + diff --git a/resources/quality/deltacomb/TPU/deltacomb_DBE0.40_TPU_B.inst.cfg b/resources/quality/deltacomb/TPU/deltacomb_DBE0.40_TPU_B.inst.cfg index c2532ef788..4cd35a2121 100644 --- a/resources/quality/deltacomb/TPU/deltacomb_DBE0.40_TPU_B.inst.cfg +++ b/resources/quality/deltacomb/TPU/deltacomb_DBE0.40_TPU_B.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = B definition = deltacomb_base +name = B +version = 4 [metadata] +material = generic_tpu +quality_type = D010 setting_version = 20 type = quality -quality_type = D010 -material = generic_tpu variant = DBE 0.40mm [values] +acceleration_travel = 10000 cool_fan_full_at_height = =layer_height * 6 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 70 -speed_print = 25 -speed_travel = 300 -acceleration_travel = 10000 -retraction_amount = 5 -retraction_hop_enabled = False ironing_flow = 5 jerk_ironing = 5 +retraction_amount = 5 +retraction_hop_enabled = False speed_ironing = =speed_print -switch_extruder_retraction_amount = 10 \ No newline at end of file +speed_print = 25 +speed_travel = 300 +switch_extruder_retraction_amount = 10 + diff --git a/resources/quality/deltacomb/TPU/deltacomb_DBE0.40_TPU_C.inst.cfg b/resources/quality/deltacomb/TPU/deltacomb_DBE0.40_TPU_C.inst.cfg index cc89344995..0bac11137c 100644 --- a/resources/quality/deltacomb/TPU/deltacomb_DBE0.40_TPU_C.inst.cfg +++ b/resources/quality/deltacomb/TPU/deltacomb_DBE0.40_TPU_C.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = C definition = deltacomb_base +name = C +version = 4 [metadata] +material = generic_tpu +quality_type = D015 setting_version = 20 type = quality -quality_type = D015 -material = generic_tpu variant = DBE 0.40mm [values] +acceleration_travel = 10000 cool_fan_full_at_height = =layer_height * 6 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 70 -speed_print = 25 -speed_travel = 300 -acceleration_travel = 10000 -retraction_amount = 5 -retraction_hop_enabled = False ironing_flow = 5 jerk_ironing = 5 +retraction_amount = 5 +retraction_hop_enabled = False speed_ironing = =speed_print -switch_extruder_retraction_amount = 10 \ No newline at end of file +speed_print = 25 +speed_travel = 300 +switch_extruder_retraction_amount = 10 + diff --git a/resources/quality/deltacomb/TPU/deltacomb_DBE0.40_TPU_D.inst.cfg b/resources/quality/deltacomb/TPU/deltacomb_DBE0.40_TPU_D.inst.cfg index 7994e014a8..d3f7d32db4 100644 --- a/resources/quality/deltacomb/TPU/deltacomb_DBE0.40_TPU_D.inst.cfg +++ b/resources/quality/deltacomb/TPU/deltacomb_DBE0.40_TPU_D.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = D definition = deltacomb_base +name = D +version = 4 [metadata] +material = generic_tpu +quality_type = D020 setting_version = 20 type = quality -quality_type = D020 -material = generic_tpu variant = DBE 0.40mm [values] +acceleration_travel = 10000 cool_fan_full_at_height = =layer_height * 6 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 70 -speed_print = 25 -speed_travel = 300 -acceleration_travel = 10000 -retraction_amount = 5 -retraction_hop_enabled = False ironing_flow = 5 jerk_ironing = 5 +retraction_amount = 5 +retraction_hop_enabled = False speed_ironing = =speed_print -switch_extruder_retraction_amount = 10 \ No newline at end of file +speed_print = 25 +speed_travel = 300 +switch_extruder_retraction_amount = 10 + diff --git a/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_B.inst.cfg b/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_B.inst.cfg index 6727cb8ed5..a6d8bde695 100755 --- a/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_B.inst.cfg +++ b/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_B.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = B definition = deltacomb_base +name = B +version = 4 [metadata] +material = generic_tpu +quality_type = D010 setting_version = 20 type = quality -quality_type = D010 -material = generic_tpu variant = FBE 0.40mm [values] +acceleration_travel = 10000 cool_fan_full_at_height = =layer_height * 6 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 70 -speed_print = 25 -speed_travel = 300 -acceleration_travel = 10000 -retraction_amount = 5 -retraction_hop_enabled = False ironing_flow = 5 jerk_ironing = 5 +retraction_amount = 5 +retraction_hop_enabled = False speed_ironing = =speed_print -switch_extruder_retraction_amount = 10 \ No newline at end of file +speed_print = 25 +speed_travel = 300 +switch_extruder_retraction_amount = 10 + diff --git a/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_C.inst.cfg b/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_C.inst.cfg index 425504c187..686f9f40e9 100755 --- a/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_C.inst.cfg +++ b/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_C.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = C definition = deltacomb_base +name = C +version = 4 [metadata] +material = generic_tpu +quality_type = D015 setting_version = 20 type = quality -quality_type = D015 -material = generic_tpu variant = FBE 0.40mm [values] +acceleration_travel = 10000 cool_fan_full_at_height = =layer_height * 6 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 70 -speed_print = 25 -speed_travel = 300 -acceleration_travel = 10000 -retraction_amount = 5 -retraction_hop_enabled = False ironing_flow = 5 jerk_ironing = 5 +retraction_amount = 5 +retraction_hop_enabled = False speed_ironing = =speed_print -switch_extruder_retraction_amount = 10 \ No newline at end of file +speed_print = 25 +speed_travel = 300 +switch_extruder_retraction_amount = 10 + diff --git a/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_D.inst.cfg b/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_D.inst.cfg index f387d0274e..fc963f29fd 100755 --- a/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_D.inst.cfg +++ b/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_D.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = D definition = deltacomb_base +name = D +version = 4 [metadata] +material = generic_tpu +quality_type = D020 setting_version = 20 type = quality -quality_type = D020 -material = generic_tpu variant = FBE 0.40mm [values] +acceleration_travel = 10000 cool_fan_full_at_height = =layer_height * 6 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 70 -speed_print = 25 -speed_travel = 300 -acceleration_travel = 10000 -retraction_amount = 5 -retraction_hop_enabled = False ironing_flow = 5 jerk_ironing = 5 +retraction_amount = 5 +retraction_hop_enabled = False speed_ironing = =speed_print -switch_extruder_retraction_amount = 10 \ No newline at end of file +speed_print = 25 +speed_travel = 300 +switch_extruder_retraction_amount = 10 + diff --git a/resources/quality/deltacomb/deltacomb_global_A.inst.cfg b/resources/quality/deltacomb/deltacomb_global_A.inst.cfg index e8e41d5936..bc8e16c9ce 100755 --- a/resources/quality/deltacomb/deltacomb_global_A.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_A.inst.cfg @@ -1,23 +1,24 @@ [general] -version = 4 -name = Extra Fine definition = deltacomb_base +name = Extra Fine +version = 4 [metadata] +global_quality = True +quality_type = D005 setting_version = 20 type = quality -quality_type = D005 weight = 1 -global_quality = True [values] adhesion_type = skirt -layer_height = 0.05 -layer_height_0 = 0.1 cool_fan_enabled = True cool_min_layer_time = 10 cool_min_layer_time_fan_speed_max = 10 cool_min_speed = 5 +layer_height = 0.05 +layer_height_0 = 0.1 material_print_temperature_layer_0 = =default_material_print_temperature + 5 +prime_tower_brim_enable = False support_angle = 80 -prime_tower_brim_enable = False \ No newline at end of file + diff --git a/resources/quality/deltacomb/deltacomb_global_B.inst.cfg b/resources/quality/deltacomb/deltacomb_global_B.inst.cfg index 220aac4192..e3aa0dd4e6 100755 --- a/resources/quality/deltacomb/deltacomb_global_B.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_B.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Fine definition = deltacomb_base +name = Fine +version = 4 [metadata] +global_quality = True +quality_type = D010 setting_version = 20 type = quality -quality_type = D010 weight = 0 -global_quality = True [values] adhesion_type = skirt -layer_height = 0.1 cool_fan_enabled = True cool_min_layer_time = 10 cool_min_layer_time_fan_speed_max = 10 cool_min_speed = 5 +layer_height = 0.1 material_print_temperature_layer_0 = =default_material_print_temperature + 5 +prime_tower_brim_enable = False support_angle = 65 -prime_tower_brim_enable = False \ No newline at end of file + diff --git a/resources/quality/deltacomb/deltacomb_global_C.inst.cfg b/resources/quality/deltacomb/deltacomb_global_C.inst.cfg index 554b9de913..b6ac3e887d 100755 --- a/resources/quality/deltacomb/deltacomb_global_C.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_C.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Normal definition = deltacomb_base +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = D015 setting_version = 20 type = quality -quality_type = D015 weight = -1 -global_quality = True [values] adhesion_type = skirt -layer_height = 0.15 cool_fan_enabled = True cool_min_layer_time = 10 cool_min_layer_time_fan_speed_max = 10 cool_min_speed = 5 +layer_height = 0.15 material_print_temperature_layer_0 = =default_material_print_temperature + 5 +prime_tower_brim_enable = False support_angle = 55 -prime_tower_brim_enable = False \ No newline at end of file + diff --git a/resources/quality/deltacomb/deltacomb_global_D.inst.cfg b/resources/quality/deltacomb/deltacomb_global_D.inst.cfg index 4fccf4df50..9fa66749bc 100755 --- a/resources/quality/deltacomb/deltacomb_global_D.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_D.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Fast definition = deltacomb_base +name = Fast +version = 4 [metadata] +global_quality = True +quality_type = D020 setting_version = 20 type = quality -quality_type = D020 weight = -2 -global_quality = True [values] adhesion_type = skirt -layer_height = 0.2 cool_fan_enabled = True cool_min_layer_time = 10 cool_min_layer_time_fan_speed_max = 10 cool_min_speed = 5 +layer_height = 0.2 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -prime_tower_brim_enable = False \ No newline at end of file +prime_tower_brim_enable = False + diff --git a/resources/quality/deltacomb/deltacomb_global_E.inst.cfg b/resources/quality/deltacomb/deltacomb_global_E.inst.cfg index 330fc2d42c..cd08e4daf5 100755 --- a/resources/quality/deltacomb/deltacomb_global_E.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_E.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Extra Fast definition = deltacomb_base +name = Extra Fast +version = 4 [metadata] +global_quality = True +quality_type = D030 setting_version = 20 type = quality -quality_type = D030 weight = -3 -global_quality = True [values] adhesion_type = skirt -layer_height = 0.3 cool_fan_enabled = True cool_min_layer_time = 10 cool_min_layer_time_fan_speed_max = 10 cool_min_speed = 5 +layer_height = 0.3 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -prime_tower_brim_enable = False \ No newline at end of file +prime_tower_brim_enable = False + diff --git a/resources/quality/deltacomb/deltacomb_global_F.inst.cfg b/resources/quality/deltacomb/deltacomb_global_F.inst.cfg index efd87a8296..3a87215f61 100755 --- a/resources/quality/deltacomb/deltacomb_global_F.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_F.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Coarse definition = deltacomb_base +name = Coarse +version = 4 [metadata] +global_quality = True +quality_type = D045 setting_version = 20 type = quality -quality_type = D045 weight = -4 -global_quality = True [values] adhesion_type = skirt -layer_height = 0.45 cool_fan_enabled = True cool_min_layer_time = 10 cool_min_layer_time_fan_speed_max = 10 cool_min_speed = 5 +layer_height = 0.45 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -prime_tower_brim_enable = False \ No newline at end of file +prime_tower_brim_enable = False + diff --git a/resources/quality/deltacomb/deltacomb_global_G.inst.cfg b/resources/quality/deltacomb/deltacomb_global_G.inst.cfg index c91b2c8e28..590522083d 100755 --- a/resources/quality/deltacomb/deltacomb_global_G.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_G.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Extra Coarse definition = deltacomb_base +name = Extra Coarse +version = 4 [metadata] +global_quality = True +quality_type = D060 setting_version = 20 type = quality -quality_type = D060 weight = -5 -global_quality = True [values] adhesion_type = skirt -layer_height = 0.6 cool_fan_enabled = True cool_min_layer_time = 10 cool_min_layer_time_fan_speed_max = 10 cool_min_speed = 5 +layer_height = 0.6 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -prime_tower_brim_enable = False \ No newline at end of file +prime_tower_brim_enable = False + diff --git a/resources/quality/diy220/diy220_draft.inst.cfg b/resources/quality/diy220/diy220_draft.inst.cfg index 8ddc366300..68609b688d 100644 --- a/resources/quality/diy220/diy220_draft.inst.cfg +++ b/resources/quality/diy220/diy220_draft.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft definition = diy220 +name = Draft +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] layer_height = 0.2 + diff --git a/resources/quality/diy220/diy220_fast.inst.cfg b/resources/quality/diy220/diy220_fast.inst.cfg index 0364b94bd9..755c313969 100644 --- a/resources/quality/diy220/diy220_fast.inst.cfg +++ b/resources/quality/diy220/diy220_fast.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Normal definition = diy220 +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -1 -global_quality = True [values] layer_height = 0.15 + diff --git a/resources/quality/diy220/diy220_high.inst.cfg b/resources/quality/diy220/diy220_high.inst.cfg index a952bc60c0..0176770680 100644 --- a/resources/quality/diy220/diy220_high.inst.cfg +++ b/resources/quality/diy220/diy220_high.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = diy220 +name = Extra Fine +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -global_quality = True [values] layer_height = 0.06 + diff --git a/resources/quality/diy220/diy220_normal.inst.cfg b/resources/quality/diy220/diy220_normal.inst.cfg index 9120f89b7f..6c31e9b796 100644 --- a/resources/quality/diy220/diy220_normal.inst.cfg +++ b/resources/quality/diy220/diy220_normal.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Fine definition = diy220 +name = Fine +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] + diff --git a/resources/quality/draft.inst.cfg b/resources/quality/draft.inst.cfg index c083eb8178..67a0eb03cf 100644 --- a/resources/quality/draft.inst.cfg +++ b/resources/quality/draft.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft definition = fdmprinter +name = Draft +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] layer_height = 0.2 + diff --git a/resources/quality/elegoo_neptune_2/elegoo_neptune_2_draft.inst.cfg b/resources/quality/elegoo_neptune_2/elegoo_neptune_2_draft.inst.cfg index 92a592c198..70a8dd15a3 100644 --- a/resources/quality/elegoo_neptune_2/elegoo_neptune_2_draft.inst.cfg +++ b/resources/quality/elegoo_neptune_2/elegoo_neptune_2_draft.inst.cfg @@ -1,26 +1,25 @@ [general] -version = 4 -name = Draft definition = elegoo_neptune_2 +name = Draft +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] acceleration_enabled = True -jerk_enabled = True -layer_height = 0.28 -layer_height_0 = 0.28 - bottom_layers = =999999 if infill_sparse_density == 100 else math.ceil(round(bottom_thickness / resolveOrValue('layer_height'), 4)) coasting_enable = False infill_line_distance = =0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density * (2 if infill_pattern == 'grid' else (3 if infill_pattern == 'triangles' or infill_pattern == 'trihexagon' or infill_pattern == 'cubic' or infill_pattern == 'cubicsubdiv' else (2 if infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' else (1 if infill_pattern == 'cross' or infill_pattern == 'cross_3d' else 1)))) infill_pattern = grid infill_sparse_density = 10.0 +jerk_enabled = True +layer_height = 0.28 +layer_height_0 = 0.28 material_flow_layer_0 = 95 retraction_amount = 6 roofing_layer_count = 1 @@ -36,4 +35,5 @@ wall_0_material_flow = 95 wall_0_wipe_dist = 0.4 wall_thickness = 1.2 z_seam_corner = z_seam_corner_weighted -z_seam_type = sharpest_corner \ No newline at end of file +z_seam_type = sharpest_corner + diff --git a/resources/quality/elegoo_neptune_2/elegoo_neptune_2_fine.inst.cfg b/resources/quality/elegoo_neptune_2/elegoo_neptune_2_fine.inst.cfg index afaa645b3e..6070012cce 100644 --- a/resources/quality/elegoo_neptune_2/elegoo_neptune_2_fine.inst.cfg +++ b/resources/quality/elegoo_neptune_2/elegoo_neptune_2_fine.inst.cfg @@ -1,34 +1,34 @@ [general] -version = 4 -name = Fine definition = elegoo_neptune_2 +name = Fine +version = 4 [metadata] +global_quality = True +quality_type = fine setting_version = 20 type = quality -quality_type = fine weight = 1 -global_quality = True [values] acceleration_enabled = True -jerk_enabled = True -layer_height = 0.12 -layer_height_0 = 0.2 -support_enable = False - coasting_enable = False infill_line_distance = =0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density * (2 if infill_pattern == 'grid' else (3 if infill_pattern == 'triangles' or infill_pattern == 'trihexagon' or infill_pattern == 'cubic' or infill_pattern == 'cubicsubdiv' else (2 if infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' else (1 if infill_pattern == 'cross' or infill_pattern == 'cross_3d' else 1)))) infill_pattern = grid infill_sparse_density = 25 +jerk_enabled = True +layer_height = 0.12 +layer_height_0 = 0.2 material_flow_layer_0 = 95 retraction_amount = 6 skirt_brim_speed = 25.0 speed_layer_0 = 25.0 speed_travel_layer_0 = 125.0 speed_wall_x = 50.0 +support_enable = False top_bottom_thickness = 1 wall_0_material_flow = 95 wall_0_wipe_dist = 0.4 wall_thickness = 1.2 -z_seam_type = sharpest_corner \ No newline at end of file +z_seam_type = sharpest_corner + diff --git a/resources/quality/elegoo_neptune_2/elegoo_neptune_2_normal.inst.cfg b/resources/quality/elegoo_neptune_2/elegoo_neptune_2_normal.inst.cfg index bf9c8b8445..f87ef1f896 100644 --- a/resources/quality/elegoo_neptune_2/elegoo_neptune_2_normal.inst.cfg +++ b/resources/quality/elegoo_neptune_2/elegoo_neptune_2_normal.inst.cfg @@ -1,27 +1,25 @@ [general] -version = 4 -name = Normal definition = elegoo_neptune_2 +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] acceleration_enabled = True adhesion_type = skirt -jerk_enabled = True -layer_height = 0.2 -layer_height_0 = 0.2 -support_enable = False - coasting_enable = False infill_line_distance = =0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density * (2 if infill_pattern == 'grid' else (3 if infill_pattern == 'triangles' or infill_pattern == 'trihexagon' or infill_pattern == 'cubic' or infill_pattern == 'cubicsubdiv' else (2 if infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' else (1 if infill_pattern == 'cross' or infill_pattern == 'cross_3d' else 1)))) infill_pattern = grid infill_sparse_density = 25 +jerk_enabled = True +layer_height = 0.2 +layer_height_0 = 0.2 material_flow_layer_0 = 95 retraction_amount = 6 skin_angles = [90 ] @@ -33,6 +31,7 @@ skirt_brim_speed = 25.0 speed_layer_0 = 25.0 speed_travel_layer_0 = 125.0 speed_wall_x = 50.0 +support_enable = False support_xy_distance = 0.2 top_bottom_thickness = 1 wall_0_inset = 0.2 @@ -40,3 +39,4 @@ wall_0_material_flow = 95 wall_0_wipe_dist = 0.4 wall_thickness = 1.2 z_seam_type = sharpest_corner + diff --git a/resources/quality/elegoo_neptune_2D/elegoo_neptune_2D_draft.inst.cfg b/resources/quality/elegoo_neptune_2D/elegoo_neptune_2D_draft.inst.cfg index 0a5b076baa..92cd8fac45 100644 --- a/resources/quality/elegoo_neptune_2D/elegoo_neptune_2D_draft.inst.cfg +++ b/resources/quality/elegoo_neptune_2D/elegoo_neptune_2D_draft.inst.cfg @@ -1,26 +1,25 @@ [general] -version = 4 -name = Draft definition = elegoo_neptune_2D +name = Draft +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] acceleration_enabled = True -jerk_enabled = True -layer_height = 0.28 -layer_height_0 = 0.28 - bottom_layers = =999999 if infill_sparse_density == 100 else math.ceil(round(bottom_thickness / resolveOrValue('layer_height'), 4)) coasting_enable = False infill_line_distance = =0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density * (2 if infill_pattern == 'grid' else (3 if infill_pattern == 'triangles' or infill_pattern == 'trihexagon' or infill_pattern == 'cubic' or infill_pattern == 'cubicsubdiv' else (2 if infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' else (1 if infill_pattern == 'cross' or infill_pattern == 'cross_3d' else 1)))) infill_pattern = grid infill_sparse_density = 10.0 +jerk_enabled = True +layer_height = 0.28 +layer_height_0 = 0.28 material_flow_layer_0 = 95 retraction_amount = 6 roofing_layer_count = 1 @@ -36,4 +35,5 @@ wall_0_material_flow = 95 wall_0_wipe_dist = 0.4 wall_thickness = 1.2 z_seam_corner = z_seam_corner_weighted -z_seam_type = sharpest_corner \ No newline at end of file +z_seam_type = sharpest_corner + diff --git a/resources/quality/elegoo_neptune_2D/elegoo_neptune_2D_fine.inst.cfg b/resources/quality/elegoo_neptune_2D/elegoo_neptune_2D_fine.inst.cfg index 7fb24a1a41..3b42fa179d 100644 --- a/resources/quality/elegoo_neptune_2D/elegoo_neptune_2D_fine.inst.cfg +++ b/resources/quality/elegoo_neptune_2D/elegoo_neptune_2D_fine.inst.cfg @@ -1,34 +1,34 @@ [general] -version = 4 -name = Fine definition = elegoo_neptune_2D +name = Fine +version = 4 [metadata] +global_quality = True +quality_type = fine setting_version = 20 type = quality -quality_type = fine weight = 1 -global_quality = True [values] acceleration_enabled = True -jerk_enabled = True -layer_height = 0.12 -layer_height_0 = 0.2 -support_enable = False - coasting_enable = False infill_line_distance = =0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density * (2 if infill_pattern == 'grid' else (3 if infill_pattern == 'triangles' or infill_pattern == 'trihexagon' or infill_pattern == 'cubic' or infill_pattern == 'cubicsubdiv' else (2 if infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' else (1 if infill_pattern == 'cross' or infill_pattern == 'cross_3d' else 1)))) infill_pattern = grid infill_sparse_density = 25 +jerk_enabled = True +layer_height = 0.12 +layer_height_0 = 0.2 material_flow_layer_0 = 95 retraction_amount = 6 skirt_brim_speed = 25.0 speed_layer_0 = 25.0 speed_travel_layer_0 = 125.0 speed_wall_x = 50.0 +support_enable = False top_bottom_thickness = 1 wall_0_material_flow = 95 wall_0_wipe_dist = 0.4 wall_thickness = 1.2 -z_seam_type = sharpest_corner \ No newline at end of file +z_seam_type = sharpest_corner + diff --git a/resources/quality/elegoo_neptune_2D/elegoo_neptune_2D_normal.inst.cfg b/resources/quality/elegoo_neptune_2D/elegoo_neptune_2D_normal.inst.cfg index 2ed5c6ad76..da50643bd8 100644 --- a/resources/quality/elegoo_neptune_2D/elegoo_neptune_2D_normal.inst.cfg +++ b/resources/quality/elegoo_neptune_2D/elegoo_neptune_2D_normal.inst.cfg @@ -1,27 +1,25 @@ [general] -version = 4 -name = Normal definition = elegoo_neptune_2D +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] acceleration_enabled = True adhesion_type = skirt -jerk_enabled = True -layer_height = 0.2 -layer_height_0 = 0.2 -support_enable = False - coasting_enable = False infill_line_distance = =0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density * (2 if infill_pattern == 'grid' else (3 if infill_pattern == 'triangles' or infill_pattern == 'trihexagon' or infill_pattern == 'cubic' or infill_pattern == 'cubicsubdiv' else (2 if infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' else (1 if infill_pattern == 'cross' or infill_pattern == 'cross_3d' else 1)))) infill_pattern = grid infill_sparse_density = 25 +jerk_enabled = True +layer_height = 0.2 +layer_height_0 = 0.2 material_flow_layer_0 = 95 retraction_amount = 6 skin_angles = [90 ] @@ -33,6 +31,7 @@ skirt_brim_speed = 25.0 speed_layer_0 = 25.0 speed_travel_layer_0 = 125.0 speed_wall_x = 50.0 +support_enable = False support_xy_distance = 0.2 top_bottom_thickness = 1 wall_0_inset = 0.2 @@ -40,3 +39,4 @@ wall_0_material_flow = 95 wall_0_wipe_dist = 0.4 wall_thickness = 1.2 z_seam_type = sharpest_corner + diff --git a/resources/quality/eryone_er20/eryone_er20_draft.inst.cfg b/resources/quality/eryone_er20/eryone_er20_draft.inst.cfg index 3cf7e3c1f3..a3389eb955 100644 --- a/resources/quality/eryone_er20/eryone_er20_draft.inst.cfg +++ b/resources/quality/eryone_er20/eryone_er20_draft.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Draft definition = eryone_er20 +name = Draft +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] acceleration_print = 1500 @@ -16,3 +16,4 @@ layer_height = 0.3 layer_height_0 = 0.3 speed_print = 80 speed_support = 60 + diff --git a/resources/quality/eryone_er20/eryone_er20_high.inst.cfg b/resources/quality/eryone_er20/eryone_er20_high.inst.cfg index e8b8fb09e0..d9f1eca336 100644 --- a/resources/quality/eryone_er20/eryone_er20_high.inst.cfg +++ b/resources/quality/eryone_er20/eryone_er20_high.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = High definition = eryone_er20 +name = High +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -global_quality = True [values] acceleration_print = 500 @@ -16,3 +16,4 @@ layer_height = 0.15 layer_height_0 = 0.2 speed_print = 50 speed_support = 30 + diff --git a/resources/quality/eryone_er20/eryone_er20_normal.inst.cfg b/resources/quality/eryone_er20/eryone_er20_normal.inst.cfg index 89a8af5b8c..d8218f6da9 100644 --- a/resources/quality/eryone_er20/eryone_er20_normal.inst.cfg +++ b/resources/quality/eryone_er20/eryone_er20_normal.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Normal definition = eryone_er20 +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] acceleration_print = 1000 @@ -16,3 +16,4 @@ layer_height = 0.2 layer_height_0 = 0.2 speed_print = 50 speed_support = 30 + diff --git a/resources/quality/eryone_thinker/eryone_thinker_extra_fast.inst.cfg b/resources/quality/eryone_thinker/eryone_thinker_extra_fast.inst.cfg index 4b2e7d29fc..ccb651d98a 100644 --- a/resources/quality/eryone_thinker/eryone_thinker_extra_fast.inst.cfg +++ b/resources/quality/eryone_thinker/eryone_thinker_extra_fast.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Extra Fast definition = eryone_thinker +name = Extra Fast +version = 4 [metadata] +global_quality = True +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft weight = -3 -global_quality = True [values] acceleration_print = 1500 acceleration_travel = 3000 +bottom_layers = 2 infill_sparse_density = 10 initial_layer_line_width_factor = 100.0 layer_height = 0.3 skirt_brim_speed = =math.ceil(speed_print * 40 / 50) -speed_print = 100.0 speed_infill = =math.ceil(speed_print * 60 / 50) +speed_layer_0 = =math.ceil(speed_print * 40 / 50) +speed_print = 100.0 speed_topbottom = =math.ceil(speed_print * 40 / 50) speed_travel = =speed_print if magic_spiralize else 150 -speed_layer_0 = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_print * 40 / 50) speed_wall_x = =math.ceil(speed_print * 60 / 50) top_layers = 4 -bottom_layers = 2 wall_line_count = 2 + diff --git a/resources/quality/eryone_thinker/eryone_thinker_fast.inst.cfg b/resources/quality/eryone_thinker/eryone_thinker_fast.inst.cfg index b9912cd7a0..e9ea37e539 100644 --- a/resources/quality/eryone_thinker/eryone_thinker_fast.inst.cfg +++ b/resources/quality/eryone_thinker/eryone_thinker_fast.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Fast definition = eryone_thinker +name = Fast +version = 4 [metadata] +global_quality = True +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -1 -global_quality = True [values] acceleration_print = 1500 acceleration_travel = 3000 +bottom_layers = 3 infill_sparse_density = 15 initial_layer_line_width_factor = 110.0 layer_height = 0.25 @@ -21,5 +22,5 @@ speed_topbottom = =math.ceil(speed_print * 40 / 60) speed_travel = =speed_print if magic_spiralize else 150 speed_wall_x = =math.ceil(speed_print * 80 / 60) top_layers = 5 -bottom_layers = 3 -wall_line_count = 2 \ No newline at end of file +wall_line_count = 2 + diff --git a/resources/quality/eryone_thinker/eryone_thinker_fine.inst.cfg b/resources/quality/eryone_thinker/eryone_thinker_fine.inst.cfg index 858e107bbb..9b732e0b1b 100644 --- a/resources/quality/eryone_thinker/eryone_thinker_fine.inst.cfg +++ b/resources/quality/eryone_thinker/eryone_thinker_fine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Fine definition = eryone_thinker +name = Fine +version = 4 [metadata] +global_quality = True +quality_type = fine setting_version = 20 type = quality -quality_type = fine weight = 2 -global_quality = True [values] alternate_extra_perimeter = true +bottom_layers = 8 infill_sparse_density = 30 initial_layer_line_width_factor = 130.0 layer_height = 0.1 @@ -19,4 +20,4 @@ speed_print = 40.0 speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_travel = =speed_print if magic_spiralize else 100 top_layers = 12 -bottom_layers = 8 + diff --git a/resources/quality/eryone_thinker/eryone_thinker_high.inst.cfg b/resources/quality/eryone_thinker/eryone_thinker_high.inst.cfg index 481bb42eaa..a762a91782 100644 --- a/resources/quality/eryone_thinker/eryone_thinker_high.inst.cfg +++ b/resources/quality/eryone_thinker/eryone_thinker_high.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = High definition = eryone_thinker +name = High +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -global_quality = True [values] alternate_extra_perimeter = true +bottom_layers = 6 infill_sparse_density = 25 initial_layer_line_width_factor = 125.0 layer_height = 0.15 @@ -19,4 +20,4 @@ speed_print = 50.0 speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_travel = =speed_print if magic_spiralize else 100 top_layers = 8 -bottom_layers = 6 + diff --git a/resources/quality/eryone_thinker/eryone_thinker_normal.inst.cfg b/resources/quality/eryone_thinker/eryone_thinker_normal.inst.cfg index 48c787bc3b..9458fe1191 100644 --- a/resources/quality/eryone_thinker/eryone_thinker_normal.inst.cfg +++ b/resources/quality/eryone_thinker/eryone_thinker_normal.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Normal definition = eryone_thinker +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] + diff --git a/resources/quality/extra_coarse.inst.cfg b/resources/quality/extra_coarse.inst.cfg index 0f08ddaaef..d6fd2e3aac 100644 --- a/resources/quality/extra_coarse.inst.cfg +++ b/resources/quality/extra_coarse.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Extra Coarse definition = fdmprinter +name = Extra Coarse +version = 4 [metadata] +global_quality = True +quality_type = extra coarse setting_version = 20 type = quality -quality_type = extra coarse weight = -4 -global_quality = True [values] layer_height = 0.6 + diff --git a/resources/quality/extra_fast.inst.cfg b/resources/quality/extra_fast.inst.cfg index 70571c423f..bcb25fcc21 100644 --- a/resources/quality/extra_fast.inst.cfg +++ b/resources/quality/extra_fast.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Extra Fast definition = fdmprinter +name = Extra Fast +version = 4 [metadata] +global_quality = True +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft weight = -3 -global_quality = True [values] layer_height = 0.3 + diff --git a/resources/quality/fabtotum/fabtotum_abs_fast.inst.cfg b/resources/quality/fabtotum/fabtotum_abs_fast.inst.cfg index 641a52be30..3ffb636307 100644 --- a/resources/quality/fabtotum/fabtotum_abs_fast.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_abs_fast.inst.cfg @@ -1,19 +1,18 @@ [general] -version = 4 definition = fabtotum name = Fast Quality +version = 4 [metadata] +material = generic_abs +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_abs variant = Lite 0.4 mm +weight = -1 [values] adhesion_type = raft -speed_print = 80 cool_fan_enabled = False cool_fan_full_at_height = 0.4 cool_fan_speed = 50 @@ -21,3 +20,5 @@ cool_fan_speed_max = 50 cool_fan_speed_min = 50 cool_min_layer_time = 3 cool_min_speed = 20 +speed_print = 80 + diff --git a/resources/quality/fabtotum/fabtotum_abs_high.inst.cfg b/resources/quality/fabtotum/fabtotum_abs_high.inst.cfg index a4e802f37a..d66a613ef1 100644 --- a/resources/quality/fabtotum/fabtotum_abs_high.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_abs_high.inst.cfg @@ -1,19 +1,18 @@ [general] -version = 4 definition = fabtotum name = High Quality +version = 4 [metadata] +material = generic_abs +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_abs variant = Lite 0.4 mm +weight = 1 [values] adhesion_type = raft -speed_print = 45 cool_fan_enabled = False cool_fan_full_at_height = 0.2 cool_fan_speed = 50 @@ -21,3 +20,5 @@ cool_fan_speed_max = 50 cool_fan_speed_min = 50 cool_min_layer_time = 3 cool_min_speed = 20 +speed_print = 45 + diff --git a/resources/quality/fabtotum/fabtotum_abs_normal.inst.cfg b/resources/quality/fabtotum/fabtotum_abs_normal.inst.cfg index 99f8ec4e56..8d5b058b19 100644 --- a/resources/quality/fabtotum/fabtotum_abs_normal.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_abs_normal.inst.cfg @@ -1,19 +1,18 @@ [general] -version = 4 definition = fabtotum name = Normal Quality +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_abs variant = Lite 0.4 mm +weight = 0 [values] adhesion_type = raft -speed_print = 60 cool_fan_enabled = False cool_fan_full_at_height = 0.3 cool_fan_speed = 50 @@ -21,3 +20,5 @@ cool_fan_speed_max = 50 cool_fan_speed_min = 50 cool_min_layer_time = 3 cool_min_speed = 20 +speed_print = 60 + diff --git a/resources/quality/fabtotum/fabtotum_nylon_fast.inst.cfg b/resources/quality/fabtotum/fabtotum_nylon_fast.inst.cfg index 9a61677c9d..0d05219ad3 100644 --- a/resources/quality/fabtotum/fabtotum_nylon_fast.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_nylon_fast.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast Quality definition = fabtotum +name = Fast Quality +version = 4 [metadata] +material = generic_nylon +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_nylon variant = Lite 0.4 mm +weight = -1 [values] adhesion_type = raft @@ -26,9 +26,9 @@ infill_sparse_density = 24 line_width = =machine_nozzle_size material_flow = 100 raft_airgap = 0.22 -raft_base_line_width= =line_width * 2 +raft_base_line_width = =line_width * 2 raft_base_thickness = =layer_height_0 * 2 -raft_interface_line_width = =line_width +raft_interface_line_width = =line_width raft_interface_thickness = =layer_height raft_margin = 5 raft_surface_layers = 2 @@ -54,3 +54,4 @@ support_z_distance = 0.15 top_bottom_thickness = 0.8 wall_thickness = 0.8 z_seam_type = random + diff --git a/resources/quality/fabtotum/fabtotum_nylon_high.inst.cfg b/resources/quality/fabtotum/fabtotum_nylon_high.inst.cfg index 1d1eedf3f4..8e296134e9 100644 --- a/resources/quality/fabtotum/fabtotum_nylon_high.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_nylon_high.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = High Quality definition = fabtotum +name = High Quality +version = 4 [metadata] +material = generic_nylon +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_nylon variant = Lite 0.4 mm +weight = 1 [values] adhesion_type = raft @@ -26,9 +26,9 @@ infill_sparse_density = 24 line_width = =machine_nozzle_size material_flow = 100 raft_airgap = 0.22 -raft_base_line_width= =line_width * 2 +raft_base_line_width = =line_width * 2 raft_base_thickness = =layer_height_0 * 2 -raft_interface_line_width = =line_width +raft_interface_line_width = =line_width raft_interface_thickness = =layer_height raft_margin = 5 raft_surface_layers = 2 @@ -54,3 +54,4 @@ support_z_distance = 0.15 top_bottom_thickness = 0.8 wall_thickness = 0.8 z_seam_type = random + diff --git a/resources/quality/fabtotum/fabtotum_nylon_normal.inst.cfg b/resources/quality/fabtotum/fabtotum_nylon_normal.inst.cfg index 4920f1750f..5f1dc62c1b 100644 --- a/resources/quality/fabtotum/fabtotum_nylon_normal.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_nylon_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal Quality definition = fabtotum +name = Normal Quality +version = 4 [metadata] +material = generic_nylon +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_nylon variant = Lite 0.4 mm +weight = 0 [values] adhesion_type = raft @@ -26,9 +26,9 @@ infill_sparse_density = 24 line_width = =machine_nozzle_size material_flow = 100 raft_airgap = 0.22 -raft_base_line_width= =line_width * 2 +raft_base_line_width = =line_width * 2 raft_base_thickness = =layer_height_0 * 2 -raft_interface_line_width = =line_width +raft_interface_line_width = =line_width raft_interface_thickness = =layer_height raft_margin = 5 raft_surface_layers = 2 @@ -54,3 +54,4 @@ support_z_distance = 0.15 top_bottom_thickness = 0.8 wall_thickness = 0.8 z_seam_type = random + diff --git a/resources/quality/fabtotum/fabtotum_pla_fast.inst.cfg b/resources/quality/fabtotum/fabtotum_pla_fast.inst.cfg index 5247ca4719..b3565dd8ac 100644 --- a/resources/quality/fabtotum/fabtotum_pla_fast.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_pla_fast.inst.cfg @@ -1,19 +1,18 @@ [general] -version = 4 definition = fabtotum name = Fast Quality +version = 4 [metadata] +material = generic_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_pla variant = Lite 0.4 mm +weight = -1 [values] adhesion_type = skirt -speed_print = 80 cool_fan_enabled = True cool_fan_full_at_height = 0.4 cool_fan_speed = 100 @@ -21,3 +20,5 @@ cool_fan_speed_max = 100 cool_fan_speed_min = 100 cool_min_layer_time = 5 cool_min_speed = 20 +speed_print = 80 + diff --git a/resources/quality/fabtotum/fabtotum_pla_high.inst.cfg b/resources/quality/fabtotum/fabtotum_pla_high.inst.cfg index 20a2340870..d6032ac5eb 100644 --- a/resources/quality/fabtotum/fabtotum_pla_high.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_pla_high.inst.cfg @@ -1,19 +1,18 @@ [general] -version = 4 definition = fabtotum name = High Quality +version = 4 [metadata] +material = generic_pla +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pla variant = Lite 0.4 mm +weight = 1 [values] adhesion_type = skirt -speed_print = 45 cool_fan_enabled = True cool_fan_full_at_height = 0.2 cool_fan_speed = 100 @@ -21,3 +20,5 @@ cool_fan_speed_max = 100 cool_fan_speed_min = 100 cool_min_layer_time = 5 cool_min_speed = 20 +speed_print = 45 + diff --git a/resources/quality/fabtotum/fabtotum_pla_normal.inst.cfg b/resources/quality/fabtotum/fabtotum_pla_normal.inst.cfg index ea267e88ac..49bc29f08e 100644 --- a/resources/quality/fabtotum/fabtotum_pla_normal.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_pla_normal.inst.cfg @@ -1,19 +1,18 @@ [general] -version = 4 definition = fabtotum name = Normal Quality +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pla variant = Lite 0.4 mm +weight = 0 [values] adhesion_type = skirt -speed_print = 60 cool_fan_enabled = True cool_fan_full_at_height = 0.3 cool_fan_speed = 100 @@ -21,3 +20,5 @@ cool_fan_speed_max = 100 cool_fan_speed_min = 100 cool_min_layer_time = 5 cool_min_speed = 20 +speed_print = 60 + diff --git a/resources/quality/fabtotum/fabtotum_tpu_fast.inst.cfg b/resources/quality/fabtotum/fabtotum_tpu_fast.inst.cfg index ddad87e2d1..4f74669511 100644 --- a/resources/quality/fabtotum/fabtotum_tpu_fast.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_tpu_fast.inst.cfg @@ -1,19 +1,18 @@ [general] -version = 4 definition = fabtotum name = Fast Quality +version = 4 [metadata] -type = quality -setting_version = 20 material = generic_tpu -variant = Lite 0.4 mm quality_type = fast +setting_version = 20 +type = quality +variant = Lite 0.4 mm weight = -1 [values] adhesion_type = skirt -speed_print = 80 cool_fan_enabled = True cool_fan_full_at_height = 0.4 cool_fan_speed = 100 @@ -21,4 +20,5 @@ cool_fan_speed_max = 100 cool_fan_speed_min = 100 cool_min_layer_time = 5 cool_min_speed = 20 +speed_print = 80 diff --git a/resources/quality/fabtotum/fabtotum_tpu_high.inst.cfg b/resources/quality/fabtotum/fabtotum_tpu_high.inst.cfg index 5db8f1172e..049f78f641 100644 --- a/resources/quality/fabtotum/fabtotum_tpu_high.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_tpu_high.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 definition = fabtotum name = High Quality +version = 4 [metadata] -type = quality -setting_version = 20 material = generic_tpu -variant = Lite 0.4 mm quality_type = high +setting_version = 20 +type = quality +variant = Lite 0.4 mm weight = 1 [values] diff --git a/resources/quality/fabtotum/fabtotum_tpu_normal.inst.cfg b/resources/quality/fabtotum/fabtotum_tpu_normal.inst.cfg index 3f09c8ea16..38b1d06256 100644 --- a/resources/quality/fabtotum/fabtotum_tpu_normal.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_tpu_normal.inst.cfg @@ -1,19 +1,18 @@ [general] -version = 4 definition = fabtotum name = Normal Quality +version = 4 [metadata] -type = quality -setting_version = 20 material = generic_tpu -variant = Lite 0.4 mm quality_type = normal +setting_version = 20 +type = quality +variant = Lite 0.4 mm weight = 0 [values] adhesion_type = skirt -speed_print = 80 cool_fan_enabled = True cool_fan_full_at_height = 0.3 cool_fan_speed = 100 @@ -21,4 +20,5 @@ cool_fan_speed_max = 100 cool_fan_speed_min = 100 cool_min_layer_time = 5 cool_min_speed = 20 +speed_print = 80 diff --git a/resources/quality/fabxpro/fabxpro_abs_draft.inst.cfg b/resources/quality/fabxpro/fabxpro_abs_draft.inst.cfg index cf71e68d00..9cd8bc1da8 100644 --- a/resources/quality/fabxpro/fabxpro_abs_draft.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_abs_draft.inst.cfg @@ -1,35 +1,36 @@ [general] -version = 4 -name = Draft definition = fabxpro +name = Draft +version = 4 [metadata] +global_quality = True +material = redd_abs +quality_type = Draft setting_version = 20 type = quality -quality_type = Draft weight = -2 -material = redd_abs -global_quality = True [values] +adhesion_type = raft +cool_fan_enabled = False +infill_before_walls = False +initial_layer_line_width_factor = 150 layer_height = 0.3 layer_height_0 = 0.35 -initial_layer_line_width_factor = 150 -infill_before_walls = False -speed_print = 55 -speed_travel = 70 +raft_airgap = 0.35 +raft_base_thickness = 0.6 +raft_margin = 5 +raft_surface_layers = 1 +raft_surface_line_spacing = 0.6 +raft_surface_thickness = 0.1 retraction_amount = 1 retraction_speed = 40 -adhesion_type = raft -raft_margin = 5 -raft_airgap = 0.35 -raft_surface_layers = 1 -raft_surface_thickness = 0.1 -raft_surface_line_spacing = 0.6 -raft_base_thickness = 0.6 -cool_fan_enabled = False +speed_print = 55 +speed_travel = 70 support_enable = True -support_pattern = lines support_infill_rate = 15 -support_z_distance = 0.15 +support_pattern = lines support_xy_distance = 0.85 +support_z_distance = 0.15 + diff --git a/resources/quality/fabxpro/fabxpro_abs_fine.inst.cfg b/resources/quality/fabxpro/fabxpro_abs_fine.inst.cfg index 230656ba2b..d42648cf35 100644 --- a/resources/quality/fabxpro/fabxpro_abs_fine.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_abs_fine.inst.cfg @@ -1,35 +1,36 @@ [general] -version = 4 -name = Fine definition = fabxpro +name = Fine +version = 4 [metadata] +global_quality = True +material = redd_abs +quality_type = Fine setting_version = 20 type = quality -quality_type = Fine weight = -2 -material = redd_abs -global_quality = True [values] +adhesion_type = raft +cool_fan_enabled = False +infill_before_walls = False +initial_layer_line_width_factor = 150 layer_height = 0.1 layer_height_0 = 0.15 -initial_layer_line_width_factor = 150 -infill_before_walls = False -speed_print = 55 -speed_travel = 70 +raft_airgap = 0.35 +raft_base_thickness = 0.6 +raft_margin = 5 +raft_surface_layers = 1 +raft_surface_line_spacing = 0.6 +raft_surface_thickness = 0.1 retraction_amount = 1 retraction_speed = 40 -adhesion_type = raft -raft_margin = 5 -raft_airgap = 0.35 -raft_surface_layers = 1 -raft_surface_thickness = 0.1 -raft_surface_line_spacing = 0.6 -raft_base_thickness = 0.6 -cool_fan_enabled = False +speed_print = 55 +speed_travel = 70 support_enable = True -support_pattern = lines support_infill_rate = 15 -support_z_distance = 0.15 +support_pattern = lines support_xy_distance = 0.85 +support_z_distance = 0.15 + diff --git a/resources/quality/fabxpro/fabxpro_abs_normal.inst.cfg b/resources/quality/fabxpro/fabxpro_abs_normal.inst.cfg index ecb065f17d..747d982d50 100644 --- a/resources/quality/fabxpro/fabxpro_abs_normal.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_abs_normal.inst.cfg @@ -1,35 +1,36 @@ [general] -version = 4 -name = Normal definition = fabxpro +name = Normal +version = 4 [metadata] +global_quality = True +material = redd_abs +quality_type = Normal setting_version = 20 type = quality -quality_type = Normal weight = -2 -material = redd_abs -global_quality = True [values] +adhesion_type = raft +cool_fan_enabled = False +infill_before_walls = False +initial_layer_line_width_factor = 150 layer_height = 0.2 layer_height_0 = 0.3 -initial_layer_line_width_factor = 150 -infill_before_walls = False -speed_print = 55 -speed_travel = 70 +raft_airgap = 0.35 +raft_base_thickness = 0.6 +raft_margin = 5 +raft_surface_layers = 1 +raft_surface_line_spacing = 0.6 +raft_surface_thickness = 0.1 retraction_amount = 1 retraction_speed = 40 -adhesion_type = raft -raft_margin = 5 -raft_airgap = 0.35 -raft_surface_layers = 1 -raft_surface_thickness = 0.1 -raft_surface_line_spacing = 0.6 -raft_base_thickness = 0.6 -cool_fan_enabled = False +speed_print = 55 +speed_travel = 70 support_enable = True -support_pattern = lines support_infill_rate = 15 -support_z_distance = 0.15 +support_pattern = lines support_xy_distance = 0.85 +support_z_distance = 0.15 + diff --git a/resources/quality/fabxpro/fabxpro_asa_draft.inst.cfg b/resources/quality/fabxpro/fabxpro_asa_draft.inst.cfg index 501d0ba59b..ffa467c21e 100644 --- a/resources/quality/fabxpro/fabxpro_asa_draft.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_asa_draft.inst.cfg @@ -1,36 +1,36 @@ [general] -version = 4 -name = Draft definition = fabxpro +name = Draft +version = 4 [metadata] +global_quality = True +material = redd_asa +quality_type = Draft setting_version = 20 type = quality -quality_type = Draft weight = -2 -material = redd_asa -global_quality = True - [values] +adhesion_type = raft +cool_fan_enabled = False +infill_before_walls = False +initial_layer_line_width_factor = 150 layer_height = 0.3 layer_height_0 = 0.35 -initial_layer_line_width_factor = 150 -infill_before_walls = False -speed_print = 55 -speed_travel = 70 +raft_airgap = 0.35 +raft_base_thickness = 0.6 +raft_margin = 5 +raft_surface_layers = 1 +raft_surface_line_spacing = 0.6 +raft_surface_thickness = 0.1 retraction_amount = 1 retraction_speed = 40 -adhesion_type = raft -raft_margin = 5 -raft_airgap = 0.35 -raft_surface_layers = 1 -raft_surface_thickness = 0.1 -raft_surface_line_spacing = 0.6 -raft_base_thickness = 0.6 -cool_fan_enabled = False +speed_print = 55 +speed_travel = 70 support_enable = True -support_pattern = lines support_infill_rate = 15 -support_z_distance = 0.15 +support_pattern = lines support_xy_distance = 0.85 +support_z_distance = 0.15 + diff --git a/resources/quality/fabxpro/fabxpro_asa_fine.inst.cfg b/resources/quality/fabxpro/fabxpro_asa_fine.inst.cfg index 446d0c3a92..134085a259 100644 --- a/resources/quality/fabxpro/fabxpro_asa_fine.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_asa_fine.inst.cfg @@ -1,36 +1,36 @@ [general] -version = 4 -name = Fine definition = fabxpro +name = Fine +version = 4 [metadata] +global_quality = True +material = redd_asa +quality_type = Fine setting_version = 20 type = quality -quality_type = Fine weight = -2 -material = redd_asa -global_quality = True [values] +adhesion_type = raft +cool_fan_enabled = False +infill_before_walls = False +initial_layer_line_width_factor = 150 layer_height = 0.1 layer_height_0 = 0.15 -initial_layer_line_width_factor = 150 -infill_before_walls = False -speed_print = 55 -speed_travel = 70 +raft_airgap = 0.35 +raft_base_thickness = 0.6 +raft_margin = 5 +raft_surface_layers = 1 +raft_surface_line_spacing = 0.6 +raft_surface_thickness = 0.1 retraction_amount = 1 retraction_speed = 40 -adhesion_type = raft -raft_margin = 5 -raft_airgap = 0.35 -raft_surface_layers = 1 -raft_surface_thickness = 0.1 -raft_surface_line_spacing = 0.6 -raft_base_thickness = 0.6 -cool_fan_enabled = False +speed_print = 55 +speed_travel = 70 support_enable = True -support_pattern = lines support_infill_rate = 15 -support_z_distance = 0.15 +support_pattern = lines support_xy_distance = 0.85 +support_z_distance = 0.15 diff --git a/resources/quality/fabxpro/fabxpro_asa_normal.inst.cfg b/resources/quality/fabxpro/fabxpro_asa_normal.inst.cfg index eab648ad18..742fc1fcc5 100644 --- a/resources/quality/fabxpro/fabxpro_asa_normal.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_asa_normal.inst.cfg @@ -1,35 +1,36 @@ [general] -version = 4 -name = Normal definition = fabxpro +name = Normal +version = 4 [metadata] +global_quality = True +material = redd_asa +quality_type = Normal setting_version = 20 type = quality -quality_type = Normal weight = -2 -material = redd_asa -global_quality = True [values] +adhesion_type = raft +cool_fan_enabled = False +infill_before_walls = False +initial_layer_line_width_factor = 150 layer_height = 0.2 layer_height_0 = 0.3 -initial_layer_line_width_factor = 150 -infill_before_walls = False -speed_print = 55 -speed_travel = 70 +raft_airgap = 0.35 +raft_base_thickness = 0.6 +raft_margin = 5 +raft_surface_layers = 1 +raft_surface_line_spacing = 0.6 +raft_surface_thickness = 0.1 retraction_amount = 1 retraction_speed = 40 -adhesion_type = raft -raft_margin = 5 -raft_airgap = 0.35 -raft_surface_layers = 1 -raft_surface_thickness = 0.1 -raft_surface_line_spacing = 0.6 -raft_base_thickness = 0.6 -cool_fan_enabled = False +speed_print = 55 +speed_travel = 70 support_enable = True -support_pattern = lines support_infill_rate = 15 +support_pattern = lines +support_xy_distance = 0.85 support_z_distance = 0.15 -support_xy_distance = 0.85 \ No newline at end of file + diff --git a/resources/quality/fabxpro/fabxpro_hips_draft.inst.cfg b/resources/quality/fabxpro/fabxpro_hips_draft.inst.cfg index 1e559075aa..e6edb8fcd8 100644 --- a/resources/quality/fabxpro/fabxpro_hips_draft.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_hips_draft.inst.cfg @@ -1,36 +1,36 @@ [general] -version = 4 -name = Draft definition = fabxpro +name = Draft +version = 4 [metadata] +global_quality = True +material = redd_hips +quality_type = Draft setting_version = 20 type = quality -quality_type = Draft weight = -2 -material = redd_hips -global_quality = True - [values] +adhesion_type = raft +cool_fan_enabled = False +infill_before_walls = False +initial_layer_line_width_factor = 150 layer_height = 0.3 layer_height_0 = 0.35 -initial_layer_line_width_factor = 150 -infill_before_walls = False -speed_print = 55 -speed_travel = 70 +raft_airgap = 0.35 +raft_base_thickness = 0.6 +raft_margin = 5 +raft_surface_layers = 1 +raft_surface_line_spacing = 0.6 +raft_surface_thickness = 0.1 retraction_amount = 1 retraction_speed = 40 -adhesion_type = raft -raft_margin = 5 -raft_airgap = 0.35 -raft_surface_layers = 1 -raft_surface_thickness = 0.1 -raft_surface_line_spacing = 0.6 -raft_base_thickness = 0.6 -cool_fan_enabled = False +speed_print = 55 +speed_travel = 70 support_enable = True -support_pattern = lines support_infill_rate = 15 -support_z_distance = 0.15 +support_pattern = lines support_xy_distance = 0.85 +support_z_distance = 0.15 + diff --git a/resources/quality/fabxpro/fabxpro_hips_fine.inst.cfg b/resources/quality/fabxpro/fabxpro_hips_fine.inst.cfg index 4939b47787..81105b7a2c 100644 --- a/resources/quality/fabxpro/fabxpro_hips_fine.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_hips_fine.inst.cfg @@ -1,36 +1,36 @@ [general] -version = 4 -name = Fine definition = fabxpro +name = Fine +version = 4 [metadata] +global_quality = True +material = redd_hips +quality_type = Fine setting_version = 20 type = quality -quality_type = Fine weight = -2 -material = redd_hips -global_quality = True [values] +adhesion_type = raft +cool_fan_enabled = False +infill_before_walls = False +initial_layer_line_width_factor = 150 layer_height = 0.1 layer_height_0 = 0.15 -initial_layer_line_width_factor = 150 -infill_before_walls = False -speed_print = 55 -speed_travel = 70 +raft_airgap = 0.35 +raft_base_thickness = 0.6 +raft_margin = 5 +raft_surface_layers = 1 +raft_surface_line_spacing = 0.6 +raft_surface_thickness = 0.1 retraction_amount = 1 retraction_speed = 40 -adhesion_type = raft -raft_margin = 5 -raft_airgap = 0.35 -raft_surface_layers = 1 -raft_surface_thickness = 0.1 -raft_surface_line_spacing = 0.6 -raft_base_thickness = 0.6 -cool_fan_enabled = False +speed_print = 55 +speed_travel = 70 support_enable = True -support_pattern = lines support_infill_rate = 15 -support_z_distance = 0.15 +support_pattern = lines support_xy_distance = 0.85 +support_z_distance = 0.15 diff --git a/resources/quality/fabxpro/fabxpro_hips_normal.inst.cfg b/resources/quality/fabxpro/fabxpro_hips_normal.inst.cfg index ecf4b049bf..8aaf19d2e8 100644 --- a/resources/quality/fabxpro/fabxpro_hips_normal.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_hips_normal.inst.cfg @@ -1,35 +1,36 @@ [general] -version = 4 -name = Normal definition = fabxpro +name = Normal +version = 4 [metadata] +global_quality = True +material = redd_hips +quality_type = Normal setting_version = 20 type = quality -quality_type = Normal weight = -2 -material = redd_hips -global_quality = True [values] +adhesion_type = raft +cool_fan_enabled = False +infill_before_walls = False +initial_layer_line_width_factor = 150 layer_height = 0.2 layer_height_0 = 0.3 -initial_layer_line_width_factor = 150 -infill_before_walls = False -speed_print = 55 -speed_travel = 70 +raft_airgap = 0.35 +raft_base_thickness = 0.6 +raft_margin = 5 +raft_surface_layers = 1 +raft_surface_line_spacing = 0.6 +raft_surface_thickness = 0.1 retraction_amount = 1 retraction_speed = 40 -adhesion_type = raft -raft_margin = 5 -raft_airgap = 0.35 -raft_surface_layers = 1 -raft_surface_thickness = 0.1 -raft_surface_line_spacing = 0.6 -raft_base_thickness = 0.6 -cool_fan_enabled = False +speed_print = 55 +speed_travel = 70 support_enable = True -support_pattern = lines support_infill_rate = 15 +support_pattern = lines +support_xy_distance = 0.85 support_z_distance = 0.15 -support_xy_distance = 0.85 \ No newline at end of file + diff --git a/resources/quality/fabxpro/fabxpro_nylon_draft.inst.cfg b/resources/quality/fabxpro/fabxpro_nylon_draft.inst.cfg index 0d2f425761..040c35b835 100644 --- a/resources/quality/fabxpro/fabxpro_nylon_draft.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_nylon_draft.inst.cfg @@ -1,36 +1,36 @@ [general] -version = 4 -name = Draft definition = fabxpro +name = Draft +version = 4 [metadata] +global_quality = True +material = redd_nylon +quality_type = Draft setting_version = 20 type = quality -quality_type = Draft weight = -2 -material = redd_nylon -global_quality = True - [values] +adhesion_type = raft +cool_fan_enabled = False +infill_before_walls = False +initial_layer_line_width_factor = 150 layer_height = 0.3 layer_height_0 = 0.35 -initial_layer_line_width_factor = 150 -infill_before_walls = False -speed_print = 55 -speed_travel = 70 +raft_airgap = 0.35 +raft_base_thickness = 0.6 +raft_margin = 5 +raft_surface_layers = 1 +raft_surface_line_spacing = 0.6 +raft_surface_thickness = 0.1 retraction_amount = 1 retraction_speed = 40 -adhesion_type = raft -raft_margin = 5 -raft_airgap = 0.35 -raft_surface_layers = 1 -raft_surface_thickness = 0.1 -raft_surface_line_spacing = 0.6 -raft_base_thickness = 0.6 -cool_fan_enabled = False +speed_print = 55 +speed_travel = 70 support_enable = True -support_pattern = lines support_infill_rate = 15 -support_z_distance = 0.15 +support_pattern = lines support_xy_distance = 0.85 +support_z_distance = 0.15 + diff --git a/resources/quality/fabxpro/fabxpro_nylon_fine.inst.cfg b/resources/quality/fabxpro/fabxpro_nylon_fine.inst.cfg index 2881c04058..f6353cda5d 100644 --- a/resources/quality/fabxpro/fabxpro_nylon_fine.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_nylon_fine.inst.cfg @@ -1,36 +1,36 @@ [general] -version = 4 -name = Fine definition = fabxpro +name = Fine +version = 4 [metadata] +global_quality = True +material = redd_nylon +quality_type = Fine setting_version = 20 type = quality -quality_type = Fine weight = -2 -material = redd_nylon -global_quality = True [values] +adhesion_type = raft +cool_fan_enabled = False +infill_before_walls = False +initial_layer_line_width_factor = 150 layer_height = 0.1 layer_height_0 = 0.15 -initial_layer_line_width_factor = 150 -infill_before_walls = False -speed_print = 55 -speed_travel = 70 +raft_airgap = 0.35 +raft_base_thickness = 0.6 +raft_margin = 5 +raft_surface_layers = 1 +raft_surface_line_spacing = 0.6 +raft_surface_thickness = 0.1 retraction_amount = 1 retraction_speed = 40 -adhesion_type = raft -raft_margin = 5 -raft_airgap = 0.35 -raft_surface_layers = 1 -raft_surface_thickness = 0.1 -raft_surface_line_spacing = 0.6 -raft_base_thickness = 0.6 -cool_fan_enabled = False +speed_print = 55 +speed_travel = 70 support_enable = True -support_pattern = lines support_infill_rate = 15 -support_z_distance = 0.15 +support_pattern = lines support_xy_distance = 0.85 +support_z_distance = 0.15 diff --git a/resources/quality/fabxpro/fabxpro_nylon_normal.inst.cfg b/resources/quality/fabxpro/fabxpro_nylon_normal.inst.cfg index 4a1cdda3fb..1bea56103e 100644 --- a/resources/quality/fabxpro/fabxpro_nylon_normal.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_nylon_normal.inst.cfg @@ -1,35 +1,36 @@ [general] -version = 4 -name = Normal definition = fabxpro +name = Normal +version = 4 [metadata] +global_quality = True +material = redd_nylon +quality_type = Normal setting_version = 20 type = quality -quality_type = Normal weight = -2 -material = redd_nylon -global_quality = True [values] +adhesion_type = raft +cool_fan_enabled = False +infill_before_walls = False +initial_layer_line_width_factor = 150 layer_height = 0.2 layer_height_0 = 0.3 -initial_layer_line_width_factor = 150 -infill_before_walls = False -speed_print = 55 -speed_travel = 70 +raft_airgap = 0.35 +raft_base_thickness = 0.6 +raft_margin = 5 +raft_surface_layers = 1 +raft_surface_line_spacing = 0.6 +raft_surface_thickness = 0.1 retraction_amount = 1 retraction_speed = 40 -adhesion_type = raft -raft_margin = 5 -raft_airgap = 0.35 -raft_surface_layers = 1 -raft_surface_thickness = 0.1 -raft_surface_line_spacing = 0.6 -raft_base_thickness = 0.6 -cool_fan_enabled = False +speed_print = 55 +speed_travel = 70 support_enable = True -support_pattern = lines support_infill_rate = 15 +support_pattern = lines +support_xy_distance = 0.85 support_z_distance = 0.15 -support_xy_distance = 0.85 \ No newline at end of file + diff --git a/resources/quality/fabxpro/fabxpro_petg_draft.inst.cfg b/resources/quality/fabxpro/fabxpro_petg_draft.inst.cfg index ca967aa81b..cf85a2cd40 100644 --- a/resources/quality/fabxpro/fabxpro_petg_draft.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_petg_draft.inst.cfg @@ -1,36 +1,36 @@ [general] -version = 4 -name = Draft definition = fabxpro +name = Draft +version = 4 [metadata] +global_quality = True +material = redd_petg +quality_type = Draft setting_version = 20 type = quality -quality_type = Draft weight = -2 -material = redd_petg -global_quality = True - [values] +adhesion_type = raft +cool_fan_enabled = False +infill_before_walls = False +initial_layer_line_width_factor = 150 layer_height = 0.3 layer_height_0 = 0.35 -initial_layer_line_width_factor = 150 -infill_before_walls = False -speed_print = 55 -speed_travel = 70 +raft_airgap = 0.35 +raft_base_thickness = 0.6 +raft_margin = 5 +raft_surface_layers = 1 +raft_surface_line_spacing = 0.6 +raft_surface_thickness = 0.1 retraction_amount = 1 retraction_speed = 40 -adhesion_type = raft -raft_margin = 5 -raft_airgap = 0.35 -raft_surface_layers = 1 -raft_surface_thickness = 0.1 -raft_surface_line_spacing = 0.6 -raft_base_thickness = 0.6 -cool_fan_enabled = False +speed_print = 55 +speed_travel = 70 support_enable = True -support_pattern = lines support_infill_rate = 15 -support_z_distance = 0.15 +support_pattern = lines support_xy_distance = 0.85 +support_z_distance = 0.15 + diff --git a/resources/quality/fabxpro/fabxpro_petg_fine.inst.cfg b/resources/quality/fabxpro/fabxpro_petg_fine.inst.cfg index feb1cad47d..de4cfad88c 100644 --- a/resources/quality/fabxpro/fabxpro_petg_fine.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_petg_fine.inst.cfg @@ -1,36 +1,36 @@ [general] -version = 4 -name = Fine definition = fabxpro +name = Fine +version = 4 [metadata] +global_quality = True +material = redd_petg +quality_type = Fine setting_version = 20 type = quality -quality_type = Fine weight = -2 -material = redd_petg -global_quality = True [values] +adhesion_type = raft +cool_fan_enabled = False +infill_before_walls = False +initial_layer_line_width_factor = 150 layer_height = 0.1 layer_height_0 = 0.15 -initial_layer_line_width_factor = 150 -infill_before_walls = False -speed_print = 55 -speed_travel = 70 +raft_airgap = 0.35 +raft_base_thickness = 0.6 +raft_margin = 5 +raft_surface_layers = 1 +raft_surface_line_spacing = 0.6 +raft_surface_thickness = 0.1 retraction_amount = 1 retraction_speed = 40 -adhesion_type = raft -raft_margin = 5 -raft_airgap = 0.35 -raft_surface_layers = 1 -raft_surface_thickness = 0.1 -raft_surface_line_spacing = 0.6 -raft_base_thickness = 0.6 -cool_fan_enabled = False +speed_print = 55 +speed_travel = 70 support_enable = True -support_pattern = lines support_infill_rate = 15 -support_z_distance = 0.15 +support_pattern = lines support_xy_distance = 0.85 +support_z_distance = 0.15 diff --git a/resources/quality/fabxpro/fabxpro_petg_normal.inst.cfg b/resources/quality/fabxpro/fabxpro_petg_normal.inst.cfg index 211549ed58..d3f39ba3ad 100644 --- a/resources/quality/fabxpro/fabxpro_petg_normal.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_petg_normal.inst.cfg @@ -1,35 +1,36 @@ [general] -version = 4 -name = Normal definition = fabxpro +name = Normal +version = 4 [metadata] +global_quality = True +material = redd_petg +quality_type = Normal setting_version = 20 type = quality -quality_type = Normal weight = -2 -material = redd_petg -global_quality = True [values] +adhesion_type = raft +cool_fan_enabled = False +infill_before_walls = False +initial_layer_line_width_factor = 150 layer_height = 0.2 layer_height_0 = 0.3 -initial_layer_line_width_factor = 150 -infill_before_walls = False -speed_print = 55 -speed_travel = 70 +raft_airgap = 0.35 +raft_base_thickness = 0.6 +raft_margin = 5 +raft_surface_layers = 1 +raft_surface_line_spacing = 0.6 +raft_surface_thickness = 0.1 retraction_amount = 1 retraction_speed = 40 -adhesion_type = raft -raft_margin = 5 -raft_airgap = 0.35 -raft_surface_layers = 1 -raft_surface_thickness = 0.1 -raft_surface_line_spacing = 0.6 -raft_base_thickness = 0.6 -cool_fan_enabled = False +speed_print = 55 +speed_travel = 70 support_enable = True -support_pattern = lines support_infill_rate = 15 +support_pattern = lines +support_xy_distance = 0.85 support_z_distance = 0.15 -support_xy_distance = 0.85 \ No newline at end of file + diff --git a/resources/quality/fabxpro/fabxpro_pla_draft.inst.cfg b/resources/quality/fabxpro/fabxpro_pla_draft.inst.cfg index ba168e0fb7..5fe07b875d 100644 --- a/resources/quality/fabxpro/fabxpro_pla_draft.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_pla_draft.inst.cfg @@ -1,31 +1,32 @@ [general] -version = 4 -name = Draft definition = fabxpro +name = Draft +version = 4 [metadata] +global_quality = True +material = redd_pla +quality_type = Draft setting_version = 20 type = quality -quality_type = Draft weight = -2 -material = redd_pla -global_quality = True [values] -layer_height = 0.3 -layer_height_0 = 0.35 -initial_layer_line_width_factor = 150 -infill_before_walls = False -speed_print = 55 -speed_travel = 70 -retraction_amount = 1 -retraction_speed = 40 adhesion_type = skirt cool_fan_enabled = true -cool_fan_speed = 100 cool_fan_full_at_height = 0.6 +cool_fan_speed = 100 +infill_before_walls = False +initial_layer_line_width_factor = 150 +layer_height = 0.3 +layer_height_0 = 0.35 +retraction_amount = 1 +retraction_speed = 40 +speed_print = 55 +speed_travel = 70 support_enable = True -support_pattern = lines support_infill_rate = 15 -support_z_distance = 0.15 +support_pattern = lines support_xy_distance = 0.85 +support_z_distance = 0.15 + diff --git a/resources/quality/fabxpro/fabxpro_pla_fine.inst.cfg b/resources/quality/fabxpro/fabxpro_pla_fine.inst.cfg index 6055def2b3..11d51f0a5f 100644 --- a/resources/quality/fabxpro/fabxpro_pla_fine.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_pla_fine.inst.cfg @@ -1,31 +1,32 @@ [general] -version = 4 -name = Fine definition = fabxpro +name = Fine +version = 4 [metadata] +global_quality = True +material = redd_pla +quality_type = Fine setting_version = 20 type = quality -quality_type = Fine weight = -2 -material = redd_pla -global_quality = True [values] -layer_height = 0.1 -layer_height_0 = 0.15 -initial_layer_line_width_factor = 150 -infill_before_walls = False -speed_print = 55 -speed_travel = 70 -retraction_amount = 1 -retraction_speed = 40 adhesion_type = skirt cool_fan_enabled = true -cool_fan_speed = 100 cool_fan_full_at_height = 0.6 +cool_fan_speed = 100 +infill_before_walls = False +initial_layer_line_width_factor = 150 +layer_height = 0.1 +layer_height_0 = 0.15 +retraction_amount = 1 +retraction_speed = 40 +speed_print = 55 +speed_travel = 70 support_enable = True -support_pattern = lines support_infill_rate = 15 -support_z_distance = 0.15 +support_pattern = lines support_xy_distance = 0.85 +support_z_distance = 0.15 + diff --git a/resources/quality/fabxpro/fabxpro_pla_normal.inst.cfg b/resources/quality/fabxpro/fabxpro_pla_normal.inst.cfg index 7542e0f623..a595a08a85 100644 --- a/resources/quality/fabxpro/fabxpro_pla_normal.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_pla_normal.inst.cfg @@ -1,31 +1,32 @@ [general] -version = 4 -name = Normal definition = fabxpro +name = Normal +version = 4 [metadata] +global_quality = True +material = redd_pla +quality_type = Normal setting_version = 20 type = quality -quality_type = Normal weight = -2 -material = redd_pla -global_quality = True [values] -layer_height = 0.2 -layer_height_0 = 0.3 -initial_layer_line_width_factor = 150 -infill_before_walls = False -speed_print = 55 -speed_travel = 70 -retraction_amount = 1 -retraction_speed = 40 adhesion_type = skirt cool_fan_enabled = true -cool_fan_speed = 100 cool_fan_full_at_height = 0.6 +cool_fan_speed = 100 +infill_before_walls = False +initial_layer_line_width_factor = 150 +layer_height = 0.2 +layer_height_0 = 0.3 +retraction_amount = 1 +retraction_speed = 40 +speed_print = 55 +speed_travel = 70 support_enable = True -support_pattern = lines support_infill_rate = 15 -support_z_distance = 0.15 +support_pattern = lines support_xy_distance = 0.85 +support_z_distance = 0.15 + diff --git a/resources/quality/fabxpro/fabxpro_tpe_draft.inst.cfg b/resources/quality/fabxpro/fabxpro_tpe_draft.inst.cfg index 2ee918bfb5..a06d8f64b3 100644 --- a/resources/quality/fabxpro/fabxpro_tpe_draft.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_tpe_draft.inst.cfg @@ -1,36 +1,36 @@ [general] -version = 4 -name = Draft definition = fabxpro +name = Draft +version = 4 [metadata] +global_quality = True +material = redd_tpe +quality_type = Draft setting_version = 20 type = quality -quality_type = Draft weight = -2 -material = redd_tpe -global_quality = True - [values] +adhesion_type = raft +cool_fan_enabled = False +infill_before_walls = False +initial_layer_line_width_factor = 150 layer_height = 0.3 layer_height_0 = 0.35 -initial_layer_line_width_factor = 150 -infill_before_walls = False -speed_print = 35 -speed_travel = 70 +raft_airgap = 0.35 +raft_base_thickness = 0.6 +raft_margin = 5 +raft_surface_layers = 1 +raft_surface_line_spacing = 0.6 +raft_surface_thickness = 0.1 retraction_amount = 1 retraction_speed = 40 -adhesion_type = raft -raft_margin = 5 -raft_airgap = 0.35 -raft_surface_layers = 1 -raft_surface_thickness = 0.1 -raft_surface_line_spacing = 0.6 -raft_base_thickness = 0.6 -cool_fan_enabled = False +speed_print = 35 +speed_travel = 70 support_enable = True -support_pattern = lines support_infill_rate = 15 -support_z_distance = 0.15 +support_pattern = lines support_xy_distance = 0.85 +support_z_distance = 0.15 + diff --git a/resources/quality/fabxpro/fabxpro_tpe_fine.inst.cfg b/resources/quality/fabxpro/fabxpro_tpe_fine.inst.cfg index 38a62e1a49..8dfeb66cc3 100644 --- a/resources/quality/fabxpro/fabxpro_tpe_fine.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_tpe_fine.inst.cfg @@ -1,36 +1,36 @@ [general] -version = 4 -name = Fine definition = fabxpro +name = Fine +version = 4 [metadata] +global_quality = True +material = redd_tpe +quality_type = Fine setting_version = 20 type = quality -quality_type = Fine weight = -2 -material = redd_tpe -global_quality = True [values] +adhesion_type = raft +cool_fan_enabled = False +infill_before_walls = False +initial_layer_line_width_factor = 150 layer_height = 0.1 layer_height_0 = 0.15 -initial_layer_line_width_factor = 150 -infill_before_walls = False -speed_print = 35 -speed_travel = 70 +raft_airgap = 0.35 +raft_base_thickness = 0.6 +raft_margin = 5 +raft_surface_layers = 1 +raft_surface_line_spacing = 0.6 +raft_surface_thickness = 0.1 retraction_amount = 1 retraction_speed = 40 -adhesion_type = raft -raft_margin = 5 -raft_airgap = 0.35 -raft_surface_layers = 1 -raft_surface_thickness = 0.1 -raft_surface_line_spacing = 0.6 -raft_base_thickness = 0.6 -cool_fan_enabled = False +speed_print = 35 +speed_travel = 70 support_enable = True -support_pattern = lines support_infill_rate = 15 -support_z_distance = 0.15 +support_pattern = lines support_xy_distance = 0.85 +support_z_distance = 0.15 diff --git a/resources/quality/fabxpro/fabxpro_tpe_normal.inst.cfg b/resources/quality/fabxpro/fabxpro_tpe_normal.inst.cfg index 56bd479f90..14fab36ec4 100644 --- a/resources/quality/fabxpro/fabxpro_tpe_normal.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_tpe_normal.inst.cfg @@ -1,35 +1,36 @@ [general] -version = 4 -name = Normal definition = fabxpro +name = Normal +version = 4 [metadata] +global_quality = True +material = redd_tpe +quality_type = Normal setting_version = 20 type = quality -quality_type = Normal weight = -2 -material = redd_tpe -global_quality = True [values] +adhesion_type = raft +cool_fan_enabled = False +infill_before_walls = False +initial_layer_line_width_factor = 150 layer_height = 0.2 layer_height_0 = 0.3 -initial_layer_line_width_factor = 150 -infill_before_walls = False -speed_print = 35 -speed_travel = 70 +raft_airgap = 0.35 +raft_base_thickness = 0.6 +raft_margin = 5 +raft_surface_layers = 1 +raft_surface_line_spacing = 0.6 +raft_surface_thickness = 0.1 retraction_amount = 1 retraction_speed = 40 -adhesion_type = raft -raft_margin = 5 -raft_airgap = 0.35 -raft_surface_layers = 1 -raft_surface_thickness = 0.1 -raft_surface_line_spacing = 0.6 -raft_base_thickness = 0.6 -cool_fan_enabled = False +speed_print = 35 +speed_travel = 70 support_enable = True -support_pattern = lines support_infill_rate = 15 +support_pattern = lines +support_xy_distance = 0.85 support_z_distance = 0.15 -support_xy_distance = 0.85 \ No newline at end of file + diff --git a/resources/quality/fast.inst.cfg b/resources/quality/fast.inst.cfg index 82394ae0ec..2bce9b7e40 100644 --- a/resources/quality/fast.inst.cfg +++ b/resources/quality/fast.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Normal definition = fdmprinter +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -1 -global_quality = True [values] +cool_min_layer_time = 3 infill_sparse_density = 10 layer_height = 0.15 -cool_min_layer_time = 3 -speed_wall_0 = =math.ceil(speed_print * 40 / 60) -speed_wall_x = =math.ceil(speed_print * 80 / 60) speed_infill = =math.ceil(speed_print * 100 / 60) speed_topbottom = =math.ceil(speed_print * 30 / 60) +speed_wall_0 = =math.ceil(speed_print * 40 / 60) +speed_wall_x = =math.ceil(speed_print * 80 / 60) + diff --git a/resources/quality/flashforge/abs/flashforge_0.20_abs_super.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.20_abs_super.inst.cfg index 9bb426a857..4a27cb4d01 100644 --- a/resources/quality/flashforge/abs/flashforge_0.20_abs_super.inst.cfg +++ b/resources/quality/flashforge/abs/flashforge_0.20_abs_super.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Super Quality definition = flashforge_base +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_abs variant = 0.2mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 30 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/abs/flashforge_0.20_abs_ultra.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.20_abs_ultra.inst.cfg index d530aa0e24..65c33e236e 100644 --- a/resources/quality/flashforge/abs/flashforge_0.20_abs_ultra.inst.cfg +++ b/resources/quality/flashforge/abs/flashforge_0.20_abs_ultra.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Ultra Quality definition = flashforge_base +name = Ultra Quality +version = 4 [metadata] +material = generic_abs +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra -material = generic_abs variant = 0.2mm Nozzle [values] @@ -20,4 +20,5 @@ material_print_temperature_layer_0 = 235 speed_infill = =speed_print speed_print = 30 speed_support = 30 -speed_travel = 100 \ No newline at end of file +speed_travel = 100 + diff --git a/resources/quality/flashforge/abs/flashforge_0.30_abs_adaptive.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.30_abs_adaptive.inst.cfg index af039899d9..d990273a2f 100644 --- a/resources/quality/flashforge/abs/flashforge_0.30_abs_adaptive.inst.cfg +++ b/resources/quality/flashforge/abs/flashforge_0.30_abs_adaptive.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Dynamic Quality definition = flashforge_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_abs +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_abs variant = 0.2mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 30 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/abs/flashforge_0.30_abs_standard.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.30_abs_standard.inst.cfg index 7398ceb8c8..747e274c28 100644 --- a/resources/quality/flashforge/abs/flashforge_0.30_abs_standard.inst.cfg +++ b/resources/quality/flashforge/abs/flashforge_0.30_abs_standard.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Standard Quality definition = flashforge_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_abs variant = 0.3mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 30 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/abs/flashforge_0.30_abs_super.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.30_abs_super.inst.cfg index a1c99c8e7c..69d8c7f3bf 100644 --- a/resources/quality/flashforge/abs/flashforge_0.30_abs_super.inst.cfg +++ b/resources/quality/flashforge/abs/flashforge_0.30_abs_super.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Super Quality definition = flashforge_base +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_abs variant = 0.3mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 30 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/abs/flashforge_0.40_abs_adaptive.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.40_abs_adaptive.inst.cfg index f4807e7544..3ca092efe9 100644 --- a/resources/quality/flashforge/abs/flashforge_0.40_abs_adaptive.inst.cfg +++ b/resources/quality/flashforge/abs/flashforge_0.40_abs_adaptive.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Dynamic Quality definition = flashforge_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_abs +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_abs variant = 0.4mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 30 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/abs/flashforge_0.40_abs_draft.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.40_abs_draft.inst.cfg index 0e9f51816a..76c0054fe2 100644 --- a/resources/quality/flashforge/abs/flashforge_0.40_abs_draft.inst.cfg +++ b/resources/quality/flashforge/abs/flashforge_0.40_abs_draft.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Draft Quality definition = flashforge_base +name = Draft Quality +version = 4 [metadata] +material = generic_abs +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_abs variant = 0.4mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 30 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/abs/flashforge_0.40_abs_low.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.40_abs_low.inst.cfg index 64f700962a..00814a8cf5 100644 --- a/resources/quality/flashforge/abs/flashforge_0.40_abs_low.inst.cfg +++ b/resources/quality/flashforge/abs/flashforge_0.40_abs_low.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Low Quality definition = flashforge_base +name = Low Quality +version = 4 [metadata] +material = generic_abs +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_abs variant = 0.4mm Nozzle [values] @@ -20,4 +20,5 @@ material_print_temperature_layer_0 = 235 speed_infill = =speed_print speed_print = 30 speed_support = 30 -speed_travel = 100 \ No newline at end of file +speed_travel = 100 + diff --git a/resources/quality/flashforge/abs/flashforge_0.40_abs_standard.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.40_abs_standard.inst.cfg index 04b92d72fd..480eb98c29 100644 --- a/resources/quality/flashforge/abs/flashforge_0.40_abs_standard.inst.cfg +++ b/resources/quality/flashforge/abs/flashforge_0.40_abs_standard.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Standard Quality definition = flashforge_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_abs variant = 0.4mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 30 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/abs/flashforge_0.40_abs_super.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.40_abs_super.inst.cfg index 2587735f72..54f47f9872 100644 --- a/resources/quality/flashforge/abs/flashforge_0.40_abs_super.inst.cfg +++ b/resources/quality/flashforge/abs/flashforge_0.40_abs_super.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Super Quality definition = flashforge_base +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_abs variant = 0.4mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 30 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/abs/flashforge_0.50_abs_adaptive.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.50_abs_adaptive.inst.cfg index 61bb2650c8..13cb578a88 100644 --- a/resources/quality/flashforge/abs/flashforge_0.50_abs_adaptive.inst.cfg +++ b/resources/quality/flashforge/abs/flashforge_0.50_abs_adaptive.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Dynamic Quality definition = flashforge_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_abs +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_abs variant = 0.5mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 30 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/abs/flashforge_0.50_abs_coarse.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.50_abs_coarse.inst.cfg index 83b10b2063..e50b1d0cf7 100644 --- a/resources/quality/flashforge/abs/flashforge_0.50_abs_coarse.inst.cfg +++ b/resources/quality/flashforge/abs/flashforge_0.50_abs_coarse.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Coarse Quality definition = flashforge_base +name = Coarse Quality +version = 4 [metadata] +material = generic_abs +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -material = generic_abs variant = 0.5mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 30 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/abs/flashforge_0.50_abs_draft.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.50_abs_draft.inst.cfg index 1e2d501398..99f5975a2b 100644 --- a/resources/quality/flashforge/abs/flashforge_0.50_abs_draft.inst.cfg +++ b/resources/quality/flashforge/abs/flashforge_0.50_abs_draft.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Draft Quality definition = flashforge_base +name = Draft Quality +version = 4 [metadata] +material = generic_abs +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_abs variant = 0.5mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 30 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/abs/flashforge_0.50_abs_low.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.50_abs_low.inst.cfg index ff64f36855..1a73c1366f 100644 --- a/resources/quality/flashforge/abs/flashforge_0.50_abs_low.inst.cfg +++ b/resources/quality/flashforge/abs/flashforge_0.50_abs_low.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Low Quality definition = flashforge_base +name = Low Quality +version = 4 [metadata] +material = generic_abs +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_abs variant = 0.5mm Nozzle [values] @@ -20,4 +20,5 @@ material_print_temperature_layer_0 = 235 speed_infill = =speed_print speed_print = 30 speed_support = 30 -speed_travel = 100 \ No newline at end of file +speed_travel = 100 + diff --git a/resources/quality/flashforge/abs/flashforge_0.50_abs_standard.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.50_abs_standard.inst.cfg index f85c4c5b1d..ff020055fd 100644 --- a/resources/quality/flashforge/abs/flashforge_0.50_abs_standard.inst.cfg +++ b/resources/quality/flashforge/abs/flashforge_0.50_abs_standard.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Standard Quality definition = flashforge_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_abs variant = 0.5mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 30 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/abs/flashforge_0.60_abs_coarse.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.60_abs_coarse.inst.cfg index c48065c478..8a0b1f03c7 100644 --- a/resources/quality/flashforge/abs/flashforge_0.60_abs_coarse.inst.cfg +++ b/resources/quality/flashforge/abs/flashforge_0.60_abs_coarse.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Coarse Quality definition = flashforge_base +name = Coarse Quality +version = 4 [metadata] +material = generic_abs +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -material = generic_abs variant = 0.6mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 30 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/abs/flashforge_0.60_abs_draft.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.60_abs_draft.inst.cfg index 7f4a96e822..b17343805c 100644 --- a/resources/quality/flashforge/abs/flashforge_0.60_abs_draft.inst.cfg +++ b/resources/quality/flashforge/abs/flashforge_0.60_abs_draft.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Draft Quality definition = flashforge_base +name = Draft Quality +version = 4 [metadata] +material = generic_abs +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_abs variant = 0.6mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 30 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/abs/flashforge_0.60_abs_extra_coarse.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.60_abs_extra_coarse.inst.cfg index 881fb22cd4..4467fcd4b8 100644 --- a/resources/quality/flashforge/abs/flashforge_0.60_abs_extra_coarse.inst.cfg +++ b/resources/quality/flashforge/abs/flashforge_0.60_abs_extra_coarse.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Coarse Quality definition = flashforge_base +name = Extra Coarse Quality +version = 4 [metadata] +material = generic_abs +quality_type = Xcoarse setting_version = 20 type = quality -quality_type = Xcoarse -material = generic_abs variant = 0.6mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 30 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/abs/flashforge_0.60_abs_standard.inst.cfg b/resources/quality/flashforge/abs/flashforge_0.60_abs_standard.inst.cfg index 251006534b..645475dbd2 100644 --- a/resources/quality/flashforge/abs/flashforge_0.60_abs_standard.inst.cfg +++ b/resources/quality/flashforge/abs/flashforge_0.60_abs_standard.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Standard Quality definition = flashforge_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_abs variant = 0.6mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 30 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/flashforge_global_0.08_ultra.inst.cfg b/resources/quality/flashforge/flashforge_global_0.08_ultra.inst.cfg index 81ed7a0ba0..c173e3fc12 100644 --- a/resources/quality/flashforge/flashforge_global_0.08_ultra.inst.cfg +++ b/resources/quality/flashforge/flashforge_global_0.08_ultra.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Ultra Quality definition = flashforge_base +name = Ultra Quality +version = 4 [metadata] +global_quality = True +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra weight = 0 -global_quality = True [values] adhesion_type = brim @@ -24,3 +24,4 @@ speed_infill = =speed_print speed_print = 40 speed_support = 30 speed_travel = 70 + diff --git a/resources/quality/flashforge/flashforge_global_0.12_super.inst.cfg b/resources/quality/flashforge/flashforge_global_0.12_super.inst.cfg index 3ad72e3715..b6b99534e5 100644 --- a/resources/quality/flashforge/flashforge_global_0.12_super.inst.cfg +++ b/resources/quality/flashforge/flashforge_global_0.12_super.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Super Quality definition = flashforge_base +name = Super Quality +version = 4 [metadata] +global_quality = True +quality_type = super setting_version = 20 type = quality -quality_type = super weight = -1 -global_quality = True [values] adhesion_type = brim @@ -24,3 +24,4 @@ speed_infill = =speed_print speed_print = 40 speed_support = 30 speed_travel = 70 + diff --git a/resources/quality/flashforge/flashforge_global_0.16_adaptive.inst.cfg b/resources/quality/flashforge/flashforge_global_0.16_adaptive.inst.cfg index b3cbe28634..440a45d391 100644 --- a/resources/quality/flashforge/flashforge_global_0.16_adaptive.inst.cfg +++ b/resources/quality/flashforge/flashforge_global_0.16_adaptive.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = flashforge_base +name = Dynamic Quality +version = 4 [metadata] +global_quality = True +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive weight = -2 -global_quality = True [values] adaptive_layer_height_enabled = true @@ -25,3 +25,4 @@ speed_infill = =speed_print speed_print = 50 speed_support = 30 speed_travel = 70 + diff --git a/resources/quality/flashforge/flashforge_global_0.20_standard.inst.cfg b/resources/quality/flashforge/flashforge_global_0.20_standard.inst.cfg index 208e968b70..c4f1264594 100644 --- a/resources/quality/flashforge/flashforge_global_0.20_standard.inst.cfg +++ b/resources/quality/flashforge/flashforge_global_0.20_standard.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = flashforge_base +name = Standard Quality +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = -3 -global_quality = True [values] adhesion_type = brim @@ -24,3 +24,4 @@ speed_infill = =speed_print speed_print = 50 speed_support = 30 speed_travel = 70 + diff --git a/resources/quality/flashforge/flashforge_global_0.28_low.inst.cfg b/resources/quality/flashforge/flashforge_global_0.28_low.inst.cfg index d0d1a1d948..94c4909a24 100644 --- a/resources/quality/flashforge/flashforge_global_0.28_low.inst.cfg +++ b/resources/quality/flashforge/flashforge_global_0.28_low.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Low Quality definition = flashforge_base +name = Low Quality +version = 4 [metadata] +global_quality = True +quality_type = low setting_version = 20 type = quality -quality_type = low weight = -4 -global_quality = True [values] adhesion_type = brim @@ -24,3 +24,4 @@ speed_infill = =speed_print speed_print = 50 speed_support = 30 speed_travel = 70 + diff --git a/resources/quality/flashforge/flashforge_global_0.32_draft.inst.cfg b/resources/quality/flashforge/flashforge_global_0.32_draft.inst.cfg index e9ada8ac1d..be13e3dd2f 100644 --- a/resources/quality/flashforge/flashforge_global_0.32_draft.inst.cfg +++ b/resources/quality/flashforge/flashforge_global_0.32_draft.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = flashforge_base +name = Draft Quality +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -5 -global_quality = True [values] adhesion_type = brim @@ -24,3 +24,4 @@ speed_infill = =speed_print speed_print = 40 speed_support = 30 speed_travel = 70 + diff --git a/resources/quality/flashforge/flashforge_global_0.40_coarse.inst.cfg b/resources/quality/flashforge/flashforge_global_0.40_coarse.inst.cfg index c1d8dc44fc..e4dc7531e7 100644 --- a/resources/quality/flashforge/flashforge_global_0.40_coarse.inst.cfg +++ b/resources/quality/flashforge/flashforge_global_0.40_coarse.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Coarse Quality definition = flashforge_base +name = Coarse Quality +version = 4 [metadata] +global_quality = True +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = -6 -global_quality = True [values] adhesion_type = brim @@ -24,3 +24,4 @@ speed_infill = =speed_print speed_print = 30 speed_support = 30 speed_travel = 70 + diff --git a/resources/quality/flashforge/flashforge_global_0.48_extra_coarse.inst.cfg b/resources/quality/flashforge/flashforge_global_0.48_extra_coarse.inst.cfg index e0823eb167..5f4ea712d2 100644 --- a/resources/quality/flashforge/flashforge_global_0.48_extra_coarse.inst.cfg +++ b/resources/quality/flashforge/flashforge_global_0.48_extra_coarse.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Extra Coarse Quality definition = flashforge_base +name = Extra Coarse Quality +version = 4 [metadata] +global_quality = True +quality_type = Xcoarse setting_version = 20 type = quality -quality_type = Xcoarse weight = -7 -global_quality = True [values] adhesion_type = brim @@ -24,3 +24,4 @@ speed_infill = =speed_print speed_print = 30 speed_support = 30 speed_travel = 70 + diff --git a/resources/quality/flashforge/petg/flashforge_0.2_petg_super.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.2_petg_super.inst.cfg index 5fed3b0b57..940e7ef2ad 100644 --- a/resources/quality/flashforge/petg/flashforge_0.2_petg_super.inst.cfg +++ b/resources/quality/flashforge/petg/flashforge_0.2_petg_super.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Super Quality definition = flashforge_base +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_petg variant = 0.2mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 30 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/petg/flashforge_0.2_petg_ultra.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.2_petg_ultra.inst.cfg index 10547949ba..d2c6f6372f 100644 --- a/resources/quality/flashforge/petg/flashforge_0.2_petg_ultra.inst.cfg +++ b/resources/quality/flashforge/petg/flashforge_0.2_petg_ultra.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Ultra Quality definition = flashforge_base +name = Ultra Quality +version = 4 [metadata] +material = generic_petg +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra -material = generic_petg variant = 0.2mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 30 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/petg/flashforge_0.30_petg_adaptive.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.30_petg_adaptive.inst.cfg index c99190b58f..17887b480d 100644 --- a/resources/quality/flashforge/petg/flashforge_0.30_petg_adaptive.inst.cfg +++ b/resources/quality/flashforge/petg/flashforge_0.30_petg_adaptive.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Dynamic Quality definition = flashforge_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_petg +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_petg variant = 0.3mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 30 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/petg/flashforge_0.30_petg_standard.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.30_petg_standard.inst.cfg index cb9fc3c24c..cb3b9bd599 100644 --- a/resources/quality/flashforge/petg/flashforge_0.30_petg_standard.inst.cfg +++ b/resources/quality/flashforge/petg/flashforge_0.30_petg_standard.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Standard Quality definition = flashforge_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_petg variant = 0.3mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 30 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/petg/flashforge_0.30_petg_super.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.30_petg_super.inst.cfg index eb2b4e056e..cd5ffd6477 100644 --- a/resources/quality/flashforge/petg/flashforge_0.30_petg_super.inst.cfg +++ b/resources/quality/flashforge/petg/flashforge_0.30_petg_super.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Super Quality definition = flashforge_base +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_petg variant = 0.3mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 30 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/petg/flashforge_0.40_petg_adaptive.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.40_petg_adaptive.inst.cfg index dce639472f..6380017b45 100644 --- a/resources/quality/flashforge/petg/flashforge_0.40_petg_adaptive.inst.cfg +++ b/resources/quality/flashforge/petg/flashforge_0.40_petg_adaptive.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Dynamic Quality definition = flashforge_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_petg +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_petg variant = 0.4mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 30 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/petg/flashforge_0.40_petg_draft.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.40_petg_draft.inst.cfg index 7158ace797..fe4bc764b3 100644 --- a/resources/quality/flashforge/petg/flashforge_0.40_petg_draft.inst.cfg +++ b/resources/quality/flashforge/petg/flashforge_0.40_petg_draft.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Draft Quality definition = flashforge_base +name = Draft Quality +version = 4 [metadata] +material = generic_petg +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_petg variant = 0.4mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 30 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/petg/flashforge_0.40_petg_low.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.40_petg_low.inst.cfg index ae51bdf0c5..7d2b7640d2 100644 --- a/resources/quality/flashforge/petg/flashforge_0.40_petg_low.inst.cfg +++ b/resources/quality/flashforge/petg/flashforge_0.40_petg_low.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Low Quality definition = flashforge_base +name = Low Quality +version = 4 [metadata] +material = generic_petg +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_petg variant = 0.4mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 30 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/petg/flashforge_0.40_petg_standard.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.40_petg_standard.inst.cfg index 86dabcaefe..b88250012a 100644 --- a/resources/quality/flashforge/petg/flashforge_0.40_petg_standard.inst.cfg +++ b/resources/quality/flashforge/petg/flashforge_0.40_petg_standard.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Standard Quality definition = flashforge_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_petg variant = 0.4mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 30 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/petg/flashforge_0.40_petg_super.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.40_petg_super.inst.cfg index 88efa52504..8d3c774365 100644 --- a/resources/quality/flashforge/petg/flashforge_0.40_petg_super.inst.cfg +++ b/resources/quality/flashforge/petg/flashforge_0.40_petg_super.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Super Quality definition = flashforge_base +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_petg variant = 0.4mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 30 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/petg/flashforge_0.50_petg_adaptive.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.50_petg_adaptive.inst.cfg index e534296d67..186994bfc0 100644 --- a/resources/quality/flashforge/petg/flashforge_0.50_petg_adaptive.inst.cfg +++ b/resources/quality/flashforge/petg/flashforge_0.50_petg_adaptive.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Dynamic Quality definition = flashforge_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_petg +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_petg variant = 0.5mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 30 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/petg/flashforge_0.50_petg_coarse.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.50_petg_coarse.inst.cfg index 9e9514a518..817bcb8cf1 100644 --- a/resources/quality/flashforge/petg/flashforge_0.50_petg_coarse.inst.cfg +++ b/resources/quality/flashforge/petg/flashforge_0.50_petg_coarse.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Coarse Quality definition = flashforge_base +name = Coarse Quality +version = 4 [metadata] +material = generic_petg +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -material = generic_petg variant = 0.5mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 30 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/petg/flashforge_0.50_petg_draft.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.50_petg_draft.inst.cfg index 84f3bfa12c..a00c1f15d4 100644 --- a/resources/quality/flashforge/petg/flashforge_0.50_petg_draft.inst.cfg +++ b/resources/quality/flashforge/petg/flashforge_0.50_petg_draft.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Draft Quality definition = flashforge_base +name = Draft Quality +version = 4 [metadata] +material = generic_petg +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_petg variant = 0.5mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 30 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/petg/flashforge_0.50_petg_low.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.50_petg_low.inst.cfg index b1baee3fd5..c3557ac29b 100644 --- a/resources/quality/flashforge/petg/flashforge_0.50_petg_low.inst.cfg +++ b/resources/quality/flashforge/petg/flashforge_0.50_petg_low.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Low Quality definition = flashforge_base +name = Low Quality +version = 4 [metadata] +material = generic_petg +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_petg variant = 0.5mm Nozzle [values] @@ -20,4 +20,5 @@ material_print_temperature_layer_0 = 240 speed_infill = =speed_print speed_print = 30 speed_support = 30 -speed_travel = 100 \ No newline at end of file +speed_travel = 100 + diff --git a/resources/quality/flashforge/petg/flashforge_0.50_petg_standard.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.50_petg_standard.inst.cfg index a1d106b703..f85a4eb5ec 100644 --- a/resources/quality/flashforge/petg/flashforge_0.50_petg_standard.inst.cfg +++ b/resources/quality/flashforge/petg/flashforge_0.50_petg_standard.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Standard Quality definition = flashforge_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_petg variant = 0.5mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 30 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/petg/flashforge_0.60_petg_draft.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.60_petg_draft.inst.cfg index 4e142c8524..f9040b1cf2 100644 --- a/resources/quality/flashforge/petg/flashforge_0.60_petg_draft.inst.cfg +++ b/resources/quality/flashforge/petg/flashforge_0.60_petg_draft.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Draft Quality definition = flashforge_base +name = Draft Quality +version = 4 [metadata] +material = generic_petg +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_petg variant = 0.6mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 30 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/petg/flashforge_0.60_petg_extra_coarse.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.60_petg_extra_coarse.inst.cfg index 08eb8c4e9e..53f7563280 100644 --- a/resources/quality/flashforge/petg/flashforge_0.60_petg_extra_coarse.inst.cfg +++ b/resources/quality/flashforge/petg/flashforge_0.60_petg_extra_coarse.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Coarse Quality definition = flashforge_base +name = Extra Coarse Quality +version = 4 [metadata] +material = generic_petg +quality_type = Xcoarse setting_version = 20 type = quality -quality_type = Xcoarse -material = generic_petg variant = 0.6mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 30 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/petg/flashforge_0.60_petg_standard.inst.cfg b/resources/quality/flashforge/petg/flashforge_0.60_petg_standard.inst.cfg index 110e457298..3deb7c06a3 100644 --- a/resources/quality/flashforge/petg/flashforge_0.60_petg_standard.inst.cfg +++ b/resources/quality/flashforge/petg/flashforge_0.60_petg_standard.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Standard Quality definition = flashforge_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_petg variant = 0.6mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 30 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/pla/flashforge_0.20_pla_super.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.20_pla_super.inst.cfg index 1bbff4b595..d712e30b00 100644 --- a/resources/quality/flashforge/pla/flashforge_0.20_pla_super.inst.cfg +++ b/resources/quality/flashforge/pla/flashforge_0.20_pla_super.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Super Quality definition = flashforge_base +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla variant = 0.2mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 50 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/pla/flashforge_0.20_pla_ultra.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.20_pla_ultra.inst.cfg index 869b51e575..ecaf141eab 100644 --- a/resources/quality/flashforge/pla/flashforge_0.20_pla_ultra.inst.cfg +++ b/resources/quality/flashforge/pla/flashforge_0.20_pla_ultra.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Ultra Quality definition = flashforge_base +name = Ultra Quality +version = 4 [metadata] +material = generic_pla +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra -material = generic_pla variant = 0.2mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 50 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/pla/flashforge_0.30_pla_adaptive.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.30_pla_adaptive.inst.cfg index 08269811ff..2bf9cbb81d 100644 --- a/resources/quality/flashforge/pla/flashforge_0.30_pla_adaptive.inst.cfg +++ b/resources/quality/flashforge/pla/flashforge_0.30_pla_adaptive.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Dynamic Quality definition = flashforge_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_pla +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_pla variant = 0.3mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 50 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/pla/flashforge_0.30_pla_standard.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.30_pla_standard.inst.cfg index 42d9447da9..b49d36c794 100644 --- a/resources/quality/flashforge/pla/flashforge_0.30_pla_standard.inst.cfg +++ b/resources/quality/flashforge/pla/flashforge_0.30_pla_standard.inst.cfg @@ -1,19 +1,19 @@ [general] -version = 4 -name = Standard Quality definition = flashforge_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_pla variant = 0.3mm Nozzle [values] -layer_height_0 = 0.24 cool_fan_speed = 100 cool_fan_speed_0 = 0 +layer_height_0 = 0.24 material_bed_temperature = 35 material_bed_temperature_layer_0 = 40 material_print_temperature = 200 @@ -22,3 +22,4 @@ speed_infill = =speed_print speed_print = 50 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/pla/flashforge_0.30_pla_super.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.30_pla_super.inst.cfg index c9526ee2a2..a900f6a1df 100644 --- a/resources/quality/flashforge/pla/flashforge_0.30_pla_super.inst.cfg +++ b/resources/quality/flashforge/pla/flashforge_0.30_pla_super.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Super Quality definition = flashforge_base +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla variant = 0.3mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 50 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/pla/flashforge_0.40_pla_adaptive.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.40_pla_adaptive.inst.cfg index bcf42cef4b..fef2d7272b 100644 --- a/resources/quality/flashforge/pla/flashforge_0.40_pla_adaptive.inst.cfg +++ b/resources/quality/flashforge/pla/flashforge_0.40_pla_adaptive.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Dynamic Quality definition = flashforge_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_pla +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_pla variant = 0.4mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 50 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/pla/flashforge_0.40_pla_draft.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.40_pla_draft.inst.cfg index f25c72a72b..1e0bdeb7df 100644 --- a/resources/quality/flashforge/pla/flashforge_0.40_pla_draft.inst.cfg +++ b/resources/quality/flashforge/pla/flashforge_0.40_pla_draft.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Draft Quality definition = flashforge_base +name = Draft Quality +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_pla variant = 0.4mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 50 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/pla/flashforge_0.40_pla_low.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.40_pla_low.inst.cfg index f00b5f258b..083618209f 100644 --- a/resources/quality/flashforge/pla/flashforge_0.40_pla_low.inst.cfg +++ b/resources/quality/flashforge/pla/flashforge_0.40_pla_low.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Low Quality definition = flashforge_base +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla variant = 0.4mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 50 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/pla/flashforge_0.40_pla_standard.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.40_pla_standard.inst.cfg index f2b47b98f1..43a48dfccb 100644 --- a/resources/quality/flashforge/pla/flashforge_0.40_pla_standard.inst.cfg +++ b/resources/quality/flashforge/pla/flashforge_0.40_pla_standard.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Standard Quality definition = flashforge_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_pla variant = 0.4mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 50 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/pla/flashforge_0.40_pla_super.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.40_pla_super.inst.cfg index b59b8d4b75..64356cbb8a 100644 --- a/resources/quality/flashforge/pla/flashforge_0.40_pla_super.inst.cfg +++ b/resources/quality/flashforge/pla/flashforge_0.40_pla_super.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Super Quality definition = flashforge_base +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla variant = 0.4mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 50 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/pla/flashforge_0.50_pla_adaptive.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.50_pla_adaptive.inst.cfg index d35197ef84..9afb00dda6 100644 --- a/resources/quality/flashforge/pla/flashforge_0.50_pla_adaptive.inst.cfg +++ b/resources/quality/flashforge/pla/flashforge_0.50_pla_adaptive.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Dynamic Quality definition = flashforge_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_pla +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_pla variant = 0.5mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 50 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/pla/flashforge_0.50_pla_coarse.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.50_pla_coarse.inst.cfg index 24782e851c..660a8a72b6 100644 --- a/resources/quality/flashforge/pla/flashforge_0.50_pla_coarse.inst.cfg +++ b/resources/quality/flashforge/pla/flashforge_0.50_pla_coarse.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Coarse Quality definition = flashforge_base +name = Coarse Quality +version = 4 [metadata] +material = generic_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -material = generic_pla variant = 0.5mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 40 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/pla/flashforge_0.50_pla_draft.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.50_pla_draft.inst.cfg index e85ee1073f..2d8df64969 100644 --- a/resources/quality/flashforge/pla/flashforge_0.50_pla_draft.inst.cfg +++ b/resources/quality/flashforge/pla/flashforge_0.50_pla_draft.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Draft Quality definition = flashforge_base +name = Draft Quality +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_pla variant = 0.5mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 50 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/pla/flashforge_0.50_pla_low.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.50_pla_low.inst.cfg index beacdae7b5..f72782c66a 100644 --- a/resources/quality/flashforge/pla/flashforge_0.50_pla_low.inst.cfg +++ b/resources/quality/flashforge/pla/flashforge_0.50_pla_low.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Low Quality definition = flashforge_base +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla variant = 0.5mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 50 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/pla/flashforge_0.50_pla_standard.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.50_pla_standard.inst.cfg index fd3c7dfafe..12a36b1c2b 100644 --- a/resources/quality/flashforge/pla/flashforge_0.50_pla_standard.inst.cfg +++ b/resources/quality/flashforge/pla/flashforge_0.50_pla_standard.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Standard Quality definition = flashforge_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_pla variant = 0.5mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 50 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/pla/flashforge_0.60_pla_draft.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.60_pla_draft.inst.cfg index 28a231337b..58f21571e5 100644 --- a/resources/quality/flashforge/pla/flashforge_0.60_pla_draft.inst.cfg +++ b/resources/quality/flashforge/pla/flashforge_0.60_pla_draft.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Draft Quality definition = flashforge_base +name = Draft Quality +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_pla variant = 0.6mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 50 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/pla/flashforge_0.60_pla_extra Coarse.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.60_pla_extra Coarse.inst.cfg index 51def4848d..87a6a45f37 100644 --- a/resources/quality/flashforge/pla/flashforge_0.60_pla_extra Coarse.inst.cfg +++ b/resources/quality/flashforge/pla/flashforge_0.60_pla_extra Coarse.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Coarse Quality definition = flashforge_base +name = Extra Coarse Quality +version = 4 [metadata] +material = generic_pla +quality_type = Xcoarse setting_version = 20 type = quality -quality_type = Xcoarse -material = generic_pla variant = 0.6mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 40 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/pla/flashforge_0.60_pla_standard.inst.cfg b/resources/quality/flashforge/pla/flashforge_0.60_pla_standard.inst.cfg index 786b3293d4..1257990c05 100644 --- a/resources/quality/flashforge/pla/flashforge_0.60_pla_standard.inst.cfg +++ b/resources/quality/flashforge/pla/flashforge_0.60_pla_standard.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Standard Quality definition = flashforge_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_pla variant = 0.6mm Nozzle [values] @@ -21,3 +21,4 @@ speed_infill = =speed_print speed_print = 50 speed_support = 30 speed_travel = 100 + diff --git a/resources/quality/flashforge/tpu/flashforge_0.40_tpu_adaptive.inst.cfg b/resources/quality/flashforge/tpu/flashforge_0.40_tpu_adaptive.inst.cfg index 440b5c01c1..47ac23c15c 100644 --- a/resources/quality/flashforge/tpu/flashforge_0.40_tpu_adaptive.inst.cfg +++ b/resources/quality/flashforge/tpu/flashforge_0.40_tpu_adaptive.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Dynamic Quality definition = flashforge_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_tpu +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_tpu variant = 0.4mm Nozzle [values] @@ -18,7 +18,8 @@ material_bed_temperature_layer_0 = 40 material_print_temperature = 230 material_print_temperature_layer_0 = 235 speed_infill = =speed_print -speed_print = 15 speed_layer_0 = 10 +speed_print = 15 speed_support = 15 speed_travel = 100 + diff --git a/resources/quality/flashforge/tpu/flashforge_0.40_tpu_draft.inst.cfg b/resources/quality/flashforge/tpu/flashforge_0.40_tpu_draft.inst.cfg index 3b9633ab26..b1747fce2f 100644 --- a/resources/quality/flashforge/tpu/flashforge_0.40_tpu_draft.inst.cfg +++ b/resources/quality/flashforge/tpu/flashforge_0.40_tpu_draft.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Draft Quality definition = flashforge_base +name = Draft Quality +version = 4 [metadata] +material = generic_tpu +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_tpu variant = 0.4mm Nozzle [values] @@ -18,7 +18,8 @@ material_bed_temperature_layer_0 = 40 material_print_temperature = 230 material_print_temperature_layer_0 = 235 speed_infill = =speed_print -speed_print = 15 speed_layer_0 = 10 +speed_print = 15 speed_support = 15 speed_travel = 100 + diff --git a/resources/quality/flashforge/tpu/flashforge_0.40_tpu_low.inst.cfg b/resources/quality/flashforge/tpu/flashforge_0.40_tpu_low.inst.cfg index 299126b01a..b82aa5439f 100644 --- a/resources/quality/flashforge/tpu/flashforge_0.40_tpu_low.inst.cfg +++ b/resources/quality/flashforge/tpu/flashforge_0.40_tpu_low.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Low Quality definition = flashforge_base +name = Low Quality +version = 4 [metadata] +material = generic_tpu +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_tpu variant = 0.4mm Nozzle [values] @@ -18,7 +18,8 @@ material_bed_temperature_layer_0 = 40 material_print_temperature = 230 material_print_temperature_layer_0 = 235 speed_infill = =speed_print -speed_print = 15 speed_layer_0 = 10 +speed_print = 15 speed_support = 15 speed_travel = 100 + diff --git a/resources/quality/flashforge/tpu/flashforge_0.40_tpu_standard.inst.cfg b/resources/quality/flashforge/tpu/flashforge_0.40_tpu_standard.inst.cfg index 9b48c0e474..14484fca02 100644 --- a/resources/quality/flashforge/tpu/flashforge_0.40_tpu_standard.inst.cfg +++ b/resources/quality/flashforge/tpu/flashforge_0.40_tpu_standard.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Standard Quality definition = flashforge_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_tpu variant = 0.4mm Nozzle [values] @@ -18,7 +18,8 @@ material_bed_temperature_layer_0 = 40 material_print_temperature = 230 material_print_temperature_layer_0 = 235 speed_infill = =speed_print -speed_print = 15 speed_layer_0 = 10 +speed_print = 15 speed_support = 15 speed_travel = 100 + diff --git a/resources/quality/flashforge/tpu/flashforge_0.40_tpu_super.inst.cfg b/resources/quality/flashforge/tpu/flashforge_0.40_tpu_super.inst.cfg index f2df3a8deb..4d45ce4ebf 100644 --- a/resources/quality/flashforge/tpu/flashforge_0.40_tpu_super.inst.cfg +++ b/resources/quality/flashforge/tpu/flashforge_0.40_tpu_super.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Super Quality definition = flashforge_base +name = Super Quality +version = 4 [metadata] +material = generic_tpu +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_tpu variant = 0.4mm Nozzle [values] @@ -18,7 +18,8 @@ material_bed_temperature_layer_0 = 40 material_print_temperature = 230 material_print_temperature_layer_0 = 235 speed_infill = =speed_print -speed_print = 15 speed_layer_0 = 10 +speed_print = 15 speed_support = 15 speed_travel = 100 + diff --git a/resources/quality/flashforge/tpu/flashforge_0.50_tpu_adaptive.inst.cfg b/resources/quality/flashforge/tpu/flashforge_0.50_tpu_adaptive.inst.cfg index 2b89095d29..f5fe21506d 100644 --- a/resources/quality/flashforge/tpu/flashforge_0.50_tpu_adaptive.inst.cfg +++ b/resources/quality/flashforge/tpu/flashforge_0.50_tpu_adaptive.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Dynamic Quality definition = flashforge_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_tpu +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_tpu variant = 0.5mm Nozzle [values] @@ -18,7 +18,8 @@ material_bed_temperature_layer_0 = 40 material_print_temperature = 230 material_print_temperature_layer_0 = 235 speed_infill = =speed_print -speed_print = 15 speed_layer_0 = 10 +speed_print = 15 speed_support = 15 speed_travel = 100 + diff --git a/resources/quality/flashforge/tpu/flashforge_0.50_tpu_draft.inst.cfg b/resources/quality/flashforge/tpu/flashforge_0.50_tpu_draft.inst.cfg index c46593163a..6db33aaf6d 100644 --- a/resources/quality/flashforge/tpu/flashforge_0.50_tpu_draft.inst.cfg +++ b/resources/quality/flashforge/tpu/flashforge_0.50_tpu_draft.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Draft Quality definition = flashforge_base +name = Draft Quality +version = 4 [metadata] +material = generic_tpu +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_tpu variant = 0.5mm Nozzle [values] @@ -18,7 +18,8 @@ material_bed_temperature_layer_0 = 40 material_print_temperature = 230 material_print_temperature_layer_0 = 235 speed_infill = =speed_print -speed_print = 15 speed_layer_0 = 10 +speed_print = 15 speed_support = 15 speed_travel = 100 + diff --git a/resources/quality/flashforge/tpu/flashforge_0.50_tpu_low.inst.cfg b/resources/quality/flashforge/tpu/flashforge_0.50_tpu_low.inst.cfg index 00ff19f414..21cf43347c 100644 --- a/resources/quality/flashforge/tpu/flashforge_0.50_tpu_low.inst.cfg +++ b/resources/quality/flashforge/tpu/flashforge_0.50_tpu_low.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Low Quality definition = flashforge_base +name = Low Quality +version = 4 [metadata] +material = generic_tpu +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_tpu variant = 0.5mm Nozzle [values] @@ -18,7 +18,8 @@ material_bed_temperature_layer_0 = 40 material_print_temperature = 230 material_print_temperature_layer_0 = 235 speed_infill = =speed_print -speed_print = 15 speed_layer_0 = 10 +speed_print = 15 speed_support = 15 speed_travel = 100 + diff --git a/resources/quality/flashforge/tpu/flashforge_0.50_tpu_standard.inst.cfg b/resources/quality/flashforge/tpu/flashforge_0.50_tpu_standard.inst.cfg index abd6c1bb59..3376673bf9 100644 --- a/resources/quality/flashforge/tpu/flashforge_0.50_tpu_standard.inst.cfg +++ b/resources/quality/flashforge/tpu/flashforge_0.50_tpu_standard.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Standard Quality definition = flashforge_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_tpu variant = 0.5mm Nozzle [values] @@ -18,7 +18,8 @@ material_bed_temperature_layer_0 = 40 material_print_temperature = 230 material_print_temperature_layer_0 = 235 speed_infill = =speed_print -speed_print = 15 speed_layer_0 = 10 +speed_print = 15 speed_support = 15 speed_travel = 100 + diff --git a/resources/quality/flashforge/tpu/flashforge_0.60_tpu_draft.inst.cfg b/resources/quality/flashforge/tpu/flashforge_0.60_tpu_draft.inst.cfg index 02f491c354..b2d115633d 100644 --- a/resources/quality/flashforge/tpu/flashforge_0.60_tpu_draft.inst.cfg +++ b/resources/quality/flashforge/tpu/flashforge_0.60_tpu_draft.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Draft Quality definition = flashforge_base +name = Draft Quality +version = 4 [metadata] +material = generic_tpu +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_tpu variant = 0.6mm Nozzle [values] @@ -18,7 +18,8 @@ material_bed_temperature_layer_0 = 40 material_print_temperature = 230 material_print_temperature_layer_0 = 235 speed_infill = =speed_print -speed_print = 15 speed_layer_0 = 10 +speed_print = 15 speed_support = 15 speed_travel = 100 + diff --git a/resources/quality/flashforge/tpu/flashforge_0.60_tpu_low.inst.cfg b/resources/quality/flashforge/tpu/flashforge_0.60_tpu_low.inst.cfg index 70c4b22c92..3ddbb19709 100644 --- a/resources/quality/flashforge/tpu/flashforge_0.60_tpu_low.inst.cfg +++ b/resources/quality/flashforge/tpu/flashforge_0.60_tpu_low.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Low Quality definition = flashforge_base +name = Low Quality +version = 4 [metadata] +material = generic_tpu +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_tpu variant = 0.6mm Nozzle [values] @@ -18,7 +18,8 @@ material_bed_temperature_layer_0 = 40 material_print_temperature = 230 material_print_temperature_layer_0 = 235 speed_infill = =speed_print -speed_print = 15 speed_layer_0 = 10 +speed_print = 15 speed_support = 15 speed_travel = 100 + diff --git a/resources/quality/flashforge/tpu/flashforge_0.60_tpu_standard.inst.cfg b/resources/quality/flashforge/tpu/flashforge_0.60_tpu_standard.inst.cfg index e9f6b61f52..fa2bee4243 100644 --- a/resources/quality/flashforge/tpu/flashforge_0.60_tpu_standard.inst.cfg +++ b/resources/quality/flashforge/tpu/flashforge_0.60_tpu_standard.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Standard Quality definition = flashforge_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_tpu variant = 0.6mm Nozzle [values] @@ -18,7 +18,8 @@ material_bed_temperature_layer_0 = 40 material_print_temperature = 230 material_print_temperature_layer_0 = 235 speed_infill = =speed_print -speed_print = 15 speed_layer_0 = 10 +speed_print = 15 speed_support = 15 speed_travel = 100 + diff --git a/resources/quality/flsun_sr/flsun_sr_fine.inst.cfg b/resources/quality/flsun_sr/flsun_sr_fine.inst.cfg index 09973fdbbd..f63bfcf4f3 100644 --- a/resources/quality/flsun_sr/flsun_sr_fine.inst.cfg +++ b/resources/quality/flsun_sr/flsun_sr_fine.inst.cfg @@ -1,81 +1,82 @@ [general] -version = 4 -name = Fine definition = flsun_sr +name = Fine +version = 4 [metadata] +global_quality = True +quality_type = fine setting_version = 20 type = quality -quality_type = fine weight = 1 -global_quality = True [values] -layer_height = 0.12 -layer_height_0 = 0.2 -retraction_combing = noskin -retraction_combing_max_distance = 10 -speed_slowdown_layers = 5 -travel_retract_before_outer_wall = False +acceleration_enabled = False adhesion_type = skirt -skirt_line_count = 2 brim_width = 4.0 cool_fan_speed = 100 cool_lift_head = False cool_min_layer_time = 4 infill_before_walls = False infill_enable_travel_optimization = False +infill_pattern = grid infill_support_angle = 50 ironing_enabled = False +ironing_only_highest_layer = True +jerk_enabled = False +jerk_travel = 25 +jerk_travel_layer_0 = 20 +jerk_wall_0 = 10 +layer_height = 0.12 +layer_height_0 = 0.2 +material_bed_temperature_layer_0 = 60 +material_final_print_temperature = 210 +material_flow_dependent_temperature = False +material_initial_print_temperature = 210 +material_print_temperature = 210 +material_print_temperature_layer_0 = 210 +optimize_wall_printing_order = True retract_at_layer_change = False retraction_amount = 6.5 +retraction_combing = noskin +retraction_combing_max_distance = 10 +retraction_hop = 0.3 +retraction_hop_enabled = True retraction_hop_only_when_collides = True +retraction_speed = 40 skin_no_small_gaps_heuristic = True skin_overlap = 10 +skirt_line_count = 2 +small_feature_speed_factor = 60 small_hole_max_size = 5 +speed_infill = 100 +speed_layer_0 = 25 +speed_print = 80 +speed_slowdown_layers = 5 speed_support = 80 -support_enable = True -support_type = everywhere -support_wall_count = 1 +speed_topbottom = 50 +speed_travel = 120 +speed_travel_layer_0 = 40 +speed_z_hop = 50 support_angle = 60 support_brim_enable = True support_brim_width = 4.0 +support_enable = True support_interface_density = 60 support_interface_enable = True support_interface_height = 0.96 support_interface_pattern = grid support_interface_skip_height = 0.12 support_roof_density = 60 +support_type = everywhere +support_wall_count = 1 support_xy_distance = 0.5 support_z_distance = 0.2 top_bottom_thickness = =layer_height*7 -travel_avoid_other_parts = True +travel_avoid_other_parts = True travel_avoid_supports = True -acceleration_enabled = False -jerk_enabled = False -infill_pattern = grid -ironing_only_highest_layer = True -jerk_travel = 25 -jerk_travel_layer_0 = 20 -jerk_wall_0 = 10 -material_flow_dependent_temperature = False -material_initial_print_temperature = 210 -material_final_print_temperature = 210 -material_print_temperature = 210 -material_print_temperature_layer_0 = 210 -material_bed_temperature_layer_0 = 60 -optimize_wall_printing_order = True -retraction_hop = 0.3 -retraction_hop_enabled = True -retraction_speed = 40 -small_feature_speed_factor = 60 -speed_infill = 100 -speed_layer_0 = 25 -speed_print = 80 -speed_topbottom = 50 -speed_travel = 120 -speed_travel_layer_0 = 40 -speed_z_hop = 50 +travel_retract_before_outer_wall = False wall_thickness = =line_width*3 z_seam_corner = z_seam_corner_inner -z_seam_type = sharpest_corner \ No newline at end of file +z_seam_type = sharpest_corner + diff --git a/resources/quality/flsun_sr/flsun_sr_normal.inst.cfg b/resources/quality/flsun_sr/flsun_sr_normal.inst.cfg index 9109a6635a..2b0fd9701a 100644 --- a/resources/quality/flsun_sr/flsun_sr_normal.inst.cfg +++ b/resources/quality/flsun_sr/flsun_sr_normal.inst.cfg @@ -1,81 +1,82 @@ [general] -version = 4 -name = Normal definition = flsun_sr +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = -2 -global_quality = True [values] -layer_height = 0.2 -layer_height_0 = 0.2 -retraction_combing = noskin -retraction_combing_max_distance = 10 -speed_slowdown_layers = 5 -travel_retract_before_outer_wall = False +acceleration_enabled = False adhesion_type = skirt -skirt_line_count = 2 brim_width = 4.0 cool_fan_speed = 100 cool_lift_head = False cool_min_layer_time = 4 infill_before_walls = False infill_enable_travel_optimization = False +infill_pattern = grid infill_support_angle = 50 ironing_enabled = False +ironing_only_highest_layer = True +jerk_enabled = False +jerk_travel = 25 +jerk_travel_layer_0 = 20 +jerk_wall_0 = 10 +layer_height = 0.2 +layer_height_0 = 0.2 +material_bed_temperature_layer_0 = 60 +material_final_print_temperature = 220 +material_flow_dependent_temperature = False +material_initial_print_temperature = 220 +material_print_temperature = 220 +material_print_temperature_layer_0 = 220 +optimize_wall_printing_order = True retract_at_layer_change = False retraction_amount = 6.5 +retraction_combing = noskin +retraction_combing_max_distance = 10 +retraction_hop = 0.3 +retraction_hop_enabled = True retraction_hop_only_when_collides = True +retraction_speed = 40 skin_no_small_gaps_heuristic = True skin_overlap = 10 +skirt_line_count = 2 +small_feature_speed_factor = 60 small_hole_max_size = 5 +speed_infill = 150 +speed_layer_0 = 25 +speed_print = 150 +speed_slowdown_layers = 5 speed_support = 80 -support_enable = True -support_type = everywhere -support_wall_count = 1 +speed_topbottom = 70 +speed_travel = 180 +speed_travel_layer_0 = 50 +speed_z_hop = 50 support_angle = 60 support_brim_enable = True support_brim_width = 4.0 +support_enable = True support_interface_density = 60 support_interface_enable = True support_interface_height = 0.6 support_interface_pattern = grid support_interface_skip_height = 0.2 support_roof_density = 60 +support_type = everywhere +support_wall_count = 1 support_xy_distance = 0.5 support_z_distance = 0.2 top_bottom_thickness = =layer_height*5 -travel_avoid_other_parts = True +travel_avoid_other_parts = True travel_avoid_supports = True -acceleration_enabled = False -jerk_enabled = False -infill_pattern = grid -ironing_only_highest_layer = True -jerk_travel = 25 -jerk_travel_layer_0 = 20 -jerk_wall_0 = 10 -material_flow_dependent_temperature = False -material_initial_print_temperature = 220 -material_final_print_temperature = 220 -material_print_temperature = 220 -material_print_temperature_layer_0 = 220 -material_bed_temperature_layer_0 = 60 -optimize_wall_printing_order = True -retraction_hop = 0.3 -retraction_hop_enabled = True -retraction_speed = 40 -small_feature_speed_factor = 60 -speed_infill = 150 -speed_layer_0 = 25 -speed_print = 150 -speed_topbottom = 70 -speed_travel = 180 -speed_travel_layer_0 = 50 -speed_z_hop = 50 +travel_retract_before_outer_wall = False wall_thickness = =line_width*3 z_seam_corner = z_seam_corner_inner -z_seam_type = sharpest_corner \ No newline at end of file +z_seam_type = sharpest_corner + diff --git a/resources/quality/flyingbear/abs/flyingbear_0.25_abs_super.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.25_abs_super.inst.cfg index 9a48f738ae..245750f82c 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.25_abs_super.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.25_abs_super.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Super Quality definition = flyingbear_base +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_abs variant = 0.25mm Nozzle [values] -wall_thickness = =line_width*6 adhesion_type = brim +wall_thickness = =line_width*6 + diff --git a/resources/quality/flyingbear/abs/flyingbear_0.25_abs_ultra.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.25_abs_ultra.inst.cfg index b0db8faa9d..be17eba6f1 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.25_abs_ultra.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.25_abs_ultra.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Ultra Quality definition = flyingbear_base +name = Ultra Quality +version = 4 [metadata] +material = generic_abs +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra -material = generic_abs variant = 0.25mm Nozzle [values] -wall_thickness = =line_width*6 adhesion_type = brim +wall_thickness = =line_width*6 + diff --git a/resources/quality/flyingbear/abs/flyingbear_0.30_abs_adaptive.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.30_abs_adaptive.inst.cfg index 24dd9e2d4d..2a3d96f9db 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.30_abs_adaptive.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.30_abs_adaptive.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = flyingbear_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_abs +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_abs variant = 0.3mm Nozzle [values] -wall_thickness = =line_width*5 adhesion_type = brim +wall_thickness = =line_width*5 + diff --git a/resources/quality/flyingbear/abs/flyingbear_0.30_abs_standard.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.30_abs_standard.inst.cfg index 35ba378079..dcba818fbc 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.30_abs_standard.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.30_abs_standard.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = flyingbear_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_abs variant = 0.3mm Nozzle [values] -wall_thickness = =line_width*5 adhesion_type = brim +wall_thickness = =line_width*5 + diff --git a/resources/quality/flyingbear/abs/flyingbear_0.30_abs_super.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.30_abs_super.inst.cfg index 402a3c3591..1d40f630c6 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.30_abs_super.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.30_abs_super.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Super Quality definition = flyingbear_base +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_abs variant = 0.3mm Nozzle [values] -wall_thickness = =line_width*5 adhesion_type = brim +wall_thickness = =line_width*5 + diff --git a/resources/quality/flyingbear/abs/flyingbear_0.40_abs_adaptive.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.40_abs_adaptive.inst.cfg index 091800ef56..fcce016b63 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.40_abs_adaptive.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.40_abs_adaptive.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = flyingbear_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_abs +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_abs variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = brim +wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/abs/flyingbear_0.40_abs_low.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.40_abs_low.inst.cfg index a5523bd2c2..4c7cbefd61 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.40_abs_low.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.40_abs_low.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Low Quality definition = flyingbear_base +name = Low Quality +version = 4 [metadata] +material = generic_abs +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_abs variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = brim +wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/abs/flyingbear_0.40_abs_standard.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.40_abs_standard.inst.cfg index e6ed5a4d23..9bccb9b7a5 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.40_abs_standard.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.40_abs_standard.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = flyingbear_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_abs variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = brim +wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/abs/flyingbear_0.40_abs_super.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.40_abs_super.inst.cfg index 2441ee4a2b..df5b21d8f6 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.40_abs_super.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.40_abs_super.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Super Quality definition = flyingbear_base +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_abs variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = brim +wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/abs/flyingbear_0.50_abs_adaptive.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.50_abs_adaptive.inst.cfg index bd01b3238e..72f769e50d 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.50_abs_adaptive.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.50_abs_adaptive.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = flyingbear_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_abs +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_abs variant = 0.5mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = brim +wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/abs/flyingbear_0.50_abs_draft.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.50_abs_draft.inst.cfg index 50988bc62b..c14c51a218 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.50_abs_draft.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.50_abs_draft.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Draft Quality definition = flyingbear_base +name = Draft Quality +version = 4 [metadata] +material = generic_abs +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_abs variant = 0.5mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = brim +wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/abs/flyingbear_0.50_abs_low.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.50_abs_low.inst.cfg index 4c0a03880e..2dcb28b8cb 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.50_abs_low.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.50_abs_low.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Low Quality definition = flyingbear_base +name = Low Quality +version = 4 [metadata] +material = generic_abs +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_abs variant = 0.5mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = brim +wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/abs/flyingbear_0.50_abs_standard.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.50_abs_standard.inst.cfg index 58a85dc951..6db4120f6b 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.50_abs_standard.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.50_abs_standard.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = flyingbear_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_abs variant = 0.5mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = brim +wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/abs/flyingbear_0.60_abs_draft.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.60_abs_draft.inst.cfg index 211af1abae..55a1db1d0a 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.60_abs_draft.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.60_abs_draft.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Draft Quality definition = flyingbear_base +name = Draft Quality +version = 4 [metadata] +material = generic_abs +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_abs variant = 0.6mm Nozzle [values] -wall_thickness = =line_width*3 adhesion_type = brim +wall_thickness = =line_width*3 + diff --git a/resources/quality/flyingbear/abs/flyingbear_0.60_abs_low.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.60_abs_low.inst.cfg index 3c81c66264..458341aaab 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.60_abs_low.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.60_abs_low.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Low Quality definition = flyingbear_base +name = Low Quality +version = 4 [metadata] +material = generic_abs +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_abs variant = 0.6mm Nozzle [values] -wall_thickness = =line_width*3 adhesion_type = brim +wall_thickness = =line_width*3 + diff --git a/resources/quality/flyingbear/abs/flyingbear_0.60_abs_standard.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.60_abs_standard.inst.cfg index b634bc798b..c0fe227ddb 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.60_abs_standard.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.60_abs_standard.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = flyingbear_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_abs variant = 0.6mm Nozzle [values] -wall_thickness = =line_width*3 adhesion_type = brim +wall_thickness = =line_width*3 + diff --git a/resources/quality/flyingbear/abs/flyingbear_0.80_abs_coarse.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.80_abs_coarse.inst.cfg index e5e0688296..0635b39c7c 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.80_abs_coarse.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.80_abs_coarse.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Coarse Quality definition = flyingbear_base +name = Coarse Quality +version = 4 [metadata] +material = generic_abs +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -material = generic_abs variant = 0.8mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = brim +wall_thickness = =line_width*2 + diff --git a/resources/quality/flyingbear/abs/flyingbear_0.80_abs_draft.inst.cfg b/resources/quality/flyingbear/abs/flyingbear_0.80_abs_draft.inst.cfg index 8d04c6b09f..111804e7d5 100644 --- a/resources/quality/flyingbear/abs/flyingbear_0.80_abs_draft.inst.cfg +++ b/resources/quality/flyingbear/abs/flyingbear_0.80_abs_draft.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Draft Quality definition = flyingbear_base +name = Draft Quality +version = 4 [metadata] +material = generic_abs +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_abs variant = 0.8mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = brim +wall_thickness = =line_width*2 + diff --git a/resources/quality/flyingbear/flyingbear_global_0.08_ultra.inst.cfg b/resources/quality/flyingbear/flyingbear_global_0.08_ultra.inst.cfg index 58435a63c8..c15cf5d2d6 100644 --- a/resources/quality/flyingbear/flyingbear_global_0.08_ultra.inst.cfg +++ b/resources/quality/flyingbear/flyingbear_global_0.08_ultra.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Ultra Quality definition = flyingbear_base +name = Ultra Quality +version = 4 [metadata] +global_quality = True +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra weight = 0 -global_quality = True [values] layer_height = 0.08 layer_height_0 = 0.12 +support_interface_height = =layer_height*12 top_bottom_thickness = =layer_height_0+layer_height*10 wall_thickness = =line_width*6 -support_interface_height = =layer_height*12 + diff --git a/resources/quality/flyingbear/flyingbear_global_0.12_super.inst.cfg b/resources/quality/flyingbear/flyingbear_global_0.12_super.inst.cfg index 1f77a6f2c9..4fcae6bc18 100644 --- a/resources/quality/flyingbear/flyingbear_global_0.12_super.inst.cfg +++ b/resources/quality/flyingbear/flyingbear_global_0.12_super.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Super Quality definition = flyingbear_base +name = Super Quality +version = 4 [metadata] +global_quality = True +quality_type = super setting_version = 20 type = quality -quality_type = super weight = -1 -global_quality = True [values] layer_height = 0.12 layer_height_0 = 0.16 +support_interface_height = =layer_height*8 top_bottom_thickness = =layer_height_0+layer_height*6 wall_thickness = =line_width*6 -support_interface_height = =layer_height*8 + diff --git a/resources/quality/flyingbear/flyingbear_global_0.16_adaptive.inst.cfg b/resources/quality/flyingbear/flyingbear_global_0.16_adaptive.inst.cfg index 53cb7e90c6..545237d450 100644 --- a/resources/quality/flyingbear/flyingbear_global_0.16_adaptive.inst.cfg +++ b/resources/quality/flyingbear/flyingbear_global_0.16_adaptive.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Dynamic Quality definition = flyingbear_base +name = Dynamic Quality +version = 4 [metadata] +global_quality = True +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive weight = -2 -global_quality = True [values] +adaptive_layer_height_enabled = true layer_height = 0.16 layer_height_0 = 0.20 +support_interface_height = =layer_height*6 top_bottom_thickness = =layer_height_0+layer_height*4 wall_thickness = =line_width*5 -support_interface_height = =layer_height*6 -adaptive_layer_height_enabled = true + diff --git a/resources/quality/flyingbear/flyingbear_global_0.20_standard.inst.cfg b/resources/quality/flyingbear/flyingbear_global_0.20_standard.inst.cfg index a18d440386..ee636c8ebb 100644 --- a/resources/quality/flyingbear/flyingbear_global_0.20_standard.inst.cfg +++ b/resources/quality/flyingbear/flyingbear_global_0.20_standard.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Standard Quality definition = flyingbear_base +name = Standard Quality +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = -3 -global_quality = True [values] layer_height = 0.20 layer_height_0 = 0.20 +support_interface_height = =layer_height*5 top_bottom_thickness = =layer_height_0+layer_height*3 wall_thickness = =line_width*4 -support_interface_height = =layer_height*5 + diff --git a/resources/quality/flyingbear/flyingbear_global_0.28_low.inst.cfg b/resources/quality/flyingbear/flyingbear_global_0.28_low.inst.cfg index 679392cf7e..9a03d5b2b6 100644 --- a/resources/quality/flyingbear/flyingbear_global_0.28_low.inst.cfg +++ b/resources/quality/flyingbear/flyingbear_global_0.28_low.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Low Quality definition = flyingbear_base +name = Low Quality +version = 4 [metadata] +global_quality = True +quality_type = low setting_version = 20 type = quality -quality_type = low weight = -4 -global_quality = True [values] layer_height = 0.28 layer_height_0 = 0.28 +support_interface_height = =layer_height*4 top_bottom_thickness = =layer_height_0+layer_height*3 wall_thickness = =line_width*3 -support_interface_height = =layer_height*4 + diff --git a/resources/quality/flyingbear/flyingbear_global_0.32_draft.inst.cfg b/resources/quality/flyingbear/flyingbear_global_0.32_draft.inst.cfg index 183cfb2f1e..d6cfa97972 100644 --- a/resources/quality/flyingbear/flyingbear_global_0.32_draft.inst.cfg +++ b/resources/quality/flyingbear/flyingbear_global_0.32_draft.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Draft Quality definition = flyingbear_base +name = Draft Quality +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -5 -global_quality = True [values] layer_height = 0.32 layer_height_0 = 0.32 +support_interface_height = =layer_height*3 top_bottom_thickness = =layer_height_0+layer_height*3 wall_thickness = =line_width*3 -support_interface_height = =layer_height*3 + diff --git a/resources/quality/flyingbear/flyingbear_global_0.40_coarse.inst.cfg b/resources/quality/flyingbear/flyingbear_global_0.40_coarse.inst.cfg index 81221eac6b..82a0234471 100644 --- a/resources/quality/flyingbear/flyingbear_global_0.40_coarse.inst.cfg +++ b/resources/quality/flyingbear/flyingbear_global_0.40_coarse.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Coarse Quality definition = flyingbear_base +name = Coarse Quality +version = 4 [metadata] +global_quality = True +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = -6 -global_quality = True [values] layer_height = 0.40 layer_height_0 = 0.40 +support_interface_height = =layer_height*2 top_bottom_thickness = =layer_height_0+layer_height*3 wall_thickness = =line_width*2 -support_interface_height = =layer_height*2 + diff --git a/resources/quality/flyingbear/hips/flyingbear_0.25_hips_super.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.25_hips_super.inst.cfg index 40fe26cc36..8708cc47bd 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.25_hips_super.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.25_hips_super.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Super Quality definition = flyingbear_base +name = Super Quality +version = 4 [metadata] +material = generic_hips +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_hips variant = 0.25mm Nozzle [values] -wall_thickness = =line_width*6 adhesion_type = brim +wall_thickness = =line_width*6 + diff --git a/resources/quality/flyingbear/hips/flyingbear_0.25_hips_ultra.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.25_hips_ultra.inst.cfg index 282a3ae616..695813561c 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.25_hips_ultra.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.25_hips_ultra.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Ultra Quality definition = flyingbear_base +name = Ultra Quality +version = 4 [metadata] +material = generic_hips +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra -material = generic_hips variant = 0.25mm Nozzle [values] -wall_thickness = =line_width*6 adhesion_type = brim +wall_thickness = =line_width*6 + diff --git a/resources/quality/flyingbear/hips/flyingbear_0.30_hips_adaptive.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.30_hips_adaptive.inst.cfg index 447c8dfc26..defd222cdd 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.30_hips_adaptive.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.30_hips_adaptive.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = flyingbear_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_hips +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_hips variant = 0.3mm Nozzle [values] -wall_thickness = =line_width*5 adhesion_type = brim +wall_thickness = =line_width*5 + diff --git a/resources/quality/flyingbear/hips/flyingbear_0.30_hips_standard.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.30_hips_standard.inst.cfg index 8bb462c5c2..181969c92a 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.30_hips_standard.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.30_hips_standard.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = flyingbear_base +name = Standard Quality +version = 4 [metadata] +material = generic_hips +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_hips variant = 0.3mm Nozzle [values] -wall_thickness = =line_width*5 adhesion_type = brim +wall_thickness = =line_width*5 + diff --git a/resources/quality/flyingbear/hips/flyingbear_0.30_hips_super.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.30_hips_super.inst.cfg index 662227c87c..8b97244f82 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.30_hips_super.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.30_hips_super.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Super Quality definition = flyingbear_base +name = Super Quality +version = 4 [metadata] +material = generic_hips +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_hips variant = 0.3mm Nozzle [values] -wall_thickness = =line_width*5 adhesion_type = brim +wall_thickness = =line_width*5 + diff --git a/resources/quality/flyingbear/hips/flyingbear_0.40_hips_adaptive.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.40_hips_adaptive.inst.cfg index fb7c8e298f..4d98e03f6f 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.40_hips_adaptive.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.40_hips_adaptive.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = flyingbear_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_hips +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_hips variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = brim +wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/hips/flyingbear_0.40_hips_low.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.40_hips_low.inst.cfg index 1bff97b776..f52a409827 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.40_hips_low.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.40_hips_low.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Low Quality definition = flyingbear_base +name = Low Quality +version = 4 [metadata] +material = generic_hips +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_hips variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = brim +wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/hips/flyingbear_0.40_hips_standard.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.40_hips_standard.inst.cfg index 7830a94a13..606aabab6b 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.40_hips_standard.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.40_hips_standard.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = flyingbear_base +name = Standard Quality +version = 4 [metadata] +material = generic_hips +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_hips variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = brim +wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/hips/flyingbear_0.40_hips_super.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.40_hips_super.inst.cfg index 7e694af8ab..e6c6f0d0df 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.40_hips_super.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.40_hips_super.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Super Quality definition = flyingbear_base +name = Super Quality +version = 4 [metadata] +material = generic_hips +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_hips variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = brim +wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/hips/flyingbear_0.50_hips_adaptive.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.50_hips_adaptive.inst.cfg index 1741cda0b9..ce428380af 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.50_hips_adaptive.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.50_hips_adaptive.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = flyingbear_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_hips +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_hips variant = 0.5mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = brim +wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/hips/flyingbear_0.50_hips_draft.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.50_hips_draft.inst.cfg index 3c44beb549..06c689a4d2 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.50_hips_draft.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.50_hips_draft.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Draft Quality definition = flyingbear_base +name = Draft Quality +version = 4 [metadata] +material = generic_hips +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_hips variant = 0.5mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = brim +wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/hips/flyingbear_0.50_hips_low.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.50_hips_low.inst.cfg index 06e83427bb..f746c2b94b 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.50_hips_low.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.50_hips_low.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Low Quality definition = flyingbear_base +name = Low Quality +version = 4 [metadata] +material = generic_hips +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_hips variant = 0.5mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = brim +wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/hips/flyingbear_0.50_hips_standard.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.50_hips_standard.inst.cfg index f292cf11ea..4956797bef 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.50_hips_standard.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.50_hips_standard.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = flyingbear_base +name = Standard Quality +version = 4 [metadata] +material = generic_hips +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_hips variant = 0.5mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = brim +wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/hips/flyingbear_0.60_hips_draft.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.60_hips_draft.inst.cfg index b25514284b..3fb8ae033c 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.60_hips_draft.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.60_hips_draft.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Draft Quality definition = flyingbear_base +name = Draft Quality +version = 4 [metadata] +material = generic_hips +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_hips variant = 0.6mm Nozzle [values] -wall_thickness = =line_width*3 adhesion_type = brim +wall_thickness = =line_width*3 + diff --git a/resources/quality/flyingbear/hips/flyingbear_0.60_hips_low.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.60_hips_low.inst.cfg index 9cb5ea67fa..b8efe91a12 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.60_hips_low.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.60_hips_low.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Low Quality definition = flyingbear_base +name = Low Quality +version = 4 [metadata] +material = generic_hips +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_hips variant = 0.6mm Nozzle [values] -wall_thickness = =line_width*3 adhesion_type = brim +wall_thickness = =line_width*3 + diff --git a/resources/quality/flyingbear/hips/flyingbear_0.60_hips_standard.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.60_hips_standard.inst.cfg index 3c6cae19af..0feda63da4 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.60_hips_standard.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.60_hips_standard.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = flyingbear_base +name = Standard Quality +version = 4 [metadata] +material = generic_hips +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_hips variant = 0.6mm Nozzle [values] -wall_thickness = =line_width*3 adhesion_type = brim +wall_thickness = =line_width*3 + diff --git a/resources/quality/flyingbear/hips/flyingbear_0.80_hips_coarse.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.80_hips_coarse.inst.cfg index 45629b0dc9..d02f629f09 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.80_hips_coarse.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.80_hips_coarse.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Coarse Quality definition = flyingbear_base +name = Coarse Quality +version = 4 [metadata] +material = generic_hips +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -material = generic_hips variant = 0.8mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = brim +wall_thickness = =line_width*2 + diff --git a/resources/quality/flyingbear/hips/flyingbear_0.80_hips_draft.inst.cfg b/resources/quality/flyingbear/hips/flyingbear_0.80_hips_draft.inst.cfg index 665f77ab39..f76b7132e5 100644 --- a/resources/quality/flyingbear/hips/flyingbear_0.80_hips_draft.inst.cfg +++ b/resources/quality/flyingbear/hips/flyingbear_0.80_hips_draft.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Draft Quality definition = flyingbear_base +name = Draft Quality +version = 4 [metadata] +material = generic_hips +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_hips variant = 0.8mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = brim +wall_thickness = =line_width*2 + diff --git a/resources/quality/flyingbear/petg/flyingbear_0.25_petg_super.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.25_petg_super.inst.cfg index 3beb72fe59..60a20d77db 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.25_petg_super.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.25_petg_super.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Super Quality definition = flyingbear_base +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_petg variant = 0.25mm Nozzle [values] -wall_thickness = =line_width*6 speed_layer_0 = 15 +wall_thickness = =line_width*6 + diff --git a/resources/quality/flyingbear/petg/flyingbear_0.25_petg_ultra.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.25_petg_ultra.inst.cfg index 889f587098..24a8f60635 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.25_petg_ultra.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.25_petg_ultra.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Ultra Quality definition = flyingbear_base +name = Ultra Quality +version = 4 [metadata] +material = generic_petg +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra -material = generic_petg variant = 0.25mm Nozzle [values] -wall_thickness = =line_width*6 speed_layer_0 = 15 +wall_thickness = =line_width*6 + diff --git a/resources/quality/flyingbear/petg/flyingbear_0.30_petg_adaptive.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.30_petg_adaptive.inst.cfg index 24f5b1b1de..bbefb1ee05 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.30_petg_adaptive.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.30_petg_adaptive.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = flyingbear_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_petg +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_petg variant = 0.3mm Nozzle [values] -wall_thickness = =line_width*5 speed_layer_0 = 15 +wall_thickness = =line_width*5 + diff --git a/resources/quality/flyingbear/petg/flyingbear_0.30_petg_standard.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.30_petg_standard.inst.cfg index eb61570b8b..e15b064a6a 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.30_petg_standard.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.30_petg_standard.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = flyingbear_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_petg variant = 0.3mm Nozzle [values] -wall_thickness = =line_width*5 speed_layer_0 = 15 +wall_thickness = =line_width*5 + diff --git a/resources/quality/flyingbear/petg/flyingbear_0.30_petg_super.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.30_petg_super.inst.cfg index 4d7b2aa069..03025f4ced 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.30_petg_super.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.30_petg_super.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Super Quality definition = flyingbear_base +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_petg variant = 0.3mm Nozzle [values] -wall_thickness = =line_width*5 speed_layer_0 = 15 +wall_thickness = =line_width*5 + diff --git a/resources/quality/flyingbear/petg/flyingbear_0.40_petg_adaptive.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.40_petg_adaptive.inst.cfg index 263e4bc111..fb1aa530fc 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.40_petg_adaptive.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.40_petg_adaptive.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = flyingbear_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_petg +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_petg variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 speed_layer_0 = 15 +wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/petg/flyingbear_0.40_petg_low.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.40_petg_low.inst.cfg index e7cc75f763..7d21112ea4 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.40_petg_low.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.40_petg_low.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Low Quality definition = flyingbear_base +name = Low Quality +version = 4 [metadata] +material = generic_petg +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_petg variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 speed_layer_0 = 15 +wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/petg/flyingbear_0.40_petg_standard.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.40_petg_standard.inst.cfg index 7da165d65c..f1b09295f8 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.40_petg_standard.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.40_petg_standard.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = flyingbear_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_petg variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 speed_layer_0 = 15 +wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/petg/flyingbear_0.40_petg_super.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.40_petg_super.inst.cfg index 0cd1f2a8fd..0f23947f53 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.40_petg_super.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.40_petg_super.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Super Quality definition = flyingbear_base +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_petg variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 speed_layer_0 = 15 +wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/petg/flyingbear_0.50_petg_adaptive.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.50_petg_adaptive.inst.cfg index 7d22bbaddd..09aa1b532c 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.50_petg_adaptive.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.50_petg_adaptive.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = flyingbear_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_petg +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_petg variant = 0.5mm Nozzle [values] -wall_thickness = =line_width*4 speed_layer_0 = 15 +wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/petg/flyingbear_0.50_petg_draft.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.50_petg_draft.inst.cfg index f98d53391c..c31886d614 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.50_petg_draft.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.50_petg_draft.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Draft Quality definition = flyingbear_base +name = Draft Quality +version = 4 [metadata] +material = generic_petg +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_petg variant = 0.5mm Nozzle [values] -wall_thickness = =line_width*4 speed_layer_0 = 15 +wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/petg/flyingbear_0.50_petg_low.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.50_petg_low.inst.cfg index b5f72aab77..1775f78f44 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.50_petg_low.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.50_petg_low.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Low Quality definition = flyingbear_base +name = Low Quality +version = 4 [metadata] +material = generic_petg +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_petg variant = 0.5mm Nozzle [values] -wall_thickness = =line_width*4 speed_layer_0 = 15 +wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/petg/flyingbear_0.50_petg_standard.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.50_petg_standard.inst.cfg index 35c2649094..a8f743bb55 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.50_petg_standard.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.50_petg_standard.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = flyingbear_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_petg variant = 0.5mm Nozzle [values] -wall_thickness = =line_width*4 speed_layer_0 = 15 +wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/petg/flyingbear_0.60_petg_draft.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.60_petg_draft.inst.cfg index 534de34176..e07fcf9dee 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.60_petg_draft.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.60_petg_draft.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Draft Quality definition = flyingbear_base +name = Draft Quality +version = 4 [metadata] +material = generic_petg +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_petg variant = 0.6mm Nozzle [values] -wall_thickness = =line_width*3 speed_layer_0 = 15 +wall_thickness = =line_width*3 + diff --git a/resources/quality/flyingbear/petg/flyingbear_0.60_petg_low.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.60_petg_low.inst.cfg index 8387538c8e..6df5ccbfb1 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.60_petg_low.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.60_petg_low.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Low Quality definition = flyingbear_base +name = Low Quality +version = 4 [metadata] +material = generic_petg +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_petg variant = 0.6mm Nozzle [values] -wall_thickness = =line_width*3 speed_layer_0 = 15 +wall_thickness = =line_width*3 + diff --git a/resources/quality/flyingbear/petg/flyingbear_0.60_petg_standard.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.60_petg_standard.inst.cfg index 55dabe72ca..94af565b15 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.60_petg_standard.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.60_petg_standard.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = flyingbear_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_petg variant = 0.6mm Nozzle [values] -wall_thickness = =line_width*3 speed_layer_0 = 15 +wall_thickness = =line_width*3 + diff --git a/resources/quality/flyingbear/petg/flyingbear_0.80_petg_coarse.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.80_petg_coarse.inst.cfg index bdefc9750f..30e2a96883 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.80_petg_coarse.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.80_petg_coarse.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Coarse Quality definition = flyingbear_base +name = Coarse Quality +version = 4 [metadata] +material = generic_petg +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -material = generic_petg variant = 0.8mm Nozzle [values] -wall_thickness = =line_width*2 speed_layer_0 = 15 +wall_thickness = =line_width*2 + diff --git a/resources/quality/flyingbear/petg/flyingbear_0.80_petg_draft.inst.cfg b/resources/quality/flyingbear/petg/flyingbear_0.80_petg_draft.inst.cfg index 3a59b5c327..92db7384f9 100644 --- a/resources/quality/flyingbear/petg/flyingbear_0.80_petg_draft.inst.cfg +++ b/resources/quality/flyingbear/petg/flyingbear_0.80_petg_draft.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Draft Quality definition = flyingbear_base +name = Draft Quality +version = 4 [metadata] +material = generic_petg +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_petg variant = 0.8mm Nozzle [values] -wall_thickness = =line_width*2 speed_layer_0 = 15 +wall_thickness = =line_width*2 + diff --git a/resources/quality/flyingbear/pla/flyingbear_0.25_pla_super.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.25_pla_super.inst.cfg index 714bcca5a5..8622a77b7b 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.25_pla_super.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.25_pla_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = flyingbear_base +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla variant = 0.25mm Nozzle [values] wall_thickness = =line_width*6 + diff --git a/resources/quality/flyingbear/pla/flyingbear_0.25_pla_ultra.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.25_pla_ultra.inst.cfg index 5d0c476bed..e364770f99 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.25_pla_ultra.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.25_pla_ultra.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Ultra Quality definition = flyingbear_base +name = Ultra Quality +version = 4 [metadata] +material = generic_pla +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra -material = generic_pla variant = 0.25mm Nozzle [values] wall_thickness = =line_width*6 + diff --git a/resources/quality/flyingbear/pla/flyingbear_0.30_pla_adaptive.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.30_pla_adaptive.inst.cfg index 8aaef605e5..203fe4bc53 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.30_pla_adaptive.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.30_pla_adaptive.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = flyingbear_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_pla +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_pla variant = 0.3mm Nozzle [values] wall_thickness = =line_width*5 + diff --git a/resources/quality/flyingbear/pla/flyingbear_0.30_pla_standard.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.30_pla_standard.inst.cfg index 55fb575264..a06251183b 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.30_pla_standard.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.30_pla_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = flyingbear_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_pla variant = 0.3mm Nozzle [values] wall_thickness = =line_width*5 + diff --git a/resources/quality/flyingbear/pla/flyingbear_0.30_pla_super.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.30_pla_super.inst.cfg index 609aeb542c..635629af87 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.30_pla_super.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.30_pla_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = flyingbear_base +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla variant = 0.3mm Nozzle [values] wall_thickness = =line_width*5 + diff --git a/resources/quality/flyingbear/pla/flyingbear_0.40_pla_adaptive.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.40_pla_adaptive.inst.cfg index b311b68f23..97195ff1f3 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.40_pla_adaptive.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.40_pla_adaptive.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = flyingbear_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_pla +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_pla variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/pla/flyingbear_0.40_pla_low.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.40_pla_low.inst.cfg index 02c954cd4a..d50f84fe05 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.40_pla_low.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.40_pla_low.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = flyingbear_base +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/pla/flyingbear_0.40_pla_standard.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.40_pla_standard.inst.cfg index 4936321d46..8e4f397f27 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.40_pla_standard.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.40_pla_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = flyingbear_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_pla variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/pla/flyingbear_0.40_pla_super.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.40_pla_super.inst.cfg index d425e51db2..fa40572221 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.40_pla_super.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.40_pla_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = flyingbear_base +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/pla/flyingbear_0.50_pla_adaptive.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.50_pla_adaptive.inst.cfg index b59a49d175..6430a2130c 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.50_pla_adaptive.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.50_pla_adaptive.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = flyingbear_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_pla +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_pla variant = 0.5mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/pla/flyingbear_0.50_pla_draft.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.50_pla_draft.inst.cfg index 79da2e980b..36bf136685 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.50_pla_draft.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.50_pla_draft.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = flyingbear_base +name = Draft Quality +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_pla variant = 0.5mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/pla/flyingbear_0.50_pla_low.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.50_pla_low.inst.cfg index 9ccdd46534..86b99061be 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.50_pla_low.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.50_pla_low.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = flyingbear_base +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla variant = 0.5mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/pla/flyingbear_0.50_pla_standard.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.50_pla_standard.inst.cfg index 9168a08656..5adff934e4 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.50_pla_standard.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.50_pla_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = flyingbear_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_pla variant = 0.5mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/pla/flyingbear_0.60_pla_draft.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.60_pla_draft.inst.cfg index c14020ac8b..f49e6a205b 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.60_pla_draft.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.60_pla_draft.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = flyingbear_base +name = Draft Quality +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_pla variant = 0.6mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/flyingbear/pla/flyingbear_0.60_pla_low.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.60_pla_low.inst.cfg index b61fdece93..6de347dd22 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.60_pla_low.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.60_pla_low.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = flyingbear_base +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla variant = 0.6mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/flyingbear/pla/flyingbear_0.60_pla_standard.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.60_pla_standard.inst.cfg index 49b47f35e4..8b2a32f0ff 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.60_pla_standard.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.60_pla_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = flyingbear_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_pla variant = 0.6mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/flyingbear/pla/flyingbear_0.80_pla_coarse.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.80_pla_coarse.inst.cfg index e8c7156aa1..66ff665d2c 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.80_pla_coarse.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.80_pla_coarse.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Coarse Quality definition = flyingbear_base +name = Coarse Quality +version = 4 [metadata] +material = generic_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -material = generic_pla variant = 0.8mm Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/flyingbear/pla/flyingbear_0.80_pla_draft.inst.cfg b/resources/quality/flyingbear/pla/flyingbear_0.80_pla_draft.inst.cfg index d28c317730..c49b2dc2ab 100644 --- a/resources/quality/flyingbear/pla/flyingbear_0.80_pla_draft.inst.cfg +++ b/resources/quality/flyingbear/pla/flyingbear_0.80_pla_draft.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = flyingbear_base +name = Draft Quality +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_pla variant = 0.8mm Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.25_plapro_super.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.25_plapro_super.inst.cfg index 03f81a6c6a..f62cebd17a 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.25_plapro_super.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.25_plapro_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = flyingbear_base +name = Super Quality +version = 4 [metadata] +material = eSUN_PLA_PRO_Black +quality_type = super setting_version = 20 type = quality -quality_type = super -material = eSUN_PLA_PRO_Black variant = 0.25mm Nozzle [values] wall_thickness = =line_width*6 + diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.25_plapro_ultra.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.25_plapro_ultra.inst.cfg index 8b98387322..8a6c57b24a 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.25_plapro_ultra.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.25_plapro_ultra.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Ultra Quality definition = flyingbear_base +name = Ultra Quality +version = 4 [metadata] +material = eSUN_PLA_PRO_Black +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra -material = eSUN_PLA_PRO_Black variant = 0.25mm Nozzle [values] wall_thickness = =line_width*6 + diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_adaptive.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_adaptive.inst.cfg index 6635ddb642..5bdd334131 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_adaptive.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_adaptive.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = flyingbear_base +name = Dynamic Quality +version = 4 [metadata] +material = eSUN_PLA_PRO_Black +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = eSUN_PLA_PRO_Black variant = 0.3mm Nozzle [values] wall_thickness = =line_width*5 + diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_standard.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_standard.inst.cfg index 34b99229df..9661f33b7b 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_standard.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = flyingbear_base +name = Standard Quality +version = 4 [metadata] +material = eSUN_PLA_PRO_Black +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = eSUN_PLA_PRO_Black variant = 0.3mm Nozzle [values] wall_thickness = =line_width*5 + diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_super.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_super.inst.cfg index af62fe0d8f..126975e718 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_super.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.30_plapro_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = flyingbear_base +name = Super Quality +version = 4 [metadata] +material = eSUN_PLA_PRO_Black +quality_type = super setting_version = 20 type = quality -quality_type = super -material = eSUN_PLA_PRO_Black variant = 0.3mm Nozzle [values] wall_thickness = =line_width*5 + diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.40_plapro_adaptive.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.40_plapro_adaptive.inst.cfg index 8ae4a3c278..2bb3812bff 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.40_plapro_adaptive.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.40_plapro_adaptive.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = flyingbear_base +name = Dynamic Quality +version = 4 [metadata] +material = eSUN_PLA_PRO_Black +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = eSUN_PLA_PRO_Black variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.40_plapro_low.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.40_plapro_low.inst.cfg index 33bd7adf64..2518a0a972 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.40_plapro_low.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.40_plapro_low.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = flyingbear_base +name = Low Quality +version = 4 [metadata] +material = eSUN_PLA_PRO_Black +quality_type = low setting_version = 20 type = quality -quality_type = low -material = eSUN_PLA_PRO_Black variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.40_plapro_standard.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.40_plapro_standard.inst.cfg index 533e12135b..202157f9e8 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.40_plapro_standard.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.40_plapro_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = flyingbear_base +name = Standard Quality +version = 4 [metadata] +material = eSUN_PLA_PRO_Black +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = eSUN_PLA_PRO_Black variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.40_plapro_super.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.40_plapro_super.inst.cfg index 4c69c388e0..dec991afca 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.40_plapro_super.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.40_plapro_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = flyingbear_base +name = Super Quality +version = 4 [metadata] +material = eSUN_PLA_PRO_Black +quality_type = super setting_version = 20 type = quality -quality_type = super -material = eSUN_PLA_PRO_Black variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_adaptive.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_adaptive.inst.cfg index c0593652f1..85f34a39e2 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_adaptive.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_adaptive.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = flyingbear_base +name = Dynamic Quality +version = 4 [metadata] +material = eSUN_PLA_PRO_Black +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = eSUN_PLA_PRO_Black variant = 0.5mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_draft.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_draft.inst.cfg index 6ba0d41d7d..d753ca1d15 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_draft.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_draft.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = flyingbear_base +name = Draft Quality +version = 4 [metadata] +material = eSUN_PLA_PRO_Black +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = eSUN_PLA_PRO_Black variant = 0.5mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_low.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_low.inst.cfg index eb63ee07e7..f637e89f3d 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_low.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_low.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = flyingbear_base +name = Low Quality +version = 4 [metadata] +material = eSUN_PLA_PRO_Black +quality_type = low setting_version = 20 type = quality -quality_type = low -material = eSUN_PLA_PRO_Black variant = 0.5mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_standard.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_standard.inst.cfg index 77a38c1f98..c9ac4222eb 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_standard.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.50_plapro_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = flyingbear_base +name = Standard Quality +version = 4 [metadata] +material = eSUN_PLA_PRO_Black +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = eSUN_PLA_PRO_Black variant = 0.5mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_draft.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_draft.inst.cfg index e041927278..8b8507e507 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_draft.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_draft.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = flyingbear_base +name = Draft Quality +version = 4 [metadata] +material = eSUN_PLA_PRO_Black +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = eSUN_PLA_PRO_Black variant = 0.6mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_low.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_low.inst.cfg index 56bc3e3743..41ac93e773 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_low.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_low.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = flyingbear_base +name = Low Quality +version = 4 [metadata] +material = eSUN_PLA_PRO_Black +quality_type = low setting_version = 20 type = quality -quality_type = low -material = eSUN_PLA_PRO_Black variant = 0.6mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_standard.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_standard.inst.cfg index 39e15492a4..e48f463f89 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_standard.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.60_plapro_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = flyingbear_base +name = Standard Quality +version = 4 [metadata] +material = eSUN_PLA_PRO_Black +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = eSUN_PLA_PRO_Black variant = 0.6mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.80_plapro_coarse.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.80_plapro_coarse.inst.cfg index af43ec60a9..582e9d5e01 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.80_plapro_coarse.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.80_plapro_coarse.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Coarse Quality definition = flyingbear_base +name = Coarse Quality +version = 4 [metadata] +material = eSUN_PLA_PRO_Black +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -material = eSUN_PLA_PRO_Black variant = 0.8mm Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/flyingbear/plapro/flyingbear_0.80_plapro_draft.inst.cfg b/resources/quality/flyingbear/plapro/flyingbear_0.80_plapro_draft.inst.cfg index 01e97fbdbf..1a0a2affbb 100644 --- a/resources/quality/flyingbear/plapro/flyingbear_0.80_plapro_draft.inst.cfg +++ b/resources/quality/flyingbear/plapro/flyingbear_0.80_plapro_draft.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = flyingbear_base +name = Draft Quality +version = 4 [metadata] +material = eSUN_PLA_PRO_Black +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = eSUN_PLA_PRO_Black variant = 0.8mm Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_adaptive.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_adaptive.inst.cfg index e794d16e73..10dcb70773 100644 --- a/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_adaptive.inst.cfg +++ b/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_adaptive.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Dynamic Quality definition = flyingbear_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_tpu +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_tpu variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 -speed_print = 20 speed_layer_0 = 10 +speed_print = 20 +wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_low.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_low.inst.cfg index d2bab94bf6..836118ae22 100644 --- a/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_low.inst.cfg +++ b/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_low.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Low Quality definition = flyingbear_base +name = Low Quality +version = 4 [metadata] +material = generic_tpu +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_tpu variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 -speed_print = 20 speed_layer_0 = 10 +speed_print = 20 +wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_standard.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_standard.inst.cfg index 5604fcb2da..7b28c33279 100644 --- a/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_standard.inst.cfg +++ b/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_standard.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Standard Quality definition = flyingbear_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_tpu variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 -speed_print = 20 speed_layer_0 = 10 +speed_print = 20 +wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_super.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_super.inst.cfg index 2b9d3c7392..dcbdd90d4f 100644 --- a/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_super.inst.cfg +++ b/resources/quality/flyingbear/tpu/flyingbear_0.40_tpu_super.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Super Quality definition = flyingbear_base +name = Super Quality +version = 4 [metadata] +material = generic_tpu +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_tpu variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 -speed_print = 20 speed_layer_0 = 10 +speed_print = 20 +wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_adaptive.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_adaptive.inst.cfg index 31a1e86d1d..4ca7270efc 100644 --- a/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_adaptive.inst.cfg +++ b/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_adaptive.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Dynamic Quality definition = flyingbear_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_tpu +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_tpu variant = 0.5mm Nozzle [values] -wall_thickness = =line_width*4 -speed_print = 20 speed_layer_0 = 10 +speed_print = 20 +wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_draft.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_draft.inst.cfg index 38fa653761..39f192ddd5 100644 --- a/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_draft.inst.cfg +++ b/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_draft.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Draft Quality definition = flyingbear_base +name = Draft Quality +version = 4 [metadata] +material = generic_tpu +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_tpu variant = 0.5mm Nozzle [values] -wall_thickness = =line_width*4 -speed_print = 20 speed_layer_0 = 10 +speed_print = 20 +wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_low.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_low.inst.cfg index 78befe7feb..daceaf39a7 100644 --- a/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_low.inst.cfg +++ b/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_low.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Low Quality definition = flyingbear_base +name = Low Quality +version = 4 [metadata] +material = generic_tpu +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_tpu variant = 0.5mm Nozzle [values] -wall_thickness = =line_width*4 -speed_print = 20 speed_layer_0 = 10 +speed_print = 20 +wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_standard.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_standard.inst.cfg index 4757e159ef..9814112b0f 100644 --- a/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_standard.inst.cfg +++ b/resources/quality/flyingbear/tpu/flyingbear_0.50_tpu_standard.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Standard Quality definition = flyingbear_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_tpu variant = 0.5mm Nozzle [values] -wall_thickness = =line_width*4 -speed_print = 20 speed_layer_0 = 10 +speed_print = 20 +wall_thickness = =line_width*4 + diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_draft.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_draft.inst.cfg index d5b9a73c55..a58f95a7c3 100644 --- a/resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_draft.inst.cfg +++ b/resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_draft.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Draft Quality definition = flyingbear_base +name = Draft Quality +version = 4 [metadata] +material = generic_tpu +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_tpu variant = 0.6mm Nozzle [values] -wall_thickness = =line_width*3 -speed_print = 20 speed_layer_0 = 10 +speed_print = 20 +wall_thickness = =line_width*3 + diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_low.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_low.inst.cfg index 1edbb27e4e..a1aaa73fc9 100644 --- a/resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_low.inst.cfg +++ b/resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_low.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Low Quality definition = flyingbear_base +name = Low Quality +version = 4 [metadata] +material = generic_tpu +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_tpu variant = 0.6mm Nozzle [values] -wall_thickness = =line_width*3 -speed_print = 20 speed_layer_0 = 10 +speed_print = 20 +wall_thickness = =line_width*3 + diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_standard.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_standard.inst.cfg index 9594e31e24..dc37f4693a 100644 --- a/resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_standard.inst.cfg +++ b/resources/quality/flyingbear/tpu/flyingbear_0.60_tpu_standard.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Standard Quality definition = flyingbear_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_tpu variant = 0.6mm Nozzle [values] -wall_thickness = =line_width*3 -speed_print = 20 speed_layer_0 = 10 +speed_print = 20 +wall_thickness = =line_width*3 + diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.80_tpu_coarse.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.80_tpu_coarse.inst.cfg index 2fc7527bd2..aba6966c9c 100644 --- a/resources/quality/flyingbear/tpu/flyingbear_0.80_tpu_coarse.inst.cfg +++ b/resources/quality/flyingbear/tpu/flyingbear_0.80_tpu_coarse.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Coarse Quality definition = flyingbear_base +name = Coarse Quality +version = 4 [metadata] +material = generic_tpu +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -material = generic_tpu variant = 0.8mm Nozzle [values] -wall_thickness = =line_width*2 -speed_print = 20 speed_layer_0 = 10 +speed_print = 20 +wall_thickness = =line_width*2 + diff --git a/resources/quality/flyingbear/tpu/flyingbear_0.80_tpu_draft.inst.cfg b/resources/quality/flyingbear/tpu/flyingbear_0.80_tpu_draft.inst.cfg index 1d4e9255d4..4d3124ecc7 100644 --- a/resources/quality/flyingbear/tpu/flyingbear_0.80_tpu_draft.inst.cfg +++ b/resources/quality/flyingbear/tpu/flyingbear_0.80_tpu_draft.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Draft Quality definition = flyingbear_base +name = Draft Quality +version = 4 [metadata] +material = generic_tpu +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_tpu variant = 0.8mm Nozzle [values] -wall_thickness = =line_width*2 -speed_print = 20 speed_layer_0 = 10 +speed_print = 20 +wall_thickness = =line_width*2 + diff --git a/resources/quality/fusedform/base/base_PVA_draft.inst.cfg b/resources/quality/fusedform/base/base_PVA_draft.inst.cfg index 9201fbd33b..0152401cfc 100644 --- a/resources/quality/fusedform/base/base_PVA_draft.inst.cfg +++ b/resources/quality/fusedform/base/base_PVA_draft.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Draft quality definition = fusedform_base +name = Draft quality +version = 4 [metadata] +material = generic_pva +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -material = generic_pva [values] -material_print_temperature = 190 material_bed_temperature = 60 +material_print_temperature = 190 speed_infill = =speed_print speed_layer_0 = 20 speed_print = 25 speed_topbottom = 20 speed_travel = 70 speed_wall = 20 -speed_wall_x = 25 \ No newline at end of file +speed_wall_x = 25 + diff --git a/resources/quality/fusedform/base/base_PVA_high.inst.cfg b/resources/quality/fusedform/base/base_PVA_high.inst.cfg index a5402a795c..17a4d1312f 100644 --- a/resources/quality/fusedform/base/base_PVA_high.inst.cfg +++ b/resources/quality/fusedform/base/base_PVA_high.inst.cfg @@ -1,18 +1,18 @@ [general] -version = 4 -name = High Quality definition = fusedform_base +name = High Quality +version = 4 [metadata] +material = generic_pva +quality_type = high setting_version = 20 type = quality -quality_type = high weight = -1 -material = generic_pva [values] -material_print_temperature = 190 material_bed_temperature = 60 +material_print_temperature = 190 speed_infill = =speed_print speed_layer_0 = 20 speed_print = 25 @@ -20,3 +20,4 @@ speed_topbottom = 20 speed_travel = 70 speed_wall = 20 speed_wall_x = 25 + diff --git a/resources/quality/fusedform/base/base_PVA_normal.inst.cfg b/resources/quality/fusedform/base/base_PVA_normal.inst.cfg index 4f17f6cf75..29cd97d867 100644 --- a/resources/quality/fusedform/base/base_PVA_normal.inst.cfg +++ b/resources/quality/fusedform/base/base_PVA_normal.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Normal quality definition = fusedform_base +name = Normal quality +version = 4 [metadata] +material = generic_pva +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = -2 -material = generic_pva [values] -material_print_temperature = 190 material_bed_temperature = 60 +material_print_temperature = 190 speed_infill = =speed_print speed_layer_0 = 20 speed_print = 25 speed_topbottom = 20 speed_travel = 70 speed_wall = 20 -speed_wall_x = 25 \ No newline at end of file +speed_wall_x = 25 + diff --git a/resources/quality/fusedform/base/base_abs_draft.inst.cfg b/resources/quality/fusedform/base/base_abs_draft.inst.cfg index 48dc85e292..1b9abd9354 100644 --- a/resources/quality/fusedform/base/base_abs_draft.inst.cfg +++ b/resources/quality/fusedform/base/base_abs_draft.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Draft Quality definition = fusedform_base +name = Draft Quality +version = 4 [metadata] +material = generic_abs +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_abs [values] -cool_fan_enabled = False -brim_width = 12 -support_brim_enable = True adhesion_type = brim +brim_width = 12 +cool_fan_enabled = False material_bed_temperature = 100 material_bed_temperature_layer_0 = 90 -material_print_temperature = 240 \ No newline at end of file +material_print_temperature = 240 +support_brim_enable = True + diff --git a/resources/quality/fusedform/base/base_abs_high.inst.cfg b/resources/quality/fusedform/base/base_abs_high.inst.cfg index c2e55b351c..43178ca264 100644 --- a/resources/quality/fusedform/base/base_abs_high.inst.cfg +++ b/resources/quality/fusedform/base/base_abs_high.inst.cfg @@ -1,21 +1,21 @@ [general] -version = 4 -name = High Quality definition = fusedform_base +name = High Quality +version = 4 [metadata] +material = generic_abs +quality_type = high setting_version = 20 type = quality -quality_type = high weight = -1 -material = generic_abs - [values] -cool_fan_enabled = False -brim_width = 12 -support_brim_enable = True adhesion_type = brim +brim_width = 12 +cool_fan_enabled = False material_bed_temperature = 100 material_bed_temperature_layer_0 = 90 -material_print_temperature = 240 \ No newline at end of file +material_print_temperature = 240 +support_brim_enable = True + diff --git a/resources/quality/fusedform/base/base_abs_normal.inst.cfg b/resources/quality/fusedform/base/base_abs_normal.inst.cfg index d81eb35575..8cf8884985 100644 --- a/resources/quality/fusedform/base/base_abs_normal.inst.cfg +++ b/resources/quality/fusedform/base/base_abs_normal.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Normal Quality definition = fusedform_base +name = Normal Quality +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = -2 -material = generic_abs [values] -cool_fan_enabled = False -brim_width = 12 -support_brim_enable = True adhesion_type = brim +brim_width = 12 +cool_fan_enabled = False material_bed_temperature = 100 material_bed_temperature_layer_0 = 90 -material_print_temperature = 240 \ No newline at end of file +material_print_temperature = 240 +support_brim_enable = True + diff --git a/resources/quality/fusedform/base/base_abs_ultra_high.inst.cfg b/resources/quality/fusedform/base/base_abs_ultra_high.inst.cfg index 62691f3f8c..13618188cd 100644 --- a/resources/quality/fusedform/base/base_abs_ultra_high.inst.cfg +++ b/resources/quality/fusedform/base/base_abs_ultra_high.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Ultra High Quality definition = fusedform_base +name = Ultra High Quality +version = 4 [metadata] +material = generic_abs +quality_type = ultra high setting_version = 20 type = quality -quality_type =ultra high weight = -1 -material = generic_abs [values] -cool_fan_enabled = False -brim_width = 12 -support_brim_enable = True adhesion_type = brim +brim_width = 12 +cool_fan_enabled = False material_bed_temperature = 100 material_bed_temperature_layer_0 = 90 -material_print_temperature = 240 \ No newline at end of file +material_print_temperature = 240 +support_brim_enable = True + diff --git a/resources/quality/fusedform/base/base_draft.inst.cfg b/resources/quality/fusedform/base/base_draft.inst.cfg index 5757381181..993b543dd3 100644 --- a/resources/quality/fusedform/base/base_draft.inst.cfg +++ b/resources/quality/fusedform/base/base_draft.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = fusedform_base +name = Draft Quality +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -4 -global_quality=True [values] layer_height = 0.25 + diff --git a/resources/quality/fusedform/base/base_flex_high.inst.cfg b/resources/quality/fusedform/base/base_flex_high.inst.cfg index 1c28457d5b..5e597fef3e 100644 --- a/resources/quality/fusedform/base/base_flex_high.inst.cfg +++ b/resources/quality/fusedform/base/base_flex_high.inst.cfg @@ -1,19 +1,19 @@ [general] -version = 4 -name = High Quality definition = fusedform_base +name = High Quality +version = 4 [metadata] +material = generic_tpu +quality_type = high setting_version = 20 type = quality -quality_type = high weight = -1 -material = generic_tpu [values] layer_height_0 = 0.25 -material_print_temperature = 220 material_bed_temperature = 60 +material_print_temperature = 220 speed_infill = =speed_print speed_layer_0 = 20 speed_print = 25 @@ -21,3 +21,4 @@ speed_topbottom = 20 speed_travel = 70 speed_wall = 20 speed_wall_x = 25 + diff --git a/resources/quality/fusedform/base/base_flex_normal.inst.cfg b/resources/quality/fusedform/base/base_flex_normal.inst.cfg index c4f00888f7..96566457d1 100644 --- a/resources/quality/fusedform/base/base_flex_normal.inst.cfg +++ b/resources/quality/fusedform/base/base_flex_normal.inst.cfg @@ -1,23 +1,24 @@ [general] -version = 4 -name = Normal quality definition = fusedform_base +name = Normal quality +version = 4 [metadata] +material = generic_tpu +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = -2 -material = generic_tpu [values] layer_height_0 = 0.25 -material_print_temperature = 220 material_bed_temperature = 60 +material_print_temperature = 220 speed_infill = =speed_print speed_layer_0 = 20 speed_print = 25 speed_topbottom = 20 speed_travel = 70 speed_wall = 20 -speed_wall_x = 25 \ No newline at end of file +speed_wall_x = 25 + diff --git a/resources/quality/fusedform/base/base_high.inst.cfg b/resources/quality/fusedform/base/base_high.inst.cfg index 2de5753c1e..ae7fffdf0e 100644 --- a/resources/quality/fusedform/base/base_high.inst.cfg +++ b/resources/quality/fusedform/base/base_high.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = High Quality definition = fusedform_base +name = High Quality +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = -1 -global_quality=True - [values] layer_height = 0.1 + diff --git a/resources/quality/fusedform/base/base_hips_draft.inst.cfg b/resources/quality/fusedform/base/base_hips_draft.inst.cfg index 37628dac70..f7776c927d 100644 --- a/resources/quality/fusedform/base/base_hips_draft.inst.cfg +++ b/resources/quality/fusedform/base/base_hips_draft.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Draft Quality definition = fusedform_base +name = Draft Quality +version = 4 [metadata] +material = generic_hips +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_hips [values] -cool_fan_enabled = False -brim_width = 12 -support_brim_enable = True adhesion_type = brim +brim_width = 12 +cool_fan_enabled = False material_bed_temperature = 100 material_bed_temperature_layer_0 = 90 -material_print_temperature = 240 \ No newline at end of file +material_print_temperature = 240 +support_brim_enable = True + diff --git a/resources/quality/fusedform/base/base_hips_high.inst.cfg b/resources/quality/fusedform/base/base_hips_high.inst.cfg index 10e6ce3181..6683d561af 100644 --- a/resources/quality/fusedform/base/base_hips_high.inst.cfg +++ b/resources/quality/fusedform/base/base_hips_high.inst.cfg @@ -1,21 +1,21 @@ [general] -version = 4 -name = High Quality definition = fusedform_base +name = High Quality +version = 4 [metadata] +material = generic_hips +quality_type = high setting_version = 20 type = quality -quality_type = high weight = -1 -material = generic_hips - [values] -cool_fan_enabled = False -brim_width = 12 -support_brim_enable = True adhesion_type = brim +brim_width = 12 +cool_fan_enabled = False material_bed_temperature = 100 material_bed_temperature_layer_0 = 90 -material_print_temperature = 240 \ No newline at end of file +material_print_temperature = 240 +support_brim_enable = True + diff --git a/resources/quality/fusedform/base/base_hips_normal.inst.cfg b/resources/quality/fusedform/base/base_hips_normal.inst.cfg index 8b88d73813..228d2f552e 100644 --- a/resources/quality/fusedform/base/base_hips_normal.inst.cfg +++ b/resources/quality/fusedform/base/base_hips_normal.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Normal Quality definition = fusedform_base +name = Normal Quality +version = 4 [metadata] +material = generic_hips +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = -2 -material = generic_hips [values] -cool_fan_enabled = False -brim_width = 12 -support_brim_enable = True adhesion_type = brim +brim_width = 12 +cool_fan_enabled = False material_bed_temperature = 100 material_bed_temperature_layer_0 = 90 -material_print_temperature = 240 \ No newline at end of file +material_print_temperature = 240 +support_brim_enable = True + diff --git a/resources/quality/fusedform/base/base_hips_ultra_high.inst.cfg b/resources/quality/fusedform/base/base_hips_ultra_high.inst.cfg index 12d9177645..fb6288f33c 100644 --- a/resources/quality/fusedform/base/base_hips_ultra_high.inst.cfg +++ b/resources/quality/fusedform/base/base_hips_ultra_high.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Ultra High Quality definition = fusedform_base +name = Ultra High Quality +version = 4 [metadata] +material = generic_hips +quality_type = ultra high setting_version = 20 type = quality -quality_type =ultra high weight = -1 -material = generic_hips [values] -cool_fan_enabled = False -brim_width = 12 -support_brim_enable = True adhesion_type = brim +brim_width = 12 +cool_fan_enabled = False material_bed_temperature = 100 material_bed_temperature_layer_0 = 90 -material_print_temperature = 240 \ No newline at end of file +material_print_temperature = 240 +support_brim_enable = True + diff --git a/resources/quality/fusedform/base/base_normal.inst.cfg b/resources/quality/fusedform/base/base_normal.inst.cfg index 22cb56f6c8..f41e46ba8c 100644 --- a/resources/quality/fusedform/base/base_normal.inst.cfg +++ b/resources/quality/fusedform/base/base_normal.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Normal Quality definition = fusedform_base +name = Normal Quality +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = -2 -global_quality=True [values] layer_height = 0.15 + diff --git a/resources/quality/fusedform/base/base_nylon_draft.inst.cfg b/resources/quality/fusedform/base/base_nylon_draft.inst.cfg index 84fbd83b51..49db2b0f45 100644 --- a/resources/quality/fusedform/base/base_nylon_draft.inst.cfg +++ b/resources/quality/fusedform/base/base_nylon_draft.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Draft Quality definition = fusedform_base +name = Draft Quality +version = 4 [metadata] +material = generic_nylon +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_nylon [values] -cool_fan_enabled = False -brim_width = 12 -support_brim_enable = True adhesion_type = brim +brim_width = 12 +cool_fan_enabled = False material_bed_temperature = 40 material_bed_temperature_layer_0 = 40 -material_print_temperature = 265 \ No newline at end of file +material_print_temperature = 265 +support_brim_enable = True + diff --git a/resources/quality/fusedform/base/base_nylon_high.inst.cfg b/resources/quality/fusedform/base/base_nylon_high.inst.cfg index 4e412c3931..40750131ab 100644 --- a/resources/quality/fusedform/base/base_nylon_high.inst.cfg +++ b/resources/quality/fusedform/base/base_nylon_high.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = High Quality definition = fusedform_base +name = High Quality +version = 4 [metadata] +material = generic_nylon +quality_type = high setting_version = 20 type = quality -quality_type = high weight = -1 -material = generic_nylon [values] -cool_fan_enabled = False -brim_width = 12 -support_brim_enable = True adhesion_type = brim +brim_width = 12 +cool_fan_enabled = False material_bed_temperature = 40 material_bed_temperature_layer_0 = 40 -material_print_temperature = 265 \ No newline at end of file +material_print_temperature = 265 +support_brim_enable = True + diff --git a/resources/quality/fusedform/base/base_nylon_normal.inst.cfg b/resources/quality/fusedform/base/base_nylon_normal.inst.cfg index ab109a6f16..2405fe0aad 100644 --- a/resources/quality/fusedform/base/base_nylon_normal.inst.cfg +++ b/resources/quality/fusedform/base/base_nylon_normal.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Normal Quality definition = fusedform_base +name = Normal Quality +version = 4 [metadata] +material = generic_nylon +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = -2 -material = generic_nylon [values] -cool_fan_enabled = False -brim_width = 12 -support_brim_enable = True adhesion_type = brim +brim_width = 12 +cool_fan_enabled = False material_bed_temperature = 40 material_bed_temperature_layer_0 = 40 -material_print_temperature = 265 \ No newline at end of file +material_print_temperature = 265 +support_brim_enable = True + diff --git a/resources/quality/fusedform/base/base_nylon_ultra_high.inst.cfg b/resources/quality/fusedform/base/base_nylon_ultra_high.inst.cfg index c68a26587c..0f36c7f860 100644 --- a/resources/quality/fusedform/base/base_nylon_ultra_high.inst.cfg +++ b/resources/quality/fusedform/base/base_nylon_ultra_high.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Ultra High Quality definition = fusedform_base +name = Ultra High Quality +version = 4 [metadata] +material = generic_nylon +quality_type = ultra high setting_version = 20 type = quality -quality_type =ultra high weight = -1 -material = generic_nylon [values] -cool_fan_enabled = False -brim_width = 12 -support_brim_enable = True adhesion_type = brim +brim_width = 12 +cool_fan_enabled = False material_bed_temperature = 40 material_bed_temperature_layer_0 = 40 -material_print_temperature = 265 \ No newline at end of file +material_print_temperature = 265 +support_brim_enable = True + diff --git a/resources/quality/fusedform/base/base_petg_high.inst.cfg b/resources/quality/fusedform/base/base_petg_high.inst.cfg index 5e5b928a63..7018141781 100644 --- a/resources/quality/fusedform/base/base_petg_high.inst.cfg +++ b/resources/quality/fusedform/base/base_petg_high.inst.cfg @@ -1,22 +1,21 @@ [general] -version = 4 -name = High Quality definition = fusedform_base +name = High Quality +version = 4 [metadata] +material = generic_petg +quality_type = high setting_version = 20 type = quality -quality_type = high weight = -1 -material = generic_petg [values] -cool_fan_enabled = True -cool_fan_speed=30 -cool_fan_speed_max=40 -brim_width = 12 -support_brim_enable = True adhesion_type = brim +brim_width = 12 +cool_fan_enabled = True +cool_fan_speed = 30 +cool_fan_speed_max = 40 material_bed_temperature = 70 material_print_temperature = 245 speed_infill = =speed_print @@ -25,4 +24,6 @@ speed_print = 30 speed_topbottom = 30 speed_travel = 70 speed_wall = 28 -speed_wall_x = 30 \ No newline at end of file +speed_wall_x = 30 +support_brim_enable = True + diff --git a/resources/quality/fusedform/base/base_petg_normal.inst.cfg b/resources/quality/fusedform/base/base_petg_normal.inst.cfg index 7c95a7540b..9119d5a69f 100644 --- a/resources/quality/fusedform/base/base_petg_normal.inst.cfg +++ b/resources/quality/fusedform/base/base_petg_normal.inst.cfg @@ -1,22 +1,21 @@ [general] -version = 4 -name = Normal Quality definition = fusedform_base +name = Normal Quality +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = -2 -material = generic_petg [values] -cool_fan_enabled = True -cool_fan_speed=30 -cool_fan_speed_max=40 -brim_width = 12 -support_brim_enable = True adhesion_type = brim +brim_width = 12 +cool_fan_enabled = True +cool_fan_speed = 30 +cool_fan_speed_max = 40 material_bed_temperature = 70 material_print_temperature = 245 speed_infill = =speed_print @@ -25,4 +24,6 @@ speed_print = 30 speed_topbottom = 30 speed_travel = 70 speed_wall = 28 -speed_wall_x = 30 \ No newline at end of file +speed_wall_x = 30 +support_brim_enable = True + diff --git a/resources/quality/fusedform/base/base_pla_draft.inst.cfg b/resources/quality/fusedform/base/base_pla_draft.inst.cfg index 71d1b67d36..34d94f8d66 100644 --- a/resources/quality/fusedform/base/base_pla_draft.inst.cfg +++ b/resources/quality/fusedform/base/base_pla_draft.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Draft Quality definition = fusedform_base +name = Draft Quality +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -4 -material = generic_pla [values] material_bed_temperature = 60 -material_print_temperature = 210 \ No newline at end of file +material_print_temperature = 210 + diff --git a/resources/quality/fusedform/base/base_pla_high.inst.cfg b/resources/quality/fusedform/base/base_pla_high.inst.cfg index c449420a71..55e356fc47 100644 --- a/resources/quality/fusedform/base/base_pla_high.inst.cfg +++ b/resources/quality/fusedform/base/base_pla_high.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = High Quality definition = fusedform_base +name = High Quality +version = 4 [metadata] +material = generic_pla +quality_type = high setting_version = 20 type = quality -quality_type = high weight = -1 -material = generic_pla [values] material_bed_temperature = 60 material_print_temperature = 210 + diff --git a/resources/quality/fusedform/base/base_pla_normal.inst.cfg b/resources/quality/fusedform/base/base_pla_normal.inst.cfg index 8af209b4fd..c46a0f2b93 100644 --- a/resources/quality/fusedform/base/base_pla_normal.inst.cfg +++ b/resources/quality/fusedform/base/base_pla_normal.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Normal Quality definition = fusedform_base +name = Normal Quality +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = -2 -material = generic_pla [values] material_bed_temperature = 60 -material_print_temperature = 210 \ No newline at end of file +material_print_temperature = 210 + diff --git a/resources/quality/fusedform/base/base_pla_ultra_high.inst.cfg b/resources/quality/fusedform/base/base_pla_ultra_high.inst.cfg index 3042202a1d..8555fd139b 100644 --- a/resources/quality/fusedform/base/base_pla_ultra_high.inst.cfg +++ b/resources/quality/fusedform/base/base_pla_ultra_high.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name =Ultra High Quality definition = fusedform_base +name = Ultra High Quality +version = 4 [metadata] +material = generic_pla +quality_type = ultra high setting_version = 20 type = quality -quality_type =ultra high weight = -2 -material = generic_pla [values] material_bed_temperature = 60 material_print_temperature = 210 + diff --git a/resources/quality/fusedform/base/base_ultra_high.inst.cfg b/resources/quality/fusedform/base/base_ultra_high.inst.cfg index cb1542bb92..d902003d45 100644 --- a/resources/quality/fusedform/base/base_ultra_high.inst.cfg +++ b/resources/quality/fusedform/base/base_ultra_high.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Ultra High Quality definition = fusedform_base +name = Ultra High Quality +version = 4 [metadata] +global_quality = True +quality_type = ultra high setting_version = 20 type = quality -quality_type =ultra high weight = -1 -global_quality=True [values] -layer_height = 0.08 \ No newline at end of file +layer_height = 0.08 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.2_ABS_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.2_ABS_super.inst.cfg new file mode 100644 index 0000000000..c716e00de0 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.2_ABS_super.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Super Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = super +setting_version = 20 +type = quality +variant = 0.2mm Nozzle + +[values] +wall_thickness = =line_width*8 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.2_ABS_ultra.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.2_ABS_ultra.inst.cfg new file mode 100644 index 0000000000..0421d175a0 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.2_ABS_ultra.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Ultra Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = ultra +setting_version = 20 +type = quality +variant = 0.2mm Nozzle + +[values] +wall_thickness = =line_width*8 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.2_PETG_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.2_PETG_super.inst.cfg new file mode 100644 index 0000000000..126071b104 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.2_PETG_super.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Super Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = super +setting_version = 20 +type = quality +variant = 0.2mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*8 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.2_PETG_ultra.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.2_PETG_ultra.inst.cfg new file mode 100644 index 0000000000..40d4dda7c6 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.2_PETG_ultra.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Ultra Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = ultra +setting_version = 20 +type = quality +variant = 0.2mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*8 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.2_PLA_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.2_PLA_super.inst.cfg new file mode 100644 index 0000000000..aa957258c9 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.2_PLA_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Super Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = super +setting_version = 20 +type = quality +variant = 0.2mm Nozzle + +[values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.2_PLA_ultra.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.2_PLA_ultra.inst.cfg new file mode 100644 index 0000000000..80f6f9289e --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.2_PLA_ultra.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Ultra Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = ultra +setting_version = 20 +type = quality +variant = 0.2mm Nozzle + +[values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..1ac70ca73d --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_adaptive.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_low.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_low.inst.cfg new file mode 100644 index 0000000000..e0ab43feb7 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_low.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Low Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = low +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_standard.inst.cfg new file mode 100644 index 0000000000..a649b2c0c5 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_standard.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Standard Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = standard +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_super.inst.cfg new file mode 100644 index 0000000000..06397942f1 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.3_ABS_super.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Super Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = super +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..e0ee7ef21c --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_adaptive.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_low.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_low.inst.cfg new file mode 100644 index 0000000000..1ecc6a2be0 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_low.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Low Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = low +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_standard.inst.cfg new file mode 100644 index 0000000000..9fb4a9cc65 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Standard Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = standard +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_super.inst.cfg new file mode 100644 index 0000000000..0ab38c1878 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.3_PETG_super.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Super Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = super +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..2383119106 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_low.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_low.inst.cfg new file mode 100644 index 0000000000..d94a3dc781 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Low Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = low +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_standard.inst.cfg new file mode 100644 index 0000000000..be628a3342 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Standard Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = standard +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_super.inst.cfg new file mode 100644 index 0000000000..b0c4d30dd5 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.3_PLA_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Super Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = super +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.3_TPU_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_TPU_adaptive.inst.cfg new file mode 100644 index 0000000000..84d40de570 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.3_TPU_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.3_TPU_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_TPU_standard.inst.cfg new file mode 100644 index 0000000000..d8cdcba1d3 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.3_TPU_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Standard Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = standard +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.3_TPU_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.3_TPU_super.inst.cfg new file mode 100644 index 0000000000..9f923fafaf --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.3_TPU_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Super Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = super +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..4082094ba7 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_adaptive.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_low.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_low.inst.cfg new file mode 100644 index 0000000000..7887ce26dc --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_low.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Low Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = low +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_standard.inst.cfg new file mode 100644 index 0000000000..6b8cdfb9ee --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_standard.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Standard Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = standard +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_super.inst.cfg new file mode 100644 index 0000000000..4ed06a0bd6 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.4_ABS_super.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Super Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = super +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..770fa64f82 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_adaptive.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_low.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_low.inst.cfg new file mode 100644 index 0000000000..cd32a817b6 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_low.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Low Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = low +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_standard.inst.cfg new file mode 100644 index 0000000000..4100e7593d --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Standard Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = standard +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_super.inst.cfg new file mode 100644 index 0000000000..190e5968f2 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.4_PETG_super.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Super Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = super +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..fdede1ecef --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_low.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_low.inst.cfg new file mode 100644 index 0000000000..c425ff5195 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Low Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = low +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_standard.inst.cfg new file mode 100644 index 0000000000..2c7482cb75 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Standard Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = standard +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_super.inst.cfg new file mode 100644 index 0000000000..cc8953b80d --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.4_PLA_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Super Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = super +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.4_TPU_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_TPU_adaptive.inst.cfg new file mode 100644 index 0000000000..0e7e97eefb --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.4_TPU_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.4_TPU_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_TPU_standard.inst.cfg new file mode 100644 index 0000000000..83a3191e8a --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.4_TPU_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Standard Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = standard +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.4_TPU_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.4_TPU_super.inst.cfg new file mode 100644 index 0000000000..2a48e4c813 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.4_TPU_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Super Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = super +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..1762683e6c --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_adaptive.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_low.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_low.inst.cfg new file mode 100644 index 0000000000..0e072af63a --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_low.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Low Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = low +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_standard.inst.cfg new file mode 100644 index 0000000000..6d08e3fdf4 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_standard.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Standard Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = standard +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_super.inst.cfg new file mode 100644 index 0000000000..40189351e9 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.5_ABS_super.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Super Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = super +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..d23be94f20 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_adaptive.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_low.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_low.inst.cfg new file mode 100644 index 0000000000..33b0038eec --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_low.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Low Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = low +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_standard.inst.cfg new file mode 100644 index 0000000000..716e95f84d --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Standard Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = standard +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_super.inst.cfg new file mode 100644 index 0000000000..da93ff74ba --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.5_PETG_super.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Super Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = super +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..4772f084b3 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_low.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_low.inst.cfg new file mode 100644 index 0000000000..0d40c4d92a --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Low Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = low +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_standard.inst.cfg new file mode 100644 index 0000000000..76dfa5bd4b --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Standard Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = standard +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_super.inst.cfg new file mode 100644 index 0000000000..b634a17a19 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.5_PLA_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Super Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = super +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.5_TPU_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_TPU_adaptive.inst.cfg new file mode 100644 index 0000000000..3070b3319b --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.5_TPU_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.5_TPU_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_TPU_standard.inst.cfg new file mode 100644 index 0000000000..8f60d14411 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.5_TPU_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Standard Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = standard +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.5_TPU_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.5_TPU_super.inst.cfg new file mode 100644 index 0000000000..a8e3291832 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.5_TPU_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Super Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = super +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.6_ABS_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.6_ABS_standard.inst.cfg new file mode 100644 index 0000000000..bcad50d300 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.6_ABS_standard.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Standard Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = standard +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.6_PETG_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.6_PETG_standard.inst.cfg new file mode 100644 index 0000000000..3156e9cc2b --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.6_PETG_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Standard Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = standard +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*3 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.6_PLA_draft.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.6_PLA_draft.inst.cfg new file mode 100644 index 0000000000..5cc4a83403 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.6_PLA_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Draft Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = draft +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.6_PLA_low.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.6_PLA_low.inst.cfg new file mode 100644 index 0000000000..be762411a6 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.6_PLA_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Low Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = low +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.6_PLA_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.6_PLA_standard.inst.cfg new file mode 100644 index 0000000000..67e6d1a747 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.6_PLA_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Standard Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = standard +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.6_TPU_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.6_TPU_standard.inst.cfg new file mode 100644 index 0000000000..5b7756e0dd --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.6_TPU_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Standard Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = standard +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.8_ABS_draft.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.8_ABS_draft.inst.cfg new file mode 100644 index 0000000000..57a5c2976e --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.8_ABS_draft.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Draft Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = draft +setting_version = 20 +type = quality +variant = 0.8mm Nozzle + +[values] +wall_thickness = =line_width*3 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.8_PETG_draft.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.8_PETG_draft.inst.cfg new file mode 100644 index 0000000000..f2b7c564a3 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.8_PETG_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Draft Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = draft +setting_version = 20 +type = quality +variant = 0.8mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*3 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.8_PLA_draft.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.8_PLA_draft.inst.cfg new file mode 100644 index 0000000000..d8ff00c7ed --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.8_PLA_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Draft Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = draft +setting_version = 20 +type = quality +variant = 0.8mm Nozzle + +[values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_0.8_TPU_draft.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_0.8_TPU_draft.inst.cfg new file mode 100644 index 0000000000..e4069ae61b --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_0.8_TPU_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Draft Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = draft +setting_version = 20 +type = quality +variant = 0.8mm Nozzle + +[values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_1.0_ABS_draft.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_1.0_ABS_draft.inst.cfg new file mode 100644 index 0000000000..ddde9b268f --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_1.0_ABS_draft.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Draft Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = draft +setting_version = 20 +type = quality +variant = 1.0mm Nozzle + +[values] +wall_thickness = =line_width*3 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_1.0_PETG_draft.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_1.0_PETG_draft.inst.cfg new file mode 100644 index 0000000000..64a025cfad --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_1.0_PETG_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Draft Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = draft +setting_version = 20 +type = quality +variant = 1.0mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*3 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_1.0_PLA_draft.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_1.0_PLA_draft.inst.cfg new file mode 100644 index 0000000000..1b6f9c1b0f --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_1.0_PLA_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Draft Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = draft +setting_version = 20 +type = quality +variant = 1.0mm Nozzle + +[values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_1.0_TPU_draft.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_1.0_TPU_draft.inst.cfg new file mode 100644 index 0000000000..2529c7225a --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_1.0_TPU_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Draft Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = draft +setting_version = 20 +type = quality +variant = 1.0mm Nozzle + +[values] + diff --git a/resources/quality/geeetech_quality/geeetech_quality_global_adaptive.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_global_adaptive.inst.cfg new file mode 100644 index 0000000000..1135b75b56 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_global_adaptive.inst.cfg @@ -0,0 +1,20 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Dynamic Quality +version = 4 + +[metadata] +global_quality = True +quality_type = adaptive +setting_version = 20 +type = quality +weight = -2 + +[values] +adaptive_layer_height_enabled = true +layer_height = 0.16 +layer_height_0 = 0.20 +support_interface_height = =layer_height*6 +top_bottom_thickness = =layer_height_0+layer_height*4 +wall_thickness = =line_width*3 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_global_draft.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_global_draft.inst.cfg new file mode 100644 index 0000000000..ac7566ac6d --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_global_draft.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Draft Quality +version = 4 + +[metadata] +global_quality = True +quality_type = draft +setting_version = 20 +type = quality +weight = -5 + +[values] +layer_height = 0.32 +layer_height_0 = 0.32 +support_interface_height = =layer_height*4 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_global_low.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_global_low.inst.cfg new file mode 100644 index 0000000000..b5fffe82c0 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_global_low.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Low Quality +version = 4 + +[metadata] +global_quality = True +quality_type = low +setting_version = 20 +type = quality +weight = -4 + +[values] +layer_height = 0.28 +layer_height_0 = 0.28 +support_interface_height = =layer_height*4 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_global_standard.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_global_standard.inst.cfg new file mode 100644 index 0000000000..c3d08b02cb --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_global_standard.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Standard Quality +version = 4 + +[metadata] +global_quality = True +quality_type = standard +setting_version = 20 +type = quality +weight = -3 + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 +support_interface_height = =layer_height*4 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_global_super.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_global_super.inst.cfg new file mode 100644 index 0000000000..8c8efecbce --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_global_super.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Super Quality +version = 4 + +[metadata] +global_quality = True +quality_type = super +setting_version = 20 +type = quality +weight = -1 + +[values] +layer_height = 0.12 +layer_height_0 = 0.12 +support_interface_height = =layer_height*8 +top_bottom_thickness = =layer_height_0+layer_height*6 +wall_thickness = =line_width*3 + diff --git a/resources/quality/geeetech_quality/geeetech_quality_global_ultra.inst.cfg b/resources/quality/geeetech_quality/geeetech_quality_global_ultra.inst.cfg new file mode 100644 index 0000000000..558a54fdd7 --- /dev/null +++ b/resources/quality/geeetech_quality/geeetech_quality_global_ultra.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = Geeetech_Base_Single_Extruder +name = Ultra Quality +version = 4 + +[metadata] +global_quality = True +quality_type = ultra +setting_version = 20 +type = quality +weight = 0 + +[values] +layer_height = 0.08 +layer_height_0 = 0.12 +support_interface_height = =layer_height*12 +top_bottom_thickness = =layer_height_0+layer_height*10 +wall_thickness = =line_width*3 + diff --git a/resources/quality/gmax15plus/gmax15plus_global_dual_normal.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_dual_normal.inst.cfg index 91f7f39f67..466ccf153f 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_dual_normal.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_dual_normal.inst.cfg @@ -1,70 +1,61 @@ [general] -version = 4 -name = gMax 1.5+ Dual Normal Layers definition = gmax15plus_dual +name = gMax 1.5+ Dual Normal Layers +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] -layer_height = 0.2 -layer_height_0 = 0.28 - -infill_before_walls = False -infill_overlap = 20 -infill_pattern = grid - -speed_slowdown_layers = 1 acceleration_enabled = True acceleration_print = 400 acceleration_travel = 700 - +adhesion_type = skirt +bottom_layers = 2 coasting_enable = False coasting_volume = 0.0625 - -retraction_combing = off -retraction_amount = 0.75 -retraction_speed = 70 -material_flow = 98 - -support_use_towers = False -support_z_distance = 0.2 -support_xy_distance = 1.5 -support_join_distance = 10 -support_interface_enable = True -support_interface_pattern = lines - -adhesion_type = skirt -skirt_gap = 2 - cool_fan_speed = 70 cool_fan_speed_max = 85 -skin_overlap = 10 -speed_print = 50 -speed_infill = =math.ceil(speed_print * 0.85) -speed_layer_0 = =math.ceil(speed_print * 0.45) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.5) -speed_wall_x = =math.ceil(speed_print * 0.7) - -top_bottom_pattern = lines -top_layers = 4 -top_thickness = 1 -bottom_layers = 2 -wall_line_count = 2 -z_seam_corner = z_seam_corner_none - +infill_before_walls = False +infill_overlap = 20 +infill_pattern = grid +layer_height = 0.2 +layer_height_0 = 0.28 +material_flow = 98 +material_standby_temperature = =material_print_temperature - 10 ooze_shield_angle = 20 ooze_shield_dist = 4 ooze_shield_enabled = True prime_tower_enable = False prime_tower_position_x = 350 prime_tower_position_y = 350 +retraction_amount = 0.75 +retraction_combing = off +retraction_speed = 70 +skin_overlap = 10 +skirt_gap = 2 +speed_infill = =math.ceil(speed_print * 0.85) +speed_layer_0 = =math.ceil(speed_print * 0.45) +speed_print = 50 +speed_slowdown_layers = 1 +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_wall = =math.ceil(speed_print * 0.5) +speed_wall_x = =math.ceil(speed_print * 0.7) +support_interface_enable = True +support_interface_pattern = lines +support_join_distance = 10 +support_use_towers = False +support_xy_distance = 1.5 +support_z_distance = 0.2 switch_extruder_retraction_amount = 6 switch_extruder_retraction_speeds = 60 +top_bottom_pattern = lines +top_layers = 4 +top_thickness = 1 +wall_line_count = 2 +z_seam_corner = z_seam_corner_none -material_standby_temperature = =material_print_temperature - 10 diff --git a/resources/quality/gmax15plus/gmax15plus_global_dual_thick.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_dual_thick.inst.cfg index ab00a33d59..5079a67b69 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_dual_thick.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_dual_thick.inst.cfg @@ -1,70 +1,61 @@ [general] -version = 4 -name = gMax 1.5+ Dual Thick Layers definition = gmax15plus_dual +name = gMax 1.5+ Dual Thick Layers +version = 4 [metadata] +global_quality = True +quality_type = course setting_version = 20 type = quality -quality_type = course weight = -2 -global_quality = True [values] -layer_height = 0.28 -layer_height_0 = 0.32 - -infill_before_walls = False -infill_overlap = 20 -infill_pattern = grid - -speed_slowdown_layers = 1 acceleration_enabled = True acceleration_print = 400 acceleration_travel = 700 - +adhesion_type = skirt +bottom_layers = 2 coasting_enable = False coasting_volume = 0.0625 - -retraction_combing = off -retraction_amount = 0.75 -retraction_speed = 70 -material_flow = 98 - -support_use_towers = False -support_z_distance = 0.2 -support_xy_distance = 1.5 -support_join_distance = 10 -support_interface_enable = True -support_interface_pattern = lines - -adhesion_type = skirt -skirt_gap = 2 - cool_fan_speed = 70 cool_fan_speed_max = 85 -skin_overlap = 10 -speed_print = 40 -speed_infill = =math.ceil(speed_print * 0.85) -speed_layer_0 = =math.ceil(speed_print * 0.5) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.5) -speed_wall_x = =math.ceil(speed_print * 0.7) - -top_bottom_pattern = lines -top_layers = 3 -top_thickness = 1 -bottom_layers = 2 -wall_line_count = 2 -z_seam_corner = z_seam_corner_none - +infill_before_walls = False +infill_overlap = 20 +infill_pattern = grid +layer_height = 0.28 +layer_height_0 = 0.32 +material_flow = 98 +material_standby_temperature = =material_print_temperature - 10 ooze_shield_angle = 20 ooze_shield_dist = 4 ooze_shield_enabled = True prime_tower_enable = False prime_tower_position_x = 350 prime_tower_position_y = 350 +retraction_amount = 0.75 +retraction_combing = off +retraction_speed = 70 +skin_overlap = 10 +skirt_gap = 2 +speed_infill = =math.ceil(speed_print * 0.85) +speed_layer_0 = =math.ceil(speed_print * 0.5) +speed_print = 40 +speed_slowdown_layers = 1 +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_wall = =math.ceil(speed_print * 0.5) +speed_wall_x = =math.ceil(speed_print * 0.7) +support_interface_enable = True +support_interface_pattern = lines +support_join_distance = 10 +support_use_towers = False +support_xy_distance = 1.5 +support_z_distance = 0.2 switch_extruder_retraction_amount = 6 switch_extruder_retraction_speeds = 60 +top_bottom_pattern = lines +top_layers = 3 +top_thickness = 1 +wall_line_count = 2 +z_seam_corner = z_seam_corner_none -material_standby_temperature = =material_print_temperature - 10 diff --git a/resources/quality/gmax15plus/gmax15plus_global_dual_thin.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_dual_thin.inst.cfg index ffa7341558..d0ab84e7cd 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_dual_thin.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_dual_thin.inst.cfg @@ -1,70 +1,61 @@ [general] -version = 4 -name = gMax 1.5+ Dual Thin Layers definition = gmax15plus_dual +name = gMax 1.5+ Dual Thin Layers +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -global_quality = True [values] -layer_height = 0.16 -layer_height_0 = 0.2 - -infill_before_walls = False -infill_overlap = 20 -infill_pattern = grid - -speed_slowdown_layers = 1 acceleration_enabled = True acceleration_print = 400 acceleration_travel = 700 - +adhesion_type = skirt +bottom_layers = 2 coasting_enable = False coasting_volume = 0.0625 - -retraction_combing = off -retraction_amount = 0.75 -retraction_speed = 70 -material_flow = 98 - -support_use_towers = False -support_z_distance = 0.2 -support_xy_distance = 1.5 -support_join_distance = 10 -support_interface_enable = True -support_interface_pattern = lines - -adhesion_type = skirt -skirt_gap = 2 - cool_fan_speed = 70 cool_fan_speed_max = 85 -skin_overlap = 10 -speed_print = 40 -speed_infill = =math.ceil(speed_print * 0.85) -speed_layer_0 = =math.ceil(speed_print * 0.4) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.5) -speed_wall_x = =math.ceil(speed_print * 0.7) - -top_bottom_pattern = lines -top_layers = 4 -top_thickness = 1 -bottom_layers = 2 -wall_line_count = 2 -z_seam_corner = z_seam_corner_none - +infill_before_walls = False +infill_overlap = 20 +infill_pattern = grid +layer_height = 0.16 +layer_height_0 = 0.2 +material_flow = 98 +material_standby_temperature = =material_print_temperature - 10 ooze_shield_angle = 20 ooze_shield_dist = 4 ooze_shield_enabled = True prime_tower_enable = False prime_tower_position_x = 350 prime_tower_position_y = 350 +retraction_amount = 0.75 +retraction_combing = off +retraction_speed = 70 +skin_overlap = 10 +skirt_gap = 2 +speed_infill = =math.ceil(speed_print * 0.85) +speed_layer_0 = =math.ceil(speed_print * 0.4) +speed_print = 40 +speed_slowdown_layers = 1 +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_wall = =math.ceil(speed_print * 0.5) +speed_wall_x = =math.ceil(speed_print * 0.7) +support_interface_enable = True +support_interface_pattern = lines +support_join_distance = 10 +support_use_towers = False +support_xy_distance = 1.5 +support_z_distance = 0.2 switch_extruder_retraction_amount = 6 switch_extruder_retraction_speeds = 60 +top_bottom_pattern = lines +top_layers = 4 +top_thickness = 1 +wall_line_count = 2 +z_seam_corner = z_seam_corner_none -material_standby_temperature = =material_print_temperature - 10 diff --git a/resources/quality/gmax15plus/gmax15plus_global_dual_very_thick.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_dual_very_thick.inst.cfg index b748cf1e36..b24a40b77a 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_dual_very_thick.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_dual_very_thick.inst.cfg @@ -1,69 +1,60 @@ [general] -version = 4 -name = gMax 1.5+ Dual Very Thick Layers definition = gmax15plus_dual +name = gMax 1.5+ Dual Very Thick Layers +version = 4 [metadata] +global_quality = True +quality_type = extra_course setting_version = 20 type = quality -quality_type = extra_course weight = -3 -global_quality = True [values] -layer_height = 0.32 - -infill_before_walls = False -infill_overlap = 20 -infill_pattern = grid - -speed_slowdown_layers = 1 acceleration_enabled = True acceleration_print = 400 acceleration_travel = 700 - +adhesion_type = skirt +bottom_layers = 2 coasting_enable = False coasting_volume = 0.0625 - -retraction_combing = off -retraction_amount = 0.75 -retraction_speed = 70 -material_flow = 98 - -support_use_towers = False -support_z_distance = 0.2 -support_xy_distance = 1.5 -support_join_distance = 10 -support_interface_enable = True -support_interface_pattern = lines - -adhesion_type = skirt -skirt_gap = 2 - cool_fan_speed = 70 cool_fan_speed_max = 85 -skin_overlap = 10 -speed_print = 40 -speed_infill = =math.ceil(speed_print * 0.85) -speed_layer_0 = =math.ceil(speed_print * 0.45) -speed_topbottom = =math.ceil(speed_print * 0.75) -speed_wall = =math.ceil(speed_print * 0.5) -speed_wall_x = =math.ceil(speed_print * 0.7) - -top_bottom_pattern = lines -top_layers = 3 -top_thickness = 1 -bottom_layers = 2 -wall_line_count = 2 -z_seam_corner = z_seam_corner_none - +infill_before_walls = False +infill_overlap = 20 +infill_pattern = grid +layer_height = 0.32 +material_flow = 98 +material_standby_temperature = =material_print_temperature - 10 ooze_shield_angle = 20 ooze_shield_dist = 4 ooze_shield_enabled = True prime_tower_enable = False prime_tower_position_x = 350 prime_tower_position_y = 350 +retraction_amount = 0.75 +retraction_combing = off +retraction_speed = 70 +skin_overlap = 10 +skirt_gap = 2 +speed_infill = =math.ceil(speed_print * 0.85) +speed_layer_0 = =math.ceil(speed_print * 0.45) +speed_print = 40 +speed_slowdown_layers = 1 +speed_topbottom = =math.ceil(speed_print * 0.75) +speed_wall = =math.ceil(speed_print * 0.5) +speed_wall_x = =math.ceil(speed_print * 0.7) +support_interface_enable = True +support_interface_pattern = lines +support_join_distance = 10 +support_use_towers = False +support_xy_distance = 1.5 +support_z_distance = 0.2 switch_extruder_retraction_amount = 6 switch_extruder_retraction_speeds = 60 +top_bottom_pattern = lines +top_layers = 3 +top_thickness = 1 +wall_line_count = 2 +z_seam_corner = z_seam_corner_none -material_standby_temperature = =material_print_temperature - 10 diff --git a/resources/quality/gmax15plus/gmax15plus_global_normal.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_normal.inst.cfg index 0bbaea9af4..712534057b 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_normal.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_normal.inst.cfg @@ -1,61 +1,52 @@ [general] -version = 4 -name = gMax 1.5+ Normal Layers definition = gmax15plus +name = gMax 1.5+ Normal Layers +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] -layer_height = 0.2 -layer_height_0 = 0.28 - -infill_before_walls = False -infill_overlap = 20 -infill_pattern = grid - -speed_slowdown_layers = 1 acceleration_enabled = True acceleration_print = 400 acceleration_travel = 700 - +adhesion_type = skirt +bottom_layers = 2 coasting_enable = False coasting_volume = 0.0625 - -retraction_combing = off -retraction_amount = 0.75 -retraction_speed = 70 -material_flow = 98 - -support_use_towers = False -support_z_distance = 0.2 -support_xy_distance = 1.5 -support_join_distance = 10 -support_interface_enable = True -support_interface_pattern = lines - -adhesion_type = skirt -skirt_gap = 2 - cool_fan_speed = 70 cool_fan_speed_max = 85 +infill_before_walls = False +infill_overlap = 20 +infill_pattern = grid +layer_height = 0.2 +layer_height_0 = 0.28 +material_flow = 98 +retraction_amount = 0.75 +retraction_combing = off +retraction_speed = 70 skin_overlap = 10 -speed_print = 50 +skirt_gap = 2 speed_infill = =math.ceil(speed_print * 0.85) speed_layer_0 = =math.ceil(speed_print * 0.6) +speed_print = 50 +speed_slowdown_layers = 1 speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.5) speed_wall_x = =math.ceil(speed_wall * 0.7) - +support_interface_enable = True +support_interface_pattern = lines +support_join_distance = 10 +support_use_towers = False +support_xy_distance = 1.5 +support_z_distance = 0.2 top_bottom_pattern = lines top_layers = 4 top_thickness = 1 -bottom_layers = 2 wall_line_count = 2 z_seam_corner = z_seam_corner_none - diff --git a/resources/quality/gmax15plus/gmax15plus_global_thick.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_thick.inst.cfg index 23192818dc..870a3d9618 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_thick.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_thick.inst.cfg @@ -1,59 +1,52 @@ [general] -version = 4 -name = gMax 1.5+ Thick Layers definition = gmax15plus +name = gMax 1.5+ Thick Layers +version = 4 [metadata] +global_quality = True +quality_type = course setting_version = 20 type = quality -quality_type = course weight = -2 -global_quality = True [values] -layer_height = 0.28 -layer_height_0 = 0.32 - -infill_before_walls = False -infill_overlap = 20 -infill_pattern = grid - -speed_slowdown_layers = 1 acceleration_enabled = True acceleration_print = 400 acceleration_travel = 700 - +adhesion_type = skirt +bottom_layers = 2 coasting_enable = False coasting_volume = 0.0625 - -retraction_combing = off -retraction_amount = 0.75 -retraction_speed = 70 -material_flow = 98 - -support_use_towers = False -support_z_distance = 0.2 -support_xy_distance = 1.5 -support_join_distance = 10 -support_interface_enable = True -support_interface_pattern = lines - -adhesion_type = skirt -skirt_gap = 2 - cool_fan_speed = 70 cool_fan_speed_max = 85 +infill_before_walls = False +infill_overlap = 20 +infill_pattern = grid +layer_height = 0.28 +layer_height_0 = 0.32 +material_flow = 98 +retraction_amount = 0.75 +retraction_combing = off +retraction_speed = 70 skin_overlap = 10 -speed_print = 50 +skirt_gap = 2 speed_infill = =math.ceil(speed_print * 0.85) speed_layer_0 = =math.ceil(speed_print * 0.6) +speed_print = 50 +speed_slowdown_layers = 1 speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.5) speed_wall_x = =math.ceil(speed_wall * 0.7) - +support_interface_enable = True +support_interface_pattern = lines +support_join_distance = 10 +support_use_towers = False +support_xy_distance = 1.5 +support_z_distance = 0.2 top_bottom_pattern = lines top_layers = 3 top_thickness = 1 -bottom_layers = 2 wall_line_count = 2 -z_seam_corner = z_seam_corner_none \ No newline at end of file +z_seam_corner = z_seam_corner_none + diff --git a/resources/quality/gmax15plus/gmax15plus_global_thin.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_thin.inst.cfg index f398920b06..8faf38bb27 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_thin.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_thin.inst.cfg @@ -1,59 +1,52 @@ [general] -version = 4 -name = gMax 1.5+ Thin Layers definition = gmax15plus +name = gMax 1.5+ Thin Layers +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -global_quality = True [values] -layer_height = 0.16 -layer_height_0 = 0.2 - -infill_before_walls = False -infill_overlap = 20 -infill_pattern = grid - -speed_slowdown_layers = 1 acceleration_enabled = True acceleration_print = 400 acceleration_travel = 700 - +adhesion_type = skirt +bottom_layers = 3 coasting_enable = False coasting_volume = 0.0625 - -retraction_combing = off -retraction_amount = 0.75 -retraction_speed = 70 -material_flow = 98 - -support_use_towers = False -support_z_distance = 0.2 -support_xy_distance = 1.5 -support_join_distance = 10 -support_interface_enable = True -support_interface_pattern = lines - -adhesion_type = skirt -skirt_gap = 2 - cool_fan_speed = 70 cool_fan_speed_max = 85 +infill_before_walls = False +infill_overlap = 20 +infill_pattern = grid +layer_height = 0.16 +layer_height_0 = 0.2 +material_flow = 98 +retraction_amount = 0.75 +retraction_combing = off +retraction_speed = 70 skin_overlap = 10 -speed_print = 55 +skirt_gap = 2 speed_infill = =math.ceil(speed_print * 0.85) speed_layer_0 = =math.ceil(speed_print * 0.6) +speed_print = 55 +speed_slowdown_layers = 1 speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.5) speed_wall_x = =math.ceil(speed_wall * 0.7) - +support_interface_enable = True +support_interface_pattern = lines +support_join_distance = 10 +support_use_towers = False +support_xy_distance = 1.5 +support_z_distance = 0.2 top_bottom_pattern = lines top_layers = 5 top_thickness = 1 -bottom_layers = 3 wall_line_count = 2 -z_seam_corner = z_seam_corner_none \ No newline at end of file +z_seam_corner = z_seam_corner_none + diff --git a/resources/quality/gmax15plus/gmax15plus_global_very_thick.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_very_thick.inst.cfg index a9c33a1e4e..ef97deeaae 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_very_thick.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_very_thick.inst.cfg @@ -1,58 +1,51 @@ [general] -version = 4 -name = gMax 1.5+ Very Thick Layers definition = gmax15plus +name = gMax 1.5+ Very Thick Layers +version = 4 [metadata] +global_quality = True +quality_type = extra_course setting_version = 20 type = quality -quality_type = extra_course weight = -3 -global_quality = True [values] -layer_height = 0.32 - -infill_before_walls = False -infill_overlap = 20 -infill_pattern = grid - -speed_slowdown_layers = 1 acceleration_enabled = True acceleration_print = 400 acceleration_travel = 700 - +adhesion_type = skirt +bottom_layers = 2 coasting_enable = False coasting_volume = 0.0625 - -retraction_combing = off -retraction_amount = 0.75 -retraction_speed = 70 -material_flow = 98 - -support_use_towers = False -support_z_distance = 0.2 -support_xy_distance = 1.5 -support_join_distance = 10 -support_interface_enable = True -support_interface_pattern = lines - -adhesion_type = skirt -skirt_gap = 2 - cool_fan_speed = 70 cool_fan_speed_max = 85 +infill_before_walls = False +infill_overlap = 20 +infill_pattern = grid +layer_height = 0.32 +material_flow = 98 +retraction_amount = 0.75 +retraction_combing = off +retraction_speed = 70 skin_overlap = 10 -speed_print = 45 +skirt_gap = 2 speed_infill = =math.ceil(speed_print * 0.85) speed_layer_0 = =math.ceil(speed_print * 0.6) +speed_print = 45 +speed_slowdown_layers = 1 speed_topbottom = =math.ceil(speed_print * 0.75) speed_wall = =math.ceil(speed_print * 0.6) speed_wall_x = =math.ceil(speed_wall * 0.7) - +support_interface_enable = True +support_interface_pattern = lines +support_join_distance = 10 +support_use_towers = False +support_xy_distance = 1.5 +support_z_distance = 0.2 top_bottom_pattern = lines top_layers = 3 top_thickness = 1 -bottom_layers = 2 wall_line_count = 2 -z_seam_corner = z_seam_corner_none \ No newline at end of file +z_seam_corner = z_seam_corner_none + diff --git a/resources/quality/goofoo/abs/goofoo_far_0.40_abs_fine.inst.cfg b/resources/quality/goofoo/abs/goofoo_far_0.40_abs_fine.inst.cfg index 5310152781..a8bffce9b4 100644 --- a/resources/quality/goofoo/abs/goofoo_far_0.40_abs_fine.inst.cfg +++ b/resources/quality/goofoo/abs/goofoo_far_0.40_abs_fine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_far +name = Fine Quality +version = 4 [metadata] +material = goofoo_abs +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_abs variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = brim cool_fan_enabled = False -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/abs/goofoo_far_0.40_abs_standard.inst.cfg b/resources/quality/goofoo/abs/goofoo_far_0.40_abs_standard.inst.cfg index f590763021..2b80e8ad36 100644 --- a/resources/quality/goofoo/abs/goofoo_far_0.40_abs_standard.inst.cfg +++ b/resources/quality/goofoo/abs/goofoo_far_0.40_abs_standard.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_far +name = Standard Quality +version = 4 [metadata] +material = goofoo_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_abs variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = brim cool_fan_enabled = False -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/abs/goofoo_near_0.40_abs_fine.inst.cfg b/resources/quality/goofoo/abs/goofoo_near_0.40_abs_fine.inst.cfg index 9c9ae6a9ec..57b9625f81 100644 --- a/resources/quality/goofoo/abs/goofoo_near_0.40_abs_fine.inst.cfg +++ b/resources/quality/goofoo/abs/goofoo_near_0.40_abs_fine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_near +name = Fine Quality +version = 4 [metadata] +material = goofoo_abs +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_abs variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = brim cool_fan_enabled = False -retraction_amount = 4.5 \ No newline at end of file +retraction_amount = 4.5 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/abs/goofoo_near_0.40_abs_standard.inst.cfg b/resources/quality/goofoo/abs/goofoo_near_0.40_abs_standard.inst.cfg index 46198f3c78..faf404c62e 100644 --- a/resources/quality/goofoo/abs/goofoo_near_0.40_abs_standard.inst.cfg +++ b/resources/quality/goofoo/abs/goofoo_near_0.40_abs_standard.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_near +name = Standard Quality +version = 4 [metadata] +material = goofoo_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_abs variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = brim cool_fan_enabled = False -retraction_amount = 4.5 \ No newline at end of file +retraction_amount = 4.5 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/asa/goofoo_far_0.40_asa_fine.inst.cfg b/resources/quality/goofoo/asa/goofoo_far_0.40_asa_fine.inst.cfg index ffe7c1d027..14233366a8 100644 --- a/resources/quality/goofoo/asa/goofoo_far_0.40_asa_fine.inst.cfg +++ b/resources/quality/goofoo/asa/goofoo_far_0.40_asa_fine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_far +name = Fine Quality +version = 4 [metadata] +material = goofoo_asa +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_asa variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = brim cool_fan_enabled = False -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/asa/goofoo_far_0.40_asa_standard.inst.cfg b/resources/quality/goofoo/asa/goofoo_far_0.40_asa_standard.inst.cfg index bde0a20503..b45dabf6c2 100644 --- a/resources/quality/goofoo/asa/goofoo_far_0.40_asa_standard.inst.cfg +++ b/resources/quality/goofoo/asa/goofoo_far_0.40_asa_standard.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_far +name = Standard Quality +version = 4 [metadata] +material = goofoo_asa +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_asa variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = brim cool_fan_enabled = False -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/asa/goofoo_near_0.40_asa_fine.inst.cfg b/resources/quality/goofoo/asa/goofoo_near_0.40_asa_fine.inst.cfg index 9e6edbf539..19fe4b1e6d 100644 --- a/resources/quality/goofoo/asa/goofoo_near_0.40_asa_fine.inst.cfg +++ b/resources/quality/goofoo/asa/goofoo_near_0.40_asa_fine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_near +name = Fine Quality +version = 4 [metadata] +material = goofoo_asa +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_asa variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = brim cool_fan_enabled = False -retraction_amount = 4.5 \ No newline at end of file +retraction_amount = 4.5 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/asa/goofoo_near_0.40_asa_standard.inst.cfg b/resources/quality/goofoo/asa/goofoo_near_0.40_asa_standard.inst.cfg index 7bc73b3eef..52f0129066 100644 --- a/resources/quality/goofoo/asa/goofoo_near_0.40_asa_standard.inst.cfg +++ b/resources/quality/goofoo/asa/goofoo_near_0.40_asa_standard.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_near +name = Standard Quality +version = 4 [metadata] +material = goofoo_asa +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_asa variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = brim cool_fan_enabled = False -retraction_amount = 4.5 \ No newline at end of file +retraction_amount = 4.5 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/goofoo_far_global_0.15_fine.inst.cfg b/resources/quality/goofoo/goofoo_far_global_0.15_fine.inst.cfg index 7f87312a42..1a7b67a0af 100644 --- a/resources/quality/goofoo/goofoo_far_global_0.15_fine.inst.cfg +++ b/resources/quality/goofoo/goofoo_far_global_0.15_fine.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_far +name = Fine Quality +version = 4 [metadata] +global_quality = True +quality_type = fine setting_version = 20 type = quality -quality_type = fine weight = -1 -global_quality = True [values] +cool_fan_enabled = True layer_height = 0.15 layer_height_0 = 0.25 +retraction_speed = 60 +support_interface_height = =layer_height*8 top_bottom_thickness = 0.8 wall_thickness = =line_width*6 -support_interface_height = =layer_height*8 -retraction_speed = 60 -cool_fan_enabled = True \ No newline at end of file + diff --git a/resources/quality/goofoo/goofoo_far_global_0.1_efine.inst.cfg b/resources/quality/goofoo/goofoo_far_global_0.1_efine.inst.cfg index 841da4bef1..7ff321a88c 100644 --- a/resources/quality/goofoo/goofoo_far_global_0.1_efine.inst.cfg +++ b/resources/quality/goofoo/goofoo_far_global_0.1_efine.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_far +name = Extra Fine Quality +version = 4 [metadata] +global_quality = True +quality_type = efine setting_version = 20 type = quality -quality_type = efine weight = 0 -global_quality = True [values] +cool_fan_enabled = True layer_height = 0.1 layer_height_0 = 0.15 +retraction_speed = 60 +support_interface_height = =layer_height*12 top_bottom_thickness = 0.8 wall_thickness = =line_width*6 -support_interface_height = =layer_height*12 -retraction_speed = 60 -cool_fan_enabled = True \ No newline at end of file + diff --git a/resources/quality/goofoo/goofoo_far_global_0.20_standard.inst.cfg b/resources/quality/goofoo/goofoo_far_global_0.20_standard.inst.cfg index 870ef0ab18..a1e02a0ef8 100644 --- a/resources/quality/goofoo/goofoo_far_global_0.20_standard.inst.cfg +++ b/resources/quality/goofoo/goofoo_far_global_0.20_standard.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_far +name = Standard Quality +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = -3 -global_quality = True [values] +cool_fan_enabled = True layer_height = 0.20 layer_height_0 = 0.3 +retraction_speed = 60 +support_interface_height = =layer_height*5 top_bottom_thickness = 0.8 wall_thickness = =line_width*4 -support_interface_height = =layer_height*5 -retraction_speed = 60 -cool_fan_enabled = True \ No newline at end of file + diff --git a/resources/quality/goofoo/goofoo_far_global_0.3_draft.inst.cfg b/resources/quality/goofoo/goofoo_far_global_0.3_draft.inst.cfg index 6cddac0852..5ab205bd74 100644 --- a/resources/quality/goofoo/goofoo_far_global_0.3_draft.inst.cfg +++ b/resources/quality/goofoo/goofoo_far_global_0.3_draft.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_far +name = Draft Quality +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] +adaptive_layer_height_enabled = true +cool_fan_enabled = True layer_height = 0.3 layer_height_0 = 0.3 +retraction_speed = 60 +support_interface_height = =layer_height*6 top_bottom_thickness = 0.8 wall_thickness = =line_width*5 -support_interface_height = =layer_height*6 -adaptive_layer_height_enabled = true -retraction_speed = 60 -cool_fan_enabled = True \ No newline at end of file + diff --git a/resources/quality/goofoo/goofoo_near_global_0.15_fine.inst.cfg b/resources/quality/goofoo/goofoo_near_global_0.15_fine.inst.cfg index f258efac56..b4a16b654a 100644 --- a/resources/quality/goofoo/goofoo_near_global_0.15_fine.inst.cfg +++ b/resources/quality/goofoo/goofoo_near_global_0.15_fine.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_near +name = Fine Quality +version = 4 [metadata] +global_quality = True +quality_type = fine setting_version = 20 type = quality -quality_type = fine weight = -1 -global_quality = True [values] +cool_fan_enabled = True layer_height = 0.15 layer_height_0 = 0.25 +retraction_speed = 60 +support_interface_height = =layer_height*8 top_bottom_thickness = 0.8 wall_thickness = =line_width*6 -support_interface_height = =layer_height*8 -retraction_speed = 60 -cool_fan_enabled = True \ No newline at end of file + diff --git a/resources/quality/goofoo/goofoo_near_global_0.1_efine.inst.cfg b/resources/quality/goofoo/goofoo_near_global_0.1_efine.inst.cfg index 3ff7c2f4e7..b18cb3ef26 100644 --- a/resources/quality/goofoo/goofoo_near_global_0.1_efine.inst.cfg +++ b/resources/quality/goofoo/goofoo_near_global_0.1_efine.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_near +name = Extra Fine Quality +version = 4 [metadata] +global_quality = True +quality_type = efine setting_version = 20 type = quality -quality_type = efine weight = 0 -global_quality = True [values] +cool_fan_enabled = True layer_height = 0.1 layer_height_0 = 0.15 +retraction_speed = 60 +support_interface_height = =layer_height*12 top_bottom_thickness = 0.8 wall_thickness = =line_width*6 -support_interface_height = =layer_height*12 -retraction_speed = 60 -cool_fan_enabled = True \ No newline at end of file + diff --git a/resources/quality/goofoo/goofoo_near_global_0.20_standard.inst.cfg b/resources/quality/goofoo/goofoo_near_global_0.20_standard.inst.cfg index 4d9442c8b6..a708a49c6c 100644 --- a/resources/quality/goofoo/goofoo_near_global_0.20_standard.inst.cfg +++ b/resources/quality/goofoo/goofoo_near_global_0.20_standard.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_near +name = Standard Quality +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = -3 -global_quality = True [values] +cool_fan_enabled = True layer_height = 0.20 layer_height_0 = 0.3 +retraction_speed = 60 +support_interface_height = =layer_height*5 top_bottom_thickness = 0.8 wall_thickness = =line_width*4 -support_interface_height = =layer_height*5 -retraction_speed = 60 -cool_fan_enabled = True \ No newline at end of file + diff --git a/resources/quality/goofoo/goofoo_near_global_0.3_draft.inst.cfg b/resources/quality/goofoo/goofoo_near_global_0.3_draft.inst.cfg index 675cef3560..32fd847fe5 100644 --- a/resources/quality/goofoo/goofoo_near_global_0.3_draft.inst.cfg +++ b/resources/quality/goofoo/goofoo_near_global_0.3_draft.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_near +name = Draft Quality +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] +adaptive_layer_height_enabled = true +cool_fan_enabled = True layer_height = 0.3 layer_height_0 = 0.3 +retraction_speed = 60 +support_interface_height = =layer_height*6 top_bottom_thickness = 0.8 wall_thickness = =line_width*5 -support_interface_height = =layer_height*6 -adaptive_layer_height_enabled = true -retraction_speed = 60 -cool_fan_enabled = True \ No newline at end of file + diff --git a/resources/quality/goofoo/goofoo_open_global_0.15_fine.inst.cfg b/resources/quality/goofoo/goofoo_open_global_0.15_fine.inst.cfg index 611905c280..9d759041f3 100644 --- a/resources/quality/goofoo/goofoo_open_global_0.15_fine.inst.cfg +++ b/resources/quality/goofoo/goofoo_open_global_0.15_fine.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_open +name = Fine Quality +version = 4 [metadata] +global_quality = True +quality_type = fine setting_version = 20 type = quality -quality_type = fine weight = -1 -global_quality = True [values] +cool_fan_enabled = True layer_height = 0.15 layer_height_0 = 0.25 +retraction_speed = 60 +support_interface_height = =layer_height*8 top_bottom_thickness = 0.8 wall_thickness = =line_width*6 -support_interface_height = =layer_height*8 -retraction_speed = 60 -cool_fan_enabled = True \ No newline at end of file + diff --git a/resources/quality/goofoo/goofoo_open_global_0.1_efine.inst.cfg b/resources/quality/goofoo/goofoo_open_global_0.1_efine.inst.cfg index d54b52e54e..8f254dd777 100644 --- a/resources/quality/goofoo/goofoo_open_global_0.1_efine.inst.cfg +++ b/resources/quality/goofoo/goofoo_open_global_0.1_efine.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_open +name = Extra Fine Quality +version = 4 [metadata] +global_quality = True +quality_type = efine setting_version = 20 type = quality -quality_type = efine weight = 0 -global_quality = True [values] +cool_fan_enabled = True layer_height = 0.1 layer_height_0 = 0.15 +retraction_speed = 60 +support_interface_height = =layer_height*12 top_bottom_thickness = 0.8 wall_thickness = =line_width*6 -support_interface_height = =layer_height*12 -retraction_speed = 60 -cool_fan_enabled = True \ No newline at end of file + diff --git a/resources/quality/goofoo/goofoo_open_global_0.20_standard.inst.cfg b/resources/quality/goofoo/goofoo_open_global_0.20_standard.inst.cfg index 31925f365c..5c20153515 100644 --- a/resources/quality/goofoo/goofoo_open_global_0.20_standard.inst.cfg +++ b/resources/quality/goofoo/goofoo_open_global_0.20_standard.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_open +name = Standard Quality +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = -3 -global_quality = True [values] +cool_fan_enabled = True layer_height = 0.20 layer_height_0 = 0.3 +retraction_speed = 60 +support_interface_height = =layer_height*5 top_bottom_thickness = 0.8 wall_thickness = =line_width*4 -support_interface_height = =layer_height*5 -retraction_speed = 60 -cool_fan_enabled = True \ No newline at end of file + diff --git a/resources/quality/goofoo/goofoo_open_global_0.3_draft.inst.cfg b/resources/quality/goofoo/goofoo_open_global_0.3_draft.inst.cfg index a43f0b8359..ab5ca40649 100644 --- a/resources/quality/goofoo/goofoo_open_global_0.3_draft.inst.cfg +++ b/resources/quality/goofoo/goofoo_open_global_0.3_draft.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_open +name = Draft Quality +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] +adaptive_layer_height_enabled = true +cool_fan_enabled = True layer_height = 0.3 layer_height_0 = 0.3 +retraction_speed = 60 +support_interface_height = =layer_height*6 top_bottom_thickness = 0.8 wall_thickness = =line_width*5 -support_interface_height = =layer_height*6 -adaptive_layer_height_enabled = true -retraction_speed = 60 -cool_fan_enabled = True \ No newline at end of file + diff --git a/resources/quality/goofoo/goofoo_small_global_0.15_fine.inst.cfg b/resources/quality/goofoo/goofoo_small_global_0.15_fine.inst.cfg index d176f3e64e..b02db01026 100644 --- a/resources/quality/goofoo/goofoo_small_global_0.15_fine.inst.cfg +++ b/resources/quality/goofoo/goofoo_small_global_0.15_fine.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_small +name = Fine Quality +version = 4 [metadata] +global_quality = True +quality_type = fine setting_version = 20 type = quality -quality_type = fine weight = -1 -global_quality = True [values] +cool_fan_enabled = True layer_height = 0.15 layer_height_0 = 0.25 +retraction_speed = 60 +support_interface_height = =layer_height*8 top_bottom_thickness = 0.8 wall_thickness = =line_width*6 -support_interface_height = =layer_height*8 -retraction_speed = 60 -cool_fan_enabled = True \ No newline at end of file + diff --git a/resources/quality/goofoo/goofoo_small_global_0.1_efine.inst.cfg b/resources/quality/goofoo/goofoo_small_global_0.1_efine.inst.cfg index 924adf4fdd..335065096c 100644 --- a/resources/quality/goofoo/goofoo_small_global_0.1_efine.inst.cfg +++ b/resources/quality/goofoo/goofoo_small_global_0.1_efine.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_small +name = Extra Fine Quality +version = 4 [metadata] +global_quality = True +quality_type = efine setting_version = 20 type = quality -quality_type = efine weight = 0 -global_quality = True [values] +cool_fan_enabled = True layer_height = 0.1 layer_height_0 = 0.15 +retraction_speed = 60 +support_interface_height = =layer_height*12 top_bottom_thickness = 0.8 wall_thickness = =line_width*6 -support_interface_height = =layer_height*12 -retraction_speed = 60 -cool_fan_enabled = True \ No newline at end of file + diff --git a/resources/quality/goofoo/goofoo_small_global_0.20_standard.inst.cfg b/resources/quality/goofoo/goofoo_small_global_0.20_standard.inst.cfg index 46ea7b288a..72915d96d9 100644 --- a/resources/quality/goofoo/goofoo_small_global_0.20_standard.inst.cfg +++ b/resources/quality/goofoo/goofoo_small_global_0.20_standard.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_small +name = Standard Quality +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = -3 -global_quality = True [values] +cool_fan_enabled = True layer_height = 0.20 layer_height_0 = 0.3 +retraction_speed = 60 +support_interface_height = =layer_height*5 top_bottom_thickness = 0.8 wall_thickness = =line_width*4 -support_interface_height = =layer_height*5 -retraction_speed = 60 -cool_fan_enabled = True \ No newline at end of file + diff --git a/resources/quality/goofoo/goofoo_small_global_0.3_draft.inst.cfg b/resources/quality/goofoo/goofoo_small_global_0.3_draft.inst.cfg index 063fb9faa8..5efa4555af 100644 --- a/resources/quality/goofoo/goofoo_small_global_0.3_draft.inst.cfg +++ b/resources/quality/goofoo/goofoo_small_global_0.3_draft.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_small +name = Draft Quality +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] +adaptive_layer_height_enabled = true +cool_fan_enabled = True layer_height = 0.3 layer_height_0 = 0.3 +retraction_speed = 60 +support_interface_height = =layer_height*6 top_bottom_thickness = 0.8 wall_thickness = =line_width*5 -support_interface_height = =layer_height*6 -adaptive_layer_height_enabled = true -retraction_speed = 60 -cool_fan_enabled = True \ No newline at end of file + diff --git a/resources/quality/goofoo/hips/goofoo_far_0.40_hips_draft.inst.cfg b/resources/quality/goofoo/hips/goofoo_far_0.40_hips_draft.inst.cfg index 71f89c77e4..68ffbea722 100644 --- a/resources/quality/goofoo/hips/goofoo_far_0.40_hips_draft.inst.cfg +++ b/resources/quality/goofoo/hips/goofoo_far_0.40_hips_draft.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_far +name = Draft Quality +version = 4 [metadata] +material = goofoo_hips +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = goofoo_hips variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = skirt -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/hips/goofoo_far_0.40_hips_efine.inst.cfg b/resources/quality/goofoo/hips/goofoo_far_0.40_hips_efine.inst.cfg index b01d68fea3..ba44bf42d6 100644 --- a/resources/quality/goofoo/hips/goofoo_far_0.40_hips_efine.inst.cfg +++ b/resources/quality/goofoo/hips/goofoo_far_0.40_hips_efine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_far +name = Extra Fine Quality +version = 4 [metadata] +material = goofoo_hips +quality_type = efine setting_version = 20 type = quality -quality_type = efine -material = goofoo_hips variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = skirt -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/hips/goofoo_far_0.40_hips_fine.inst.cfg b/resources/quality/goofoo/hips/goofoo_far_0.40_hips_fine.inst.cfg index 540cdbd631..b5cada3bae 100644 --- a/resources/quality/goofoo/hips/goofoo_far_0.40_hips_fine.inst.cfg +++ b/resources/quality/goofoo/hips/goofoo_far_0.40_hips_fine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_far +name = Fine Quality +version = 4 [metadata] +material = goofoo_hips +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_hips variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = skirt -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/hips/goofoo_far_0.40_hips_standard.inst.cfg b/resources/quality/goofoo/hips/goofoo_far_0.40_hips_standard.inst.cfg index b9648ede31..54309c9450 100644 --- a/resources/quality/goofoo/hips/goofoo_far_0.40_hips_standard.inst.cfg +++ b/resources/quality/goofoo/hips/goofoo_far_0.40_hips_standard.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_far +name = Standard Quality +version = 4 [metadata] +material = goofoo_hips +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_hips variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = skirt -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/hips/goofoo_near_0.40_hips_draft.inst.cfg b/resources/quality/goofoo/hips/goofoo_near_0.40_hips_draft.inst.cfg index dc9982a4c3..1c69be7be9 100644 --- a/resources/quality/goofoo/hips/goofoo_near_0.40_hips_draft.inst.cfg +++ b/resources/quality/goofoo/hips/goofoo_near_0.40_hips_draft.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_near +name = Draft Quality +version = 4 [metadata] +material = goofoo_hips +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = goofoo_hips variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = skirt -retraction_amount = 4.5 \ No newline at end of file +retraction_amount = 4.5 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/hips/goofoo_near_0.40_hips_efine.inst.cfg b/resources/quality/goofoo/hips/goofoo_near_0.40_hips_efine.inst.cfg index af6d3c8517..fdf56e8013 100644 --- a/resources/quality/goofoo/hips/goofoo_near_0.40_hips_efine.inst.cfg +++ b/resources/quality/goofoo/hips/goofoo_near_0.40_hips_efine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_near +name = Extra Fine Quality +version = 4 [metadata] +material = goofoo_hips +quality_type = efine setting_version = 20 type = quality -quality_type = efine -material = goofoo_hips variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = skirt -retraction_amount = 4.5 \ No newline at end of file +retraction_amount = 4.5 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/hips/goofoo_near_0.40_hips_fine.inst.cfg b/resources/quality/goofoo/hips/goofoo_near_0.40_hips_fine.inst.cfg index a5b5312217..8c0a1a64f0 100644 --- a/resources/quality/goofoo/hips/goofoo_near_0.40_hips_fine.inst.cfg +++ b/resources/quality/goofoo/hips/goofoo_near_0.40_hips_fine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_near +name = Fine Quality +version = 4 [metadata] +material = goofoo_hips +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_hips variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = skirt -retraction_amount = 4.5 \ No newline at end of file +retraction_amount = 4.5 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/hips/goofoo_near_0.40_hips_standard.inst.cfg b/resources/quality/goofoo/hips/goofoo_near_0.40_hips_standard.inst.cfg index 43fd98bae8..09c9dedc0c 100644 --- a/resources/quality/goofoo/hips/goofoo_near_0.40_hips_standard.inst.cfg +++ b/resources/quality/goofoo/hips/goofoo_near_0.40_hips_standard.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_near +name = Standard Quality +version = 4 [metadata] +material = goofoo_hips +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_hips variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = skirt -retraction_amount = 4.5 \ No newline at end of file +retraction_amount = 4.5 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/hips/goofoo_open_0.40_hips_draft.inst.cfg b/resources/quality/goofoo/hips/goofoo_open_0.40_hips_draft.inst.cfg index e27eb1fcb4..8268cf9dcd 100644 --- a/resources/quality/goofoo/hips/goofoo_open_0.40_hips_draft.inst.cfg +++ b/resources/quality/goofoo/hips/goofoo_open_0.40_hips_draft.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_open +name = Draft Quality +version = 4 [metadata] +material = goofoo_hips +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = goofoo_hips variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = skirt -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/hips/goofoo_open_0.40_hips_efine.inst.cfg b/resources/quality/goofoo/hips/goofoo_open_0.40_hips_efine.inst.cfg index 0b8e808ab5..857f7dd195 100644 --- a/resources/quality/goofoo/hips/goofoo_open_0.40_hips_efine.inst.cfg +++ b/resources/quality/goofoo/hips/goofoo_open_0.40_hips_efine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_open +name = Extra Fine Quality +version = 4 [metadata] +material = goofoo_hips +quality_type = efine setting_version = 20 type = quality -quality_type = efine -material = goofoo_hips variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = skirt -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/hips/goofoo_open_0.40_hips_fine.inst.cfg b/resources/quality/goofoo/hips/goofoo_open_0.40_hips_fine.inst.cfg index f00e02dfb5..7040025061 100644 --- a/resources/quality/goofoo/hips/goofoo_open_0.40_hips_fine.inst.cfg +++ b/resources/quality/goofoo/hips/goofoo_open_0.40_hips_fine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_open +name = Fine Quality +version = 4 [metadata] +material = goofoo_hips +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_hips variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = skirt -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/hips/goofoo_open_0.40_hips_standard.inst.cfg b/resources/quality/goofoo/hips/goofoo_open_0.40_hips_standard.inst.cfg index a57b85233c..5f613ccbf9 100644 --- a/resources/quality/goofoo/hips/goofoo_open_0.40_hips_standard.inst.cfg +++ b/resources/quality/goofoo/hips/goofoo_open_0.40_hips_standard.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_open +name = Standard Quality +version = 4 [metadata] +material = goofoo_hips +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_hips variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = skirt -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/pa/goofoo_far_0.40_pa_fine.inst.cfg b/resources/quality/goofoo/pa/goofoo_far_0.40_pa_fine.inst.cfg index c228b80485..0402528a49 100644 --- a/resources/quality/goofoo/pa/goofoo_far_0.40_pa_fine.inst.cfg +++ b/resources/quality/goofoo/pa/goofoo_far_0.40_pa_fine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_far +name = Fine Quality +version = 4 [metadata] +material = goofoo_pa +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_pa variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = brim retraction_amount = 6 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/pa/goofoo_far_0.40_pa_standard.inst.cfg b/resources/quality/goofoo/pa/goofoo_far_0.40_pa_standard.inst.cfg index 4947ea6aaa..c577a901d9 100644 --- a/resources/quality/goofoo/pa/goofoo_far_0.40_pa_standard.inst.cfg +++ b/resources/quality/goofoo/pa/goofoo_far_0.40_pa_standard.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_far +name = Standard Quality +version = 4 [metadata] +material = goofoo_pa +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_pa variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = brim -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/pa/goofoo_near_0.40_pa_fine.inst.cfg b/resources/quality/goofoo/pa/goofoo_near_0.40_pa_fine.inst.cfg index d2de67c419..d5f9ce9050 100644 --- a/resources/quality/goofoo/pa/goofoo_near_0.40_pa_fine.inst.cfg +++ b/resources/quality/goofoo/pa/goofoo_near_0.40_pa_fine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_near +name = Fine Quality +version = 4 [metadata] +material = goofoo_pa +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_pa variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = brim retraction_amount = 4.5 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/pa/goofoo_near_0.40_pa_standard.inst.cfg b/resources/quality/goofoo/pa/goofoo_near_0.40_pa_standard.inst.cfg index 46f1a8807c..b08f96c79a 100644 --- a/resources/quality/goofoo/pa/goofoo_near_0.40_pa_standard.inst.cfg +++ b/resources/quality/goofoo/pa/goofoo_near_0.40_pa_standard.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_near +name = Standard Quality +version = 4 [metadata] +material = goofoo_pa +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_pa variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = brim -retraction_amount = 4.5 \ No newline at end of file +retraction_amount = 4.5 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/pa_cf/goofoo_far_0.40_pa_cf_fine.inst.cfg b/resources/quality/goofoo/pa_cf/goofoo_far_0.40_pa_cf_fine.inst.cfg index 27dbeb658b..37fd3aea2b 100644 --- a/resources/quality/goofoo/pa_cf/goofoo_far_0.40_pa_cf_fine.inst.cfg +++ b/resources/quality/goofoo/pa_cf/goofoo_far_0.40_pa_cf_fine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_far +name = Fine Quality +version = 4 [metadata] +material = goofoo_pa_cf +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_pa_cf variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = brim -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/pa_cf/goofoo_far_0.40_pa_cf_standard.inst.cfg b/resources/quality/goofoo/pa_cf/goofoo_far_0.40_pa_cf_standard.inst.cfg index 4060c34061..a1c4000189 100644 --- a/resources/quality/goofoo/pa_cf/goofoo_far_0.40_pa_cf_standard.inst.cfg +++ b/resources/quality/goofoo/pa_cf/goofoo_far_0.40_pa_cf_standard.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_far +name = Standard Quality +version = 4 [metadata] +material = goofoo_pa_cf +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_pa_cf variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = brim -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/pa_cf/goofoo_near_0.40_pa_cf_fine.inst.cfg b/resources/quality/goofoo/pa_cf/goofoo_near_0.40_pa_cf_fine.inst.cfg index 36f89305f6..8f77923928 100644 --- a/resources/quality/goofoo/pa_cf/goofoo_near_0.40_pa_cf_fine.inst.cfg +++ b/resources/quality/goofoo/pa_cf/goofoo_near_0.40_pa_cf_fine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_near +name = Fine Quality +version = 4 [metadata] +material = goofoo_pa_cf +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_pa_cf variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = brim -retraction_amount = 4.5 \ No newline at end of file +retraction_amount = 4.5 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/pa_cf/goofoo_near_0.40_pa_cf_standard.inst.cfg b/resources/quality/goofoo/pa_cf/goofoo_near_0.40_pa_cf_standard.inst.cfg index 64a7e52dbe..4115abeda6 100644 --- a/resources/quality/goofoo/pa_cf/goofoo_near_0.40_pa_cf_standard.inst.cfg +++ b/resources/quality/goofoo/pa_cf/goofoo_near_0.40_pa_cf_standard.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_near +name = Standard Quality +version = 4 [metadata] +material = goofoo_pa_cf +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_pa_cf variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 adhesion_type = brim -retraction_amount = 4.5 \ No newline at end of file +retraction_amount = 4.5 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/pc/goofoo_far_0.40_pc_draft.inst.cfg b/resources/quality/goofoo/pc/goofoo_far_0.40_pc_draft.inst.cfg index 3c78d139b3..646de7c093 100644 --- a/resources/quality/goofoo/pc/goofoo_far_0.40_pc_draft.inst.cfg +++ b/resources/quality/goofoo/pc/goofoo_far_0.40_pc_draft.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_far +name = Draft Quality +version = 4 [metadata] +material = goofoo_pc +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = goofoo_pc variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pc/goofoo_far_0.40_pc_efine.inst.cfg b/resources/quality/goofoo/pc/goofoo_far_0.40_pc_efine.inst.cfg index 9190f3c060..a84005a46f 100644 --- a/resources/quality/goofoo/pc/goofoo_far_0.40_pc_efine.inst.cfg +++ b/resources/quality/goofoo/pc/goofoo_far_0.40_pc_efine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_far +name = Extra Fine Quality +version = 4 [metadata] +material = goofoo_pc +quality_type = efine setting_version = 20 type = quality -quality_type = efine -material = goofoo_pc variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pc/goofoo_far_0.40_pc_fine.inst.cfg b/resources/quality/goofoo/pc/goofoo_far_0.40_pc_fine.inst.cfg index a569cbb2f2..0ce7ac630f 100644 --- a/resources/quality/goofoo/pc/goofoo_far_0.40_pc_fine.inst.cfg +++ b/resources/quality/goofoo/pc/goofoo_far_0.40_pc_fine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_far +name = Fine Quality +version = 4 [metadata] +material = goofoo_pc +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_pc variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pc/goofoo_far_0.40_pc_standard.inst.cfg b/resources/quality/goofoo/pc/goofoo_far_0.40_pc_standard.inst.cfg index 718eed3083..a50b2621b3 100644 --- a/resources/quality/goofoo/pc/goofoo_far_0.40_pc_standard.inst.cfg +++ b/resources/quality/goofoo/pc/goofoo_far_0.40_pc_standard.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_far +name = Standard Quality +version = 4 [metadata] +material = goofoo_pc +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_pc variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pc/goofoo_near_0.40_pc_draft.inst.cfg b/resources/quality/goofoo/pc/goofoo_near_0.40_pc_draft.inst.cfg index c5611599d0..f5f9b809e6 100644 --- a/resources/quality/goofoo/pc/goofoo_near_0.40_pc_draft.inst.cfg +++ b/resources/quality/goofoo/pc/goofoo_near_0.40_pc_draft.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_near +name = Draft Quality +version = 4 [metadata] +material = goofoo_pc +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = goofoo_pc variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 4.5 \ No newline at end of file +retraction_amount = 4.5 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pc/goofoo_near_0.40_pc_efine.inst.cfg b/resources/quality/goofoo/pc/goofoo_near_0.40_pc_efine.inst.cfg index e72c2b21f1..c4e93e924e 100644 --- a/resources/quality/goofoo/pc/goofoo_near_0.40_pc_efine.inst.cfg +++ b/resources/quality/goofoo/pc/goofoo_near_0.40_pc_efine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_near +name = Extra Fine Quality +version = 4 [metadata] +material = goofoo_pc +quality_type = efine setting_version = 20 type = quality -quality_type = efine -material = goofoo_pc variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 4.5 \ No newline at end of file +retraction_amount = 4.5 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pc/goofoo_near_0.40_pc_fine.inst.cfg b/resources/quality/goofoo/pc/goofoo_near_0.40_pc_fine.inst.cfg index 3877431669..a8372e618a 100644 --- a/resources/quality/goofoo/pc/goofoo_near_0.40_pc_fine.inst.cfg +++ b/resources/quality/goofoo/pc/goofoo_near_0.40_pc_fine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_near +name = Fine Quality +version = 4 [metadata] +material = goofoo_pc +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_pc variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 4.5 \ No newline at end of file +retraction_amount = 4.5 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pc/goofoo_near_0.40_pc_standard.inst.cfg b/resources/quality/goofoo/pc/goofoo_near_0.40_pc_standard.inst.cfg index 1354b13743..83416ba82b 100644 --- a/resources/quality/goofoo/pc/goofoo_near_0.40_pc_standard.inst.cfg +++ b/resources/quality/goofoo/pc/goofoo_near_0.40_pc_standard.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_near +name = Standard Quality +version = 4 [metadata] +material = goofoo_pc +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_pc variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 4.5 \ No newline at end of file +retraction_amount = 4.5 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/peek/goofoo_far_0.40_peek_draft.inst.cfg b/resources/quality/goofoo/peek/goofoo_far_0.40_peek_draft.inst.cfg index 04bdfbe9b8..c8bf15e2b3 100644 --- a/resources/quality/goofoo/peek/goofoo_far_0.40_peek_draft.inst.cfg +++ b/resources/quality/goofoo/peek/goofoo_far_0.40_peek_draft.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_far +name = Draft Quality +version = 4 [metadata] +material = goofoo_peek +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = goofoo_peek variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt cool_fan_enabled = False -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/peek/goofoo_far_0.40_peek_efine.inst.cfg b/resources/quality/goofoo/peek/goofoo_far_0.40_peek_efine.inst.cfg index c0fc826844..3fae26b9b0 100644 --- a/resources/quality/goofoo/peek/goofoo_far_0.40_peek_efine.inst.cfg +++ b/resources/quality/goofoo/peek/goofoo_far_0.40_peek_efine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_far +name = Extra Fine Quality +version = 4 [metadata] +material = goofoo_peek +quality_type = efine setting_version = 20 type = quality -quality_type = efine -material = goofoo_peek variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt cool_fan_enabled = False -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/peek/goofoo_far_0.40_peek_fine.inst.cfg b/resources/quality/goofoo/peek/goofoo_far_0.40_peek_fine.inst.cfg index aad19e3e3b..40c20eb5b5 100644 --- a/resources/quality/goofoo/peek/goofoo_far_0.40_peek_fine.inst.cfg +++ b/resources/quality/goofoo/peek/goofoo_far_0.40_peek_fine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_far +name = Fine Quality +version = 4 [metadata] +material = goofoo_peek +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_peek variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt cool_fan_enabled = False -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/peek/goofoo_far_0.40_peek_standard.inst.cfg b/resources/quality/goofoo/peek/goofoo_far_0.40_peek_standard.inst.cfg index e918865fbc..bff8800567 100644 --- a/resources/quality/goofoo/peek/goofoo_far_0.40_peek_standard.inst.cfg +++ b/resources/quality/goofoo/peek/goofoo_far_0.40_peek_standard.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_far +name = Standard Quality +version = 4 [metadata] +material = goofoo_peek +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_peek variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt cool_fan_enabled = False -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/peek/goofoo_near_0.40_peek_draft.inst.cfg b/resources/quality/goofoo/peek/goofoo_near_0.40_peek_draft.inst.cfg index 7968d41021..09a99a276b 100644 --- a/resources/quality/goofoo/peek/goofoo_near_0.40_peek_draft.inst.cfg +++ b/resources/quality/goofoo/peek/goofoo_near_0.40_peek_draft.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_near +name = Draft Quality +version = 4 [metadata] +material = goofoo_peek +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = goofoo_peek variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt cool_fan_enabled = False -retraction_amount = 4.5 \ No newline at end of file +retraction_amount = 4.5 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/peek/goofoo_near_0.40_peek_efine.inst.cfg b/resources/quality/goofoo/peek/goofoo_near_0.40_peek_efine.inst.cfg index 8ca078bf55..f05a6a961c 100644 --- a/resources/quality/goofoo/peek/goofoo_near_0.40_peek_efine.inst.cfg +++ b/resources/quality/goofoo/peek/goofoo_near_0.40_peek_efine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_near +name = Extra Fine Quality +version = 4 [metadata] +material = goofoo_peek +quality_type = efine setting_version = 20 type = quality -quality_type = efine -material = goofoo_peek variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt cool_fan_enabled = False -retraction_amount = 4.5 \ No newline at end of file +retraction_amount = 4.5 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/peek/goofoo_near_0.40_peek_fine.inst.cfg b/resources/quality/goofoo/peek/goofoo_near_0.40_peek_fine.inst.cfg index 2f76c7564e..08139e1e88 100644 --- a/resources/quality/goofoo/peek/goofoo_near_0.40_peek_fine.inst.cfg +++ b/resources/quality/goofoo/peek/goofoo_near_0.40_peek_fine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_near +name = Fine Quality +version = 4 [metadata] +material = goofoo_peek +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_peek variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt cool_fan_enabled = False -retraction_amount = 4.5 \ No newline at end of file +retraction_amount = 4.5 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/peek/goofoo_near_0.40_peek_standard.inst.cfg b/resources/quality/goofoo/peek/goofoo_near_0.40_peek_standard.inst.cfg index 1f6ce72596..7024ad8a5d 100644 --- a/resources/quality/goofoo/peek/goofoo_near_0.40_peek_standard.inst.cfg +++ b/resources/quality/goofoo/peek/goofoo_near_0.40_peek_standard.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_near +name = Standard Quality +version = 4 [metadata] +material = goofoo_peek +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_peek variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt cool_fan_enabled = False -retraction_amount = 4.5 \ No newline at end of file +retraction_amount = 4.5 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/petg/goofoo_far_0.40_petg_fine.inst.cfg b/resources/quality/goofoo/petg/goofoo_far_0.40_petg_fine.inst.cfg index 059b769eab..887ed658fb 100644 --- a/resources/quality/goofoo/petg/goofoo_far_0.40_petg_fine.inst.cfg +++ b/resources/quality/goofoo/petg/goofoo_far_0.40_petg_fine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_far +name = Fine Quality +version = 4 [metadata] +material = goofoo_petg +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_petg variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 -speed_layer_0 = 15 adhesion_type = skirt -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +speed_layer_0 = 15 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/petg/goofoo_far_0.40_petg_standard.inst.cfg b/resources/quality/goofoo/petg/goofoo_far_0.40_petg_standard.inst.cfg index bf13b05e29..1f56b3d33f 100644 --- a/resources/quality/goofoo/petg/goofoo_far_0.40_petg_standard.inst.cfg +++ b/resources/quality/goofoo/petg/goofoo_far_0.40_petg_standard.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_far +name = Standard Quality +version = 4 [metadata] +material = goofoo_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_petg variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 -speed_layer_0 = 15 adhesion_type = skirt -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +speed_layer_0 = 15 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/petg/goofoo_near_0.40_petg_fine.inst.cfg b/resources/quality/goofoo/petg/goofoo_near_0.40_petg_fine.inst.cfg index 7a2efa0472..9469675139 100644 --- a/resources/quality/goofoo/petg/goofoo_near_0.40_petg_fine.inst.cfg +++ b/resources/quality/goofoo/petg/goofoo_near_0.40_petg_fine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_near +name = Fine Quality +version = 4 [metadata] +material = goofoo_petg +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_petg variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 -speed_layer_0 = 15 adhesion_type = skirt -retraction_amount = 4.5 \ No newline at end of file +retraction_amount = 4.5 +speed_layer_0 = 15 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/petg/goofoo_near_0.40_petg_standard.inst.cfg b/resources/quality/goofoo/petg/goofoo_near_0.40_petg_standard.inst.cfg index eaa03ff0e3..b3e9061be1 100644 --- a/resources/quality/goofoo/petg/goofoo_near_0.40_petg_standard.inst.cfg +++ b/resources/quality/goofoo/petg/goofoo_near_0.40_petg_standard.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_near +name = Standard Quality +version = 4 [metadata] +material = goofoo_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_petg variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 -speed_layer_0 = 15 adhesion_type = skirt -retraction_amount = 4.5 \ No newline at end of file +retraction_amount = 4.5 +speed_layer_0 = 15 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/petg/goofoo_open_0.40_petg_fine.inst.cfg b/resources/quality/goofoo/petg/goofoo_open_0.40_petg_fine.inst.cfg index 55a160b2c0..80193c33e0 100644 --- a/resources/quality/goofoo/petg/goofoo_open_0.40_petg_fine.inst.cfg +++ b/resources/quality/goofoo/petg/goofoo_open_0.40_petg_fine.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_open +name = Fine Quality +version = 4 [metadata] +material = goofoo_petg +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_petg variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 -speed_layer_0 = 15 adhesion_type = skirt +material_bed_temperature = 70 retraction_amount = 6 -material_bed_temperature = 70 \ No newline at end of file +speed_layer_0 = 15 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/petg/goofoo_open_0.40_petg_standard.inst.cfg b/resources/quality/goofoo/petg/goofoo_open_0.40_petg_standard.inst.cfg index 0fddb5a354..fcb68ac6d6 100644 --- a/resources/quality/goofoo/petg/goofoo_open_0.40_petg_standard.inst.cfg +++ b/resources/quality/goofoo/petg/goofoo_open_0.40_petg_standard.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_open +name = Standard Quality +version = 4 [metadata] +material = goofoo_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_petg variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 -speed_layer_0 = 15 adhesion_type = skirt +material_bed_temperature = 70 retraction_amount = 6 -material_bed_temperature = 70 \ No newline at end of file +speed_layer_0 = 15 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/petg/goofoo_small_0.40_petg_fine.inst.cfg b/resources/quality/goofoo/petg/goofoo_small_0.40_petg_fine.inst.cfg index 66fff53b13..fd8c8b80c8 100644 --- a/resources/quality/goofoo/petg/goofoo_small_0.40_petg_fine.inst.cfg +++ b/resources/quality/goofoo/petg/goofoo_small_0.40_petg_fine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_small +name = Fine Quality +version = 4 [metadata] +material = goofoo_petg +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_petg variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 -speed_layer_0 = 15 adhesion_type = raft -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +speed_layer_0 = 15 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/petg/goofoo_small_0.40_petg_standard.inst.cfg b/resources/quality/goofoo/petg/goofoo_small_0.40_petg_standard.inst.cfg index 63c47f0643..cbc9b5114b 100644 --- a/resources/quality/goofoo/petg/goofoo_small_0.40_petg_standard.inst.cfg +++ b/resources/quality/goofoo/petg/goofoo_small_0.40_petg_standard.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_small +name = Standard Quality +version = 4 [metadata] +material = goofoo_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_petg variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 -speed_layer_0 = 15 adhesion_type = raft -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +speed_layer_0 = 15 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/pla/goofoo_far_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_0.40_pla_draft.inst.cfg index 6f99afce0d..b46f227273 100644 --- a/resources/quality/goofoo/pla/goofoo_far_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_0.40_pla_draft.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_far +name = Draft Quality +version = 4 [metadata] +material = goofoo_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = goofoo_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_far_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_0.40_pla_efine.inst.cfg index 4d3b145927..f438be0e55 100644 --- a/resources/quality/goofoo/pla/goofoo_far_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_0.40_pla_efine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_far +name = Extra Fine Quality +version = 4 [metadata] +material = goofoo_pla +quality_type = efine setting_version = 20 type = quality -quality_type = efine -material = goofoo_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_far_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_0.40_pla_fine.inst.cfg index 2609ef1a8a..0728f556db 100644 --- a/resources/quality/goofoo/pla/goofoo_far_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_0.40_pla_fine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_far +name = Fine Quality +version = 4 [metadata] +material = goofoo_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_far_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_0.40_pla_standard.inst.cfg index 744013dcb1..298f85f5ce 100644 --- a/resources/quality/goofoo/pla/goofoo_far_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_0.40_pla_standard.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_far +name = Standard Quality +version = 4 [metadata] +material = goofoo_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_draft.inst.cfg index c77a95b347..0be39a211f 100644 --- a/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_draft.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_far +name = Draft Quality +version = 4 [metadata] +material = goofoo_bronze_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = goofoo_bronze_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = raft retraction_amount = 1 retraction_speed = 10 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_efine.inst.cfg index 393500208c..e682a2fe63 100644 --- a/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_efine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_far +name = Extra Fine Quality +version = 4 [metadata] +material = goofoo_bronze_pla +quality_type = efine setting_version = 20 type = quality -quality_type = efine -material = goofoo_bronze_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = raft retraction_amount = 1 -retraction_speed = 10 \ No newline at end of file +retraction_speed = 10 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_fine.inst.cfg index 2fe48702fc..32c228963d 100644 --- a/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_fine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_far +name = Fine Quality +version = 4 [metadata] +material = goofoo_bronze_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_bronze_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = raft retraction_amount = 1 -retraction_speed = 10 \ No newline at end of file +retraction_speed = 10 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_standard.inst.cfg index aada43d286..b06e12e6cc 100644 --- a/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_bronze_0.40_pla_standard.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_far +name = Standard Quality +version = 4 [metadata] +material = goofoo_bronze_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_bronze_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = raft retraction_amount = 1 -retraction_speed = 10 \ No newline at end of file +retraction_speed = 10 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_draft.inst.cfg index 21d00a1aa9..3f133ea56f 100644 --- a/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_draft.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_far +name = Draft Quality +version = 4 [metadata] +material = goofoo_emarble_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = goofoo_emarble_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_efine.inst.cfg index cc01a886d2..4d1ac99b52 100644 --- a/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_efine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_far +name = Extra Fine Quality +version = 4 [metadata] +material = goofoo_emarble_pla +quality_type = efine setting_version = 20 type = quality -quality_type = efine -material = goofoo_emarble_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_fine.inst.cfg index aa62a0fd79..b8216498b2 100644 --- a/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_fine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_far +name = Fine Quality +version = 4 [metadata] +material = goofoo_emarble_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_emarble_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_standard.inst.cfg index dc002b883b..89502bf88d 100644 --- a/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_emarble_0.40_pla_standard.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_far +name = Standard Quality +version = 4 [metadata] +material = goofoo_emarble_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_emarble_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_draft.inst.cfg index 9223d75e6c..cdaed8a751 100644 --- a/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_draft.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_far +name = Draft Quality +version = 4 [metadata] +material = goofoo_esilk_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = goofoo_esilk_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_efine.inst.cfg index eb5a14a58e..d60f33e345 100644 --- a/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_efine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_far +name = Extra Fine Quality +version = 4 [metadata] +material = goofoo_esilk_pla +quality_type = efine setting_version = 20 type = quality -quality_type = efine -material = goofoo_esilk_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_fine.inst.cfg index fff7786d4a..b461cd8433 100644 --- a/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_fine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_far +name = Fine Quality +version = 4 [metadata] +material = goofoo_esilk_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_esilk_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_standard.inst.cfg index bb1f4edefa..c286d2f988 100644 --- a/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_esilk_0.40_pla_standard.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_far +name = Standard Quality +version = 4 [metadata] +material = goofoo_esilk_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_esilk_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_draft.inst.cfg index cc39f4bc2a..3005e55859 100644 --- a/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_draft.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_far +name = Draft Quality +version = 4 [metadata] +material = goofoo_wood_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = goofoo_wood_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_efine.inst.cfg index 25173342e9..d22db05250 100644 --- a/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_efine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_far +name = Extra Fine Quality +version = 4 [metadata] +material = goofoo_wood_pla +quality_type = efine setting_version = 20 type = quality -quality_type = efine -material = goofoo_wood_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_fine.inst.cfg index 2668bef8bf..1c370ad04c 100644 --- a/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_fine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_far +name = Fine Quality +version = 4 [metadata] +material = goofoo_wood_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_wood_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_standard.inst.cfg index b18b53e6e3..e13698965f 100644 --- a/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_far_wood_0.40_pla_standard.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_far +name = Standard Quality +version = 4 [metadata] +material = goofoo_wood_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_wood_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_near_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_0.40_pla_draft.inst.cfg index 1f0583ccc7..307614e8e0 100644 --- a/resources/quality/goofoo/pla/goofoo_near_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_0.40_pla_draft.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_near +name = Draft Quality +version = 4 [metadata] +material = goofoo_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = goofoo_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 4.5 \ No newline at end of file +retraction_amount = 4.5 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_near_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_0.40_pla_efine.inst.cfg index 2c1b73883a..ec5590da84 100644 --- a/resources/quality/goofoo/pla/goofoo_near_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_0.40_pla_efine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_near +name = Extra Fine Quality +version = 4 [metadata] +material = goofoo_pla +quality_type = efine setting_version = 20 type = quality -quality_type = efine -material = goofoo_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 4.5 \ No newline at end of file +retraction_amount = 4.5 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_near_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_0.40_pla_fine.inst.cfg index ca3dd2b8c6..24da8c3799 100644 --- a/resources/quality/goofoo/pla/goofoo_near_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_0.40_pla_fine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_near +name = Fine Quality +version = 4 [metadata] +material = goofoo_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 4.5 \ No newline at end of file +retraction_amount = 4.5 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_near_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_0.40_pla_standard.inst.cfg index 0d50224596..617c4949ae 100644 --- a/resources/quality/goofoo/pla/goofoo_near_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_0.40_pla_standard.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_near +name = Standard Quality +version = 4 [metadata] +material = goofoo_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 4.5 \ No newline at end of file +retraction_amount = 4.5 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_draft.inst.cfg index 0e8556cff0..f9bb94da6b 100644 --- a/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_draft.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_near +name = Draft Quality +version = 4 [metadata] +material = goofoo_bronze_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = goofoo_bronze_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt retraction_amount = 1 retraction_speed = 10 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_efine.inst.cfg index 2b41a1b425..48450bfac6 100644 --- a/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_efine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_near +name = Extra Fine Quality +version = 4 [metadata] +material = goofoo_bronze_pla +quality_type = efine setting_version = 20 type = quality -quality_type = efine -material = goofoo_bronze_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt retraction_amount = 1 -retraction_speed = 10 \ No newline at end of file +retraction_speed = 10 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_fine.inst.cfg index e283869fd4..77258001d7 100644 --- a/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_fine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_near +name = Fine Quality +version = 4 [metadata] +material = goofoo_bronze_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_bronze_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt retraction_amount = 1 -retraction_speed = 10 \ No newline at end of file +retraction_speed = 10 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_standard.inst.cfg index 1d0947d1b7..24cf03bd3c 100644 --- a/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_bronze_0.40_pla_standard.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_near +name = Standard Quality +version = 4 [metadata] +material = goofoo_bronze_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_bronze_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt retraction_amount = 1 -retraction_speed = 10 \ No newline at end of file +retraction_speed = 10 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_draft.inst.cfg index 075623f612..b0b384133f 100644 --- a/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_draft.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_near +name = Draft Quality +version = 4 [metadata] +material = goofoo_emarble_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = goofoo_emarble_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 4.5 \ No newline at end of file +retraction_amount = 4.5 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_efine.inst.cfg index 3df1d30d61..57f8936e24 100644 --- a/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_efine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_near +name = Extra Fine Quality +version = 4 [metadata] +material = goofoo_emarble_pla +quality_type = efine setting_version = 20 type = quality -quality_type = efine -material = goofoo_emarble_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 4.5 \ No newline at end of file +retraction_amount = 4.5 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_fine.inst.cfg index 919d01c93b..05ff430f4f 100644 --- a/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_fine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_near +name = Fine Quality +version = 4 [metadata] +material = goofoo_emarble_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_emarble_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 4.5 \ No newline at end of file +retraction_amount = 4.5 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_standard.inst.cfg index 7e84a89f63..18f30d52c8 100644 --- a/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_emarble_0.40_pla_standard.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_near +name = Standard Quality +version = 4 [metadata] +material = goofoo_emarble_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_emarble_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 4.5 \ No newline at end of file +retraction_amount = 4.5 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_draft.inst.cfg index ed68461916..99c5bbe65b 100644 --- a/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_draft.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_near +name = Draft Quality +version = 4 [metadata] +material = goofoo_esilk_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = goofoo_esilk_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 4.5 \ No newline at end of file +retraction_amount = 4.5 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_efine.inst.cfg index 6fad24ecc0..75fc3a017d 100644 --- a/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_efine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_near +name = Extra Fine Quality +version = 4 [metadata] +material = goofoo_esilk_pla +quality_type = efine setting_version = 20 type = quality -quality_type = efine -material = goofoo_esilk_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 4.5 \ No newline at end of file +retraction_amount = 4.5 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_fine.inst.cfg index f2296e71dc..deb6d07f10 100644 --- a/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_fine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_near +name = Fine Quality +version = 4 [metadata] +material = goofoo_esilk_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_esilk_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 4.5 \ No newline at end of file +retraction_amount = 4.5 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_standard.inst.cfg index 8410c5b53f..e0225b3161 100644 --- a/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_esilk_0.40_pla_standard.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_near +name = Standard Quality +version = 4 [metadata] +material = goofoo_esilk_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_esilk_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 4.5 \ No newline at end of file +retraction_amount = 4.5 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_draft.inst.cfg index 31a19502bd..5ee299b703 100644 --- a/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_draft.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_near +name = Draft Quality +version = 4 [metadata] +material = goofoo_wood_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = goofoo_wood_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 5 \ No newline at end of file +retraction_amount = 5 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_efine.inst.cfg index a60634dc51..8d47164374 100644 --- a/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_efine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_near +name = Extra Fine Quality +version = 4 [metadata] +material = goofoo_wood_pla +quality_type = efine setting_version = 20 type = quality -quality_type = efine -material = goofoo_wood_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 5 \ No newline at end of file +retraction_amount = 5 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_fine.inst.cfg index 9b537af455..e7ada1b36e 100644 --- a/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_fine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_near +name = Fine Quality +version = 4 [metadata] +material = goofoo_wood_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_wood_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 5 \ No newline at end of file +retraction_amount = 5 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_standard.inst.cfg index 6037d5bbb8..9f85e3f27b 100644 --- a/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_near_wood_0.40_pla_standard.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_near +name = Standard Quality +version = 4 [metadata] +material = goofoo_wood_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_wood_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt -retraction_amount = 5 \ No newline at end of file +retraction_amount = 5 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_open_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_0.40_pla_draft.inst.cfg index b83b4b4606..efbaec3d09 100644 --- a/resources/quality/goofoo/pla/goofoo_open_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_open_0.40_pla_draft.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_open +name = Draft Quality +version = 4 [metadata] +material = goofoo_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = goofoo_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt +material_bed_temperature = 60 retraction_amount = 6 -material_bed_temperature = 60 \ No newline at end of file +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_open_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_0.40_pla_efine.inst.cfg index 072f29034e..8a45fb82af 100644 --- a/resources/quality/goofoo/pla/goofoo_open_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_open_0.40_pla_efine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_open +name = Extra Fine Quality +version = 4 [metadata] +material = goofoo_pla +quality_type = efine setting_version = 20 type = quality -quality_type = efine -material = goofoo_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt +material_bed_temperature = 60 retraction_amount = 6 -material_bed_temperature = 60 \ No newline at end of file +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_open_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_0.40_pla_fine.inst.cfg index fa03b3f912..31d8c02799 100644 --- a/resources/quality/goofoo/pla/goofoo_open_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_open_0.40_pla_fine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_open +name = Fine Quality +version = 4 [metadata] +material = goofoo_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt +material_bed_temperature = 60 retraction_amount = 6 -material_bed_temperature = 60 \ No newline at end of file +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_open_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_0.40_pla_standard.inst.cfg index 38d4c19539..d041fb6270 100644 --- a/resources/quality/goofoo/pla/goofoo_open_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_open_0.40_pla_standard.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_open +name = Standard Quality +version = 4 [metadata] +material = goofoo_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt +material_bed_temperature = 60 retraction_amount = 6 -material_bed_temperature = 60 \ No newline at end of file +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_draft.inst.cfg index cebccc7cd6..6690eb5b14 100644 --- a/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_draft.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_open +name = Draft Quality +version = 4 [metadata] +material = goofoo_emarble_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = goofoo_emarble_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt +material_bed_temperature = 70 retraction_amount = 6 -material_bed_temperature = 70 \ No newline at end of file +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_efine.inst.cfg index 5474f72d77..b2209aeadb 100644 --- a/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_efine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_open +name = Extra Fine Quality +version = 4 [metadata] +material = goofoo_emarble_pla +quality_type = efine setting_version = 20 type = quality -quality_type = efine -material = goofoo_emarble_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt +material_bed_temperature = 70 retraction_amount = 6 -material_bed_temperature = 70 \ No newline at end of file +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_fine.inst.cfg index 58dd3eb550..18efc55f99 100644 --- a/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_fine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_open +name = Fine Quality +version = 4 [metadata] +material = goofoo_emarble_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_emarble_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt +material_bed_temperature = 70 retraction_amount = 6 -material_bed_temperature = 70 \ No newline at end of file +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_standard.inst.cfg index 4b3f7c0c78..1cd2034b8f 100644 --- a/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_open_emarble_0.40_pla_standard.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_open +name = Standard Quality +version = 4 [metadata] +material = goofoo_emarble_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_emarble_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt +material_bed_temperature = 70 retraction_amount = 6 -material_bed_temperature = 70 \ No newline at end of file +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_draft.inst.cfg index bfc7040a94..7b972d8942 100644 --- a/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_draft.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_open +name = Draft Quality +version = 4 [metadata] +material = goofoo_esilk_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = goofoo_esilk_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt +material_bed_temperature = 70 retraction_amount = 6 -material_bed_temperature = 70 \ No newline at end of file +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_efine.inst.cfg index a498e7140e..34a3ea96e6 100644 --- a/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_efine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_open +name = Extra Fine Quality +version = 4 [metadata] +material = goofoo_esilk_pla +quality_type = efine setting_version = 20 type = quality -quality_type = efine -material = goofoo_esilk_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt +material_bed_temperature = 70 retraction_amount = 6 -material_bed_temperature = 70 \ No newline at end of file +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_fine.inst.cfg index 2bea6a8c09..ef2aed6560 100644 --- a/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_fine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_open +name = Fine Quality +version = 4 [metadata] +material = goofoo_esilk_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_esilk_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt +material_bed_temperature = 70 retraction_amount = 6 -material_bed_temperature = 70 \ No newline at end of file +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_standard.inst.cfg index 86f3f66ab8..e0b3aa379f 100644 --- a/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_open_esilk_0.40_pla_standard.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_open +name = Standard Quality +version = 4 [metadata] +material = goofoo_esilk_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_esilk_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt +material_bed_temperature = 70 retraction_amount = 6 -material_bed_temperature = 70 \ No newline at end of file +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_draft.inst.cfg index 9a149d619b..d7322010c3 100644 --- a/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_draft.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_open +name = Draft Quality +version = 4 [metadata] +material = goofoo_wood_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = goofoo_wood_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt +material_bed_temperature = 60 retraction_amount = 6 -material_bed_temperature = 60 \ No newline at end of file +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_efine.inst.cfg index 2dbfdbd6ac..c0e2411528 100644 --- a/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_efine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_open +name = Extra Fine Quality +version = 4 [metadata] +material = goofoo_wood_pla +quality_type = efine setting_version = 20 type = quality -quality_type = efine -material = goofoo_wood_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt +material_bed_temperature = 60 retraction_amount = 6 -material_bed_temperature = 60 \ No newline at end of file +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_fine.inst.cfg index c4beac9b4c..14643055f8 100644 --- a/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_fine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_open +name = Fine Quality +version = 4 [metadata] +material = goofoo_wood_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_wood_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt +material_bed_temperature = 60 retraction_amount = 6 -material_bed_temperature = 60 \ No newline at end of file +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_standard.inst.cfg index 28a7eecb47..bc2891a9a3 100644 --- a/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_open_wood_0.40_pla_standard.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_open +name = Standard Quality +version = 4 [metadata] +material = goofoo_wood_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_wood_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = skirt +material_bed_temperature = 60 retraction_amount = 6 -material_bed_temperature = 60 \ No newline at end of file +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_small_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_0.40_pla_draft.inst.cfg index 664fc336d4..d243e5a85d 100644 --- a/resources/quality/goofoo/pla/goofoo_small_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_small_0.40_pla_draft.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_small +name = Draft Quality +version = 4 [metadata] +material = goofoo_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = goofoo_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = raft -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_small_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_0.40_pla_efine.inst.cfg index 805c457f18..d8fc75fecf 100644 --- a/resources/quality/goofoo/pla/goofoo_small_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_small_0.40_pla_efine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_small +name = Extra Fine Quality +version = 4 [metadata] +material = goofoo_pla +quality_type = efine setting_version = 20 type = quality -quality_type = efine -material = goofoo_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = raft -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_small_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_0.40_pla_fine.inst.cfg index e8e92fa461..0b12d6474a 100644 --- a/resources/quality/goofoo/pla/goofoo_small_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_small_0.40_pla_fine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_small +name = Fine Quality +version = 4 [metadata] +material = goofoo_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = raft -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_small_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_0.40_pla_standard.inst.cfg index 1444b2dd00..24befe8a60 100644 --- a/resources/quality/goofoo/pla/goofoo_small_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_small_0.40_pla_standard.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_small +name = Standard Quality +version = 4 [metadata] +material = goofoo_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = raft -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_small_0.70_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_0.70_pla_standard.inst.cfg index 219d1b2dc4..94c4b36d7b 100644 --- a/resources/quality/goofoo/pla/goofoo_small_0.70_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_small_0.70_pla_standard.inst.cfg @@ -1,17 +1,18 @@ -[general] -version = 4 -name = Standard Quality -definition = goofoo_small - -[metadata] -setting_version = 20 -type = quality -quality_type = normal -material = goofoo_pla -variant = 0.7mm Nozzle - -[values] -retraction_amount = 6 -infill_pattern = cubic -top_bottom_thickness = 1.6 -wall_thickness = 1.4 \ No newline at end of file +[general] +definition = goofoo_small +name = Standard Quality +version = 4 + +[metadata] +material = goofoo_pla +quality_type = normal +setting_version = 20 +type = quality +variant = 0.7mm Nozzle + +[values] +infill_pattern = cubic +retraction_amount = 6 +top_bottom_thickness = 1.6 +wall_thickness = 1.4 + diff --git a/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_draft.inst.cfg index 097a501614..8e7e9b08f9 100644 --- a/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_draft.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_small +name = Draft Quality +version = 4 [metadata] +material = goofoo_emarble_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = goofoo_emarble_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = raft -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_efine.inst.cfg index 78a7b62ae6..f6171db6f4 100644 --- a/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_efine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_small +name = Extra Fine Quality +version = 4 [metadata] +material = goofoo_emarble_pla +quality_type = efine setting_version = 20 type = quality -quality_type = efine -material = goofoo_emarble_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = raft -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_fine.inst.cfg index 89defc68f3..a355619b67 100644 --- a/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_fine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_small +name = Fine Quality +version = 4 [metadata] +material = goofoo_emarble_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_emarble_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = raft -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_standard.inst.cfg index 0dee621106..7a36c28aa2 100644 --- a/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_small_emarble_0.40_pla_standard.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_small +name = Standard Quality +version = 4 [metadata] +material = goofoo_emarble_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_emarble_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = raft -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_draft.inst.cfg index 44109a1be3..29becbf717 100644 --- a/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_draft.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_small +name = Draft Quality +version = 4 [metadata] +material = goofoo_esilk_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = goofoo_esilk_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = raft -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_efine.inst.cfg index c7e54cb2c1..32e712947b 100644 --- a/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_efine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_small +name = Extra Fine Quality +version = 4 [metadata] +material = goofoo_esilk_pla +quality_type = efine setting_version = 20 type = quality -quality_type = efine -material = goofoo_esilk_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = raft -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_fine.inst.cfg index 69d9e6ddb7..0cbeb43412 100644 --- a/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_fine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_small +name = Fine Quality +version = 4 [metadata] +material = goofoo_esilk_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_esilk_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = raft -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_standard.inst.cfg index 54f7692e8f..66688d62f0 100644 --- a/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_small_esilk_0.40_pla_standard.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_small +name = Standard Quality +version = 4 [metadata] +material = goofoo_esilk_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_esilk_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = raft -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_draft.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_draft.inst.cfg index e136aae747..ddea99bc0b 100644 --- a/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_draft.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_draft.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_small +name = Draft Quality +version = 4 [metadata] +material = goofoo_wood_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = goofoo_wood_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = raft -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_efine.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_efine.inst.cfg index 28f852d5b0..edb7592a78 100644 --- a/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_efine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_efine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_small +name = Extra Fine Quality +version = 4 [metadata] +material = goofoo_wood_pla +quality_type = efine setting_version = 20 type = quality -quality_type = efine -material = goofoo_wood_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = raft -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_fine.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_fine.inst.cfg index 4a24e0c1bf..e40621a272 100644 --- a/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_fine.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_fine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_small +name = Fine Quality +version = 4 [metadata] +material = goofoo_wood_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_wood_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = raft -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_standard.inst.cfg b/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_standard.inst.cfg index 3ec9ff53b5..b67b2d2b00 100644 --- a/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_standard.inst.cfg +++ b/resources/quality/goofoo/pla/goofoo_small_wood_0.40_pla_standard.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_small +name = Standard Quality +version = 4 [metadata] +material = goofoo_wood_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_wood_pla variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = raft -retraction_amount = 6 \ No newline at end of file +retraction_amount = 6 +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_draft.inst.cfg b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_draft.inst.cfg index e21d9901db..254e189550 100644 --- a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_draft.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_draft.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_far +name = Draft Quality +version = 4 [metadata] +material = goofoo_pva +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = goofoo_pva variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = none -support_pattern = grid -support_infill_rate = 50 support_brim_enable = True -support_interface_enable = True support_enable = True +support_infill_rate = 50 +support_interface_enable = True +support_pattern = grid +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_efine.inst.cfg b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_efine.inst.cfg index 7581f9a274..39ea3ae4ff 100644 --- a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_efine.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_efine.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_far +name = Extra Fine Quality +version = 4 [metadata] +material = goofoo_pva +quality_type = efine setting_version = 20 type = quality -quality_type = efine -material = goofoo_pva variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = none -support_pattern = grid -support_infill_rate = 50 support_brim_enable = True -support_interface_enable = True support_enable = True +support_infill_rate = 50 +support_interface_enable = True +support_pattern = grid +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_fine.inst.cfg b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_fine.inst.cfg index b05fba760f..8e377be345 100644 --- a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_fine.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_fine.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_far +name = Fine Quality +version = 4 [metadata] +material = goofoo_pva +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_pva variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = none -support_pattern = grid -support_infill_rate = 50 support_brim_enable = True -support_interface_enable = True support_enable = True +support_infill_rate = 50 +support_interface_enable = True +support_pattern = grid +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_standard.inst.cfg b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_standard.inst.cfg index 550f8742aa..7f11b2da92 100644 --- a/resources/quality/goofoo/pva/goofoo_far_0.40_pva_standard.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_far_0.40_pva_standard.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_far +name = Standard Quality +version = 4 [metadata] +material = goofoo_pva +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_pva variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = none -support_pattern = grid -support_infill_rate = 50 support_brim_enable = True -support_interface_enable = True support_enable = True +support_infill_rate = 50 +support_interface_enable = True +support_pattern = grid +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_draft.inst.cfg b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_draft.inst.cfg index b774b9cfdb..44945d1a47 100644 --- a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_draft.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_draft.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_near +name = Draft Quality +version = 4 [metadata] +material = goofoo_pva +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = goofoo_pva variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = none -support_pattern = grid -support_infill_rate = 50 support_brim_enable = True -support_interface_enable = True support_enable = True +support_infill_rate = 50 +support_interface_enable = True +support_pattern = grid +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_efine.inst.cfg b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_efine.inst.cfg index 01f57ba2ef..cb49d717d8 100644 --- a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_efine.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_efine.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_near +name = Extra Fine Quality +version = 4 [metadata] +material = goofoo_pva +quality_type = efine setting_version = 20 type = quality -quality_type = efine -material = goofoo_pva variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = none -support_pattern = grid -support_infill_rate = 50 support_brim_enable = True -support_interface_enable = True support_enable = True +support_infill_rate = 50 +support_interface_enable = True +support_pattern = grid +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_fine.inst.cfg b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_fine.inst.cfg index 3e352dd2ed..a69ab06bfb 100644 --- a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_fine.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_fine.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_near +name = Fine Quality +version = 4 [metadata] +material = goofoo_pva +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_pva variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = none -support_pattern = grid -support_infill_rate = 50 support_brim_enable = True -support_interface_enable = True support_enable = True +support_infill_rate = 50 +support_interface_enable = True +support_pattern = grid +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_standard.inst.cfg b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_standard.inst.cfg index 4c42f15f93..93ace4df9a 100644 --- a/resources/quality/goofoo/pva/goofoo_near_0.40_pva_standard.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_near_0.40_pva_standard.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_near +name = Standard Quality +version = 4 [metadata] +material = goofoo_pva +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_pva variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = none -support_pattern = grid -support_infill_rate = 50 support_brim_enable = True -support_interface_enable = True support_enable = True +support_infill_rate = 50 +support_interface_enable = True +support_pattern = grid +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_draft.inst.cfg b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_draft.inst.cfg index ee71ef40d7..e51ffdc5e4 100644 --- a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_draft.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_draft.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_open +name = Draft Quality +version = 4 [metadata] +material = goofoo_pva +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = goofoo_pva variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = none -support_pattern = grid -support_infill_rate = 50 -support_brim_enable = True -support_interface_enable = True -support_enable = True material_bed_temperature = 70 +support_brim_enable = True +support_enable = True +support_infill_rate = 50 +support_interface_enable = True +support_pattern = grid +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_efine.inst.cfg b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_efine.inst.cfg index 3529f69d75..85c5d33800 100644 --- a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_efine.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_efine.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_open +name = Extra Fine Quality +version = 4 [metadata] +material = goofoo_pva +quality_type = efine setting_version = 20 type = quality -quality_type = efine -material = goofoo_pva variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = none -support_pattern = grid -support_infill_rate = 50 -support_brim_enable = True -support_interface_enable = True -support_enable = True material_bed_temperature = 70 +support_brim_enable = True +support_enable = True +support_infill_rate = 50 +support_interface_enable = True +support_pattern = grid +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_fine.inst.cfg b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_fine.inst.cfg index 418c2eb348..66dbbd69b3 100644 --- a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_fine.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_fine.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_open +name = Fine Quality +version = 4 [metadata] +material = goofoo_pva +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_pva variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = none -support_pattern = grid -support_infill_rate = 50 -support_brim_enable = True -support_interface_enable = True -support_enable = True material_bed_temperature = 70 +support_brim_enable = True +support_enable = True +support_infill_rate = 50 +support_interface_enable = True +support_pattern = grid +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_standard.inst.cfg b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_standard.inst.cfg index cd71e25506..54820d6f88 100644 --- a/resources/quality/goofoo/pva/goofoo_open_0.40_pva_standard.inst.cfg +++ b/resources/quality/goofoo/pva/goofoo_open_0.40_pva_standard.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_open +name = Standard Quality +version = 4 [metadata] +material = goofoo_pva +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_pva variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*2 adhesion_type = none -support_pattern = grid -support_infill_rate = 50 -support_brim_enable = True -support_interface_enable = True -support_enable = True material_bed_temperature = 70 +support_brim_enable = True +support_enable = True +support_infill_rate = 50 +support_interface_enable = True +support_pattern = grid +wall_thickness = =line_width*2 + diff --git a/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_draft.inst.cfg b/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_draft.inst.cfg index aed77e1aff..d18529284a 100644 --- a/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_draft.inst.cfg +++ b/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_draft.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_far +name = Draft Quality +version = 4 [metadata] +material = goofoo_tpe_83a +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = goofoo_tpe_83a variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 -speed_print = 20 +adhesion_type = skirt speed_layer_0 = 10 -adhesion_type = skirt \ No newline at end of file +speed_print = 20 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_efine.inst.cfg b/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_efine.inst.cfg index 68cc4f51a3..ea6e8d9a70 100644 --- a/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_efine.inst.cfg +++ b/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_efine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_far +name = Extra Fine Quality +version = 4 [metadata] +material = goofoo_tpe_83a +quality_type = efine setting_version = 20 type = quality -quality_type = efine -material = goofoo_tpe_83a variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 -speed_print = 20 +adhesion_type = skirt speed_layer_0 = 10 -adhesion_type = skirt \ No newline at end of file +speed_print = 20 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_fine.inst.cfg b/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_fine.inst.cfg index e8bfdbd3cb..fad1ffd88b 100644 --- a/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_fine.inst.cfg +++ b/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_fine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_far +name = Fine Quality +version = 4 [metadata] +material = goofoo_tpe_83a +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_tpe_83a variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 -speed_print = 20 +adhesion_type = skirt speed_layer_0 = 10 -adhesion_type = skirt \ No newline at end of file +speed_print = 20 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_standard.inst.cfg b/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_standard.inst.cfg index 121a3c7083..82198ac225 100644 --- a/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_standard.inst.cfg +++ b/resources/quality/goofoo/tpe/goofoo_far_0.40_tpe_standard.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_far +name = Standard Quality +version = 4 [metadata] +material = goofoo_tpe_83a +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_tpe_83a variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 -speed_print = 20 +adhesion_type = skirt speed_layer_0 = 10 -adhesion_type = skirt \ No newline at end of file +speed_print = 20 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_draft.inst.cfg b/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_draft.inst.cfg index e4b5cac9a6..fdd42e869d 100644 --- a/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_draft.inst.cfg +++ b/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_draft.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_near +name = Draft Quality +version = 4 [metadata] +material = goofoo_tpe_83a +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = goofoo_tpe_83a variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 -speed_print = 20 +adhesion_type = skirt speed_layer_0 = 10 -adhesion_type = skirt \ No newline at end of file +speed_print = 20 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_efine.inst.cfg b/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_efine.inst.cfg index 63f65b83b1..e81158c976 100644 --- a/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_efine.inst.cfg +++ b/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_efine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_near +name = Extra Fine Quality +version = 4 [metadata] +material = goofoo_tpe_83a +quality_type = efine setting_version = 20 type = quality -quality_type = efine -material = goofoo_tpe_83a variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 -speed_print = 20 +adhesion_type = skirt speed_layer_0 = 10 -adhesion_type = skirt \ No newline at end of file +speed_print = 20 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_fine.inst.cfg b/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_fine.inst.cfg index 67403affc6..5dfa3d5b30 100644 --- a/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_fine.inst.cfg +++ b/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_fine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_near +name = Fine Quality +version = 4 [metadata] +material = goofoo_tpe_83a +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_tpe_83a variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 -speed_print = 20 +adhesion_type = skirt speed_layer_0 = 10 -adhesion_type = skirt \ No newline at end of file +speed_print = 20 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_standard.inst.cfg b/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_standard.inst.cfg index 4d594ff4bb..49c8ecaaa5 100644 --- a/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_standard.inst.cfg +++ b/resources/quality/goofoo/tpe/goofoo_near_0.40_tpe_standard.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_near +name = Standard Quality +version = 4 [metadata] +material = goofoo_tpe_83a +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_tpe_83a variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 -speed_print = 20 +adhesion_type = skirt speed_layer_0 = 10 -adhesion_type = skirt \ No newline at end of file +speed_print = 20 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_draft.inst.cfg b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_draft.inst.cfg index fb37dc9adb..c3707e961c 100644 --- a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_draft.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_draft.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_far +name = Draft Quality +version = 4 [metadata] +material = goofoo_tpu_87a +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = goofoo_tpu_87a variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 -speed_print = 20 -speed_layer_0 = 10 adhesion_type = skirt +speed_layer_0 = 10 +speed_print = 20 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_fine.inst.cfg b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_fine.inst.cfg index fbd4dc8db2..43632da7ca 100644 --- a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_fine.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_fine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_far +name = Fine Quality +version = 4 [metadata] +material = goofoo_tpu_87a +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_tpu_87a variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*3 -speed_print = 20 -speed_layer_0 = 10 adhesion_type = skirt +speed_layer_0 = 10 +speed_print = 20 +wall_thickness = =line_width*3 + diff --git a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_standard.inst.cfg b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_standard.inst.cfg index ed188595b9..329cf25ef4 100644 --- a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_standard.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_87a_standard.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_far +name = Standard Quality +version = 4 [metadata] +material = goofoo_tpu_87a +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_tpu_87a variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 -speed_print = 20 -speed_layer_0 = 10 adhesion_type = skirt +speed_layer_0 = 10 +speed_print = 20 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_draft.inst.cfg b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_draft.inst.cfg index 6d63271509..78583a5395 100644 --- a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_draft.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_draft.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_far +name = Draft Quality +version = 4 [metadata] +material = goofoo_tpu_95a +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = goofoo_tpu_95a variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*3 -speed_print = 20 -speed_layer_0 = 10 adhesion_type = skirt +speed_layer_0 = 10 +speed_print = 20 +wall_thickness = =line_width*3 + diff --git a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_efine.inst.cfg b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_efine.inst.cfg index d743038326..6dc53186ff 100644 --- a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_efine.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_efine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_far +name = Extra Fine Quality +version = 4 [metadata] +material = goofoo_tpu_95a +quality_type = efine setting_version = 20 type = quality -quality_type = efine -material = goofoo_tpu_95a variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 -speed_print = 20 +adhesion_type = skirt speed_layer_0 = 10 -adhesion_type = skirt \ No newline at end of file +speed_print = 20 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_fine.inst.cfg b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_fine.inst.cfg index f0b0dcc7d7..0ca549a0df 100644 --- a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_fine.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_fine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_far +name = Fine Quality +version = 4 [metadata] +material = goofoo_tpu_95a +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_tpu_95a variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 -speed_print = 20 +adhesion_type = skirt speed_layer_0 = 10 -adhesion_type = skirt \ No newline at end of file +speed_print = 20 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_standard.inst.cfg b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_standard.inst.cfg index ee90e21960..53959d93c8 100644 --- a/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_standard.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_far_0.40_tpu_95a_standard.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_far +name = Standard Quality +version = 4 [metadata] +material = goofoo_tpu_95a +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_tpu_95a variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 -speed_print = 20 +adhesion_type = skirt speed_layer_0 = 10 -adhesion_type = skirt \ No newline at end of file +speed_print = 20 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_draft.inst.cfg b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_draft.inst.cfg index d58f1c8b15..ecc123bef1 100644 --- a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_draft.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_draft.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_near +name = Draft Quality +version = 4 [metadata] +material = goofoo_tpu_87a +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = goofoo_tpu_87a variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 -speed_print = 20 -speed_layer_0 = 10 adhesion_type = skirt +speed_layer_0 = 10 +speed_print = 20 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_fine.inst.cfg b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_fine.inst.cfg index 93f441b2e7..cddb7e9d42 100644 --- a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_fine.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_fine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_near +name = Fine Quality +version = 4 [metadata] +material = goofoo_tpu_87a +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_tpu_87a variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*3 -speed_print = 20 -speed_layer_0 = 10 adhesion_type = skirt +speed_layer_0 = 10 +speed_print = 20 +wall_thickness = =line_width*3 + diff --git a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_standard.inst.cfg b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_standard.inst.cfg index b2cea10f58..2e25749d31 100644 --- a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_standard.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_87a_standard.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_near +name = Standard Quality +version = 4 [metadata] +material = goofoo_tpu_87a +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_tpu_87a variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 -speed_print = 20 -speed_layer_0 = 10 adhesion_type = skirt +speed_layer_0 = 10 +speed_print = 20 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_draft.inst.cfg b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_draft.inst.cfg index ff681d0b78..2cdf0ea7f6 100644 --- a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_draft.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_draft.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Draft Quality definition = goofoo_near +name = Draft Quality +version = 4 [metadata] +material = goofoo_tpu_95a +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = goofoo_tpu_95a variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*3 -speed_print = 20 -speed_layer_0 = 10 adhesion_type = skirt +speed_layer_0 = 10 +speed_print = 20 +wall_thickness = =line_width*3 + diff --git a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_efine.inst.cfg b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_efine.inst.cfg index cde2370db4..fc07cc6bb3 100644 --- a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_efine.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_efine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Extra Fine Quality definition = goofoo_near +name = Extra Fine Quality +version = 4 [metadata] +material = goofoo_tpu_95a +quality_type = efine setting_version = 20 type = quality -quality_type = efine -material = goofoo_tpu_95a variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 -speed_print = 20 +adhesion_type = skirt speed_layer_0 = 10 -adhesion_type = skirt \ No newline at end of file +speed_print = 20 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_fine.inst.cfg b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_fine.inst.cfg index 6b20d5bf96..ac636a4df5 100644 --- a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_fine.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_fine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Fine Quality definition = goofoo_near +name = Fine Quality +version = 4 [metadata] +material = goofoo_tpu_95a +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = goofoo_tpu_95a variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 -speed_print = 20 +adhesion_type = skirt speed_layer_0 = 10 -adhesion_type = skirt \ No newline at end of file +speed_print = 20 +wall_thickness = =line_width*4 + diff --git a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_standard.inst.cfg b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_standard.inst.cfg index d45def63be..e2312513ea 100644 --- a/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_standard.inst.cfg +++ b/resources/quality/goofoo/tpu/goofoo_near_0.40_tpu_95a_standard.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Standard Quality definition = goofoo_near +name = Standard Quality +version = 4 [metadata] +material = goofoo_tpu_95a +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = goofoo_tpu_95a variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 -speed_print = 20 +adhesion_type = skirt speed_layer_0 = 10 -adhesion_type = skirt \ No newline at end of file +speed_print = 20 +wall_thickness = =line_width*4 + diff --git a/resources/quality/high.inst.cfg b/resources/quality/high.inst.cfg index c3c58808d2..de85224f08 100644 --- a/resources/quality/high.inst.cfg +++ b/resources/quality/high.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Extra Fine definition = fdmprinter +name = Extra Fine +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -global_quality = True [values] layer_height = 0.06 -speed_topbottom = =math.ceil(speed_print * 15 / 60) speed_infill = =math.ceil(speed_print * 80 / 60) +speed_topbottom = =math.ceil(speed_print * 15 / 60) + diff --git a/resources/quality/hms434/hms434_global_Coarse_Quality.inst.cfg b/resources/quality/hms434/hms434_global_Coarse_Quality.inst.cfg index 73efd76062..4826d3a52b 100644 --- a/resources/quality/hms434/hms434_global_Coarse_Quality.inst.cfg +++ b/resources/quality/hms434/hms434_global_Coarse_Quality.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Coarse definition = hms434 +name = Coarse +version = 4 [metadata] +global_quality = True +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = -1 -global_quality = True [values] layer_height = 0.4 layer_height_0 = 0.2 + diff --git a/resources/quality/hms434/hms434_global_High_Quality.inst.cfg b/resources/quality/hms434/hms434_global_High_Quality.inst.cfg index 3282c89e43..b5c7462c07 100644 --- a/resources/quality/hms434/hms434_global_High_Quality.inst.cfg +++ b/resources/quality/hms434/hms434_global_High_Quality.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = High definition = hms434 +name = High +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -global_quality = True [values] layer_height = 0.1 diff --git a/resources/quality/hms434/hms434_global_Normal_Quality.inst.cfg b/resources/quality/hms434/hms434_global_Normal_Quality.inst.cfg index cea899ffef..e61a34fa44 100644 --- a/resources/quality/hms434/hms434_global_Normal_Quality.inst.cfg +++ b/resources/quality/hms434/hms434_global_Normal_Quality.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Normal definition = hms434 +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] layer_height = 0.2 layer_height_0 = 0.2 + diff --git a/resources/quality/hms434/pla/hms434_0.4_pla_high.inst.cfg b/resources/quality/hms434/pla/hms434_0.4_pla_high.inst.cfg index acddac2235..fb4b2b5494 100644 --- a/resources/quality/hms434/pla/hms434_0.4_pla_high.inst.cfg +++ b/resources/quality/hms434/pla/hms434_0.4_pla_high.inst.cfg @@ -1,34 +1,30 @@ [general] -version = 4 -name = High definition = hms434 +name = High +version = 4 [metadata] +material = generic_pla +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pla variant = 0.4mm TP extruder +weight = 1 [values] - -wall_0_wipe_dist = 0.0 -ironing_enabled = true - +coasting_min_volume = 0.17 +coasting_speed = 100 +coasting_volume = 0.05 infill_overlap_mm = -0.1 infill_wipe_dist = 0 - +ironing_enabled = true material_bed_temperature_layer_0 = =material_bed_temperature + 10 material_flow = 100 retraction_amount = 1.5 -retraction_speed = 40 -retraction_prime_speed = 8 retraction_extra_prime_amount = 0 -switch_extruder_retraction_amount = 2 - +retraction_prime_speed = 8 +retraction_speed = 40 speed_print = 50 +switch_extruder_retraction_amount = 2 +wall_0_wipe_dist = 0.0 -coasting_volume = 0.05 -coasting_min_volume = 0.17 -coasting_speed = 100 diff --git a/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_coarse.inst.cfg b/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_coarse.inst.cfg index 5b8194438a..3822cd489b 100644 --- a/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_coarse.inst.cfg +++ b/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_coarse.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Coarse definition = imade3d_jellybox +name = Coarse +version = 4 [metadata] +material = generic_petg +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_petg variant = 0.4 mm +weight = -1 [values] speed_print = 45 + diff --git a/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_fine.inst.cfg b/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_fine.inst.cfg index b94412b68f..b95f5d06e1 100644 --- a/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_fine.inst.cfg +++ b/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_fine.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Fine definition = imade3d_jellybox +name = Fine +version = 4 [metadata] +material = generic_petg +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_petg variant = 0.4 mm +weight = 1 [values] -speed_print = 50 \ No newline at end of file +speed_print = 50 + diff --git a/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_medium.inst.cfg b/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_medium.inst.cfg index 6cccabefe0..fdd2734322 100644 --- a/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_medium.inst.cfg +++ b/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_medium.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Medium definition = imade3d_jellybox +name = Medium +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_petg variant = 0.4 mm +weight = 0 [values] -speed_print = 45 \ No newline at end of file +speed_print = 45 + diff --git a/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_coarse.inst.cfg b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_coarse.inst.cfg index 455d846407..a38486b6d9 100644 --- a/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_coarse.inst.cfg +++ b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_coarse.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Coarse definition = imade3d_jellybox +name = Coarse +version = 4 [metadata] +material = generic_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_pla variant = 0.4 mm +weight = -1 [values] -speed_print = 45 \ No newline at end of file +speed_print = 45 + diff --git a/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_fine.inst.cfg b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_fine.inst.cfg index 574ed002e5..0a5d68e0f3 100644 --- a/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_fine.inst.cfg +++ b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_fine.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Fine definition = imade3d_jellybox +name = Fine +version = 4 [metadata] +material = generic_pla +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pla variant = 0.4 mm +weight = 1 [values] -speed_print = 50 \ No newline at end of file +speed_print = 50 + diff --git a/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_medium.inst.cfg b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_medium.inst.cfg index b9c310189f..f7fe1b26e1 100644 --- a/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_medium.inst.cfg +++ b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_medium.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Medium definition = imade3d_jellybox +name = Medium +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pla variant = 0.4 mm +weight = 0 [values] -speed_print = 45 \ No newline at end of file +speed_print = 45 + diff --git a/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_ultrafine.inst.cfg b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_ultrafine.inst.cfg index c9559966c7..e21630abf0 100644 --- a/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_ultrafine.inst.cfg +++ b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_ultrafine.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = UltraFine definition = imade3d_jellybox +name = UltraFine +version = 4 [metadata] +material = generic_pla +quality_type = ultrahigh setting_version = 20 type = quality -quality_type = ultrahigh -weight = 2 -material = generic_pla variant = 0.4 mm +weight = 2 [values] -speed_print = 55 \ No newline at end of file +speed_print = 55 + diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg index 060c382336..128ad0acac 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg @@ -1,29 +1,35 @@ [general] -version = 4 -name = Coarse definition = imade3d_jellybox +name = Coarse +version = 4 [metadata] +global_quality = True +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -1 -global_quality = True [values] adhesion_type = skirt -layer_height = 0.3 -layer_height_0 = 0.3 -retraction_hop = 0.2 bottom_thickness = =top_bottom_thickness +bridge_enable_more_layers = False +bridge_settings_enabled = True +bridge_skin_material_flow = 85 +bridge_skin_speed = 20 +bridge_wall_material_flow = 85 +bridge_wall_speed = 20 coasting_enable = True coasting_min_volume = 2 coasting_volume = 0.032 cool_fan_speed_max = =cool_fan_speed infill_before_walls = False +infill_enable_travel_optimization = True infill_line_width = =round(line_width * 1.5, 2) infill_pattern = zigzag infill_sparse_density = 25 +layer_height = 0.3 +layer_height_0 = 0.3 line_width = =machine_nozzle_size material_bed_temperature = =default_material_bed_temperature material_bed_temperature_layer_0 = =material_bed_temperature + 5 @@ -32,6 +38,8 @@ material_print_temperature_layer_0 = =material_print_temperature + 5 print_sequence = all_at_once retract_at_layer_change = True retraction_combing = noskin +retraction_combing_max_distance = 50 +retraction_hop = 0.2 retraction_hop_enabled = True retraction_min_travel = =machine_nozzle_size * 3 retraction_retract_speed = =retraction_speed @@ -65,11 +73,4 @@ support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0.2 travel_retract_before_outer_wall = True wall_0_wipe_dist = =round(line_width * 1.2,1) -bridge_settings_enabled = True -bridge_enable_more_layers = False -bridge_skin_material_flow = 85 -bridge_skin_speed = 20 -bridge_wall_material_flow = 85 -bridge_wall_speed = 20 -infill_enable_travel_optimization = True -retraction_combing_max_distance = 50 \ No newline at end of file + diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg index 80d818bd5b..077da429f3 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg @@ -1,29 +1,35 @@ [general] -version = 4 -name = Fine definition = imade3d_jellybox +name = Fine +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -global_quality = True [values] adhesion_type = skirt -layer_height = 0.1 -layer_height_0 = 0.3 -retraction_hop = 0.1 bottom_thickness = =top_bottom_thickness +bridge_enable_more_layers = False +bridge_settings_enabled = True +bridge_skin_material_flow = 85 +bridge_skin_speed = 20 +bridge_wall_material_flow = 85 +bridge_wall_speed = 20 coasting_enable = True coasting_min_volume = 2 coasting_volume = 0.032 cool_fan_speed_max = =cool_fan_speed infill_before_walls = False +infill_enable_travel_optimization = True infill_line_width = =round(line_width * 1.5, 2) infill_pattern = zigzag infill_sparse_density = 25 +layer_height = 0.1 +layer_height_0 = 0.3 line_width = =machine_nozzle_size material_bed_temperature = =default_material_bed_temperature material_bed_temperature_layer_0 = =material_bed_temperature + 5 @@ -32,6 +38,8 @@ material_print_temperature_layer_0 = =material_print_temperature + 5 print_sequence = all_at_once retract_at_layer_change = True retraction_combing = noskin +retraction_combing_max_distance = 50 +retraction_hop = 0.1 retraction_hop_enabled = True retraction_min_travel = =machine_nozzle_size * 3 retraction_retract_speed = =retraction_speed @@ -65,11 +73,4 @@ support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0.2 travel_retract_before_outer_wall = True wall_0_wipe_dist = =round(line_width * 1.2,1) -bridge_settings_enabled = True -bridge_enable_more_layers = False -bridge_skin_material_flow = 85 -bridge_skin_speed = 20 -bridge_wall_material_flow = 85 -bridge_wall_speed = 20 -infill_enable_travel_optimization = True -retraction_combing_max_distance = 50 \ No newline at end of file + diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg index cf6a3bde70..b1c120cba9 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg @@ -1,29 +1,35 @@ [general] -version = 4 -name = Medium definition = imade3d_jellybox +name = Medium +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] adhesion_type = skirt -layer_height = 0.2 -layer_height_0 = 0.3 -retraction_hop = 0.2 bottom_thickness = =top_bottom_thickness +bridge_enable_more_layers = False +bridge_settings_enabled = True +bridge_skin_material_flow = 85 +bridge_skin_speed = 20 +bridge_wall_material_flow = 85 +bridge_wall_speed = 20 coasting_enable = True coasting_min_volume = 2 coasting_volume = 0.032 cool_fan_speed_max = =cool_fan_speed infill_before_walls = False +infill_enable_travel_optimization = True infill_line_width = =round(line_width * 1.5, 2) infill_pattern = zigzag infill_sparse_density = 25 +layer_height = 0.2 +layer_height_0 = 0.3 line_width = =machine_nozzle_size material_bed_temperature = =default_material_bed_temperature material_bed_temperature_layer_0 = =material_bed_temperature + 5 @@ -32,6 +38,8 @@ material_print_temperature_layer_0 = =material_print_temperature + 5 print_sequence = all_at_once retract_at_layer_change = True retraction_combing = noskin +retraction_combing_max_distance = 50 +retraction_hop = 0.2 retraction_hop_enabled = True retraction_min_travel = =machine_nozzle_size * 3 retraction_retract_speed = =retraction_speed @@ -65,11 +73,4 @@ support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0.2 travel_retract_before_outer_wall = True wall_0_wipe_dist = =round(line_width * 1.2,1) -bridge_settings_enabled = True -bridge_enable_more_layers = False -bridge_skin_material_flow = 85 -bridge_skin_speed = 20 -bridge_wall_material_flow = 85 -bridge_wall_speed = 20 -infill_enable_travel_optimization = True -retraction_combing_max_distance = 50 \ No newline at end of file + diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg index f23ab17b4e..9ac381b0b1 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg @@ -1,29 +1,35 @@ [general] -version = 4 -name = UltraFine definition = imade3d_jellybox +name = UltraFine +version = 4 [metadata] +global_quality = True +quality_type = ultrahigh setting_version = 20 type = quality -quality_type = ultrahigh weight = 2 -global_quality = True [values] adhesion_type = skirt -layer_height = 0.05 -layer_height_0 = 0.3 -retraction_hop = 0.1 bottom_thickness = =top_bottom_thickness +bridge_enable_more_layers = False +bridge_settings_enabled = True +bridge_skin_material_flow = 85 +bridge_skin_speed = 20 +bridge_wall_material_flow = 85 +bridge_wall_speed = 20 coasting_enable = True coasting_min_volume = 2 coasting_volume = 0.032 cool_fan_speed_max = =cool_fan_speed infill_before_walls = False +infill_enable_travel_optimization = True infill_line_width = =round(line_width * 1.5, 2) infill_pattern = zigzag infill_sparse_density = 25 +layer_height = 0.05 +layer_height_0 = 0.3 line_width = =machine_nozzle_size material_bed_temperature = =default_material_bed_temperature material_bed_temperature_layer_0 = =material_bed_temperature + 5 @@ -32,6 +38,8 @@ material_print_temperature_layer_0 = =material_print_temperature + 5 print_sequence = all_at_once retract_at_layer_change = True retraction_combing = noskin +retraction_combing_max_distance = 50 +retraction_hop = 0.1 retraction_hop_enabled = True retraction_min_travel = =machine_nozzle_size * 3 retraction_retract_speed = =retraction_speed @@ -65,11 +73,4 @@ support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0.2 travel_retract_before_outer_wall = True wall_0_wipe_dist = =round(line_width * 1.2,1) -bridge_settings_enabled = True -bridge_enable_more_layers = False -bridge_skin_material_flow = 85 -bridge_skin_speed = 20 -bridge_wall_material_flow = 85 -bridge_wall_speed = 20 -infill_enable_travel_optimization = True -retraction_combing_max_distance = 50 \ No newline at end of file + diff --git a/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_coarse.inst.cfg b/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_coarse.inst.cfg index 2aeb2f804c..c49c1cdce7 100644 --- a/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_coarse.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_coarse.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Coarse definition = imade3d_jellybox_2 +name = Coarse +version = 4 [metadata] +material = generic_petg +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_petg variant = 0.4 mm +weight = -1 [values] speed_print = 45 + diff --git a/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_fine.inst.cfg b/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_fine.inst.cfg index 1b08ae372f..09a24a1459 100644 --- a/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_fine.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_fine.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Fine definition = imade3d_jellybox_2 +name = Fine +version = 4 [metadata] +material = generic_petg +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_petg variant = 0.4 mm +weight = 1 [values] -speed_print = 50 \ No newline at end of file +speed_print = 50 + diff --git a/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_medium.inst.cfg b/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_medium.inst.cfg index ec8aab201d..228b1928b2 100644 --- a/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_medium.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/PETG/jb2_generic_petg_0.4_medium.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Medium definition = imade3d_jellybox_2 +name = Medium +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_petg variant = 0.4 mm +weight = 0 [values] -speed_print = 45 \ No newline at end of file +speed_print = 45 + diff --git a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_coarse.inst.cfg b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_coarse.inst.cfg index 751177cdc0..e431fc40ad 100644 --- a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_coarse.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_coarse.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Coarse definition = imade3d_jellybox_2 +name = Coarse +version = 4 [metadata] +material = generic_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_pla variant = 0.4 mm +weight = -1 [values] -speed_print = 45 \ No newline at end of file +speed_print = 45 + diff --git a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_fine.inst.cfg b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_fine.inst.cfg index 0d0c626d7c..bf5a81ab81 100644 --- a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_fine.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_fine.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Fine definition = imade3d_jellybox_2 +name = Fine +version = 4 [metadata] +material = generic_pla +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pla variant = 0.4 mm +weight = 1 [values] -speed_print = 50 \ No newline at end of file +speed_print = 50 + diff --git a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_medium.inst.cfg b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_medium.inst.cfg index 9d7d30e7e2..031379f410 100644 --- a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_medium.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_medium.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Medium definition = imade3d_jellybox_2 +name = Medium +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pla variant = 0.4 mm +weight = 0 [values] -speed_print = 45 \ No newline at end of file +speed_print = 45 + diff --git a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_ultrafine.inst.cfg b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_ultrafine.inst.cfg index c99140271a..058af7d192 100644 --- a/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_ultrafine.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/PLA/jb2_generic_pla_0.4_ultrafine.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = UltraFine definition = imade3d_jellybox_2 +name = UltraFine +version = 4 [metadata] +material = generic_pla +quality_type = ultrahigh setting_version = 20 type = quality -quality_type = ultrahigh -weight = 2 -material = generic_pla variant = 0.4 mm +weight = 2 [values] -speed_print = 55 \ No newline at end of file +speed_print = 55 + diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg index c0d7c8f3cf..79daef8395 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg @@ -1,29 +1,35 @@ [general] -version = 4 -name = Coarse definition = imade3d_jellybox_2 +name = Coarse +version = 4 [metadata] +global_quality = True +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -1 -global_quality = True [values] adhesion_type = skirt -layer_height = 0.3 -layer_height_0 = 0.3 -retraction_hop = 0.2 bottom_thickness = =top_bottom_thickness +bridge_enable_more_layers = False +bridge_settings_enabled = True +bridge_skin_material_flow = 85 +bridge_skin_speed = 20 +bridge_wall_material_flow = 85 +bridge_wall_speed = 20 coasting_enable = True coasting_min_volume = 2 coasting_volume = 0.032 cool_fan_speed_max = =cool_fan_speed infill_before_walls = False +infill_enable_travel_optimization = True infill_line_width = =round(line_width * 1.5, 2) infill_pattern = zigzag infill_sparse_density = 25 +layer_height = 0.3 +layer_height_0 = 0.3 line_width = =machine_nozzle_size material_bed_temperature = =default_material_bed_temperature material_bed_temperature_layer_0 = =material_bed_temperature + 5 @@ -32,6 +38,8 @@ material_print_temperature_layer_0 = =material_print_temperature + 5 print_sequence = all_at_once retract_at_layer_change = True retraction_combing = noskin +retraction_combing_max_distance = 50 +retraction_hop = 0.2 retraction_hop_enabled = True retraction_min_travel = =machine_nozzle_size * 3 retraction_retract_speed = =retraction_speed @@ -65,11 +73,4 @@ support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0.2 travel_retract_before_outer_wall = True wall_0_wipe_dist = =round(line_width * 1.2,1) -bridge_settings_enabled = True -bridge_enable_more_layers = False -bridge_skin_material_flow = 85 -bridge_skin_speed = 20 -bridge_wall_material_flow = 85 -bridge_wall_speed = 20 -infill_enable_travel_optimization = True -retraction_combing_max_distance = 50 \ No newline at end of file + diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg index 2f6e83f7dc..c8ac68ada5 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg @@ -1,29 +1,35 @@ [general] -version = 4 -name = Fine definition = imade3d_jellybox_2 +name = Fine +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -global_quality = True [values] adhesion_type = skirt -layer_height = 0.1 -layer_height_0 = 0.3 -retraction_hop = 0.1 bottom_thickness = =top_bottom_thickness +bridge_enable_more_layers = False +bridge_settings_enabled = True +bridge_skin_material_flow = 85 +bridge_skin_speed = 20 +bridge_wall_material_flow = 85 +bridge_wall_speed = 20 coasting_enable = True coasting_min_volume = 2 coasting_volume = 0.032 cool_fan_speed_max = =cool_fan_speed infill_before_walls = False +infill_enable_travel_optimization = True infill_line_width = =round(line_width * 1.5, 2) infill_pattern = zigzag infill_sparse_density = 25 +layer_height = 0.1 +layer_height_0 = 0.3 line_width = =machine_nozzle_size material_bed_temperature = =default_material_bed_temperature material_bed_temperature_layer_0 = =material_bed_temperature + 5 @@ -32,6 +38,8 @@ material_print_temperature_layer_0 = =material_print_temperature + 5 print_sequence = all_at_once retract_at_layer_change = True retraction_combing = noskin +retraction_combing_max_distance = 50 +retraction_hop = 0.1 retraction_hop_enabled = True retraction_min_travel = =machine_nozzle_size * 3 retraction_retract_speed = =retraction_speed @@ -65,11 +73,4 @@ support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0.2 travel_retract_before_outer_wall = True wall_0_wipe_dist = =round(line_width * 1.2,1) -bridge_settings_enabled = True -bridge_enable_more_layers = False -bridge_skin_material_flow = 85 -bridge_skin_speed = 20 -bridge_wall_material_flow = 85 -bridge_wall_speed = 20 -infill_enable_travel_optimization = True -retraction_combing_max_distance = 50 \ No newline at end of file + diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg index e32efa2c0c..bebff86c2e 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg @@ -1,29 +1,35 @@ [general] -version = 4 -name = Medium definition = imade3d_jellybox_2 +name = Medium +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] adhesion_type = skirt -layer_height = 0.2 -layer_height_0 = 0.3 -retraction_hop = 0.2 bottom_thickness = =top_bottom_thickness +bridge_enable_more_layers = False +bridge_settings_enabled = True +bridge_skin_material_flow = 85 +bridge_skin_speed = 20 +bridge_wall_material_flow = 85 +bridge_wall_speed = 20 coasting_enable = True coasting_min_volume = 2 coasting_volume = 0.032 cool_fan_speed_max = =cool_fan_speed infill_before_walls = False +infill_enable_travel_optimization = True infill_line_width = =round(line_width * 1.5, 2) infill_pattern = zigzag infill_sparse_density = 25 +layer_height = 0.2 +layer_height_0 = 0.3 line_width = =machine_nozzle_size material_bed_temperature = =default_material_bed_temperature material_bed_temperature_layer_0 = =material_bed_temperature + 5 @@ -32,6 +38,8 @@ material_print_temperature_layer_0 = =material_print_temperature + 5 print_sequence = all_at_once retract_at_layer_change = True retraction_combing = noskin +retraction_combing_max_distance = 50 +retraction_hop = 0.2 retraction_hop_enabled = True retraction_min_travel = =machine_nozzle_size * 3 retraction_retract_speed = =retraction_speed @@ -65,11 +73,4 @@ support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0.2 travel_retract_before_outer_wall = True wall_0_wipe_dist = =round(line_width * 1.2,1) -bridge_settings_enabled = True -bridge_enable_more_layers = False -bridge_skin_material_flow = 85 -bridge_skin_speed = 20 -bridge_wall_material_flow = 85 -bridge_wall_speed = 20 -infill_enable_travel_optimization = True -retraction_combing_max_distance = 50 \ No newline at end of file + diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg index 5f8cfd7fc3..1ab7c2934b 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg @@ -1,29 +1,35 @@ [general] -version = 4 -name = UltraFine definition = imade3d_jellybox_2 +name = UltraFine +version = 4 [metadata] +global_quality = True +quality_type = ultrahigh setting_version = 20 type = quality -quality_type = ultrahigh weight = 2 -global_quality = True [values] adhesion_type = skirt -layer_height = 0.05 -layer_height_0 = 0.3 -retraction_hop = 0.1 bottom_thickness = =top_bottom_thickness +bridge_enable_more_layers = False +bridge_settings_enabled = True +bridge_skin_material_flow = 85 +bridge_skin_speed = 20 +bridge_wall_material_flow = 85 +bridge_wall_speed = 20 coasting_enable = True coasting_min_volume = 2 coasting_volume = 0.032 cool_fan_speed_max = =cool_fan_speed infill_before_walls = False +infill_enable_travel_optimization = True infill_line_width = =round(line_width * 1.5, 2) infill_pattern = zigzag infill_sparse_density = 25 +layer_height = 0.05 +layer_height_0 = 0.3 line_width = =machine_nozzle_size material_bed_temperature = =default_material_bed_temperature material_bed_temperature_layer_0 = =material_bed_temperature + 5 @@ -32,6 +38,8 @@ material_print_temperature_layer_0 = =material_print_temperature + 5 print_sequence = all_at_once retract_at_layer_change = True retraction_combing = noskin +retraction_combing_max_distance = 50 +retraction_hop = 0.1 retraction_hop_enabled = True retraction_min_travel = =machine_nozzle_size * 3 retraction_retract_speed = =retraction_speed @@ -65,11 +73,4 @@ support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0.2 travel_retract_before_outer_wall = True wall_0_wipe_dist = =round(line_width * 1.2,1) -bridge_settings_enabled = True -bridge_enable_more_layers = False -bridge_skin_material_flow = 85 -bridge_skin_speed = 20 -bridge_wall_material_flow = 85 -bridge_wall_speed = 20 -infill_enable_travel_optimization = True -retraction_combing_max_distance = 50 \ No newline at end of file + diff --git a/resources/quality/inat/inat_base_advanced_materials.inst.cfg b/resources/quality/inat/inat_base_advanced_materials.inst.cfg index 0aa30f2641..4422e9663d 100644 --- a/resources/quality/inat/inat_base_advanced_materials.inst.cfg +++ b/resources/quality/inat/inat_base_advanced_materials.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Advanced materials definition = inat_base +name = Advanced materials +version = 4 [metadata] +global_quality = True +quality_type = normal_advanced setting_version = 20 type = quality -quality_type = normal_advanced weight = -1 -global_quality = True [values] -layer_height = 0.2 adhesion_type = brim +brim_width = =30*skirt_brim_line_width*initial_layer_line_width_factor/100.0 +layer_height = 0.2 speed_layer_0 = 20 speed_print = 60 speed_travel = 100 xy_offset_layer_0 = 0 -brim_width = =30*skirt_brim_line_width*initial_layer_line_width_factor/100.0 + diff --git a/resources/quality/inat/inat_base_draft.inst.cfg b/resources/quality/inat/inat_base_draft.inst.cfg index f0e4e8496d..924bd52652 100644 --- a/resources/quality/inat/inat_base_draft.inst.cfg +++ b/resources/quality/inat/inat_base_draft.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Draft definition = inat_base +name = Draft +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = 0 -global_quality = True [values] -layer_height = 0.32 infill_sparse_density = 15 +layer_height = 0.32 speed_print = 80 + diff --git a/resources/quality/inat/inat_base_fine.inst.cfg b/resources/quality/inat/inat_base_fine.inst.cfg index b0a2ce1bb0..fff76ca7f5 100644 --- a/resources/quality/inat/inat_base_fine.inst.cfg +++ b/resources/quality/inat/inat_base_fine.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Fine definition = inat_base +name = Fine +version = 4 [metadata] +global_quality = True +quality_type = fine setting_version = 20 type = quality -quality_type = fine weight = 1 -global_quality = True [values] -layer_height = 0.12 \ No newline at end of file +layer_height = 0.12 + diff --git a/resources/quality/inat/inat_base_standard.inst.cfg b/resources/quality/inat/inat_base_standard.inst.cfg index aa472432c0..7531f8c744 100644 --- a/resources/quality/inat/inat_base_standard.inst.cfg +++ b/resources/quality/inat/inat_base_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard definition = inat_base +name = Standard +version = 4 [metadata] +global_quality = True +quality_type = standard setting_version = 20 type = quality -quality_type = standard weight = 0 -global_quality = True [values] speed_print = 80 + diff --git a/resources/quality/inat/inat_base_strong.inst.cfg b/resources/quality/inat/inat_base_strong.inst.cfg index 0221059e0e..f2c8f152a9 100644 --- a/resources/quality/inat/inat_base_strong.inst.cfg +++ b/resources/quality/inat/inat_base_strong.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Strong definition = inat_base +name = Strong +version = 4 [metadata] +global_quality = True +quality_type = strong setting_version = 20 type = quality -quality_type = strong weight = -3 -global_quality = True [values] -speed_print = 50 -speed_layer_0 = 20 -wall_thickness = =8*wall_line_width -top_bottom_thickness = 2.0 +adhesion_type = brim alternate_extra_perimeter = True -infill_sparse_density = 80 cool_fan_enabled = False -adhesion_type = brim \ No newline at end of file +infill_sparse_density = 80 +speed_layer_0 = 20 +speed_print = 50 +top_bottom_thickness = 2.0 +wall_thickness = =8*wall_line_width + diff --git a/resources/quality/inat/inat_base_tree_support.inst.cfg b/resources/quality/inat/inat_base_tree_support.inst.cfg index aa811aaa6e..d04a3d50cf 100644 --- a/resources/quality/inat/inat_base_tree_support.inst.cfg +++ b/resources/quality/inat/inat_base_tree_support.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Tree supports definition = inat_base +name = Tree supports +version = 4 [metadata] +global_quality = True +quality_type = normal_tree_supp setting_version = 20 type = quality -quality_type = normal_tree_supp weight = -2 -global_quality = True [values] -support_structure = tree -support_type = buildplate support_enable = True -support_top_distance = 0.4 \ No newline at end of file +support_structure = tree +support_top_distance = 0.4 +support_type = buildplate + diff --git a/resources/quality/jgaurora_a6/jgaurora_a6_0.12_detail.inst.cfg b/resources/quality/jgaurora_a6/jgaurora_a6_0.12_detail.inst.cfg index a35a405f50..07701b9a0a 100644 --- a/resources/quality/jgaurora_a6/jgaurora_a6_0.12_detail.inst.cfg +++ b/resources/quality/jgaurora_a6/jgaurora_a6_0.12_detail.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = Detail 0.12 definition = jgaurora_a6 +name = Detail 0.12 +version = 4 [metadata] -setting_version = 20 +global_quality = true quality_type = detail +setting_version = 20 type = quality weight = 0 -global_quality = true [values] -layer_height = 0.12 -layer_height_0 = 0.2 -initial_layer_line_width_factor = 150 -infill_before_walls = true -speed_print = 50 -speed_travel = 80 -retraction_amount = 4 acceleration_enabled = True adhesion_type = skirt +infill_before_walls = true +initial_layer_line_width_factor = 150 jerk_enabled = True +layer_height = 0.12 +layer_height_0 = 0.2 +retraction_amount = 4 retraction_combing = infill +speed_print = 50 +speed_travel = 80 support_enable = False travel_retract_before_outer_wall = True + diff --git a/resources/quality/jgaurora_a6/jgaurora_a6_0.16_optimal.inst.cfg b/resources/quality/jgaurora_a6/jgaurora_a6_0.16_optimal.inst.cfg index 1dc8582180..b412dff0a5 100644 --- a/resources/quality/jgaurora_a6/jgaurora_a6_0.16_optimal.inst.cfg +++ b/resources/quality/jgaurora_a6/jgaurora_a6_0.16_optimal.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = Optimal 0.16 definition = jgaurora_a6 +name = Optimal 0.16 +version = 4 [metadata] +global_quality = true quality_type = optimal setting_version = 20 type = quality weight = -1 -global_quality = true [values] +acceleration_enabled = True +adhesion_type = skirt +infill_before_walls = true +initial_layer_line_width_factor = 150 +jerk_enabled = True layer_height = 0.16 layer_height_0 = 0.2 -initial_layer_line_width_factor = 150 -infill_before_walls = true +retraction_amount = 4 +retraction_combing = infill speed_print = 55 speed_travel = 80 -retraction_amount = 4 -adhesion_type = skirt -acceleration_enabled = True -jerk_enabled = True -retraction_combing = infill support_enable = False travel_retract_before_outer_wall = True + diff --git a/resources/quality/jgaurora_a6/jgaurora_a6_0.24_draft.inst.cfg b/resources/quality/jgaurora_a6/jgaurora_a6_0.24_draft.inst.cfg index e39dbf08d2..6fc99dae09 100644 --- a/resources/quality/jgaurora_a6/jgaurora_a6_0.24_draft.inst.cfg +++ b/resources/quality/jgaurora_a6/jgaurora_a6_0.24_draft.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Draft 0.24 definition = jgaurora_a6 +name = Draft 0.24 +version = 4 [metadata] +global_quality = true quality_type = draft setting_version = 20 type = quality weight = -3 -global_quality = true [values] +adhesion_type = skirt layer_height = 0.24 layer_height_0 = 0.24 -speed_print = 60 retraction_amount = 4 -adhesion_type = skirt retraction_combing = infill +speed_print = 60 support_enable = False travel_retract_before_outer_wall = True + diff --git a/resources/quality/jgaurora_a6/jgaurora_a6_0.2_normal.inst.cfg b/resources/quality/jgaurora_a6/jgaurora_a6_0.2_normal.inst.cfg index 658fc02936..4ed91b02b8 100644 --- a/resources/quality/jgaurora_a6/jgaurora_a6_0.2_normal.inst.cfg +++ b/resources/quality/jgaurora_a6/jgaurora_a6_0.2_normal.inst.cfg @@ -1,21 +1,22 @@ [general] -version = 4 -name = Normal 0.20 definition = jgaurora_a6 +name = Normal 0.20 +version = 4 [metadata] +global_quality = true quality_type = normal setting_version = 20 type = quality weight = -2 -global_quality = true [values] +adhesion_type = skirt layer_height = 0.2 layer_height_0 = 0.2 +retraction_combing = infill speed_print = 60 speed_travel = 100 -adhesion_type = skirt -retraction_combing = infill support_enable = False travel_retract_before_outer_wall = True + diff --git a/resources/quality/katihal/alya3dp_normal.inst.cfg b/resources/quality/katihal/alya3dp_normal.inst.cfg index bb35bdb895..09753dfc78 100644 --- a/resources/quality/katihal/alya3dp_normal.inst.cfg +++ b/resources/quality/katihal/alya3dp_normal.inst.cfg @@ -1,36 +1,32 @@ [general] -version = 4 -name = Normal definition = alya3dp +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = alya_normal setting_version = 20 type = quality -quality_type = alya_normal weight = 0 -global_quality = True [values] -layer_height = 0.16 -layer_height_0 = 0.1 adhesion_type = raft -skirt_line_count = 2 -skirt_gap = 2 fill_outline_gaps = True infill_angles = [0,90 ] -infill_sparse_density = 15 -retraction_min_travel = 0.8 -skin_angles = [0,90] -top_layers = 6 -wall_line_count = 2 +infill_line_width = 0.4 infill_pattern = grid -skin_line_width = 0.4 +infill_sparse_density = 15 +layer_height = 0.16 +layer_height_0 = 0.1 +line_width = 0.4 +optimize_wall_printing_order = True raft_base_line_spacing = 2.6 raft_base_line_width = 1.2 raft_base_thickness = 0.3 +raft_interface_line_spacing = 0.8 raft_interface_line_width = 0.4 raft_interface_thickness = 0.3 -raft_interface_line_spacing = 0.8 raft_margin = 5 raft_surface_layers = 3 raft_surface_line_width = 0.4 @@ -38,20 +34,25 @@ raft_surface_thickness = 0.2 retract_at_layer_change = true retraction_hop = 0.5 retraction_hop_enabled = true -support_type = everywhere -support_interface_pattern =lines -support_top_distance = 0.15 -support_z_distance = 0.25 +retraction_min_travel = 0.8 +skin_angles = [0,90] +skin_line_width = 0.4 +skirt_gap = 2 +skirt_line_count = 2 +support_angle = 70 support_bottom_distance = 0.15 support_brim_width = 6 support_infill_rate = =15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15 +support_initial_layer_line_distance = 2.7 +support_interface_pattern = lines support_line_distance = 1.7 support_line_width = 0.25 -support_initial_layer_line_distance = 2.7 +support_top_distance = 0.15 +support_type = everywhere support_xy_distance = 0.7 -infill_line_width = 0.4 -line_width = 0.4 -optimize_wall_printing_order = True -support_angle = 70 +support_z_distance = 0.25 +top_layers = 6 +wall_line_count = 2 +wall_line_width_0 = 0.35 wall_line_width_x = 0.4 -wall_line_width_0 = 0.35 \ No newline at end of file + diff --git a/resources/quality/katihal/alya3dp_normal_generic_pla.inst.cfg b/resources/quality/katihal/alya3dp_normal_generic_pla.inst.cfg index 8265363e0c..b6000d11eb 100644 --- a/resources/quality/katihal/alya3dp_normal_generic_pla.inst.cfg +++ b/resources/quality/katihal/alya3dp_normal_generic_pla.inst.cfg @@ -1,31 +1,32 @@ [general] -version = 4 definition = alya3dp name = Normal +version = 4 [metadata] +material = generic_pla +quality_type = alya_normal setting_version = 20 type = quality -quality_type = alya_normal weight = 3 -material = generic_pla [values] -speed_print = 40 -speed_topbottom = 30 -speed_wall_0 = 35 +cool_fan_speed = 100 +cool_fan_speed_0 = 100 +layer_0_z_overlap = 0.04 +raft_airgap = 0.15 +raft_base_fan_speed = 0 +raft_base_speed = 15 +raft_interface_fan_speed = 0 +raft_interface_speed = 20 +raft_surface_fan_speed = 100 +raft_surface_speed = 35 speed_infill = 45 speed_layer_0 = 25 +speed_print = 40 speed_support = 45 speed_support_interface = 35 +speed_topbottom = 30 speed_travel = 60 -raft_airgap = 0.15 -layer_0_z_overlap = 0.04 -raft_base_speed = 15 -raft_interface_speed = 20 -raft_surface_speed = 35 -raft_surface_fan_speed = 100 -raft_base_fan_speed = 0 -raft_interface_fan_speed = 0 -cool_fan_speed = 100 -cool_fan_speed_0 = 100 \ No newline at end of file +speed_wall_0 = 35 + diff --git a/resources/quality/katihal/alyanx3dp_normal.inst.cfg b/resources/quality/katihal/alyanx3dp_normal.inst.cfg index d57573e3b7..9ea6ca5605 100644 --- a/resources/quality/katihal/alyanx3dp_normal.inst.cfg +++ b/resources/quality/katihal/alyanx3dp_normal.inst.cfg @@ -1,36 +1,32 @@ [general] -version = 4 -name = Normal definition = alyanx3dp +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = alyanx_normal setting_version = 20 type = quality -quality_type = alyanx_normal weight = 0 -global_quality = True [values] -layer_height = 0.16 -layer_height_0 = 0.1 adhesion_type = raft -skirt_line_count = 2 -skirt_gap = 2 fill_outline_gaps = True infill_angles = [0,90 ] -infill_sparse_density = 15 -retraction_min_travel = 0.8 -skin_angles = [0,90] -top_layers = 6 -wall_line_count = 2 +infill_line_width = 0.4 infill_pattern = grid -skin_line_width = 0.4 +infill_sparse_density = 15 +layer_height = 0.16 +layer_height_0 = 0.1 +line_width = 0.4 +optimize_wall_printing_order = True raft_base_line_spacing = 2.6 raft_base_line_width = 1.2 raft_base_thickness = 0.3 +raft_interface_line_spacing = 0.8 raft_interface_line_width = 0.4 raft_interface_thickness = 0.3 -raft_interface_line_spacing = 0.8 raft_margin = 5 raft_surface_layers = 3 raft_surface_line_width = 0.4 @@ -38,20 +34,25 @@ raft_surface_thickness = 0.2 retract_at_layer_change = true retraction_hop = 0.5 retraction_hop_enabled = true -support_type = everywhere -support_interface_pattern =lines -support_top_distance = 0.15 -support_z_distance = 0.25 +retraction_min_travel = 0.8 +skin_angles = [0,90] +skin_line_width = 0.4 +skirt_gap = 2 +skirt_line_count = 2 +support_angle = 70 support_bottom_distance = 0.15 support_brim_width = 6 support_infill_rate = =15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15 +support_initial_layer_line_distance = 2.7 +support_interface_pattern = lines support_line_distance = 1.7 support_line_width = 0.25 -support_initial_layer_line_distance = 2.7 +support_top_distance = 0.15 +support_type = everywhere support_xy_distance = 0.7 -infill_line_width = 0.4 -line_width = 0.4 -optimize_wall_printing_order = True -support_angle = 70 +support_z_distance = 0.25 +top_layers = 6 +wall_line_count = 2 +wall_line_width_0 = 0.35 wall_line_width_x = 0.4 -wall_line_width_0 = 0.35 \ No newline at end of file + diff --git a/resources/quality/katihal/alyanx3dp_normal_generic_pla.inst.cfg b/resources/quality/katihal/alyanx3dp_normal_generic_pla.inst.cfg index 5e1666d0ed..e6f1fd1302 100644 --- a/resources/quality/katihal/alyanx3dp_normal_generic_pla.inst.cfg +++ b/resources/quality/katihal/alyanx3dp_normal_generic_pla.inst.cfg @@ -1,31 +1,32 @@ [general] -version = 4 definition = alyanx3dp name = Normal +version = 4 [metadata] +material = generic_pla +quality_type = alyanx_normal setting_version = 20 type = quality -quality_type = alyanx_normal weight = 2 -material = generic_pla [values] -speed_print = 40 -speed_topbottom = 30 -speed_wall_0 = 35 +cool_fan_speed = 100 +cool_fan_speed_0 = 100 +layer_0_z_overlap = 0.04 +raft_airgap = 0.15 +raft_base_fan_speed = 0 +raft_base_speed = 15 +raft_interface_fan_speed = 0 +raft_interface_speed = 20 +raft_surface_fan_speed = 100 +raft_surface_speed = 35 speed_infill = 45 speed_layer_0 = 25 +speed_print = 40 speed_support = 45 speed_support_interface = 35 +speed_topbottom = 30 speed_travel = 60 -raft_airgap = 0.15 -layer_0_z_overlap = 0.04 -raft_base_speed = 15 -raft_interface_speed = 20 -raft_surface_speed = 35 -raft_surface_fan_speed = 100 -raft_base_fan_speed = 0 -raft_interface_fan_speed = 0 -cool_fan_speed = 100 -cool_fan_speed_0 = 100 \ No newline at end of file +speed_wall_0 = 35 + diff --git a/resources/quality/katihal/kupido_normal.inst.cfg b/resources/quality/katihal/kupido_normal.inst.cfg index 77ce2e65ef..6c0040418e 100644 --- a/resources/quality/katihal/kupido_normal.inst.cfg +++ b/resources/quality/katihal/kupido_normal.inst.cfg @@ -1,36 +1,32 @@ [general] -version = 4 -name = Normal definition = kupido +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = kupido_normal setting_version = 20 type = quality -quality_type = kupido_normal weight = 0 -global_quality = True [values] -layer_height = 0.16 -layer_height_0 = 0.1 adhesion_type = raft -skirt_line_count = 2 -skirt_gap = 2 fill_outline_gaps = True infill_angles = [0,90 ] -infill_sparse_density = 15 -retraction_min_travel = 0.8 -skin_angles = [0,90] -top_layers = 6 -wall_line_count = 2 +infill_line_width = 0.4 infill_pattern = grid -skin_line_width = 0.4 +infill_sparse_density = 15 +layer_height = 0.16 +layer_height_0 = 0.1 +line_width = 0.4 +optimize_wall_printing_order = True raft_base_line_spacing = 2.6 raft_base_line_width = 1.2 raft_base_thickness = 0.3 +raft_interface_line_spacing = 0.8 raft_interface_line_width = 0.4 raft_interface_thickness = 0.3 -raft_interface_line_spacing = 0.8 raft_margin = 5 raft_surface_layers = 3 raft_surface_line_width = 0.4 @@ -38,20 +34,25 @@ raft_surface_thickness = 0.2 retract_at_layer_change = true retraction_hop = 0.5 retraction_hop_enabled = true -support_type = everywhere -support_interface_pattern =lines -support_top_distance = 0.15 -support_z_distance = 0.25 +retraction_min_travel = 0.8 +skin_angles = [0,90] +skin_line_width = 0.4 +skirt_gap = 2 +skirt_line_count = 2 +support_angle = 70 support_bottom_distance = 0.15 support_brim_width = 6 support_infill_rate = =15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15 +support_initial_layer_line_distance = 2.7 +support_interface_pattern = lines support_line_distance = 1.7 support_line_width = 0.25 -support_initial_layer_line_distance = 2.7 +support_top_distance = 0.15 +support_type = everywhere support_xy_distance = 0.7 -infill_line_width = 0.4 -line_width = 0.4 -optimize_wall_printing_order = True -support_angle = 70 +support_z_distance = 0.25 +top_layers = 6 +wall_line_count = 2 +wall_line_width_0 = 0.35 wall_line_width_x = 0.4 -wall_line_width_0 = 0.35 \ No newline at end of file + diff --git a/resources/quality/katihal/kupido_normal_generic_abs.inst.cfg b/resources/quality/katihal/kupido_normal_generic_abs.inst.cfg index 42bedfc8d6..9d665085c9 100644 --- a/resources/quality/katihal/kupido_normal_generic_abs.inst.cfg +++ b/resources/quality/katihal/kupido_normal_generic_abs.inst.cfg @@ -1,31 +1,32 @@ [general] -version = 4 definition = kupido name = Normal +version = 4 [metadata] +material = generic_abs +quality_type = kupido_normal setting_version = 20 type = quality -quality_type = kupido_normal weight = 3 -material = generic_abs [values] -speed_print = 40 -speed_topbottom = 30 -speed_wall_0 = 35 +cool_fan_speed = 30 +cool_fan_speed_0 = 30 +layer_0_z_overlap = 0.04 +raft_airgap = 0.1 +raft_base_fan_speed = 0 +raft_base_speed = 15 +raft_interface_fan_speed = 0 +raft_interface_speed = 20 +raft_surface_fan_speed = 100 +raft_surface_speed = 35 speed_infill = 45 speed_layer_0 = 25 +speed_print = 40 speed_support = 45 speed_support_interface = 35 +speed_topbottom = 30 speed_travel = 60 -raft_airgap = 0.1 -layer_0_z_overlap = 0.04 -raft_base_speed = 15 -raft_interface_speed = 20 -raft_surface_speed = 35 -raft_surface_fan_speed = 100 -raft_base_fan_speed = 0 -raft_interface_fan_speed = 0 -cool_fan_speed = 30 -cool_fan_speed_0 = 30 \ No newline at end of file +speed_wall_0 = 35 + diff --git a/resources/quality/katihal/kupido_normal_generic_pla.inst.cfg b/resources/quality/katihal/kupido_normal_generic_pla.inst.cfg index 0f25ab269e..514a2fe6ca 100644 --- a/resources/quality/katihal/kupido_normal_generic_pla.inst.cfg +++ b/resources/quality/katihal/kupido_normal_generic_pla.inst.cfg @@ -1,31 +1,32 @@ [general] -version = 4 definition = kupido name = Normal +version = 4 [metadata] +material = generic_pla +quality_type = kupido_normal setting_version = 20 type = quality -quality_type = kupido_normal weight = 3 -material = generic_pla [values] -speed_print = 40 -speed_topbottom = 30 -speed_wall_0 = 35 +cool_fan_speed = 100 +cool_fan_speed_0 = 100 +layer_0_z_overlap = 0.04 +raft_airgap = 0.15 +raft_base_fan_speed = 0 +raft_base_speed = 15 +raft_interface_fan_speed = 0 +raft_interface_speed = 20 +raft_surface_fan_speed = 100 +raft_surface_speed = 35 speed_infill = 45 speed_layer_0 = 25 +speed_print = 40 speed_support = 45 speed_support_interface = 35 +speed_topbottom = 30 speed_travel = 60 -raft_airgap = 0.15 -layer_0_z_overlap = 0.04 -raft_base_speed = 15 -raft_interface_speed = 20 -raft_surface_speed = 35 -raft_surface_fan_speed = 100 -raft_base_fan_speed = 0 -raft_interface_fan_speed = 0 -cool_fan_speed = 100 -cool_fan_speed_0 = 100 \ No newline at end of file +speed_wall_0 = 35 + diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_draft.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_draft.inst.cfg index 34a05fce25..8d8e5e27d7 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_draft.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_draft.inst.cfg @@ -1,41 +1,37 @@ [general] -version = 4 -name = Draft definition = kemiq_q2_beta +name = Draft +version = 4 [metadata] +material = generic_abs +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = -3 -material = generic_abs [values] +adhesion_type = raft +cool_fan_enabled = False layer_height = 0.35 layer_height_0 = 0.3 - -speed_print = 70 -speed_infill = =math.ceil(speed_print * 60 / 70) -speed_layer_0 = =math.ceil(speed_print * 20 / 70) -speed_wall_0 = =math.ceil(speed_print * 30 / 70) -speed_wall_x = =math.ceil(speed_print * 50 / 70) -speed_topbottom = =math.ceil(speed_print * 30 / 70) -speed_travel = 120 - -material_print_temperature = 246 material_bed_temperature = 85 - -retraction_speed = 50 -retraction_amount = 1.5 - -adhesion_type = raft +material_print_temperature = 246 raft_airgap = 0.25 -raft_margin = 10 -raft_surface_layers = 3 -raft_interface_line_spacing = 2 -raft_speed = 20 raft_base_line_width = 0.8 raft_base_thickness = 0.36 +raft_interface_line_spacing = 2 +raft_margin = 10 +raft_speed = 20 +raft_surface_layers = 3 raft_surface_line_spacing = 0.4 +retraction_amount = 1.5 +retraction_speed = 50 +speed_infill = =math.ceil(speed_print * 60 / 70) +speed_layer_0 = =math.ceil(speed_print * 20 / 70) +speed_print = 70 +speed_topbottom = =math.ceil(speed_print * 30 / 70) +speed_travel = 120 +speed_wall_0 = =math.ceil(speed_print * 30 / 70) +speed_wall_x = =math.ceil(speed_print * 50 / 70) -cool_fan_enabled = False diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_extra_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_extra_fine.inst.cfg index 0cbe13fd52..404ea1a8c4 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_extra_fine.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_extra_fine.inst.cfg @@ -1,41 +1,37 @@ [general] -version = 4 -name = Extra Fine definition = kemiq_q2_beta +name = Extra Fine +version = 4 [metadata] +material = generic_abs +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -material = generic_abs [values] +adhesion_type = raft +cool_fan_enabled = False layer_height = 0.06 layer_height_0 = 0.3 - -speed_print = 40 -speed_infill = =math.ceil(speed_print * 50 / 40) -speed_layer_0 = =math.ceil(speed_print * 15 / 40) -speed_wall_0 = =math.ceil(speed_print * 20 / 40) -speed_wall_x = =speed_print -speed_topbottom = =math.ceil(speed_print * 20 / 40) -speed_travel = 120 - -material_print_temperature = 246 material_bed_temperature = 85 - -retraction_speed = 50 -retraction_amount = 1.5 - -adhesion_type = raft +material_print_temperature = 246 raft_airgap = 0.25 -raft_margin = 10 -raft_surface_layers = 3 -raft_interface_line_spacing = 2 -raft_speed = 20 raft_base_line_width = 0.8 raft_base_thickness = 0.36 +raft_interface_line_spacing = 2 +raft_margin = 10 +raft_speed = 20 +raft_surface_layers = 3 raft_surface_line_spacing = 0.4 +retraction_amount = 1.5 +retraction_speed = 50 +speed_infill = =math.ceil(speed_print * 50 / 40) +speed_layer_0 = =math.ceil(speed_print * 15 / 40) +speed_print = 40 +speed_topbottom = =math.ceil(speed_print * 20 / 40) +speed_travel = 120 +speed_wall_0 = =math.ceil(speed_print * 20 / 40) +speed_wall_x = =speed_print -cool_fan_enabled = False diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_fine.inst.cfg index fcf821ccee..7ed75ee9f5 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_fine.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_fine.inst.cfg @@ -1,41 +1,37 @@ [general] -version = 4 -name = Fine definition = kemiq_q2_beta +name = Fine +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = generic_abs [values] +adhesion_type = raft +cool_fan_enabled = False layer_height = 0.1 layer_height_0 = 0.3 - -speed_print = 50 -speed_infill = =math.ceil(speed_print * 60 / 50) -speed_layer_0 = =math.ceil(speed_print * 20 / 50) -speed_wall_0 = =math.ceil(speed_print * 25 / 50) -speed_wall_x = =math.ceil(speed_print * 45 / 50) -speed_topbottom = =math.ceil(speed_print * 30 / 50) -speed_travel = 120 - -material_print_temperature = 246 material_bed_temperature = 85 - -retraction_speed = 50 -retraction_amount = 1.5 - -adhesion_type = raft +material_print_temperature = 246 raft_airgap = 0.25 -raft_margin = 10 -raft_surface_layers = 3 -raft_interface_line_spacing = 2 -raft_speed = 20 raft_base_line_width = 0.8 raft_base_thickness = 0.36 +raft_interface_line_spacing = 2 +raft_margin = 10 +raft_speed = 20 +raft_surface_layers = 3 raft_surface_line_spacing = 0.4 +retraction_amount = 1.5 +retraction_speed = 50 +speed_infill = =math.ceil(speed_print * 60 / 50) +speed_layer_0 = =math.ceil(speed_print * 20 / 50) +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 30 / 50) +speed_travel = 120 +speed_wall_0 = =math.ceil(speed_print * 25 / 50) +speed_wall_x = =math.ceil(speed_print * 45 / 50) -cool_fan_enabled = False diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_low.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_low.inst.cfg index bb9af57335..e44e4d4acf 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_low.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_low.inst.cfg @@ -1,41 +1,37 @@ [general] -version = 4 -name = Low definition = kemiq_q2_beta +name = Low +version = 4 [metadata] +material = generic_abs +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -material = generic_abs [values] +adhesion_type = raft +cool_fan_enabled = False layer_height = 0.2 layer_height_0 = 0.3 - -speed_print = 70 -speed_infill = =math.ceil(speed_print * 60 / 70) -speed_layer_0 = =math.ceil(speed_print * 20 / 70) -speed_wall_0 = =math.ceil(speed_print * 30 / 70) -speed_wall_x = =math.ceil(speed_print * 50 / 70) -speed_topbottom = =math.ceil(speed_print * 30 / 70) -speed_travel = 120 - -material_print_temperature = 246 material_bed_temperature = 85 - -retraction_speed = 50 -retraction_amount = 1.5 - -adhesion_type = raft +material_print_temperature = 246 raft_airgap = 0.25 -raft_margin = 10 -raft_surface_layers = 3 -raft_interface_line_spacing = 2 -raft_speed = 20 raft_base_line_width = 0.8 raft_base_thickness = 0.36 +raft_interface_line_spacing = 2 +raft_margin = 10 +raft_speed = 20 +raft_surface_layers = 3 raft_surface_line_spacing = 0.4 +retraction_amount = 1.5 +retraction_speed = 50 +speed_infill = =math.ceil(speed_print * 60 / 70) +speed_layer_0 = =math.ceil(speed_print * 20 / 70) +speed_print = 70 +speed_topbottom = =math.ceil(speed_print * 30 / 70) +speed_travel = 120 +speed_wall_0 = =math.ceil(speed_print * 30 / 70) +speed_wall_x = =math.ceil(speed_print * 50 / 70) -cool_fan_enabled = False diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_normal.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_normal.inst.cfg index 62c12a0bca..babbe8463a 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_abs_normal.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_abs_normal.inst.cfg @@ -1,41 +1,37 @@ [general] -version = 4 -name = Normal definition = kemiq_q2_beta +name = Normal +version = 4 [metadata] +material = generic_abs +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -1 -material = generic_abs [values] +adhesion_type = raft +cool_fan_enabled = False layer_height = 0.15 layer_height_0 = 0.3 - -speed_print = 60 -speed_infill = =math.ceil(speed_print * 50 / 60) -speed_layer_0 = =math.ceil(speed_print * 15 / 60) -speed_wall_0 = =math.ceil(speed_print * 20 / 60) -speed_wall_x = =math.ceil(speed_print * 40 / 60) -speed_topbottom = =math.ceil(speed_print * 20 / 60) -speed_travel = 120 - -material_print_temperature = 246 material_bed_temperature = 85 - -retraction_speed = 50 -retraction_amount = 1.5 - -adhesion_type = raft +material_print_temperature = 246 raft_airgap = 0.25 -raft_margin = 10 -raft_surface_layers = 3 -raft_interface_line_spacing = 2 -raft_speed = 20 raft_base_line_width = 0.8 raft_base_thickness = 0.36 +raft_interface_line_spacing = 2 +raft_margin = 10 +raft_speed = 20 +raft_surface_layers = 3 raft_surface_line_spacing = 0.4 +retraction_amount = 1.5 +retraction_speed = 50 +speed_infill = =math.ceil(speed_print * 50 / 60) +speed_layer_0 = =math.ceil(speed_print * 15 / 60) +speed_print = 60 +speed_topbottom = =math.ceil(speed_print * 20 / 60) +speed_travel = 120 +speed_wall_0 = =math.ceil(speed_print * 20 / 60) +speed_wall_x = =math.ceil(speed_print * 40 / 60) -cool_fan_enabled = False diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_draft.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_draft.inst.cfg index b4ab881229..3285ef7ecc 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_draft.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_draft.inst.cfg @@ -1,25 +1,22 @@ [general] -version = 4 -name = Draft definition = kemiq_q2_beta +name = Draft +version = 4 [metadata] +material = generic_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = -3 -material = generic_pla [values] -layer_height = 0.35 adhesion_type = skirt - +layer_height = 0.35 +material_bed_temperature = 60 +material_print_temperature = 214 +raft_airgap = 0.25 +retraction_amount = 2.15 +retraction_speed = 40 speed_print = 60 -material_print_temperature = 214 -material_bed_temperature = 60 - -retraction_speed = 40 -retraction_amount = 2.15 - -raft_airgap = 0.25 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_extra_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_extra_fine.inst.cfg index 430f0bd5a4..9f7585e0c0 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_extra_fine.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_extra_fine.inst.cfg @@ -1,25 +1,22 @@ [general] -version = 4 -name = Extra Fine definition = kemiq_q2_beta +name = Extra Fine +version = 4 [metadata] +material = generic_pla +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -material = generic_pla [values] -layer_height = 0.06 adhesion_type = skirt - +layer_height = 0.06 +material_bed_temperature = 60 +material_print_temperature = 214 +raft_airgap = 0.25 +retraction_amount = 2.15 +retraction_speed = 40 speed_print = 30 -material_print_temperature = 214 -material_bed_temperature = 60 - -retraction_speed = 40 -retraction_amount = 2.15 - -raft_airgap = 0.25 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_fine.inst.cfg index 6632469324..b6f7938667 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_fine.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_fine.inst.cfg @@ -1,25 +1,22 @@ [general] -version = 4 -name = Fine definition = kemiq_q2_beta +name = Fine +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = generic_pla [values] -layer_height = 0.1 adhesion_type = skirt - +layer_height = 0.1 +material_bed_temperature = 60 +material_print_temperature = 214 +raft_airgap = 0.25 +retraction_amount = 2.15 +retraction_speed = 40 speed_print = 40 -material_print_temperature = 214 -material_bed_temperature = 60 - -retraction_speed = 40 -retraction_amount = 2.15 - -raft_airgap = 0.25 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_low.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_low.inst.cfg index afb3a001ef..d0c52f9f8a 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_low.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_low.inst.cfg @@ -1,25 +1,22 @@ [general] -version = 4 -name = Low definition = kemiq_q2_beta +name = Low +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -material = generic_pla [values] -layer_height = 0.2 adhesion_type = skirt - +layer_height = 0.2 +material_bed_temperature = 60 +material_print_temperature = 214 +raft_airgap = 0.25 +retraction_amount = 2.15 +retraction_speed = 40 speed_print = 60 -material_print_temperature = 214 -material_bed_temperature = 60 - -retraction_speed = 40 -retraction_amount = 2.15 - -raft_airgap = 0.25 diff --git a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_normal.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_normal.inst.cfg index deba2117ac..78e7f56640 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_beta_pla_normal.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_beta_pla_normal.inst.cfg @@ -1,25 +1,22 @@ [general] -version = 4 -name = Normal definition = kemiq_q2_beta +name = Normal +version = 4 [metadata] +material = generic_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -1 -material = generic_pla [values] -layer_height = 0.15 adhesion_type = skirt - +layer_height = 0.15 +material_bed_temperature = 60 +material_print_temperature = 214 +raft_airgap = 0.25 +retraction_amount = 2.15 +retraction_speed = 40 speed_print = 50 -material_print_temperature = 214 -material_bed_temperature = 60 - -retraction_speed = 40 -retraction_amount = 2.15 - -raft_airgap = 0.25 diff --git a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_draft.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_draft.inst.cfg index c9cc625a5f..eba22ed98e 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_draft.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_draft.inst.cfg @@ -1,24 +1,21 @@ [general] -version = 4 -name = Draft definition = kemiq_q2_gama +name = Draft +version = 4 [metadata] +material = generic_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = -3 -material = generic_pla [values] -layer_height = 0.35 adhesion_type = raft - +layer_height = 0.35 +material_print_temperature = 214 +raft_airgap = 0.25 +retraction_amount = 2.15 +retraction_speed = 40 speed_print = 60 -material_print_temperature = 214 - -retraction_speed = 40 -retraction_amount = 2.15 - -raft_airgap = 0.25 diff --git a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_extra_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_extra_fine.inst.cfg index 9aa8b6e2b2..f939f9c0ce 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_extra_fine.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_extra_fine.inst.cfg @@ -1,30 +1,27 @@ [general] -version = 4 -name = Extra Fine definition = kemiq_q2_gama +name = Extra Fine +version = 4 [metadata] +material = generic_pla +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -material = generic_pla [values] -layer_height = 0.06 adhesion_type = skirt - -speed_print = 40 +layer_height = 0.06 +material_print_temperature = 214 +raft_airgap = 0.25 +retraction_amount = 2.15 +retraction_speed = 40 speed_infill = =math.ceil(speed_print * 50 / 40) speed_layer_0 = =math.ceil(speed_print * 15 / 40) -speed_wall_0 = =math.ceil(speed_print * 20 / 40) -speed_wall_x = =speed_print +speed_print = 40 speed_topbottom = =math.ceil(speed_print * 20 / 40) speed_travel = 120 +speed_wall_0 = =math.ceil(speed_print * 20 / 40) +speed_wall_x = =speed_print -material_print_temperature = 214 - -retraction_speed = 40 -retraction_amount = 2.15 - -raft_airgap = 0.25 diff --git a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_fine.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_fine.inst.cfg index 46014a9c23..5f36f30bfa 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_fine.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_fine.inst.cfg @@ -1,30 +1,27 @@ [general] -version = 4 -name = Fine definition = kemiq_q2_gama +name = Fine +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = generic_pla [values] -layer_height = 0.1 adhesion_type = skirt - -speed_print = 50 +layer_height = 0.1 +material_print_temperature = 214 +raft_airgap = 0.25 +retraction_amount = 2.15 +retraction_speed = 40 speed_infill = =math.ceil(speed_print * 60 / 50) speed_layer_0 = =math.ceil(speed_print * 20 / 50) -speed_wall_0 = =math.ceil(speed_print * 25 / 50) -speed_wall_x = =math.ceil(speed_print * 45 / 50) +speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_travel = 120 +speed_wall_0 = =math.ceil(speed_print * 25 / 50) +speed_wall_x = =math.ceil(speed_print * 45 / 50) -material_print_temperature = 214 - -retraction_speed = 40 -retraction_amount = 2.15 - -raft_airgap = 0.25 diff --git a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_low.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_low.inst.cfg index 09d49dac0d..b959a33341 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_low.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_low.inst.cfg @@ -1,24 +1,21 @@ [general] -version = 4 -name = Low definition = kemiq_q2_gama +name = Low +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -material = generic_pla [values] -layer_height = 0.2 adhesion_type = raft - +layer_height = 0.2 +material_print_temperature = 214 +raft_airgap = 0.25 +retraction_amount = 2.15 +retraction_speed = 40 speed_print = 60 -material_print_temperature = 214 - -retraction_speed = 40 -retraction_amount = 2.15 - -raft_airgap = 0.25 diff --git a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_normal.inst.cfg b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_normal.inst.cfg index 9756d4e924..a9c4a0fa68 100644 --- a/resources/quality/kemiq_q2/kemiq_q2_gama_pla_normal.inst.cfg +++ b/resources/quality/kemiq_q2/kemiq_q2_gama_pla_normal.inst.cfg @@ -1,30 +1,27 @@ [general] -version = 4 -name = Normal definition = kemiq_q2_gama +name = Normal +version = 4 [metadata] +material = generic_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -1 -material = generic_pla [values] -layer_height = 0.15 adhesion_type = skirt - -speed_print = 60 +layer_height = 0.15 +material_print_temperature = 214 +raft_airgap = 0.25 +retraction_amount = 2.15 +retraction_speed = 40 speed_infill = =math.ceil(speed_print * 50 / 60) speed_layer_0 = =math.ceil(speed_print * 15 / 60) -speed_wall_0 = =math.ceil(speed_print * 20 / 60) -speed_wall_x = =math.ceil(speed_print * 40 / 60) +speed_print = 60 speed_topbottom = =math.ceil(speed_print * 20 / 60) speed_travel = 120 +speed_wall_0 = =math.ceil(speed_print * 20 / 60) +speed_wall_x = =math.ceil(speed_print * 40 / 60) -material_print_temperature = 214 - -retraction_speed = 40 -retraction_amount = 2.15 - -raft_airgap = 0.25 diff --git a/resources/quality/key3d/key3d_tyro_best.inst.cfg b/resources/quality/key3d/key3d_tyro_best.inst.cfg index 9a73786941..ef27b1602c 100644 --- a/resources/quality/key3d/key3d_tyro_best.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_best.inst.cfg @@ -1,119 +1,120 @@ [general] -version = 4 -name = Best Quality definition = key3d_tyro +name = Best Quality +version = 4 [metadata] +global_quality = True +quality_type = best setting_version = 20 type = quality -quality_type = best weight = 1 -global_quality = True [values] -layer_height = 0.08 -layer_height_0 = 0.24 -line_width = 0.4 -wall_line_width_0 = 0.4 -initial_layer_line_width_factor = 100 -wall_thickness = 0.8 -wall_0_wipe_dist = 0.2 -roofing_layer_count = 1 -top_bottom_thickness = 0.6 -top_thickness = 0.8 -top_layers = 5 -bottom_thickness = 0.6 -bottom_layers = 3 -top_bottom_pattern = lines -top_bottom_pattern_0 = lines -wall_0_inset = 0 -optimize_wall_printing_order = False -alternate_extra_perimeter = False -fill_outline_gaps = True -xy_offset = 0 -skin_no_small_gaps_heuristic = True -skin_outline_count = 1 -ironing_enabled = False -infill_sparse_density = 20 -zig_zaggify_infill = False -infill_multiplier = 1 -infill_wall_line_count = 0 -infill_overlap = 10 -skin_overlap = 5 -infill_wipe_dist = 0.1 -gradual_infill_steps = 0 -infill_before_walls = False -infill_support_enabled = False -max_skin_angle_for_expansion = 90 -default_material_print_temperature = 220 -material_print_temperature = 220 -material_print_temperature_layer_0 = 220 -material_initial_print_temperature = 220 -material_final_print_temperature = 220 -default_material_bed_temperature = 0 -material_bed_temperature = 0 -build_volume_temperature = 0 -material_flow = 100 -retraction_enable = True -retract_at_layer_change = False -retraction_amount = 5 -retraction_speed = 45 -retraction_extra_prime_amount = 0 -retraction_min_travel = 0.8 -retraction_count_max = 90 -retraction_extrusion_window = 5 -limit_support_retractions = True -switch_extruder_retraction_amount = 16 -switch_extruder_retraction_speeds = 20 -speed_print = 30 -speed_travel = 150 -speed_layer_0 = 10 -speed_travel_layer_0 = 50 -speed_slowdown_layers = 2 acceleration_enabled = False acceleration_roofing = 3000 -jerk_enabled = False -retraction_combing = off -travel_retract_before_outer_wall = False -retraction_hop_enabled = False +adhesion_type = skirt +alternate_extra_perimeter = False +bottom_layers = 3 +bottom_thickness = 0.6 +build_volume_temperature = 0 +carve_multiple_volumes = False cool_fan_enabled = True +cool_fan_full_at_height = 0.24 cool_fan_speed = 100 cool_fan_speed_0 = 0 -cool_fan_full_at_height = 0.24 cool_lift_head = False -support_enable = True -support_type = everywhere -support_angle = 50 -support_pattern = grid -support_wall_count = 0 -zig_zaggify_support = False -support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20 -support_infill_angles = [0] -support_brim_enable = True -support_brim_line_count = 5 -support_z_distance = 0.2 -support_xy_distance = 0.7 -support_xy_distance_overhang = 0.2 -support_bottom_stair_step_height = 0.3 -support_bottom_stair_step_width = 5.0 -support_join_distance = 2.0 -support_offset = 0.2 +default_material_bed_temperature = 0 +default_material_print_temperature = 220 +fill_outline_gaps = True +gradual_infill_steps = 0 gradual_support_infill_steps = 0 -support_roof_enable = True -support_bottom_enable = False -support_roof_height = 0.45 -support_roof_density = 45 -support_roof_pattern = lines -support_fan_enable = False -support_use_towers = True -support_tower_diameter = 3 -support_tower_roof_angle = 65 -adhesion_type = skirt -skirt_line_count = 2 -skirt_gap = 3 -meshfix_union_all = True -meshfix_union_all_remove_holes = False +infill_before_walls = False +infill_multiplier = 1 +infill_overlap = 10 +infill_sparse_density = 20 +infill_support_enabled = False +infill_wall_line_count = 0 +infill_wipe_dist = 0.1 +initial_layer_line_width_factor = 100 +ironing_enabled = False +jerk_enabled = False +layer_height = 0.08 +layer_height_0 = 0.24 +limit_support_retractions = True +line_width = 0.4 +material_bed_temperature = 0 +material_final_print_temperature = 220 +material_flow = 100 +material_initial_print_temperature = 220 +material_print_temperature = 220 +material_print_temperature_layer_0 = 220 +max_skin_angle_for_expansion = 90 meshfix_extensive_stitching = False meshfix_keep_open_polygons = False +meshfix_union_all = True +meshfix_union_all_remove_holes = False multiple_mesh_overlap = 0.16 -carve_multiple_volumes = False +optimize_wall_printing_order = False +retract_at_layer_change = False +retraction_amount = 5 +retraction_combing = off +retraction_count_max = 90 +retraction_enable = True +retraction_extra_prime_amount = 0 +retraction_extrusion_window = 5 +retraction_hop_enabled = False +retraction_min_travel = 0.8 +retraction_speed = 45 +roofing_layer_count = 1 +skin_no_small_gaps_heuristic = True +skin_outline_count = 1 +skin_overlap = 5 +skirt_gap = 3 +skirt_line_count = 2 +speed_layer_0 = 10 +speed_print = 30 +speed_slowdown_layers = 2 +speed_travel = 150 +speed_travel_layer_0 = 50 +support_angle = 50 +support_bottom_enable = False +support_bottom_stair_step_height = 0.3 +support_bottom_stair_step_width = 5.0 +support_brim_enable = True +support_brim_line_count = 5 +support_enable = True +support_fan_enable = False +support_infill_angles = [0] +support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20 +support_join_distance = 2.0 +support_offset = 0.2 +support_pattern = grid +support_roof_density = 45 +support_roof_enable = True +support_roof_height = 0.45 +support_roof_pattern = lines +support_tower_diameter = 3 +support_tower_roof_angle = 65 +support_type = everywhere +support_use_towers = True +support_wall_count = 0 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.2 +support_z_distance = 0.2 +switch_extruder_retraction_amount = 16 +switch_extruder_retraction_speeds = 20 +top_bottom_pattern = lines +top_bottom_pattern_0 = lines +top_bottom_thickness = 0.6 +top_layers = 5 +top_thickness = 0.8 +travel_retract_before_outer_wall = False +wall_0_inset = 0 +wall_0_wipe_dist = 0.2 +wall_line_width_0 = 0.4 +wall_thickness = 0.8 +xy_offset = 0 +zig_zaggify_infill = False +zig_zaggify_support = False + diff --git a/resources/quality/key3d/key3d_tyro_fast.inst.cfg b/resources/quality/key3d/key3d_tyro_fast.inst.cfg index bfc155c5cb..aa1e762076 100644 --- a/resources/quality/key3d/key3d_tyro_fast.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_fast.inst.cfg @@ -1,118 +1,119 @@ [general] -version = 4 -name = Fast Quality definition = key3d_tyro +name = Fast Quality +version = 4 [metadata] +global_quality = True +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -1 -global_quality = True [values] -layer_height = 0.24 -layer_height_0 = 0.24 -line_width = 0.4 -initial_layer_line_width_factor = 100 -wall_thickness = 0.8 -wall_0_wipe_dist = 0.2 -roofing_layer_count = 1 -top_bottom_thickness = 0.6 -top_thickness = 0.8 -top_layers = 5 -bottom_thickness = 0.6 -bottom_layers = 3 -top_bottom_pattern = lines -top_bottom_pattern_0 = lines -wall_0_inset = 0 -optimize_wall_printing_order = False -alternate_extra_perimeter = False -fill_outline_gaps = True -xy_offset = 0 -skin_no_small_gaps_heuristic = True -skin_outline_count = 1 -ironing_enabled = False -infill_sparse_density = 15 -zig_zaggify_infill = False -infill_multiplier = 1 -infill_wall_line_count = 0 -infill_overlap = 10 -skin_overlap = 5 -infill_wipe_dist = 0.1 -gradual_infill_steps = 0 -infill_before_walls = False -infill_support_enabled = False -max_skin_angle_for_expansion = 90 -default_material_print_temperature = 220 -material_print_temperature = 220 -material_print_temperature_layer_0 = 220 -material_initial_print_temperature = 220 -material_final_print_temperature = 220 -default_material_bed_temperature = 0 -material_bed_temperature = 0 -build_volume_temperature = 0 -material_flow = 100 -retraction_enable = True -retract_at_layer_change = False -retraction_amount = 5 -retraction_speed = 45 -retraction_extra_prime_amount = 0 -retraction_min_travel = 0.8 -retraction_count_max = 90 -retraction_extrusion_window = 5 -limit_support_retractions = True -switch_extruder_retraction_amount = 16 -switch_extruder_retraction_speeds = 20 -speed_print = 60 -speed_travel = 150 -speed_layer_0 = 10 -speed_travel_layer_0 = 50 -speed_slowdown_layers = 2 acceleration_enabled = False acceleration_roofing = 3000 -jerk_enabled = False -retraction_combing = off -travel_retract_before_outer_wall = False -retraction_hop_enabled = False +adhesion_type = skirt +alternate_extra_perimeter = False +bottom_layers = 3 +bottom_thickness = 0.6 +build_volume_temperature = 0 +carve_multiple_volumes = False cool_fan_enabled = True +cool_fan_full_at_height = 0.48 cool_fan_speed = 100 cool_fan_speed_0 = 0 -cool_fan_full_at_height = 0.48 cool_lift_head = False -support_enable = True -support_type = everywhere -support_angle = 50 -support_pattern = grid -support_wall_count = 0 -zig_zaggify_support = False -support_infill_rate = =15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15 -support_infill_angles = [0] -support_brim_enable = True -support_brim_line_count = 5 -support_z_distance = 0.3 -support_xy_distance = 0.7 -support_xy_distance_overhang = 0.2 -support_bottom_stair_step_height = 0.3 -support_bottom_stair_step_width = 5.0 -support_join_distance = 2.0 -support_offset = 0.2 +default_material_bed_temperature = 0 +default_material_print_temperature = 220 +fill_outline_gaps = True +gradual_infill_steps = 0 gradual_support_infill_steps = 0 -support_roof_enable = True -support_bottom_enable = False -support_roof_height = 0.45 -support_roof_density = 45 -support_roof_pattern = lines -support_fan_enable = False -support_use_towers = True -support_tower_diameter = 3 -support_tower_roof_angle = 65 -adhesion_type = skirt -skirt_line_count = 2 -skirt_gap = 3 -meshfix_union_all = True -meshfix_union_all_remove_holes = False +infill_before_walls = False +infill_multiplier = 1 +infill_overlap = 10 +infill_sparse_density = 15 +infill_support_enabled = False +infill_wall_line_count = 0 +infill_wipe_dist = 0.1 +initial_layer_line_width_factor = 100 +ironing_enabled = False +jerk_enabled = False +layer_height = 0.24 +layer_height_0 = 0.24 +limit_support_retractions = True +line_width = 0.4 +material_bed_temperature = 0 +material_final_print_temperature = 220 +material_flow = 100 +material_initial_print_temperature = 220 +material_print_temperature = 220 +material_print_temperature_layer_0 = 220 +max_skin_angle_for_expansion = 90 meshfix_extensive_stitching = False meshfix_keep_open_polygons = False +meshfix_union_all = True +meshfix_union_all_remove_holes = False multiple_mesh_overlap = 0.16 -carve_multiple_volumes = False +optimize_wall_printing_order = False +retract_at_layer_change = False +retraction_amount = 5 +retraction_combing = off +retraction_count_max = 90 +retraction_enable = True +retraction_extra_prime_amount = 0 +retraction_extrusion_window = 5 +retraction_hop_enabled = False +retraction_min_travel = 0.8 +retraction_speed = 45 +roofing_layer_count = 1 +skin_no_small_gaps_heuristic = True +skin_outline_count = 1 +skin_overlap = 5 +skirt_gap = 3 +skirt_line_count = 2 +speed_layer_0 = 10 +speed_print = 60 +speed_slowdown_layers = 2 +speed_travel = 150 +speed_travel_layer_0 = 50 +support_angle = 50 +support_bottom_enable = False +support_bottom_stair_step_height = 0.3 +support_bottom_stair_step_width = 5.0 +support_brim_enable = True +support_brim_line_count = 5 +support_enable = True +support_fan_enable = False +support_infill_angles = [0] +support_infill_rate = =15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15 +support_join_distance = 2.0 +support_offset = 0.2 +support_pattern = grid +support_roof_density = 45 +support_roof_enable = True +support_roof_height = 0.45 +support_roof_pattern = lines +support_tower_diameter = 3 +support_tower_roof_angle = 65 +support_type = everywhere +support_use_towers = True +support_wall_count = 0 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.2 +support_z_distance = 0.3 +switch_extruder_retraction_amount = 16 +switch_extruder_retraction_speeds = 20 +top_bottom_pattern = lines +top_bottom_pattern_0 = lines +top_bottom_thickness = 0.6 +top_layers = 5 +top_thickness = 0.8 +travel_retract_before_outer_wall = False +wall_0_inset = 0 +wall_0_wipe_dist = 0.2 +wall_thickness = 0.8 +xy_offset = 0 +zig_zaggify_infill = False +zig_zaggify_support = False + diff --git a/resources/quality/key3d/key3d_tyro_normal.inst.cfg b/resources/quality/key3d/key3d_tyro_normal.inst.cfg index 06293319d8..8901631b75 100644 --- a/resources/quality/key3d/key3d_tyro_normal.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_normal.inst.cfg @@ -1,118 +1,119 @@ [general] -version = 4 -name = Normal Quality definition = key3d_tyro +name = Normal Quality +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] -layer_height = 0.16 -layer_height_0 = 0.24 -line_width = 0.4 -initial_layer_line_width_factor = 100 -wall_thickness = 0.8 -wall_0_wipe_dist = 0.2 -roofing_layer_count = 1 -top_bottom_thickness = 0.6 -top_thickness = 0.8 -top_layers = 5 -bottom_thickness = 0.6 -bottom_layers = 3 -top_bottom_pattern = lines -top_bottom_pattern_0 = lines -wall_0_inset = 0 -optimize_wall_printing_order = False -alternate_extra_perimeter = False -fill_outline_gaps = True -xy_offset = 0 -skin_no_small_gaps_heuristic = True -skin_outline_count = 1 -ironing_enabled = False -infill_sparse_density = 20 -zig_zaggify_infill = False -infill_multiplier = 1 -infill_wall_line_count = 0 -infill_overlap = 10 -skin_overlap = 5 -infill_wipe_dist = 0.1 -gradual_infill_steps = 0 -infill_before_walls = False -infill_support_enabled = False -max_skin_angle_for_expansion = 90 -default_material_print_temperature = 220 -material_print_temperature = 220 -material_print_temperature_layer_0 = 220 -material_initial_print_temperature = 220 -material_final_print_temperature = 220 -default_material_bed_temperature = 0 -material_bed_temperature = 0 -build_volume_temperature = 0 -material_flow = 100 -retraction_enable = True -retract_at_layer_change = False -retraction_amount = 5 -retraction_speed = 45 -retraction_extra_prime_amount = 0 -retraction_min_travel = 0.8 -retraction_count_max = 90 -retraction_extrusion_window = 5 -limit_support_retractions = True -switch_extruder_retraction_amount = 16 -switch_extruder_retraction_speeds = 20 -speed_print = 50 -speed_travel = 150 -speed_layer_0 = 10 -speed_travel_layer_0 = 50 -speed_slowdown_layers = 2 acceleration_enabled = False acceleration_roofing = 3000 -jerk_enabled = False -retraction_combing = off -travel_retract_before_outer_wall = False -retraction_hop_enabled = False +adhesion_type = skirt +alternate_extra_perimeter = False +bottom_layers = 3 +bottom_thickness = 0.6 +build_volume_temperature = 0 +carve_multiple_volumes = False cool_fan_enabled = True +cool_fan_full_at_height = 0.32 cool_fan_speed = 100 cool_fan_speed_0 = 0 -cool_fan_full_at_height = 0.32 cool_lift_head = False -support_enable = True -support_type = everywhere -support_angle = 50 -support_pattern = grid -support_wall_count = 0 -zig_zaggify_support = False -support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20 -support_infill_angles = [0] -support_brim_enable = True -support_brim_line_count = 5 -support_z_distance = 0.21 -support_xy_distance = 0.7 -support_xy_distance_overhang = 0.2 -support_bottom_stair_step_height = 0.3 -support_bottom_stair_step_width = 5.0 -support_join_distance = 2.0 -support_offset = 0.2 +default_material_bed_temperature = 0 +default_material_print_temperature = 220 +fill_outline_gaps = True +gradual_infill_steps = 0 gradual_support_infill_steps = 0 -support_roof_enable = True -support_bottom_enable = False -support_roof_height = 0.45 -support_roof_density = 45 -support_roof_pattern = lines -support_fan_enable = False -support_use_towers = True -support_tower_diameter = 3 -support_tower_roof_angle = 65 -adhesion_type = skirt -skirt_line_count = 2 -skirt_gap = 3 -meshfix_union_all = True -meshfix_union_all_remove_holes = False +infill_before_walls = False +infill_multiplier = 1 +infill_overlap = 10 +infill_sparse_density = 20 +infill_support_enabled = False +infill_wall_line_count = 0 +infill_wipe_dist = 0.1 +initial_layer_line_width_factor = 100 +ironing_enabled = False +jerk_enabled = False +layer_height = 0.16 +layer_height_0 = 0.24 +limit_support_retractions = True +line_width = 0.4 +material_bed_temperature = 0 +material_final_print_temperature = 220 +material_flow = 100 +material_initial_print_temperature = 220 +material_print_temperature = 220 +material_print_temperature_layer_0 = 220 +max_skin_angle_for_expansion = 90 meshfix_extensive_stitching = False meshfix_keep_open_polygons = False +meshfix_union_all = True +meshfix_union_all_remove_holes = False multiple_mesh_overlap = 0.16 -carve_multiple_volumes = False +optimize_wall_printing_order = False +retract_at_layer_change = False +retraction_amount = 5 +retraction_combing = off +retraction_count_max = 90 +retraction_enable = True +retraction_extra_prime_amount = 0 +retraction_extrusion_window = 5 +retraction_hop_enabled = False +retraction_min_travel = 0.8 +retraction_speed = 45 +roofing_layer_count = 1 +skin_no_small_gaps_heuristic = True +skin_outline_count = 1 +skin_overlap = 5 +skirt_gap = 3 +skirt_line_count = 2 +speed_layer_0 = 10 +speed_print = 50 +speed_slowdown_layers = 2 +speed_travel = 150 +speed_travel_layer_0 = 50 +support_angle = 50 +support_bottom_enable = False +support_bottom_stair_step_height = 0.3 +support_bottom_stair_step_width = 5.0 +support_brim_enable = True +support_brim_line_count = 5 +support_enable = True +support_fan_enable = False +support_infill_angles = [0] +support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20 +support_join_distance = 2.0 +support_offset = 0.2 +support_pattern = grid +support_roof_density = 45 +support_roof_enable = True +support_roof_height = 0.45 +support_roof_pattern = lines +support_tower_diameter = 3 +support_tower_roof_angle = 65 +support_type = everywhere +support_use_towers = True +support_wall_count = 0 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.2 +support_z_distance = 0.21 +switch_extruder_retraction_amount = 16 +switch_extruder_retraction_speeds = 20 +top_bottom_pattern = lines +top_bottom_pattern_0 = lines +top_bottom_thickness = 0.6 +top_layers = 5 +top_thickness = 0.8 +travel_retract_before_outer_wall = False +wall_0_inset = 0 +wall_0_wipe_dist = 0.2 +wall_thickness = 0.8 +xy_offset = 0 +zig_zaggify_infill = False +zig_zaggify_support = False + diff --git a/resources/quality/kingroon/ABS/kingroon_0.2_ABS_super.inst.cfg b/resources/quality/kingroon/ABS/kingroon_0.2_ABS_super.inst.cfg index d109cb2227..f5986aece3 100644 --- a/resources/quality/kingroon/ABS/kingroon_0.2_ABS_super.inst.cfg +++ b/resources/quality/kingroon/ABS/kingroon_0.2_ABS_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = kingroon_base +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super 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/kingroon/ABS/kingroon_0.2_ABS_ultra.inst.cfg b/resources/quality/kingroon/ABS/kingroon_0.2_ABS_ultra.inst.cfg index ebbefee199..4843bceda2 100644 --- a/resources/quality/kingroon/ABS/kingroon_0.2_ABS_ultra.inst.cfg +++ b/resources/quality/kingroon/ABS/kingroon_0.2_ABS_ultra.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Ultra Quality definition = kingroon_base +name = Ultra Quality +version = 4 [metadata] +material = generic_abs +quality_type = ultra 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/kingroon/ABS/kingroon_0.3_ABS_adaptive.inst.cfg b/resources/quality/kingroon/ABS/kingroon_0.3_ABS_adaptive.inst.cfg index 7e2eb25f0a..4a9b60c0a4 100644 --- a/resources/quality/kingroon/ABS/kingroon_0.3_ABS_adaptive.inst.cfg +++ b/resources/quality/kingroon/ABS/kingroon_0.3_ABS_adaptive.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = kingroon_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_abs +quality_type = adaptive 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/kingroon/ABS/kingroon_0.3_ABS_low.inst.cfg b/resources/quality/kingroon/ABS/kingroon_0.3_ABS_low.inst.cfg index 22bf30f809..728295063a 100644 --- a/resources/quality/kingroon/ABS/kingroon_0.3_ABS_low.inst.cfg +++ b/resources/quality/kingroon/ABS/kingroon_0.3_ABS_low.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = kingroon_base +name = Low Quality +version = 4 [metadata] +material = generic_abs +quality_type = low 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/kingroon/ABS/kingroon_0.3_ABS_standard.inst.cfg b/resources/quality/kingroon/ABS/kingroon_0.3_ABS_standard.inst.cfg index dcdc90630f..2212665f50 100644 --- a/resources/quality/kingroon/ABS/kingroon_0.3_ABS_standard.inst.cfg +++ b/resources/quality/kingroon/ABS/kingroon_0.3_ABS_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = kingroon_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = standard 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/kingroon/ABS/kingroon_0.3_ABS_super.inst.cfg b/resources/quality/kingroon/ABS/kingroon_0.3_ABS_super.inst.cfg index 91a9d59da2..5822c5c159 100644 --- a/resources/quality/kingroon/ABS/kingroon_0.3_ABS_super.inst.cfg +++ b/resources/quality/kingroon/ABS/kingroon_0.3_ABS_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = kingroon_base +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super 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/kingroon/ABS/kingroon_0.4_ABS_adaptive.inst.cfg b/resources/quality/kingroon/ABS/kingroon_0.4_ABS_adaptive.inst.cfg index 118fb76839..71d9af8b18 100644 --- a/resources/quality/kingroon/ABS/kingroon_0.4_ABS_adaptive.inst.cfg +++ b/resources/quality/kingroon/ABS/kingroon_0.4_ABS_adaptive.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = kingroon_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_abs +quality_type = adaptive 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/kingroon/ABS/kingroon_0.4_ABS_low.inst.cfg b/resources/quality/kingroon/ABS/kingroon_0.4_ABS_low.inst.cfg index 72ca7a3c1b..3145131481 100644 --- a/resources/quality/kingroon/ABS/kingroon_0.4_ABS_low.inst.cfg +++ b/resources/quality/kingroon/ABS/kingroon_0.4_ABS_low.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = kingroon_base +name = Low Quality +version = 4 [metadata] +material = generic_abs +quality_type = low 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/kingroon/ABS/kingroon_0.4_ABS_standard.inst.cfg b/resources/quality/kingroon/ABS/kingroon_0.4_ABS_standard.inst.cfg index 32fff4e17b..3f69bbc438 100644 --- a/resources/quality/kingroon/ABS/kingroon_0.4_ABS_standard.inst.cfg +++ b/resources/quality/kingroon/ABS/kingroon_0.4_ABS_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = kingroon_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = standard 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/kingroon/ABS/kingroon_0.4_ABS_super.inst.cfg b/resources/quality/kingroon/ABS/kingroon_0.4_ABS_super.inst.cfg index eddcfd9eb3..858dd871a7 100644 --- a/resources/quality/kingroon/ABS/kingroon_0.4_ABS_super.inst.cfg +++ b/resources/quality/kingroon/ABS/kingroon_0.4_ABS_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = kingroon_base +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super 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/kingroon/ABS/kingroon_0.5_ABS_adaptive.inst.cfg b/resources/quality/kingroon/ABS/kingroon_0.5_ABS_adaptive.inst.cfg index 58409d5a6c..3e8a769011 100644 --- a/resources/quality/kingroon/ABS/kingroon_0.5_ABS_adaptive.inst.cfg +++ b/resources/quality/kingroon/ABS/kingroon_0.5_ABS_adaptive.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = kingroon_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_abs +quality_type = adaptive 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/kingroon/ABS/kingroon_0.5_ABS_low.inst.cfg b/resources/quality/kingroon/ABS/kingroon_0.5_ABS_low.inst.cfg index adde82cc70..2c1ae97c8f 100644 --- a/resources/quality/kingroon/ABS/kingroon_0.5_ABS_low.inst.cfg +++ b/resources/quality/kingroon/ABS/kingroon_0.5_ABS_low.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = kingroon_base +name = Low Quality +version = 4 [metadata] +material = generic_abs +quality_type = low 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/kingroon/ABS/kingroon_0.5_ABS_standard.inst.cfg b/resources/quality/kingroon/ABS/kingroon_0.5_ABS_standard.inst.cfg index 2dba767782..dcc58746f6 100644 --- a/resources/quality/kingroon/ABS/kingroon_0.5_ABS_standard.inst.cfg +++ b/resources/quality/kingroon/ABS/kingroon_0.5_ABS_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = kingroon_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = standard 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/kingroon/ABS/kingroon_0.5_ABS_super.inst.cfg b/resources/quality/kingroon/ABS/kingroon_0.5_ABS_super.inst.cfg index cb321b3199..ccd59a3ebb 100644 --- a/resources/quality/kingroon/ABS/kingroon_0.5_ABS_super.inst.cfg +++ b/resources/quality/kingroon/ABS/kingroon_0.5_ABS_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = kingroon_base +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super 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/kingroon/ABS/kingroon_0.6_ABS_standard.inst.cfg b/resources/quality/kingroon/ABS/kingroon_0.6_ABS_standard.inst.cfg index 380d51b97e..5b88a1a745 100644 --- a/resources/quality/kingroon/ABS/kingroon_0.6_ABS_standard.inst.cfg +++ b/resources/quality/kingroon/ABS/kingroon_0.6_ABS_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = kingroon_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = standard 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/kingroon/ABS/kingroon_0.8_ABS_draft.inst.cfg b/resources/quality/kingroon/ABS/kingroon_0.8_ABS_draft.inst.cfg index 234fc69d4d..30b40e9cbd 100644 --- a/resources/quality/kingroon/ABS/kingroon_0.8_ABS_draft.inst.cfg +++ b/resources/quality/kingroon/ABS/kingroon_0.8_ABS_draft.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = kingroon_base +name = Draft Quality +version = 4 [metadata] +material = generic_abs +quality_type = draft 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/kingroon/ABS/kingroon_1.0_ABS_draft.inst.cfg b/resources/quality/kingroon/ABS/kingroon_1.0_ABS_draft.inst.cfg index 81b14e730b..2a71a5b3f6 100644 --- a/resources/quality/kingroon/ABS/kingroon_1.0_ABS_draft.inst.cfg +++ b/resources/quality/kingroon/ABS/kingroon_1.0_ABS_draft.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = kingroon_base +name = Draft Quality +version = 4 [metadata] +material = generic_abs +quality_type = draft 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/kingroon/PETG/kingroon_0.2_PETG_super.inst.cfg b/resources/quality/kingroon/PETG/kingroon_0.2_PETG_super.inst.cfg index f30d23ba6a..1d87d19a1f 100644 --- a/resources/quality/kingroon/PETG/kingroon_0.2_PETG_super.inst.cfg +++ b/resources/quality/kingroon/PETG/kingroon_0.2_PETG_super.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Super Quality definition = kingroon_base +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super 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 + diff --git a/resources/quality/kingroon/PETG/kingroon_0.2_PETG_ultra.inst.cfg b/resources/quality/kingroon/PETG/kingroon_0.2_PETG_ultra.inst.cfg index f09229b892..e77d52c92a 100644 --- a/resources/quality/kingroon/PETG/kingroon_0.2_PETG_ultra.inst.cfg +++ b/resources/quality/kingroon/PETG/kingroon_0.2_PETG_ultra.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Ultra Quality definition = kingroon_base +name = Ultra Quality +version = 4 [metadata] +material = generic_petg +quality_type = ultra 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 + diff --git a/resources/quality/kingroon/PETG/kingroon_0.3_PETG_adaptive.inst.cfg b/resources/quality/kingroon/PETG/kingroon_0.3_PETG_adaptive.inst.cfg index eec351b01a..fb4c0a0990 100644 --- a/resources/quality/kingroon/PETG/kingroon_0.3_PETG_adaptive.inst.cfg +++ b/resources/quality/kingroon/PETG/kingroon_0.3_PETG_adaptive.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = kingroon_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_petg +quality_type = adaptive 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 + diff --git a/resources/quality/kingroon/PETG/kingroon_0.3_PETG_low.inst.cfg b/resources/quality/kingroon/PETG/kingroon_0.3_PETG_low.inst.cfg index b40a538772..55bd773e5c 100644 --- a/resources/quality/kingroon/PETG/kingroon_0.3_PETG_low.inst.cfg +++ b/resources/quality/kingroon/PETG/kingroon_0.3_PETG_low.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Low Quality definition = kingroon_base +name = Low Quality +version = 4 [metadata] +material = generic_petg +quality_type = low 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 + diff --git a/resources/quality/kingroon/PETG/kingroon_0.3_PETG_standard.inst.cfg b/resources/quality/kingroon/PETG/kingroon_0.3_PETG_standard.inst.cfg index 17bc371da8..5e9238503e 100644 --- a/resources/quality/kingroon/PETG/kingroon_0.3_PETG_standard.inst.cfg +++ b/resources/quality/kingroon/PETG/kingroon_0.3_PETG_standard.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = kingroon_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = standard 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 + diff --git a/resources/quality/kingroon/PETG/kingroon_0.3_PETG_super.inst.cfg b/resources/quality/kingroon/PETG/kingroon_0.3_PETG_super.inst.cfg index 690398403d..d3d9621cad 100644 --- a/resources/quality/kingroon/PETG/kingroon_0.3_PETG_super.inst.cfg +++ b/resources/quality/kingroon/PETG/kingroon_0.3_PETG_super.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Super Quality definition = kingroon_base +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super 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 + diff --git a/resources/quality/kingroon/PETG/kingroon_0.4_PETG_adaptive.inst.cfg b/resources/quality/kingroon/PETG/kingroon_0.4_PETG_adaptive.inst.cfg index 4eceb853ff..6c7cd49fb2 100644 --- a/resources/quality/kingroon/PETG/kingroon_0.4_PETG_adaptive.inst.cfg +++ b/resources/quality/kingroon/PETG/kingroon_0.4_PETG_adaptive.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = kingroon_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_petg +quality_type = adaptive 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 + diff --git a/resources/quality/kingroon/PETG/kingroon_0.4_PETG_low.inst.cfg b/resources/quality/kingroon/PETG/kingroon_0.4_PETG_low.inst.cfg index b70ec0538f..da698ea949 100644 --- a/resources/quality/kingroon/PETG/kingroon_0.4_PETG_low.inst.cfg +++ b/resources/quality/kingroon/PETG/kingroon_0.4_PETG_low.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Low Quality definition = kingroon_base +name = Low Quality +version = 4 [metadata] +material = generic_petg +quality_type = low 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 + diff --git a/resources/quality/kingroon/PETG/kingroon_0.4_PETG_standard.inst.cfg b/resources/quality/kingroon/PETG/kingroon_0.4_PETG_standard.inst.cfg index 852e83add8..b80ce4da35 100644 --- a/resources/quality/kingroon/PETG/kingroon_0.4_PETG_standard.inst.cfg +++ b/resources/quality/kingroon/PETG/kingroon_0.4_PETG_standard.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = kingroon_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = standard 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 + diff --git a/resources/quality/kingroon/PETG/kingroon_0.4_PETG_super.inst.cfg b/resources/quality/kingroon/PETG/kingroon_0.4_PETG_super.inst.cfg index 428644a62a..07ae2c6067 100644 --- a/resources/quality/kingroon/PETG/kingroon_0.4_PETG_super.inst.cfg +++ b/resources/quality/kingroon/PETG/kingroon_0.4_PETG_super.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Super Quality definition = kingroon_base +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super 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 + diff --git a/resources/quality/kingroon/PETG/kingroon_0.5_PETG_adaptive.inst.cfg b/resources/quality/kingroon/PETG/kingroon_0.5_PETG_adaptive.inst.cfg index 465ceb3070..2dd3a86c02 100644 --- a/resources/quality/kingroon/PETG/kingroon_0.5_PETG_adaptive.inst.cfg +++ b/resources/quality/kingroon/PETG/kingroon_0.5_PETG_adaptive.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = kingroon_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_petg +quality_type = adaptive 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 + diff --git a/resources/quality/kingroon/PETG/kingroon_0.5_PETG_low.inst.cfg b/resources/quality/kingroon/PETG/kingroon_0.5_PETG_low.inst.cfg index 2b05d15f74..462f4d9e68 100644 --- a/resources/quality/kingroon/PETG/kingroon_0.5_PETG_low.inst.cfg +++ b/resources/quality/kingroon/PETG/kingroon_0.5_PETG_low.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Low Quality definition = kingroon_base +name = Low Quality +version = 4 [metadata] +material = generic_petg +quality_type = low 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 + diff --git a/resources/quality/kingroon/PETG/kingroon_0.5_PETG_standard.inst.cfg b/resources/quality/kingroon/PETG/kingroon_0.5_PETG_standard.inst.cfg index 9ef42acde3..b1df1538b2 100644 --- a/resources/quality/kingroon/PETG/kingroon_0.5_PETG_standard.inst.cfg +++ b/resources/quality/kingroon/PETG/kingroon_0.5_PETG_standard.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = kingroon_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = standard 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 + diff --git a/resources/quality/kingroon/PETG/kingroon_0.5_PETG_super.inst.cfg b/resources/quality/kingroon/PETG/kingroon_0.5_PETG_super.inst.cfg index 477506576f..8366b301df 100644 --- a/resources/quality/kingroon/PETG/kingroon_0.5_PETG_super.inst.cfg +++ b/resources/quality/kingroon/PETG/kingroon_0.5_PETG_super.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Super Quality definition = kingroon_base +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super 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 + diff --git a/resources/quality/kingroon/PETG/kingroon_0.6_PETG_standard.inst.cfg b/resources/quality/kingroon/PETG/kingroon_0.6_PETG_standard.inst.cfg index cde00aa511..7c492f3e49 100644 --- a/resources/quality/kingroon/PETG/kingroon_0.6_PETG_standard.inst.cfg +++ b/resources/quality/kingroon/PETG/kingroon_0.6_PETG_standard.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = kingroon_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = standard 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 + diff --git a/resources/quality/kingroon/PETG/kingroon_0.8_PETG_draft.inst.cfg b/resources/quality/kingroon/PETG/kingroon_0.8_PETG_draft.inst.cfg index aca8cb49d4..b2da429b53 100644 --- a/resources/quality/kingroon/PETG/kingroon_0.8_PETG_draft.inst.cfg +++ b/resources/quality/kingroon/PETG/kingroon_0.8_PETG_draft.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Draft Quality definition = kingroon_base +name = Draft Quality +version = 4 [metadata] +material = generic_petg +quality_type = draft 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 + diff --git a/resources/quality/kingroon/PETG/kingroon_1.0_PETG_draft.inst.cfg b/resources/quality/kingroon/PETG/kingroon_1.0_PETG_draft.inst.cfg index 5a6ea072d9..7edf5359be 100644 --- a/resources/quality/kingroon/PETG/kingroon_1.0_PETG_draft.inst.cfg +++ b/resources/quality/kingroon/PETG/kingroon_1.0_PETG_draft.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Draft Quality definition = kingroon_base +name = Draft Quality +version = 4 [metadata] +material = generic_petg +quality_type = draft 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 + diff --git a/resources/quality/kingroon/PLA/kingroon_0.2_PLA_super.inst.cfg b/resources/quality/kingroon/PLA/kingroon_0.2_PLA_super.inst.cfg index e9e906d7a1..2629ffa856 100644 --- a/resources/quality/kingroon/PLA/kingroon_0.2_PLA_super.inst.cfg +++ b/resources/quality/kingroon/PLA/kingroon_0.2_PLA_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = kingroon_base +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla variant = 0.2mm Nozzle [values] + diff --git a/resources/quality/kingroon/PLA/kingroon_0.2_PLA_ultra.inst.cfg b/resources/quality/kingroon/PLA/kingroon_0.2_PLA_ultra.inst.cfg index 636eebd521..d2ffb90500 100644 --- a/resources/quality/kingroon/PLA/kingroon_0.2_PLA_ultra.inst.cfg +++ b/resources/quality/kingroon/PLA/kingroon_0.2_PLA_ultra.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Ultra Quality definition = kingroon_base +name = Ultra Quality +version = 4 [metadata] +material = generic_pla +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra -material = generic_pla variant = 0.2mm Nozzle [values] + diff --git a/resources/quality/kingroon/PLA/kingroon_0.3_PLA_adaptive.inst.cfg b/resources/quality/kingroon/PLA/kingroon_0.3_PLA_adaptive.inst.cfg index c2f418c8ba..12678ae92e 100644 --- a/resources/quality/kingroon/PLA/kingroon_0.3_PLA_adaptive.inst.cfg +++ b/resources/quality/kingroon/PLA/kingroon_0.3_PLA_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = kingroon_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_pla +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_pla variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/kingroon/PLA/kingroon_0.3_PLA_low.inst.cfg b/resources/quality/kingroon/PLA/kingroon_0.3_PLA_low.inst.cfg index fdc61cda38..f7c7e3a15c 100644 --- a/resources/quality/kingroon/PLA/kingroon_0.3_PLA_low.inst.cfg +++ b/resources/quality/kingroon/PLA/kingroon_0.3_PLA_low.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low Quality definition = kingroon_base +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/kingroon/PLA/kingroon_0.3_PLA_standard.inst.cfg b/resources/quality/kingroon/PLA/kingroon_0.3_PLA_standard.inst.cfg index 9ca11a7027..7e8f740cc4 100644 --- a/resources/quality/kingroon/PLA/kingroon_0.3_PLA_standard.inst.cfg +++ b/resources/quality/kingroon/PLA/kingroon_0.3_PLA_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = kingroon_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_pla variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/kingroon/PLA/kingroon_0.3_PLA_super.inst.cfg b/resources/quality/kingroon/PLA/kingroon_0.3_PLA_super.inst.cfg index f689be5979..f4c40f4c2d 100644 --- a/resources/quality/kingroon/PLA/kingroon_0.3_PLA_super.inst.cfg +++ b/resources/quality/kingroon/PLA/kingroon_0.3_PLA_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = kingroon_base +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/kingroon/PLA/kingroon_0.4_PLA_adaptive.inst.cfg b/resources/quality/kingroon/PLA/kingroon_0.4_PLA_adaptive.inst.cfg index 8a52537d6c..5aaf093e28 100644 --- a/resources/quality/kingroon/PLA/kingroon_0.4_PLA_adaptive.inst.cfg +++ b/resources/quality/kingroon/PLA/kingroon_0.4_PLA_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = kingroon_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_pla +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_pla variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/kingroon/PLA/kingroon_0.4_PLA_low.inst.cfg b/resources/quality/kingroon/PLA/kingroon_0.4_PLA_low.inst.cfg index 3503e7b784..ba6f01da3f 100644 --- a/resources/quality/kingroon/PLA/kingroon_0.4_PLA_low.inst.cfg +++ b/resources/quality/kingroon/PLA/kingroon_0.4_PLA_low.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low Quality definition = kingroon_base +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/kingroon/PLA/kingroon_0.4_PLA_standard.inst.cfg b/resources/quality/kingroon/PLA/kingroon_0.4_PLA_standard.inst.cfg index e39cf7dc98..63c1dd29aa 100644 --- a/resources/quality/kingroon/PLA/kingroon_0.4_PLA_standard.inst.cfg +++ b/resources/quality/kingroon/PLA/kingroon_0.4_PLA_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = kingroon_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_pla variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/kingroon/PLA/kingroon_0.4_PLA_super.inst.cfg b/resources/quality/kingroon/PLA/kingroon_0.4_PLA_super.inst.cfg index fe26d8db8a..c88e98c261 100644 --- a/resources/quality/kingroon/PLA/kingroon_0.4_PLA_super.inst.cfg +++ b/resources/quality/kingroon/PLA/kingroon_0.4_PLA_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = kingroon_base +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/kingroon/PLA/kingroon_0.5_PLA_adaptive.inst.cfg b/resources/quality/kingroon/PLA/kingroon_0.5_PLA_adaptive.inst.cfg index 9f3640bfbc..63dddce608 100644 --- a/resources/quality/kingroon/PLA/kingroon_0.5_PLA_adaptive.inst.cfg +++ b/resources/quality/kingroon/PLA/kingroon_0.5_PLA_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = kingroon_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_pla +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_pla variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/kingroon/PLA/kingroon_0.5_PLA_low.inst.cfg b/resources/quality/kingroon/PLA/kingroon_0.5_PLA_low.inst.cfg index 78a52ddf98..e9433cece9 100644 --- a/resources/quality/kingroon/PLA/kingroon_0.5_PLA_low.inst.cfg +++ b/resources/quality/kingroon/PLA/kingroon_0.5_PLA_low.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low Quality definition = kingroon_base +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/kingroon/PLA/kingroon_0.5_PLA_standard.inst.cfg b/resources/quality/kingroon/PLA/kingroon_0.5_PLA_standard.inst.cfg index 788b09df38..d905cd9513 100644 --- a/resources/quality/kingroon/PLA/kingroon_0.5_PLA_standard.inst.cfg +++ b/resources/quality/kingroon/PLA/kingroon_0.5_PLA_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = kingroon_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_pla variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/kingroon/PLA/kingroon_0.5_PLA_super.inst.cfg b/resources/quality/kingroon/PLA/kingroon_0.5_PLA_super.inst.cfg index ba8bced2cd..da25445afd 100644 --- a/resources/quality/kingroon/PLA/kingroon_0.5_PLA_super.inst.cfg +++ b/resources/quality/kingroon/PLA/kingroon_0.5_PLA_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = kingroon_base +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/kingroon/PLA/kingroon_0.6_PLA_draft.inst.cfg b/resources/quality/kingroon/PLA/kingroon_0.6_PLA_draft.inst.cfg index 3991169f5a..da84b6bb41 100644 --- a/resources/quality/kingroon/PLA/kingroon_0.6_PLA_draft.inst.cfg +++ b/resources/quality/kingroon/PLA/kingroon_0.6_PLA_draft.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = kingroon_base +name = Draft Quality +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_pla variant = 0.6mm Nozzle [values] + diff --git a/resources/quality/kingroon/PLA/kingroon_0.6_PLA_low.inst.cfg b/resources/quality/kingroon/PLA/kingroon_0.6_PLA_low.inst.cfg index 76f5107cdd..00bc0e8665 100644 --- a/resources/quality/kingroon/PLA/kingroon_0.6_PLA_low.inst.cfg +++ b/resources/quality/kingroon/PLA/kingroon_0.6_PLA_low.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low Quality definition = kingroon_base +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla variant = 0.6mm Nozzle [values] + diff --git a/resources/quality/kingroon/PLA/kingroon_0.6_PLA_standard.inst.cfg b/resources/quality/kingroon/PLA/kingroon_0.6_PLA_standard.inst.cfg index ce66046f90..365bf14102 100644 --- a/resources/quality/kingroon/PLA/kingroon_0.6_PLA_standard.inst.cfg +++ b/resources/quality/kingroon/PLA/kingroon_0.6_PLA_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = kingroon_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_pla variant = 0.6mm Nozzle [values] + diff --git a/resources/quality/kingroon/PLA/kingroon_0.8_PLA_draft.inst.cfg b/resources/quality/kingroon/PLA/kingroon_0.8_PLA_draft.inst.cfg index 28421a1513..cd4e4212ee 100644 --- a/resources/quality/kingroon/PLA/kingroon_0.8_PLA_draft.inst.cfg +++ b/resources/quality/kingroon/PLA/kingroon_0.8_PLA_draft.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = kingroon_base +name = Draft Quality +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_pla variant = 0.8mm Nozzle [values] + diff --git a/resources/quality/kingroon/PLA/kingroon_1.0_PLA_draft.inst.cfg b/resources/quality/kingroon/PLA/kingroon_1.0_PLA_draft.inst.cfg index e7a16b06c7..424d53eb8b 100644 --- a/resources/quality/kingroon/PLA/kingroon_1.0_PLA_draft.inst.cfg +++ b/resources/quality/kingroon/PLA/kingroon_1.0_PLA_draft.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = kingroon_base +name = Draft Quality +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_pla variant = 1.0mm Nozzle [values] + diff --git a/resources/quality/kingroon/TPU/kingroon_0.3_TPU_adaptive.inst.cfg b/resources/quality/kingroon/TPU/kingroon_0.3_TPU_adaptive.inst.cfg index f86f6b470d..52e3ea1416 100644 --- a/resources/quality/kingroon/TPU/kingroon_0.3_TPU_adaptive.inst.cfg +++ b/resources/quality/kingroon/TPU/kingroon_0.3_TPU_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = kingroon_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_tpu +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_tpu variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/kingroon/TPU/kingroon_0.3_TPU_standard.inst.cfg b/resources/quality/kingroon/TPU/kingroon_0.3_TPU_standard.inst.cfg index 1b1565fd7e..9c045853c2 100644 --- a/resources/quality/kingroon/TPU/kingroon_0.3_TPU_standard.inst.cfg +++ b/resources/quality/kingroon/TPU/kingroon_0.3_TPU_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = kingroon_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_tpu variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/kingroon/TPU/kingroon_0.3_TPU_super.inst.cfg b/resources/quality/kingroon/TPU/kingroon_0.3_TPU_super.inst.cfg index 5f37ed7749..2d8a7a9c7b 100644 --- a/resources/quality/kingroon/TPU/kingroon_0.3_TPU_super.inst.cfg +++ b/resources/quality/kingroon/TPU/kingroon_0.3_TPU_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = kingroon_base +name = Super Quality +version = 4 [metadata] +material = generic_tpu +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_tpu variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/kingroon/TPU/kingroon_0.4_TPU_adaptive.inst.cfg b/resources/quality/kingroon/TPU/kingroon_0.4_TPU_adaptive.inst.cfg index 8ba5abef53..7875bc0704 100644 --- a/resources/quality/kingroon/TPU/kingroon_0.4_TPU_adaptive.inst.cfg +++ b/resources/quality/kingroon/TPU/kingroon_0.4_TPU_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = kingroon_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_tpu +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_tpu variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/kingroon/TPU/kingroon_0.4_TPU_standard.inst.cfg b/resources/quality/kingroon/TPU/kingroon_0.4_TPU_standard.inst.cfg index 69e57121f2..fed93c7162 100644 --- a/resources/quality/kingroon/TPU/kingroon_0.4_TPU_standard.inst.cfg +++ b/resources/quality/kingroon/TPU/kingroon_0.4_TPU_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = kingroon_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_tpu variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/kingroon/TPU/kingroon_0.4_TPU_super.inst.cfg b/resources/quality/kingroon/TPU/kingroon_0.4_TPU_super.inst.cfg index 8addcebc1f..2c7e74ad2e 100644 --- a/resources/quality/kingroon/TPU/kingroon_0.4_TPU_super.inst.cfg +++ b/resources/quality/kingroon/TPU/kingroon_0.4_TPU_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = kingroon_base +name = Super Quality +version = 4 [metadata] +material = generic_tpu +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_tpu variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/kingroon/TPU/kingroon_0.5_TPU_adaptive.inst.cfg b/resources/quality/kingroon/TPU/kingroon_0.5_TPU_adaptive.inst.cfg index d3c697091f..96ea42f10c 100644 --- a/resources/quality/kingroon/TPU/kingroon_0.5_TPU_adaptive.inst.cfg +++ b/resources/quality/kingroon/TPU/kingroon_0.5_TPU_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = kingroon_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_tpu +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_tpu variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/kingroon/TPU/kingroon_0.5_TPU_standard.inst.cfg b/resources/quality/kingroon/TPU/kingroon_0.5_TPU_standard.inst.cfg index 6f20b95722..30daddf9c2 100644 --- a/resources/quality/kingroon/TPU/kingroon_0.5_TPU_standard.inst.cfg +++ b/resources/quality/kingroon/TPU/kingroon_0.5_TPU_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = kingroon_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_tpu variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/kingroon/TPU/kingroon_0.5_TPU_super.inst.cfg b/resources/quality/kingroon/TPU/kingroon_0.5_TPU_super.inst.cfg index 00e204ee65..8cd7c44c86 100644 --- a/resources/quality/kingroon/TPU/kingroon_0.5_TPU_super.inst.cfg +++ b/resources/quality/kingroon/TPU/kingroon_0.5_TPU_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = kingroon_base +name = Super Quality +version = 4 [metadata] +material = generic_tpu +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_tpu variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/kingroon/TPU/kingroon_0.6_TPU_standard.inst.cfg b/resources/quality/kingroon/TPU/kingroon_0.6_TPU_standard.inst.cfg index 1bc445c1ff..9d0aef9119 100644 --- a/resources/quality/kingroon/TPU/kingroon_0.6_TPU_standard.inst.cfg +++ b/resources/quality/kingroon/TPU/kingroon_0.6_TPU_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = kingroon_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_tpu variant = 0.6mm Nozzle [values] + diff --git a/resources/quality/kingroon/TPU/kingroon_0.8_TPU_draft.inst.cfg b/resources/quality/kingroon/TPU/kingroon_0.8_TPU_draft.inst.cfg index cbea0a8307..f95414492f 100644 --- a/resources/quality/kingroon/TPU/kingroon_0.8_TPU_draft.inst.cfg +++ b/resources/quality/kingroon/TPU/kingroon_0.8_TPU_draft.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = kingroon_base +name = Draft Quality +version = 4 [metadata] +material = generic_tpu +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_tpu variant = 0.8mm Nozzle [values] + diff --git a/resources/quality/kingroon/TPU/kingroon_1.0_TPU_draft.inst.cfg b/resources/quality/kingroon/TPU/kingroon_1.0_TPU_draft.inst.cfg index 7bb373d68a..8c3f3226b0 100644 --- a/resources/quality/kingroon/TPU/kingroon_1.0_TPU_draft.inst.cfg +++ b/resources/quality/kingroon/TPU/kingroon_1.0_TPU_draft.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = kingroon_base +name = Draft Quality +version = 4 [metadata] +material = generic_tpu +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_tpu variant = 1.0mm Nozzle [values] + diff --git a/resources/quality/kingroon/kingroon_global_adaptive.inst.cfg b/resources/quality/kingroon/kingroon_global_adaptive.inst.cfg index 9a7c3d1637..0da901fa56 100644 --- a/resources/quality/kingroon/kingroon_global_adaptive.inst.cfg +++ b/resources/quality/kingroon/kingroon_global_adaptive.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Dynamic Quality definition = kingroon_base +name = Dynamic Quality +version = 4 [metadata] +global_quality = True +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive weight = -2 -global_quality = True [values] +adaptive_layer_height_enabled = true layer_height = 0.16 layer_height_0 = 0.20 +support_interface_height = =layer_height*6 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/kingroon/kingroon_global_draft.inst.cfg b/resources/quality/kingroon/kingroon_global_draft.inst.cfg index 8dbcd492ee..4b8a32caf3 100644 --- a/resources/quality/kingroon/kingroon_global_draft.inst.cfg +++ b/resources/quality/kingroon/kingroon_global_draft.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Draft Quality definition = kingroon_base +name = Draft Quality +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -5 -global_quality = True [values] layer_height = 0.32 layer_height_0 = 0.32 +support_interface_height = =layer_height*4 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/kingroon/kingroon_global_low.inst.cfg b/resources/quality/kingroon/kingroon_global_low.inst.cfg index 4d80829296..8e774f81aa 100644 --- a/resources/quality/kingroon/kingroon_global_low.inst.cfg +++ b/resources/quality/kingroon/kingroon_global_low.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Low Quality definition = kingroon_base +name = Low Quality +version = 4 [metadata] +global_quality = True +quality_type = low setting_version = 20 type = quality -quality_type = low weight = -4 -global_quality = True [values] layer_height = 0.28 layer_height_0 = 0.28 +support_interface_height = =layer_height*4 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/kingroon/kingroon_global_standard.inst.cfg b/resources/quality/kingroon/kingroon_global_standard.inst.cfg index 18d10a1a90..4803784564 100644 --- a/resources/quality/kingroon/kingroon_global_standard.inst.cfg +++ b/resources/quality/kingroon/kingroon_global_standard.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Standard Quality definition = kingroon_base +name = Standard Quality +version = 4 [metadata] +global_quality = True +quality_type = standard setting_version = 20 type = quality -quality_type = standard weight = -3 -global_quality = True [values] layer_height = 0.2 layer_height_0 = 0.2 +support_interface_height = =layer_height*5 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/kingroon/kingroon_global_super.inst.cfg b/resources/quality/kingroon/kingroon_global_super.inst.cfg index 7b825abe0e..83f943ea26 100644 --- a/resources/quality/kingroon/kingroon_global_super.inst.cfg +++ b/resources/quality/kingroon/kingroon_global_super.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Super Quality definition = kingroon_base +name = Super Quality +version = 4 [metadata] +global_quality = True +quality_type = super setting_version = 20 type = quality -quality_type = super weight = -1 -global_quality = True [values] layer_height = 0.12 layer_height_0 = 0.12 +support_interface_height = =layer_height*8 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/kingroon/kingroon_global_ultra.inst.cfg b/resources/quality/kingroon/kingroon_global_ultra.inst.cfg index add210d87d..105a8bdc3b 100644 --- a/resources/quality/kingroon/kingroon_global_ultra.inst.cfg +++ b/resources/quality/kingroon/kingroon_global_ultra.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Ultra Quality definition = kingroon_base +name = Ultra Quality +version = 4 [metadata] +global_quality = True +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra weight = 0 -global_quality = True [values] layer_height = 0.08 layer_height_0 = 0.12 +support_interface_height = =layer_height*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/koonovo/koonovo_base_global_draft.inst.cfg b/resources/quality/koonovo/koonovo_base_global_draft.inst.cfg index 0fc2a6fb6b..b8eccda163 100644 --- a/resources/quality/koonovo/koonovo_base_global_draft.inst.cfg +++ b/resources/quality/koonovo/koonovo_base_global_draft.inst.cfg @@ -1,17 +1,18 @@ -[general] -version = 4 -name = Draft Quality -definition = koonovo_base - -[metadata] -setting_version = 20 -type = quality -quality_type = draft -global_quality = True - -[values] -layer_height = 0.25 -layer_height_0 = 0.25 -top_bottom_thickness = =layer_height_0+layer_height*3 -wall_thickness = =line_width*2 -support_interface_height = =layer_height*4 +[general] +definition = koonovo_base +name = Draft Quality +version = 4 + +[metadata] +global_quality = True +quality_type = draft +setting_version = 20 +type = quality + +[values] +layer_height = 0.25 +layer_height_0 = 0.25 +support_interface_height = =layer_height*4 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 + diff --git a/resources/quality/koonovo/koonovo_base_global_standard.inst.cfg b/resources/quality/koonovo/koonovo_base_global_standard.inst.cfg index ac3843c972..74ce2eb07e 100644 --- a/resources/quality/koonovo/koonovo_base_global_standard.inst.cfg +++ b/resources/quality/koonovo/koonovo_base_global_standard.inst.cfg @@ -1,18 +1,19 @@ -[general] -version = 4 -name = Standard Quality -definition = koonovo_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 +[general] +definition = koonovo_base +name = Standard Quality +version = 4 + +[metadata] +global_quality = True +quality_type = standard +setting_version = 20 +type = quality +weight = -3 + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 +support_interface_height = =layer_height*4 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 + diff --git a/resources/quality/koonovo/koovono_base_global_high.inst.cfg b/resources/quality/koonovo/koovono_base_global_high.inst.cfg index 05d4dc206a..7f3b90d19d 100644 --- a/resources/quality/koonovo/koovono_base_global_high.inst.cfg +++ b/resources/quality/koonovo/koovono_base_global_high.inst.cfg @@ -1,18 +1,19 @@ -[general] -version = 4 -name = Super Quality -definition = koonovo_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 +[general] +definition = koonovo_base +name = Super Quality +version = 4 + +[metadata] +global_quality = True +quality_type = high +setting_version = 20 +type = quality +weight = -1 + +[values] +layer_height = 0.12 +layer_height_0 = 0.12 +support_interface_height = =layer_height*8 +top_bottom_thickness = =layer_height_0+layer_height*6 +wall_thickness = =line_width*3 + diff --git a/resources/quality/liquid/liquid_global_Draft_Quality.inst.cfg b/resources/quality/liquid/liquid_global_Draft_Quality.inst.cfg index 88609bcbfa..50e0c172f8 100644 --- a/resources/quality/liquid/liquid_global_Draft_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_global_Draft_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Fast definition = liquid +name = Fast +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] layer_height = 0.2 + diff --git a/resources/quality/liquid/liquid_global_Fast_Quality.inst.cfg b/resources/quality/liquid/liquid_global_Fast_Quality.inst.cfg index a9105f6485..40cbb30a62 100644 --- a/resources/quality/liquid/liquid_global_Fast_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_global_Fast_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Normal definition = liquid +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -1 -global_quality = True [values] layer_height = 0.15 + diff --git a/resources/quality/liquid/liquid_global_High_Quality.inst.cfg b/resources/quality/liquid/liquid_global_High_Quality.inst.cfg index 3261cd4f44..6add90a1d4 100644 --- a/resources/quality/liquid/liquid_global_High_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_global_High_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = liquid +name = Extra Fine +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -global_quality = True [values] layer_height = 0.06 + diff --git a/resources/quality/liquid/liquid_global_Normal_Quality.inst.cfg b/resources/quality/liquid/liquid_global_Normal_Quality.inst.cfg index 2a60625f2e..92c974e18b 100644 --- a/resources/quality/liquid/liquid_global_Normal_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_global_Normal_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Fine definition = liquid +name = Fine +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] layer_height = 0.1 + diff --git a/resources/quality/liquid/liquid_global_Superdraft_Quality.inst.cfg b/resources/quality/liquid/liquid_global_Superdraft_Quality.inst.cfg index cfe95c7341..5ddeaf7291 100644 --- a/resources/quality/liquid/liquid_global_Superdraft_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_global_Superdraft_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Sprint definition = liquid +name = Sprint +version = 4 [metadata] +global_quality = True +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft weight = -4 -global_quality = True [values] layer_height = 0.4 + diff --git a/resources/quality/liquid/liquid_global_Verydraft_Quality.inst.cfg b/resources/quality/liquid/liquid_global_Verydraft_Quality.inst.cfg index f06b44fd7b..6b7f732ccb 100644 --- a/resources/quality/liquid/liquid_global_Verydraft_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_global_Verydraft_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Extra Fast definition = liquid +name = Extra Fast +version = 4 [metadata] +global_quality = True +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft weight = -3 -global_quality = True [values] layer_height = 0.3 + diff --git a/resources/quality/liquid/liquid_vo0.4_ABS_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_ABS_Draft_Print.inst.cfg index 348665dc50..12dcd51e5d 100644 --- a/resources/quality/liquid/liquid_vo0.4_ABS_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_ABS_Draft_Print.inst.cfg @@ -1,31 +1,30 @@ [general] -version = 4 -name = Fast definition = liquid +name = Fast +version = 4 [metadata] +material = generic_abs +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_abs variant = VO 0.4 +weight = -2 [values] +infill_line_width = =round(line_width * 0.4 / 0.35, 2) 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 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) wall_thickness = 1 -infill_line_width = =round(line_width * 0.4 / 0.35, 2) -speed_infill = =math.ceil(speed_print * 50 / 60) - diff --git a/resources/quality/liquid/liquid_vo0.4_ABS_Fast_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_ABS_Fast_Print.inst.cfg index d1511e7907..a92e00e684 100644 --- a/resources/quality/liquid/liquid_vo0.4_ABS_Fast_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_ABS_Fast_Print.inst.cfg @@ -1,30 +1,29 @@ [general] -version = 4 -name = Normal definition = liquid +name = Normal +version = 4 [metadata] +material = generic_abs +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_abs variant = VO 0.4 +weight = -1 [values] cool_min_speed = 7 +infill_line_width = =round(line_width * 0.4 / 0.35, 2) 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 +speed_infill = =math.ceil(speed_print * 45 / 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_line_width = =round(line_width * 0.4 / 0.35, 2) -speed_infill = =math.ceil(speed_print * 45 / 60) - diff --git a/resources/quality/liquid/liquid_vo0.4_ABS_High_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_ABS_High_Quality.inst.cfg index c9395452d5..51a520a529 100644 --- a/resources/quality/liquid/liquid_vo0.4_ABS_High_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_ABS_High_Quality.inst.cfg @@ -1,29 +1,28 @@ [general] -version = 4 -name = Extra Fine definition = liquid +name = Extra Fine +version = 4 [metadata] +material = generic_abs +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_abs variant = VO 0.4 +weight = 1 [values] cool_min_speed = 12 +infill_line_width = =round(line_width * 0.4 / 0.35, 2) 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 +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_line_width = =round(line_width * 0.4 / 0.35, 2) -speed_infill = =math.ceil(speed_print * 40 / 50) - diff --git a/resources/quality/liquid/liquid_vo0.4_ABS_Normal_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_ABS_Normal_Quality.inst.cfg index 7ab043eccf..74e3c7735f 100644 --- a/resources/quality/liquid/liquid_vo0.4_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_ABS_Normal_Quality.inst.cfg @@ -1,27 +1,27 @@ [general] -version = 4 -name = Fine definition = liquid +name = Fine +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_abs variant = VO 0.4 +weight = 0 [values] +infill_line_width = =round(line_width * 0.4 / 0.35, 2) 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 +speed_infill = =math.ceil(speed_print * 40 / 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_line_width = =round(line_width * 0.4 / 0.35, 2) -speed_infill = =math.ceil(speed_print * 40 / 55) diff --git a/resources/quality/liquid/liquid_vo0.4_CPE_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_CPE_Draft_Print.inst.cfg index f62016d6ed..d58e736ad9 100644 --- a/resources/quality/liquid/liquid_vo0.4_CPE_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_CPE_Draft_Print.inst.cfg @@ -1,28 +1,28 @@ [general] -version = 4 -name = Fast definition = liquid +name = Fast +version = 4 [metadata] +material = generic_cpe +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_cpe variant = VO 0.4 +weight = -2 [values] -material_print_temperature = =default_material_print_temperature + 10 -material_initial_print_temperature = =material_print_temperature - 5 +infill_pattern = 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 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) wall_thickness = 1 -infill_pattern = triangles -speed_infill = =math.ceil(speed_print * 50 / 60) diff --git a/resources/quality/liquid/liquid_vo0.4_CPE_Fast_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_CPE_Fast_Print.inst.cfg index 0e536f2935..b1101ab295 100644 --- a/resources/quality/liquid/liquid_vo0.4_CPE_Fast_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_CPE_Fast_Print.inst.cfg @@ -1,27 +1,27 @@ [general] -version = 4 -name = Normal definition = liquid +name = Normal +version = 4 [metadata] +material = generic_cpe +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_cpe variant = VO 0.4 +weight = -1 [values] cool_min_speed = 7 -material_print_temperature = =default_material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature - 5 +infill_pattern = 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 -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 = triangles -speed_infill = =math.ceil(speed_print * 50 / 60) \ No newline at end of file diff --git a/resources/quality/liquid/liquid_vo0.4_CPE_High_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_CPE_High_Quality.inst.cfg index e066b88082..cc7a356023 100644 --- a/resources/quality/liquid/liquid_vo0.4_CPE_High_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_CPE_High_Quality.inst.cfg @@ -1,28 +1,28 @@ [general] -version = 4 -name = Extra Fine definition = liquid +name = Extra Fine +version = 4 [metadata] +material = generic_cpe +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_cpe variant = VO 0.4 +weight = 1 [values] cool_min_speed = 12 +infill_pattern = 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 -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 = triangles -speed_infill = =math.ceil(speed_print * 40 / 50) \ No newline at end of file diff --git a/resources/quality/liquid/liquid_vo0.4_CPE_Normal_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_CPE_Normal_Quality.inst.cfg index eed9bb563c..14d3854594 100644 --- a/resources/quality/liquid/liquid_vo0.4_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_CPE_Normal_Quality.inst.cfg @@ -1,26 +1,26 @@ [general] -version = 4 -name = Fine definition = liquid +name = Fine +version = 4 [metadata] +material = generic_cpe +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_cpe variant = VO 0.4 +weight = 0 [values] +infill_pattern = 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 -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 = triangles -speed_infill = =math.ceil(speed_print * 45 / 55) \ No newline at end of file diff --git a/resources/quality/liquid/liquid_vo0.4_Nylon_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_Nylon_Draft_Print.inst.cfg index 945957e1fa..740f51973d 100644 --- a/resources/quality/liquid/liquid_vo0.4_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_Nylon_Draft_Print.inst.cfg @@ -1,25 +1,26 @@ [general] -version = 4 -name = Fast definition = liquid +name = Fast +version = 4 [metadata] +material = generic_nylon +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_nylon variant = VO 0.4 +weight = -2 [values] adhesion_type = brim cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 infill_line_width = =round(line_width * 0.5 / 0.4, 2) +jerk_travel = 20 line_width = =machine_nozzle_size -material_print_temperature = =default_material_print_temperature + 10 -material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature = =default_material_print_temperature + 10 material_standby_temperature = 100 ooze_shield_angle = 40 raft_acceleration = =acceleration_layer_0 @@ -35,4 +36,3 @@ switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 wall_line_width_x = =wall_line_width -jerk_travel = 20 diff --git a/resources/quality/liquid/liquid_vo0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_Nylon_Fast_Print.inst.cfg index c276d703aa..da8251a3fa 100644 --- a/resources/quality/liquid/liquid_vo0.4_Nylon_Fast_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_Nylon_Fast_Print.inst.cfg @@ -1,25 +1,26 @@ [general] -version = 4 -name = Normal definition = liquid +name = Normal +version = 4 [metadata] +material = generic_nylon +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_nylon variant = VO 0.4 +weight = -1 [values] adhesion_type = brim cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 infill_line_width = =round(line_width * 0.5 / 0.4, 2) +jerk_travel = 20 line_width = =machine_nozzle_size -material_print_temperature = =default_material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature = =default_material_print_temperature + 5 material_standby_temperature = 100 ooze_shield_angle = 40 raft_acceleration = =acceleration_layer_0 @@ -35,4 +36,3 @@ switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 wall_line_width_x = =wall_line_width -jerk_travel = 20 diff --git a/resources/quality/liquid/liquid_vo0.4_Nylon_High_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_Nylon_High_Quality.inst.cfg index b084a33478..98ee2ef17d 100644 --- a/resources/quality/liquid/liquid_vo0.4_Nylon_High_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_Nylon_High_Quality.inst.cfg @@ -1,24 +1,25 @@ [general] -version = 4 -name = Extra Fine definition = liquid +name = Extra Fine +version = 4 [metadata] +material = generic_nylon +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_nylon variant = VO 0.4 +weight = 1 [values] adhesion_type = brim cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 15 infill_line_width = =round(line_width * 0.5 / 0.4, 2) +jerk_travel = 20 line_width = =machine_nozzle_size -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_standby_temperature = 100 ooze_shield_angle = 40 raft_acceleration = =acceleration_layer_0 @@ -34,4 +35,3 @@ switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 wall_line_width_x = =wall_line_width -jerk_travel = 20 diff --git a/resources/quality/liquid/liquid_vo0.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_Nylon_Normal_Quality.inst.cfg index a566abe46e..0a8dd0b310 100644 --- a/resources/quality/liquid/liquid_vo0.4_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_Nylon_Normal_Quality.inst.cfg @@ -1,24 +1,25 @@ [general] -version = 4 -name = Fine definition = liquid +name = Fine +version = 4 [metadata] +material = generic_nylon +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_nylon variant = VO 0.4 +weight = 0 [values] adhesion_type = brim cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 12 infill_line_width = =round(line_width * 0.5 / 0.4, 2) +jerk_travel = 20 line_width = =machine_nozzle_size -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_standby_temperature = 100 ooze_shield_angle = 40 raft_acceleration = =acceleration_layer_0 @@ -34,4 +35,3 @@ switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 wall_line_width_x = =wall_line_width -jerk_travel = 20 diff --git a/resources/quality/liquid/liquid_vo0.4_PC_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PC_Draft_Print.inst.cfg index af4457e606..2ece0b433c 100644 --- a/resources/quality/liquid/liquid_vo0.4_PC_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PC_Draft_Print.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = liquid +name = Fast +version = 4 [metadata] +material = generic_pc +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pc variant = VO 0.4 +weight = -2 [values] acceleration_enabled = True @@ -61,3 +61,4 @@ switch_extruder_retraction_speeds = 35 wall_0_inset = 0 wall_line_width_x = =round(line_width * 0.4 / 0.35, 2) wall_thickness = 1.2 + diff --git a/resources/quality/liquid/liquid_vo0.4_PC_Fast_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PC_Fast_Print.inst.cfg index e9ee45eac7..61b9a0cebb 100644 --- a/resources/quality/liquid/liquid_vo0.4_PC_Fast_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PC_Fast_Print.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = liquid +name = Normal +version = 4 [metadata] +material = generic_pc +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_pc variant = VO 0.4 +weight = -1 [values] acceleration_enabled = True @@ -49,7 +49,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_bottom_distance = =support_z_distance @@ -61,3 +60,4 @@ switch_extruder_retraction_speeds = 35 wall_0_inset = 0 wall_line_width_x = =round(line_width * 0.4 / 0.35, 2) wall_thickness = 1.2 + diff --git a/resources/quality/liquid/liquid_vo0.4_PC_High_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PC_High_Quality.inst.cfg index ce5ef3353c..fe3cdbbd22 100644 --- a/resources/quality/liquid/liquid_vo0.4_PC_High_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PC_High_Quality.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = liquid +name = Extra Fine +version = 4 [metadata] +material = generic_pc +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pc variant = VO 0.4 +weight = 1 [values] acceleration_enabled = True @@ -50,7 +50,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_bottom_distance = =support_z_distance @@ -62,3 +61,4 @@ switch_extruder_retraction_speeds = 35 wall_0_inset = 0 wall_line_width_x = =round(line_width * 0.4 / 0.35, 2) wall_thickness = 1.2 + diff --git a/resources/quality/liquid/liquid_vo0.4_PC_Normal_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PC_Normal_Quality.inst.cfg index bb74a493a1..c54f18ea60 100644 --- a/resources/quality/liquid/liquid_vo0.4_PC_Normal_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PC_Normal_Quality.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = liquid +name = Fine +version = 4 [metadata] +material = generic_pc +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pc variant = VO 0.4 +weight = 0 [values] acceleration_enabled = True @@ -48,7 +48,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_bottom_distance = =support_z_distance @@ -60,3 +59,4 @@ switch_extruder_retraction_speeds = 35 wall_0_inset = 0 wall_line_width_x = =round(line_width * 0.4 / 0.35, 2) wall_thickness = 1.2 + diff --git a/resources/quality/liquid/liquid_vo0.4_PETG_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PETG_Draft_Print.inst.cfg index fa4eca93b2..a4cb2fc953 100644 --- a/resources/quality/liquid/liquid_vo0.4_PETG_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PETG_Draft_Print.inst.cfg @@ -1,36 +1,36 @@ [general] -version = 4 -name = Fast definition = liquid +name = Fast +version = 4 [metadata] +material = generic_petg +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_petg variant = VO 0.4 +weight = -2 [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_line_width = =round(line_width * 0.42 / 0.35, 2) +infill_sparse_density = 15 +jerk_travel = 20 +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 skin_overlap = 20 -speed_print = 70 speed_layer_0 = =math.ceil(speed_print * 20 / 70) +speed_print = 70 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 wall_thickness = 0.8 -jerk_travel = 20 -infill_line_width = =round(line_width * 0.42 / 0.35, 2) -infill_sparse_density = 15 -layer_height_0 = 0.2 -acceleration_wall = 2000 -acceleration_wall_0 = 2000 \ No newline at end of file diff --git a/resources/quality/liquid/liquid_vo0.4_PETG_Fast_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PETG_Fast_Print.inst.cfg index d7704dbee6..99a48b631c 100644 --- a/resources/quality/liquid/liquid_vo0.4_PETG_Fast_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PETG_Fast_Print.inst.cfg @@ -1,31 +1,31 @@ [general] -version = 4 -name = Normal definition = liquid +name = Normal +version = 4 [metadata] +material = generic_petg +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_petg variant = VO 0.4 +weight = -1 [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed +infill_line_width = =round(line_width * 0.42 / 0.35, 2) +jerk_travel = 20 +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 -speed_print = 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 / 60) top_bottom_thickness = 1 wall_thickness = 1 -jerk_travel = 20 -infill_line_width = =round(line_width * 0.42 / 0.35, 2) -layer_height_0 = 0.2 \ No newline at end of file diff --git a/resources/quality/liquid/liquid_vo0.4_PETG_High_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PETG_High_Quality.inst.cfg index bf7607dc20..f473fd292c 100644 --- a/resources/quality/liquid/liquid_vo0.4_PETG_High_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PETG_High_Quality.inst.cfg @@ -1,33 +1,33 @@ [general] -version = 4 -name = Extra Fine definition = liquid +name = Extra Fine +version = 4 [metadata] +material = generic_petg +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_petg variant = VO 0.4 +weight = 1 [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 10 +infill_line_width = =round(line_width * 0.42 / 0.35, 2) +jerk_travel = 20 +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 skin_overlap = 10 -speed_print = 50 speed_layer_0 = =math.ceil(speed_print * 20 / 50) +speed_print = 50 speed_topbottom = =math.ceil(speed_print * 35 / 50) speed_wall = =math.ceil(speed_print * 35 / 50) top_bottom_thickness = 1 wall_thickness = 1 -jerk_travel = 20 -infill_line_width = =round(line_width * 0.42 / 0.35, 2) -layer_height_0 = 0.2 \ No newline at end of file diff --git a/resources/quality/liquid/liquid_vo0.4_PETG_Normal_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PETG_Normal_Quality.inst.cfg index b3bada5dfe..b47bd80f35 100644 --- a/resources/quality/liquid/liquid_vo0.4_PETG_Normal_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PETG_Normal_Quality.inst.cfg @@ -1,20 +1,23 @@ [general] -version = 4 -name = Fine definition = liquid +name = Fine +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_petg variant = VO 0.4 +weight = 0 [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 7 +infill_line_width = =round(line_width * 0.42 / 0.35, 2) +jerk_travel = 20 +layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_standby_temperature = 100 @@ -24,6 +27,3 @@ speed_layer_0 = =math.ceil(speed_print * 20 / 70) top_bottom_thickness = 1 wall_thickness = 1 -jerk_travel = 20 -infill_line_width = =round(line_width * 0.42 / 0.35, 2) -layer_height_0 = 0.2 \ No newline at end of file diff --git a/resources/quality/liquid/liquid_vo0.4_PLA_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PLA_Draft_Print.inst.cfg index f86d5454b5..bb039fc9b6 100644 --- a/resources/quality/liquid/liquid_vo0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PLA_Draft_Print.inst.cfg @@ -1,36 +1,36 @@ [general] -version = 4 -name = Fast definition = liquid +name = Fast +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pla variant = VO 0.4 +weight = -2 [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_line_width = =round(line_width * 0.42 / 0.35, 2) +infill_sparse_density = 15 +jerk_travel = 20 +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 skin_overlap = 20 -speed_print = 70 speed_layer_0 = =math.ceil(speed_print * 20 / 70) +speed_print = 70 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 wall_thickness = 0.8 -jerk_travel = 20 -infill_line_width = =round(line_width * 0.42 / 0.35, 2) -infill_sparse_density = 15 -layer_height_0 = 0.2 -acceleration_wall = 2000 -acceleration_wall_0 = 2000 \ No newline at end of file diff --git a/resources/quality/liquid/liquid_vo0.4_PLA_Fast_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PLA_Fast_Print.inst.cfg index 0145169641..fe49db4357 100644 --- a/resources/quality/liquid/liquid_vo0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PLA_Fast_Print.inst.cfg @@ -1,31 +1,31 @@ [general] -version = 4 -name = Normal definition = liquid +name = Normal +version = 4 [metadata] +material = generic_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_pla variant = VO 0.4 +weight = -1 [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed +infill_line_width = =round(line_width * 0.42 / 0.35, 2) +jerk_travel = 20 +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 -speed_print = 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 / 60) top_bottom_thickness = 1 wall_thickness = 1 -jerk_travel = 20 -infill_line_width = =round(line_width * 0.42 / 0.35, 2) -layer_height_0 = 0.2 \ No newline at end of file diff --git a/resources/quality/liquid/liquid_vo0.4_PLA_High_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PLA_High_Quality.inst.cfg index 20fe9f0e49..eca5c67612 100644 --- a/resources/quality/liquid/liquid_vo0.4_PLA_High_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PLA_High_Quality.inst.cfg @@ -1,33 +1,33 @@ [general] -version = 4 -name = Extra Fine definition = liquid +name = Extra Fine +version = 4 [metadata] +material = generic_pla +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pla variant = VO 0.4 +weight = 1 [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 10 +infill_line_width = =round(line_width * 0.42 / 0.35, 2) +jerk_travel = 20 +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 skin_overlap = 10 -speed_print = 50 speed_layer_0 = =math.ceil(speed_print * 20 / 50) +speed_print = 50 speed_topbottom = =math.ceil(speed_print * 35 / 50) speed_wall = =math.ceil(speed_print * 35 / 50) top_bottom_thickness = 1 wall_thickness = 1 -jerk_travel = 20 -infill_line_width = =round(line_width * 0.42 / 0.35, 2) -layer_height_0 = 0.2 \ No newline at end of file diff --git a/resources/quality/liquid/liquid_vo0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PLA_Normal_Quality.inst.cfg index 57ba006c79..dcb263cefe 100644 --- a/resources/quality/liquid/liquid_vo0.4_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PLA_Normal_Quality.inst.cfg @@ -1,20 +1,23 @@ [general] -version = 4 -name = Fine definition = liquid +name = Fine +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pla variant = VO 0.4 +weight = 0 [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 7 +infill_line_width = =round(line_width * 0.42 / 0.35, 2) +jerk_travel = 20 +layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_standby_temperature = 100 @@ -24,6 +27,3 @@ speed_layer_0 = =math.ceil(speed_print * 20 / 70) top_bottom_thickness = 1 wall_thickness = 1 -jerk_travel = 20 -infill_line_width = =round(line_width * 0.42 / 0.35, 2) -layer_height_0 = 0.2 \ No newline at end of file diff --git a/resources/quality/liquid/liquid_vo0.4_PP_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PP_Draft_Print.inst.cfg index 3d2d6d8521..53fe71bf15 100644 --- a/resources/quality/liquid/liquid_vo0.4_PP_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PP_Draft_Print.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = liquid +name = Fast +version = 4 [metadata] +material = generic_pp +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pp variant = VO 0.4 +weight = -2 [values] acceleration_enabled = True @@ -59,3 +59,4 @@ switch_extruder_retraction_speeds = 35 wall_0_inset = 0 wall_line_width_x = =line_width wall_thickness = =line_width * 3 + diff --git a/resources/quality/liquid/liquid_vo0.4_PP_Fast_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PP_Fast_Print.inst.cfg index d8afd5b4a6..9e38c03a7f 100644 --- a/resources/quality/liquid/liquid_vo0.4_PP_Fast_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PP_Fast_Print.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = liquid +name = Normal +version = 4 [metadata] +material = generic_pp +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_pp variant = VO 0.4 +weight = -1 [values] acceleration_enabled = True @@ -49,7 +49,6 @@ retraction_prime_speed = 18 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) @@ -61,3 +60,4 @@ top_bottom_thickness = 1.1 wall_0_inset = 0 wall_line_width_x = =line_width wall_thickness = =line_width * 3 + diff --git a/resources/quality/liquid/liquid_vo0.4_PP_Normal_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PP_Normal_Quality.inst.cfg index d0f94a4c53..5163a5e947 100644 --- a/resources/quality/liquid/liquid_vo0.4_PP_Normal_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PP_Normal_Quality.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = liquid +name = Fine +version = 4 [metadata] +material = generic_pp +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pp variant = VO 0.4 +weight = 0 [values] acceleration_enabled = True @@ -49,7 +49,6 @@ retraction_prime_speed = 18 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) @@ -61,3 +60,4 @@ top_bottom_thickness = 1 wall_0_inset = 0 wall_line_width_x = =line_width wall_thickness = =line_width * 3 + diff --git a/resources/quality/liquid/liquid_vo0.4_TPU_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_TPU_Draft_Print.inst.cfg index 9b1969266e..48afd85244 100644 --- a/resources/quality/liquid/liquid_vo0.4_TPU_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_TPU_Draft_Print.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = liquid +name = Fast +version = 4 [metadata] +material = generic_tpu +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_tpu variant = VO 0.4 +weight = -2 [values] acceleration_enabled = True @@ -48,7 +48,6 @@ skin_overlap = 5 speed_layer_0 = =math.ceil(speed_print * 18 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) - speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) support_angle = 50 @@ -60,3 +59,4 @@ travel_avoid_distance = 1.5 wall_0_inset = 0 wall_line_width_x = =line_width wall_thickness = 0.76 + diff --git a/resources/quality/liquid/liquid_vo0.4_TPU_Fast_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_TPU_Fast_Print.inst.cfg index cd61d4efc9..e85d3364cb 100644 --- a/resources/quality/liquid/liquid_vo0.4_TPU_Fast_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_TPU_Fast_Print.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = liquid +name = Normal +version = 4 [metadata] +material = generic_tpu +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_tpu variant = VO 0.4 +weight = -1 [values] acceleration_enabled = True @@ -48,7 +48,6 @@ skin_overlap = 5 speed_layer_0 = =math.ceil(speed_print * 18 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) - speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) support_angle = 50 diff --git a/resources/quality/liquid/liquid_vo0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_TPU_Normal_Quality.inst.cfg index fe233e4222..ea03856b51 100644 --- a/resources/quality/liquid/liquid_vo0.4_TPU_Normal_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_TPU_Normal_Quality.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = liquid +name = Fine +version = 4 [metadata] +material = generic_tpu +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_tpu variant = VO 0.4 +weight = 0 [values] acceleration_enabled = True @@ -47,7 +47,6 @@ skin_overlap = 5 speed_layer_0 = =math.ceil(speed_print * 18 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) - speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) support_angle = 50 diff --git a/resources/quality/liquid/liquid_vo0.6_CFFCPE_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.6_CFFCPE_Draft_Print.inst.cfg index 2d029aac50..003711cd38 100644 --- a/resources/quality/liquid/liquid_vo0.6_CFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.6_CFFCPE_Draft_Print.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = liquid +name = Fast +version = 4 [metadata] +material = generic_cffcpe +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_cffcpe variant = VO 0.6 +weight = -2 [values] adhesion_type = skirt @@ -29,3 +29,4 @@ support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 wall_line_width_x = =line_width + diff --git a/resources/quality/liquid/liquid_vo0.6_CFFPA_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.6_CFFPA_Draft_Print.inst.cfg index 3bb3b3f216..ad8567aa26 100644 --- a/resources/quality/liquid/liquid_vo0.6_CFFPA_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.6_CFFPA_Draft_Print.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = liquid +name = Fast +version = 4 [metadata] +material = generic_cffpa +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_cffpa variant = VO 0.6 +weight = -2 [values] adhesion_type = skirt @@ -29,3 +29,4 @@ support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 wall_line_width_x = =line_width + diff --git a/resources/quality/liquid/liquid_vo0.6_GFFCPE_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.6_GFFCPE_Draft_Print.inst.cfg index 48faaa65e1..92b1bc6255 100644 --- a/resources/quality/liquid/liquid_vo0.6_GFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.6_GFFCPE_Draft_Print.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = liquid +name = Fast +version = 4 [metadata] +material = generic_gffcpe +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_gffcpe variant = VO 0.6 +weight = -2 [values] adhesion_type = brim @@ -29,3 +29,4 @@ support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 wall_line_width_x = =line_width + diff --git a/resources/quality/liquid/liquid_vo0.6_GFFPA_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.6_GFFPA_Draft_Print.inst.cfg index a6a52fb04d..0cd31f32ee 100644 --- a/resources/quality/liquid/liquid_vo0.6_GFFPA_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.6_GFFPA_Draft_Print.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = liquid +name = Fast +version = 4 [metadata] +material = generic_gffpa +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_gffpa variant = VO 0.6 +weight = -2 [values] adhesion_type = brim @@ -29,3 +29,4 @@ support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 wall_line_width_x = =line_width + diff --git a/resources/quality/liquid/liquid_vo0.6_PETG_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.6_PETG_Draft_Print.inst.cfg index 0b72c825e1..6635cc36cb 100644 --- a/resources/quality/liquid/liquid_vo0.6_PETG_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.6_PETG_Draft_Print.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Fast definition = liquid +name = Fast +version = 4 [metadata] +is_experimental = True +material = generic_petg +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -3 -material = generic_petg variant = VO 0.6 -is_experimental = True +weight = -3 [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height @@ -31,8 +31,8 @@ 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 support_line_width = =line_width * 0.75 support_pattern = ='triangles' @@ -41,3 +41,4 @@ top_bottom_thickness = =layer_height * 4 wall_line_width = =round(line_width * 0.75 / 0.75, 2) wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x + diff --git a/resources/quality/liquid/liquid_vo0.6_PETG_Fast_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.6_PETG_Fast_Print.inst.cfg index a404cdc16b..991bf8a242 100644 --- a/resources/quality/liquid/liquid_vo0.6_PETG_Fast_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.6_PETG_Fast_Print.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Normal definition = liquid +name = Normal +version = 4 [metadata] +is_experimental = True +material = generic_petg +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -2 -material = generic_petg variant = VO 0.6 -is_experimental = True +weight = -2 [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height @@ -31,8 +31,8 @@ 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 support_line_width = =line_width * 0.75 support_pattern = ='triangles' @@ -41,3 +41,4 @@ top_bottom_thickness = =layer_height * 4 wall_line_width = =round(line_width * 0.75 / 0.75, 2) wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x + diff --git a/resources/quality/liquid/liquid_vo0.6_PLA_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.6_PLA_Draft_Print.inst.cfg index 8e7e4effdb..3dd57ef0d8 100644 --- a/resources/quality/liquid/liquid_vo0.6_PLA_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.6_PLA_Draft_Print.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Fast definition = liquid +name = Fast +version = 4 [metadata] +is_experimental = True +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -3 -material = generic_pla variant = VO 0.6 -is_experimental = True +weight = -3 [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height @@ -31,8 +31,8 @@ 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 support_line_width = =line_width * 0.75 support_pattern = ='triangles' @@ -41,3 +41,4 @@ top_bottom_thickness = =layer_height * 4 wall_line_width = =round(line_width * 0.75 / 0.75, 2) wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x + diff --git a/resources/quality/liquid/liquid_vo0.6_PLA_Fast_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.6_PLA_Fast_Print.inst.cfg index 290d1fe6c9..13966c1b19 100644 --- a/resources/quality/liquid/liquid_vo0.6_PLA_Fast_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.6_PLA_Fast_Print.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Normal definition = liquid +name = Normal +version = 4 [metadata] +is_experimental = True +material = generic_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -2 -material = generic_pla variant = VO 0.6 -is_experimental = True +weight = -2 [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height @@ -31,8 +31,8 @@ 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 support_line_width = =line_width * 0.75 support_pattern = ='triangles' @@ -41,3 +41,4 @@ top_bottom_thickness = =layer_height * 4 wall_line_width = =round(line_width * 0.75 / 0.75, 2) wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x + diff --git a/resources/quality/liquid/liquid_vo0.8_ABS_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_ABS_Draft_Print.inst.cfg index fe5802a25f..55da51dabd 100644 --- a/resources/quality/liquid/liquid_vo0.8_ABS_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_ABS_Draft_Print.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Fast definition = liquid +name = Fast +version = 4 [metadata] +material = generic_abs +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_abs variant = VO 0.8 +weight = -2 [values] line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature + 20 material_standby_temperature = 100 +retract_at_layer_change = False 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/liquid/liquid_vo0.8_ABS_Superdraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_ABS_Superdraft_Print.inst.cfg index d9c7ac25b1..ea9fac453f 100644 --- a/resources/quality/liquid/liquid_vo0.8_ABS_Superdraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_ABS_Superdraft_Print.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Sprint definition = liquid +name = Sprint +version = 4 [metadata] +material = generic_abs +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_abs variant = VO 0.8 +weight = -4 [values] line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature + 25 material_standby_temperature = 100 +retract_at_layer_change = False 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/liquid/liquid_vo0.8_ABS_Verydraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_ABS_Verydraft_Print.inst.cfg index 79cf8b496d..2d9dbf99e9 100644 --- a/resources/quality/liquid/liquid_vo0.8_ABS_Verydraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_ABS_Verydraft_Print.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Extra Fast definition = liquid +name = Extra Fast +version = 4 [metadata] +material = generic_abs +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_abs variant = VO 0.8 +weight = -3 [values] line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature + 22 material_standby_temperature = 100 +retract_at_layer_change = False 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/liquid/liquid_vo0.8_CPE_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_CPE_Draft_Print.inst.cfg index f4b258a4ee..17dd636e06 100644 --- a/resources/quality/liquid/liquid_vo0.8_CPE_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_CPE_Draft_Print.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Fast definition = liquid +name = Fast +version = 4 [metadata] +material = generic_cpe +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_cpe variant = VO 0.8 +weight = -2 [values] brim_width = 15 +jerk_travel = 20 line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature + 15 material_standby_temperature = 100 @@ -22,4 +23,3 @@ speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) -jerk_travel = 20 \ No newline at end of file diff --git a/resources/quality/liquid/liquid_vo0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_CPE_Superdraft_Print.inst.cfg index 70aa171e5b..cc06c11014 100644 --- a/resources/quality/liquid/liquid_vo0.8_CPE_Superdraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_CPE_Superdraft_Print.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Sprint definition = liquid +name = Sprint +version = 4 [metadata] +material = generic_cpe +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_cpe variant = VO 0.8 +weight = -4 [values] brim_width = 15 +jerk_travel = 20 line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature + 20 material_standby_temperature = 100 @@ -23,4 +24,3 @@ speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -jerk_travel = 20 \ No newline at end of file diff --git a/resources/quality/liquid/liquid_vo0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_CPE_Verydraft_Print.inst.cfg index 4c4950c4a1..e34aad6bfe 100644 --- a/resources/quality/liquid/liquid_vo0.8_CPE_Verydraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_CPE_Verydraft_Print.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Extra Fast definition = liquid +name = Extra Fast +version = 4 [metadata] +material = generic_cpe +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_cpe variant = VO 0.8 +weight = -3 [values] brim_width = 15 +jerk_travel = 20 line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature + 17 material_standby_temperature = 100 @@ -22,4 +23,3 @@ speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) -jerk_travel = 20 diff --git a/resources/quality/liquid/liquid_vo0.8_Nylon_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_Nylon_Draft_Print.inst.cfg index 250f56436e..40d3def10b 100644 --- a/resources/quality/liquid/liquid_vo0.8_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_Nylon_Draft_Print.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = liquid +name = Fast +version = 4 [metadata] +material = generic_nylon +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_nylon variant = VO 0.8 +weight = -2 [values] brim_width = 5.6 @@ -33,3 +33,4 @@ support_xy_distance = =wall_line_width_0 * 1.5 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 + diff --git a/resources/quality/liquid/liquid_vo0.8_Nylon_Superdraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_Nylon_Superdraft_Print.inst.cfg index b5ab20871a..3263c0f0a3 100644 --- a/resources/quality/liquid/liquid_vo0.8_Nylon_Superdraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_Nylon_Superdraft_Print.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Sprint definition = liquid +name = Sprint +version = 4 [metadata] +material = generic_nylon +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_nylon variant = VO 0.8 +weight = -4 [values] brim_width = 5.6 @@ -33,3 +33,4 @@ support_xy_distance = =wall_line_width_0 * 1.5 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 + diff --git a/resources/quality/liquid/liquid_vo0.8_Nylon_Verydraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_Nylon_Verydraft_Print.inst.cfg index 369a81c674..9ced2d8e13 100644 --- a/resources/quality/liquid/liquid_vo0.8_Nylon_Verydraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_Nylon_Verydraft_Print.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fast definition = liquid +name = Extra Fast +version = 4 [metadata] +material = generic_nylon +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_nylon variant = VO 0.8 +weight = -3 [values] brim_width = 5.6 @@ -33,3 +33,4 @@ support_xy_distance = =wall_line_width_0 * 1.5 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 + diff --git a/resources/quality/liquid/liquid_vo0.8_PC_Fast_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PC_Fast_Print.inst.cfg index 4add029aa1..a4ac2f0fe6 100644 --- a/resources/quality/liquid/liquid_vo0.8_PC_Fast_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PC_Fast_Print.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Fast - Experimental definition = liquid +name = Fast - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_pc +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pc variant = VO 0.8 -is_experimental = True +weight = -2 [values] brim_width = 14 @@ -30,3 +30,4 @@ speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) support_line_width = =round(line_width * 0.6 / 0.7, 2) + diff --git a/resources/quality/liquid/liquid_vo0.8_PC_Superdraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PC_Superdraft_Print.inst.cfg index d38bad5748..1ed974d8ac 100644 --- a/resources/quality/liquid/liquid_vo0.8_PC_Superdraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PC_Superdraft_Print.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Sprint - Experimental definition = liquid +name = Sprint - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_pc +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_pc variant = VO 0.8 -is_experimental = True +weight = -4 [values] brim_width = 14 @@ -29,3 +29,4 @@ speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) support_line_width = =round(line_width * 0.6 / 0.7, 2) + diff --git a/resources/quality/liquid/liquid_vo0.8_PC_Verydraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PC_Verydraft_Print.inst.cfg index d2a2f5833e..b51c42d9c4 100644 --- a/resources/quality/liquid/liquid_vo0.8_PC_Verydraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PC_Verydraft_Print.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Extra Fast - Experimental definition = liquid +name = Extra Fast - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_pc +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_pc variant = VO 0.8 -is_experimental = True +weight = -3 [values] brim_width = 14 @@ -30,3 +30,4 @@ speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) support_line_width = =round(line_width * 0.6 / 0.7, 2) + diff --git a/resources/quality/liquid/liquid_vo0.8_PETG_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PETG_Draft_Print.inst.cfg index d937f462f3..a686b526e1 100644 --- a/resources/quality/liquid/liquid_vo0.8_PETG_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PETG_Draft_Print.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = liquid +name = Fast +version = 4 [metadata] +material = generic_petg +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_petg variant = VO 0.8 +weight = -2 [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height @@ -17,6 +17,8 @@ cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height infill_line_width = =round(line_width * 0.65 / 0.75, 2) +infill_sparse_density = 15 +layer_height_0 = 0.4 line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 @@ -24,6 +26,12 @@ 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 +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_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall support_angle = 70 support_line_width = =line_width * 0.75 support_xy_distance = =wall_line_width_0 * 1.5 @@ -32,11 +40,3 @@ wall_line_width = =round(line_width * 0.75 / 0.75, 2) wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x -retract_at_layer_change = False -speed_print = 45 -speed_topbottom = =math.ceil(speed_print * 35 / 45) -speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_x = =speed_wall -speed_wall_0 = =math.ceil(speed_wall * 35 / 40) -infill_sparse_density = 15 -layer_height_0 = 0.4 diff --git a/resources/quality/liquid/liquid_vo0.8_PETG_Superdraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PETG_Superdraft_Print.inst.cfg index 2fc973a474..e49ff3abe4 100644 --- a/resources/quality/liquid/liquid_vo0.8_PETG_Superdraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PETG_Superdraft_Print.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Sprint definition = liquid +name = Sprint +version = 4 [metadata] +material = generic_petg +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_petg variant = VO 0.8 +weight = -4 [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height @@ -17,6 +17,8 @@ cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height infill_line_width = =round(line_width * 0.65 / 0.75, 2) +infill_sparse_density = 15 +layer_height_0 = 0.4 line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 @@ -25,6 +27,12 @@ material_initial_print_temperature = =max(-273.15, material_print_temperature - material_print_temperature = =default_material_print_temperature + 15 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 * 40 / 45) +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall support_angle = 70 support_line_width = =line_width * 0.75 support_xy_distance = =wall_line_width_0 * 1.5 @@ -32,11 +40,4 @@ top_bottom_thickness = =layer_height * 4 wall_line_width = =round(line_width * 0.75 / 0.75, 2) wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x -retract_at_layer_change = False -speed_print = 45 -speed_topbottom = =math.ceil(speed_print * 35 / 45) -speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_x = =speed_wall -speed_wall_0 = =math.ceil(speed_wall * 35 / 40) -infill_sparse_density = 15 -layer_height_0 = 0.4 + diff --git a/resources/quality/liquid/liquid_vo0.8_PETG_Verydraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PETG_Verydraft_Print.inst.cfg index 72e4629575..b85601a3b7 100644 --- a/resources/quality/liquid/liquid_vo0.8_PETG_Verydraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PETG_Verydraft_Print.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fast definition = liquid +name = Extra Fast +version = 4 [metadata] +material = generic_petg +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_petg variant = VO 0.8 +weight = -3 [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height @@ -17,6 +17,8 @@ cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height infill_line_width = =round(line_width * 0.65 / 0.75, 2) +infill_sparse_density = 15 +layer_height_0 = 0.4 line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 @@ -24,6 +26,12 @@ 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 +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_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall support_angle = 70 support_line_width = =line_width * 0.75 support_xy_distance = =wall_line_width_0 * 1.5 @@ -31,11 +39,4 @@ top_bottom_thickness = =layer_height * 4 wall_line_width = =round(line_width * 0.75 / 0.75, 2) wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x -retract_at_layer_change = False -speed_print = 45 -speed_topbottom = =math.ceil(speed_print * 35 / 45) -speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_x = =speed_wall -speed_wall_0 = =math.ceil(speed_wall * 35 / 40) -infill_sparse_density = 15 -layer_height_0 = 0.4 + diff --git a/resources/quality/liquid/liquid_vo0.8_PLA_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PLA_Draft_Print.inst.cfg index e022304ad9..f2720fc62b 100644 --- a/resources/quality/liquid/liquid_vo0.8_PLA_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PLA_Draft_Print.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = liquid +name = Fast +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pla variant = VO 0.8 +weight = -2 [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height @@ -17,6 +17,8 @@ cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height infill_line_width = =round(line_width * 0.65 / 0.75, 2) +infill_sparse_density = 15 +layer_height_0 = 0.4 line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 @@ -24,6 +26,12 @@ 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 +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_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall support_angle = 70 support_line_width = =line_width * 0.75 support_xy_distance = =wall_line_width_0 * 1.5 @@ -32,11 +40,3 @@ wall_line_width = =round(line_width * 0.75 / 0.75, 2) wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x -retract_at_layer_change = False -speed_print = 45 -speed_topbottom = =math.ceil(speed_print * 35 / 45) -speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_x = =speed_wall -speed_wall_0 = =math.ceil(speed_wall * 35 / 40) -infill_sparse_density = 15 -layer_height_0 = 0.4 diff --git a/resources/quality/liquid/liquid_vo0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PLA_Superdraft_Print.inst.cfg index b480b737fa..10fab63709 100644 --- a/resources/quality/liquid/liquid_vo0.8_PLA_Superdraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PLA_Superdraft_Print.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Sprint definition = liquid +name = Sprint +version = 4 [metadata] +material = generic_pla +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_pla variant = VO 0.8 +weight = -4 [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height @@ -17,6 +17,8 @@ cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height infill_line_width = =round(line_width * 0.65 / 0.75, 2) +infill_sparse_density = 15 +layer_height_0 = 0.4 line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 @@ -25,6 +27,12 @@ material_initial_print_temperature = =max(-273.15, material_print_temperature - material_print_temperature = =default_material_print_temperature + 15 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 * 40 / 45) +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall support_angle = 70 support_line_width = =line_width * 0.75 support_xy_distance = =wall_line_width_0 * 1.5 @@ -32,11 +40,4 @@ top_bottom_thickness = =layer_height * 4 wall_line_width = =round(line_width * 0.75 / 0.75, 2) wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x -retract_at_layer_change = False -speed_print = 45 -speed_topbottom = =math.ceil(speed_print * 35 / 45) -speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_x = =speed_wall -speed_wall_0 = =math.ceil(speed_wall * 35 / 40) -infill_sparse_density = 15 -layer_height_0 = 0.4 + diff --git a/resources/quality/liquid/liquid_vo0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PLA_Verydraft_Print.inst.cfg index 93c718cc0f..597f174478 100644 --- a/resources/quality/liquid/liquid_vo0.8_PLA_Verydraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PLA_Verydraft_Print.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fast definition = liquid +name = Extra Fast +version = 4 [metadata] +material = generic_pla +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_pla variant = VO 0.8 +weight = -3 [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height @@ -17,6 +17,8 @@ cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height infill_line_width = =round(line_width * 0.65 / 0.75, 2) +infill_sparse_density = 15 +layer_height_0 = 0.4 line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 @@ -24,6 +26,12 @@ 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 +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_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall support_angle = 70 support_line_width = =line_width * 0.75 support_xy_distance = =wall_line_width_0 * 1.5 @@ -31,11 +39,4 @@ top_bottom_thickness = =layer_height * 4 wall_line_width = =round(line_width * 0.75 / 0.75, 2) wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x -retract_at_layer_change = False -speed_print = 45 -speed_topbottom = =math.ceil(speed_print * 35 / 45) -speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_x = =speed_wall -speed_wall_0 = =math.ceil(speed_wall * 35 / 40) -infill_sparse_density = 15 -layer_height_0 = 0.4 + diff --git a/resources/quality/liquid/liquid_vo0.8_PP_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PP_Draft_Print.inst.cfg index 69d2e67de1..3a504af58d 100644 --- a/resources/quality/liquid/liquid_vo0.8_PP_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PP_Draft_Print.inst.cfg @@ -1,21 +1,20 @@ [general] -version = 4 -name = Fast definition = liquid +name = Fast +version = 4 [metadata] +material = generic_pp +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pp variant = VO 0.8 +weight = -2 [values] brim_width = 25 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 17 -top_skin_expand_distance = =line_width * 2 infill_before_walls = True infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = tetrahedral @@ -37,7 +36,6 @@ retraction_hop = 0.5 retraction_min_travel = 1.5 retraction_prime_speed = 15 skin_line_width = =round(line_width * 0.78 / 0.8, 2) - speed_wall_x = =math.ceil(speed_wall * 30 / 30) support_bottom_distance = =support_z_distance support_line_width = =round(line_width * 0.7 / 0.8, 2) @@ -46,6 +44,8 @@ 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 wall_line_width_x = =round(line_width * 0.8 / 0.8, 2) wall_thickness = 1.6 + diff --git a/resources/quality/liquid/liquid_vo0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PP_Superdraft_Print.inst.cfg index b2388332fa..383b26542c 100644 --- a/resources/quality/liquid/liquid_vo0.8_PP_Superdraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PP_Superdraft_Print.inst.cfg @@ -1,21 +1,20 @@ [general] -version = 4 -name = Sprint definition = liquid +name = Sprint +version = 4 [metadata] +material = generic_pp +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_pp variant = VO 0.8 +weight = -4 [values] brim_width = 25 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 17 -top_skin_expand_distance = =line_width * 2 infill_before_walls = True infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = tetrahedral @@ -37,7 +36,6 @@ retraction_hop = 0.5 retraction_min_travel = 1.5 retraction_prime_speed = 15 skin_line_width = =round(line_width * 0.78 / 0.8, 2) - speed_wall_x = =math.ceil(speed_wall * 30 / 30) support_bottom_distance = =support_z_distance support_line_width = =round(line_width * 0.7 / 0.8, 2) @@ -46,6 +44,8 @@ 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 wall_line_width_x = =round(line_width * 0.8 / 0.8, 2) wall_thickness = 1.6 + diff --git a/resources/quality/liquid/liquid_vo0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PP_Verydraft_Print.inst.cfg index 9e7babac08..8e4d943f5b 100644 --- a/resources/quality/liquid/liquid_vo0.8_PP_Verydraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PP_Verydraft_Print.inst.cfg @@ -1,21 +1,20 @@ [general] -version = 4 -name = Extra Fast definition = liquid +name = Extra Fast +version = 4 [metadata] +material = generic_pp +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_pp variant = VO 0.8 +weight = -3 [values] brim_width = 25 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 17 -top_skin_expand_distance = =line_width * 2 infill_before_walls = True infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = tetrahedral @@ -36,7 +35,6 @@ retraction_hop = 0.5 retraction_min_travel = 1.5 retraction_prime_speed = 15 skin_line_width = =round(line_width * 0.78 / 0.8, 2) - speed_wall_x = =math.ceil(speed_wall * 30 / 30) support_bottom_distance = =support_z_distance support_line_width = =round(line_width * 0.7 / 0.8, 2) @@ -45,6 +43,8 @@ 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 wall_line_width_x = =round(line_width * 0.8 / 0.8, 2) wall_thickness = 1.6 + diff --git a/resources/quality/liquid/liquid_vo0.8_TPU_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_TPU_Draft_Print.inst.cfg index 5182f97446..fc15416bb3 100644 --- a/resources/quality/liquid/liquid_vo0.8_TPU_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_TPU_Draft_Print.inst.cfg @@ -1,25 +1,25 @@ [general] -version = 4 -name = Fast definition = liquid +name = Fast +version = 4 [metadata] +material = generic_tpu +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_tpu variant = VO 0.8 +weight = -2 [values] brim_width = 8.75 cool_min_layer_time_fan_speed_max = 6 -top_skin_expand_distance = =line_width * 2 infill_before_walls = True infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = cross_3d jerk_prime_tower = =math.ceil(jerk_print * 25 / 15) jerk_support = =math.ceil(jerk_print * 25 / 15) +jerk_travel = 20 jerk_wall_0 = =math.ceil(jerk_wall * 15 / 15) machine_nozzle_cool_down_speed = 0.5 machine_nozzle_heat_up_speed = 2.5 @@ -42,7 +42,6 @@ retraction_prime_speed = 15 skin_line_width = =round(line_width * 0.78 / 0.8, 2) speed_print = 30 speed_topbottom = =math.ceil(speed_print * 25 / 30) - speed_wall = =math.ceil(speed_print * 30 / 30) speed_wall_x = =math.ceil(speed_wall * 30 / 30) support_angle = 50 @@ -53,9 +52,9 @@ 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 wall_line_width_x = =round(line_width * 0.6 / 0.8, 2) wall_thickness = 1.3 -jerk_travel = 20 diff --git a/resources/quality/liquid/liquid_vo0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_TPU_Superdraft_Print.inst.cfg index 430fce9b9a..2c3347a011 100644 --- a/resources/quality/liquid/liquid_vo0.8_TPU_Superdraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_TPU_Superdraft_Print.inst.cfg @@ -1,26 +1,26 @@ [general] -version = 4 -name = Sprint definition = liquid +name = Sprint +version = 4 [metadata] +material = generic_tpu +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_tpu variant = VO 0.8 +weight = -4 [values] brim_width = 8.75 cool_min_layer_time_fan_speed_max = 6 -top_skin_expand_distance = =line_width * 2 infill_before_walls = True infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = cross_3d infill_sparse_density = 10 jerk_prime_tower = =math.ceil(jerk_print * 25 / 15) jerk_support = =math.ceil(jerk_print * 25 / 15) +jerk_travel = 20 jerk_wall_0 = =math.ceil(jerk_wall * 15 / 15) machine_nozzle_cool_down_speed = 0.5 machine_nozzle_heat_up_speed = 2.5 @@ -43,7 +43,6 @@ retraction_prime_speed = 15 skin_line_width = =round(line_width * 0.78 / 0.8, 2) speed_print = 30 speed_topbottom = =math.ceil(speed_print * 20 / 30) - speed_wall = =math.ceil(speed_print * 30 / 30) speed_wall_x = =math.ceil(speed_wall * 30 / 30) support_angle = 50 @@ -54,9 +53,9 @@ 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 wall_line_width_x = =round(line_width * 0.6 / 0.8, 2) wall_thickness = 1.3 -jerk_travel = 20 diff --git a/resources/quality/liquid/liquid_vo0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_TPU_Verydraft_Print.inst.cfg index d6ec2a09d6..43573551ae 100644 --- a/resources/quality/liquid/liquid_vo0.8_TPU_Verydraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_TPU_Verydraft_Print.inst.cfg @@ -1,26 +1,26 @@ [general] -version = 4 -name = Extra Fast definition = liquid +name = Extra Fast +version = 4 [metadata] +material = generic_tpu +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_tpu variant = VO 0.8 +weight = -3 [values] brim_width = 8.75 cool_min_layer_time_fan_speed_max = 6 -top_skin_expand_distance = =line_width * 2 infill_before_walls = True infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = cross_3d infill_sparse_density = 10 jerk_prime_tower = =math.ceil(jerk_print * 25 / 15) jerk_support = =math.ceil(jerk_print * 25 / 15) +jerk_travel = 20 jerk_wall_0 = =math.ceil(jerk_wall * 15 / 15) machine_nozzle_cool_down_speed = 0.5 machine_nozzle_heat_up_speed = 2.5 @@ -42,7 +42,6 @@ retraction_prime_speed = 15 skin_line_width = =round(line_width * 0.78 / 0.8, 2) speed_print = 30 speed_topbottom = =math.ceil(speed_print * 23 / 30) - speed_wall = =math.ceil(speed_print * 30 / 30) speed_wall_x = =math.ceil(speed_wall * 30 / 30) support_angle = 50 @@ -53,9 +52,9 @@ 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 wall_line_width_x = =round(line_width * 0.6 / 0.8, 2) wall_thickness = 1.3 -jerk_travel = 20 diff --git a/resources/quality/longer/ABS/longer_0.4_ABS_adaptive.inst.cfg b/resources/quality/longer/ABS/longer_0.4_ABS_adaptive.inst.cfg index 0f5a71dd15..c42c59ba22 100644 --- a/resources/quality/longer/ABS/longer_0.4_ABS_adaptive.inst.cfg +++ b/resources/quality/longer/ABS/longer_0.4_ABS_adaptive.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = longer_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_abs +quality_type = adaptive 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/longer/ABS/longer_0.4_ABS_low.inst.cfg b/resources/quality/longer/ABS/longer_0.4_ABS_low.inst.cfg index e1d1e550ee..5a456d4d83 100644 --- a/resources/quality/longer/ABS/longer_0.4_ABS_low.inst.cfg +++ b/resources/quality/longer/ABS/longer_0.4_ABS_low.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = longer_base +name = Low Quality +version = 4 [metadata] +material = generic_abs +quality_type = low 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/longer/ABS/longer_0.4_ABS_standard.inst.cfg b/resources/quality/longer/ABS/longer_0.4_ABS_standard.inst.cfg index 24c3a99de9..d35967e3fc 100644 --- a/resources/quality/longer/ABS/longer_0.4_ABS_standard.inst.cfg +++ b/resources/quality/longer/ABS/longer_0.4_ABS_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = longer_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = standard 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/longer/ABS/longer_0.4_ABS_super.inst.cfg b/resources/quality/longer/ABS/longer_0.4_ABS_super.inst.cfg index d442802860..51f65b548d 100644 --- a/resources/quality/longer/ABS/longer_0.4_ABS_super.inst.cfg +++ b/resources/quality/longer/ABS/longer_0.4_ABS_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = longer_base +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super 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/longer/PETG/longer_0.4_PETG_adaptive.inst.cfg b/resources/quality/longer/PETG/longer_0.4_PETG_adaptive.inst.cfg index 6907e4ceeb..92336f9dc2 100644 --- a/resources/quality/longer/PETG/longer_0.4_PETG_adaptive.inst.cfg +++ b/resources/quality/longer/PETG/longer_0.4_PETG_adaptive.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = longer_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_petg +quality_type = adaptive 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/longer/PETG/longer_0.4_PETG_low.inst.cfg b/resources/quality/longer/PETG/longer_0.4_PETG_low.inst.cfg index 2b54a084c7..0a5c7060b7 100644 --- a/resources/quality/longer/PETG/longer_0.4_PETG_low.inst.cfg +++ b/resources/quality/longer/PETG/longer_0.4_PETG_low.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Low Quality definition = longer_base +name = Low Quality +version = 4 [metadata] +material = generic_petg +quality_type = low 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/longer/PETG/longer_0.4_PETG_standard.inst.cfg b/resources/quality/longer/PETG/longer_0.4_PETG_standard.inst.cfg index 305f1ed66d..d672e8e80d 100644 --- a/resources/quality/longer/PETG/longer_0.4_PETG_standard.inst.cfg +++ b/resources/quality/longer/PETG/longer_0.4_PETG_standard.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = longer_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = standard 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/longer/PETG/longer_0.4_PETG_super.inst.cfg b/resources/quality/longer/PETG/longer_0.4_PETG_super.inst.cfg index 143898a48c..74f03b15cd 100644 --- a/resources/quality/longer/PETG/longer_0.4_PETG_super.inst.cfg +++ b/resources/quality/longer/PETG/longer_0.4_PETG_super.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Super Quality definition = longer_base +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super 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/longer/PLA/longer_0.4_PLA_adaptive.inst.cfg b/resources/quality/longer/PLA/longer_0.4_PLA_adaptive.inst.cfg index d46c54fab6..72c9bdb07c 100644 --- a/resources/quality/longer/PLA/longer_0.4_PLA_adaptive.inst.cfg +++ b/resources/quality/longer/PLA/longer_0.4_PLA_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = longer_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_pla +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_pla variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/longer/PLA/longer_0.4_PLA_low.inst.cfg b/resources/quality/longer/PLA/longer_0.4_PLA_low.inst.cfg index 90ce5c57c5..05dd3dfd9a 100644 --- a/resources/quality/longer/PLA/longer_0.4_PLA_low.inst.cfg +++ b/resources/quality/longer/PLA/longer_0.4_PLA_low.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low Quality definition = longer_base +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/longer/PLA/longer_0.4_PLA_standard.inst.cfg b/resources/quality/longer/PLA/longer_0.4_PLA_standard.inst.cfg index 559ba90d4b..f32ce760e1 100644 --- a/resources/quality/longer/PLA/longer_0.4_PLA_standard.inst.cfg +++ b/resources/quality/longer/PLA/longer_0.4_PLA_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = longer_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_pla variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/longer/PLA/longer_0.4_PLA_super.inst.cfg b/resources/quality/longer/PLA/longer_0.4_PLA_super.inst.cfg index c02157c342..5f8908d721 100644 --- a/resources/quality/longer/PLA/longer_0.4_PLA_super.inst.cfg +++ b/resources/quality/longer/PLA/longer_0.4_PLA_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = longer_base +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/longer/TPU/longer_0.4_TPU_adaptive.inst.cfg b/resources/quality/longer/TPU/longer_0.4_TPU_adaptive.inst.cfg index 0f70a2255c..a7023b3bd2 100644 --- a/resources/quality/longer/TPU/longer_0.4_TPU_adaptive.inst.cfg +++ b/resources/quality/longer/TPU/longer_0.4_TPU_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = longer_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_tpu +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_tpu variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/longer/TPU/longer_0.4_TPU_standard.inst.cfg b/resources/quality/longer/TPU/longer_0.4_TPU_standard.inst.cfg index 193b0ea940..4c1be2b603 100644 --- a/resources/quality/longer/TPU/longer_0.4_TPU_standard.inst.cfg +++ b/resources/quality/longer/TPU/longer_0.4_TPU_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = longer_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_tpu variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/longer/TPU/longer_0.4_TPU_super.inst.cfg b/resources/quality/longer/TPU/longer_0.4_TPU_super.inst.cfg index c91b16a21e..9eaa3cc109 100644 --- a/resources/quality/longer/TPU/longer_0.4_TPU_super.inst.cfg +++ b/resources/quality/longer/TPU/longer_0.4_TPU_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = longer_base +name = Super Quality +version = 4 [metadata] +material = generic_tpu +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_tpu variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/longer/longer_global_adaptive.inst.cfg b/resources/quality/longer/longer_global_adaptive.inst.cfg index adb36960f7..be5e161688 100644 --- a/resources/quality/longer/longer_global_adaptive.inst.cfg +++ b/resources/quality/longer/longer_global_adaptive.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Dynamic Quality definition = longer_base +name = Dynamic Quality +version = 4 [metadata] +global_quality = True +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive weight = -2 -global_quality = True [values] +adaptive_layer_height_enabled = true layer_height = 0.16 layer_height_0 = 0.20 +support_interface_height = =layer_height*6 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/longer/longer_global_draft.inst.cfg b/resources/quality/longer/longer_global_draft.inst.cfg index e0eebdef16..17e8d5d337 100644 --- a/resources/quality/longer/longer_global_draft.inst.cfg +++ b/resources/quality/longer/longer_global_draft.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Draft Quality definition = longer_base +name = Draft Quality +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -5 -global_quality = True [values] layer_height = 0.32 layer_height_0 = 0.32 +support_interface_height = =layer_height*4 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/longer/longer_global_low.inst.cfg b/resources/quality/longer/longer_global_low.inst.cfg index 12f79f089e..9fb6042fec 100644 --- a/resources/quality/longer/longer_global_low.inst.cfg +++ b/resources/quality/longer/longer_global_low.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Low Quality definition = longer_base +name = Low Quality +version = 4 [metadata] +global_quality = True +quality_type = low setting_version = 20 type = quality -quality_type = low weight = -4 -global_quality = True [values] layer_height = 0.28 layer_height_0 = 0.28 +support_interface_height = =layer_height*4 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/longer/longer_global_standard.inst.cfg b/resources/quality/longer/longer_global_standard.inst.cfg index 47e8c3ee00..ed98ba78b7 100644 --- a/resources/quality/longer/longer_global_standard.inst.cfg +++ b/resources/quality/longer/longer_global_standard.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Standard Quality definition = longer_base +name = Standard Quality +version = 4 [metadata] +global_quality = True +quality_type = standard setting_version = 20 type = quality -quality_type = standard weight = -3 -global_quality = True [values] layer_height = 0.2 layer_height_0 = 0.2 +support_interface_height = =layer_height*4 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/longer/longer_global_super.inst.cfg b/resources/quality/longer/longer_global_super.inst.cfg index 8d39e4fa0f..d64cd3dac0 100644 --- a/resources/quality/longer/longer_global_super.inst.cfg +++ b/resources/quality/longer/longer_global_super.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Super Quality definition = longer_base +name = Super Quality +version = 4 [metadata] +global_quality = True +quality_type = super setting_version = 20 type = quality -quality_type = super weight = -1 -global_quality = True [values] layer_height = 0.12 layer_height_0 = 0.12 +support_interface_height = =layer_height*8 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/longer/longer_global_ultra.inst.cfg b/resources/quality/longer/longer_global_ultra.inst.cfg index ce76293bea..675bccbd23 100644 --- a/resources/quality/longer/longer_global_ultra.inst.cfg +++ b/resources/quality/longer/longer_global_ultra.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Ultra Quality definition = longer_base +name = Ultra Quality +version = 4 [metadata] +global_quality = True +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra weight = 0 -global_quality = True [values] layer_height = 0.08 layer_height_0 = 0.12 +support_interface_height = =layer_height*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/makeblock/makeblock_mcreate_pla_normal.inst.cfg b/resources/quality/makeblock/makeblock_mcreate_pla_normal.inst.cfg index fd23af15a1..21db1f0e90 100644 --- a/resources/quality/makeblock/makeblock_mcreate_pla_normal.inst.cfg +++ b/resources/quality/makeblock/makeblock_mcreate_pla_normal.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Fine definition = makeblock_mcreate +name = Fine +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = generic_pla [values] +adhesion_type = skirt default_material_print_temperature = 190 -material_initial_print_temperature = 190 material_final_print_temperature = 185 material_flow = 94 +material_initial_print_temperature = 190 retraction_speed = 55 skirt_line_count = 2 -adhesion_type = skirt + diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_draft.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_draft.inst.cfg index c1736a9e3f..56d7999c74 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_draft.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_draft.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Fast definition = malyan_m200 +name = Fast +version = 4 [metadata] +material = generic_abs +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -material = generic_abs [values] material_bed_temperature = 70 material_bed_temperature_layer_0 = 70 + diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_fast.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_fast.inst.cfg index 8a5c3e43a7..ca6f73c4f6 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_fast.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_fast.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Normal definition = malyan_m200 +name = Normal +version = 4 [metadata] +material = generic_abs +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -1 -material = generic_abs [values] material_bed_temperature = 70 material_bed_temperature_layer_0 = 70 + diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_high.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_high.inst.cfg index b6de1bfcbe..ae1c2c9b2e 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_high.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_high.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Finer definition = malyan_m200 +name = Finer +version = 4 [metadata] +material = generic_abs +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -material = generic_abs [values] material_bed_temperature = 70 material_bed_temperature_layer_0 = 70 + diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_normal.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_normal.inst.cfg index 7ff2cc5bf5..a5cc61d446 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_normal.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_normal.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Fine definition = malyan_m200 +name = Fine +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = generic_abs [values] material_bed_temperature = 70 material_bed_temperature_layer_0 = 70 + diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_superdraft.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_superdraft.inst.cfg index 85ed8e562b..7ae4cfc214 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_superdraft.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_superdraft.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Lowest Quality Draft definition = malyan_m200 +name = Lowest Quality Draft +version = 4 [metadata] +material = generic_abs +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft weight = -5 -material = generic_abs [values] material_bed_temperature = 70 material_bed_temperature_layer_0 = 70 + diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_thickerdraft.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_thickerdraft.inst.cfg index d59ba3501b..5faae7cf95 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_thickerdraft.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_thickerdraft.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Draft definition = malyan_m200 +name = Draft +version = 4 [metadata] +material = generic_abs +quality_type = thickerdraft setting_version = 20 type = quality -quality_type = thickerdraft weight = -3 -material = generic_abs [values] material_bed_temperature = 70 material_bed_temperature_layer_0 = 70 + diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_ultra.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_ultra.inst.cfg index baef7c9df8..65759d68ee 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_ultra.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_ultra.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Ultra Fine definition = malyan_m200 +name = Ultra Fine +version = 4 [metadata] +material = generic_abs +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra weight = 2 -material = generic_abs [values] material_bed_temperature = 70 material_bed_temperature_layer_0 = 70 + diff --git a/resources/quality/malyan_m200/abs/malyan_m200_abs_verydraft.inst.cfg b/resources/quality/malyan_m200/abs/malyan_m200_abs_verydraft.inst.cfg index 461b2f5d2e..feab11ed9d 100644 --- a/resources/quality/malyan_m200/abs/malyan_m200_abs_verydraft.inst.cfg +++ b/resources/quality/malyan_m200/abs/malyan_m200_abs_verydraft.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Low Detail Draft definition = malyan_m200 +name = Low Detail Draft +version = 4 [metadata] +material = generic_abs +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft weight = -3 -material = generic_abs [values] material_bed_temperature = 70 material_bed_temperature_layer_0 = 70 + diff --git a/resources/quality/malyan_m200/malyan_m200_global_Draft_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_Draft_Quality.inst.cfg index 7048d1ee68..23e113fc8a 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_Draft_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_Draft_Quality.inst.cfg @@ -1,23 +1,24 @@ [general] -version = 4 -name = Fast definition = malyan_m200 +name = Fast +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] -layer_height = 0.21875 -layer_height_0 = 0.2625 -wall_thickness = 1.05 -top_bottom_thickness = 0.72 -infill_sparse_density = 22 -speed_print = 50 -speed_layer_0 = =round(speed_print * 30 / 50) -speed_topbottom = =math.ceil(speed_print * 20 / 50) cool_min_layer_time = 5 cool_min_speed = 10 +infill_sparse_density = 22 +layer_height = 0.21875 +layer_height_0 = 0.2625 +speed_layer_0 = =round(speed_print * 30 / 50) +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 20 / 50) +top_bottom_thickness = 0.72 +wall_thickness = 1.05 + diff --git a/resources/quality/malyan_m200/malyan_m200_global_Fast_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_Fast_Quality.inst.cfg index 3058c2aa32..1b40adf07f 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_Fast_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_Fast_Quality.inst.cfg @@ -1,23 +1,24 @@ [general] -version = 4 -name = Normal definition = malyan_m200 +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -1 -global_quality = True [values] -layer_height = 0.175 -layer_height_0 = 0.2625 -wall_thickness = 1.05 -top_bottom_thickness = 0.72 -infill_sparse_density = 22 -speed_print = 50 -speed_layer_0 = =round(speed_print * 30 / 50) -speed_topbottom = =math.ceil(speed_print * 20 / 50) cool_min_layer_time = 5 cool_min_speed = 10 +infill_sparse_density = 22 +layer_height = 0.175 +layer_height_0 = 0.2625 +speed_layer_0 = =round(speed_print * 30 / 50) +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 20 / 50) +top_bottom_thickness = 0.72 +wall_thickness = 1.05 + diff --git a/resources/quality/malyan_m200/malyan_m200_global_High_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_High_Quality.inst.cfg index a962f5f791..f6c2d13a7c 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_High_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_High_Quality.inst.cfg @@ -1,23 +1,24 @@ [general] -version = 4 -name = Finer definition = malyan_m200 +name = Finer +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -global_quality = True [values] -layer_height = 0.0875 -layer_height_0 = 0.2625 -wall_thickness = 1.05 -top_bottom_thickness = 0.72 -infill_sparse_density = 22 -speed_print = 50 -speed_layer_0 = =round(speed_print * 30 / 50) -speed_topbottom = =math.ceil(speed_print * 20 / 50) cool_min_layer_time = 5 cool_min_speed = 10 +infill_sparse_density = 22 +layer_height = 0.0875 +layer_height_0 = 0.2625 +speed_layer_0 = =round(speed_print * 30 / 50) +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 20 / 50) +top_bottom_thickness = 0.72 +wall_thickness = 1.05 + diff --git a/resources/quality/malyan_m200/malyan_m200_global_Normal_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_Normal_Quality.inst.cfg index 7ca6519a4e..426c8e8cad 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_Normal_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_Normal_Quality.inst.cfg @@ -1,23 +1,24 @@ [general] -version = 4 -name = Fine definition = malyan_m200 +name = Fine +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] -layer_height = 0.13125 -layer_height_0 = 0.2625 -wall_thickness = 1.05 -top_bottom_thickness = 0.72 -infill_sparse_density = 22 -speed_print = 50 -speed_layer_0 = =round(speed_print * 30 / 50) -speed_topbottom = =math.ceil(speed_print * 20 / 50) cool_min_layer_time = 5 cool_min_speed = 10 +infill_sparse_density = 22 +layer_height = 0.13125 +layer_height_0 = 0.2625 +speed_layer_0 = =round(speed_print * 30 / 50) +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 20 / 50) +top_bottom_thickness = 0.72 +wall_thickness = 1.05 + diff --git a/resources/quality/malyan_m200/malyan_m200_global_SuperDraft_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_SuperDraft_Quality.inst.cfg index 0a1ab8eafd..12b3795566 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_SuperDraft_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_SuperDraft_Quality.inst.cfg @@ -1,23 +1,24 @@ [general] -version = 4 -name = Lowest Quality Draft definition = malyan_m200 +name = Lowest Quality Draft +version = 4 [metadata] +global_quality = True +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft weight = -5 -global_quality = True [values] -layer_height = 0.35 -layer_height_0 = 0.35 -wall_thickness = 1.05 -top_bottom_thickness = 0.72 -infill_sparse_density = 22 -speed_print = 50 -speed_layer_0 = =round(speed_print * 30 / 50) -speed_topbottom = =math.ceil(speed_print * 20 / 50) cool_min_layer_time = 5 cool_min_speed = 10 +infill_sparse_density = 22 +layer_height = 0.35 +layer_height_0 = 0.35 +speed_layer_0 = =round(speed_print * 30 / 50) +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 20 / 50) +top_bottom_thickness = 0.72 +wall_thickness = 1.05 + diff --git a/resources/quality/malyan_m200/malyan_m200_global_ThickerDraft_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_ThickerDraft_Quality.inst.cfg index b6a34e660e..5e17177bd0 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_ThickerDraft_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_ThickerDraft_Quality.inst.cfg @@ -1,23 +1,24 @@ [general] -version = 4 -name = Draft definition = malyan_m200 +name = Draft +version = 4 [metadata] +global_quality = True +quality_type = thickerdraft setting_version = 20 type = quality -quality_type = thickerdraft weight = -3 -global_quality = True [values] -layer_height = 0.2625 -layer_height_0 = 0.2625 -wall_thickness = 1.05 -top_bottom_thickness = 0.72 -infill_sparse_density = 22 -speed_print = 50 -speed_layer_0 = =round(speed_print * 30 / 50) -speed_topbottom = =math.ceil(speed_print * 20 / 50) cool_min_layer_time = 5 cool_min_speed = 10 +infill_sparse_density = 22 +layer_height = 0.2625 +layer_height_0 = 0.2625 +speed_layer_0 = =round(speed_print * 30 / 50) +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 20 / 50) +top_bottom_thickness = 0.72 +wall_thickness = 1.05 + diff --git a/resources/quality/malyan_m200/malyan_m200_global_Ultra_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_Ultra_Quality.inst.cfg index 846bd79a64..2df3381529 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_Ultra_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_Ultra_Quality.inst.cfg @@ -1,23 +1,24 @@ [general] -version = 4 -name = Ultra Fine definition = malyan_m200 +name = Ultra Fine +version = 4 [metadata] +global_quality = True +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra weight = 2 -global_quality = True [values] -layer_height = 0.04375 -layer_height_0 = 0.2625 -wall_thickness = 1.05 -top_bottom_thickness = 0.72 -infill_sparse_density = 22 -speed_print = 50 -speed_layer_0 = =round(speed_print * 30 / 50) -speed_topbottom = =math.ceil(speed_print * 20 / 50) cool_min_layer_time = 5 cool_min_speed = 10 +infill_sparse_density = 22 +layer_height = 0.04375 +layer_height_0 = 0.2625 +speed_layer_0 = =round(speed_print * 30 / 50) +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 20 / 50) +top_bottom_thickness = 0.72 +wall_thickness = 1.05 + diff --git a/resources/quality/malyan_m200/malyan_m200_global_VeryDraft_Quality.inst.cfg b/resources/quality/malyan_m200/malyan_m200_global_VeryDraft_Quality.inst.cfg index 2cc1158e3d..c27e3272ce 100644 --- a/resources/quality/malyan_m200/malyan_m200_global_VeryDraft_Quality.inst.cfg +++ b/resources/quality/malyan_m200/malyan_m200_global_VeryDraft_Quality.inst.cfg @@ -1,23 +1,24 @@ [general] -version = 4 -name = Low Detail Draft definition = malyan_m200 +name = Low Detail Draft +version = 4 [metadata] +global_quality = True +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft weight = -3 -global_quality = True [values] -layer_height = 0.30625 -layer_height_0 = 0.30625 -wall_thickness = 1.05 -top_bottom_thickness = 0.72 -infill_sparse_density = 22 -speed_print = 50 -speed_layer_0 = =round(speed_print * 30 / 50) -speed_topbottom = =math.ceil(speed_print * 20 / 50) cool_min_layer_time = 5 cool_min_speed = 10 +infill_sparse_density = 22 +layer_height = 0.30625 +layer_height_0 = 0.30625 +speed_layer_0 = =round(speed_print * 30 / 50) +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 20 / 50) +top_bottom_thickness = 0.72 +wall_thickness = 1.05 + diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_draft.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_draft.inst.cfg index 6a4b184b1c..7ae8941b99 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_draft.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_draft.inst.cfg @@ -1,11 +1,12 @@ [general] -version = 4 -name = Fast definition = malyan_m200 +name = Fast +version = 4 [metadata] +material = generic_petg +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -material = generic_petg + diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_fast.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_fast.inst.cfg index 02ddbfb826..5a3a263da2 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_fast.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_fast.inst.cfg @@ -1,11 +1,12 @@ [general] -version = 4 -name = Normal definition = malyan_m200 +name = Normal +version = 4 [metadata] +material = generic_petg +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -1 -material = generic_petg + diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_high.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_high.inst.cfg index bc1ce677b8..ce7d7e7390 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_high.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_high.inst.cfg @@ -1,11 +1,12 @@ [general] -version = 4 -name = Finer definition = malyan_m200 +name = Finer +version = 4 [metadata] +material = generic_petg +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -material = generic_petg + diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_normal.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_normal.inst.cfg index 24f085d156..61b788b98a 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_normal.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_normal.inst.cfg @@ -1,11 +1,12 @@ [general] -version = 4 -name = Fine definition = malyan_m200 +name = Fine +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = generic_petg + diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_superdraft.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_superdraft.inst.cfg index 851c111173..dbd7f30118 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_superdraft.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_superdraft.inst.cfg @@ -1,11 +1,12 @@ [general] -version = 4 -name = Lowest Quality Draft definition = malyan_m200 +name = Lowest Quality Draft +version = 4 [metadata] +material = generic_petg +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft weight = -5 -material = generic_petg + diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_thickerdraft.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_thickerdraft.inst.cfg index d445b465ea..27695d5322 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_thickerdraft.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_thickerdraft.inst.cfg @@ -1,11 +1,12 @@ [general] -version = 4 -name = Draft definition = malyan_m200 +name = Draft +version = 4 [metadata] +material = generic_petg +quality_type = thickerdraft setting_version = 20 type = quality -quality_type = thickerdraft weight = -3 -material = generic_petg + diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_ultra.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_ultra.inst.cfg index d4cd1f2f0a..20eb19dcff 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_ultra.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_ultra.inst.cfg @@ -1,11 +1,12 @@ [general] -version = 4 -name = Ultra Fine definition = malyan_m200 +name = Ultra Fine +version = 4 [metadata] +material = generic_petg +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra weight = 2 -material = generic_petg + diff --git a/resources/quality/malyan_m200/petg/malyan_m200_petg_verydraft.inst.cfg b/resources/quality/malyan_m200/petg/malyan_m200_petg_verydraft.inst.cfg index 3f5ff9fd3b..11b1e6845f 100644 --- a/resources/quality/malyan_m200/petg/malyan_m200_petg_verydraft.inst.cfg +++ b/resources/quality/malyan_m200/petg/malyan_m200_petg_verydraft.inst.cfg @@ -1,11 +1,12 @@ [general] -version = 4 -name = Low Detail Draft definition = malyan_m200 +name = Low Detail Draft +version = 4 [metadata] +material = generic_petg +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft weight = -3 -material = generic_petg + diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_draft.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_draft.inst.cfg index 54ba134c9e..da18913f68 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_draft.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_draft.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Fast definition = malyan_m200 +name = Fast +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -material = generic_pla [values] material_bed_temperature = 60 material_bed_temperature_layer_0 = 60 + diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_fast.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_fast.inst.cfg index 5d6e756ff8..696ed33136 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_fast.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_fast.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Normal definition = malyan_m200 +name = Normal +version = 4 [metadata] +material = generic_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -1 -material = generic_pla [values] material_bed_temperature = 60 material_bed_temperature_layer_0 = 60 + diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_high.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_high.inst.cfg index 00b7c88ceb..e76e0be282 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_high.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_high.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Finer definition = malyan_m200 +name = Finer +version = 4 [metadata] +material = generic_pla +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -material = generic_pla [values] material_bed_temperature = 60 material_bed_temperature_layer_0 = 60 + diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_normal.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_normal.inst.cfg index 9900785a02..b2d36662be 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_normal.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_normal.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Fine definition = malyan_m200 +name = Fine +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = generic_pla [values] material_bed_temperature = 60 material_bed_temperature_layer_0 = 60 + diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_superdraft.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_superdraft.inst.cfg index 8b0ed84d0b..5be981b7b8 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_superdraft.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_superdraft.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Lowest Quality Draft definition = malyan_m200 +name = Lowest Quality Draft +version = 4 [metadata] +material = generic_pla +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft weight = -5 -material = generic_pla [values] material_bed_temperature = 60 material_bed_temperature_layer_0 = 60 + diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_thickerdraft.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_thickerdraft.inst.cfg index e750a3798c..98ead23059 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_thickerdraft.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_thickerdraft.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Draft definition = malyan_m200 +name = Draft +version = 4 [metadata] +material = generic_pla +quality_type = thickerdraft setting_version = 20 type = quality -quality_type = thickerdraft weight = -3 -material = generic_pla [values] material_bed_temperature = 60 material_bed_temperature_layer_0 = 60 + diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_ultra.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_ultra.inst.cfg index 54c97ce6a1..43ad6354b0 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_ultra.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_ultra.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Ultra Fine definition = malyan_m200 +name = Ultra Fine +version = 4 [metadata] +material = generic_pla +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra weight = 2 -material = generic_pla [values] material_bed_temperature = 60 material_bed_temperature_layer_0 = 60 + diff --git a/resources/quality/malyan_m200/pla/malyan_m200_pla_verydraft.inst.cfg b/resources/quality/malyan_m200/pla/malyan_m200_pla_verydraft.inst.cfg index d28d87748f..9ac0e062c4 100644 --- a/resources/quality/malyan_m200/pla/malyan_m200_pla_verydraft.inst.cfg +++ b/resources/quality/malyan_m200/pla/malyan_m200_pla_verydraft.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Low Detail Draft definition = malyan_m200 +name = Low Detail Draft +version = 4 [metadata] +material = generic_pla +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft weight = -3 -material = generic_pla [values] material_bed_temperature = 60 material_bed_temperature_layer_0 = 60 + 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 a290d894e0..839c3f0a7b 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Super Quality definition = mingda_base +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_abs variant = 0.2mm Nozzle [values] +raft_airgap = 0.1 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 7b4f45bbb9..5bbd340f9e 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Ultra Quality definition = mingda_base +name = Ultra Quality +version = 4 [metadata] +material = generic_abs +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra -material = generic_abs variant = 0.2mm Nozzle [values] +raft_airgap = 0.1 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 aea32319cd..e31ce94061 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = mingda_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_abs +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_abs variant = 0.3mm Nozzle [values] +raft_airgap = 0.1 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 dcc0c48812..8ad2f698d1 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 @@ -1,18 +1,18 @@ [general] -version = 4 -name = Low Quality definition = mingda_base +name = Low Quality +version = 4 [metadata] +material = generic_abs +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_abs variant = 0.3mm Nozzle [values] -wall_thickness = =line_width*4 - raft_airgap = 0.1 raft_interface_thickness = 0.2 raft_surface_thickness = 0.2 +wall_thickness = =line_width*4 + 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 687a605422..ff9ff7d18a 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 @@ -1,17 +1,17 @@ [general] -version = 4 -name = Standard Quality definition = mingda_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_abs variant = 0.3mm Nozzle [values] -wall_thickness = =line_width*4 - raft_airgap = 0.1 raft_interface_thickness = =round(layer_height, 2) +wall_thickness = =line_width*4 + 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 c67c5e9ea6..2a7ccb1f2f 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Super Quality definition = mingda_base +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_abs variant = 0.3mm Nozzle [values] +raft_airgap = 0.1 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 cd3ba80866..e74d24fffd 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = mingda_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_abs +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_abs variant = 0.4mm Nozzle [values] +raft_airgap = 0.1 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 2f335102fe..790c610f22 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 @@ -1,17 +1,17 @@ [general] -version = 4 -name = Low Quality definition = mingda_base +name = Low Quality +version = 4 [metadata] +material = generic_abs +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_abs variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 - raft_airgap = 0.1 raft_interface_thickness = 0.3 +wall_thickness = =line_width*4 + 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 fcf26711f7..55339dceea 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = mingda_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_abs variant = 0.4mm Nozzle [values] +raft_airgap = 0.1 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 f18e33b7bd..f7cbdb839a 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Super Quality definition = mingda_base +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_abs variant = 0.4mm Nozzle [values] +raft_airgap = 0.1 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 71f24f53dd..dcb0bcbee5 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = mingda_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_abs +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_abs variant = 0.5mm Nozzle [values] +raft_airgap = 0.1 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 8a7f59c5d3..ca88324a9b 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Low Quality definition = mingda_base +name = Low Quality +version = 4 [metadata] +material = generic_abs +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_abs variant = 0.5mm Nozzle [values] +raft_airgap = 0.1 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 7a9bc4b647..e69c7a4201 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = mingda_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_abs variant = 0.5mm Nozzle [values] +raft_airgap = 0.1 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 4604328d8c..8df60bbdb3 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Super Quality definition = mingda_base +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_abs variant = 0.5mm Nozzle [values] +raft_airgap = 0.1 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 6dad91e842..f078f0d6c9 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = mingda_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_abs variant = 0.6mm Nozzle [values] +raft_airgap = 0.1 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 4c2df1ef24..3de299156e 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Draft Quality definition = mingda_base +name = Draft Quality +version = 4 [metadata] +material = generic_abs +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_abs variant = 0.8mm Nozzle [values] +raft_airgap = 0.1 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 5c38398af0..a17b2fdaf6 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Draft Quality definition = mingda_base +name = Draft Quality +version = 4 [metadata] +material = generic_abs +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_abs variant = 1.0mm Nozzle [values] +raft_airgap = 0.1 wall_thickness = =line_width*3 -raft_airgap = 0.1 diff --git a/resources/quality/mingda/PETG/mingda_0.2_PETG_super.inst.cfg b/resources/quality/mingda/PETG/mingda_0.2_PETG_super.inst.cfg index add589b0fa..b204da5105 100644 --- a/resources/quality/mingda/PETG/mingda_0.2_PETG_super.inst.cfg +++ b/resources/quality/mingda/PETG/mingda_0.2_PETG_super.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Super Quality definition = mingda_base +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super 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 + diff --git a/resources/quality/mingda/PETG/mingda_0.2_PETG_ultra.inst.cfg b/resources/quality/mingda/PETG/mingda_0.2_PETG_ultra.inst.cfg index f4a1390a39..8490ee8531 100644 --- a/resources/quality/mingda/PETG/mingda_0.2_PETG_ultra.inst.cfg +++ b/resources/quality/mingda/PETG/mingda_0.2_PETG_ultra.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Ultra Quality definition = mingda_base +name = Ultra Quality +version = 4 [metadata] +material = generic_petg +quality_type = ultra 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 + diff --git a/resources/quality/mingda/PETG/mingda_0.3_PETG_adaptive.inst.cfg b/resources/quality/mingda/PETG/mingda_0.3_PETG_adaptive.inst.cfg index c9c045aeee..9009c2c8d6 100644 --- a/resources/quality/mingda/PETG/mingda_0.3_PETG_adaptive.inst.cfg +++ b/resources/quality/mingda/PETG/mingda_0.3_PETG_adaptive.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = mingda_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_petg +quality_type = adaptive 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 + 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 a6f2784f8d..db962dc5d5 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 @@ -1,18 +1,18 @@ [general] -version = 4 -name = Low Quality definition = mingda_base +name = Low Quality +version = 4 [metadata] +material = generic_petg +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_petg variant = 0.3mm Nozzle [values] +raft_interface_thickness = 0.2 +raft_surface_thickness = 0.2 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 f57e3db198..dc46500bfb 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 @@ -1,17 +1,17 @@ [general] -version = 4 -name = Standard Quality definition = mingda_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_petg variant = 0.3mm Nozzle [values] +raft_interface_thickness = =round(layer_height, 2) 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.3_PETG_super.inst.cfg b/resources/quality/mingda/PETG/mingda_0.3_PETG_super.inst.cfg index a12ec007d5..c2d40333b3 100644 --- a/resources/quality/mingda/PETG/mingda_0.3_PETG_super.inst.cfg +++ b/resources/quality/mingda/PETG/mingda_0.3_PETG_super.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Super Quality definition = mingda_base +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super 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 + diff --git a/resources/quality/mingda/PETG/mingda_0.4_PETG_adaptive.inst.cfg b/resources/quality/mingda/PETG/mingda_0.4_PETG_adaptive.inst.cfg index dbf9ba1673..92ca425cf7 100644 --- a/resources/quality/mingda/PETG/mingda_0.4_PETG_adaptive.inst.cfg +++ b/resources/quality/mingda/PETG/mingda_0.4_PETG_adaptive.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = mingda_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_petg +quality_type = adaptive 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 + 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 e2b1d88690..e0edd4290f 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 @@ -1,17 +1,17 @@ [general] -version = 4 -name = Low Quality definition = mingda_base +name = Low Quality +version = 4 [metadata] +material = generic_petg +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_petg variant = 0.4mm Nozzle [values] +raft_interface_thickness = 0.3 speed_layer_0 = 15 wall_thickness = =line_width*4 -raft_interface_thickness = 0.3 diff --git a/resources/quality/mingda/PETG/mingda_0.4_PETG_standard.inst.cfg b/resources/quality/mingda/PETG/mingda_0.4_PETG_standard.inst.cfg index 2945f57d32..378d2e43e7 100644 --- a/resources/quality/mingda/PETG/mingda_0.4_PETG_standard.inst.cfg +++ b/resources/quality/mingda/PETG/mingda_0.4_PETG_standard.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = mingda_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = standard 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 + diff --git a/resources/quality/mingda/PETG/mingda_0.4_PETG_super.inst.cfg b/resources/quality/mingda/PETG/mingda_0.4_PETG_super.inst.cfg index fedb5ce674..f44352145c 100644 --- a/resources/quality/mingda/PETG/mingda_0.4_PETG_super.inst.cfg +++ b/resources/quality/mingda/PETG/mingda_0.4_PETG_super.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Super Quality definition = mingda_base +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super 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 + diff --git a/resources/quality/mingda/PETG/mingda_0.5_PETG_adaptive.inst.cfg b/resources/quality/mingda/PETG/mingda_0.5_PETG_adaptive.inst.cfg index b0539c81f0..ee06f04cd4 100644 --- a/resources/quality/mingda/PETG/mingda_0.5_PETG_adaptive.inst.cfg +++ b/resources/quality/mingda/PETG/mingda_0.5_PETG_adaptive.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = mingda_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_petg +quality_type = adaptive 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 + diff --git a/resources/quality/mingda/PETG/mingda_0.5_PETG_low.inst.cfg b/resources/quality/mingda/PETG/mingda_0.5_PETG_low.inst.cfg index 3138ed5c91..2d4bb2af87 100644 --- a/resources/quality/mingda/PETG/mingda_0.5_PETG_low.inst.cfg +++ b/resources/quality/mingda/PETG/mingda_0.5_PETG_low.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Low Quality definition = mingda_base +name = Low Quality +version = 4 [metadata] +material = generic_petg +quality_type = low 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 + diff --git a/resources/quality/mingda/PETG/mingda_0.5_PETG_standard.inst.cfg b/resources/quality/mingda/PETG/mingda_0.5_PETG_standard.inst.cfg index 5eeefa8103..47cb96106a 100644 --- a/resources/quality/mingda/PETG/mingda_0.5_PETG_standard.inst.cfg +++ b/resources/quality/mingda/PETG/mingda_0.5_PETG_standard.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = mingda_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = standard 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 + diff --git a/resources/quality/mingda/PETG/mingda_0.5_PETG_super.inst.cfg b/resources/quality/mingda/PETG/mingda_0.5_PETG_super.inst.cfg index 78b583913b..778ace3878 100644 --- a/resources/quality/mingda/PETG/mingda_0.5_PETG_super.inst.cfg +++ b/resources/quality/mingda/PETG/mingda_0.5_PETG_super.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Super Quality definition = mingda_base +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super 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 + diff --git a/resources/quality/mingda/PETG/mingda_0.6_PETG_standard.inst.cfg b/resources/quality/mingda/PETG/mingda_0.6_PETG_standard.inst.cfg index 8df0421d84..34b7c93efc 100644 --- a/resources/quality/mingda/PETG/mingda_0.6_PETG_standard.inst.cfg +++ b/resources/quality/mingda/PETG/mingda_0.6_PETG_standard.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = mingda_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = standard 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 + diff --git a/resources/quality/mingda/PETG/mingda_0.8_PETG_draft.inst.cfg b/resources/quality/mingda/PETG/mingda_0.8_PETG_draft.inst.cfg index 1e94e2e887..1c6c1e5b24 100644 --- a/resources/quality/mingda/PETG/mingda_0.8_PETG_draft.inst.cfg +++ b/resources/quality/mingda/PETG/mingda_0.8_PETG_draft.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Draft Quality definition = mingda_base +name = Draft Quality +version = 4 [metadata] +material = generic_petg +quality_type = draft 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 + diff --git a/resources/quality/mingda/PETG/mingda_1.0_PETG_draft.inst.cfg b/resources/quality/mingda/PETG/mingda_1.0_PETG_draft.inst.cfg index 4581ee5047..8579f30837 100644 --- a/resources/quality/mingda/PETG/mingda_1.0_PETG_draft.inst.cfg +++ b/resources/quality/mingda/PETG/mingda_1.0_PETG_draft.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Draft Quality definition = mingda_base +name = Draft Quality +version = 4 [metadata] +material = generic_petg +quality_type = draft 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 + diff --git a/resources/quality/mingda/PLA/mingda_0.2_PLA_super.inst.cfg b/resources/quality/mingda/PLA/mingda_0.2_PLA_super.inst.cfg index 09bbf768fc..424141628f 100644 --- a/resources/quality/mingda/PLA/mingda_0.2_PLA_super.inst.cfg +++ b/resources/quality/mingda/PLA/mingda_0.2_PLA_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = mingda_base +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla variant = 0.2mm Nozzle [values] + diff --git a/resources/quality/mingda/PLA/mingda_0.2_PLA_ultra.inst.cfg b/resources/quality/mingda/PLA/mingda_0.2_PLA_ultra.inst.cfg index 62b59cf986..30ecb5e363 100644 --- a/resources/quality/mingda/PLA/mingda_0.2_PLA_ultra.inst.cfg +++ b/resources/quality/mingda/PLA/mingda_0.2_PLA_ultra.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Ultra Quality definition = mingda_base +name = Ultra Quality +version = 4 [metadata] +material = generic_pla +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra -material = generic_pla variant = 0.2mm Nozzle [values] + diff --git a/resources/quality/mingda/PLA/mingda_0.3_PLA_adaptive.inst.cfg b/resources/quality/mingda/PLA/mingda_0.3_PLA_adaptive.inst.cfg index 0ad767091b..f2ab826437 100644 --- a/resources/quality/mingda/PLA/mingda_0.3_PLA_adaptive.inst.cfg +++ b/resources/quality/mingda/PLA/mingda_0.3_PLA_adaptive.inst.cfg @@ -1,12 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = mingda_base +name = Dynamic Quality +version = 4 + [metadata] +material = generic_pla +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_pla variant = 0.3mm Nozzle [values] + 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 73143d9c9d..4daf4255fa 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 @@ -1,15 +1,16 @@ [general] -version = 4 -name = Low Quality definition = mingda_base +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -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 0da6cf8201..c8961e7986 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = mingda_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_pla variant = 0.3mm Nozzle [values] raft_interface_thickness = =round(layer_height, 2) + diff --git a/resources/quality/mingda/PLA/mingda_0.3_PLA_super.inst.cfg b/resources/quality/mingda/PLA/mingda_0.3_PLA_super.inst.cfg index b282a96ecd..c005c17f6b 100644 --- a/resources/quality/mingda/PLA/mingda_0.3_PLA_super.inst.cfg +++ b/resources/quality/mingda/PLA/mingda_0.3_PLA_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = mingda_base +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/mingda/PLA/mingda_0.4_PLA_adaptive.inst.cfg b/resources/quality/mingda/PLA/mingda_0.4_PLA_adaptive.inst.cfg index 521d667ff6..a3b8a56991 100644 --- a/resources/quality/mingda/PLA/mingda_0.4_PLA_adaptive.inst.cfg +++ b/resources/quality/mingda/PLA/mingda_0.4_PLA_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = mingda_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_pla +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_pla variant = 0.4mm Nozzle [values] + 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 c8970c8d0c..c0a2d3295f 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = mingda_base +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla variant = 0.4mm Nozzle [values] raft_interface_thickness = 0.3 + diff --git a/resources/quality/mingda/PLA/mingda_0.4_PLA_standard.inst.cfg b/resources/quality/mingda/PLA/mingda_0.4_PLA_standard.inst.cfg index 9623aecf06..aff83c70f5 100644 --- a/resources/quality/mingda/PLA/mingda_0.4_PLA_standard.inst.cfg +++ b/resources/quality/mingda/PLA/mingda_0.4_PLA_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = mingda_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_pla variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/mingda/PLA/mingda_0.4_PLA_super.inst.cfg b/resources/quality/mingda/PLA/mingda_0.4_PLA_super.inst.cfg index bd8f1dd177..800e25ac79 100644 --- a/resources/quality/mingda/PLA/mingda_0.4_PLA_super.inst.cfg +++ b/resources/quality/mingda/PLA/mingda_0.4_PLA_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = mingda_base +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/mingda/PLA/mingda_0.5_PLA_adaptive.inst.cfg b/resources/quality/mingda/PLA/mingda_0.5_PLA_adaptive.inst.cfg index 84b254bdfa..4bb343162a 100644 --- a/resources/quality/mingda/PLA/mingda_0.5_PLA_adaptive.inst.cfg +++ b/resources/quality/mingda/PLA/mingda_0.5_PLA_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = mingda_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_pla +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_pla variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/mingda/PLA/mingda_0.5_PLA_low.inst.cfg b/resources/quality/mingda/PLA/mingda_0.5_PLA_low.inst.cfg index b9d7afacdc..bf80e0e722 100644 --- a/resources/quality/mingda/PLA/mingda_0.5_PLA_low.inst.cfg +++ b/resources/quality/mingda/PLA/mingda_0.5_PLA_low.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low Quality definition = mingda_base +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/mingda/PLA/mingda_0.5_PLA_standard.inst.cfg b/resources/quality/mingda/PLA/mingda_0.5_PLA_standard.inst.cfg index 5e3b10ece0..abd68d5c00 100644 --- a/resources/quality/mingda/PLA/mingda_0.5_PLA_standard.inst.cfg +++ b/resources/quality/mingda/PLA/mingda_0.5_PLA_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = mingda_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_pla variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/mingda/PLA/mingda_0.5_PLA_super.inst.cfg b/resources/quality/mingda/PLA/mingda_0.5_PLA_super.inst.cfg index c5526da793..da19022e2d 100644 --- a/resources/quality/mingda/PLA/mingda_0.5_PLA_super.inst.cfg +++ b/resources/quality/mingda/PLA/mingda_0.5_PLA_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = mingda_base +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/mingda/PLA/mingda_0.6_PLA_draft.inst.cfg b/resources/quality/mingda/PLA/mingda_0.6_PLA_draft.inst.cfg index caba25f84d..1fe6594eb3 100644 --- a/resources/quality/mingda/PLA/mingda_0.6_PLA_draft.inst.cfg +++ b/resources/quality/mingda/PLA/mingda_0.6_PLA_draft.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = mingda_base +name = Draft Quality +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_pla variant = 0.6mm Nozzle [values] + diff --git a/resources/quality/mingda/PLA/mingda_0.6_PLA_low.inst.cfg b/resources/quality/mingda/PLA/mingda_0.6_PLA_low.inst.cfg index c78f5fa0ea..b6c38121cc 100644 --- a/resources/quality/mingda/PLA/mingda_0.6_PLA_low.inst.cfg +++ b/resources/quality/mingda/PLA/mingda_0.6_PLA_low.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low Quality definition = mingda_base +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla variant = 0.6mm Nozzle [values] + diff --git a/resources/quality/mingda/PLA/mingda_0.6_PLA_standard.inst.cfg b/resources/quality/mingda/PLA/mingda_0.6_PLA_standard.inst.cfg index 9d00a1b364..3b6b6b68a6 100644 --- a/resources/quality/mingda/PLA/mingda_0.6_PLA_standard.inst.cfg +++ b/resources/quality/mingda/PLA/mingda_0.6_PLA_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = mingda_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_pla variant = 0.6mm Nozzle [values] + diff --git a/resources/quality/mingda/PLA/mingda_0.8_PLA_draft.inst.cfg b/resources/quality/mingda/PLA/mingda_0.8_PLA_draft.inst.cfg index 60c45c2100..ad38828f33 100644 --- a/resources/quality/mingda/PLA/mingda_0.8_PLA_draft.inst.cfg +++ b/resources/quality/mingda/PLA/mingda_0.8_PLA_draft.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = mingda_base +name = Draft Quality +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_pla variant = 0.8mm Nozzle [values] + diff --git a/resources/quality/mingda/PLA/mingda_1.0_PLA_draft.inst.cfg b/resources/quality/mingda/PLA/mingda_1.0_PLA_draft.inst.cfg index 9dc0023c5c..cd36c8a3e1 100644 --- a/resources/quality/mingda/PLA/mingda_1.0_PLA_draft.inst.cfg +++ b/resources/quality/mingda/PLA/mingda_1.0_PLA_draft.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = mingda_base +name = Draft Quality +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_pla variant = 1.0mm Nozzle [values] + diff --git a/resources/quality/mingda/TPU/mingda_0.3_TPU_adaptive.inst.cfg b/resources/quality/mingda/TPU/mingda_0.3_TPU_adaptive.inst.cfg index 8705744072..14d94407b2 100644 --- a/resources/quality/mingda/TPU/mingda_0.3_TPU_adaptive.inst.cfg +++ b/resources/quality/mingda/TPU/mingda_0.3_TPU_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = mingda_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_tpu +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_tpu variant = 0.3mm Nozzle [values] + 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 b2a607705f..06ca1c610e 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = mingda_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_tpu variant = 0.3mm Nozzle [values] raft_interface_thickness = =round(layer_height, 2) + diff --git a/resources/quality/mingda/TPU/mingda_0.3_TPU_super.inst.cfg b/resources/quality/mingda/TPU/mingda_0.3_TPU_super.inst.cfg index b2be126343..9a05cf1edf 100644 --- a/resources/quality/mingda/TPU/mingda_0.3_TPU_super.inst.cfg +++ b/resources/quality/mingda/TPU/mingda_0.3_TPU_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = mingda_base +name = Super Quality +version = 4 [metadata] +material = generic_tpu +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_tpu variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/mingda/TPU/mingda_0.4_TPU_adaptive.inst.cfg b/resources/quality/mingda/TPU/mingda_0.4_TPU_adaptive.inst.cfg index 5dde34a112..5d57350659 100644 --- a/resources/quality/mingda/TPU/mingda_0.4_TPU_adaptive.inst.cfg +++ b/resources/quality/mingda/TPU/mingda_0.4_TPU_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = mingda_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_tpu +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_tpu variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/mingda/TPU/mingda_0.4_TPU_standard.inst.cfg b/resources/quality/mingda/TPU/mingda_0.4_TPU_standard.inst.cfg index 397541f1ca..03aebbd14a 100644 --- a/resources/quality/mingda/TPU/mingda_0.4_TPU_standard.inst.cfg +++ b/resources/quality/mingda/TPU/mingda_0.4_TPU_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = mingda_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_tpu variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/mingda/TPU/mingda_0.4_TPU_super.inst.cfg b/resources/quality/mingda/TPU/mingda_0.4_TPU_super.inst.cfg index cacbe479e2..7e03a31537 100644 --- a/resources/quality/mingda/TPU/mingda_0.4_TPU_super.inst.cfg +++ b/resources/quality/mingda/TPU/mingda_0.4_TPU_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = mingda_base +name = Super Quality +version = 4 [metadata] +material = generic_tpu +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_tpu variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/mingda/TPU/mingda_0.5_TPU_adaptive.inst.cfg b/resources/quality/mingda/TPU/mingda_0.5_TPU_adaptive.inst.cfg index e8550a6ff4..b98bb9fb4b 100644 --- a/resources/quality/mingda/TPU/mingda_0.5_TPU_adaptive.inst.cfg +++ b/resources/quality/mingda/TPU/mingda_0.5_TPU_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = mingda_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_tpu +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_tpu variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/mingda/TPU/mingda_0.5_TPU_standard.inst.cfg b/resources/quality/mingda/TPU/mingda_0.5_TPU_standard.inst.cfg index f6c4e9998a..40a4d2292a 100644 --- a/resources/quality/mingda/TPU/mingda_0.5_TPU_standard.inst.cfg +++ b/resources/quality/mingda/TPU/mingda_0.5_TPU_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = mingda_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_tpu variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/mingda/TPU/mingda_0.5_TPU_super.inst.cfg b/resources/quality/mingda/TPU/mingda_0.5_TPU_super.inst.cfg index 86c10513e0..9144171b15 100644 --- a/resources/quality/mingda/TPU/mingda_0.5_TPU_super.inst.cfg +++ b/resources/quality/mingda/TPU/mingda_0.5_TPU_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = mingda_base +name = Super Quality +version = 4 [metadata] +material = generic_tpu +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_tpu variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/mingda/TPU/mingda_0.6_TPU_standard.inst.cfg b/resources/quality/mingda/TPU/mingda_0.6_TPU_standard.inst.cfg index b84ddafd99..e83efd7b23 100644 --- a/resources/quality/mingda/TPU/mingda_0.6_TPU_standard.inst.cfg +++ b/resources/quality/mingda/TPU/mingda_0.6_TPU_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = mingda_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_tpu variant = 0.6mm Nozzle [values] + diff --git a/resources/quality/mingda/TPU/mingda_0.8_TPU_draft.inst.cfg b/resources/quality/mingda/TPU/mingda_0.8_TPU_draft.inst.cfg index 990475987a..1cd168cb4a 100644 --- a/resources/quality/mingda/TPU/mingda_0.8_TPU_draft.inst.cfg +++ b/resources/quality/mingda/TPU/mingda_0.8_TPU_draft.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = mingda_base +name = Draft Quality +version = 4 [metadata] +material = generic_tpu +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_tpu variant = 0.8mm Nozzle [values] + diff --git a/resources/quality/mingda/TPU/mingda_1.0_TPU_draft.inst.cfg b/resources/quality/mingda/TPU/mingda_1.0_TPU_draft.inst.cfg index 111684bb61..fff3ca7922 100644 --- a/resources/quality/mingda/TPU/mingda_1.0_TPU_draft.inst.cfg +++ b/resources/quality/mingda/TPU/mingda_1.0_TPU_draft.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = mingda_base +name = Draft Quality +version = 4 [metadata] +material = generic_tpu +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_tpu variant = 1.0mm Nozzle [values] + diff --git a/resources/quality/mingda/mingda_global_adaptive.inst.cfg b/resources/quality/mingda/mingda_global_adaptive.inst.cfg index 7fcfaa3c96..153a8faec2 100644 --- a/resources/quality/mingda/mingda_global_adaptive.inst.cfg +++ b/resources/quality/mingda/mingda_global_adaptive.inst.cfg @@ -1,33 +1,31 @@ [general] -version = 4 -name = Dynamic Quality definition = mingda_base +name = Dynamic Quality +version = 4 [metadata] +global_quality = True +quality_type = adaptive 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 - 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 +layer_height = 0.16 +layer_height_0 = 0.20 raft_airgap = 0.18 raft_base_thickness = =round(layer_height*1.5, 2) raft_interface_thickness = =round(layer_height*1.2, 2) +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) +support_interface_height = =layer_height*6 +top_bottom_thickness = =layer_height_0+layer_height*4 +wall_thickness = =line_width*3 + diff --git a/resources/quality/mingda/mingda_global_draft.inst.cfg b/resources/quality/mingda/mingda_global_draft.inst.cfg index bb6ae41101..e29bdceebe 100644 --- a/resources/quality/mingda/mingda_global_draft.inst.cfg +++ b/resources/quality/mingda/mingda_global_draft.inst.cfg @@ -1,36 +1,32 @@ [general] -version = 4 -name = Draft Quality definition = mingda_base +name = Draft Quality +version = 4 [metadata] +global_quality = True +quality_type = draft 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 - -jerk_travel = 20 acceleration_print = 2000 -acceleration_wall = 1500 -acceleration_wall_0 = 1000 acceleration_topbottom = 1000 acceleration_travel = 2000 - -infill_sparse_density = 10 +acceleration_wall = 1500 +acceleration_wall_0 = 1000 infill_line_width = =line_width*1 - -speed_print = 50 -speed_wall = 50 - +infill_sparse_density = 10 +jerk_travel = 20 +layer_height = 0.32 +layer_height_0 = 0.32 raft_airgap = 0.18 raft_base_thickness = =round(layer_height*1.5, 2) raft_interface_thickness = =round(layer_height*1.2, 2) +speed_print = 50 +speed_wall = 50 +support_interface_height = =layer_height*4 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 diff --git a/resources/quality/mingda/mingda_global_low.inst.cfg b/resources/quality/mingda/mingda_global_low.inst.cfg index 080e5da12b..5742dc6ff4 100644 --- a/resources/quality/mingda/mingda_global_low.inst.cfg +++ b/resources/quality/mingda/mingda_global_low.inst.cfg @@ -1,35 +1,32 @@ [general] -version = 4 -name = Low Quality definition = mingda_base +name = Low Quality +version = 4 [metadata] +global_quality = True +quality_type = low 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 - -jerk_travel = 20 acceleration_print = 2000 -acceleration_wall = 1500 -acceleration_wall_0 = 1000 acceleration_topbottom = 1000 acceleration_travel = 2000 - -infill_sparse_density = 10 +acceleration_wall = 1500 +acceleration_wall_0 = 1000 infill_line_width = =line_width*1 - -speed_print = 50 -speed_wall = 50 - +infill_sparse_density = 10 +jerk_travel = 20 +layer_height = 0.28 +layer_height_0 = 0.28 raft_airgap = 0.18 raft_base_thickness = =round(layer_height*1.5, 2) raft_interface_thickness = =round(layer_height*1.2, 2) +speed_print = 50 +speed_wall = 50 +support_interface_height = =layer_height*4 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 + diff --git a/resources/quality/mingda/mingda_global_standard.inst.cfg b/resources/quality/mingda/mingda_global_standard.inst.cfg index e59e66882d..a8bd00d674 100644 --- a/resources/quality/mingda/mingda_global_standard.inst.cfg +++ b/resources/quality/mingda/mingda_global_standard.inst.cfg @@ -1,35 +1,32 @@ [general] -version = 4 -name = Standard Quality definition = mingda_base +name = Standard Quality +version = 4 [metadata] +global_quality = True +quality_type = standard 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 - -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 +infill_line_width = =round(line_width * 0.4 / 0.35, 2) +infill_sparse_density = 20 jerk_travel = 50 - +layer_height = 0.2 +layer_height_0 = 0.2 raft_airgap = 0.18 raft_base_thickness = =round(layer_height*1.5, 2) raft_interface_thickness = =round(layer_height*1.2, 2) +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) +support_interface_height = =layer_height*5 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*3 + diff --git a/resources/quality/mingda/mingda_global_super.inst.cfg b/resources/quality/mingda/mingda_global_super.inst.cfg index ce20114662..cdb375d891 100644 --- a/resources/quality/mingda/mingda_global_super.inst.cfg +++ b/resources/quality/mingda/mingda_global_super.inst.cfg @@ -1,26 +1,25 @@ [general] -version = 4 -name = Super Quality definition = mingda_base +name = Super Quality +version = 4 [metadata] +global_quality = True +quality_type = super 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 - infill_line_width = =round(line_width * 0.42 / 0.35, 2) infill_sparse_density = 20 - jerk_travel = 50 +layer_height = 0.12 +layer_height_0 = 0.12 raft_airgap = 0.18 raft_base_thickness = =round(layer_height*1.5, 2) raft_interface_thickness = =round(layer_height*1.2, 2) +support_interface_height = =layer_height*8 +top_bottom_thickness = =layer_height_0+layer_height*6 +wall_thickness = =line_width*3 + diff --git a/resources/quality/mingda/mingda_global_ultra.inst.cfg b/resources/quality/mingda/mingda_global_ultra.inst.cfg index c2b616cb1a..a7382fd1df 100644 --- a/resources/quality/mingda/mingda_global_ultra.inst.cfg +++ b/resources/quality/mingda/mingda_global_ultra.inst.cfg @@ -1,31 +1,29 @@ [general] -version = 4 -name = Ultra Quality definition = mingda_base +name = Ultra Quality +version = 4 [metadata] +global_quality = True +quality_type = ultra 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 - -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 +layer_height = 0.08 +layer_height_0 = 0.12 raft_airgap = 0.18 raft_base_thickness = =round(layer_height*1.5, 2) raft_interface_thickness = =round(layer_height*1.2, 2) +skin_overlap = 10 +speed_layer_0 = 10 +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 35 / 50) +speed_wall = =math.ceil(speed_print * 35 / 50) +support_interface_height = =layer_height*12 +top_bottom_thickness = =layer_height_0+layer_height*10 +wall_thickness = =line_width*3 + diff --git a/resources/quality/mixware_hyper_s/mixware_hyper_s_draft.inst.cfg b/resources/quality/mixware_hyper_s/mixware_hyper_s_draft.inst.cfg index ac188f75cc..43f6f3c3ca 100644 --- a/resources/quality/mixware_hyper_s/mixware_hyper_s_draft.inst.cfg +++ b/resources/quality/mixware_hyper_s/mixware_hyper_s_draft.inst.cfg @@ -1,25 +1,26 @@ [general] -version = 4 -name = Draft definition = mixware_hyper_s +name = Draft +version = 4 [metadata] -type = quality -quality_type = draft global_quality = True +quality_type = draft setting_version = 20 +type = quality [values] +acceleration_enabled = false +infill_before_walls = false +infill_overlap = 30.0 +infill_wipe_dist = 0.0 layer_height = 0.15 retraction_combing = all retraction_extrusion_window = 10 retraction_min_travel = 1.5 -infill_wipe_dist = 0.0 skin_overlap = 10.0 -infill_overlap = 30.0 -wall_0_wipe_dist = 0.0 -support_wall_count = 1 support_brim_enable = false -infill_before_walls = false -acceleration_enabled = false support_enable = true +support_wall_count = 1 +wall_0_wipe_dist = 0.0 + diff --git a/resources/quality/mixware_hyper_s/mixware_hyper_s_extra_fast.inst.cfg b/resources/quality/mixware_hyper_s/mixware_hyper_s_extra_fast.inst.cfg index d0ae456269..528334a879 100644 --- a/resources/quality/mixware_hyper_s/mixware_hyper_s_extra_fast.inst.cfg +++ b/resources/quality/mixware_hyper_s/mixware_hyper_s_extra_fast.inst.cfg @@ -1,25 +1,26 @@ [general] -version = 4 -name = Coarse definition = mixware_hyper_s +name = Coarse +version = 4 [metadata] -type = quality +global_quality = True quality_type = coarse setting_version = 20 -global_quality = True +type = quality [values] +acceleration_enabled = false +infill_before_walls = false +infill_overlap = 30.0 +infill_wipe_dist = 0.0 layer_height = 0.2 retraction_combing = all retraction_extrusion_window = 10 retraction_min_travel = 1.5 -infill_wipe_dist = 0.0 skin_overlap = 10.0 -infill_overlap = 30.0 -wall_0_wipe_dist = 0.0 -support_wall_count = 1 support_brim_enable = false -infill_before_walls = false -acceleration_enabled = false support_enable = true +support_wall_count = 1 +wall_0_wipe_dist = 0.0 + diff --git a/resources/quality/mixware_hyper_s/mixware_hyper_s_normal.inst.cfg b/resources/quality/mixware_hyper_s/mixware_hyper_s_normal.inst.cfg index 396f331b3c..f5ef08b36b 100644 --- a/resources/quality/mixware_hyper_s/mixware_hyper_s_normal.inst.cfg +++ b/resources/quality/mixware_hyper_s/mixware_hyper_s_normal.inst.cfg @@ -1,25 +1,26 @@ [general] -version = 4 -name = Fine definition = mixware_hyper_s +name = Fine +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal -global_quality = True [values] +acceleration_enabled = false +infill_before_walls = false +infill_overlap = 30.0 +infill_wipe_dist = 0.0 layer_height = 0.1 retraction_combing = all retraction_extrusion_window = 10 retraction_min_travel = 1.5 -infill_wipe_dist = 0.0 skin_overlap = 10.0 -infill_overlap = 30.0 -wall_0_wipe_dist = 0.0 -support_wall_count = 1 support_brim_enable = false -infill_before_walls = false -acceleration_enabled = false support_enable = true +support_wall_count = 1 +wall_0_wipe_dist = 0.0 + diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_draft.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_draft.inst.cfg index 01274a427d..6ffcb70492 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_draft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_draft.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Fast definition = monoprice_select_mini_v2 +name = Fast +version = 4 [metadata] +material = generic_abs +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -material = generic_abs [values] material_bed_temperature = 70 material_bed_temperature_layer_0 = 70 + diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_fast.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_fast.inst.cfg index 7f27b83d35..582ea502a7 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_fast.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_fast.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Normal definition = monoprice_select_mini_v2 +name = Normal +version = 4 [metadata] +material = generic_abs +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -1 -material = generic_abs [values] material_bed_temperature = 70 material_bed_temperature_layer_0 = 70 + diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_high.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_high.inst.cfg index 4d23f0184b..e259b81da1 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_high.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_high.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Finer definition = monoprice_select_mini_v2 +name = Finer +version = 4 [metadata] +material = generic_abs +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -material = generic_abs [values] material_bed_temperature = 70 material_bed_temperature_layer_0 = 70 + diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_normal.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_normal.inst.cfg index 28a3fa24e9..37ec986bfc 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_normal.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_normal.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Fine definition = monoprice_select_mini_v2 +name = Fine +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = generic_abs [values] material_bed_temperature = 70 material_bed_temperature_layer_0 = 70 + diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_superdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_superdraft.inst.cfg index 1f87b6954c..3bfe0e0a03 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_superdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_superdraft.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Lowest Quality Draft definition = monoprice_select_mini_v2 +name = Lowest Quality Draft +version = 4 [metadata] +material = generic_abs +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft weight = -5 -material = generic_abs [values] material_bed_temperature = 70 material_bed_temperature_layer_0 = 70 + diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_thickerdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_thickerdraft.inst.cfg index 3e1e0d6fa0..3e9ab526e5 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_thickerdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_thickerdraft.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Draft definition = monoprice_select_mini_v2 +name = Draft +version = 4 [metadata] +material = generic_abs +quality_type = thickerdraft setting_version = 20 type = quality -quality_type = thickerdraft weight = -3 -material = generic_abs [values] material_bed_temperature = 70 material_bed_temperature_layer_0 = 70 + diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_ultra.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_ultra.inst.cfg index 380e0dd002..7140d94ced 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_ultra.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_ultra.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Ultra Fine definition = monoprice_select_mini_v2 +name = Ultra Fine +version = 4 [metadata] +material = generic_abs +quality_type = thickerdraft setting_version = 20 type = quality -quality_type = thickerdraft weight = 2 -material = generic_abs [values] material_bed_temperature = 70 material_bed_temperature_layer_0 = 70 + diff --git a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_verydraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_verydraft.inst.cfg index f648b02b16..10a8d2d027 100644 --- a/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_verydraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/abs/monoprice_select_mini_v2_abs_verydraft.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Low Detail Draft definition = monoprice_select_mini_v2 +name = Low Detail Draft +version = 4 [metadata] +material = generic_abs +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft weight = -3 -material = generic_abs [values] material_bed_temperature = 70 material_bed_temperature_layer_0 = 70 + diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Draft_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Draft_Quality.inst.cfg index 2b303c5d25..900eb6ec0a 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Draft_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Draft_Quality.inst.cfg @@ -1,23 +1,24 @@ [general] -version = 4 -name = Fast definition = monoprice_select_mini_v2 +name = Fast +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] -layer_height = 0.21875 -layer_height_0 = 0.2625 -wall_thickness = 1.05 -top_bottom_thickness = 0.72 -infill_sparse_density = 22 -speed_print = 50 -speed_layer_0 = =round(speed_print * 30 / 50) -speed_topbottom = =math.ceil(speed_print * 20 / 50) cool_min_layer_time = 5 cool_min_speed = 10 +infill_sparse_density = 22 +layer_height = 0.21875 +layer_height_0 = 0.2625 +speed_layer_0 = =round(speed_print * 30 / 50) +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 20 / 50) +top_bottom_thickness = 0.72 +wall_thickness = 1.05 + diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Fast_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Fast_Quality.inst.cfg index 8bbb1eb4c1..c0eeca91a5 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Fast_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Fast_Quality.inst.cfg @@ -1,23 +1,24 @@ [general] -version = 4 -name = Normal definition = monoprice_select_mini_v2 +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -1 -global_quality = True [values] -layer_height = 0.175 -layer_height_0 = 0.2625 -wall_thickness = 1.05 -top_bottom_thickness = 0.72 -infill_sparse_density = 22 -speed_print = 50 -speed_layer_0 = =round(speed_print * 30 / 50) -speed_topbottom = =math.ceil(speed_print * 20 / 50) cool_min_layer_time = 5 cool_min_speed = 10 +infill_sparse_density = 22 +layer_height = 0.175 +layer_height_0 = 0.2625 +speed_layer_0 = =round(speed_print * 30 / 50) +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 20 / 50) +top_bottom_thickness = 0.72 +wall_thickness = 1.05 + diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_High_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_High_Quality.inst.cfg index 3de8da13a6..0b6edb037f 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_High_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_High_Quality.inst.cfg @@ -1,23 +1,24 @@ [general] -version = 4 -name = Finer definition = monoprice_select_mini_v2 +name = Finer +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -global_quality = True [values] -layer_height = 0.0875 -layer_height_0 = 0.2625 -wall_thickness = 1.05 -top_bottom_thickness = 0.72 -infill_sparse_density = 22 -speed_print = 50 -speed_layer_0 = =round(speed_print * 30 / 50) -speed_topbottom = =math.ceil(speed_print * 20 / 50) cool_min_layer_time = 5 cool_min_speed = 10 +infill_sparse_density = 22 +layer_height = 0.0875 +layer_height_0 = 0.2625 +speed_layer_0 = =round(speed_print * 30 / 50) +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 20 / 50) +top_bottom_thickness = 0.72 +wall_thickness = 1.05 + diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Normal_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Normal_Quality.inst.cfg index d807aabefe..638fca9253 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Normal_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Normal_Quality.inst.cfg @@ -1,23 +1,24 @@ [general] -version = 4 -name = Fine definition = monoprice_select_mini_v2 +name = Fine +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] -layer_height = 0.13125 -layer_height_0 = 0.2625 -wall_thickness = 1.05 -top_bottom_thickness = 0.72 -infill_sparse_density = 22 -speed_print = 50 -speed_layer_0 = =round(speed_print * 30 / 50) -speed_topbottom = =math.ceil(speed_print * 20 / 50) cool_min_layer_time = 5 cool_min_speed = 10 +infill_sparse_density = 22 +layer_height = 0.13125 +layer_height_0 = 0.2625 +speed_layer_0 = =round(speed_print * 30 / 50) +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 20 / 50) +top_bottom_thickness = 0.72 +wall_thickness = 1.05 + diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_SuperDraft_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_SuperDraft_Quality.inst.cfg index 2e349bd617..18154d0f17 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_SuperDraft_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_SuperDraft_Quality.inst.cfg @@ -1,23 +1,24 @@ [general] -version = 4 -name = Lowest Quality Draft definition = monoprice_select_mini_v2 +name = Lowest Quality Draft +version = 4 [metadata] +global_quality = True +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft weight = -5 -global_quality = True [values] -layer_height = 0.35 -layer_height_0 = 0.35 -wall_thickness = 1.05 -top_bottom_thickness = 0.72 -infill_sparse_density = 22 -speed_print = 50 -speed_layer_0 = =round(speed_print * 30 / 50) -speed_topbottom = =math.ceil(speed_print * 20 / 50) cool_min_layer_time = 5 cool_min_speed = 10 +infill_sparse_density = 22 +layer_height = 0.35 +layer_height_0 = 0.35 +speed_layer_0 = =round(speed_print * 30 / 50) +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 20 / 50) +top_bottom_thickness = 0.72 +wall_thickness = 1.05 + diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_ThickerDraft_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_ThickerDraft_Quality.inst.cfg index a9a5d2bf1f..92e2c875a4 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_ThickerDraft_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_ThickerDraft_Quality.inst.cfg @@ -1,23 +1,24 @@ [general] -version = 4 -name = Draft definition = monoprice_select_mini_v2 +name = Draft +version = 4 [metadata] +global_quality = True +quality_type = thickerdraft setting_version = 20 type = quality -quality_type = thickerdraft weight = -3 -global_quality = True [values] -layer_height = 0.2625 -layer_height_0 = 0.2625 -wall_thickness = 1.05 -top_bottom_thickness = 0.72 -infill_sparse_density = 22 -speed_print = 50 -speed_layer_0 = =round(speed_print * 30 / 50) -speed_topbottom = =math.ceil(speed_print * 20 / 50) cool_min_layer_time = 5 cool_min_speed = 10 +infill_sparse_density = 22 +layer_height = 0.2625 +layer_height_0 = 0.2625 +speed_layer_0 = =round(speed_print * 30 / 50) +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 20 / 50) +top_bottom_thickness = 0.72 +wall_thickness = 1.05 + diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Ultra_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Ultra_Quality.inst.cfg index 38e5ea7037..36ae72d4b2 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Ultra_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_Ultra_Quality.inst.cfg @@ -1,23 +1,24 @@ [general] -version = 4 -name = Ultra Fine definition = monoprice_select_mini_v2 +name = Ultra Fine +version = 4 [metadata] +global_quality = True +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra weight = 2 -global_quality = True [values] -layer_height = 0.04375 -layer_height_0 = 0.2625 -wall_thickness = 1.05 -top_bottom_thickness = 0.72 -infill_sparse_density = 22 -speed_print = 50 -speed_layer_0 = =round(speed_print * 30 / 50) -speed_topbottom = =math.ceil(speed_print * 20 / 50) cool_min_layer_time = 5 cool_min_speed = 10 +infill_sparse_density = 22 +layer_height = 0.04375 +layer_height_0 = 0.2625 +speed_layer_0 = =round(speed_print * 30 / 50) +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 20 / 50) +top_bottom_thickness = 0.72 +wall_thickness = 1.05 + diff --git a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_VeryDraft_Quality.inst.cfg b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_VeryDraft_Quality.inst.cfg index d6f046ed23..51ae4a7fae 100644 --- a/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_VeryDraft_Quality.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/monoprice_select_mini_v2_global_VeryDraft_Quality.inst.cfg @@ -1,23 +1,24 @@ [general] -version = 4 -name = Low Detail Draft definition = monoprice_select_mini_v2 +name = Low Detail Draft +version = 4 [metadata] +global_quality = True +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft weight = -3 -global_quality = True [values] -layer_height = 0.30625 -layer_height_0 = 0.30625 -wall_thickness = 1.05 -top_bottom_thickness = 0.72 -infill_sparse_density = 22 -speed_print = 50 -speed_layer_0 = =round(speed_print * 30 / 50) -speed_topbottom = =math.ceil(speed_print * 20 / 50) cool_min_layer_time = 5 cool_min_speed = 10 +infill_sparse_density = 22 +layer_height = 0.30625 +layer_height_0 = 0.30625 +speed_layer_0 = =round(speed_print * 30 / 50) +speed_print = 50 +speed_topbottom = =math.ceil(speed_print * 20 / 50) +top_bottom_thickness = 0.72 +wall_thickness = 1.05 + diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_draft.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_draft.inst.cfg index 6b4ae9829d..3c191d1324 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_draft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_draft.inst.cfg @@ -1,11 +1,12 @@ [general] -version = 4 -name = Fast definition = monoprice_select_mini_v2 +name = Fast +version = 4 [metadata] +material = generic_nylon +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -material = generic_nylon + diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_fast.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_fast.inst.cfg index d608b051fa..ebafdae56a 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_fast.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_fast.inst.cfg @@ -1,11 +1,12 @@ [general] -version = 4 -name = Normal definition = monoprice_select_mini_v2 +name = Normal +version = 4 [metadata] +material = generic_nylon +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -1 -material = generic_nylon + diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_high.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_high.inst.cfg index 32b924e2c6..bd05d47ef2 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_high.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_high.inst.cfg @@ -1,11 +1,12 @@ [general] -version = 4 -name = Finer definition = monoprice_select_mini_v2 +name = Finer +version = 4 [metadata] +material = generic_nylon +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -material = generic_nylon + diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_normal.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_normal.inst.cfg index abe9c19631..18c554fef7 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_normal.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_normal.inst.cfg @@ -1,11 +1,12 @@ [general] -version = 4 -name = Fine definition = monoprice_select_mini_v2 +name = Fine +version = 4 [metadata] +material = generic_nylon +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = generic_nylon + diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_superdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_superdraft.inst.cfg index b183379536..b7038260fe 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_superdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_superdraft.inst.cfg @@ -1,11 +1,12 @@ [general] -version = 4 -name = Lowest Quality Draft definition = monoprice_select_mini_v2 +name = Lowest Quality Draft +version = 4 [metadata] +material = generic_nylon +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft weight = -5 -material = generic_nylon + diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_thickerdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_thickerdraft.inst.cfg index 3fa7846a2d..2f66211709 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_thickerdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_thickerdraft.inst.cfg @@ -1,11 +1,12 @@ [general] -version = 4 -name = Draft definition = monoprice_select_mini_v2 +name = Draft +version = 4 [metadata] +material = generic_nylon +quality_type = thickerdraft setting_version = 20 type = quality -quality_type = thickerdraft weight = -3 -material = generic_nylon + diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_ultra.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_ultra.inst.cfg index 43c37757f8..b5018d6cc7 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_ultra.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_ultra.inst.cfg @@ -1,11 +1,12 @@ [general] -version = 4 -name = Ultra Fine definition = monoprice_select_mini_v2 +name = Ultra Fine +version = 4 [metadata] +material = generic_nylon +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra weight = 2 -material = generic_nylon + diff --git a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_verydraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_verydraft.inst.cfg index ea4214ab35..78f5d8b972 100644 --- a/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_verydraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/nylon/monoprice_select_mini_v2_nylon_verydraft.inst.cfg @@ -1,11 +1,12 @@ [general] -version = 4 -name = Low Detail Draft definition = monoprice_select_mini_v2 +name = Low Detail Draft +version = 4 [metadata] +material = generic_nylon +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft weight = -3 -material = generic_nylon + diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_draft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_draft.inst.cfg index 9909193823..c4091dcca7 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_draft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_draft.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Fast definition = monoprice_select_mini_v2 +name = Fast +version = 4 [metadata] +material = generic_pc +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -material = generic_pc [values] material_bed_temperature = 70 material_bed_temperature_layer_0 = 70 + diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_fast.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_fast.inst.cfg index 3088c2a0bb..a9f823bea2 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_fast.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_fast.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Normal definition = monoprice_select_mini_v2 +name = Normal +version = 4 [metadata] +material = generic_pc +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -1 -material = generic_pc [values] material_bed_temperature = 70 material_bed_temperature_layer_0 = 70 + diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_high.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_high.inst.cfg index 7d654d698c..8da55d5a5e 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_high.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_high.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Finer definition = monoprice_select_mini_v2 +name = Finer +version = 4 [metadata] +material = generic_pc +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -material = generic_pc [values] material_bed_temperature = 70 material_bed_temperature_layer_0 = 70 + diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_normal.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_normal.inst.cfg index ded324237c..ada1b368a5 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_normal.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_normal.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Fine definition = monoprice_select_mini_v2 +name = Fine +version = 4 [metadata] +material = generic_pc +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = generic_pc [values] material_bed_temperature = 70 material_bed_temperature_layer_0 = 70 + diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_superdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_superdraft.inst.cfg index ba1df40803..0d695acb45 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_superdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_superdraft.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Lowest Quality Draft definition = monoprice_select_mini_v2 +name = Lowest Quality Draft +version = 4 [metadata] +material = generic_pc +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft weight = -5 -material = generic_pc [values] material_bed_temperature = 70 material_bed_temperature_layer_0 = 70 + diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_thickerdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_thickerdraft.inst.cfg index b36c9c86c5..480ec105b5 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_thickerdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_thickerdraft.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Draft definition = monoprice_select_mini_v2 +name = Draft +version = 4 [metadata] +material = generic_pc +quality_type = thickerdraft setting_version = 20 type = quality -quality_type = thickerdraft weight = -3 -material = generic_pc [values] material_bed_temperature = 70 material_bed_temperature_layer_0 = 70 + diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_ultra.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_ultra.inst.cfg index ddc7085fc0..8bc61868a4 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_ultra.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_ultra.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Ultra Fine definition = monoprice_select_mini_v2 +name = Ultra Fine +version = 4 [metadata] +material = generic_pc +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra weight = 2 -material = generic_pc [values] material_bed_temperature = 70 material_bed_temperature_layer_0 = 70 + diff --git a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_verydraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_verydraft.inst.cfg index cddd7cf1a1..f505041a5c 100644 --- a/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_verydraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pc/monoprice_select_mini_v2_pc_verydraft.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Low Detail Draft definition = monoprice_select_mini_v2 +name = Low Detail Draft +version = 4 [metadata] +material = generic_pc +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft weight = -3 -material = generic_pc [values] material_bed_temperature = 70 material_bed_temperature_layer_0 = 70 + diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_draft.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_draft.inst.cfg index cfcfd0eda8..f09e696c54 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_draft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_draft.inst.cfg @@ -1,11 +1,12 @@ [general] -version = 4 -name = Fast definition = monoprice_select_mini_v2 +name = Fast +version = 4 [metadata] +material = generic_petg +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -material = generic_petg + diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_fast.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_fast.inst.cfg index 7772c13ab9..89906c059d 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_fast.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_fast.inst.cfg @@ -1,11 +1,12 @@ [general] -version = 4 -name = Normal definition = monoprice_select_mini_v2 +name = Normal +version = 4 [metadata] +material = generic_petg +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -1 -material = generic_petg + diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_high.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_high.inst.cfg index c43a58be2c..834133f038 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_high.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_high.inst.cfg @@ -1,11 +1,12 @@ [general] -version = 4 -name = Finer definition = monoprice_select_mini_v2 +name = Finer +version = 4 [metadata] +material = generic_petg +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -material = generic_petg + diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_normal.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_normal.inst.cfg index bef9fdfe82..f9d44894f1 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_normal.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_normal.inst.cfg @@ -1,11 +1,12 @@ [general] -version = 4 -name = Fine definition = monoprice_select_mini_v2 +name = Fine +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = generic_petg + diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_superdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_superdraft.inst.cfg index 5a72cc7977..4c97eca1d9 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_superdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_superdraft.inst.cfg @@ -1,11 +1,12 @@ [general] -version = 4 -name = Lowest Quality Draft definition = monoprice_select_mini_v2 +name = Lowest Quality Draft +version = 4 [metadata] +material = generic_petg +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft weight = -5 -material = generic_petg + diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_thickerdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_thickerdraft.inst.cfg index e2a4de1c61..d0e40f597d 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_thickerdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_thickerdraft.inst.cfg @@ -1,11 +1,12 @@ [general] -version = 4 -name = Draft definition = monoprice_select_mini_v2 +name = Draft +version = 4 [metadata] +material = generic_petg +quality_type = thickerdraft setting_version = 20 type = quality -quality_type = thickerdraft weight = -3 -material = generic_petg + diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_ultra.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_ultra.inst.cfg index fa04dead85..886e8e2941 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_ultra.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_ultra.inst.cfg @@ -1,11 +1,12 @@ [general] -version = 4 -name = Ultra Fine definition = monoprice_select_mini_v2 +name = Ultra Fine +version = 4 [metadata] +material = generic_petg +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra weight = 2 -material = generic_petg + diff --git a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_verydraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_verydraft.inst.cfg index 81ea798071..034b5a583a 100644 --- a/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_verydraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/petg/monoprice_select_mini_v2_petg_verydraft.inst.cfg @@ -1,11 +1,12 @@ [general] -version = 4 -name = Low Detail Draft definition = monoprice_select_mini_v2 +name = Low Detail Draft +version = 4 [metadata] +material = generic_petg +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft weight = -3 -material = generic_petg + diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_draft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_draft.inst.cfg index c0aca37d92..ad6c82c4dd 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_draft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_draft.inst.cfg @@ -1,11 +1,12 @@ [general] -version = 4 -name = Fast definition = monoprice_select_mini_v2 +name = Fast +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -material = generic_pla + diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_fast.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_fast.inst.cfg index 8ed542e038..b42f208548 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_fast.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_fast.inst.cfg @@ -1,11 +1,12 @@ [general] -version = 4 -name = Normal definition = monoprice_select_mini_v2 +name = Normal +version = 4 [metadata] +material = generic_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = 0 -material = generic_pla + diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_high.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_high.inst.cfg index 7dad8fc3ce..edb2587911 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_high.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_high.inst.cfg @@ -1,11 +1,12 @@ [general] -version = 4 -name = Finer definition = monoprice_select_mini_v2 +name = Finer +version = 4 [metadata] +material = generic_pla +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -material = generic_pla + diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_normal.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_normal.inst.cfg index 8b7becabcc..96aa6a078a 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_normal.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_normal.inst.cfg @@ -1,11 +1,12 @@ [general] -version = 4 -name = Fine definition = monoprice_select_mini_v2 +name = Fine +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = generic_pla + diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_superdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_superdraft.inst.cfg index 871da63427..52025f16ae 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_superdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_superdraft.inst.cfg @@ -1,11 +1,12 @@ [general] -version = 4 -name = Lowest Quality Draft definition = monoprice_select_mini_v2 +name = Lowest Quality Draft +version = 4 [metadata] +material = generic_pla +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft weight = -5 -material = generic_pla + diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_thickerdraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_thickerdraft.inst.cfg index 0bb365b701..7d9cff7632 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_thickerdraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_thickerdraft.inst.cfg @@ -1,11 +1,12 @@ [general] -version = 4 -name = Draft definition = monoprice_select_mini_v2 +name = Draft +version = 4 [metadata] +material = generic_pla +quality_type = thickerdraft setting_version = 20 type = quality -quality_type = thickerdraft weight = -3 -material = generic_pla + diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_ultra.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_ultra.inst.cfg index 26c9a97cd4..d26b4e5fb3 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_ultra.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_ultra.inst.cfg @@ -1,11 +1,12 @@ [general] -version = 4 -name = Ultra Fine definition = monoprice_select_mini_v2 +name = Ultra Fine +version = 4 [metadata] +material = generic_pla +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra weight = 2 -material = generic_pla + diff --git a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_verydraft.inst.cfg b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_verydraft.inst.cfg index 2e3d7ee4b8..790a2ae891 100644 --- a/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_verydraft.inst.cfg +++ b/resources/quality/monoprice_select_mini_v2/pla/monoprice_select_mini_v2_pla_verydraft.inst.cfg @@ -1,11 +1,12 @@ [general] -version = 4 -name = Low Detail Draft definition = monoprice_select_mini_v2 +name = Low Detail Draft +version = 4 [metadata] +material = generic_pla +quality_type = verydraft setting_version = 20 type = quality -material = generic_pla weight = 0 -quality_type = verydraft + diff --git a/resources/quality/normal.inst.cfg b/resources/quality/normal.inst.cfg index 5e4fa02320..5a5989a55b 100644 --- a/resources/quality/normal.inst.cfg +++ b/resources/quality/normal.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Fine definition = fdmprinter +name = Fine +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] + diff --git a/resources/quality/nps/nps_ABS_A.inst.cfg b/resources/quality/nps/nps_ABS_A.inst.cfg index e920d95be1..a2b8c31503 100644 --- a/resources/quality/nps/nps_ABS_A.inst.cfg +++ b/resources/quality/nps/nps_ABS_A.inst.cfg @@ -1,46 +1,47 @@ -[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 +[general] +definition = nps +name = A +version = 4 + +[metadata] +material = generic_abs +quality_type = a +setting_version = 20 +type = quality +weight = 1 + +[values] +cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 19 * layer_height +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time = 11 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 10 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_bed_temperature = 100 +material_flow = 100 +material_print_temperature = =default_material_print_temperature + 10 +material_print_temperature_layer_0 = =240 +retraction_extra_prime_amount = 0.1 +retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width +skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +support_angle = 65 +support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/nps/nps_ABS_B.inst.cfg b/resources/quality/nps/nps_ABS_B.inst.cfg index cf57c8afdc..d40ed349f0 100644 --- a/resources/quality/nps/nps_ABS_B.inst.cfg +++ b/resources/quality/nps/nps_ABS_B.inst.cfg @@ -1,42 +1,43 @@ -[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 +[general] +definition = nps +name = B +version = 4 + +[metadata] +material = generic_abs +quality_type = b +setting_version = 20 +type = quality +weight = 0 + +[values] +cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 14 * layer_height +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time = 11 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 10 +material_bed_temperature = 100 +material_flow = 96 +material_print_temperature = =default_material_print_temperature + 13 +material_print_temperature_layer_0 = =243 +prime_tower_enable = True +retraction_extra_prime_amount = 0.1 +retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width +skin_overlap = 15 +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_print = 55 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +support_angle = 60 +support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_z_distance = =layer_height + diff --git a/resources/quality/nps/nps_ABS_C.inst.cfg b/resources/quality/nps/nps_ABS_C.inst.cfg index b0e435d9bc..6d0c9785a6 100644 --- a/resources/quality/nps/nps_ABS_C.inst.cfg +++ b/resources/quality/nps/nps_ABS_C.inst.cfg @@ -1,42 +1,43 @@ -[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 +[general] +definition = nps +name = C +version = 4 + +[metadata] +material = generic_abs +quality_type = c +setting_version = 20 +type = quality +weight = -1 + +[values] +cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 9 * layer_height +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time = 11 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 10 +material_bed_temperature = 100 +material_flow = 91 +material_print_temperature = =default_material_print_temperature + 15 +material_print_temperature_layer_0 = =245 +prime_tower_enable = True +retraction_extra_prime_amount = 0.1 +retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width +skin_overlap = 20 +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_print = 60 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +support_angle = 55 +support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_z_distance = =layer_height + diff --git a/resources/quality/nps/nps_PC_A.inst.cfg b/resources/quality/nps/nps_PC_A.inst.cfg index 96a84784ab..7fd2a7cf6d 100644 --- a/resources/quality/nps/nps_PC_A.inst.cfg +++ b/resources/quality/nps/nps_PC_A.inst.cfg @@ -1,56 +1,55 @@ -[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 - +[general] +definition = nps +name = A +version = 4 + +[metadata] +material = generic_pc +quality_type = a +setting_version = 20 +type = quality +weight = 1 + +[values] +adhesion_type = brim +bridge_fan_speed = 100 +bridge_settings_enabled = True +bridge_skin_density = 80 +bridge_skin_material_flow = 100 +bridge_skin_speed = 12.5 +bridge_wall_coast = 50 +bridge_wall_material_flow = 50 +bridge_wall_speed = 12 +cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_fan_speed = 10 +cool_fan_speed_max = 10 +cool_lift_head = true +cool_min_layer_time = 2 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 12 +material_bed_temperature = 110 +material_flow = 100 +material_print_temperature = =default_material_print_temperature + 10 +material_print_temperature_layer_0 = =280 +prime_tower_enable = True +retraction_extra_prime_amount = 0.1 +retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width +retraction_speed = 30 +skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_print = 35 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +support_angle = 60 +support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_z_distance = =layer_height +wall_line_count = 3 + diff --git a/resources/quality/nps/nps_PC_B.inst.cfg b/resources/quality/nps/nps_PC_B.inst.cfg index 4700d063a1..dc38ceea79 100644 --- a/resources/quality/nps/nps_PC_B.inst.cfg +++ b/resources/quality/nps/nps_PC_B.inst.cfg @@ -1,56 +1,55 @@ -[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 +[general] +definition = nps +name = B +version = 4 + +[metadata] +material = generic_pc +quality_type = b +setting_version = 20 +type = quality +weight = 0 + +[values] +adhesion_type = brim +bridge_fan_speed = 100 +bridge_settings_enabled = True +bridge_skin_density = 80 +bridge_skin_material_flow = 100 +bridge_skin_speed = 12.5 +bridge_wall_coast = 50 +bridge_wall_material_flow = 50 +bridge_wall_speed = 12 +cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_fan_speed = 10 +cool_fan_speed_max = 10 +cool_lift_head = true +cool_min_layer_time = 2 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 12 +material_bed_temperature = 110 +material_flow = 88 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = 275 +prime_tower_enable = True +retraction_extra_prime_amount = 0.1 +retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width +retraction_speed = 30 +skin_overlap = 15 +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_print = 35 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +support_angle = 60 +support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_z_distance = =layer_height +wall_line_count = 3 + diff --git a/resources/quality/nps/nps_PC_C.inst.cfg b/resources/quality/nps/nps_PC_C.inst.cfg index 7e85fe319c..3ee9c53f40 100644 --- a/resources/quality/nps/nps_PC_C.inst.cfg +++ b/resources/quality/nps/nps_PC_C.inst.cfg @@ -1,56 +1,55 @@ -[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 +[general] +definition = nps +name = C +version = 4 + +[metadata] +material = generic_pc +quality_type = c +setting_version = 20 +type = quality +weight = -1 + +[values] +adhesion_type = brim +bridge_fan_speed = 100 +bridge_settings_enabled = True +bridge_skin_density = 80 +bridge_skin_material_flow = 100 +bridge_skin_speed = 12.5 +bridge_wall_coast = 50 +bridge_wall_material_flow = 50 +bridge_wall_speed = 12 +cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_fan_speed = 10 +cool_fan_speed_max = 10 +cool_lift_head = true +cool_min_layer_time = 2 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 12 +material_bed_temperature = 110 +material_flow = 88 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = 275 +prime_tower_enable = True +retraction_extra_prime_amount = 0.1 +retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width +retraction_speed = 30 +skin_overlap = 20 +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_print = 35 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +support_angle = 60 +support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_z_distance = =layer_height +wall_line_count = 3 + diff --git a/resources/quality/nps/nps_PETG_A.inst.cfg b/resources/quality/nps/nps_PETG_A.inst.cfg index 1881d25206..db6832763e 100644 --- a/resources/quality/nps/nps_PETG_A.inst.cfg +++ b/resources/quality/nps/nps_PETG_A.inst.cfg @@ -1,42 +1,43 @@ -[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 +[general] +definition = nps +name = A +version = 4 + +[metadata] +material = generic_petg +quality_type = a +setting_version = 20 +type = quality +weight = 1 + +[values] +cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time = 11 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 10 +material_bed_temperature = 80 +material_flow = 98 +material_print_temperature = =default_material_print_temperature + 20 +material_print_temperature_layer_0 = =230 +prime_tower_enable = True +retraction_extra_prime_amount = 0 +retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width +skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +support_angle = 65 +support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_z_distance = =layer_height*2 + diff --git a/resources/quality/nps/nps_PETG_B.inst.cfg b/resources/quality/nps/nps_PETG_B.inst.cfg index 156959e020..972c374255 100644 --- a/resources/quality/nps/nps_PETG_B.inst.cfg +++ b/resources/quality/nps/nps_PETG_B.inst.cfg @@ -1,42 +1,43 @@ -[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 +[general] +definition = nps +name = B +version = 4 + +[metadata] +material = generic_petg +quality_type = b +setting_version = 20 +type = quality +weight = 0 + +[values] +cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time = 11 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 10 +material_bed_temperature = 80 +material_flow = 95 +material_print_temperature = =default_material_print_temperature + 20 +material_print_temperature_layer_0 = =230 +prime_tower_enable = True +retraction_extra_prime_amount = 0 +retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width +skin_overlap = 15 +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_print = 55 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +support_angle = 60 +support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_z_distance = =layer_height*2 + diff --git a/resources/quality/nps/nps_PETG_C.inst.cfg b/resources/quality/nps/nps_PETG_C.inst.cfg index d84858e55a..41f8b11806 100644 --- a/resources/quality/nps/nps_PETG_C.inst.cfg +++ b/resources/quality/nps/nps_PETG_C.inst.cfg @@ -1,41 +1,42 @@ -[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 +[general] +definition = nps +name = C +version = 4 + +[metadata] +material = generic_petg +quality_type = c +setting_version = 20 +type = quality +weight = -1 + +[values] +cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time = 11 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 10 +material_bed_temperature = 80 +material_flow = 91 +material_print_temperature = =default_material_print_temperature + 20 +material_print_temperature_layer_0 = =230 +retraction_extra_prime_amount = 0 +retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width +skin_overlap = 20 +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_print = 60 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +support_angle = 55 +support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_z_distance = =layer_height*2 + diff --git a/resources/quality/nps/nps_PLA_A.inst.cfg b/resources/quality/nps/nps_PLA_A.inst.cfg index 3c9d8e8b20..620b0f638e 100644 --- a/resources/quality/nps/nps_PLA_A.inst.cfg +++ b/resources/quality/nps/nps_PLA_A.inst.cfg @@ -1,41 +1,42 @@ -[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 +[general] +definition = nps +name = A +version = 4 + +[metadata] +material = generic_pla +quality_type = a +setting_version = 20 +type = quality +weight = 1 + +[values] +cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time = 11 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 10 +material_bed_temperature = 60 +material_flow = 98 +material_print_temperature = =default_material_print_temperature + 15 +material_print_temperature_layer_0 = =210 +retraction_extra_prime_amount = 0.1 +retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width +skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +support_angle = 65 +support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_z_distance = =layer_height*2 + diff --git a/resources/quality/nps/nps_PLA_B.inst.cfg b/resources/quality/nps/nps_PLA_B.inst.cfg index e870274500..3b9b82c659 100644 --- a/resources/quality/nps/nps_PLA_B.inst.cfg +++ b/resources/quality/nps/nps_PLA_B.inst.cfg @@ -1,41 +1,42 @@ -[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 +[general] +definition = nps +name = B +version = 4 + +[metadata] +material = generic_pla +quality_type = b +setting_version = 20 +type = quality +weight = 0 + +[values] +cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time = 11 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 10 +material_bed_temperature = 60 +material_flow = 100 +material_print_temperature = =default_material_print_temperature + 15 +material_print_temperature_layer_0 = =220 +retraction_extra_prime_amount = 0.0 +retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width +skin_overlap = 15 +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_print = 55 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +support_angle = 60 +support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_z_distance = =layer_height*2 + diff --git a/resources/quality/nps/nps_PLA_C.inst.cfg b/resources/quality/nps/nps_PLA_C.inst.cfg index 955ea3875c..f81d59a8d6 100644 --- a/resources/quality/nps/nps_PLA_C.inst.cfg +++ b/resources/quality/nps/nps_PLA_C.inst.cfg @@ -1,41 +1,42 @@ -[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 +[general] +definition = nps +name = C +version = 4 + +[metadata] +material = generic_pla +quality_type = c +setting_version = 20 +type = quality +weight = -1 + +[values] +cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time = 11 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 10 +material_bed_temperature = 60 +material_flow = 91 +material_print_temperature = =default_material_print_temperature + 15 +material_print_temperature_layer_0 = =220 +retraction_extra_prime_amount = 0.1 +retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width +skin_overlap = 20 +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_print = 60 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +support_angle = 55 +support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_z_distance = =layer_height*2 + diff --git a/resources/quality/nps/nps_TPU_A.inst.cfg b/resources/quality/nps/nps_TPU_A.inst.cfg index 679b6f8e31..de6d14d4de 100644 --- a/resources/quality/nps/nps_TPU_A.inst.cfg +++ b/resources/quality/nps/nps_TPU_A.inst.cfg @@ -1,41 +1,42 @@ -[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 +[general] +definition = nps +name = A +version = 4 + +[metadata] +material = generic_tpu +quality_type = a +setting_version = 20 +type = quality +weight = 1 + +[values] +cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time = 11 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 10 +material_bed_temperature = 45 +material_flow = 107 +material_print_temperature = =default_material_print_temperature - 13 +material_print_temperature_layer_0 = =215 +retraction_extra_prime_amount = 0.2 +retraction_hop_only_when_collides = False +retraction_min_travel = =3*line_width +skin_overlap = 5 +speed_layer_0 = =math.ceil(speed_print * 20/30) +speed_print = 30 +speed_slowdown_layers = 1 +speed_topbottom = =math.ceil(speed_print * 25/30) +speed_wall = =math.ceil(speed_print * 30/30) +speed_wall_0 = =math.ceil(speed_print * 25/30) +support_angle = 50 +support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 0.5 +support_xy_distance = =line_width * 2.5 +support_xy_distance_overhang = =wall_line_width_0 +support_z_distance = =layer_height*2 + diff --git a/resources/quality/nps/nps_TPU_B.inst.cfg b/resources/quality/nps/nps_TPU_B.inst.cfg index af4c9f26bf..cf1467435f 100644 --- a/resources/quality/nps/nps_TPU_B.inst.cfg +++ b/resources/quality/nps/nps_TPU_B.inst.cfg @@ -1,41 +1,42 @@ -[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 +[general] +definition = nps +name = B +version = 4 + +[metadata] +material = generic_tpu +quality_type = b +setting_version = 20 +type = quality +weight = 0 + +[values] +cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time = 11 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 10 +material_bed_temperature = 45 +material_flow = 103 +material_print_temperature = =default_material_print_temperature - 13 +material_print_temperature_layer_0 = =210 +retraction_extra_prime_amount = 0.2 +retraction_hop_only_when_collides = False +retraction_min_travel = =3*line_width +skin_overlap = 5 +speed_layer_0 = =math.ceil(speed_print * 20/35) +speed_print = 35 +speed_slowdown_layers = 1 +speed_topbottom = =math.ceil(speed_print * 25/35) +speed_wall = =math.ceil(speed_print * 35/35) +speed_wall_0 = =math.ceil(speed_print * 27/35) +support_angle = 50 +support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 0.5 +support_xy_distance = =line_width * 2.5 +support_xy_distance_overhang = =wall_line_width_0 +support_z_distance = =layer_height*2 + diff --git a/resources/quality/nps/nps_TPU_C.inst.cfg b/resources/quality/nps/nps_TPU_C.inst.cfg index 809ffc91b6..15c2babe0b 100644 --- a/resources/quality/nps/nps_TPU_C.inst.cfg +++ b/resources/quality/nps/nps_TPU_C.inst.cfg @@ -1,41 +1,42 @@ -[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 +[general] +definition = nps +name = C +version = 4 + +[metadata] +material = generic_tpu +quality_type = c +setting_version = 20 +type = quality +weight = -1 + +[values] +cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time = 11 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 10 +material_bed_temperature = 45 +material_flow = 101 +material_print_temperature = =default_material_print_temperature - 13 +material_print_temperature_layer_0 = =215 +retraction_extra_prime_amount = 0.2 +retraction_hop_only_when_collides = False +retraction_min_travel = =3*line_width +skin_overlap = 5 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 1 +speed_topbottom = =math.ceil(speed_print * 27/40) +speed_wall = =math.ceil(speed_print * 40/40) +speed_wall_0 = =math.ceil(speed_print * 30/40) +support_angle = 50 +support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 0.5 +support_xy_distance = =line_width * 2.5 +support_xy_distance_overhang = =wall_line_width_0 +support_z_distance = =layer_height*2 + diff --git a/resources/quality/nps/nps_global_A.inst.cfg b/resources/quality/nps/nps_global_A.inst.cfg index aa3ba1c71a..7a776973b4 100644 --- a/resources/quality/nps/nps_global_A.inst.cfg +++ b/resources/quality/nps/nps_global_A.inst.cfg @@ -1,15 +1,16 @@ -[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 +[general] +definition = nps +name = Extra Fine Qualité +version = 4 + +[metadata] +global_quality = True +quality_type = a +setting_version = 20 +type = quality +weight = 0 + +[values] +layer_height = 0.1 +top_bottom_thickness = =5*layer_height + diff --git a/resources/quality/nps/nps_global_B.inst.cfg b/resources/quality/nps/nps_global_B.inst.cfg index fcc9a5cc0b..e7dee60cf4 100644 --- a/resources/quality/nps/nps_global_B.inst.cfg +++ b/resources/quality/nps/nps_global_B.inst.cfg @@ -1,15 +1,16 @@ -[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 +[general] +definition = nps +name = Fine Qualité +version = 4 + +[metadata] +global_quality = True +quality_type = b +setting_version = 20 +type = quality +weight = 0 + +[values] +layer_height = 0.16 +top_bottom_thickness = =3*layer_height + diff --git a/resources/quality/nps/nps_global_C.inst.cfg b/resources/quality/nps/nps_global_C.inst.cfg index d5870296a3..1bebfd1cdd 100644 --- a/resources/quality/nps/nps_global_C.inst.cfg +++ b/resources/quality/nps/nps_global_C.inst.cfg @@ -1,15 +1,16 @@ -[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 +[general] +definition = nps +name = Haute qualité +version = 4 + +[metadata] +global_quality = True +quality_type = c +setting_version = 20 +type = quality +weight = 0 + +[values] +layer_height = 0.25 +top_bottom_thickness = =5*layer_height + diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg index 7ae006b606..39460a466d 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg @@ -1,119 +1,119 @@ - [general] -version = 4 -name = Best Quality definition = nwa3d_a31 +name = Best Quality +version = 4 [metadata] +global_quality = True +quality_type = best setting_version = 20 type = quality -quality_type = best weight = 1 -global_quality = True [values] -layer_height = 0.08 -layer_height_0 = 0.24 -line_width = 0.4 -wall_line_width_0 = 0.4 -initial_layer_line_width_factor = 100 -wall_thickness = 0.8 -wall_0_wipe_dist = 0.2 -roofing_layer_count = 1 -top_bottom_thickness = 0.6 -top_thickness = 0.8 -top_layers = 5 -bottom_thickness = 0.6 -bottom_layers = 3 -top_bottom_pattern = lines -top_bottom_pattern_0 = lines -wall_0_inset = 0 -optimize_wall_printing_order = False -alternate_extra_perimeter = False -fill_outline_gaps = True -xy_offset = 0 -skin_no_small_gaps_heuristic = True -skin_outline_count = 1 -ironing_enabled = False -infill_sparse_density = 20 -zig_zaggify_infill = False -infill_multiplier = 1 -infill_wall_line_count = 0 -infill_overlap = 10 -skin_overlap = 5 -infill_wipe_dist = 0.1 -gradual_infill_steps = 0 -infill_before_walls = False -infill_support_enabled = False -max_skin_angle_for_expansion = 90 -default_material_print_temperature = 220 -material_print_temperature = 220 -material_print_temperature_layer_0 = 220 -material_initial_print_temperature = 220 -material_final_print_temperature = 220 -default_material_bed_temperature = 50 -material_bed_temperature = 50 -material_flow = 100 -retraction_enable = True -retract_at_layer_change = False -retraction_amount = 5 -retraction_speed = 45 -retraction_extra_prime_amount = 0 -retraction_min_travel = 0.8 -retraction_count_max = 90 -retraction_extrusion_window = 5 -limit_support_retractions = True -switch_extruder_retraction_amount = 16 -switch_extruder_retraction_speeds = 20 -speed_print = 30 -speed_travel = 150 -speed_layer_0 = 10 -speed_travel_layer_0 = 50 -speed_slowdown_layers = 2 acceleration_enabled = False acceleration_roofing = 3000 -jerk_enabled = False -retraction_combing = off -travel_retract_before_outer_wall = False -retraction_hop_enabled = False +adhesion_type = skirt +alternate_extra_perimeter = False +bottom_layers = 3 +bottom_thickness = 0.6 +carve_multiple_volumes = False cool_fan_enabled = True +cool_fan_full_at_height = 0.24 cool_fan_speed = 100 cool_fan_speed_0 = 0 -cool_fan_full_at_height = 0.24 cool_lift_head = False -support_enable = True -support_type = everywhere -support_angle = 50 -support_pattern = grid -support_wall_count = 0 -zig_zaggify_support = False -support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20 -support_infill_angles = [0] -support_brim_enable = True -support_brim_line_count = 5 -support_z_distance = 0.2 -support_xy_distance = 0.7 -support_xy_distance_overhang = 0.2 -support_bottom_stair_step_height = 0.3 -support_bottom_stair_step_width = 5.0 -support_join_distance = 2.0 -support_offset = 0.2 +default_material_bed_temperature = 50 +default_material_print_temperature = 220 +fill_outline_gaps = True +gradual_infill_steps = 0 gradual_support_infill_steps = 0 -support_roof_enable = True -support_bottom_enable = False -support_roof_height = 0.45 -support_roof_density = 45 -support_roof_pattern = lines -support_fan_enable = False -support_use_towers = True -support_tower_diameter = 3 -support_tower_roof_angle = 65 -adhesion_type = skirt -skirt_line_count = 2 -skirt_gap = 3 -meshfix_union_all = True -meshfix_union_all_remove_holes = False +infill_before_walls = False +infill_multiplier = 1 +infill_overlap = 10 +infill_sparse_density = 20 +infill_support_enabled = False +infill_wall_line_count = 0 +infill_wipe_dist = 0.1 +initial_layer_line_width_factor = 100 +ironing_enabled = False +jerk_enabled = False +layer_height = 0.08 +layer_height_0 = 0.24 +limit_support_retractions = True +line_width = 0.4 +material_bed_temperature = 50 +material_final_print_temperature = 220 +material_flow = 100 +material_initial_print_temperature = 220 +material_print_temperature = 220 +material_print_temperature_layer_0 = 220 +max_skin_angle_for_expansion = 90 meshfix_extensive_stitching = False meshfix_keep_open_polygons = False +meshfix_union_all = True +meshfix_union_all_remove_holes = False multiple_mesh_overlap = 0.16 -carve_multiple_volumes = False +optimize_wall_printing_order = False +retract_at_layer_change = False +retraction_amount = 5 +retraction_combing = off +retraction_count_max = 90 +retraction_enable = True +retraction_extra_prime_amount = 0 +retraction_extrusion_window = 5 +retraction_hop_enabled = False +retraction_min_travel = 0.8 +retraction_speed = 45 +roofing_layer_count = 1 +skin_no_small_gaps_heuristic = True +skin_outline_count = 1 +skin_overlap = 5 +skirt_gap = 3 +skirt_line_count = 2 +speed_layer_0 = 10 +speed_print = 30 +speed_slowdown_layers = 2 +speed_travel = 150 +speed_travel_layer_0 = 50 +support_angle = 50 +support_bottom_enable = False +support_bottom_stair_step_height = 0.3 +support_bottom_stair_step_width = 5.0 +support_brim_enable = True +support_brim_line_count = 5 +support_enable = True +support_fan_enable = False +support_infill_angles = [0] +support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20 +support_join_distance = 2.0 +support_offset = 0.2 +support_pattern = grid +support_roof_density = 45 +support_roof_enable = True +support_roof_height = 0.45 +support_roof_pattern = lines +support_tower_diameter = 3 +support_tower_roof_angle = 65 +support_type = everywhere +support_use_towers = True +support_wall_count = 0 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.2 +support_z_distance = 0.2 +switch_extruder_retraction_amount = 16 +switch_extruder_retraction_speeds = 20 +top_bottom_pattern = lines +top_bottom_pattern_0 = lines +top_bottom_thickness = 0.6 +top_layers = 5 +top_thickness = 0.8 +travel_retract_before_outer_wall = False +wall_0_inset = 0 +wall_0_wipe_dist = 0.2 +wall_line_width_0 = 0.4 +wall_thickness = 0.8 +xy_offset = 0 +zig_zaggify_infill = False +zig_zaggify_support = False + diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg index 2d6c3617bf..0b361a1718 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg @@ -1,115 +1,116 @@ [general] -version = 4 -name = 0.6 Engineering Quality definition = nwa3d_a31 +name = 0.6 Engineering Quality +version = 4 [metadata] +global_quality = True +quality_type = Engineering setting_version = 20 type = quality -quality_type = Engineering weight = -2 -global_quality = True [values] -layer_height = 0.28 -layer_height_0 = 0.4 -line_width = 0.6 -wall_line_width_0 = 0.6 -initial_layer_line_width_factor = 100 -wall_thickness = 1.2 -wall_0_wipe_dist = 0.2 -roofing_layer_count = 1 -top_bottom_thickness = 1.2 -top_layers = 5 -bottom_layers = 3 -top_bottom_pattern = lines -top_bottom_pattern_0 = lines -wall_0_inset = 0 -optimize_wall_printing_order = False -alternate_extra_perimeter = False -fill_outline_gaps = True -xy_offset = 0 -skin_no_small_gaps_heuristic = True -skin_outline_count = 1 -ironing_enabled = False -infill_sparse_density = 15 -zig_zaggify_infill = False -infill_multiplier = 1 -infill_wall_line_count = 0 -infill_overlap = 10 -skin_overlap = 5 -infill_wipe_dist = 0.15 -gradual_infill_steps = 0 -infill_before_walls = False -infill_support_enabled = False -max_skin_angle_for_expansion = 90 -default_material_print_temperature = 220 -material_print_temperature = 220 -material_print_temperature_layer_0 = 220 -material_initial_print_temperature = 220 -material_final_print_temperature = 220 -default_material_bed_temperature = 50 -material_bed_temperature = 50 -material_flow = 100 -retraction_enable = True -retract_at_layer_change = False -retraction_amount = 5 -retraction_speed = 45 -retraction_extra_prime_amount = 0 -retraction_min_travel = 1.2 -retraction_count_max = 90 -retraction_extrusion_window = 5 -limit_support_retractions = True -switch_extruder_retraction_amount = 16 -switch_extruder_retraction_speeds = 20 -speed_print = 40 -speed_travel = 150 -speed_layer_0 = 10 -speed_travel_layer_0 = 40 -speed_slowdown_layers = 2 acceleration_enabled = False -jerk_enabled = False -retraction_combing = off -travel_retract_before_outer_wall = False -retraction_hop_enabled = False +adhesion_type = skirt +alternate_extra_perimeter = False +bottom_layers = 3 +carve_multiple_volumes = False cool_fan_enabled = True +cool_fan_full_layer = 3 cool_fan_speed = 100 cool_fan_speed_0 = 0 -cool_fan_full_layer = 3 cool_lift_head = False -support_enable = True -support_type = everywhere -support_angle = 50 -support_pattern = grid -support_wall_count = 0 -zig_zaggify_support = False -support_infill_rate = =10 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 10 -support_infill_angles = [0] -support_brim_enable = True -support_brim_line_count = 5 -support_z_distance = 0.34 -support_xy_distance = 0.7 -support_xy_distance_overhang = 0.2 -support_bottom_stair_step_height = 0.3 -support_bottom_stair_step_width = 5.0 -support_join_distance = 2.0 -support_offset = 0.2 +default_material_bed_temperature = 50 +default_material_print_temperature = 220 +fill_outline_gaps = True +gradual_infill_steps = 0 gradual_support_infill_steps = 0 -support_roof_enable = True -support_bottom_enable = False -support_roof_height = .45 -support_roof_density = 45 -support_roof_pattern = grid -support_fan_enable = False -support_use_towers = True -support_tower_diameter = 3 -support_tower_roof_angle = 65 -adhesion_type = skirt -skirt_line_count = 2 -skirt_gap = 3 -meshfix_union_all = True -meshfix_union_all_remove_holes = False +infill_before_walls = False +infill_multiplier = 1 +infill_overlap = 10 +infill_sparse_density = 15 +infill_support_enabled = False +infill_wall_line_count = 0 +infill_wipe_dist = 0.15 +initial_layer_line_width_factor = 100 +ironing_enabled = False +jerk_enabled = False +layer_height = 0.28 +layer_height_0 = 0.4 +limit_support_retractions = True +line_width = 0.6 +material_bed_temperature = 50 +material_final_print_temperature = 220 +material_flow = 100 +material_initial_print_temperature = 220 +material_print_temperature = 220 +material_print_temperature_layer_0 = 220 +max_skin_angle_for_expansion = 90 meshfix_extensive_stitching = False meshfix_keep_open_polygons = False +meshfix_union_all = True +meshfix_union_all_remove_holes = False multiple_mesh_overlap = 0.16 -carve_multiple_volumes = False +optimize_wall_printing_order = False +retract_at_layer_change = False +retraction_amount = 5 +retraction_combing = off +retraction_count_max = 90 +retraction_enable = True +retraction_extra_prime_amount = 0 +retraction_extrusion_window = 5 +retraction_hop_enabled = False +retraction_min_travel = 1.2 +retraction_speed = 45 +roofing_layer_count = 1 +skin_no_small_gaps_heuristic = True +skin_outline_count = 1 +skin_overlap = 5 +skirt_gap = 3 +skirt_line_count = 2 +speed_layer_0 = 10 +speed_print = 40 +speed_slowdown_layers = 2 +speed_travel = 150 +speed_travel_layer_0 = 40 +support_angle = 50 +support_bottom_enable = False +support_bottom_stair_step_height = 0.3 +support_bottom_stair_step_width = 5.0 +support_brim_enable = True +support_brim_line_count = 5 +support_enable = True +support_fan_enable = False +support_infill_angles = [0] +support_infill_rate = =10 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 10 +support_join_distance = 2.0 +support_offset = 0.2 +support_pattern = grid +support_roof_density = 45 +support_roof_enable = True +support_roof_height = .45 +support_roof_pattern = grid +support_tower_diameter = 3 +support_tower_roof_angle = 65 +support_type = everywhere +support_use_towers = True +support_wall_count = 0 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.2 +support_z_distance = 0.34 +switch_extruder_retraction_amount = 16 +switch_extruder_retraction_speeds = 20 +top_bottom_pattern = lines +top_bottom_pattern_0 = lines +top_bottom_thickness = 1.2 +top_layers = 5 +travel_retract_before_outer_wall = False +wall_0_inset = 0 +wall_0_wipe_dist = 0.2 +wall_line_width_0 = 0.6 +wall_thickness = 1.2 +xy_offset = 0 +zig_zaggify_infill = False +zig_zaggify_support = False + diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg index aad794f91c..f5ae176bc2 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg @@ -1,119 +1,119 @@ - [general] -version = 4 -name = Fast Quality definition = nwa3d_a31 +name = Fast Quality +version = 4 [metadata] +global_quality = True +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -1 -global_quality = True [values] -layer_height = 0.24 -layer_height_0 = 0.24 -line_width = 0.4 -wall_line_width_0 = 0.4 -initial_layer_line_width_factor = 100 -wall_thickness = 0.8 -wall_0_wipe_dist = 0.2 -roofing_layer_count = 1 -top_bottom_thickness = 0.6 -top_thickness = 0.8 -top_layers = 5 -bottom_thickness = 0.6 -bottom_layers = 3 -top_bottom_pattern = lines -top_bottom_pattern_0 = lines -wall_0_inset = 0 -optimize_wall_printing_order = False -alternate_extra_perimeter = False -fill_outline_gaps = True -xy_offset = 0 -skin_no_small_gaps_heuristic = True -skin_outline_count = 1 -ironing_enabled = False -infill_sparse_density = 15 -zig_zaggify_infill = False -infill_multiplier = 1 -infill_wall_line_count = 0 -infill_overlap = 10 -skin_overlap = 5 -infill_wipe_dist = 0.1 -gradual_infill_steps = 0 -infill_before_walls = False -infill_support_enabled = False -max_skin_angle_for_expansion = 90 -default_material_print_temperature = 220 -material_print_temperature = 220 -material_print_temperature_layer_0 = 220 -material_initial_print_temperature = 220 -material_final_print_temperature = 220 -default_material_bed_temperature = 50 -material_bed_temperature = 50 -material_flow = 100 -retraction_enable = True -retract_at_layer_change = False -retraction_amount = 5 -retraction_speed = 45 -retraction_extra_prime_amount = 0 -retraction_min_travel = 0.8 -retraction_count_max = 90 -retraction_extrusion_window = 5 -limit_support_retractions = True -switch_extruder_retraction_amount = 16 -switch_extruder_retraction_speeds = 20 -speed_print = 60 -speed_travel = 150 -speed_layer_0 = 10 -speed_travel_layer_0 = 50 -speed_slowdown_layers = 2 acceleration_enabled = False acceleration_roofing = 3000 -jerk_enabled = False -retraction_combing = off -travel_retract_before_outer_wall = False -retraction_hop_enabled = False +adhesion_type = skirt +alternate_extra_perimeter = False +bottom_layers = 3 +bottom_thickness = 0.6 +carve_multiple_volumes = False cool_fan_enabled = True +cool_fan_full_at_height = 0.48 cool_fan_speed = 100 cool_fan_speed_0 = 0 -cool_fan_full_at_height = 0.48 cool_lift_head = False -support_enable = True -support_type = everywhere -support_angle = 50 -support_pattern = grid -support_wall_count = 0 -zig_zaggify_support = False -support_infill_rate = =15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15 -support_infill_angles = [0] -support_brim_enable = True -support_brim_line_count = 5 -support_z_distance = 0.3 -support_xy_distance = 0.7 -support_xy_distance_overhang = 0.2 -support_bottom_stair_step_height = 0.3 -support_bottom_stair_step_width = 5.0 -support_join_distance = 2.0 -support_offset = 0.2 +default_material_bed_temperature = 50 +default_material_print_temperature = 220 +fill_outline_gaps = True +gradual_infill_steps = 0 gradual_support_infill_steps = 0 -support_roof_enable = True -support_bottom_enable = False -support_roof_height = 0.45 -support_roof_density = 45 -support_roof_pattern = lines -support_fan_enable = False -support_use_towers = True -support_tower_diameter = 3 -support_tower_roof_angle = 65 -adhesion_type = skirt -skirt_line_count = 2 -skirt_gap = 3 -meshfix_union_all = True -meshfix_union_all_remove_holes = False +infill_before_walls = False +infill_multiplier = 1 +infill_overlap = 10 +infill_sparse_density = 15 +infill_support_enabled = False +infill_wall_line_count = 0 +infill_wipe_dist = 0.1 +initial_layer_line_width_factor = 100 +ironing_enabled = False +jerk_enabled = False +layer_height = 0.24 +layer_height_0 = 0.24 +limit_support_retractions = True +line_width = 0.4 +material_bed_temperature = 50 +material_final_print_temperature = 220 +material_flow = 100 +material_initial_print_temperature = 220 +material_print_temperature = 220 +material_print_temperature_layer_0 = 220 +max_skin_angle_for_expansion = 90 meshfix_extensive_stitching = False meshfix_keep_open_polygons = False +meshfix_union_all = True +meshfix_union_all_remove_holes = False multiple_mesh_overlap = 0.16 -carve_multiple_volumes = False +optimize_wall_printing_order = False +retract_at_layer_change = False +retraction_amount = 5 +retraction_combing = off +retraction_count_max = 90 +retraction_enable = True +retraction_extra_prime_amount = 0 +retraction_extrusion_window = 5 +retraction_hop_enabled = False +retraction_min_travel = 0.8 +retraction_speed = 45 +roofing_layer_count = 1 +skin_no_small_gaps_heuristic = True +skin_outline_count = 1 +skin_overlap = 5 +skirt_gap = 3 +skirt_line_count = 2 +speed_layer_0 = 10 +speed_print = 60 +speed_slowdown_layers = 2 +speed_travel = 150 +speed_travel_layer_0 = 50 +support_angle = 50 +support_bottom_enable = False +support_bottom_stair_step_height = 0.3 +support_bottom_stair_step_width = 5.0 +support_brim_enable = True +support_brim_line_count = 5 +support_enable = True +support_fan_enable = False +support_infill_angles = [0] +support_infill_rate = =15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15 +support_join_distance = 2.0 +support_offset = 0.2 +support_pattern = grid +support_roof_density = 45 +support_roof_enable = True +support_roof_height = 0.45 +support_roof_pattern = lines +support_tower_diameter = 3 +support_tower_roof_angle = 65 +support_type = everywhere +support_use_towers = True +support_wall_count = 0 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.2 +support_z_distance = 0.3 +switch_extruder_retraction_amount = 16 +switch_extruder_retraction_speeds = 20 +top_bottom_pattern = lines +top_bottom_pattern_0 = lines +top_bottom_thickness = 0.6 +top_layers = 5 +top_thickness = 0.8 +travel_retract_before_outer_wall = False +wall_0_inset = 0 +wall_0_wipe_dist = 0.2 +wall_line_width_0 = 0.4 +wall_thickness = 0.8 +xy_offset = 0 +zig_zaggify_infill = False +zig_zaggify_support = False + diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg index c0aa59f1d0..e568857eba 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg @@ -1,118 +1,119 @@ [general] -version = 4 -name = Normal Quality definition = nwa3d_a31 +name = Normal Quality +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] -layer_height = 0.16 -layer_height_0 = 0.24 -line_width = 0.4 -wall_line_width_0 = 0.4 -initial_layer_line_width_factor = 100 -wall_thickness = 0.8 -wall_0_wipe_dist = 0.2 -roofing_layer_count = 1 -top_bottom_thickness = 0.6 -top_thickness = 0.8 -top_layers = 5 -bottom_thickness = 0.6 -bottom_layers = 3 -top_bottom_pattern = lines -top_bottom_pattern_0 = lines -wall_0_inset = 0 -optimize_wall_printing_order = False -alternate_extra_perimeter = False -fill_outline_gaps = True -xy_offset = 0 -skin_no_small_gaps_heuristic = True -skin_outline_count = 1 -ironing_enabled = False -infill_sparse_density = 20 -zig_zaggify_infill = False -infill_multiplier = 1 -infill_wall_line_count = 0 -infill_overlap = 10 -skin_overlap = 5 -infill_wipe_dist = 0.1 -gradual_infill_steps = 0 -infill_before_walls = False -infill_support_enabled = False -max_skin_angle_for_expansion = 90 -default_material_print_temperature = 220 -material_print_temperature = 220 -material_print_temperature_layer_0 = 220 -material_initial_print_temperature = 220 -material_final_print_temperature = 220 -default_material_bed_temperature = 50 -material_bed_temperature = 50 -material_flow = 100 -retraction_enable = True -retract_at_layer_change = False -retraction_amount = 5 -retraction_speed = 45 -retraction_extra_prime_amount = 0 -retraction_min_travel = 0.8 -retraction_count_max = 90 -retraction_extrusion_window = 5 -limit_support_retractions = True -switch_extruder_retraction_amount = 16 -switch_extruder_retraction_speeds = 20 -speed_print = 50 -speed_travel = 150 -speed_layer_0 = 10 -speed_travel_layer_0 = 50 -speed_slowdown_layers = 2 acceleration_enabled = False acceleration_roofing = 3000 -jerk_enabled = False -retraction_combing = off -travel_retract_before_outer_wall = False -retraction_hop_enabled = False +adhesion_type = skirt +alternate_extra_perimeter = False +bottom_layers = 3 +bottom_thickness = 0.6 +carve_multiple_volumes = False cool_fan_enabled = True +cool_fan_full_at_height = 0.32 cool_fan_speed = 100 cool_fan_speed_0 = 0 -cool_fan_full_at_height = 0.32 cool_lift_head = False -support_enable = True -support_type = everywhere -support_angle = 50 -support_pattern = grid -support_wall_count = 0 -zig_zaggify_support = False -support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20 -support_infill_angles = [0] -support_brim_enable = True -support_brim_line_count = 5 -support_z_distance = 0.21 -support_xy_distance = 0.7 -support_xy_distance_overhang = 0.2 -support_bottom_stair_step_height = 0.3 -support_bottom_stair_step_width = 5.0 -support_join_distance = 2.0 -support_offset = 0.2 +default_material_bed_temperature = 50 +default_material_print_temperature = 220 +fill_outline_gaps = True +gradual_infill_steps = 0 gradual_support_infill_steps = 0 -support_roof_enable = True -support_bottom_enable = False -support_roof_height = 0.45 -support_roof_density = 45 -support_roof_pattern = lines -support_fan_enable = False -support_use_towers = True -support_tower_diameter = 3 -support_tower_roof_angle = 65 -adhesion_type = skirt -skirt_line_count = 2 -skirt_gap = 3 -meshfix_union_all = True -meshfix_union_all_remove_holes = False +infill_before_walls = False +infill_multiplier = 1 +infill_overlap = 10 +infill_sparse_density = 20 +infill_support_enabled = False +infill_wall_line_count = 0 +infill_wipe_dist = 0.1 +initial_layer_line_width_factor = 100 +ironing_enabled = False +jerk_enabled = False +layer_height = 0.16 +layer_height_0 = 0.24 +limit_support_retractions = True +line_width = 0.4 +material_bed_temperature = 50 +material_final_print_temperature = 220 +material_flow = 100 +material_initial_print_temperature = 220 +material_print_temperature = 220 +material_print_temperature_layer_0 = 220 +max_skin_angle_for_expansion = 90 meshfix_extensive_stitching = False meshfix_keep_open_polygons = False +meshfix_union_all = True +meshfix_union_all_remove_holes = False multiple_mesh_overlap = 0.16 -carve_multiple_volumes = False +optimize_wall_printing_order = False +retract_at_layer_change = False +retraction_amount = 5 +retraction_combing = off +retraction_count_max = 90 +retraction_enable = True +retraction_extra_prime_amount = 0 +retraction_extrusion_window = 5 +retraction_hop_enabled = False +retraction_min_travel = 0.8 +retraction_speed = 45 +roofing_layer_count = 1 +skin_no_small_gaps_heuristic = True +skin_outline_count = 1 +skin_overlap = 5 +skirt_gap = 3 +skirt_line_count = 2 +speed_layer_0 = 10 +speed_print = 50 +speed_slowdown_layers = 2 +speed_travel = 150 +speed_travel_layer_0 = 50 +support_angle = 50 +support_bottom_enable = False +support_bottom_stair_step_height = 0.3 +support_bottom_stair_step_width = 5.0 +support_brim_enable = True +support_brim_line_count = 5 +support_enable = True +support_fan_enable = False +support_infill_angles = [0] +support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20 +support_join_distance = 2.0 +support_offset = 0.2 +support_pattern = grid +support_roof_density = 45 +support_roof_enable = True +support_roof_height = 0.45 +support_roof_pattern = lines +support_tower_diameter = 3 +support_tower_roof_angle = 65 +support_type = everywhere +support_use_towers = True +support_wall_count = 0 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.2 +support_z_distance = 0.21 +switch_extruder_retraction_amount = 16 +switch_extruder_retraction_speeds = 20 +top_bottom_pattern = lines +top_bottom_pattern_0 = lines +top_bottom_thickness = 0.6 +top_layers = 5 +top_thickness = 0.8 +travel_retract_before_outer_wall = False +wall_0_inset = 0 +wall_0_wipe_dist = 0.2 +wall_line_width_0 = 0.4 +wall_thickness = 0.8 +xy_offset = 0 +zig_zaggify_infill = False +zig_zaggify_support = False + diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg index 1e2b316efc..606d958306 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg @@ -1,122 +1,118 @@ [general] -version = 4 -name = Best Quality definition = nwa3d_a5 +name = Best Quality +version = 4 [metadata] +global_quality = True +quality_type = best setting_version = 20 type = quality -quality_type = best weight = 1 -global_quality = True [values] -layer_height = 0.08 -layer_height_0 = 0.24 -line_width = 0.4 -initial_layer_line_width_factor = 100 -wall_thickness = 0.8 -wall_0_wipe_dist = 0.2 -roofing_layer_count = 1 -top_bottom_thickness = 0.6 -top_thickness = 0.8 -top_layers = 5 -bottom_thickness = 0.6 -bottom_layers = 3 -top_bottom_pattern = lines -top_bottom_pattern_0 = lines -wall_0_inset = 0 -optimize_wall_printing_order = False -alternate_extra_perimeter = False -fill_outline_gaps = True -xy_offset = 0 -skin_no_small_gaps_heuristic = True -skin_outline_count = 1 -ironing_enabled = False -infill_sparse_density = 20 -zig_zaggify_infill = False -infill_multiplier = 1 -infill_wall_line_count = 0 -infill_overlap = 10 -skin_overlap = 5 -infill_wipe_dist = 0.1 -gradual_infill_steps = 0 -infill_before_walls = False -infill_support_enabled = False -max_skin_angle_for_expansion = 90 -default_material_print_temperature = 220 -material_print_temperature = 220 -material_print_temperature_layer_0 = 220 -material_initial_print_temperature = 220 -material_final_print_temperature = 220 -default_material_bed_temperature = 0 -material_bed_temperature = 0 -material_flow = 100 -retraction_enable = True -retract_at_layer_change = False -retraction_amount = 5 -retraction_speed = 45 -retraction_extra_prime_amount = 0 -retraction_min_travel = 0.8 -retraction_count_max = 90 -retraction_extrusion_window = 5 -limit_support_retractions = True -switch_extruder_retraction_amount = 16 -switch_extruder_retraction_speeds = 20 -speed_print = 30 -speed_travel = 150 -speed_layer_0 = 10 -speed_travel_layer_0 = 50 -speed_slowdown_layers = 2 acceleration_enabled = False acceleration_roofing = 3000 -jerk_enabled = False -retraction_combing = off -travel_retract_before_outer_wall = False -retraction_hop_enabled = False +adhesion_type = skirt +alternate_extra_perimeter = False +bottom_layers = 3 +bottom_thickness = 0.6 +carve_multiple_volumes = False cool_fan_enabled = True +cool_fan_full_at_height = 0.24 cool_fan_speed = 100 cool_fan_speed_0 = 0 -cool_fan_full_at_height = 0.24 cool_lift_head = False -support_enable = True -support_type = everywhere -support_angle = 50 -support_pattern = grid -support_wall_count = 0 -zig_zaggify_support = False -support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20 -support_infill_angles = [0] -support_brim_enable = True -support_brim_line_count = 5 -support_z_distance = 0.18 -support_xy_distance = 0.7 -support_xy_distance_overhang = 0.2 -support_bottom_stair_step_height = 0.3 -support_bottom_stair_step_width = 5.0 -support_join_distance = 2.0 -support_offset = 0.2 +default_material_bed_temperature = 0 +default_material_print_temperature = 220 +fill_outline_gaps = True +gradual_infill_steps = 0 gradual_support_infill_steps = 0 -support_roof_enable = True -support_bottom_enable = False -support_roof_height = 0.45 -support_roof_density = 45 -support_roof_pattern = lines -support_fan_enable = False -support_use_towers = True -support_tower_diameter = 3 -support_tower_roof_angle = 65 -adhesion_type = skirt -skirt_line_count = 2 -skirt_gap = 3 -meshfix_union_all = True -meshfix_union_all_remove_holes = False +infill_before_walls = False +infill_multiplier = 1 +infill_overlap = 10 +infill_sparse_density = 20 +infill_support_enabled = False +infill_wall_line_count = 0 +infill_wipe_dist = 0.1 +initial_layer_line_width_factor = 100 +ironing_enabled = False +jerk_enabled = False +layer_height = 0.08 +layer_height_0 = 0.24 +limit_support_retractions = True +line_width = 0.4 +material_bed_temperature = 0 +material_final_print_temperature = 220 +material_flow = 100 +material_initial_print_temperature = 220 +material_print_temperature = 220 +material_print_temperature_layer_0 = 220 +max_skin_angle_for_expansion = 90 meshfix_extensive_stitching = False meshfix_keep_open_polygons = False +meshfix_union_all = True +meshfix_union_all_remove_holes = False multiple_mesh_overlap = 0.16 -carve_multiple_volumes = False - - - - +optimize_wall_printing_order = False +retract_at_layer_change = False +retraction_amount = 5 +retraction_combing = off +retraction_count_max = 90 +retraction_enable = True +retraction_extra_prime_amount = 0 +retraction_extrusion_window = 5 +retraction_hop_enabled = False +retraction_min_travel = 0.8 +retraction_speed = 45 +roofing_layer_count = 1 +skin_no_small_gaps_heuristic = True +skin_outline_count = 1 +skin_overlap = 5 +skirt_gap = 3 +skirt_line_count = 2 +speed_layer_0 = 10 +speed_print = 30 +speed_slowdown_layers = 2 +speed_travel = 150 +speed_travel_layer_0 = 50 +support_angle = 50 +support_bottom_enable = False +support_bottom_stair_step_height = 0.3 +support_bottom_stair_step_width = 5.0 +support_brim_enable = True +support_brim_line_count = 5 +support_enable = True +support_fan_enable = False +support_infill_angles = [0] +support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20 +support_join_distance = 2.0 +support_offset = 0.2 +support_pattern = grid +support_roof_density = 45 +support_roof_enable = True +support_roof_height = 0.45 +support_roof_pattern = lines +support_tower_diameter = 3 +support_tower_roof_angle = 65 +support_type = everywhere +support_use_towers = True +support_wall_count = 0 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.2 +support_z_distance = 0.18 +switch_extruder_retraction_amount = 16 +switch_extruder_retraction_speeds = 20 +top_bottom_pattern = lines +top_bottom_pattern_0 = lines +top_bottom_thickness = 0.6 +top_layers = 5 +top_thickness = 0.8 +travel_retract_before_outer_wall = False +wall_0_inset = 0 +wall_0_wipe_dist = 0.2 +wall_thickness = 0.8 +xy_offset = 0 +zig_zaggify_infill = False +zig_zaggify_support = False diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg index 9fd4d77ed9..5fcfc53622 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg @@ -1,117 +1,118 @@ [general] -version = 4 -name = Fast Quality definition = nwa3d_a5 +name = Fast Quality +version = 4 [metadata] +global_quality = True +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -1 -global_quality = True [values] -layer_height = 0.24 -layer_height_0 = 0.24 -line_width = 0.4 -initial_layer_line_width_factor = 100 -wall_thickness = 0.8 -wall_0_wipe_dist = 0.2 -roofing_layer_count = 1 -top_bottom_thickness = 0.6 -top_thickness = 0.8 -top_layers = 5 -bottom_thickness = 0.6 -bottom_layers = 3 -top_bottom_pattern = lines -top_bottom_pattern_0 = lines -wall_0_inset = 0 -optimize_wall_printing_order = False -alternate_extra_perimeter = False -fill_outline_gaps = True -xy_offset = 0 -skin_no_small_gaps_heuristic = True -skin_outline_count = 1 -ironing_enabled = False -infill_sparse_density = 15 -zig_zaggify_infill = False -infill_multiplier = 1 -infill_wall_line_count = 0 -infill_overlap = 10 -skin_overlap = 5 -infill_wipe_dist = 0.1 -gradual_infill_steps = 0 -infill_before_walls = False -infill_support_enabled = False -max_skin_angle_for_expansion = 90 -default_material_print_temperature = 220 -material_print_temperature = 220 -material_print_temperature_layer_0 = 220 -material_initial_print_temperature = 220 -material_final_print_temperature = 220 -default_material_bed_temperature = 0 -material_bed_temperature = 0 -material_flow = 100 -retraction_enable = True -retract_at_layer_change = False -retraction_amount = 5 -retraction_speed = 45 -retraction_extra_prime_amount = 0 -retraction_min_travel = 0.8 -retraction_count_max = 90 -retraction_extrusion_window = 5 -limit_support_retractions = True -switch_extruder_retraction_amount = 16 -switch_extruder_retraction_speeds = 20 -speed_print = 60 -speed_travel = 150 -speed_layer_0 = 10 -speed_travel_layer_0 = 50 -speed_slowdown_layers = 2 acceleration_enabled = False acceleration_roofing = 3000 -jerk_enabled = False -retraction_combing = off -travel_retract_before_outer_wall = False -retraction_hop_enabled = False +adhesion_type = skirt +alternate_extra_perimeter = False +bottom_layers = 3 +bottom_thickness = 0.6 +carve_multiple_volumes = False cool_fan_enabled = True +cool_fan_full_at_height = 0.48 cool_fan_speed = 100 cool_fan_speed_0 = 0 -cool_fan_full_at_height = 0.48 cool_lift_head = False -support_enable = True -support_type = everywhere -support_angle = 50 -support_pattern = grid -support_wall_count = 0 -zig_zaggify_support = False -support_infill_rate = =15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15 -support_infill_angles = [0] -support_brim_enable = True -support_brim_line_count = 5 -support_z_distance = 0.3 -support_xy_distance = 0.7 -support_xy_distance_overhang = 0.2 -support_bottom_stair_step_height = 0.3 -support_bottom_stair_step_width = 5.0 -support_join_distance = 2.0 -support_offset = 0.2 +default_material_bed_temperature = 0 +default_material_print_temperature = 220 +fill_outline_gaps = True +gradual_infill_steps = 0 gradual_support_infill_steps = 0 -support_roof_enable = True -support_bottom_enable = False -support_roof_height = 0.45 -support_roof_density = 45 -support_roof_pattern = lines -support_fan_enable = False -support_use_towers = True -support_tower_diameter = 3 -support_tower_roof_angle = 65 -adhesion_type = skirt -skirt_line_count = 2 -skirt_gap = 3 -meshfix_union_all = True -meshfix_union_all_remove_holes = False +infill_before_walls = False +infill_multiplier = 1 +infill_overlap = 10 +infill_sparse_density = 15 +infill_support_enabled = False +infill_wall_line_count = 0 +infill_wipe_dist = 0.1 +initial_layer_line_width_factor = 100 +ironing_enabled = False +jerk_enabled = False +layer_height = 0.24 +layer_height_0 = 0.24 +limit_support_retractions = True +line_width = 0.4 +material_bed_temperature = 0 +material_final_print_temperature = 220 +material_flow = 100 +material_initial_print_temperature = 220 +material_print_temperature = 220 +material_print_temperature_layer_0 = 220 +max_skin_angle_for_expansion = 90 meshfix_extensive_stitching = False meshfix_keep_open_polygons = False +meshfix_union_all = True +meshfix_union_all_remove_holes = False multiple_mesh_overlap = 0.16 -carve_multiple_volumes = False +optimize_wall_printing_order = False +retract_at_layer_change = False +retraction_amount = 5 +retraction_combing = off +retraction_count_max = 90 +retraction_enable = True +retraction_extra_prime_amount = 0 +retraction_extrusion_window = 5 +retraction_hop_enabled = False +retraction_min_travel = 0.8 +retraction_speed = 45 +roofing_layer_count = 1 +skin_no_small_gaps_heuristic = True +skin_outline_count = 1 +skin_overlap = 5 +skirt_gap = 3 +skirt_line_count = 2 +speed_layer_0 = 10 +speed_print = 60 +speed_slowdown_layers = 2 +speed_travel = 150 +speed_travel_layer_0 = 50 +support_angle = 50 +support_bottom_enable = False +support_bottom_stair_step_height = 0.3 +support_bottom_stair_step_width = 5.0 +support_brim_enable = True +support_brim_line_count = 5 +support_enable = True +support_fan_enable = False +support_infill_angles = [0] +support_infill_rate = =15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15 +support_join_distance = 2.0 +support_offset = 0.2 +support_pattern = grid +support_roof_density = 45 +support_roof_enable = True +support_roof_height = 0.45 +support_roof_pattern = lines +support_tower_diameter = 3 +support_tower_roof_angle = 65 +support_type = everywhere +support_use_towers = True +support_wall_count = 0 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.2 +support_z_distance = 0.3 +switch_extruder_retraction_amount = 16 +switch_extruder_retraction_speeds = 20 +top_bottom_pattern = lines +top_bottom_pattern_0 = lines +top_bottom_thickness = 0.6 +top_layers = 5 +top_thickness = 0.8 +travel_retract_before_outer_wall = False +wall_0_inset = 0 +wall_0_wipe_dist = 0.2 +wall_thickness = 0.8 +xy_offset = 0 +zig_zaggify_infill = False +zig_zaggify_support = False + diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg index e1825dfd42..cf700921ad 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg @@ -1,117 +1,118 @@ [general] -version = 4 -name = Normal Quality definition = nwa3d_a5 +name = Normal Quality +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] -layer_height = 0.16 -layer_height_0 = 0.24 -line_width = 0.4 -initial_layer_line_width_factor = 100 -wall_thickness = 0.8 -wall_0_wipe_dist = 0.2 -roofing_layer_count = 1 -top_bottom_thickness = 0.6 -top_thickness = 0.8 -top_layers = 5 -bottom_thickness = 0.6 -bottom_layers = 3 -top_bottom_pattern = lines -top_bottom_pattern_0 = lines -wall_0_inset = 0 -optimize_wall_printing_order = False -alternate_extra_perimeter = False -fill_outline_gaps = True -xy_offset = 0 -skin_no_small_gaps_heuristic = True -skin_outline_count = 1 -ironing_enabled = False -infill_sparse_density = 20 -zig_zaggify_infill = False -infill_multiplier = 1 -infill_wall_line_count = 0 -infill_overlap = 10 -skin_overlap = 5 -infill_wipe_dist = 0.1 -gradual_infill_steps = 0 -infill_before_walls = False -infill_support_enabled = False -max_skin_angle_for_expansion = 90 -default_material_print_temperature = 220 -material_print_temperature = 220 -material_print_temperature_layer_0 = 220 -material_initial_print_temperature = 220 -material_final_print_temperature = 220 -default_material_bed_temperature = 0 -material_bed_temperature = 0 -material_flow = 100 -retraction_enable = True -retract_at_layer_change = False -retraction_amount = 5 -retraction_speed = 45 -retraction_extra_prime_amount = 0 -retraction_min_travel = 0.8 -retraction_count_max = 90 -retraction_extrusion_window = 5 -limit_support_retractions = True -switch_extruder_retraction_amount = 16 -switch_extruder_retraction_speeds = 20 -speed_print = 50 -speed_travel = 150 -speed_layer_0 = 10 -speed_travel_layer_0 = 50 -speed_slowdown_layers = 2 acceleration_enabled = False acceleration_roofing = 3000 -jerk_enabled = False -retraction_combing = off -travel_retract_before_outer_wall = False -retraction_hop_enabled = False +adhesion_type = skirt +alternate_extra_perimeter = False +bottom_layers = 3 +bottom_thickness = 0.6 +carve_multiple_volumes = False cool_fan_enabled = True +cool_fan_full_at_height = 0.32 cool_fan_speed = 100 cool_fan_speed_0 = 0 -cool_fan_full_at_height = 0.32 cool_lift_head = False -support_enable = True -support_type = everywhere -support_angle = 50 -support_pattern = grid -support_wall_count = 0 -zig_zaggify_support = False -support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20 -support_infill_angles = [0] -support_brim_enable = True -support_brim_line_count = 5 -support_z_distance = 0.21 -support_xy_distance = 0.7 -support_xy_distance_overhang = 0.2 -support_bottom_stair_step_height = 0.3 -support_bottom_stair_step_width = 5.0 -support_join_distance = 2.0 -support_offset = 0.2 +default_material_bed_temperature = 0 +default_material_print_temperature = 220 +fill_outline_gaps = True +gradual_infill_steps = 0 gradual_support_infill_steps = 0 -support_roof_enable = True -support_bottom_enable = False -support_roof_height = 0.45 -support_roof_density = 45 -support_roof_pattern = lines -support_fan_enable = False -support_use_towers = True -support_tower_diameter = 3 -support_tower_roof_angle = 65 -adhesion_type = skirt -skirt_line_count = 2 -skirt_gap = 3 -meshfix_union_all = True -meshfix_union_all_remove_holes = False +infill_before_walls = False +infill_multiplier = 1 +infill_overlap = 10 +infill_sparse_density = 20 +infill_support_enabled = False +infill_wall_line_count = 0 +infill_wipe_dist = 0.1 +initial_layer_line_width_factor = 100 +ironing_enabled = False +jerk_enabled = False +layer_height = 0.16 +layer_height_0 = 0.24 +limit_support_retractions = True +line_width = 0.4 +material_bed_temperature = 0 +material_final_print_temperature = 220 +material_flow = 100 +material_initial_print_temperature = 220 +material_print_temperature = 220 +material_print_temperature_layer_0 = 220 +max_skin_angle_for_expansion = 90 meshfix_extensive_stitching = False meshfix_keep_open_polygons = False +meshfix_union_all = True +meshfix_union_all_remove_holes = False multiple_mesh_overlap = 0.16 -carve_multiple_volumes = False +optimize_wall_printing_order = False +retract_at_layer_change = False +retraction_amount = 5 +retraction_combing = off +retraction_count_max = 90 +retraction_enable = True +retraction_extra_prime_amount = 0 +retraction_extrusion_window = 5 +retraction_hop_enabled = False +retraction_min_travel = 0.8 +retraction_speed = 45 +roofing_layer_count = 1 +skin_no_small_gaps_heuristic = True +skin_outline_count = 1 +skin_overlap = 5 +skirt_gap = 3 +skirt_line_count = 2 +speed_layer_0 = 10 +speed_print = 50 +speed_slowdown_layers = 2 +speed_travel = 150 +speed_travel_layer_0 = 50 +support_angle = 50 +support_bottom_enable = False +support_bottom_stair_step_height = 0.3 +support_bottom_stair_step_width = 5.0 +support_brim_enable = True +support_brim_line_count = 5 +support_enable = True +support_fan_enable = False +support_infill_angles = [0] +support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20 +support_join_distance = 2.0 +support_offset = 0.2 +support_pattern = grid +support_roof_density = 45 +support_roof_enable = True +support_roof_height = 0.45 +support_roof_pattern = lines +support_tower_diameter = 3 +support_tower_roof_angle = 65 +support_type = everywhere +support_use_towers = True +support_wall_count = 0 +support_xy_distance = 0.7 +support_xy_distance_overhang = 0.2 +support_z_distance = 0.21 +switch_extruder_retraction_amount = 16 +switch_extruder_retraction_speeds = 20 +top_bottom_pattern = lines +top_bottom_pattern_0 = lines +top_bottom_thickness = 0.6 +top_layers = 5 +top_thickness = 0.8 +travel_retract_before_outer_wall = False +wall_0_inset = 0 +wall_0_wipe_dist = 0.2 +wall_thickness = 0.8 +xy_offset = 0 +zig_zaggify_infill = False +zig_zaggify_support = False + diff --git a/resources/quality/peopoly_moai/peopoly_moai_coarse.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_coarse.inst.cfg index f2dc8c271f..912366c5bb 100644 --- a/resources/quality/peopoly_moai/peopoly_moai_coarse.inst.cfg +++ b/resources/quality/peopoly_moai/peopoly_moai_coarse.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Coarse definition = peopoly_moai +name = Coarse +version = 4 [metadata] +global_quality = True +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = 3 -global_quality = True [values] layer_height = 0.08 @@ -16,3 +16,4 @@ speed_print = 90 speed_travel = 120 speed_travel_layer_0 = 100 speed_wall = 90 + diff --git a/resources/quality/peopoly_moai/peopoly_moai_draft.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_draft.inst.cfg index 1297a02efa..3ff1981c1b 100644 --- a/resources/quality/peopoly_moai/peopoly_moai_draft.inst.cfg +++ b/resources/quality/peopoly_moai/peopoly_moai_draft.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Draft definition = peopoly_moai +name = Draft +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] layer_height = 0.1 speed_print = 85 +speed_slowdown_layers = 2 speed_travel = 120 speed_travel_layer_0 = 100 speed_wall = 85 -speed_slowdown_layers = 2 + diff --git a/resources/quality/peopoly_moai/peopoly_moai_extra_high.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_extra_high.inst.cfg index 3e3c888bb9..40bebda1c7 100644 --- a/resources/quality/peopoly_moai/peopoly_moai_extra_high.inst.cfg +++ b/resources/quality/peopoly_moai/peopoly_moai_extra_high.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Extra High definition = peopoly_moai +name = Extra High +version = 4 [metadata] +global_quality = True +quality_type = extra_high setting_version = 20 type = quality -quality_type = extra_high weight = 0 -global_quality = True [values] layer_height = 0.02 speed_print = 185 +speed_slowdown_layers = 5 speed_travel = 185 speed_travel_layer_0 = 100 speed_wall = 185 -speed_slowdown_layers = 5 + diff --git a/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg index 8deddf8fa4..7f70613091 100644 --- a/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg +++ b/resources/quality/peopoly_moai/peopoly_moai_high.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = High definition = peopoly_moai +name = High +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -global_quality = True [values] layer_height = 0.04 speed_print = 140 +speed_slowdown_layers = 4 speed_travel = 140 speed_travel_layer_0 = 100 speed_wall = 140 -speed_slowdown_layers = 4 + diff --git a/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg b/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg index 902f762c13..2c6500a654 100644 --- a/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg +++ b/resources/quality/peopoly_moai/peopoly_moai_normal.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Normal definition = peopoly_moai +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] layer_height = 0.06 @@ -16,3 +16,4 @@ speed_print = 120 speed_travel = 120 speed_travel_layer_0 = 100 speed_wall = 120 + diff --git a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_adaptive.inst.cfg b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_adaptive.inst.cfg index 91485b44c7..16fadf3eb4 100644 --- a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_adaptive.inst.cfg +++ b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_adaptive.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = rigid3d_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_abs +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_abs [values] cool_fan_enabled = False -default_material_print_temperature = 240 default_material_bed_temperature = 100 +default_material_print_temperature = 240 + diff --git a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_good.inst.cfg b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_good.inst.cfg index 223f2866f9..e160c683e7 100644 --- a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_good.inst.cfg +++ b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_good.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Good Quality definition = rigid3d_base +name = Good Quality +version = 4 [metadata] +material = generic_abs +quality_type = good setting_version = 20 type = quality -quality_type = good -material = generic_abs variant = 0.4mm Nozzle [values] cool_fan_enabled = False +default_material_bed_temperature = 100 default_material_print_temperature = 235 -default_material_bed_temperature = 100 \ No newline at end of file + diff --git a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_low.inst.cfg b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_low.inst.cfg index b194edea3a..528953db9c 100644 --- a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_low.inst.cfg +++ b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_low.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Low Quality definition = rigid3d_base +name = Low Quality +version = 4 [metadata] +material = generic_abs +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_abs variant = 0.4mm Nozzle [values] cool_fan_enabled = False -default_material_print_temperature = 240 default_material_bed_temperature = 100 +default_material_print_temperature = 240 + diff --git a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_standard.inst.cfg b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_standard.inst.cfg index 22ac39071c..c78e59a850 100644 --- a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_standard.inst.cfg +++ b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_standard.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = rigid3d_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_abs [values] cool_fan_enabled = False -default_material_print_temperature = 235 default_material_bed_temperature = 100 +default_material_print_temperature = 235 + diff --git a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_super.inst.cfg b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_super.inst.cfg index feff17d39a..1d234d88bf 100644 --- a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_super.inst.cfg +++ b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_super.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Super Quality definition = rigid3d_base +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_abs [values] cool_fan_enabled = False -default_material_print_temperature = 235 default_material_bed_temperature = 100 +default_material_print_temperature = 235 + diff --git a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_ultra.inst.cfg b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_ultra.inst.cfg index 929a9fd2e3..55223b424f 100644 --- a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_ultra.inst.cfg +++ b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_ultra.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Ultra Quality definition = rigid3d_base +name = Ultra Quality +version = 4 [metadata] +material = generic_abs +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra -material = generic_abs [values] cool_fan_enabled = False -default_material_print_temperature = 235 default_material_bed_temperature = 100 +default_material_print_temperature = 235 + diff --git a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_adaptive.inst.cfg b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_adaptive.inst.cfg index e9f02fa466..8465bdbd22 100644 --- a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_adaptive.inst.cfg +++ b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_adaptive.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Dynamic Quality definition = rigid3d_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_nylon +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_nylon [values] -default_material_print_temperature = 250 -default_material_bed_temperature = 90 -retraction_amount = 3 cool_fan_enabled = False -retraction_speed = 40 \ No newline at end of file +default_material_bed_temperature = 90 +default_material_print_temperature = 250 +retraction_amount = 3 +retraction_speed = 40 + diff --git a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_good.inst.cfg b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_good.inst.cfg index 34acb85391..4b0c3da5a7 100644 --- a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_good.inst.cfg +++ b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_good.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Good Quality definition = rigid3d_base +name = Good Quality +version = 4 [metadata] +material = generic_nylon +quality_type = good setting_version = 20 type = quality -quality_type = good -material = generic_nylon [values] -default_material_print_temperature = 245 -default_material_bed_temperature = 90 -retraction_amount = 3 cool_fan_enabled = False -retraction_speed = 40 \ No newline at end of file +default_material_bed_temperature = 90 +default_material_print_temperature = 245 +retraction_amount = 3 +retraction_speed = 40 + diff --git a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_low.inst.cfg b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_low.inst.cfg index 456ec74c68..664f5e2e51 100644 --- a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_low.inst.cfg +++ b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_low.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Low Quality definition = rigid3d_base +name = Low Quality +version = 4 [metadata] +material = generic_nylon +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_nylon [values] -default_material_print_temperature = 250 -default_material_bed_temperature = 90 -retraction_amount = 3 cool_fan_enabled = False -retraction_speed = 40 \ No newline at end of file +default_material_bed_temperature = 90 +default_material_print_temperature = 250 +retraction_amount = 3 +retraction_speed = 40 + diff --git a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_standard.inst.cfg b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_standard.inst.cfg index 071e60661f..6d4d99be81 100644 --- a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_standard.inst.cfg +++ b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_standard.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Standard Quality definition = rigid3d_base +name = Standard Quality +version = 4 [metadata] +material = generic_nylon +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_nylon [values] -default_material_print_temperature = 245 -default_material_bed_temperature = 90 -retraction_amount = 3 cool_fan_enabled = False -retraction_speed = 40 \ No newline at end of file +default_material_bed_temperature = 90 +default_material_print_temperature = 245 +retraction_amount = 3 +retraction_speed = 40 + diff --git a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_super.inst.cfg b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_super.inst.cfg index 35a317a26f..0ebe089855 100644 --- a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_super.inst.cfg +++ b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_super.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Super Quality definition = rigid3d_base +name = Super Quality +version = 4 [metadata] +material = generic_nylon +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_nylon [values] -default_material_print_temperature = 245 -default_material_bed_temperature = 90 -retraction_amount = 3 cool_fan_enabled = False -retraction_speed = 40 \ No newline at end of file +default_material_bed_temperature = 90 +default_material_print_temperature = 245 +retraction_amount = 3 +retraction_speed = 40 + diff --git a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_ultra.inst.cfg b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_ultra.inst.cfg index 8f622b08c4..c77de14dfd 100644 --- a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_ultra.inst.cfg +++ b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_ultra.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Ultra Quality definition = rigid3d_base +name = Ultra Quality +version = 4 [metadata] +material = generic_nylon +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra -material = generic_nylon [values] -default_material_print_temperature = 245 -default_material_bed_temperature = 90 -retraction_amount = 3 cool_fan_enabled = False +default_material_bed_temperature = 90 +default_material_print_temperature = 245 +retraction_amount = 3 retraction_speed = 40 + diff --git a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_adaptive.inst.cfg b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_adaptive.inst.cfg index e45d965bbc..c46ccf0b37 100644 --- a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_adaptive.inst.cfg +++ b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_adaptive.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = rigid3d_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_petg +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_petg [values] -retraction_amount = 2 -default_material_print_temperature = 250 default_material_bed_temperature = 85 +default_material_print_temperature = 250 +retraction_amount = 2 + diff --git a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_good.inst.cfg b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_good.inst.cfg index 1cb3ddd594..b8f6424d66 100644 --- a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_good.inst.cfg +++ b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_good.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Good Quality definition = rigid3d_base +name = Good Quality +version = 4 [metadata] +material = generic_petg +quality_type = good setting_version = 20 type = quality -quality_type = good -material = generic_petg [values] -retraction_amount = 2 -default_material_print_temperature = 245 default_material_bed_temperature = 85 +default_material_print_temperature = 245 +retraction_amount = 2 + diff --git a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_low.inst.cfg b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_low.inst.cfg index 142dab0fa5..dc926ed484 100644 --- a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_low.inst.cfg +++ b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_low.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Low Quality definition = rigid3d_base +name = Low Quality +version = 4 [metadata] +material = generic_petg +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_petg [values] -retraction_amount = 2 -default_material_print_temperature = 250 default_material_bed_temperature = 85 +default_material_print_temperature = 250 +retraction_amount = 2 + diff --git a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_standard.inst.cfg b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_standard.inst.cfg index 9970ea80d5..1c75948842 100644 --- a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_standard.inst.cfg +++ b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_standard.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = rigid3d_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_petg [values] -retraction_amount = 2 -default_material_print_temperature = 245 default_material_bed_temperature = 85 +default_material_print_temperature = 245 +retraction_amount = 2 + diff --git a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_super.inst.cfg b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_super.inst.cfg index d9b88d6f06..90c3ea0968 100644 --- a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_super.inst.cfg +++ b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_super.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Super Quality definition = rigid3d_base +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_petg [values] -retraction_amount = 2 -default_material_print_temperature = 245 default_material_bed_temperature = 85 +default_material_print_temperature = 245 +retraction_amount = 2 + diff --git a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_ultra.inst.cfg b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_ultra.inst.cfg index a2cd29e814..52c1b3e990 100644 --- a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_ultra.inst.cfg +++ b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_ultra.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Ultra Quality definition = rigid3d_base +name = Ultra Quality +version = 4 [metadata] +material = generic_petg +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra -material = generic_petg [values] -retraction_amount = 2 -default_material_print_temperature = 245 default_material_bed_temperature = 85 +default_material_print_temperature = 245 +retraction_amount = 2 + diff --git a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_adaptive.inst.cfg b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_adaptive.inst.cfg index b5717639ec..c1f7c9051a 100644 --- a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_adaptive.inst.cfg +++ b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_adaptive.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = rigid3d_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_pla +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_pla [values] -default_material_print_temperature = 210 default_material_bed_temperature = 55 +default_material_print_temperature = 210 + diff --git a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_good.inst.cfg b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_good.inst.cfg index af26bebec3..092801063d 100644 --- a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_good.inst.cfg +++ b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_good.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Good Quality definition = rigid3d_base +name = Good Quality +version = 4 [metadata] +material = generic_pla +quality_type = good setting_version = 20 type = quality -quality_type = good -material = generic_pla [values] -default_material_print_temperature = 205 default_material_bed_temperature = 55 +default_material_print_temperature = 205 + diff --git a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_low.inst.cfg b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_low.inst.cfg index 39902dcd0d..8b67c8c276 100644 --- a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_low.inst.cfg +++ b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_low.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = rigid3d_base +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla [values] -default_material_print_temperature = 210 default_material_bed_temperature = 55 +default_material_print_temperature = 210 + diff --git a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_standard.inst.cfg b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_standard.inst.cfg index f4d2a94bb7..6aa1939aa0 100644 --- a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_standard.inst.cfg +++ b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = rigid3d_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_pla [values] -default_material_print_temperature = 205 default_material_bed_temperature = 55 +default_material_print_temperature = 205 + diff --git a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_super.inst.cfg b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_super.inst.cfg index 2c99771ee3..47f71d0ec2 100644 --- a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_super.inst.cfg +++ b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = rigid3d_base +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla [values] -default_material_print_temperature = 205 default_material_bed_temperature = 55 +default_material_print_temperature = 205 + diff --git a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_ultra.inst.cfg b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_ultra.inst.cfg index 55c658b6f7..00061cb90f 100644 --- a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_ultra.inst.cfg +++ b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_ultra.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Ultra Quality definition = rigid3d_base +name = Ultra Quality +version = 4 [metadata] +material = generic_pla +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra -material = generic_pla [values] -default_material_print_temperature = 205 default_material_bed_temperature = 55 +default_material_print_temperature = 205 + diff --git a/resources/quality/rigid3d_base/rigid3d_base_global_adaptive.inst.cfg b/resources/quality/rigid3d_base/rigid3d_base_global_adaptive.inst.cfg index a066a1d526..eb641b1d24 100644 --- a/resources/quality/rigid3d_base/rigid3d_base_global_adaptive.inst.cfg +++ b/resources/quality/rigid3d_base/rigid3d_base_global_adaptive.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Dynamic Quality definition = rigid3d_base +name = Dynamic Quality +version = 4 [metadata] +global_quality = True +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive weight = -6 -global_quality = True [values] +adaptive_layer_height_enabled = true layer_height = 0.24 layer_height_0 = 0.20 -adaptive_layer_height_enabled = true + diff --git a/resources/quality/rigid3d_base/rigid3d_base_global_good.inst.cfg b/resources/quality/rigid3d_base/rigid3d_base_global_good.inst.cfg index f6fbe8def0..3040e12e8a 100644 --- a/resources/quality/rigid3d_base/rigid3d_base_global_good.inst.cfg +++ b/resources/quality/rigid3d_base/rigid3d_base_global_good.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Good Quality definition = rigid3d_base +name = Good Quality +version = 4 [metadata] +global_quality = True +quality_type = good setting_version = 20 type = quality -quality_type = good weight = -2 -global_quality = True [values] layer_height = 0.16 layer_height_0 = 0.20 + diff --git a/resources/quality/rigid3d_base/rigid3d_base_global_low.inst.cfg b/resources/quality/rigid3d_base/rigid3d_base_global_low.inst.cfg index 52a376ea65..e2dca6acf4 100644 --- a/resources/quality/rigid3d_base/rigid3d_base_global_low.inst.cfg +++ b/resources/quality/rigid3d_base/rigid3d_base_global_low.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Low Quality definition = rigid3d_base +name = Low Quality +version = 4 [metadata] +global_quality = True +quality_type = low setting_version = 20 type = quality -quality_type = low weight = -4 -global_quality = True [values] layer_height = 0.28 layer_height_0 = 0.2 + diff --git a/resources/quality/rigid3d_base/rigid3d_base_global_standard.inst.cfg b/resources/quality/rigid3d_base/rigid3d_base_global_standard.inst.cfg index 28b1e7c974..67f551dcfc 100644 --- a/resources/quality/rigid3d_base/rigid3d_base_global_standard.inst.cfg +++ b/resources/quality/rigid3d_base/rigid3d_base_global_standard.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = rigid3d_base +name = Standard Quality +version = 4 [metadata] +global_quality = True +quality_type = standard setting_version = 20 type = quality -quality_type = standard weight = -3 -global_quality = True [values] layer_height = 0.2 layer_height_0 = 0.2 + diff --git a/resources/quality/rigid3d_base/rigid3d_base_global_super.inst.cfg b/resources/quality/rigid3d_base/rigid3d_base_global_super.inst.cfg index 1dbebd0301..601cfbbc5d 100644 --- a/resources/quality/rigid3d_base/rigid3d_base_global_super.inst.cfg +++ b/resources/quality/rigid3d_base/rigid3d_base_global_super.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Super Quality definition = rigid3d_base +name = Super Quality +version = 4 [metadata] +global_quality = True +quality_type = super setting_version = 20 type = quality -quality_type = super weight = -1 -global_quality = True [values] layer_height = 0.12 layer_height_0 = 0.20 + diff --git a/resources/quality/rigid3d_base/rigid3d_base_global_ultra.inst.cfg b/resources/quality/rigid3d_base/rigid3d_base_global_ultra.inst.cfg index 35a7a8f91e..c0da146214 100644 --- a/resources/quality/rigid3d_base/rigid3d_base_global_ultra.inst.cfg +++ b/resources/quality/rigid3d_base/rigid3d_base_global_ultra.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Ultra Quality definition = rigid3d_base +name = Ultra Quality +version = 4 [metadata] +global_quality = True +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra weight = 0 -global_quality = True [values] layer_height = 0.06 layer_height_0 = 0.20 + diff --git a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_adaptive.inst.cfg b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_adaptive.inst.cfg index fa8319ac06..d754ca5415 100644 --- a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_adaptive.inst.cfg +++ b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_adaptive.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Dynamic Quality definition = rigid3d_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_tpu +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_tpu [values] -default_material_print_temperature = 250 default_material_bed_temperature = 70 -speed_print = 20 +default_material_print_temperature = 250 +retraction_amount = 3 retraction_speed = 20 -retraction_amount = 3 \ No newline at end of file +speed_print = 20 + diff --git a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_good.inst.cfg b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_good.inst.cfg index 62b5a4bfd5..5cceadf18f 100644 --- a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_good.inst.cfg +++ b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_good.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Good Quality definition = rigid3d_base +name = Good Quality +version = 4 [metadata] +material = generic_tpu +quality_type = good setting_version = 20 type = quality -quality_type = good -material = generic_tpu [values] -default_material_print_temperature = 245 default_material_bed_temperature = 70 -speed_print = 20 +default_material_print_temperature = 245 +retraction_amount = 3 retraction_speed = 20 -retraction_amount = 3 \ No newline at end of file +speed_print = 20 + diff --git a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_low.inst.cfg b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_low.inst.cfg index cd903e1bed..afc6c21ac7 100644 --- a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_low.inst.cfg +++ b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_low.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Low Quality definition = rigid3d_base +name = Low Quality +version = 4 [metadata] +material = generic_tpu +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_tpu [values] -default_material_print_temperature = 250 default_material_bed_temperature = 70 -speed_print = 20 +default_material_print_temperature = 250 +retraction_amount = 3 retraction_speed = 20 -retraction_amount = 3 \ No newline at end of file +speed_print = 20 + diff --git a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_standard.inst.cfg b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_standard.inst.cfg index cec20319d9..0af35bdc37 100644 --- a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_standard.inst.cfg +++ b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_standard.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Standard Quality definition = rigid3d_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_tpu [values] -default_material_print_temperature = 245 default_material_bed_temperature = 70 -speed_print = 20 +default_material_print_temperature = 245 +retraction_amount = 3 retraction_speed = 20 -retraction_amount = 3 \ No newline at end of file +speed_print = 20 + diff --git a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_super.inst.cfg b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_super.inst.cfg index 4fc51a05a7..d379c53494 100644 --- a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_super.inst.cfg +++ b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_super.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Super Quality definition = rigid3d_base +name = Super Quality +version = 4 [metadata] +material = generic_tpu +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_tpu [values] -default_material_print_temperature = 245 default_material_bed_temperature = 70 -speed_print = 20 +default_material_print_temperature = 245 +retraction_amount = 3 retraction_speed = 20 -retraction_amount = 3 \ No newline at end of file +speed_print = 20 + diff --git a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_ultra.inst.cfg b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_ultra.inst.cfg index d5cc27b4fd..85256877ad 100644 --- a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_ultra.inst.cfg +++ b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_ultra.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Ultra Quality definition = rigid3d_base +name = Ultra Quality +version = 4 [metadata] +material = generic_tpu +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra -material = generic_tpu [values] -default_material_print_temperature = 245 default_material_bed_temperature = 70 -speed_print = 20 +default_material_print_temperature = 245 +retraction_amount = 3 retraction_speed = 20 -retraction_amount = 3 \ No newline at end of file +speed_print = 20 + diff --git a/resources/quality/skriware_2/sk2_advanced.inst.cfg b/resources/quality/skriware_2/sk2_advanced.inst.cfg index 22d941c394..61cfb5fc4a 100644 --- a/resources/quality/skriware_2/sk2_advanced.inst.cfg +++ b/resources/quality/skriware_2/sk2_advanced.inst.cfg @@ -1,35 +1,36 @@ [general] -version = 4 -name = Advanced definition = skriware_2 +name = Advanced +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] -layer_height = 0.2 -layer_height_0 = 0.2 -speed_travel = 80 -acceleration_travel = 400 -jerk_travel = 10 acceleration_layer_0 = 200 acceleration_print_layer_0 = 200 +acceleration_travel = 400 acceleration_travel_layer_0 = 200 jerk_layer_0 = 2 jerk_print_layer_0 = 2 +jerk_travel = 10 jerk_travel_layer_0 = 2 -raft_interface_line_spacing = 0.8 -raft_interface_line_width = 0.6 -raft_interface_speed = 40 -raft_interface_thickness = 0.2 +layer_height = 0.2 +layer_height_0 = 0.2 raft_base_line_spacing = 1.5 raft_base_line_width = 0.8 raft_base_speed = 20 raft_base_thickness = 0.3 +raft_interface_line_spacing = 0.8 +raft_interface_line_width = 0.6 +raft_interface_speed = 40 +raft_interface_thickness = 0.2 raft_surface_layers = 1 raft_surface_line_spacing = 0.6 raft_surface_speed = 60 +speed_travel = 80 + diff --git a/resources/quality/skriware_2/sk2_fast.inst.cfg b/resources/quality/skriware_2/sk2_fast.inst.cfg index 533a7289e6..bc7f5abfc5 100644 --- a/resources/quality/skriware_2/sk2_fast.inst.cfg +++ b/resources/quality/skriware_2/sk2_fast.inst.cfg @@ -1,63 +1,64 @@ [general] -version = 4 -name = Fast definition = skriware_2 +name = Fast +version = 4 [metadata] +global_quality = True +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -1 -global_quality = True [values] -layer_height = 0.3 -layer_height_0 = 0.3 -support_infill_sparse_thickness = 0.3 -speed_travel = 100 +acceleration_infill = 400 +acceleration_layer_0 = 200 +acceleration_print = 400 +acceleration_print_layer_0 = 200 +acceleration_roofing = 400 +acceleration_support = 400 +acceleration_topbottom = 400 acceleration_travel = 400 -jerk_travel = 10 -speed_wall = 40 -speed_wall_0 = 30 -speed_wall_x = 40 +acceleration_travel_layer_0 = 200 acceleration_wall = 400 acceleration_wall_0 = 400 acceleration_wall_x = 400 +jerk_infill = 10 +jerk_layer_0 = 5 +jerk_print = 10 +jerk_print_layer_0 = 2 +jerk_roofing = 10 +jerk_support = 10 +jerk_topbottom = 10 +jerk_travel = 10 +jerk_travel_layer_0 = 10 jerk_wall = 10 jerk_wall_0 = 10 jerk_wall_x = 10 -speed_infill = 80 -acceleration_infill = 400 -jerk_infill = 10 -speed_roofing = 30 -acceleration_roofing = 400 -jerk_roofing = 10 -speed_topbottom = 30 -acceleration_topbottom = 400 -jerk_topbottom = 10 -speed_support = 50 -acceleration_support = 400 -jerk_support = 10 -speed_travel_layer_0 = 80 -speed_print_layer_0 = 20 -speed_layer_0 = 10 -acceleration_layer_0 = 200 -acceleration_print_layer_0 = 200 -acceleration_travel_layer_0 = 200 -jerk_layer_0 = 5 -jerk_print_layer_0 = 2 -jerk_travel_layer_0 = 10 -speed_print = 40 -acceleration_print = 400 -jerk_print = 10 -raft_interface_line_spacing = 0.8 -raft_interface_line_width = 0.6 -raft_interface_speed = 40 -raft_interface_thickness = 0.2 +layer_height = 0.3 +layer_height_0 = 0.3 raft_base_line_spacing = 1.5 raft_base_line_width = 0.8 raft_base_speed = 20 raft_base_thickness = 0.3 +raft_interface_line_spacing = 0.8 +raft_interface_line_width = 0.6 +raft_interface_speed = 40 +raft_interface_thickness = 0.2 raft_surface_layers = 1 raft_surface_line_spacing = 0.6 raft_surface_speed = 60 +speed_infill = 80 +speed_layer_0 = 10 +speed_print = 40 +speed_print_layer_0 = 20 +speed_roofing = 30 +speed_support = 50 +speed_topbottom = 30 +speed_travel = 100 +speed_travel_layer_0 = 80 +speed_wall = 40 +speed_wall_0 = 30 +speed_wall_x = 40 +support_infill_sparse_thickness = 0.3 + diff --git a/resources/quality/skriware_2/sk2_precise.inst.cfg b/resources/quality/skriware_2/sk2_precise.inst.cfg index 3cc506aa63..2f4cbf0617 100644 --- a/resources/quality/skriware_2/sk2_precise.inst.cfg +++ b/resources/quality/skriware_2/sk2_precise.inst.cfg @@ -1,63 +1,63 @@ [general] -version = 4 -name = Precise definition = skriware_2 +name = Precise +version = 4 [metadata] +global_quality = True +quality_type = best setting_version = 20 type = quality -quality_type = best weight = -1 -global_quality = True [values] -layer_height = 0.2 -layer_height_0 = 0.2 -speed_print = 20 -speed_travel = 80 +acceleration_infill = 400 +acceleration_layer_0 = 200 +acceleration_print = 400 +acceleration_print_layer_0 = 200 +acceleration_roofing = 400 +acceleration_support = 400 +acceleration_topbottom = 400 acceleration_travel = 400 -jerk_travel = 10 -speed_wall = 20 -speed_wall_0 = 20 -speed_wall_x = 20 +acceleration_travel_layer_0 = 200 acceleration_wall = 400 acceleration_wall_0 = 200 acceleration_wall_x = 200 +jerk_infill = 10 +jerk_layer_0 = 10 +jerk_print = 10 +jerk_print_layer_0 = 10 +jerk_roofing = 10 +jerk_support = 10 +jerk_topbottom = 10 +jerk_travel = 10 +jerk_travel_layer_0 = 10 jerk_wall = 10 jerk_wall_0 = 5 jerk_wall_x = 10 -speed_infill = 80 -acceleration_infill = 400 -jerk_infill = 10 -speed_roofing = 20 -acceleration_roofing = 400 -jerk_roofing = 10 -speed_topbottom = 20 -acceleration_topbottom = 400 -jerk_topbottom = 10 -speed_support = 50 -acceleration_support = 400 -jerk_support = 10 -speed_travel_layer_0 = 80 -speed_print_layer_0 = 20 -speed_layer_0 = 20 -acceleration_layer_0 = 200 -acceleration_print_layer_0 = 200 -acceleration_travel_layer_0 = 200 -jerk_layer_0 = 10 -jerk_print_layer_0 = 10 -jerk_travel_layer_0 = 10 -speed_print = 20 -acceleration_print = 400 -jerk_print = 10 -raft_interface_line_spacing = 0.8 -raft_interface_line_width = 0.6 -raft_interface_speed = 40 -raft_interface_thickness = 0.2 +layer_height = 0.2 +layer_height_0 = 0.2 raft_base_line_spacing = 1.5 raft_base_line_width = 0.8 raft_base_speed = 20 raft_base_thickness = 0.3 +raft_interface_line_spacing = 0.8 +raft_interface_line_width = 0.6 +raft_interface_speed = 40 +raft_interface_thickness = 0.2 raft_surface_layers = 1 raft_surface_line_spacing = 0.6 raft_surface_speed = 60 +speed_infill = 80 +speed_layer_0 = 20 +speed_print = 20 +speed_print_layer_0 = 20 +speed_roofing = 20 +speed_support = 50 +speed_topbottom = 20 +speed_travel = 80 +speed_travel_layer_0 = 80 +speed_wall = 20 +speed_wall_0 = 20 +speed_wall_x = 20 + diff --git a/resources/quality/snakeoilxy/snakeoilxy_global_fast_quality.inst.cfg b/resources/quality/snakeoilxy/snakeoilxy_global_fast_quality.inst.cfg new file mode 100644 index 0000000000..047f2bb100 --- /dev/null +++ b/resources/quality/snakeoilxy/snakeoilxy_global_fast_quality.inst.cfg @@ -0,0 +1,57 @@ +[general] +definition = snakeoil_standard_base +name = Fast +version = 4 + +[metadata] +global_quality = True +quality_type = fast +setting_version = 20 +type = quality + +[values] +acceleration_enabled = True +acceleration_print = 15000 +acceleration_roofing = 10000 +acceleration_topbottom = 10000 +acceleration_travel = 15000 +acceleration_wall = 15000 +acceleration_wall_0 = 10000 +adhesion_type = skirt +alternate_extra_perimeter = False +infill_line_width = 0.5 +infill_pattern = lines +infill_sparse_density = 10 +layer_height = 0.2 +layer_height_0 = 0.2 +optimize_wall_printing_order = True +retraction_amount = 0.8 +retraction_combing = noskin +retraction_hop = 0.2 +retraction_hop_enabled = True +retraction_hop_only_when_collides = True +retraction_speed = 35 +roofing_layer_count = 0 +skin_monotonic = True +skirt_brim_speed = 45 +speed_infill = 200 +speed_layer_0 = 45 +speed_print = 300 +speed_print_layer_0 = 45 +speed_roofing = 100 +speed_support = 200 +speed_topbottom = 150 +speed_travel = 300 +speed_travel_layer_0 = 150 +speed_wall = 100 +speed_wall_0 = 100 +speed_wall_x = 150 +support_angle = 46 +support_enable = False +top_bottom_thickness = 0.6 +travel_avoid_supports = True +wall_line_width = 0.45 +wall_line_width_0 = 0.4 +wall_thickness = 1.25 +zig_zaggify_infill = True + diff --git a/resources/quality/snakeoilxy/snakeoilxy_global_fine_quality.inst.cfg b/resources/quality/snakeoilxy/snakeoilxy_global_fine_quality.inst.cfg new file mode 100644 index 0000000000..fdb9965a58 --- /dev/null +++ b/resources/quality/snakeoilxy/snakeoilxy_global_fine_quality.inst.cfg @@ -0,0 +1,57 @@ +[general] +definition = snakeoil_standard_base +name = Fine +version = 4 + +[metadata] +global_quality = True +quality_type = fine +setting_version = 20 +type = quality + +[values] +acceleration_enabled = True +acceleration_print = 15000 +acceleration_roofing = 10000 +acceleration_topbottom = 10000 +acceleration_travel = 15000 +acceleration_wall = 7500 +acceleration_wall_0 = 7500 +adhesion_type = skirt +alternate_extra_perimeter = False +cool_min_layer_time = 10 +infill_line_width = 0.5 +infill_pattern = gyroid +infill_sparse_density = 15 +inset_direction = outside_in +layer_height = 0.2 +layer_height_0 = 0.2 +optimize_wall_printing_order = True +retraction_amount = 0.8 +retraction_combing = noskin +retraction_hop = 0.2 +retraction_hop_enabled = True +retraction_hop_only_when_collides = True +retraction_speed = 35 +roofing_layer_count = 1 +skin_monotonic = True +skirt_brim_speed = 45 +speed_infill = 150 +speed_layer_0 = 45 +speed_print = 100 +speed_roofing = 100 +speed_topbottom = 100 +speed_travel = 300 +speed_travel_layer_0 = 60 +speed_wall = 100 +speed_wall_0 = 75 +speed_wall_x = 100 +support_angle = 46 +support_enable = False +top_bottom_thickness = 0.8 +travel_avoid_supports = True +wall_line_width = 0.45 +wall_line_width_0 = 0.4 +wall_thickness = 1.65 +zig_zaggify_infill = True + diff --git a/resources/quality/snakeoilxy/snakeoilxy_global_normal_quality.inst.cfg b/resources/quality/snakeoilxy/snakeoilxy_global_normal_quality.inst.cfg new file mode 100644 index 0000000000..4f206e6d59 --- /dev/null +++ b/resources/quality/snakeoilxy/snakeoilxy_global_normal_quality.inst.cfg @@ -0,0 +1,57 @@ +[general] +definition = snakeoil_standard_base +name = Normal +version = 4 + +[metadata] +global_quality = True +quality_type = normal +setting_version = 20 +type = quality + +[values] +acceleration_enabled = True +acceleration_print = 15000 +acceleration_roofing = 10000 +acceleration_topbottom = 10000 +acceleration_travel = 15000 +acceleration_wall = 10000 +acceleration_wall_0 = 7500 +adhesion_type = skirt +alternate_extra_perimeter = True +bottom_layers = 3 +infill_line_width = 0.5 +infill_pattern = gyroid +infill_sparse_density = 15 +layer_height = 0.2 +layer_height_0 = 0.2 +optimize_wall_printing_order = True +retraction_amount = 0.8 +retraction_combing = noskin +retraction_hop = 0.2 +retraction_hop_enabled = True +retraction_hop_only_when_collides = True +retraction_speed = 35 +roofing_layer_count = 1 +skin_monotonic = True +skirt_brim_speed = 45 +speed_infill = 150 +speed_layer_0 = 45 +speed_print = 150 +speed_roofing = 100 +speed_topbottom = 100 +speed_travel = 300 +speed_travel_layer_0 = 100 +speed_wall = 100 +speed_wall_0 = 100 +speed_wall_x = 150 +support_angle = 46 +support_enable = False +top_bottom_thickness = 0.6 +top_layers = 3 +travel_avoid_supports = True +wall_line_width = 0.45 +wall_line_width_0 = 0.4 +wall_thickness = 1.25 +zig_zaggify_infill = True + diff --git a/resources/quality/snakeoilxy/snakeoilxy_global_strong_quality.inst.cfg b/resources/quality/snakeoilxy/snakeoilxy_global_strong_quality.inst.cfg new file mode 100644 index 0000000000..755d2f4e87 --- /dev/null +++ b/resources/quality/snakeoilxy/snakeoilxy_global_strong_quality.inst.cfg @@ -0,0 +1,56 @@ +[general] +definition = snakeoil_standard_base +name = Strong +version = 4 + +[metadata] +global_quality = True +quality_type = strong +setting_version = 20 +type = quality + +[values] +acceleration_enabled = True +acceleration_print = 15000 +acceleration_roofing = 10000 +acceleration_topbottom = 10000 +acceleration_travel = 15000 +acceleration_wall = 10000 +acceleration_wall_0 = 7500 +adhesion_type = skirt +alternate_extra_perimeter = True +infill_line_width = 0.5 +infill_pattern = gyroid +infill_sparse_density = 30 +layer_height = 0.2 +layer_height_0 = 0.2 +optimize_wall_printing_order = True +retraction_amount = 0.8 +retraction_combing = noskin +retraction_hop = 0.2 +retraction_hop_enabled = True +retraction_hop_only_when_collides = True +retraction_speed = 35 +roofing_layer_count = 1 +skin_monotonic = True +skirt_brim_speed = 45 +speed_infill = 150 +speed_layer_0 = 45 +speed_print = 100 +speed_print_layer_0 = 60 +speed_roofing = 100 +speed_topbottom = 100 +speed_travel = 300 +speed_travel_layer_0 = 100 +speed_wall = 100 +speed_wall_0 = 75 +speed_wall_x = 100 +support_angle = 46 +support_enable = False +top_bottom_thickness = 1 +travel_avoid_supports = True +wall_line_width = 0.45 +wall_line_width_0 = 0.4 +wall_thickness = 2.05 +zig_zaggify_infill = True + diff --git a/resources/quality/snapmaker2/snapmaker2_fast.inst.cfg b/resources/quality/snapmaker2/snapmaker2_fast.inst.cfg index f3576e3060..c45bdd237d 100644 --- a/resources/quality/snapmaker2/snapmaker2_fast.inst.cfg +++ b/resources/quality/snapmaker2/snapmaker2_fast.inst.cfg @@ -1,65 +1,58 @@ -[general] -version = 4 -name = Fast -definition = snapmaker2 - -[metadata] -setting_version = 20 -type = quality -quality_type = fast -weight = -2 -global_quality = True - -[values] -layer_height = 0.24 -layer_height_0 = 0.2 -initial_layer_line_width_factor = 100 - -wall_thickness = 0.8 -wall_line_count = 2 -top_thickness = 0.8 -top_layers = 4 -bottom_thickness = 0.8 -bottom_layers = 4 -skin_outline_count = 0 - -; infill_line_distance = 8 -infill_sparse_density = 15 -infill_sparse_thickness = 0.24 -skin_preshrink = 0.8 -top_skin_preshrink = 0.8 -bottom_skin_preshrink = 0.8 -expand_skins_expand_distance = 0.8 -top_skin_expand_distance = 0.8 -bottom_skin_expand_distance = 0.8 - -speed_travel = 80 -speed_topbottom = 30 -speed_wall_x = 25 -speed_wall_0 = 20 -speed_wall = 40 -speed_infill = 60 -speed_print = 60 -speed_print_layer_0 = 18 -speed_travel_layer_0 = 24 -skirt_brim_speed = 18 - -retraction_hop = 1 -retraction_hop_enabled = False - -magic_spiralize = False -magic_mesh_surface_mode = normal - -adhesion_type = skirt -skirt_line_count = 1 -brim_width = 8 -brim_line_count = 20 -raft_margin = 15 - -support_enable = False -support_type = everywhere -support_pattern = zigzag -support_angle = 50 -support_infill_rate = 15 -support_line_distance = 2.66 -support_initial_layer_line_distance = 2.66 +[general] +definition = snapmaker2 +name = Fast +version = 4 + +[metadata] +global_quality = True +quality_type = fast +setting_version = 20 +type = quality +weight = -2 + +[values] +adhesion_type = skirt +bottom_layers = 4 +bottom_skin_expand_distance = 0.8 +bottom_skin_preshrink = 0.8 +bottom_thickness = 0.8 +brim_line_count = 20 +brim_width = 8 +expand_skins_expand_distance = 0.8 +infill_sparse_density = 15 +infill_sparse_thickness = 0.24 +initial_layer_line_width_factor = 100 +layer_height = 0.24 +layer_height_0 = 0.2 +magic_mesh_surface_mode = normal +magic_spiralize = False +raft_margin = 15 +retraction_hop = 1 +retraction_hop_enabled = False +skin_outline_count = 0 +skin_preshrink = 0.8 +skirt_brim_speed = 18 +skirt_line_count = 1 +speed_infill = 60 +speed_print = 60 +speed_print_layer_0 = 18 +speed_topbottom = 30 +speed_travel = 80 +speed_travel_layer_0 = 24 +speed_wall = 40 +speed_wall_0 = 20 +speed_wall_x = 25 +support_angle = 50 +support_enable = False +support_infill_rate = 15 +support_initial_layer_line_distance = 2.66 +support_line_distance = 2.66 +support_pattern = zigzag +support_type = everywhere +top_layers = 4 +top_skin_expand_distance = 0.8 +top_skin_preshrink = 0.8 +top_thickness = 0.8 +wall_line_count = 2 +wall_thickness = 0.8 + diff --git a/resources/quality/snapmaker2/snapmaker2_high.inst.cfg b/resources/quality/snapmaker2/snapmaker2_high.inst.cfg index a4ff9e9ad6..d9855bd506 100644 --- a/resources/quality/snapmaker2/snapmaker2_high.inst.cfg +++ b/resources/quality/snapmaker2/snapmaker2_high.inst.cfg @@ -1,64 +1,57 @@ [general] -version = 4 -name = High definition = snapmaker2 +name = High +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -global_quality = True [values] -layer_height = 0.08 -layer_height_0 = 0.15 -initial_layer_line_width_factor = 100 - -wall_thickness = 1.2 -wall_line_count = 3 -top_thickness = 0.8 -top_layers = 10 -bottom_thickness = 0.8 +adhesion_type = skirt bottom_layers = 10 -skin_outline_count = 1 - -; infill_line_distance = 8 +bottom_skin_expand_distance = 1.2 +bottom_skin_preshrink = 1.2 +bottom_thickness = 0.8 +brim_line_count = 20 +brim_width = 8 +expand_skins_expand_distance = 1.2 infill_sparse_density = 15 infill_sparse_thickness = 0.08 +initial_layer_line_width_factor = 100 +layer_height = 0.08 +layer_height_0 = 0.15 +magic_mesh_surface_mode = normal +magic_spiralize = False +raft_margin = 15 +retraction_hop = 1 +retraction_hop_enabled = False +skin_outline_count = 1 skin_preshrink = 1.2 -top_skin_preshrink = 1.2 -bottom_skin_preshrink = 1.2 -expand_skins_expand_distance = 1.2 -top_skin_expand_distance = 1.2 -bottom_skin_expand_distance = 1.2 - -speed_travel = 60 -speed_topbottom = 20 -speed_wall_x = 15 -speed_wall_0 = 10 -speed_wall = 30 +skirt_brim_speed = 18 +skirt_line_count = 1 speed_infill = 40 speed_print = 40 speed_print_layer_0 = 18 +speed_topbottom = 20 +speed_travel = 60 speed_travel_layer_0 = 24 -skirt_brim_speed = 18 - -retraction_hop = 1 -retraction_hop_enabled = False - -magic_spiralize = False -magic_mesh_surface_mode = normal - -adhesion_type = skirt -skirt_line_count = 1 -brim_width = 8 -brim_line_count = 20 -raft_margin = 15 - -support_enable = False -support_type = everywhere -support_pattern = zigzag +speed_wall = 30 +speed_wall_0 = 10 +speed_wall_x = 15 support_angle = 50 +support_enable = False support_infill_rate = 15 support_line_distance = 2.66 +support_pattern = zigzag +support_type = everywhere +top_layers = 10 +top_skin_expand_distance = 1.2 +top_skin_preshrink = 1.2 +top_thickness = 0.8 +wall_line_count = 3 +wall_thickness = 1.2 + diff --git a/resources/quality/snapmaker2/snapmaker2_normal.inst.cfg b/resources/quality/snapmaker2/snapmaker2_normal.inst.cfg index 9221a7e15e..aabc9e71cb 100644 --- a/resources/quality/snapmaker2/snapmaker2_normal.inst.cfg +++ b/resources/quality/snapmaker2/snapmaker2_normal.inst.cfg @@ -1,65 +1,58 @@ -[general] -version = 4 -name = Normal -definition = snapmaker2 - -[metadata] -setting_version = 20 -type = quality -quality_type = normal -weight = 0 -global_quality = True - -[values] -layer_height = 0.16 -layer_height_0 = 0.2 -initial_layer_line_width_factor = 100 - -wall_thickness = 1.2 -wall_line_count = 3 -top_thickness = 0.8 -top_layers = 5 -bottom_thickness = 0.8 -bottom_layers = 5 -skin_outline_count = 0 - -; infill_line_distance = 8 -infill_sparse_density = 15 -infill_sparse_thickness = 0.16 -skin_preshrink = 1.2 -top_skin_preshrink = 1.2 -bottom_skin_preshrink = 1.2 -expand_skins_expand_distance = 1.2 -top_skin_expand_distance = 1.2 -bottom_skin_expand_distance = 1.2 - -speed_travel = 70 -speed_topbottom = 25 -speed_wall_x = 20 -speed_wall_0 = 15 -speed_wall = 30 -speed_infill = 50 -speed_print = 50 -speed_print_layer_0 = 18 -speed_travel_layer_0 = 24 -skirt_brim_speed = 18 - -retraction_hop = 1 -retraction_hop_enabled = False - -magic_spiralize = False -magic_mesh_surface_mode = normal - -adhesion_type = skirt -skirt_line_count = 1 -brim_width = 8 -brim_line_count = 20 -raft_margin = 15 - -support_enable = False -support_type = everywhere -support_pattern = zigzag -support_angle = 50 -support_infill_rate = 15 -support_line_distance = 2.66 -support_initial_layer_line_distance = 2.66 +[general] +definition = snapmaker2 +name = Normal +version = 4 + +[metadata] +global_quality = True +quality_type = normal +setting_version = 20 +type = quality +weight = 0 + +[values] +adhesion_type = skirt +bottom_layers = 5 +bottom_skin_expand_distance = 1.2 +bottom_skin_preshrink = 1.2 +bottom_thickness = 0.8 +brim_line_count = 20 +brim_width = 8 +expand_skins_expand_distance = 1.2 +infill_sparse_density = 15 +infill_sparse_thickness = 0.16 +initial_layer_line_width_factor = 100 +layer_height = 0.16 +layer_height_0 = 0.2 +magic_mesh_surface_mode = normal +magic_spiralize = False +raft_margin = 15 +retraction_hop = 1 +retraction_hop_enabled = False +skin_outline_count = 0 +skin_preshrink = 1.2 +skirt_brim_speed = 18 +skirt_line_count = 1 +speed_infill = 50 +speed_print = 50 +speed_print_layer_0 = 18 +speed_topbottom = 25 +speed_travel = 70 +speed_travel_layer_0 = 24 +speed_wall = 30 +speed_wall_0 = 15 +speed_wall_x = 20 +support_angle = 50 +support_enable = False +support_infill_rate = 15 +support_initial_layer_line_distance = 2.66 +support_line_distance = 2.66 +support_pattern = zigzag +support_type = everywhere +top_layers = 5 +top_skin_expand_distance = 1.2 +top_skin_preshrink = 1.2 +top_thickness = 0.8 +wall_line_count = 3 +wall_thickness = 1.2 + diff --git a/resources/quality/sovol/ABS/sovol_bowden_0.2_ABS_super.inst.cfg b/resources/quality/sovol/ABS/sovol_bowden_0.2_ABS_super.inst.cfg new file mode 100644 index 0000000000..21f8d8b4fe --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_bowden_0.2_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Super Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = super +setting_version = 20 +type = quality +variant = 0.2mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_bowden_0.2_ABS_ultra.inst.cfg b/resources/quality/sovol/ABS/sovol_bowden_0.2_ABS_ultra.inst.cfg new file mode 100644 index 0000000000..ff835ca89f --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_bowden_0.2_ABS_ultra.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Ultra Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = ultra +setting_version = 20 +type = quality +variant = 0.2mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_bowden_0.3_ABS_adaptive.inst.cfg b/resources/quality/sovol/ABS/sovol_bowden_0.3_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..35afe8d20f --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_bowden_0.3_ABS_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_bowden_0.3_ABS_low.inst.cfg b/resources/quality/sovol/ABS/sovol_bowden_0.3_ABS_low.inst.cfg new file mode 100644 index 0000000000..46b47b1253 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_bowden_0.3_ABS_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Low Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = low +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_bowden_0.3_ABS_standard.inst.cfg b/resources/quality/sovol/ABS/sovol_bowden_0.3_ABS_standard.inst.cfg new file mode 100644 index 0000000000..63e62f0f99 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_bowden_0.3_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Standard Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = standard +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_bowden_0.3_ABS_super.inst.cfg b/resources/quality/sovol/ABS/sovol_bowden_0.3_ABS_super.inst.cfg new file mode 100644 index 0000000000..85da59c98d --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_bowden_0.3_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Super Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = super +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_bowden_0.4_ABS_adaptive.inst.cfg b/resources/quality/sovol/ABS/sovol_bowden_0.4_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..78abfdf631 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_bowden_0.4_ABS_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_bowden_0.4_ABS_low.inst.cfg b/resources/quality/sovol/ABS/sovol_bowden_0.4_ABS_low.inst.cfg new file mode 100644 index 0000000000..5f9224c643 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_bowden_0.4_ABS_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Low Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = low +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_bowden_0.4_ABS_standard.inst.cfg b/resources/quality/sovol/ABS/sovol_bowden_0.4_ABS_standard.inst.cfg new file mode 100644 index 0000000000..f6116f3bd2 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_bowden_0.4_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Standard Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = standard +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_bowden_0.4_ABS_super.inst.cfg b/resources/quality/sovol/ABS/sovol_bowden_0.4_ABS_super.inst.cfg new file mode 100644 index 0000000000..8948f468f2 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_bowden_0.4_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Super Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = super +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_bowden_0.5_ABS_adaptive.inst.cfg b/resources/quality/sovol/ABS/sovol_bowden_0.5_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..1a70351dc5 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_bowden_0.5_ABS_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_bowden_0.5_ABS_low.inst.cfg b/resources/quality/sovol/ABS/sovol_bowden_0.5_ABS_low.inst.cfg new file mode 100644 index 0000000000..ea39f53779 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_bowden_0.5_ABS_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Low Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = low +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_bowden_0.5_ABS_standard.inst.cfg b/resources/quality/sovol/ABS/sovol_bowden_0.5_ABS_standard.inst.cfg new file mode 100644 index 0000000000..483febcacb --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_bowden_0.5_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Standard Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = standard +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_bowden_0.5_ABS_super.inst.cfg b/resources/quality/sovol/ABS/sovol_bowden_0.5_ABS_super.inst.cfg new file mode 100644 index 0000000000..6878f2d9d8 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_bowden_0.5_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Super Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = super +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_bowden_0.6_ABS_adaptive.inst.cfg b/resources/quality/sovol/ABS/sovol_bowden_0.6_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..387239c0f4 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_bowden_0.6_ABS_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_bowden_0.6_ABS_draft.inst.cfg b/resources/quality/sovol/ABS/sovol_bowden_0.6_ABS_draft.inst.cfg new file mode 100644 index 0000000000..7a3b980e0a --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_bowden_0.6_ABS_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Draft Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = draft +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_bowden_0.6_ABS_low.inst.cfg b/resources/quality/sovol/ABS/sovol_bowden_0.6_ABS_low.inst.cfg new file mode 100644 index 0000000000..ea39f53779 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_bowden_0.6_ABS_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Low Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = low +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_bowden_0.6_ABS_standard.inst.cfg b/resources/quality/sovol/ABS/sovol_bowden_0.6_ABS_standard.inst.cfg new file mode 100644 index 0000000000..460e2ae243 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_bowden_0.6_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Standard Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = standard +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_bowden_0.8_ABS_draft.inst.cfg b/resources/quality/sovol/ABS/sovol_bowden_0.8_ABS_draft.inst.cfg new file mode 100644 index 0000000000..d383bf27fa --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_bowden_0.8_ABS_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Draft Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = draft +setting_version = 20 +type = quality +variant = 0.8mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_bowden_1.0_ABS_draft.inst.cfg b/resources/quality/sovol/ABS/sovol_bowden_1.0_ABS_draft.inst.cfg new file mode 100644 index 0000000000..216a3308dc --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_bowden_1.0_ABS_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Draft Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = draft +setting_version = 20 +type = quality +variant = 1.0mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_planetary_0.2_ABS_super.inst.cfg b/resources/quality/sovol/ABS/sovol_planetary_0.2_ABS_super.inst.cfg new file mode 100644 index 0000000000..ebb3921413 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_planetary_0.2_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Super Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = super +setting_version = 20 +type = quality +variant = 0.2mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_planetary_0.2_ABS_ultra.inst.cfg b/resources/quality/sovol/ABS/sovol_planetary_0.2_ABS_ultra.inst.cfg new file mode 100644 index 0000000000..af48cf0ac6 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_planetary_0.2_ABS_ultra.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Ultra Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = ultra +setting_version = 20 +type = quality +variant = 0.2mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_planetary_0.3_ABS_adaptive.inst.cfg b/resources/quality/sovol/ABS/sovol_planetary_0.3_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..1b77c906d3 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_planetary_0.3_ABS_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_planetary_0.3_ABS_low.inst.cfg b/resources/quality/sovol/ABS/sovol_planetary_0.3_ABS_low.inst.cfg new file mode 100644 index 0000000000..c7ea1d39de --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_planetary_0.3_ABS_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Low Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = low +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_planetary_0.3_ABS_standard.inst.cfg b/resources/quality/sovol/ABS/sovol_planetary_0.3_ABS_standard.inst.cfg new file mode 100644 index 0000000000..e354c6a9d5 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_planetary_0.3_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Standard Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = standard +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_planetary_0.3_ABS_super.inst.cfg b/resources/quality/sovol/ABS/sovol_planetary_0.3_ABS_super.inst.cfg new file mode 100644 index 0000000000..3ec447bfe9 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_planetary_0.3_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Super Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = super +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_planetary_0.4_ABS_adaptive.inst.cfg b/resources/quality/sovol/ABS/sovol_planetary_0.4_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..4f8130e9ec --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_planetary_0.4_ABS_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_planetary_0.4_ABS_low.inst.cfg b/resources/quality/sovol/ABS/sovol_planetary_0.4_ABS_low.inst.cfg new file mode 100644 index 0000000000..1a5754d538 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_planetary_0.4_ABS_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Low Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = low +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_planetary_0.4_ABS_standard.inst.cfg b/resources/quality/sovol/ABS/sovol_planetary_0.4_ABS_standard.inst.cfg new file mode 100644 index 0000000000..2fd0526a82 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_planetary_0.4_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Standard Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = standard +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_planetary_0.4_ABS_super.inst.cfg b/resources/quality/sovol/ABS/sovol_planetary_0.4_ABS_super.inst.cfg new file mode 100644 index 0000000000..5922d49fcf --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_planetary_0.4_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Super Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = super +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_planetary_0.5_ABS_adaptive.inst.cfg b/resources/quality/sovol/ABS/sovol_planetary_0.5_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..312a7a49ef --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_planetary_0.5_ABS_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_planetary_0.5_ABS_low.inst.cfg b/resources/quality/sovol/ABS/sovol_planetary_0.5_ABS_low.inst.cfg new file mode 100644 index 0000000000..7f0ca2e0e4 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_planetary_0.5_ABS_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Low Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = low +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_planetary_0.5_ABS_standard.inst.cfg b/resources/quality/sovol/ABS/sovol_planetary_0.5_ABS_standard.inst.cfg new file mode 100644 index 0000000000..3c3e023c5d --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_planetary_0.5_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Standard Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = standard +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_planetary_0.5_ABS_super.inst.cfg b/resources/quality/sovol/ABS/sovol_planetary_0.5_ABS_super.inst.cfg new file mode 100644 index 0000000000..29b318248c --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_planetary_0.5_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Super Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = super +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_planetary_0.6_ABS_adaptive.inst.cfg b/resources/quality/sovol/ABS/sovol_planetary_0.6_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..7ad13d5b64 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_planetary_0.6_ABS_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_planetary_0.6_ABS_draft.inst.cfg b/resources/quality/sovol/ABS/sovol_planetary_0.6_ABS_draft.inst.cfg new file mode 100644 index 0000000000..3a69d76a67 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_planetary_0.6_ABS_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Draft Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = draft +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_planetary_0.6_ABS_low.inst.cfg b/resources/quality/sovol/ABS/sovol_planetary_0.6_ABS_low.inst.cfg new file mode 100644 index 0000000000..7f0ca2e0e4 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_planetary_0.6_ABS_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Low Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = low +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_planetary_0.6_ABS_standard.inst.cfg b/resources/quality/sovol/ABS/sovol_planetary_0.6_ABS_standard.inst.cfg new file mode 100644 index 0000000000..e9909c4db1 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_planetary_0.6_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Standard Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = standard +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_planetary_0.8_ABS_draft.inst.cfg b/resources/quality/sovol/ABS/sovol_planetary_0.8_ABS_draft.inst.cfg new file mode 100644 index 0000000000..82b0935c44 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_planetary_0.8_ABS_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Draft Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = draft +setting_version = 20 +type = quality +variant = 0.8mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_planetary_1.0_ABS_draft.inst.cfg b/resources/quality/sovol/ABS/sovol_planetary_1.0_ABS_draft.inst.cfg new file mode 100644 index 0000000000..f80356b9c0 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_planetary_1.0_ABS_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Draft Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = draft +setting_version = 20 +type = quality +variant = 1.0mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_titan_0.2_ABS_super.inst.cfg b/resources/quality/sovol/ABS/sovol_titan_0.2_ABS_super.inst.cfg new file mode 100644 index 0000000000..4175475359 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_titan_0.2_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Super Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = super +setting_version = 20 +type = quality +variant = 0.2mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_titan_0.2_ABS_ultra.inst.cfg b/resources/quality/sovol/ABS/sovol_titan_0.2_ABS_ultra.inst.cfg new file mode 100644 index 0000000000..4ba1248b9b --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_titan_0.2_ABS_ultra.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Ultra Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = ultra +setting_version = 20 +type = quality +variant = 0.2mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_titan_0.3_ABS_adaptive.inst.cfg b/resources/quality/sovol/ABS/sovol_titan_0.3_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..9e0d9f691f --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_titan_0.3_ABS_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_titan_0.3_ABS_low.inst.cfg b/resources/quality/sovol/ABS/sovol_titan_0.3_ABS_low.inst.cfg new file mode 100644 index 0000000000..89c3d90794 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_titan_0.3_ABS_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Low Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = low +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_titan_0.3_ABS_standard.inst.cfg b/resources/quality/sovol/ABS/sovol_titan_0.3_ABS_standard.inst.cfg new file mode 100644 index 0000000000..952976d258 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_titan_0.3_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Standard Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = standard +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_titan_0.3_ABS_super.inst.cfg b/resources/quality/sovol/ABS/sovol_titan_0.3_ABS_super.inst.cfg new file mode 100644 index 0000000000..13a9432acf --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_titan_0.3_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Super Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = super +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_titan_0.4_ABS_adaptive.inst.cfg b/resources/quality/sovol/ABS/sovol_titan_0.4_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..b078c40652 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_titan_0.4_ABS_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_titan_0.4_ABS_low.inst.cfg b/resources/quality/sovol/ABS/sovol_titan_0.4_ABS_low.inst.cfg new file mode 100644 index 0000000000..05574c55fc --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_titan_0.4_ABS_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Low Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = low +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_titan_0.4_ABS_standard.inst.cfg b/resources/quality/sovol/ABS/sovol_titan_0.4_ABS_standard.inst.cfg new file mode 100644 index 0000000000..f45f8f1718 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_titan_0.4_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Standard Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = standard +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_titan_0.4_ABS_super.inst.cfg b/resources/quality/sovol/ABS/sovol_titan_0.4_ABS_super.inst.cfg new file mode 100644 index 0000000000..5da5a122a5 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_titan_0.4_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Super Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = super +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_titan_0.5_ABS_adaptive.inst.cfg b/resources/quality/sovol/ABS/sovol_titan_0.5_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..85c000424a --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_titan_0.5_ABS_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_titan_0.5_ABS_low.inst.cfg b/resources/quality/sovol/ABS/sovol_titan_0.5_ABS_low.inst.cfg new file mode 100644 index 0000000000..315299a04e --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_titan_0.5_ABS_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Low Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = low +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_titan_0.5_ABS_standard.inst.cfg b/resources/quality/sovol/ABS/sovol_titan_0.5_ABS_standard.inst.cfg new file mode 100644 index 0000000000..1a81900d90 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_titan_0.5_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Standard Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = standard +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_titan_0.5_ABS_super.inst.cfg b/resources/quality/sovol/ABS/sovol_titan_0.5_ABS_super.inst.cfg new file mode 100644 index 0000000000..97af728079 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_titan_0.5_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Super Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = super +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_titan_0.6_ABS_adaptive.inst.cfg b/resources/quality/sovol/ABS/sovol_titan_0.6_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..a6d1d34dcf --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_titan_0.6_ABS_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_titan_0.6_ABS_draft.inst.cfg b/resources/quality/sovol/ABS/sovol_titan_0.6_ABS_draft.inst.cfg new file mode 100644 index 0000000000..8ed9ebab18 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_titan_0.6_ABS_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Draft Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = draft +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_titan_0.6_ABS_low.inst.cfg b/resources/quality/sovol/ABS/sovol_titan_0.6_ABS_low.inst.cfg new file mode 100644 index 0000000000..315299a04e --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_titan_0.6_ABS_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Low Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = low +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_titan_0.6_ABS_standard.inst.cfg b/resources/quality/sovol/ABS/sovol_titan_0.6_ABS_standard.inst.cfg new file mode 100644 index 0000000000..d5021990c1 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_titan_0.6_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Standard Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = standard +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_titan_0.8_ABS_draft.inst.cfg b/resources/quality/sovol/ABS/sovol_titan_0.8_ABS_draft.inst.cfg new file mode 100644 index 0000000000..5a1096f368 --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_titan_0.8_ABS_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Draft Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = draft +setting_version = 20 +type = quality +variant = 0.8mm Nozzle + +[values] + diff --git a/resources/quality/sovol/ABS/sovol_titan_1.0_ABS_draft.inst.cfg b/resources/quality/sovol/ABS/sovol_titan_1.0_ABS_draft.inst.cfg new file mode 100644 index 0000000000..bce6a465eb --- /dev/null +++ b/resources/quality/sovol/ABS/sovol_titan_1.0_ABS_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Draft Quality +version = 4 + +[metadata] +material = generic_abs +quality_type = draft +setting_version = 20 +type = quality +variant = 1.0mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PETG/sovol_bowden_0.2_PETG_super.inst.cfg b/resources/quality/sovol/PETG/sovol_bowden_0.2_PETG_super.inst.cfg new file mode 100644 index 0000000000..175793e1cf --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_bowden_0.2_PETG_super.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_bowden +name = Super Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = super +setting_version = 20 +type = quality +variant = 0.2mm Nozzle + +[values] +retraction_amount = 7 +retraction_speed = 25 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_bowden_0.2_PETG_ultra.inst.cfg b/resources/quality/sovol/PETG/sovol_bowden_0.2_PETG_ultra.inst.cfg new file mode 100644 index 0000000000..ea5ec2cfe1 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_bowden_0.2_PETG_ultra.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_bowden +name = Ultra Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = ultra +setting_version = 20 +type = quality +variant = 0.2mm Nozzle + +[values] +retraction_amount = 7 +retraction_speed = 25 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_bowden_0.3_PETG_adaptive.inst.cfg b/resources/quality/sovol/PETG/sovol_bowden_0.3_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..9c252a4e42 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_bowden_0.3_PETG_adaptive.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_bowden +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] +retraction_amount = 7 +retraction_speed = 25 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_bowden_0.3_PETG_low.inst.cfg b/resources/quality/sovol/PETG/sovol_bowden_0.3_PETG_low.inst.cfg new file mode 100644 index 0000000000..77f1a7a8b8 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_bowden_0.3_PETG_low.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_bowden +name = Low Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = low +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] +retraction_amount = 7 +retraction_speed = 25 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_bowden_0.3_PETG_standard.inst.cfg b/resources/quality/sovol/PETG/sovol_bowden_0.3_PETG_standard.inst.cfg new file mode 100644 index 0000000000..c5c36d51de --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_bowden_0.3_PETG_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_bowden +name = Standard Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = standard +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] +retraction_amount = 7 +retraction_speed = 25 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_bowden_0.3_PETG_super.inst.cfg b/resources/quality/sovol/PETG/sovol_bowden_0.3_PETG_super.inst.cfg new file mode 100644 index 0000000000..5ef1e650de --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_bowden_0.3_PETG_super.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_bowden +name = Super Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = super +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] +retraction_amount = 7 +retraction_speed = 25 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_bowden_0.4_PETG_adaptive.inst.cfg b/resources/quality/sovol/PETG/sovol_bowden_0.4_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..d26ff8d108 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_bowden_0.4_PETG_adaptive.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_bowden +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] +retraction_amount = 7 +retraction_speed = 25 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_bowden_0.4_PETG_low.inst.cfg b/resources/quality/sovol/PETG/sovol_bowden_0.4_PETG_low.inst.cfg new file mode 100644 index 0000000000..aff106826b --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_bowden_0.4_PETG_low.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_bowden +name = Low Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = low +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] +retraction_amount = 7 +retraction_speed = 25 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_bowden_0.4_PETG_standard.inst.cfg b/resources/quality/sovol/PETG/sovol_bowden_0.4_PETG_standard.inst.cfg new file mode 100644 index 0000000000..ec2e7beb0a --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_bowden_0.4_PETG_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_bowden +name = Standard Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = standard +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] +retraction_amount = 7 +retraction_speed = 25 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_bowden_0.4_PETG_super.inst.cfg b/resources/quality/sovol/PETG/sovol_bowden_0.4_PETG_super.inst.cfg new file mode 100644 index 0000000000..7d34bc700a --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_bowden_0.4_PETG_super.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_bowden +name = Super Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = super +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] +retraction_amount = 7 +retraction_speed = 25 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_bowden_0.5_PETG_adaptive.inst.cfg b/resources/quality/sovol/PETG/sovol_bowden_0.5_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..0c998682cf --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_bowden_0.5_PETG_adaptive.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_bowden +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] +retraction_amount = 7 +retraction_speed = 25 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_bowden_0.5_PETG_low.inst.cfg b/resources/quality/sovol/PETG/sovol_bowden_0.5_PETG_low.inst.cfg new file mode 100644 index 0000000000..01e71efc8e --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_bowden_0.5_PETG_low.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_bowden +name = Low Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = low +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] +retraction_amount = 7 +retraction_speed = 25 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_bowden_0.5_PETG_standard.inst.cfg b/resources/quality/sovol/PETG/sovol_bowden_0.5_PETG_standard.inst.cfg new file mode 100644 index 0000000000..1deba83381 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_bowden_0.5_PETG_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_bowden +name = Standard Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = standard +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] +retraction_amount = 7 +retraction_speed = 25 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_bowden_0.5_PETG_super.inst.cfg b/resources/quality/sovol/PETG/sovol_bowden_0.5_PETG_super.inst.cfg new file mode 100644 index 0000000000..2ef15d48a6 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_bowden_0.5_PETG_super.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_bowden +name = Super Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = super +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] +retraction_amount = 7 +retraction_speed = 25 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_bowden_0.6_PETG_adaptive.inst.cfg b/resources/quality/sovol/PETG/sovol_bowden_0.6_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..8a30e3e4ed --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_bowden_0.6_PETG_adaptive.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_bowden +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] +retraction_amount = 7 +retraction_speed = 25 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_bowden_0.6_PETG_draft.inst.cfg b/resources/quality/sovol/PETG/sovol_bowden_0.6_PETG_draft.inst.cfg new file mode 100644 index 0000000000..4e8edf0dc4 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_bowden_0.6_PETG_draft.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_bowden +name = Draft Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = draft +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] +retraction_amount = 7 +retraction_speed = 25 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_bowden_0.6_PETG_low.inst.cfg b/resources/quality/sovol/PETG/sovol_bowden_0.6_PETG_low.inst.cfg new file mode 100644 index 0000000000..e7b4bc136e --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_bowden_0.6_PETG_low.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_bowden +name = Low Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = low +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] +retraction_amount = 7 +retraction_speed = 25 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_bowden_0.6_PETG_standard.inst.cfg b/resources/quality/sovol/PETG/sovol_bowden_0.6_PETG_standard.inst.cfg new file mode 100644 index 0000000000..2ff12abb50 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_bowden_0.6_PETG_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_bowden +name = Standard Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = standard +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] +retraction_amount = 7 +retraction_speed = 25 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_bowden_0.8_PETG_draft.inst.cfg b/resources/quality/sovol/PETG/sovol_bowden_0.8_PETG_draft.inst.cfg new file mode 100644 index 0000000000..67a628d3ca --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_bowden_0.8_PETG_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = sovol_base_bowden +name = Draft Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = draft +setting_version = 20 +type = quality +variant = 0.8mm Nozzle + +[values] +retraction_amount = 0.8 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_bowden_1.0_PETG_draft.inst.cfg b/resources/quality/sovol/PETG/sovol_bowden_1.0_PETG_draft.inst.cfg new file mode 100644 index 0000000000..4ace4cc5dc --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_bowden_1.0_PETG_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = sovol_base_bowden +name = Draft Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = draft +setting_version = 20 +type = quality +variant = 1.0mm Nozzle + +[values] +retraction_amount = 0.8 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_planetary_0.2_PETG_super.inst.cfg b/resources/quality/sovol/PETG/sovol_planetary_0.2_PETG_super.inst.cfg new file mode 100644 index 0000000000..a0202e69a0 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_planetary_0.2_PETG_super.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_planetary +name = Super Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = super +setting_version = 20 +type = quality +variant = 0.2mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_planetary_0.2_PETG_ultra.inst.cfg b/resources/quality/sovol/PETG/sovol_planetary_0.2_PETG_ultra.inst.cfg new file mode 100644 index 0000000000..11d91c8fe7 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_planetary_0.2_PETG_ultra.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_planetary +name = Ultra Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = ultra +setting_version = 20 +type = quality +variant = 0.2mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_planetary_0.3_PETG_adaptive.inst.cfg b/resources/quality/sovol/PETG/sovol_planetary_0.3_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..cf4a50ce2a --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_planetary_0.3_PETG_adaptive.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_planetary +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_planetary_0.3_PETG_low.inst.cfg b/resources/quality/sovol/PETG/sovol_planetary_0.3_PETG_low.inst.cfg new file mode 100644 index 0000000000..577349db7d --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_planetary_0.3_PETG_low.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_planetary +name = Low Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = low +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_planetary_0.3_PETG_standard.inst.cfg b/resources/quality/sovol/PETG/sovol_planetary_0.3_PETG_standard.inst.cfg new file mode 100644 index 0000000000..3d740bf1b0 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_planetary_0.3_PETG_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_planetary +name = Standard Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = standard +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_planetary_0.3_PETG_super.inst.cfg b/resources/quality/sovol/PETG/sovol_planetary_0.3_PETG_super.inst.cfg new file mode 100644 index 0000000000..dcc7dba414 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_planetary_0.3_PETG_super.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_planetary +name = Super Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = super +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_planetary_0.4_PETG_adaptive.inst.cfg b/resources/quality/sovol/PETG/sovol_planetary_0.4_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..48f3ee16c3 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_planetary_0.4_PETG_adaptive.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_planetary +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_planetary_0.4_PETG_low.inst.cfg b/resources/quality/sovol/PETG/sovol_planetary_0.4_PETG_low.inst.cfg new file mode 100644 index 0000000000..8012409386 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_planetary_0.4_PETG_low.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_planetary +name = Low Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = low +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_planetary_0.4_PETG_standard.inst.cfg b/resources/quality/sovol/PETG/sovol_planetary_0.4_PETG_standard.inst.cfg new file mode 100644 index 0000000000..bffd21112a --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_planetary_0.4_PETG_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_planetary +name = Standard Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = standard +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_planetary_0.4_PETG_super.inst.cfg b/resources/quality/sovol/PETG/sovol_planetary_0.4_PETG_super.inst.cfg new file mode 100644 index 0000000000..2a63535eae --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_planetary_0.4_PETG_super.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_planetary +name = Super Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = super +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_planetary_0.5_PETG_adaptive.inst.cfg b/resources/quality/sovol/PETG/sovol_planetary_0.5_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..126db5c0f3 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_planetary_0.5_PETG_adaptive.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_planetary +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_planetary_0.5_PETG_low.inst.cfg b/resources/quality/sovol/PETG/sovol_planetary_0.5_PETG_low.inst.cfg new file mode 100644 index 0000000000..0a21849f95 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_planetary_0.5_PETG_low.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_planetary +name = Low Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = low +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_planetary_0.5_PETG_standard.inst.cfg b/resources/quality/sovol/PETG/sovol_planetary_0.5_PETG_standard.inst.cfg new file mode 100644 index 0000000000..72f252b6de --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_planetary_0.5_PETG_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_planetary +name = Standard Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = standard +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_planetary_0.5_PETG_super.inst.cfg b/resources/quality/sovol/PETG/sovol_planetary_0.5_PETG_super.inst.cfg new file mode 100644 index 0000000000..e364cbe269 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_planetary_0.5_PETG_super.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_planetary +name = Super Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = super +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_planetary_0.6_PETG_adaptive.inst.cfg b/resources/quality/sovol/PETG/sovol_planetary_0.6_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..8e2c6832ff --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_planetary_0.6_PETG_adaptive.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_planetary +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_planetary_0.6_PETG_draft.inst.cfg b/resources/quality/sovol/PETG/sovol_planetary_0.6_PETG_draft.inst.cfg new file mode 100644 index 0000000000..da1c4c1ce1 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_planetary_0.6_PETG_draft.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_planetary +name = Draft Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = draft +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_planetary_0.6_PETG_low.inst.cfg b/resources/quality/sovol/PETG/sovol_planetary_0.6_PETG_low.inst.cfg new file mode 100644 index 0000000000..0efff47b80 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_planetary_0.6_PETG_low.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_planetary +name = Low Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = low +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_planetary_0.6_PETG_standard.inst.cfg b/resources/quality/sovol/PETG/sovol_planetary_0.6_PETG_standard.inst.cfg new file mode 100644 index 0000000000..b121668f02 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_planetary_0.6_PETG_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_planetary +name = Standard Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = standard +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_planetary_0.8_PETG_draft.inst.cfg b/resources/quality/sovol/PETG/sovol_planetary_0.8_PETG_draft.inst.cfg new file mode 100644 index 0000000000..184e6b84e3 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_planetary_0.8_PETG_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = sovol_base_planetary +name = Draft Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = draft +setting_version = 20 +type = quality +variant = 0.8mm Nozzle + +[values] +retraction_amount = 0.8 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_planetary_1.0_PETG_draft.inst.cfg b/resources/quality/sovol/PETG/sovol_planetary_1.0_PETG_draft.inst.cfg new file mode 100644 index 0000000000..58bec790c5 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_planetary_1.0_PETG_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = sovol_base_planetary +name = Draft Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = draft +setting_version = 20 +type = quality +variant = 1.0mm Nozzle + +[values] +retraction_amount = 0.8 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_titan_0.2_PETG_super.inst.cfg b/resources/quality/sovol/PETG/sovol_titan_0.2_PETG_super.inst.cfg new file mode 100644 index 0000000000..3a0125c5e6 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_titan_0.2_PETG_super.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_titan +name = Super Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = super +setting_version = 20 +type = quality +variant = 0.2mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_titan_0.2_PETG_ultra.inst.cfg b/resources/quality/sovol/PETG/sovol_titan_0.2_PETG_ultra.inst.cfg new file mode 100644 index 0000000000..c9a6e99261 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_titan_0.2_PETG_ultra.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_titan +name = Ultra Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = ultra +setting_version = 20 +type = quality +variant = 0.2mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_titan_0.3_PETG_adaptive.inst.cfg b/resources/quality/sovol/PETG/sovol_titan_0.3_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..0b11fc77ea --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_titan_0.3_PETG_adaptive.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_titan +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_titan_0.3_PETG_low.inst.cfg b/resources/quality/sovol/PETG/sovol_titan_0.3_PETG_low.inst.cfg new file mode 100644 index 0000000000..150af7e15d --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_titan_0.3_PETG_low.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_titan +name = Low Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = low +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_titan_0.3_PETG_standard.inst.cfg b/resources/quality/sovol/PETG/sovol_titan_0.3_PETG_standard.inst.cfg new file mode 100644 index 0000000000..adab6d27a6 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_titan_0.3_PETG_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_titan +name = Standard Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = standard +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_titan_0.3_PETG_super.inst.cfg b/resources/quality/sovol/PETG/sovol_titan_0.3_PETG_super.inst.cfg new file mode 100644 index 0000000000..2371c07f91 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_titan_0.3_PETG_super.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_titan +name = Super Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = super +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_titan_0.4_PETG_adaptive.inst.cfg b/resources/quality/sovol/PETG/sovol_titan_0.4_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..32e7bf0c13 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_titan_0.4_PETG_adaptive.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_titan +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_titan_0.4_PETG_low.inst.cfg b/resources/quality/sovol/PETG/sovol_titan_0.4_PETG_low.inst.cfg new file mode 100644 index 0000000000..ba76774250 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_titan_0.4_PETG_low.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_titan +name = Low Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = low +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_titan_0.4_PETG_standard.inst.cfg b/resources/quality/sovol/PETG/sovol_titan_0.4_PETG_standard.inst.cfg new file mode 100644 index 0000000000..35cb2ae4ca --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_titan_0.4_PETG_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_titan +name = Standard Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = standard +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_titan_0.4_PETG_super.inst.cfg b/resources/quality/sovol/PETG/sovol_titan_0.4_PETG_super.inst.cfg new file mode 100644 index 0000000000..657cf74cc1 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_titan_0.4_PETG_super.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_titan +name = Super Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = super +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_titan_0.5_PETG_adaptive.inst.cfg b/resources/quality/sovol/PETG/sovol_titan_0.5_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..a2f965354a --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_titan_0.5_PETG_adaptive.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_titan +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_titan_0.5_PETG_low.inst.cfg b/resources/quality/sovol/PETG/sovol_titan_0.5_PETG_low.inst.cfg new file mode 100644 index 0000000000..9058957658 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_titan_0.5_PETG_low.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_titan +name = Low Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = low +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_titan_0.5_PETG_standard.inst.cfg b/resources/quality/sovol/PETG/sovol_titan_0.5_PETG_standard.inst.cfg new file mode 100644 index 0000000000..2196ba722a --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_titan_0.5_PETG_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_titan +name = Standard Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = standard +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_titan_0.5_PETG_super.inst.cfg b/resources/quality/sovol/PETG/sovol_titan_0.5_PETG_super.inst.cfg new file mode 100644 index 0000000000..3f1b2a27d6 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_titan_0.5_PETG_super.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_titan +name = Super Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = super +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_titan_0.6_PETG_adaptive.inst.cfg b/resources/quality/sovol/PETG/sovol_titan_0.6_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..9b6451e612 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_titan_0.6_PETG_adaptive.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_titan +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_titan_0.6_PETG_draft.inst.cfg b/resources/quality/sovol/PETG/sovol_titan_0.6_PETG_draft.inst.cfg new file mode 100644 index 0000000000..48ed8600c8 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_titan_0.6_PETG_draft.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_titan +name = Draft Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = draft +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_titan_0.6_PETG_low.inst.cfg b/resources/quality/sovol/PETG/sovol_titan_0.6_PETG_low.inst.cfg new file mode 100644 index 0000000000..49fbe34e3c --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_titan_0.6_PETG_low.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_titan +name = Low Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = low +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_titan_0.6_PETG_standard.inst.cfg b/resources/quality/sovol/PETG/sovol_titan_0.6_PETG_standard.inst.cfg new file mode 100644 index 0000000000..5c422df316 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_titan_0.6_PETG_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = sovol_base_titan +name = Standard Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = standard +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] +retraction_amount = 2 +retraction_speed = 40 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_titan_0.8_PETG_draft.inst.cfg b/resources/quality/sovol/PETG/sovol_titan_0.8_PETG_draft.inst.cfg new file mode 100644 index 0000000000..1783686472 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_titan_0.8_PETG_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = sovol_base_titan +name = Draft Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = draft +setting_version = 20 +type = quality +variant = 0.8mm Nozzle + +[values] +retraction_amount = 0.8 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PETG/sovol_titan_1.0_PETG_draft.inst.cfg b/resources/quality/sovol/PETG/sovol_titan_1.0_PETG_draft.inst.cfg new file mode 100644 index 0000000000..7d2fda3219 --- /dev/null +++ b/resources/quality/sovol/PETG/sovol_titan_1.0_PETG_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = sovol_base_titan +name = Draft Quality +version = 4 + +[metadata] +material = generic_petg +quality_type = draft +setting_version = 20 +type = quality +variant = 1.0mm Nozzle + +[values] +retraction_amount = 0.8 +speed_layer_0 = 15 + diff --git a/resources/quality/sovol/PLA/sovol_bowden_0.2_PLA_super.inst.cfg b/resources/quality/sovol/PLA/sovol_bowden_0.2_PLA_super.inst.cfg new file mode 100644 index 0000000000..192a16ef7a --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_bowden_0.2_PLA_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Super Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = super +setting_version = 20 +type = quality +variant = 0.2mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_bowden_0.2_PLA_ultra.inst.cfg b/resources/quality/sovol/PLA/sovol_bowden_0.2_PLA_ultra.inst.cfg new file mode 100644 index 0000000000..c86299ba15 --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_bowden_0.2_PLA_ultra.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Ultra Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = ultra +setting_version = 20 +type = quality +variant = 0.2mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_bowden_0.3_PLA_adaptive.inst.cfg b/resources/quality/sovol/PLA/sovol_bowden_0.3_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..b03e88d92d --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_bowden_0.3_PLA_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_bowden_0.3_PLA_low.inst.cfg b/resources/quality/sovol/PLA/sovol_bowden_0.3_PLA_low.inst.cfg new file mode 100644 index 0000000000..9cadc1433f --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_bowden_0.3_PLA_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Low Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = low +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_bowden_0.3_PLA_standard.inst.cfg b/resources/quality/sovol/PLA/sovol_bowden_0.3_PLA_standard.inst.cfg new file mode 100644 index 0000000000..1b02fc72a6 --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_bowden_0.3_PLA_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Standard Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = standard +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_bowden_0.3_PLA_super.inst.cfg b/resources/quality/sovol/PLA/sovol_bowden_0.3_PLA_super.inst.cfg new file mode 100644 index 0000000000..9705879088 --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_bowden_0.3_PLA_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Super Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = super +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_bowden_0.4_PLA_adaptive.inst.cfg b/resources/quality/sovol/PLA/sovol_bowden_0.4_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..ff1bbaa3c9 --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_bowden_0.4_PLA_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_bowden_0.4_PLA_low.inst.cfg b/resources/quality/sovol/PLA/sovol_bowden_0.4_PLA_low.inst.cfg new file mode 100644 index 0000000000..fd47e92b86 --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_bowden_0.4_PLA_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Low Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = low +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_bowden_0.4_PLA_standard.inst.cfg b/resources/quality/sovol/PLA/sovol_bowden_0.4_PLA_standard.inst.cfg new file mode 100644 index 0000000000..b6e742bedb --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_bowden_0.4_PLA_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Standard Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = standard +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_bowden_0.4_PLA_super.inst.cfg b/resources/quality/sovol/PLA/sovol_bowden_0.4_PLA_super.inst.cfg new file mode 100644 index 0000000000..590b7771ee --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_bowden_0.4_PLA_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Super Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = super +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_bowden_0.5_PLA_adaptive.inst.cfg b/resources/quality/sovol/PLA/sovol_bowden_0.5_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..93bbdd31be --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_bowden_0.5_PLA_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_bowden_0.5_PLA_low.inst.cfg b/resources/quality/sovol/PLA/sovol_bowden_0.5_PLA_low.inst.cfg new file mode 100644 index 0000000000..e9d9a7bf59 --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_bowden_0.5_PLA_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Low Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = low +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_bowden_0.5_PLA_standard.inst.cfg b/resources/quality/sovol/PLA/sovol_bowden_0.5_PLA_standard.inst.cfg new file mode 100644 index 0000000000..c69671fa83 --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_bowden_0.5_PLA_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Standard Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = standard +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_bowden_0.5_PLA_super.inst.cfg b/resources/quality/sovol/PLA/sovol_bowden_0.5_PLA_super.inst.cfg new file mode 100644 index 0000000000..3af5041d57 --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_bowden_0.5_PLA_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Super Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = super +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_bowden_0.6_PLA_adaptive.inst.cfg b/resources/quality/sovol/PLA/sovol_bowden_0.6_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..848f7d799e --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_bowden_0.6_PLA_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_bowden_0.6_PLA_draft.inst.cfg b/resources/quality/sovol/PLA/sovol_bowden_0.6_PLA_draft.inst.cfg new file mode 100644 index 0000000000..a482ddcc22 --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_bowden_0.6_PLA_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Draft Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = draft +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_bowden_0.6_PLA_low.inst.cfg b/resources/quality/sovol/PLA/sovol_bowden_0.6_PLA_low.inst.cfg new file mode 100644 index 0000000000..d19ab316cb --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_bowden_0.6_PLA_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Low Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = low +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_bowden_0.6_PLA_standard.inst.cfg b/resources/quality/sovol/PLA/sovol_bowden_0.6_PLA_standard.inst.cfg new file mode 100644 index 0000000000..ccbc6b66dd --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_bowden_0.6_PLA_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Standard Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = standard +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_bowden_0.8_PLA_draft.inst.cfg b/resources/quality/sovol/PLA/sovol_bowden_0.8_PLA_draft.inst.cfg new file mode 100644 index 0000000000..102f807d83 --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_bowden_0.8_PLA_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Draft Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = draft +setting_version = 20 +type = quality +variant = 0.8mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_bowden_1.0_PLA_draft.inst.cfg b/resources/quality/sovol/PLA/sovol_bowden_1.0_PLA_draft.inst.cfg new file mode 100644 index 0000000000..59dd022052 --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_bowden_1.0_PLA_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_bowden +name = Draft Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = draft +setting_version = 20 +type = quality +variant = 1.0mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_planetary_0.2_PLA_super.inst.cfg b/resources/quality/sovol/PLA/sovol_planetary_0.2_PLA_super.inst.cfg new file mode 100644 index 0000000000..b1de3d7760 --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_planetary_0.2_PLA_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Super Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = super +setting_version = 20 +type = quality +variant = 0.2mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_planetary_0.2_PLA_ultra.inst.cfg b/resources/quality/sovol/PLA/sovol_planetary_0.2_PLA_ultra.inst.cfg new file mode 100644 index 0000000000..19b58ab72d --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_planetary_0.2_PLA_ultra.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Ultra Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = ultra +setting_version = 20 +type = quality +variant = 0.2mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_planetary_0.3_PLA_adaptive.inst.cfg b/resources/quality/sovol/PLA/sovol_planetary_0.3_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..d25200ce5c --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_planetary_0.3_PLA_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_planetary_0.3_PLA_low.inst.cfg b/resources/quality/sovol/PLA/sovol_planetary_0.3_PLA_low.inst.cfg new file mode 100644 index 0000000000..26df1f11dc --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_planetary_0.3_PLA_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Low Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = low +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_planetary_0.3_PLA_standard.inst.cfg b/resources/quality/sovol/PLA/sovol_planetary_0.3_PLA_standard.inst.cfg new file mode 100644 index 0000000000..e26b88ed5b --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_planetary_0.3_PLA_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Standard Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = standard +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_planetary_0.3_PLA_super.inst.cfg b/resources/quality/sovol/PLA/sovol_planetary_0.3_PLA_super.inst.cfg new file mode 100644 index 0000000000..675114778e --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_planetary_0.3_PLA_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Super Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = super +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_planetary_0.4_PLA_adaptive.inst.cfg b/resources/quality/sovol/PLA/sovol_planetary_0.4_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..37f96b6f55 --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_planetary_0.4_PLA_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_planetary_0.4_PLA_low.inst.cfg b/resources/quality/sovol/PLA/sovol_planetary_0.4_PLA_low.inst.cfg new file mode 100644 index 0000000000..74cc140680 --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_planetary_0.4_PLA_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Low Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = low +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_planetary_0.4_PLA_standard.inst.cfg b/resources/quality/sovol/PLA/sovol_planetary_0.4_PLA_standard.inst.cfg new file mode 100644 index 0000000000..ac647f24b6 --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_planetary_0.4_PLA_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Standard Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = standard +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_planetary_0.4_PLA_super.inst.cfg b/resources/quality/sovol/PLA/sovol_planetary_0.4_PLA_super.inst.cfg new file mode 100644 index 0000000000..48bc0ebede --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_planetary_0.4_PLA_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Super Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = super +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_planetary_0.5_PLA_adaptive.inst.cfg b/resources/quality/sovol/PLA/sovol_planetary_0.5_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..1f3e93badd --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_planetary_0.5_PLA_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_planetary_0.5_PLA_low.inst.cfg b/resources/quality/sovol/PLA/sovol_planetary_0.5_PLA_low.inst.cfg new file mode 100644 index 0000000000..f7cfb41a33 --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_planetary_0.5_PLA_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Low Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = low +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_planetary_0.5_PLA_standard.inst.cfg b/resources/quality/sovol/PLA/sovol_planetary_0.5_PLA_standard.inst.cfg new file mode 100644 index 0000000000..d0b581a33c --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_planetary_0.5_PLA_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Standard Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = standard +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_planetary_0.5_PLA_super.inst.cfg b/resources/quality/sovol/PLA/sovol_planetary_0.5_PLA_super.inst.cfg new file mode 100644 index 0000000000..c96d99430b --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_planetary_0.5_PLA_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Super Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = super +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_planetary_0.6_PLA_adaptive.inst.cfg b/resources/quality/sovol/PLA/sovol_planetary_0.6_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..d88f8c1b96 --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_planetary_0.6_PLA_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_planetary_0.6_PLA_draft.inst.cfg b/resources/quality/sovol/PLA/sovol_planetary_0.6_PLA_draft.inst.cfg new file mode 100644 index 0000000000..4d55c230ce --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_planetary_0.6_PLA_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Draft Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = draft +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_planetary_0.6_PLA_low.inst.cfg b/resources/quality/sovol/PLA/sovol_planetary_0.6_PLA_low.inst.cfg new file mode 100644 index 0000000000..143f66eaa4 --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_planetary_0.6_PLA_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Low Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = low +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_planetary_0.6_PLA_standard.inst.cfg b/resources/quality/sovol/PLA/sovol_planetary_0.6_PLA_standard.inst.cfg new file mode 100644 index 0000000000..60c1c7b087 --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_planetary_0.6_PLA_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Standard Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = standard +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_planetary_0.8_PLA_draft.inst.cfg b/resources/quality/sovol/PLA/sovol_planetary_0.8_PLA_draft.inst.cfg new file mode 100644 index 0000000000..d3022933ee --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_planetary_0.8_PLA_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Draft Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = draft +setting_version = 20 +type = quality +variant = 0.8mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_planetary_1.0_PLA_draft.inst.cfg b/resources/quality/sovol/PLA/sovol_planetary_1.0_PLA_draft.inst.cfg new file mode 100644 index 0000000000..53ddcf4e95 --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_planetary_1.0_PLA_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_planetary +name = Draft Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = draft +setting_version = 20 +type = quality +variant = 1.0mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_titan_0.2_PLA_super.inst.cfg b/resources/quality/sovol/PLA/sovol_titan_0.2_PLA_super.inst.cfg new file mode 100644 index 0000000000..7f6ce596b5 --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_titan_0.2_PLA_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Super Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = super +setting_version = 20 +type = quality +variant = 0.2mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_titan_0.2_PLA_ultra.inst.cfg b/resources/quality/sovol/PLA/sovol_titan_0.2_PLA_ultra.inst.cfg new file mode 100644 index 0000000000..2ce381dd64 --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_titan_0.2_PLA_ultra.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Ultra Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = ultra +setting_version = 20 +type = quality +variant = 0.2mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_titan_0.3_PLA_adaptive.inst.cfg b/resources/quality/sovol/PLA/sovol_titan_0.3_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..61078ffd70 --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_titan_0.3_PLA_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_titan_0.3_PLA_low.inst.cfg b/resources/quality/sovol/PLA/sovol_titan_0.3_PLA_low.inst.cfg new file mode 100644 index 0000000000..18848596b1 --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_titan_0.3_PLA_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Low Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = low +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_titan_0.3_PLA_standard.inst.cfg b/resources/quality/sovol/PLA/sovol_titan_0.3_PLA_standard.inst.cfg new file mode 100644 index 0000000000..2b9fe2dbfb --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_titan_0.3_PLA_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Standard Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = standard +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_titan_0.3_PLA_super.inst.cfg b/resources/quality/sovol/PLA/sovol_titan_0.3_PLA_super.inst.cfg new file mode 100644 index 0000000000..555a5ba868 --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_titan_0.3_PLA_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Super Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = super +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_titan_0.4_PLA_adaptive.inst.cfg b/resources/quality/sovol/PLA/sovol_titan_0.4_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..6780f5381a --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_titan_0.4_PLA_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_titan_0.4_PLA_low.inst.cfg b/resources/quality/sovol/PLA/sovol_titan_0.4_PLA_low.inst.cfg new file mode 100644 index 0000000000..dce09e4f6c --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_titan_0.4_PLA_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Low Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = low +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_titan_0.4_PLA_standard.inst.cfg b/resources/quality/sovol/PLA/sovol_titan_0.4_PLA_standard.inst.cfg new file mode 100644 index 0000000000..673a6292ed --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_titan_0.4_PLA_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Standard Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = standard +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_titan_0.4_PLA_super.inst.cfg b/resources/quality/sovol/PLA/sovol_titan_0.4_PLA_super.inst.cfg new file mode 100644 index 0000000000..a239533cdb --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_titan_0.4_PLA_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Super Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = super +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_titan_0.5_PLA_adaptive.inst.cfg b/resources/quality/sovol/PLA/sovol_titan_0.5_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..cba32ea038 --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_titan_0.5_PLA_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_titan_0.5_PLA_low.inst.cfg b/resources/quality/sovol/PLA/sovol_titan_0.5_PLA_low.inst.cfg new file mode 100644 index 0000000000..460f5d554f --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_titan_0.5_PLA_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Low Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = low +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_titan_0.5_PLA_standard.inst.cfg b/resources/quality/sovol/PLA/sovol_titan_0.5_PLA_standard.inst.cfg new file mode 100644 index 0000000000..91d046e54a --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_titan_0.5_PLA_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Standard Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = standard +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_titan_0.5_PLA_super.inst.cfg b/resources/quality/sovol/PLA/sovol_titan_0.5_PLA_super.inst.cfg new file mode 100644 index 0000000000..a33d7b5f67 --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_titan_0.5_PLA_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Super Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = super +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_titan_0.6_PLA_adaptive.inst.cfg b/resources/quality/sovol/PLA/sovol_titan_0.6_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..22a6ef3590 --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_titan_0.6_PLA_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_titan_0.6_PLA_draft.inst.cfg b/resources/quality/sovol/PLA/sovol_titan_0.6_PLA_draft.inst.cfg new file mode 100644 index 0000000000..c58b7bb296 --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_titan_0.6_PLA_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Draft Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = draft +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_titan_0.6_PLA_low.inst.cfg b/resources/quality/sovol/PLA/sovol_titan_0.6_PLA_low.inst.cfg new file mode 100644 index 0000000000..91a704ec08 --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_titan_0.6_PLA_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Low Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = low +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_titan_0.6_PLA_standard.inst.cfg b/resources/quality/sovol/PLA/sovol_titan_0.6_PLA_standard.inst.cfg new file mode 100644 index 0000000000..ca66dd6a91 --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_titan_0.6_PLA_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Standard Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = standard +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_titan_0.8_PLA_draft.inst.cfg b/resources/quality/sovol/PLA/sovol_titan_0.8_PLA_draft.inst.cfg new file mode 100644 index 0000000000..8332bb9916 --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_titan_0.8_PLA_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Draft Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = draft +setting_version = 20 +type = quality +variant = 0.8mm Nozzle + +[values] + diff --git a/resources/quality/sovol/PLA/sovol_titan_1.0_PLA_draft.inst.cfg b/resources/quality/sovol/PLA/sovol_titan_1.0_PLA_draft.inst.cfg new file mode 100644 index 0000000000..62d22d9451 --- /dev/null +++ b/resources/quality/sovol/PLA/sovol_titan_1.0_PLA_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +definition = sovol_base_titan +name = Draft Quality +version = 4 + +[metadata] +material = generic_pla +quality_type = draft +setting_version = 20 +type = quality +variant = 1.0mm Nozzle + +[values] + diff --git a/resources/quality/sovol/TPU/sovol_bowden_0.3_TPU_adaptive.inst.cfg b/resources/quality/sovol/TPU/sovol_bowden_0.3_TPU_adaptive.inst.cfg new file mode 100644 index 0000000000..468337be8a --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_bowden_0.3_TPU_adaptive.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_bowden +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/TPU/sovol_bowden_0.3_TPU_standard.inst.cfg b/resources/quality/sovol/TPU/sovol_bowden_0.3_TPU_standard.inst.cfg new file mode 100644 index 0000000000..8e1754b8bf --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_bowden_0.3_TPU_standard.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_bowden +name = Standard Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = standard +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/TPU/sovol_bowden_0.3_TPU_super.inst.cfg b/resources/quality/sovol/TPU/sovol_bowden_0.3_TPU_super.inst.cfg new file mode 100644 index 0000000000..a20c55e4dc --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_bowden_0.3_TPU_super.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_bowden +name = Super Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = super +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/TPU/sovol_bowden_0.4_TPU_adaptive.inst.cfg b/resources/quality/sovol/TPU/sovol_bowden_0.4_TPU_adaptive.inst.cfg new file mode 100644 index 0000000000..5faf50db35 --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_bowden_0.4_TPU_adaptive.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_bowden +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/TPU/sovol_bowden_0.4_TPU_standard.inst.cfg b/resources/quality/sovol/TPU/sovol_bowden_0.4_TPU_standard.inst.cfg new file mode 100644 index 0000000000..b0322f1797 --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_bowden_0.4_TPU_standard.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_bowden +name = Standard Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = standard +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/TPU/sovol_bowden_0.4_TPU_super.inst.cfg b/resources/quality/sovol/TPU/sovol_bowden_0.4_TPU_super.inst.cfg new file mode 100644 index 0000000000..67937ecf6f --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_bowden_0.4_TPU_super.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_bowden +name = Super Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = super +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/TPU/sovol_bowden_0.5_TPU_adaptive.inst.cfg b/resources/quality/sovol/TPU/sovol_bowden_0.5_TPU_adaptive.inst.cfg new file mode 100644 index 0000000000..edb2ca8820 --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_bowden_0.5_TPU_adaptive.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_bowden +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/TPU/sovol_bowden_0.5_TPU_standard.inst.cfg b/resources/quality/sovol/TPU/sovol_bowden_0.5_TPU_standard.inst.cfg new file mode 100644 index 0000000000..5170ffb368 --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_bowden_0.5_TPU_standard.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_bowden +name = Standard Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = standard +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/TPU/sovol_bowden_0.5_TPU_super.inst.cfg b/resources/quality/sovol/TPU/sovol_bowden_0.5_TPU_super.inst.cfg new file mode 100644 index 0000000000..bf28b37bf6 --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_bowden_0.5_TPU_super.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_bowden +name = Super Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = super +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/TPU/sovol_bowden_0.6_TPU_standard.inst.cfg b/resources/quality/sovol/TPU/sovol_bowden_0.6_TPU_standard.inst.cfg new file mode 100644 index 0000000000..32ebb4711a --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_bowden_0.6_TPU_standard.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_bowden +name = Standard Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = standard +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/TPU/sovol_bowden_0.8_TPU_draft.inst.cfg b/resources/quality/sovol/TPU/sovol_bowden_0.8_TPU_draft.inst.cfg new file mode 100644 index 0000000000..a4284e0a07 --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_bowden_0.8_TPU_draft.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_bowden +name = Draft Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = draft +setting_version = 20 +type = quality +variant = 0.8mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/TPU/sovol_bowden_1.0_TPU_draft.inst.cfg b/resources/quality/sovol/TPU/sovol_bowden_1.0_TPU_draft.inst.cfg new file mode 100644 index 0000000000..868fad3b71 --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_bowden_1.0_TPU_draft.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_bowden +name = Draft Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = draft +setting_version = 20 +type = quality +variant = 1.0mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/TPU/sovol_planetary_0.3_TPU_adaptive.inst.cfg b/resources/quality/sovol/TPU/sovol_planetary_0.3_TPU_adaptive.inst.cfg new file mode 100644 index 0000000000..0a4b9abff9 --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_planetary_0.3_TPU_adaptive.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_planetary +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/TPU/sovol_planetary_0.3_TPU_standard.inst.cfg b/resources/quality/sovol/TPU/sovol_planetary_0.3_TPU_standard.inst.cfg new file mode 100644 index 0000000000..bee23ec807 --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_planetary_0.3_TPU_standard.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_planetary +name = Standard Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = standard +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/TPU/sovol_planetary_0.3_TPU_super.inst.cfg b/resources/quality/sovol/TPU/sovol_planetary_0.3_TPU_super.inst.cfg new file mode 100644 index 0000000000..04aa4f72a2 --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_planetary_0.3_TPU_super.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_planetary +name = Super Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = super +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/TPU/sovol_planetary_0.4_TPU_adaptive.inst.cfg b/resources/quality/sovol/TPU/sovol_planetary_0.4_TPU_adaptive.inst.cfg new file mode 100644 index 0000000000..0350f18ca1 --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_planetary_0.4_TPU_adaptive.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_planetary +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/TPU/sovol_planetary_0.4_TPU_standard.inst.cfg b/resources/quality/sovol/TPU/sovol_planetary_0.4_TPU_standard.inst.cfg new file mode 100644 index 0000000000..3429a1202d --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_planetary_0.4_TPU_standard.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_planetary +name = Standard Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = standard +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/TPU/sovol_planetary_0.4_TPU_super.inst.cfg b/resources/quality/sovol/TPU/sovol_planetary_0.4_TPU_super.inst.cfg new file mode 100644 index 0000000000..f29b9cb1d7 --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_planetary_0.4_TPU_super.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_planetary +name = Super Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = super +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/TPU/sovol_planetary_0.5_TPU_adaptive.inst.cfg b/resources/quality/sovol/TPU/sovol_planetary_0.5_TPU_adaptive.inst.cfg new file mode 100644 index 0000000000..28c835b682 --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_planetary_0.5_TPU_adaptive.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_planetary +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/TPU/sovol_planetary_0.5_TPU_standard.inst.cfg b/resources/quality/sovol/TPU/sovol_planetary_0.5_TPU_standard.inst.cfg new file mode 100644 index 0000000000..b75f650796 --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_planetary_0.5_TPU_standard.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_planetary +name = Standard Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = standard +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/TPU/sovol_planetary_0.5_TPU_super.inst.cfg b/resources/quality/sovol/TPU/sovol_planetary_0.5_TPU_super.inst.cfg new file mode 100644 index 0000000000..fedef590f4 --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_planetary_0.5_TPU_super.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_planetary +name = Super Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = super +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/TPU/sovol_planetary_0.6_TPU_standard.inst.cfg b/resources/quality/sovol/TPU/sovol_planetary_0.6_TPU_standard.inst.cfg new file mode 100644 index 0000000000..1b47329bc6 --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_planetary_0.6_TPU_standard.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_planetary +name = Standard Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = standard +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/TPU/sovol_planetary_0.8_TPU_draft.inst.cfg b/resources/quality/sovol/TPU/sovol_planetary_0.8_TPU_draft.inst.cfg new file mode 100644 index 0000000000..60c0ec6339 --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_planetary_0.8_TPU_draft.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_planetary +name = Draft Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = draft +setting_version = 20 +type = quality +variant = 0.8mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/TPU/sovol_planetary_1.0_TPU_draft.inst.cfg b/resources/quality/sovol/TPU/sovol_planetary_1.0_TPU_draft.inst.cfg new file mode 100644 index 0000000000..e8ef223926 --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_planetary_1.0_TPU_draft.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_planetary +name = Draft Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = draft +setting_version = 20 +type = quality +variant = 1.0mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/TPU/sovol_titan_0.3_TPU_adaptive.inst.cfg b/resources/quality/sovol/TPU/sovol_titan_0.3_TPU_adaptive.inst.cfg new file mode 100644 index 0000000000..ab63df4e0e --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_titan_0.3_TPU_adaptive.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_titan +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/TPU/sovol_titan_0.3_TPU_standard.inst.cfg b/resources/quality/sovol/TPU/sovol_titan_0.3_TPU_standard.inst.cfg new file mode 100644 index 0000000000..00fc36b696 --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_titan_0.3_TPU_standard.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_titan +name = Standard Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = standard +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/TPU/sovol_titan_0.3_TPU_super.inst.cfg b/resources/quality/sovol/TPU/sovol_titan_0.3_TPU_super.inst.cfg new file mode 100644 index 0000000000..54dec6742a --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_titan_0.3_TPU_super.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_titan +name = Super Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = super +setting_version = 20 +type = quality +variant = 0.3mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/TPU/sovol_titan_0.4_TPU_adaptive.inst.cfg b/resources/quality/sovol/TPU/sovol_titan_0.4_TPU_adaptive.inst.cfg new file mode 100644 index 0000000000..bc54e889ff --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_titan_0.4_TPU_adaptive.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_titan +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/TPU/sovol_titan_0.4_TPU_standard.inst.cfg b/resources/quality/sovol/TPU/sovol_titan_0.4_TPU_standard.inst.cfg new file mode 100644 index 0000000000..6fc8e959cb --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_titan_0.4_TPU_standard.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_titan +name = Standard Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = standard +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/TPU/sovol_titan_0.4_TPU_super.inst.cfg b/resources/quality/sovol/TPU/sovol_titan_0.4_TPU_super.inst.cfg new file mode 100644 index 0000000000..49ba9607ee --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_titan_0.4_TPU_super.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_titan +name = Super Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = super +setting_version = 20 +type = quality +variant = 0.4mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/TPU/sovol_titan_0.5_TPU_adaptive.inst.cfg b/resources/quality/sovol/TPU/sovol_titan_0.5_TPU_adaptive.inst.cfg new file mode 100644 index 0000000000..e23c8d2940 --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_titan_0.5_TPU_adaptive.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_titan +name = Dynamic Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = adaptive +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/TPU/sovol_titan_0.5_TPU_standard.inst.cfg b/resources/quality/sovol/TPU/sovol_titan_0.5_TPU_standard.inst.cfg new file mode 100644 index 0000000000..4db71883e8 --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_titan_0.5_TPU_standard.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_titan +name = Standard Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = standard +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/TPU/sovol_titan_0.5_TPU_super.inst.cfg b/resources/quality/sovol/TPU/sovol_titan_0.5_TPU_super.inst.cfg new file mode 100644 index 0000000000..0e47a9cc50 --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_titan_0.5_TPU_super.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_titan +name = Super Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = super +setting_version = 20 +type = quality +variant = 0.5mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/TPU/sovol_titan_0.6_TPU_standard.inst.cfg b/resources/quality/sovol/TPU/sovol_titan_0.6_TPU_standard.inst.cfg new file mode 100644 index 0000000000..b18553f818 --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_titan_0.6_TPU_standard.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_titan +name = Standard Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = standard +setting_version = 20 +type = quality +variant = 0.6mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/TPU/sovol_titan_0.8_TPU_draft.inst.cfg b/resources/quality/sovol/TPU/sovol_titan_0.8_TPU_draft.inst.cfg new file mode 100644 index 0000000000..09b2737826 --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_titan_0.8_TPU_draft.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_titan +name = Draft Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = draft +setting_version = 20 +type = quality +variant = 0.8mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/TPU/sovol_titan_1.0_TPU_draft.inst.cfg b/resources/quality/sovol/TPU/sovol_titan_1.0_TPU_draft.inst.cfg new file mode 100644 index 0000000000..e0b25c2d1e --- /dev/null +++ b/resources/quality/sovol/TPU/sovol_titan_1.0_TPU_draft.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = sovol_base_titan +name = Draft Quality +version = 4 + +[metadata] +material = generic_tpu +quality_type = draft +setting_version = 20 +type = quality +variant = 1.0mm Nozzle + +[values] +retraction_amount = 1.2 +retraction_speed = 20 +speed_layer_0 = 10 +speed_print = 20 + diff --git a/resources/quality/sovol/sovol_bowden_global_adaptive.inst.cfg b/resources/quality/sovol/sovol_bowden_global_adaptive.inst.cfg new file mode 100644 index 0000000000..1a7e22b65c --- /dev/null +++ b/resources/quality/sovol/sovol_bowden_global_adaptive.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = sovol_base_bowden +name = Dynamic Quality +version = 4 + +[metadata] +global_quality = True +quality_type = adaptive +setting_version = 20 +type = quality +weight = -2 + +[values] +adaptive_layer_height_enabled = true +layer_height = 0.16 +layer_height_0 = 0.20 +support_interface_height = =layer_height*6 +top_bottom_thickness = =layer_height_0+layer_height*5 + diff --git a/resources/quality/sovol/sovol_bowden_global_draft.inst.cfg b/resources/quality/sovol/sovol_bowden_global_draft.inst.cfg new file mode 100644 index 0000000000..7c7c03076f --- /dev/null +++ b/resources/quality/sovol/sovol_bowden_global_draft.inst.cfg @@ -0,0 +1,23 @@ +[general] +definition = sovol_base_bowden +name = Draft Quality +version = 4 + +[metadata] +global_quality = True +quality_type = draft +setting_version = 20 +type = quality +weight = -5 + +[values] +adhesion_type = skirt +layer_height = 0.32 +layer_height_0 = 0.32 +speed_print = 60 +speed_topbottom = =math.ceil(speed_print * (60 / 100)) +speed_wall = =math.ceil(speed_print * (60 / 100)) +support_interface_height = =layer_height*4 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 + diff --git a/resources/quality/sovol/sovol_bowden_global_low.inst.cfg b/resources/quality/sovol/sovol_bowden_global_low.inst.cfg new file mode 100644 index 0000000000..a8957eaeb1 --- /dev/null +++ b/resources/quality/sovol/sovol_bowden_global_low.inst.cfg @@ -0,0 +1,22 @@ +[general] +definition = sovol_base_bowden +name = Low Quality +version = 4 + +[metadata] +global_quality = True +quality_type = low +setting_version = 20 +type = quality +weight = -4 + +[values] +layer_height = 0.28 +layer_height_0 = 0.28 +speed_print = 60 +speed_topbottom = =math.ceil(speed_print * (60 / 100)) +speed_wall = =math.ceil(speed_print * (60 / 100)) +support_interface_height = =layer_height*4 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 + diff --git a/resources/quality/sovol/sovol_bowden_global_standard.inst.cfg b/resources/quality/sovol/sovol_bowden_global_standard.inst.cfg new file mode 100644 index 0000000000..0a4dc9a988 --- /dev/null +++ b/resources/quality/sovol/sovol_bowden_global_standard.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = sovol_base_bowden +name = Standard Quality +version = 4 + +[metadata] +global_quality = True +quality_type = standard +setting_version = 20 +type = quality +weight = -3 + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 +support_interface_height = =layer_height*5 +top_bottom_thickness = =layer_height_0+layer_height*4 +wall_thickness = =line_width*2 + diff --git a/resources/quality/sovol/sovol_bowden_global_super.inst.cfg b/resources/quality/sovol/sovol_bowden_global_super.inst.cfg new file mode 100644 index 0000000000..ca0884839a --- /dev/null +++ b/resources/quality/sovol/sovol_bowden_global_super.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = sovol_base_bowden +name = Super Quality +version = 4 + +[metadata] +global_quality = True +quality_type = super +setting_version = 20 +type = quality +weight = -1 + +[values] +acceleration_wall = 400 +layer_height = 0.12 +layer_height_0 = 0.12 +support_interface_height = =layer_height*8 +top_bottom_thickness = =layer_height_0+layer_height*6 + diff --git a/resources/quality/sovol/sovol_bowden_global_ultra.inst.cfg b/resources/quality/sovol/sovol_bowden_global_ultra.inst.cfg new file mode 100644 index 0000000000..270e5199bc --- /dev/null +++ b/resources/quality/sovol/sovol_bowden_global_ultra.inst.cfg @@ -0,0 +1,20 @@ +[general] +definition = sovol_base_bowden +name = Ultra Quality +version = 4 + +[metadata] +global_quality = True +quality_type = ultra +setting_version = 20 +type = quality +weight = 0 + +[values] +acceleration_wall = 400 +layer_height = 0.08 +layer_height_0 = 0.12 +speed_layer_0 = 15 +support_interface_height = =layer_height*12 +top_bottom_thickness = =layer_height_0+layer_height*10 + diff --git a/resources/quality/sovol/sovol_planetary_global_adaptive.inst.cfg b/resources/quality/sovol/sovol_planetary_global_adaptive.inst.cfg new file mode 100644 index 0000000000..013abda834 --- /dev/null +++ b/resources/quality/sovol/sovol_planetary_global_adaptive.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = sovol_base_planetary +name = Dynamic Quality +version = 4 + +[metadata] +global_quality = True +quality_type = adaptive +setting_version = 20 +type = quality +weight = -2 + +[values] +adaptive_layer_height_enabled = true +layer_height = 0.16 +layer_height_0 = 0.20 +support_interface_height = =layer_height*6 +top_bottom_thickness = =layer_height_0+layer_height*5 + diff --git a/resources/quality/sovol/sovol_planetary_global_draft.inst.cfg b/resources/quality/sovol/sovol_planetary_global_draft.inst.cfg new file mode 100644 index 0000000000..5ede71ce3d --- /dev/null +++ b/resources/quality/sovol/sovol_planetary_global_draft.inst.cfg @@ -0,0 +1,23 @@ +[general] +definition = sovol_base_planetary +name = Draft Quality +version = 4 + +[metadata] +global_quality = True +quality_type = draft +setting_version = 20 +type = quality +weight = -5 + +[values] +adhesion_type = skirt +layer_height = 0.32 +layer_height_0 = 0.32 +speed_print = 60 +speed_topbottom = =math.ceil(speed_print * (60 / 100)) +speed_wall = =math.ceil(speed_print * (60 / 100)) +support_interface_height = =layer_height*4 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 + diff --git a/resources/quality/sovol/sovol_planetary_global_low.inst.cfg b/resources/quality/sovol/sovol_planetary_global_low.inst.cfg new file mode 100644 index 0000000000..60a46f9773 --- /dev/null +++ b/resources/quality/sovol/sovol_planetary_global_low.inst.cfg @@ -0,0 +1,22 @@ +[general] +definition = sovol_base_planetary +name = Low Quality +version = 4 + +[metadata] +global_quality = True +quality_type = low +setting_version = 20 +type = quality +weight = -4 + +[values] +layer_height = 0.28 +layer_height_0 = 0.28 +speed_print = 60 +speed_topbottom = =math.ceil(speed_print * (60 / 100)) +speed_wall = =math.ceil(speed_print * (60 / 100)) +support_interface_height = =layer_height*4 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 + diff --git a/resources/quality/sovol/sovol_planetary_global_standard.inst.cfg b/resources/quality/sovol/sovol_planetary_global_standard.inst.cfg new file mode 100644 index 0000000000..00a7d1342b --- /dev/null +++ b/resources/quality/sovol/sovol_planetary_global_standard.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = sovol_base_planetary +name = Standard Quality +version = 4 + +[metadata] +global_quality = True +quality_type = standard +setting_version = 20 +type = quality +weight = -3 + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 +support_interface_height = =layer_height*5 +top_bottom_thickness = =layer_height_0+layer_height*4 +wall_thickness = =line_width*2 + diff --git a/resources/quality/sovol/sovol_planetary_global_super.inst.cfg b/resources/quality/sovol/sovol_planetary_global_super.inst.cfg new file mode 100644 index 0000000000..8204fb00f8 --- /dev/null +++ b/resources/quality/sovol/sovol_planetary_global_super.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = sovol_base_planetary +name = Super Quality +version = 4 + +[metadata] +global_quality = True +quality_type = super +setting_version = 20 +type = quality +weight = -1 + +[values] +acceleration_wall = 400 +layer_height = 0.12 +layer_height_0 = 0.12 +support_interface_height = =layer_height*8 +top_bottom_thickness = =layer_height_0+layer_height*6 + diff --git a/resources/quality/sovol/sovol_planetary_global_ultra.inst.cfg b/resources/quality/sovol/sovol_planetary_global_ultra.inst.cfg new file mode 100644 index 0000000000..90d03b27eb --- /dev/null +++ b/resources/quality/sovol/sovol_planetary_global_ultra.inst.cfg @@ -0,0 +1,20 @@ +[general] +definition = sovol_base_planetary +name = Ultra Quality +version = 4 + +[metadata] +global_quality = True +quality_type = ultra +setting_version = 20 +type = quality +weight = 0 + +[values] +acceleration_wall = 400 +layer_height = 0.08 +layer_height_0 = 0.12 +speed_layer_0 = 15 +support_interface_height = =layer_height*12 +top_bottom_thickness = =layer_height_0+layer_height*10 + diff --git a/resources/quality/sovol/sovol_titan_global_adaptive.inst.cfg b/resources/quality/sovol/sovol_titan_global_adaptive.inst.cfg new file mode 100644 index 0000000000..cfa8db17b3 --- /dev/null +++ b/resources/quality/sovol/sovol_titan_global_adaptive.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = sovol_base_titan +name = Dynamic Quality +version = 4 + +[metadata] +global_quality = True +quality_type = adaptive +setting_version = 20 +type = quality +weight = -2 + +[values] +adaptive_layer_height_enabled = true +layer_height = 0.16 +layer_height_0 = 0.20 +support_interface_height = =layer_height*6 +top_bottom_thickness = =layer_height_0+layer_height*5 + diff --git a/resources/quality/sovol/sovol_titan_global_draft.inst.cfg b/resources/quality/sovol/sovol_titan_global_draft.inst.cfg new file mode 100644 index 0000000000..dcb335b3cc --- /dev/null +++ b/resources/quality/sovol/sovol_titan_global_draft.inst.cfg @@ -0,0 +1,23 @@ +[general] +definition = sovol_base_titan +name = Draft Quality +version = 4 + +[metadata] +global_quality = True +quality_type = draft +setting_version = 20 +type = quality +weight = -5 + +[values] +adhesion_type = skirt +layer_height = 0.32 +layer_height_0 = 0.32 +speed_print = 60 +speed_topbottom = =math.ceil(speed_print * (60 / 100)) +speed_wall = =math.ceil(speed_print * (60 / 100)) +support_interface_height = =layer_height*4 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 + diff --git a/resources/quality/sovol/sovol_titan_global_low.inst.cfg b/resources/quality/sovol/sovol_titan_global_low.inst.cfg new file mode 100644 index 0000000000..202fa154f7 --- /dev/null +++ b/resources/quality/sovol/sovol_titan_global_low.inst.cfg @@ -0,0 +1,22 @@ +[general] +definition = sovol_base_titan +name = Low Quality +version = 4 + +[metadata] +global_quality = True +quality_type = low +setting_version = 20 +type = quality +weight = -4 + +[values] +layer_height = 0.28 +layer_height_0 = 0.28 +speed_print = 60 +speed_topbottom = =math.ceil(speed_print * (60 / 100)) +speed_wall = =math.ceil(speed_print * (60 / 100)) +support_interface_height = =layer_height*4 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 + diff --git a/resources/quality/sovol/sovol_titan_global_standard.inst.cfg b/resources/quality/sovol/sovol_titan_global_standard.inst.cfg new file mode 100644 index 0000000000..bcb73248c0 --- /dev/null +++ b/resources/quality/sovol/sovol_titan_global_standard.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = sovol_base_titan +name = Standard Quality +version = 4 + +[metadata] +global_quality = True +quality_type = standard +setting_version = 20 +type = quality +weight = -3 + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 +support_interface_height = =layer_height*5 +top_bottom_thickness = =layer_height_0+layer_height*4 +wall_thickness = =line_width*2 + diff --git a/resources/quality/sovol/sovol_titan_global_super.inst.cfg b/resources/quality/sovol/sovol_titan_global_super.inst.cfg new file mode 100644 index 0000000000..80afacf289 --- /dev/null +++ b/resources/quality/sovol/sovol_titan_global_super.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = sovol_base_titan +name = Super Quality +version = 4 + +[metadata] +global_quality = True +quality_type = super +setting_version = 20 +type = quality +weight = -1 + +[values] +acceleration_wall = 400 +layer_height = 0.12 +layer_height_0 = 0.12 +support_interface_height = =layer_height*8 +top_bottom_thickness = =layer_height_0+layer_height*6 + diff --git a/resources/quality/sovol/sovol_titan_global_ultra.inst.cfg b/resources/quality/sovol/sovol_titan_global_ultra.inst.cfg new file mode 100644 index 0000000000..f45b59ad3c --- /dev/null +++ b/resources/quality/sovol/sovol_titan_global_ultra.inst.cfg @@ -0,0 +1,20 @@ +[general] +definition = sovol_base_titan +name = Ultra Quality +version = 4 + +[metadata] +global_quality = True +quality_type = ultra +setting_version = 20 +type = quality +weight = 0 + +[values] +acceleration_wall = 400 +layer_height = 0.08 +layer_height_0 = 0.12 +speed_layer_0 = 15 +support_interface_height = =layer_height*12 +top_bottom_thickness = =layer_height_0+layer_height*10 + diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS-X_A.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS-X_A.inst.cfg index 0c57098f3d..b63834ad71 100644 --- a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS-X_A.inst.cfg +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS-X_A.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = A definition = strateo3d +name = A +version = 4 [metadata] +material = emotiontech_absx +quality_type = a setting_version = 20 type = quality -quality_type = a -weight = 1 -material = emotiontech_absx variant = High temp 0.4 +weight = 1 [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_full_at_height = =layer_height_0 + 19 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 65 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 100 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 100 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +support_angle = 65 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS-X_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS-X_B.inst.cfg index c6aa37e242..5e4e926b09 100644 --- a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS-X_B.inst.cfg +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS-X_B.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_absx +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 0 -material = emotiontech_absx variant = High temp 0.4 +weight = 0 [values] -layer_height_0 = =round(0.67*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 = 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_full_at_height = =layer_height_0 + 14 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 60 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 96 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -material_flow = 96 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 15 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_print = 55 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +support_angle = 60 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS-X_C.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS-X_C.inst.cfg index 7bbc4ec5ea..2e0aaba847 100644 --- a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS-X_C.inst.cfg +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS-X_C.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_absx +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = -1 -material = emotiontech_absx variant = High temp 0.4 +weight = -1 [values] -layer_height_0 = =round(0.75*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 = 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_full_at_height = =layer_height_0 + 9 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 91 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_flow = 91 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 20 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_print = 60 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +support_angle = 55 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS_A.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS_A.inst.cfg index 7285f7b098..d9627197cb 100644 --- a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS_A.inst.cfg +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS_A.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = A definition = strateo3d +name = A +version = 4 [metadata] +material = emotiontech_abs +quality_type = a setting_version = 20 type = quality -quality_type = a -weight = 1 -material = emotiontech_abs variant = High temp 0.4 +weight = 1 [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_full_at_height = =layer_height_0 + 19 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 65 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 100 material_print_temperature = =default_material_print_temperature + 1 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 100 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +support_angle = 65 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS_B.inst.cfg index 2861e0b3a1..4a3bec193a 100644 --- a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS_B.inst.cfg +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS_B.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_abs +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 0 -material = emotiontech_abs variant = High temp 0.4 +weight = 0 [values] -layer_height_0 = =round(0.67*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 = 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_full_at_height = =layer_height_0 + 14 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 60 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 96 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature + 1 -material_flow = 96 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 15 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_print = 55 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +support_angle = 60 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS_C.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS_C.inst.cfg index 31c7afc2af..b81744b129 100644 --- a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS_C.inst.cfg +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ABS_C.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_abs +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = -1 -material = emotiontech_abs variant = High temp 0.4 +weight = -1 [values] -layer_height_0 = =round(0.75*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 = 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_full_at_height = =layer_height_0 + 9 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 91 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature +3 -material_flow = 91 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 20 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_print = 60 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +support_angle = 55 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ACETATE_A.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ACETATE_A.inst.cfg index 37bdacf7c1..a808108318 100644 --- a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ACETATE_A.inst.cfg +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ACETATE_A.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = A definition = strateo3d +name = A +version = 4 [metadata] +material = emotiontech_acetate +quality_type = a setting_version = 20 type = quality -quality_type = a -weight = 1 -material = emotiontech_acetate variant = High temp 0.4 +weight = 1 [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.4 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 50 -speed_wall = =math.ceil(speed_print * 37/50) -speed_wall_0 = =math.ceil(speed_wall * 30/37) -speed_topbottom = =math.ceil(speed_print * 33/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 10 * layer_height 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 + 10 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 60 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 98 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 98 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 33/50) +speed_wall = =math.ceil(speed_print * 37/50) +speed_wall_0 = =math.ceil(speed_wall * 30/37) +support_angle = 60 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 + diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ACETATE_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ACETATE_B.inst.cfg index b41f0679ea..1bd0283581 100644 --- a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ACETATE_B.inst.cfg +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ACETATE_B.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_acetate +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 0 -material = emotiontech_acetate variant = High temp 0.4 +weight = 0 [values] -layer_height_0 = =round(0.67*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.4 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 55 -speed_wall = =math.ceil(speed_print * 40/55) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 37/55) -speed_layer_0 = =math.ceil(speed_print * 27/55) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 7 * layer_height 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 + 7 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 95 material_print_temperature = =default_material_print_temperature + 2 material_print_temperature_layer_0 = =default_material_print_temperature + 0 -material_flow = 95 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 27/55) +speed_print = 55 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_wall = =math.ceil(speed_print * 40/55) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 + diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ACETATE_C.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ACETATE_C.inst.cfg index 8badb65f02..5992c2d751 100644 --- a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ACETATE_C.inst.cfg +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ACETATE_C.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_acetate +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = -1 -material = emotiontech_acetate variant = High temp 0.4 +weight = -1 [values] -layer_height_0 = =round(0.75*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.4 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 60 -speed_wall = =math.ceil(speed_print * 45/60) -speed_wall_0 = =math.ceil(speed_wall * 33/45) -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_full_at_height = =layer_height_0 + 5 * layer_height 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 + 5 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 93 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -material_flow = 93 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_print = 60 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_wall = =math.ceil(speed_print * 45/60) +speed_wall_0 = =math.ceil(speed_wall * 33/45) +support_angle = 50 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 + diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ASA-X_A.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ASA-X_A.inst.cfg index c8c9a7b4df..720fcc4d23 100644 --- a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ASA-X_A.inst.cfg +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ASA-X_A.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = A definition = strateo3d +name = A +version = 4 [metadata] +material = emotiontech_asax +quality_type = a setting_version = 20 type = quality -quality_type = a -weight = 1 -material = emotiontech_asax variant = High temp 0.4 +weight = 1 [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_full_at_height = =layer_height_0 + 19 * layer_height cool_fan_speed = 40 cool_fan_speed_max = 75 -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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 65 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 100 material_print_temperature = =default_material_print_temperature + 1 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -material_flow = 100 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +support_angle = 65 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 support_xy_distance = =line_width * 1.5 support_xy_distance_overhang = =wall_line_width_0 -support_offset = 1 -support_interface_density = 100 -prime_tower_enable = True +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ASA-X_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ASA-X_B.inst.cfg index 67eaf24f1c..c118741029 100644 --- a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ASA-X_B.inst.cfg +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ASA-X_B.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_asax +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 0 -material = emotiontech_asax variant = High temp 0.4 +weight = 0 [values] -layer_height_0 = =round(0.67*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 = 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_full_at_height = =layer_height_0 + 14 * layer_height cool_fan_speed = 40 cool_fan_speed_max = 75 -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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 60 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 96 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_flow = 96 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 15 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_print = 55 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +support_angle = 60 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 support_xy_distance = =line_width * 1.5 support_xy_distance_overhang = =wall_line_width_0 -support_offset = 1 -support_interface_density = 100 -prime_tower_enable = True +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ASA-X_C.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ASA-X_C.inst.cfg index 4873838d1a..a6a7ffae29 100644 --- a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ASA-X_C.inst.cfg +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_ASA-X_C.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_asax +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = -1 -material = emotiontech_asax variant = High temp 0.4 +weight = -1 [values] -layer_height_0 = =round(0.75*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 = 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_full_at_height = =layer_height_0 + 9 * layer_height cool_fan_speed = 40 cool_fan_speed_max = 75 -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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 91 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 7 -material_flow = 91 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 20 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_print = 60 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +support_angle = 55 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 support_xy_distance = =line_width * 1.5 support_xy_distance_overhang = =wall_line_width_0 -support_offset = 1 -support_interface_density = 100 -prime_tower_enable = True +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_COPA_A.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_COPA_A.inst.cfg index 0295f9aa64..75e2db1c44 100644 --- a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_COPA_A.inst.cfg +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_COPA_A.inst.cfg @@ -1,62 +1,63 @@ [general] -version = 4 -name = A definition = strateo3d +name = A +version = 4 [metadata] +material = emotiontech_copa +quality_type = a setting_version = 20 type = quality -quality_type = a -weight = 1 -material = emotiontech_copa variant = High temp 0.4 +weight = 1 [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 -wall_line_count = 3 -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 +bridge_fan_speed = 80 +bridge_settings_enabled = True +bridge_skin_density = 80 +bridge_skin_material_flow = 60 +bridge_skin_speed = 8 +bridge_wall_coast = 50 +bridge_wall_material_flow = 50 +bridge_wall_speed = 8 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed = 20 cool_fan_speed_max = 80 -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 = 2 cool_lift_head = True -support_angle = 45 -material_print_temperature = =default_material_print_temperature -material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_initial_print_temperature = =default_material_print_temperature +cool_min_layer_time = 2 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 2 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_final_print_temperature = =default_material_print_temperature material_flow = 91 -skin_material_flow = 92 +material_initial_print_temperature = =default_material_print_temperature +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +meshfix_maximum_deviation = 0.04 +meshfix_maximum_resolution = 0.5 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width +skin_material_flow = 92 skin_overlap = 10 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_print = 35 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +support_angle = 45 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 -bridge_settings_enabled = True -bridge_wall_coast = 50 -bridge_wall_speed = 8 -bridge_wall_material_flow = 50 -bridge_skin_speed = 8 -bridge_skin_material_flow = 60 -bridge_skin_density = 80 -bridge_fan_speed = 80 -meshfix_maximum_resolution = 0.5 -meshfix_maximum_deviation = 0.04 +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 3 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_COPA_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_COPA_B.inst.cfg index d0069461e8..50979e49c3 100644 --- a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_COPA_B.inst.cfg +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_COPA_B.inst.cfg @@ -1,62 +1,63 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_copa +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 0 -material = emotiontech_copa variant = High temp 0.4 +weight = 0 [values] -layer_height_0 = =round(0.67*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 -wall_line_count = 3 -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 +bridge_fan_speed = 80 +bridge_settings_enabled = True +bridge_skin_density = 80 +bridge_skin_material_flow = 60 +bridge_skin_speed = 8 +bridge_wall_coast = 50 +bridge_wall_material_flow = 50 +bridge_wall_speed = 8 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed = 20 cool_fan_speed_max = 80 -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 = 2 cool_lift_head = True -support_angle = 60 -material_print_temperature = =default_material_print_temperature -material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_initial_print_temperature = =default_material_print_temperature +cool_min_layer_time = 2 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 2 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_final_print_temperature = =default_material_print_temperature material_flow = 91 -skin_material_flow = 92 +material_initial_print_temperature = =default_material_print_temperature +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +meshfix_maximum_deviation = 0.04 +meshfix_maximum_resolution = 0.5 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width +skin_material_flow = 92 skin_overlap = 15 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_print = 35 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +support_angle = 60 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 -bridge_settings_enabled = True -bridge_wall_coast = 50 -bridge_wall_speed = 8 -bridge_wall_material_flow = 50 -bridge_skin_speed = 8 -bridge_skin_material_flow = 60 -bridge_skin_density = 80 -bridge_fan_speed = 80 -meshfix_maximum_resolution = 0.5 -meshfix_maximum_deviation = 0.04 +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 3 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_COPA_C.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_COPA_C.inst.cfg index 23accc5834..c90c17470c 100644 --- a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_COPA_C.inst.cfg +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_COPA_C.inst.cfg @@ -1,62 +1,63 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_copa +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = -1 -material = emotiontech_copa variant = High temp 0.4 +weight = -1 [values] -layer_height_0 = =round(0.75*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 -wall_line_count = 3 -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 +bridge_fan_speed = 80 +bridge_settings_enabled = True +bridge_skin_density = 80 +bridge_skin_material_flow = 60 +bridge_skin_speed = 8 +bridge_wall_coast = 50 +bridge_wall_material_flow = 50 +bridge_wall_speed = 8 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed = 20 cool_fan_speed_max = 80 -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 = 2 cool_lift_head = True -support_angle = 60 -material_print_temperature = =default_material_print_temperature -material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_initial_print_temperature = =default_material_print_temperature +cool_min_layer_time = 2 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 2 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_final_print_temperature = =default_material_print_temperature material_flow = 91 -skin_material_flow = 92 +material_initial_print_temperature = =default_material_print_temperature +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +meshfix_maximum_deviation = 0.04 +meshfix_maximum_resolution = 0.5 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width +skin_material_flow = 92 skin_overlap = 20 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_print = 35 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +support_angle = 60 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 -bridge_settings_enabled = True -bridge_wall_coast = 50 -bridge_wall_speed = 8 -bridge_wall_material_flow = 50 -bridge_skin_speed = 8 -bridge_skin_material_flow = 60 -bridge_skin_density = 80 -bridge_fan_speed = 80 -meshfix_maximum_resolution = 0.5 -meshfix_maximum_deviation = 0.04 +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 3 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_HIPS_A.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_HIPS_A.inst.cfg index 950e441276..83ba4b0e86 100644 --- a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_HIPS_A.inst.cfg +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_HIPS_A.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = A definition = strateo3d +name = A +version = 4 [metadata] +material = emotiontech_hips +quality_type = a setting_version = 20 type = quality -quality_type = a -weight = 1 -material = emotiontech_hips variant = High temp 0.4 +weight = 1 [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.4 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 14 * layer_height 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 + 14 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 + diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_HIPS_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_HIPS_B.inst.cfg index b00876c6de..b962121810 100644 --- a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_HIPS_B.inst.cfg +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_HIPS_B.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_hips +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 0 -material = emotiontech_hips variant = High temp 0.4 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.4 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 9 * layer_height 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 + 9 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 97 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 15 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 + diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_HIPS_C.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_HIPS_C.inst.cfg index 2d3d5b5484..1a53bcbe36 100644 --- a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_HIPS_C.inst.cfg +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_HIPS_C.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_hips +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = -1 -material = emotiontech_hips variant = High temp 0.4 +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.4 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 97 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 20 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 + diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PC_A.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PC_A.inst.cfg index d6dc3014dd..ac27390fdf 100644 --- a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PC_A.inst.cfg +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PC_A.inst.cfg @@ -1,61 +1,60 @@ [general] -version = 4 -name = A definition = strateo3d +name = A +version = 4 [metadata] +material = emotiontech_pc +quality_type = a setting_version = 20 type = quality -quality_type = a -weight = 1 -material = emotiontech_pc variant = High temp 0.4 +weight = 1 [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 = 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 +adhesion_type = brim +bridge_fan_speed = 100 +bridge_settings_enabled = True +bridge_skin_density = 80 +bridge_skin_material_flow = 100 +bridge_skin_speed = 12.5 +bridge_wall_coast = 50 +bridge_wall_material_flow = 50 +bridge_wall_speed = 12 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height 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 +cool_min_layer_time = 2 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 12 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 88 material_print_temperature = 260 material_print_temperature_layer_0 = 265 -material_flow = 88 -wall_line_count = 3 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_speed = 30 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width +retraction_speed = 30 skin_overlap = 10 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_print = 35 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +support_angle = 60 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 3 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PC_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PC_B.inst.cfg index 0f059e05e9..10e8216d57 100644 --- a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PC_B.inst.cfg +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PC_B.inst.cfg @@ -1,61 +1,60 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_pc +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 0 -material = emotiontech_pc variant = High temp 0.4 +weight = 0 [values] -layer_height_0 = =round(0.67*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 = 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 +adhesion_type = brim +bridge_fan_speed = 100 +bridge_settings_enabled = True +bridge_skin_density = 80 +bridge_skin_material_flow = 100 +bridge_skin_speed = 12.5 +bridge_wall_coast = 50 +bridge_wall_material_flow = 50 +bridge_wall_speed = 12 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height 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 +cool_min_layer_time = 2 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 12 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 88 material_print_temperature = 270 material_print_temperature_layer_0 = 275 -material_flow = 88 -wall_line_count = 3 -retraction_speed = 30 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width +retraction_speed = 30 skin_overlap = 15 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_print = 35 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +support_angle = 60 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 3 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 -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/strateo3d/HT0.4/s3d_ht0.4_PC_C.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PC_C.inst.cfg index 4b86632a66..c8cc7afd8b 100644 --- a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PC_C.inst.cfg +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PC_C.inst.cfg @@ -1,61 +1,60 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_pc +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = -1 -material = emotiontech_pc variant = High temp 0.4 +weight = -1 [values] -layer_height_0 = =round(0.75*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 = 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 +adhesion_type = brim +bridge_fan_speed = 100 +bridge_settings_enabled = True +bridge_skin_density = 80 +bridge_skin_material_flow = 100 +bridge_skin_speed = 12.5 +bridge_wall_coast = 50 +bridge_wall_material_flow = 50 +bridge_wall_speed = 12 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height 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 +cool_min_layer_time = 2 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 12 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 88 material_print_temperature = 270 material_print_temperature_layer_0 = 275 -material_flow = 88 -wall_line_count = 3 -retraction_speed = 30 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width +retraction_speed = 30 skin_overlap = 20 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_print = 35 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +support_angle = 60 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 3 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 -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/strateo3d/HT0.4/s3d_ht0.4_PEKK_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PEKK_B.inst.cfg index 5ed9308482..7df38e1c2b 100644 --- a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PEKK_B.inst.cfg +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PEKK_B.inst.cfg @@ -1,58 +1,59 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_pekk +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 0 -material = emotiontech_pekk variant = High temp 0.4 +weight = 0 [values] -layer_height_0 = =round(0.75*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 -initial_layer_line_width_factor = 120 -material_flow_layer_0 = 120 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -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 = 10 -speed_travel_layer_0 = 100 -skirt_brim_speed = 5 -speed_slowdown_layers = 2 +bridge_enable_more_layers = False +bridge_fan_speed = 100 +bridge_settings_enabled = True +bridge_skin_material_flow = =bridge_wall_material_flow +bridge_skin_speed = =bridge_wall_speed +bridge_wall_material_flow = 185 +bridge_wall_speed = 5 cool_fan_enabled = True +cool_fan_full_layer = 2 cool_fan_speed = 30 cool_fan_speed_max = 30 -cool_min_layer_time_fan_speed_max = 10 cool_min_layer_time = 11 -cool_fan_full_layer = 2 +cool_min_layer_time_fan_speed_max = 10 cool_min_speed = 5 -support_angle = 45 +initial_layer_line_width_factor = 120 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 105 +material_flow_layer_0 = 120 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 15 -material_flow = 105 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 15 -support_z_distance = =layer_height +skirt_brim_speed = 5 +speed_layer_0 = 10 +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_travel_layer_0 = 100 +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +support_angle = 45 support_bottom_distance = =support_z_distance +support_interface_density = 105 +support_offset = 1 support_xy_distance = =line_width * 1.7 support_xy_distance_overhang = =wall_line_width_0 -support_offset = 1 -support_interface_density = 105 -prime_tower_enable = True -bridge_settings_enabled = True -bridge_wall_speed = 5 -bridge_wall_material_flow = 185 -bridge_skin_speed = =bridge_wall_speed -bridge_skin_material_flow = =bridge_wall_material_flow -bridge_fan_speed = 100 -bridge_enable_more_layers = False +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PETG_A.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PETG_A.inst.cfg index 5656a3edb0..a3762ee855 100644 --- a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PETG_A.inst.cfg +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PETG_A.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = A definition = strateo3d +name = A +version = 4 [metadata] +material = emotiontech_petg +quality_type = a setting_version = 20 type = quality -quality_type = a -weight = 1 -material = emotiontech_petg variant = High temp 0.4 +weight = 1 [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_full_at_height = =layer_height_0 + 3 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 65 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 98 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 98 +prime_tower_enable = True retraction_extra_prime_amount = 0 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +support_angle = 65 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PETG_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PETG_B.inst.cfg index f5315c9b0b..6ef25e48bd 100644 --- a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PETG_B.inst.cfg +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PETG_B.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_petg +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 0 -material = emotiontech_petg variant = High temp 0.4 +weight = 0 [values] -layer_height_0 = =round(0.67*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 = 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_full_at_height = =layer_height_0 + 3 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 60 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 95 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 95 +prime_tower_enable = True retraction_extra_prime_amount = 0 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 15 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_print = 55 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +support_angle = 60 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PETG_C.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PETG_C.inst.cfg index d9dc021e53..54a3536352 100644 --- a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PETG_C.inst.cfg +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PETG_C.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_petg +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = -1 -material = emotiontech_petg variant = High temp 0.4 +weight = -1 [values] -layer_height_0 = =round(0.75*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 = 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_full_at_height = =layer_height_0 + 3 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 91 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature +5 -material_flow = 91 +prime_tower_enable = True retraction_extra_prime_amount = 0 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 20 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_print = 60 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +support_angle = 55 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_A.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_A.inst.cfg index 41b6a05de9..fc7d9bcf87 100644 --- a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_A.inst.cfg +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_A.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = A definition = strateo3d +name = A +version = 4 [metadata] +material = emotiontech_pla +quality_type = a setting_version = 20 type = quality -quality_type = a -weight = 1 -material = emotiontech_pla variant = High temp 0.4 +weight = 1 [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_full_at_height = =layer_height_0 + 2 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 65 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 98 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -5 -material_flow = 98 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +support_angle = 65 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_B.inst.cfg index 95123fb54d..5f15c488ac 100644 --- a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_B.inst.cfg +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_B.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_pla +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 0 -material = emotiontech_pla variant = High temp 0.4 +weight = 0 [values] -layer_height_0 = =round(0.67*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 = 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_full_at_height = =layer_height_0 + 2 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 60 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 95 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 95 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 15 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_print = 55 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +support_angle = 60 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_C.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_C.inst.cfg index 8c9289ebe1..1fdc3ff627 100644 --- a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_C.inst.cfg +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_C.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_pla +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = -1 -material = emotiontech_pla variant = High temp 0.4 +weight = -1 [values] -layer_height_0 = =round(0.75*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 = 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_full_at_height = =layer_height_0 + 2 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 91 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_flow = 91 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 20 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_print = 60 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +support_angle = 55 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_HT_A.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_HT_A.inst.cfg index fca7a3f152..bdd9a45d25 100644 --- a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_HT_A.inst.cfg +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_HT_A.inst.cfg @@ -1,55 +1,56 @@ [general] -version = 4 -name = A definition = strateo3d +name = A +version = 4 [metadata] +material = emotiontech_pla_hr_870 +quality_type = a setting_version = 20 type = quality -quality_type = a -weight = 1 -material = emotiontech_pla_hr_870 variant = High temp 0.4 +weight = 1 [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 -wall_line_count = 3 -speed_print = 30 -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_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed = 100 cool_fan_speed_max = 100 -cool_min_layer_time_fan_speed_max = 20 +cool_lift_head = True cool_min_layer_time = 2 -cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 4 -support_angle = 65 -material_print_temperature = =default_material_print_temperature + 5 -material_print_temperature_layer_0 = =default_material_print_temperature + 10 -material_initial_print_temperature = =default_material_print_temperature + 5 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_final_print_temperature = =default_material_print_temperature + 5 material_flow = 91 -skin_material_flow = 92 +material_initial_print_temperature = =default_material_print_temperature + 5 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 10 +meshfix_maximum_deviation = 0.04 +meshfix_maximum_resolution = 0.5 +prime_tower_enable = True retraction_amount = 2 retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width +skin_material_flow = 92 skin_overlap = 10 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_print = 30 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +support_angle = 65 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 -meshfix_maximum_resolution = 0.5 -meshfix_maximum_deviation = 0.04 -cool_lift_head = True +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 3 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_HT_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_HT_B.inst.cfg index 9f659c54a6..a52be89712 100644 --- a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_HT_B.inst.cfg +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_HT_B.inst.cfg @@ -1,54 +1,55 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_pla_hr_870 +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 0 -material = emotiontech_pla_hr_870 variant = High temp 0.4 +weight = 0 [values] -layer_height_0 = =round(0.67*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 = 40 -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_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed = 100 cool_fan_speed_max = 100 -cool_min_layer_time_fan_speed_max = 20 +cool_lift_head = True cool_min_layer_time = 2 -cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 4 -support_angle = 60 -material_print_temperature = =default_material_print_temperature -material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_initial_print_temperature = =default_material_print_temperature +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_final_print_temperature = =default_material_print_temperature material_flow = 91 -skin_material_flow = 92 +material_initial_print_temperature = =default_material_print_temperature +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +meshfix_maximum_deviation = 0.04 +meshfix_maximum_resolution = 0.5 +prime_tower_enable = True retraction_amount = 2 retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width +skin_material_flow = 92 skin_overlap = 15 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +support_angle = 60 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 -meshfix_maximum_resolution = 0.5 -meshfix_maximum_deviation = 0.04 -cool_lift_head = True +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_HT_C.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_HT_C.inst.cfg index 5507ffa799..f208d523c9 100644 --- a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_HT_C.inst.cfg +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_PLA_HT_C.inst.cfg @@ -1,54 +1,55 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_pla_hr_870 +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = -1 -material = emotiontech_pla_hr_870 variant = High temp 0.4 +weight = -1 [values] -layer_height_0 = =round(0.75*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 = 40 -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_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed = 100 cool_fan_speed_max = 100 -cool_min_layer_time_fan_speed_max = 20 +cool_lift_head = True cool_min_layer_time = 2 -cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 4 -support_angle = 55 -material_print_temperature = =default_material_print_temperature -material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_initial_print_temperature = =default_material_print_temperature +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_final_print_temperature = =default_material_print_temperature material_flow = 91 -skin_material_flow = 92 +material_initial_print_temperature = =default_material_print_temperature +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +meshfix_maximum_deviation = 0.04 +meshfix_maximum_resolution = 0.5 +prime_tower_enable = True retraction_amount = 2 retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width +skin_material_flow = 92 skin_overlap = 20 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +support_angle = 55 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 -meshfix_maximum_resolution = 0.5 -meshfix_maximum_deviation = 0.04 -cool_lift_head = True +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_TPU98A_A.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_TPU98A_A.inst.cfg index f914fd3527..9c73467de3 100644 --- a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_TPU98A_A.inst.cfg +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_TPU98A_A.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = A definition = strateo3d +name = A +version = 4 [metadata] +material = emotiontech_tpu98a +quality_type = a setting_version = 20 type = quality -quality_type = a -weight = 1 -material = emotiontech_tpu98a variant = High temp 0.4 +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.38 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.38 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.38 -wall_0_wipe_dist = =machine_nozzle_size/2 -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_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +material_flow = 107 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature - 3 -material_flow = 107 +prime_tower_enable = True retraction_extra_prime_amount = 0.2 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = False +retraction_min_travel = =3*line_width skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 20/30) +speed_print = 30 +speed_slowdown_layers = 1 +speed_topbottom = =math.ceil(speed_print * 25/30) +speed_wall = =math.ceil(speed_print * 30/30) +speed_wall_0 = =math.ceil(speed_print * 25/30) +support_angle = 50 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 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 -prime_tower_enable = True +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.38 + diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_TPU98A_B.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_TPU98A_B.inst.cfg index bb9cd6a2b3..4179f2349d 100644 --- a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_TPU98A_B.inst.cfg +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_TPU98A_B.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_tpu98a +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 0 -material = emotiontech_tpu98a variant = High temp 0.4 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.38 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.38 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.38 -wall_0_wipe_dist = =machine_nozzle_size/2 -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_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +material_flow = 103 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 103 +prime_tower_enable = True retraction_extra_prime_amount = 0.2 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = False +retraction_min_travel = =3*line_width skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 20/35) +speed_print = 35 +speed_slowdown_layers = 1 +speed_topbottom = =math.ceil(speed_print * 25/35) +speed_wall = =math.ceil(speed_print * 35/35) +speed_wall_0 = =math.ceil(speed_print * 27/35) +support_angle = 50 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 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 -prime_tower_enable = True +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.38 + diff --git a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_TPU98A_C.inst.cfg b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_TPU98A_C.inst.cfg index 46a9f6c63a..439d2dff2f 100644 --- a/resources/quality/strateo3d/HT0.4/s3d_ht0.4_TPU98A_C.inst.cfg +++ b/resources/quality/strateo3d/HT0.4/s3d_ht0.4_TPU98A_C.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_tpu98a +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = -1 -material = emotiontech_tpu98a variant = High temp 0.4 +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.38 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.38 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.38 -wall_0_wipe_dist = =machine_nozzle_size/2 -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_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +material_flow = 101 material_print_temperature = =default_material_print_temperature + 7 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -material_flow = 101 +prime_tower_enable = True retraction_extra_prime_amount = 0.2 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = False +retraction_min_travel = =3*line_width skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 1 +speed_topbottom = =math.ceil(speed_print * 27/40) +speed_wall = =math.ceil(speed_print * 40/40) +speed_wall_0 = =math.ceil(speed_print * 30/40) +support_angle = 50 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 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 -prime_tower_enable = True +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.38 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS-X_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS-X_A.inst.cfg index 19dcd3dff8..f324b4cd8e 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS-X_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS-X_A.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = A definition = strateo3d +name = A +version = 4 [metadata] +material = emotiontech_absx +quality_type = a setting_version = 20 type = quality -quality_type = a -weight = 1 -material = emotiontech_absx variant = Standard 0.4 +weight = 1 [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_full_at_height = =layer_height_0 + 19 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 65 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 100 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 100 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +support_angle = 65 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS-X_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS-X_B.inst.cfg index d2a8379c93..05b0ca9ffb 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS-X_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS-X_B.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_absx +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 0 -material = emotiontech_absx variant = Standard 0.4 +weight = 0 [values] -layer_height_0 = =round(0.67*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 = 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_full_at_height = =layer_height_0 + 14 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 60 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 96 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -material_flow = 96 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 15 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_print = 55 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +support_angle = 60 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS-X_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS-X_C.inst.cfg index c953946d10..31b70858c8 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS-X_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS-X_C.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_absx +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = -1 -material = emotiontech_absx variant = Standard 0.4 +weight = -1 [values] -layer_height_0 = =round(0.75*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 = 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_full_at_height = =layer_height_0 + 9 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 91 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_flow = 91 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 20 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_print = 60 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +support_angle = 55 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg index 64bcba1151..dc6595a5ac 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = A definition = strateo3d +name = A +version = 4 [metadata] +material = emotiontech_abs +quality_type = a setting_version = 20 type = quality -quality_type = a -weight = 1 -material = emotiontech_abs variant = Standard 0.4 +weight = 1 [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_full_at_height = =layer_height_0 + 19 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 65 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 100 material_print_temperature = =default_material_print_temperature + 1 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 100 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +support_angle = 65 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg index e2691fadbe..79de4319db 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_abs +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 0 -material = emotiontech_abs variant = Standard 0.4 +weight = 0 [values] -layer_height_0 = =round(0.67*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 = 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_full_at_height = =layer_height_0 + 14 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 60 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 96 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature + 1 -material_flow = 96 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 15 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_print = 55 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +support_angle = 60 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg index fc6d90e37a..87bb0ee0d5 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_abs +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = -1 -material = emotiontech_abs variant = Standard 0.4 +weight = -1 [values] -layer_height_0 = =round(0.75*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 = 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_full_at_height = =layer_height_0 + 9 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 91 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature +3 -material_flow = 91 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 20 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_print = 60 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +support_angle = 55 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ACETATE_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ACETATE_A.inst.cfg index 38c217a922..a67ca99b75 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ACETATE_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ACETATE_A.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = A definition = strateo3d +name = A +version = 4 [metadata] +material = emotiontech_acetate +quality_type = a setting_version = 20 type = quality -quality_type = a -weight = 1 -material = emotiontech_acetate variant = Standard 0.4 +weight = 1 [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.4 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 50 -speed_wall = =math.ceil(speed_print * 37/50) -speed_wall_0 = =math.ceil(speed_wall * 30/37) -speed_topbottom = =math.ceil(speed_print * 33/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 10 * layer_height 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 + 10 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 60 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 98 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 98 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 33/50) +speed_wall = =math.ceil(speed_print * 37/50) +speed_wall_0 = =math.ceil(speed_wall * 30/37) +support_angle = 60 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ACETATE_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ACETATE_B.inst.cfg index 3114babdcf..ee822b1a91 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ACETATE_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ACETATE_B.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_acetate +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 0 -material = emotiontech_acetate variant = Standard 0.4 +weight = 0 [values] -layer_height_0 = =round(0.67*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.4 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 55 -speed_wall = =math.ceil(speed_print * 40/55) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 37/55) -speed_layer_0 = =math.ceil(speed_print * 27/55) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 7 * layer_height 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 + 7 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 95 material_print_temperature = =default_material_print_temperature + 2 material_print_temperature_layer_0 = =default_material_print_temperature + 0 -material_flow = 95 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 27/55) +speed_print = 55 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_wall = =math.ceil(speed_print * 40/55) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ACETATE_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ACETATE_C.inst.cfg index 5245b7abb9..7bcc716461 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ACETATE_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ACETATE_C.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_acetate +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = -1 -material = emotiontech_acetate variant = Standard 0.4 +weight = -1 [values] -layer_height_0 = =round(0.75*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.4 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 60 -speed_wall = =math.ceil(speed_print * 45/60) -speed_wall_0 = =math.ceil(speed_wall * 33/45) -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_full_at_height = =layer_height_0 + 5 * layer_height 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 + 5 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 93 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -material_flow = 93 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_print = 60 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_wall = =math.ceil(speed_print * 45/60) +speed_wall_0 = =math.ceil(speed_wall * 33/45) +support_angle = 50 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_A.inst.cfg index 3fa1a22a28..7509b70a8f 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_A.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = A definition = strateo3d +name = A +version = 4 [metadata] +material = emotiontech_asax +quality_type = a setting_version = 20 type = quality -quality_type = a -weight = 1 -material = emotiontech_asax variant = Standard 0.4 +weight = 1 [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_full_at_height = =layer_height_0 + 19 * layer_height cool_fan_speed = 40 cool_fan_speed_max = 75 -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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 65 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 100 material_print_temperature = =default_material_print_temperature + 1 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -material_flow = 100 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +support_angle = 65 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 support_xy_distance = =line_width * 1.5 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_B.inst.cfg index 5006d0d5ff..30af644e74 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_B.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_asax +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 0 -material = emotiontech_asax variant = Standard 0.4 +weight = 0 [values] -layer_height_0 = =round(0.67*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 = 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_full_at_height = =layer_height_0 + 14 * layer_height cool_fan_speed = 40 cool_fan_speed_max = 75 -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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 60 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 96 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_flow = 96 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 15 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_print = 55 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +support_angle = 60 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 support_xy_distance = =line_width * 1.5 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_C.inst.cfg index 1243b4ccc0..7dac975c5c 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ASA-X_C.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_asax +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = -1 -material = emotiontech_asax variant = Standard 0.4 +weight = -1 [values] -layer_height_0 = =round(0.75*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 = 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_full_at_height = =layer_height_0 + 9 * layer_height cool_fan_speed = 40 cool_fan_speed_max = 75 -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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 91 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 7 -material_flow = 91 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 20 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_print = 60 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +support_angle = 55 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 support_xy_distance = =line_width * 1.5 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_BVOH_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_BVOH_A.inst.cfg index d96fe75972..c92c18f7e9 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_BVOH_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_BVOH_A.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = A definition = strateo3d +name = A +version = 4 [metadata] +material = emotiontech_bvoh +quality_type = a setting_version = 20 type = quality -quality_type = a -weight = 1 -material = emotiontech_bvoh variant = Standard 0.4 +weight = 1 [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.4 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 14 * layer_height 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 + 14 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_BVOH_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_BVOH_B.inst.cfg index 21f87e0abf..cf553e5458 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_BVOH_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_BVOH_B.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_bvoh +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 0 -material = emotiontech_bvoh variant = Standard 0.4 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.4 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 9 * layer_height 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 + 9 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 97 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 15 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_BVOH_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_BVOH_C.inst.cfg index 336cf8627b..967e6ca967 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_BVOH_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_BVOH_C.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_bvoh +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = -1 -material = emotiontech_bvoh variant = Standard 0.4 +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.4 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 97 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 20 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_COPA_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_COPA_A.inst.cfg index 3d579a6f78..3650959b61 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_COPA_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_COPA_A.inst.cfg @@ -1,62 +1,63 @@ [general] -version = 4 -name = A definition = strateo3d +name = A +version = 4 [metadata] +material = emotiontech_copa +quality_type = a setting_version = 20 type = quality -quality_type = a -weight = 1 -material = emotiontech_copa variant = Standard 0.4 +weight = 1 [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 -wall_line_count = 3 -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 +bridge_fan_speed = 80 +bridge_settings_enabled = True +bridge_skin_density = 80 +bridge_skin_material_flow = 60 +bridge_skin_speed = 8 +bridge_wall_coast = 50 +bridge_wall_material_flow = 50 +bridge_wall_speed = 8 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed = 20 cool_fan_speed_max = 80 -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 = 2 cool_lift_head = True -support_angle = 45 -material_print_temperature = =default_material_print_temperature -material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_initial_print_temperature = =default_material_print_temperature +cool_min_layer_time = 2 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 2 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_final_print_temperature = =default_material_print_temperature material_flow = 91 -skin_material_flow = 92 +material_initial_print_temperature = =default_material_print_temperature +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +meshfix_maximum_deviation = 0.04 +meshfix_maximum_resolution = 0.5 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width +skin_material_flow = 92 skin_overlap = 10 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_print = 35 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +support_angle = 45 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 -bridge_settings_enabled = True -bridge_wall_coast = 50 -bridge_wall_speed = 8 -bridge_wall_material_flow = 50 -bridge_skin_speed = 8 -bridge_skin_material_flow = 60 -bridge_skin_density = 80 -bridge_fan_speed = 80 -meshfix_maximum_resolution = 0.5 -meshfix_maximum_deviation = 0.04 \ No newline at end of file +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 3 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_COPA_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_COPA_B.inst.cfg index 17a7e20691..fd7979000a 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_COPA_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_COPA_B.inst.cfg @@ -1,62 +1,63 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_copa +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 0 -material = emotiontech_copa variant = Standard 0.4 +weight = 0 [values] -layer_height_0 = =round(0.67*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 -wall_line_count = 3 -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 +bridge_fan_speed = 80 +bridge_settings_enabled = True +bridge_skin_density = 80 +bridge_skin_material_flow = 60 +bridge_skin_speed = 8 +bridge_wall_coast = 50 +bridge_wall_material_flow = 50 +bridge_wall_speed = 8 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed = 20 cool_fan_speed_max = 80 -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 = 2 cool_lift_head = True -support_angle = 60 -material_print_temperature = =default_material_print_temperature -material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_initial_print_temperature = =default_material_print_temperature +cool_min_layer_time = 2 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 2 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_final_print_temperature = =default_material_print_temperature material_flow = 91 -skin_material_flow = 92 +material_initial_print_temperature = =default_material_print_temperature +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +meshfix_maximum_deviation = 0.04 +meshfix_maximum_resolution = 0.5 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width +skin_material_flow = 92 skin_overlap = 15 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_print = 35 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +support_angle = 60 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 -bridge_settings_enabled = True -bridge_wall_coast = 50 -bridge_wall_speed = 8 -bridge_wall_material_flow = 50 -bridge_skin_speed = 8 -bridge_skin_material_flow = 60 -bridge_skin_density = 80 -bridge_fan_speed = 80 -meshfix_maximum_resolution = 0.5 -meshfix_maximum_deviation = 0.04 \ No newline at end of file +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 3 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_COPA_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_COPA_C.inst.cfg index b52b34c3a5..c088d92a77 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_COPA_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_COPA_C.inst.cfg @@ -1,62 +1,63 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_copa +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = -1 -material = emotiontech_copa variant = Standard 0.4 +weight = -1 [values] -layer_height_0 = =round(0.75*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 -wall_line_count = 3 -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 +bridge_fan_speed = 80 +bridge_settings_enabled = True +bridge_skin_density = 80 +bridge_skin_material_flow = 60 +bridge_skin_speed = 8 +bridge_wall_coast = 50 +bridge_wall_material_flow = 50 +bridge_wall_speed = 8 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed = 20 cool_fan_speed_max = 80 -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 = 2 cool_lift_head = True -support_angle = 60 -material_print_temperature = =default_material_print_temperature -material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_initial_print_temperature = =default_material_print_temperature +cool_min_layer_time = 2 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 2 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_final_print_temperature = =default_material_print_temperature material_flow = 91 -skin_material_flow = 92 +material_initial_print_temperature = =default_material_print_temperature +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +meshfix_maximum_deviation = 0.04 +meshfix_maximum_resolution = 0.5 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width +skin_material_flow = 92 skin_overlap = 20 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_print = 35 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +support_angle = 60 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 -bridge_settings_enabled = True -bridge_wall_coast = 50 -bridge_wall_speed = 8 -bridge_wall_material_flow = 50 -bridge_skin_speed = 8 -bridge_skin_material_flow = 60 -bridge_skin_density = 80 -bridge_fan_speed = 80 -meshfix_maximum_resolution = 0.5 -meshfix_maximum_deviation = 0.04 \ No newline at end of file +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 3 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_A.inst.cfg index 644a55b307..97647276ce 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_A.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = A definition = strateo3d +name = A +version = 4 [metadata] +material = emotiontech_hips +quality_type = a setting_version = 20 type = quality -quality_type = a -weight = 1 -material = emotiontech_hips variant = Standard 0.4 +weight = 1 [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.4 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 14 * layer_height 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 + 14 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_B.inst.cfg index 6eeff451a7..235c91b3c4 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_B.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_hips +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 0 -material = emotiontech_hips variant = Standard 0.4 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.4 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 9 * layer_height 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 + 9 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 97 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 15 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_C.inst.cfg index e1aae2bbff..29658407fb 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_HIPS_C.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_hips +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = -1 -material = emotiontech_hips variant = Standard 0.4 +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.4 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 97 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 20 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PC_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PC_A.inst.cfg index 7db31bb2fe..502a4d4f49 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PC_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PC_A.inst.cfg @@ -1,61 +1,60 @@ [general] -version = 4 -name = A definition = strateo3d +name = A +version = 4 [metadata] +material = emotiontech_pc +quality_type = a setting_version = 20 type = quality -quality_type = a -weight = 1 -material = emotiontech_pc variant = Standard 0.4 +weight = 1 [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 = 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 +adhesion_type = brim +bridge_fan_speed = 100 +bridge_settings_enabled = True +bridge_skin_density = 80 +bridge_skin_material_flow = 100 +bridge_skin_speed = 12.5 +bridge_wall_coast = 50 +bridge_wall_material_flow = 50 +bridge_wall_speed = 12 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height 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 +cool_min_layer_time = 2 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 12 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 88 material_print_temperature = 260 material_print_temperature_layer_0 = 265 -material_flow = 88 -wall_line_count = 3 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_speed = 30 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width +retraction_speed = 30 skin_overlap = 10 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_print = 35 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +support_angle = 60 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 3 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PC_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PC_B.inst.cfg index f0cc4d5918..0308deef89 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PC_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PC_B.inst.cfg @@ -1,61 +1,60 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_pc +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 0 -material = emotiontech_pc variant = Standard 0.4 +weight = 0 [values] -layer_height_0 = =round(0.67*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 = 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 +adhesion_type = brim +bridge_fan_speed = 100 +bridge_settings_enabled = True +bridge_skin_density = 80 +bridge_skin_material_flow = 100 +bridge_skin_speed = 12.5 +bridge_wall_coast = 50 +bridge_wall_material_flow = 50 +bridge_wall_speed = 12 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height 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 +cool_min_layer_time = 2 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 12 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 88 material_print_temperature = 270 material_print_temperature_layer_0 = 275 -material_flow = 88 -wall_line_count = 3 -retraction_speed = 30 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width +retraction_speed = 30 skin_overlap = 15 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_print = 35 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +support_angle = 60 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 3 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 -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/strateo3d/Standard_0.4/s3d_std0.4_PC_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PC_C.inst.cfg index c7c3e22b9b..6fc108c547 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PC_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PC_C.inst.cfg @@ -1,61 +1,60 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_pc +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = -1 -material = emotiontech_pc variant = Standard 0.4 +weight = -1 [values] -layer_height_0 = =round(0.75*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 = 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 +adhesion_type = brim +bridge_fan_speed = 100 +bridge_settings_enabled = True +bridge_skin_density = 80 +bridge_skin_material_flow = 100 +bridge_skin_speed = 12.5 +bridge_wall_coast = 50 +bridge_wall_material_flow = 50 +bridge_wall_speed = 12 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height 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 +cool_min_layer_time = 2 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 12 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 88 material_print_temperature = 270 material_print_temperature_layer_0 = 275 -material_flow = 88 -wall_line_count = 3 -retraction_speed = 30 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width +retraction_speed = 30 skin_overlap = 20 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_print = 35 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +support_angle = 60 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 3 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 -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/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg index 3ee7392285..d9df15b1b2 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = A definition = strateo3d +name = A +version = 4 [metadata] +material = emotiontech_petg +quality_type = a setting_version = 20 type = quality -quality_type = a -weight = 1 -material = emotiontech_petg variant = Standard 0.4 +weight = 1 [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_full_at_height = =layer_height_0 + 3 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 65 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 98 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 98 +prime_tower_enable = True retraction_extra_prime_amount = 0 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +support_angle = 65 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg index 0912abb272..3df350a4e8 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_petg +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 0 -material = emotiontech_petg variant = Standard 0.4 +weight = 0 [values] -layer_height_0 = =round(0.67*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 = 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_full_at_height = =layer_height_0 + 3 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 60 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 95 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 95 +prime_tower_enable = True retraction_extra_prime_amount = 0 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 15 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_print = 55 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +support_angle = 60 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg index ae0b946069..d2da75d031 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_petg +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = -1 -material = emotiontech_petg variant = Standard 0.4 +weight = -1 [values] -layer_height_0 = =round(0.75*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 = 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_full_at_height = =layer_height_0 + 3 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 91 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature +5 -material_flow = 91 +prime_tower_enable = True retraction_extra_prime_amount = 0 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 20 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_print = 60 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +support_angle = 55 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg index ce99127268..470329e5d7 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = A definition = strateo3d +name = A +version = 4 [metadata] +material = emotiontech_pla +quality_type = a setting_version = 20 type = quality -quality_type = a -weight = 1 -material = emotiontech_pla variant = Standard 0.4 +weight = 1 [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_full_at_height = =layer_height_0 + 2 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 65 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 98 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -5 -material_flow = 98 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +support_angle = 65 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg index b92a6c6196..d90fae569e 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_pla +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 0 -material = emotiontech_pla variant = Standard 0.4 +weight = 0 [values] -layer_height_0 = =round(0.67*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 = 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_full_at_height = =layer_height_0 + 2 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 60 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 95 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 95 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 15 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_print = 55 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +support_angle = 60 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg index 6e3d42528f..d689743f45 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_pla +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = -1 -material = emotiontech_pla variant = Standard 0.4 +weight = -1 [values] -layer_height_0 = =round(0.75*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 = 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_full_at_height = =layer_height_0 + 2 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 91 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_flow = 91 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 20 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_print = 60 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +support_angle = 55 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_HT_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_HT_A.inst.cfg index 0c4b34c748..21ac5f153c 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_HT_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_HT_A.inst.cfg @@ -1,55 +1,56 @@ [general] -version = 4 -name = A definition = strateo3d +name = A +version = 4 [metadata] +material = emotiontech_pla_hr_870 +quality_type = a setting_version = 20 type = quality -quality_type = a -weight = 1 -material = emotiontech_pla_hr_870 variant = Standard 0.4 +weight = 1 [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 -wall_line_count = 3 -speed_print = 30 -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_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed = 100 cool_fan_speed_max = 100 -cool_min_layer_time_fan_speed_max = 20 +cool_lift_head = True cool_min_layer_time = 2 -cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 4 -support_angle = 65 -material_print_temperature = =default_material_print_temperature + 5 -material_print_temperature_layer_0 = =default_material_print_temperature + 10 -material_initial_print_temperature = =default_material_print_temperature + 5 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_final_print_temperature = =default_material_print_temperature + 5 material_flow = 91 -skin_material_flow = 92 +material_initial_print_temperature = =default_material_print_temperature + 5 +material_print_temperature = =default_material_print_temperature + 5 +material_print_temperature_layer_0 = =default_material_print_temperature + 10 +meshfix_maximum_deviation = 0.04 +meshfix_maximum_resolution = 0.5 +prime_tower_enable = True retraction_amount = 2 retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width +skin_material_flow = 92 skin_overlap = 10 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_print = 30 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +support_angle = 65 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 -meshfix_maximum_resolution = 0.5 -meshfix_maximum_deviation = 0.04 -cool_lift_head = True \ No newline at end of file +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 3 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_HT_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_HT_B.inst.cfg index 260f7cde66..d0fb8b0cb8 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_HT_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_HT_B.inst.cfg @@ -1,54 +1,55 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_pla_hr_870 +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 0 -material = emotiontech_pla_hr_870 variant = Standard 0.4 +weight = 0 [values] -layer_height_0 = =round(0.67*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 = 40 -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_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed = 100 cool_fan_speed_max = 100 -cool_min_layer_time_fan_speed_max = 20 +cool_lift_head = True cool_min_layer_time = 2 -cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 4 -support_angle = 60 -material_print_temperature = =default_material_print_temperature -material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_initial_print_temperature = =default_material_print_temperature +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_final_print_temperature = =default_material_print_temperature material_flow = 91 -skin_material_flow = 92 +material_initial_print_temperature = =default_material_print_temperature +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +meshfix_maximum_deviation = 0.04 +meshfix_maximum_resolution = 0.5 +prime_tower_enable = True retraction_amount = 2 retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width +skin_material_flow = 92 skin_overlap = 15 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +support_angle = 60 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 -meshfix_maximum_resolution = 0.5 -meshfix_maximum_deviation = 0.04 -cool_lift_head = True \ No newline at end of file +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_HT_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_HT_C.inst.cfg index 49cce02b03..ca3c3411a9 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_HT_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_HT_C.inst.cfg @@ -1,54 +1,55 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_pla_hr_870 +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = -1 -material = emotiontech_pla_hr_870 variant = Standard 0.4 +weight = -1 [values] -layer_height_0 = =round(0.75*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 = 40 -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_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed = 100 cool_fan_speed_max = 100 -cool_min_layer_time_fan_speed_max = 20 +cool_lift_head = True cool_min_layer_time = 2 -cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 4 -support_angle = 55 -material_print_temperature = =default_material_print_temperature -material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_initial_print_temperature = =default_material_print_temperature +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 material_final_print_temperature = =default_material_print_temperature material_flow = 91 -skin_material_flow = 92 +material_initial_print_temperature = =default_material_print_temperature +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +meshfix_maximum_deviation = 0.04 +meshfix_maximum_resolution = 0.5 +prime_tower_enable = True retraction_amount = 2 retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width +skin_material_flow = 92 skin_overlap = 20 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +support_angle = 55 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 -meshfix_maximum_resolution = 0.5 -meshfix_maximum_deviation = 0.04 -cool_lift_head = True \ No newline at end of file +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg index 295013a5b1..38a448d646 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_A.inst.cfg @@ -1,50 +1,51 @@ - [general] -version = 4 -name = A +[general] definition = strateo3d +name = A +version = 4 [metadata] +material = emotiontech_pva-m +quality_type = a setting_version = 20 type = quality -quality_type = a -weight = 1 -material = emotiontech_pva-m variant = Standard 0.4 +weight = 1 [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.4 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 14 * layer_height 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 + 14 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg index 8984f88369..c23f33ebc0 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_B.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_pva-m +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 0 -material = emotiontech_pva-m variant = Standard 0.4 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.4 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 9 * layer_height 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 + 9 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 97 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 15 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg index 15b70f99d6..c2b31fc2a2 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-M_C.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_pva-m +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = -1 -material = emotiontech_pva-m variant = Standard 0.4 +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.4 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 97 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 20 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg index 47d9f1c471..34be469af4 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_A.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = A definition = strateo3d +name = A +version = 4 [metadata] +material = emotiontech_pva-s +quality_type = a setting_version = 20 type = quality -quality_type = a -weight = 1 -material = emotiontech_pva-s variant = Standard 0.4 +weight = 1 [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.4 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 14 * layer_height 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 + 14 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg index 3aeb4cd7c3..2f71a0ef59 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_B.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_pva-s +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 0 -material = emotiontech_pva-s variant = Standard 0.4 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.4 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 9 * layer_height 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 + 9 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 97 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 15 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg index 8c1ec211ec..a6ec061371 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PVA-S_C.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_pva-s +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = -1 -material = emotiontech_pva-s variant = Standard 0.4 +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.4 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +material_flow = 97 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 20 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.4 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg index a5851bb08a..7f9718d83e 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_A.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = A definition = strateo3d +name = A +version = 4 [metadata] +material = emotiontech_tpu98a +quality_type = a setting_version = 20 type = quality -quality_type = a -weight = 1 -material = emotiontech_tpu98a variant = Standard 0.4 +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.38 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.38 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.38 -wall_0_wipe_dist = =machine_nozzle_size/2 -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_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +material_flow = 107 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature - 3 -material_flow = 107 +prime_tower_enable = True retraction_extra_prime_amount = 0.2 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = False +retraction_min_travel = =3*line_width skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 20/30) +speed_print = 30 +speed_slowdown_layers = 1 +speed_topbottom = =math.ceil(speed_print * 25/30) +speed_wall = =math.ceil(speed_print * 30/30) +speed_wall_0 = =math.ceil(speed_print * 25/30) +support_angle = 50 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 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 -prime_tower_enable = True \ No newline at end of file +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.38 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg index 7122c0ab00..50551c25b9 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_B.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_tpu98a +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 0 -material = emotiontech_tpu98a variant = Standard 0.4 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.38 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.38 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.38 -wall_0_wipe_dist = =machine_nozzle_size/2 -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_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +material_flow = 103 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 103 +prime_tower_enable = True retraction_extra_prime_amount = 0.2 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = False +retraction_min_travel = =3*line_width skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 20/35) +speed_print = 35 +speed_slowdown_layers = 1 +speed_topbottom = =math.ceil(speed_print * 25/35) +speed_wall = =math.ceil(speed_print * 35/35) +speed_wall_0 = =math.ceil(speed_print * 27/35) +support_angle = 50 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 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 -prime_tower_enable = True \ No newline at end of file +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.38 + diff --git a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg index 90ca2a2569..d261ada993 100644 --- a/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.4/s3d_std0.4_TPU98A_C.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_tpu98a +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = -1 -material = emotiontech_tpu98a variant = Standard 0.4 +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.38 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.38 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.38 -wall_0_wipe_dist = =machine_nozzle_size/2 -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_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +material_flow = 101 material_print_temperature = =default_material_print_temperature + 7 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -material_flow = 101 +prime_tower_enable = True retraction_extra_prime_amount = 0.2 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = False +retraction_min_travel = =3*line_width skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 1 +speed_topbottom = =math.ceil(speed_print * 27/40) +speed_wall = =math.ceil(speed_print * 40/40) +speed_wall_0 = =math.ceil(speed_print * 30/40) +support_angle = 50 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 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 -prime_tower_enable = True \ No newline at end of file +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.38 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.38 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS-X_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS-X_B.inst.cfg index afabd0c36e..c7baf8b128 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS-X_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS-X_B.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_absx +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 1 -material = emotiontech_absx variant = Standard 0.6 +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 50 -speed_wall = =math.ceil(speed_print * 37/50) -speed_wall_0 = =math.ceil(speed_wall * 27/43) -speed_topbottom = =math.ceil(speed_print * 33/50) -speed_layer_0 = =math.ceil(speed_print * 20/50) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +material_flow = 100 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 100 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 33/50) +speed_wall = =math.ceil(speed_print * 37/50) +speed_wall_0 = =math.ceil(speed_wall * 27/43) +support_angle = 55 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS-X_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS-X_C.inst.cfg index 19578873a9..e3d11c3032 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS-X_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS-X_C.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_absx +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = 0 -material = emotiontech_absx variant = Standard 0.6 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 55 -speed_wall = =math.ceil(speed_print * 40/55) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 35/55) -speed_layer_0 = =math.ceil(speed_print * 23/55) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +material_flow = 98 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -material_flow = 98 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 23/55) +speed_print = 55 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/55) +speed_wall = =math.ceil(speed_print * 40/55) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 50 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS-X_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS-X_D.inst.cfg index c9227d4688..f2fa1294bc 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS-X_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS-X_D.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_absx +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = -1 -material = emotiontech_absx variant = Standard 0.6 +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 60 -speed_wall = =math.ceil(speed_print * 43/60) -speed_wall_0 = =math.ceil(speed_wall * 33/43) -speed_topbottom = =math.ceil(speed_print * 37/60) -speed_layer_0 = =math.ceil(speed_print * 25/60) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +material_flow = 96 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_flow = 96 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/60) +speed_print = 60 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 37/60) +speed_wall = =math.ceil(speed_print * 43/60) +speed_wall_0 = =math.ceil(speed_wall * 33/43) +support_angle = 45 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg index 0834364f06..d5191b521e 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_B.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_abs +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 1 -material = emotiontech_abs variant = Standard 0.6 +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 50 -speed_wall = =math.ceil(speed_print * 37/50) -speed_wall_0 = =math.ceil(speed_wall * 27/43) -speed_topbottom = =math.ceil(speed_print * 33/50) -speed_layer_0 = =math.ceil(speed_print * 20/50) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +material_flow = 100 material_print_temperature = =default_material_print_temperature + 1 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 100 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 33/50) +speed_wall = =math.ceil(speed_print * 37/50) +speed_wall_0 = =math.ceil(speed_wall * 27/43) +support_angle = 55 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg index 392341e8ac..4cc2641df5 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_C.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_abs +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = 0 -material = emotiontech_abs variant = Standard 0.6 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 55 -speed_wall = =math.ceil(speed_print * 40/55) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 35/55) -speed_layer_0 = =math.ceil(speed_print * 23/55) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +material_flow = 98 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature + 1 -material_flow = 98 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 23/55) +speed_print = 55 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/55) +speed_wall = =math.ceil(speed_print * 40/55) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 50 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg index 93f3e180af..faa8223291 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ABS_D.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_abs +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = -1 -material = emotiontech_abs variant = Standard 0.6 +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 60 -speed_wall = =math.ceil(speed_print * 43/60) -speed_wall_0 = =math.ceil(speed_wall * 33/43) -speed_topbottom = =math.ceil(speed_print * 37/60) -speed_layer_0 = =math.ceil(speed_print * 25/60) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +material_flow = 96 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -material_flow = 96 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/60) +speed_print = 60 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 37/60) +speed_wall = =math.ceil(speed_print * 43/60) +speed_wall_0 = =math.ceil(speed_wall * 33/43) +support_angle = 45 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ACETATE_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ACETATE_B.inst.cfg index 557c650a5b..44a553cdfc 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ACETATE_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ACETATE_B.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_acetate +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 1 -material = emotiontech_acetate variant = Standard 0.6 +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 50 -speed_wall = =math.ceil(speed_print * 37/50) -speed_wall_0 = =math.ceil(speed_wall * 30/37) -speed_topbottom = =math.ceil(speed_print * 33/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height 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 + 2 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 60 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +material_flow = 95 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 95 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 33/50) +speed_wall = =math.ceil(speed_print * 37/50) +speed_wall_0 = =math.ceil(speed_wall * 30/37) +support_angle = 60 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ACETATE_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ACETATE_C.inst.cfg index b179a77935..991e81e6f8 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ACETATE_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ACETATE_C.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_acetate +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = 0 -material = emotiontech_acetate variant = Standard 0.6 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 55 -speed_wall = =math.ceil(speed_print * 40/55) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 37/55) -speed_layer_0 = =math.ceil(speed_print * 27/55) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height 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 + 2 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +material_flow = 93 material_print_temperature = =default_material_print_temperature + 2 material_print_temperature_layer_0 = =default_material_print_temperature + 0 -material_flow = 93 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 27/55) +speed_print = 55 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_wall = =math.ceil(speed_print * 40/55) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ACETATE_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ACETATE_D.inst.cfg index d0e92c138c..d676eb927b 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ACETATE_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ACETATE_D.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_acetate +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = -1 -material = emotiontech_acetate variant = Standard 0.6 +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 60 -speed_wall = =math.ceil(speed_print * 45/60) -speed_wall_0 = =math.ceil(speed_wall * 33/45) -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_full_at_height = =layer_height_0 + 2 * layer_height 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 + 2 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +material_flow = 91 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -material_flow = 91 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_print = 60 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_wall = =math.ceil(speed_print * 45/60) +speed_wall_0 = =math.ceil(speed_wall * 33/45) +support_angle = 50 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg index 4a38b97d3e..299624df90 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_B.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_asax +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 1 -material = emotiontech_asax variant = Standard 0.6 +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 50 -speed_wall = =math.ceil(speed_print * 37/50) -speed_wall_0 = =math.ceil(speed_wall * 30/37) -speed_topbottom = =math.ceil(speed_print * 35/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height cool_fan_speed = 40 cool_fan_speed_max = 75 -cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 -cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 60 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +material_flow = 101 material_print_temperature = =default_material_print_temperature + 1 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -material_flow = 101 +prime_tower_enable = True retraction_extra_prime_amount = 0.2 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 37/50) +speed_wall_0 = =math.ceil(speed_wall * 30/37) +support_angle = 60 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 support_xy_distance = =line_width * 1.5 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg index 5f111cfdb8..9e6bde48fc 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_C.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_asax +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = 0 -material = emotiontech_asax variant = Standard 0.6 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 55 -speed_wall = =math.ceil(speed_print * 40/55) -speed_wall_0 = =math.ceil(speed_wall * 33/40) -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_full_at_height = =layer_height_0 + 6 * layer_height cool_fan_speed = 40 cool_fan_speed_max = 75 -cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 -cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +material_flow = 99 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_flow = 99 +prime_tower_enable = True retraction_extra_prime_amount = 0.2 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_print = 55 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_wall = =math.ceil(speed_print * 40/55) +speed_wall_0 = =math.ceil(speed_wall * 33/40) +support_angle = 55 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg index 9da0a57200..3345b7030e 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_ASA-X_D.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_asax +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = -1 -material = emotiontech_asax variant = Standard 0.6 +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 60 -speed_wall = =math.ceil(speed_print * 43/60) -speed_wall_0 = =math.ceil(speed_wall * 35/45) -speed_topbottom = =math.ceil(speed_print * 40/60) -speed_layer_0 = =math.ceil(speed_print * 25/60) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height cool_fan_speed = 40 cool_fan_speed_max = 75 -cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 -cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +material_flow = 97 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 7 -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.2 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/60) +speed_print = 60 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_wall = =math.ceil(speed_print * 43/60) +speed_wall_0 = =math.ceil(speed_wall * 35/45) +support_angle = 50 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_BVOH_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_BVOH_B.inst.cfg index d56f2386fe..438db52bd0 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_BVOH_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_BVOH_B.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_bvoh +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 1 -material = emotiontech_bvoh variant = Standard 0.6 +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +material_flow = 95 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 95 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_BVOH_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_BVOH_C.inst.cfg index 259cb146bd..910e730fd1 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_BVOH_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_BVOH_C.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_bvoh +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = 0 -material = emotiontech_bvoh variant = Standard 0.6 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +material_flow = 95 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 95 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_BVOH_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_BVOH_D.inst.cfg index b65acc22ba..a77f8d10a4 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_BVOH_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_BVOH_D.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_bvoh +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = -1 -material = emotiontech_bvoh variant = Standard 0.6 +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +material_flow = 95 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 95 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_COPA_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_COPA_B.inst.cfg index d65b84bb98..40eb9139e1 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_COPA_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_COPA_B.inst.cfg @@ -1,64 +1,65 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_copa +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 1 -material = emotiontech_copa variant = Standard 0.6 +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -wall_0_wipe_dist = =machine_nozzle_size/2 -wall_line_count = 3 -speed_print = 35 -speed_wall = =math.ceil(speed_print * 37/50) -speed_wall_0 = =math.ceil(speed_wall * 30/37) -speed_topbottom = =math.ceil(speed_print * 33/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 +bridge_fan_speed = 80 +bridge_settings_enabled = True +bridge_skin_density = 80 +bridge_skin_material_flow = 60 +bridge_skin_speed = 10 +bridge_wall_coast = 50 +bridge_wall_material_flow = 50 +bridge_wall_speed = 10 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed = 20 cool_fan_speed_max = 80 -cool_min_layer_time_fan_speed_max = 20 -cool_min_layer_time = 3 -cool_fan_full_at_height = =layer_height_0 + 2 * layer_height -cool_min_speed = 4 cool_lift_head = True -support_angle = 45 -material_print_temperature = =default_material_print_temperature -material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_initial_print_temperature = =default_material_print_temperature +cool_min_layer_time = 3 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 4 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_final_print_temperature = =default_material_print_temperature material_flow = 90 -skin_material_flow = 92 -retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width -retraction_hop_only_when_collides = True -skin_overlap = 5 -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 +material_initial_print_temperature = =default_material_print_temperature +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +meshfix_maximum_deviation = 0.04 +meshfix_maximum_resolution = 0.5 prime_tower_enable = True retraction_amount = 3 +retraction_extra_prime_amount = 0.1 +retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width retraction_speed = 35 -bridge_settings_enabled = True -bridge_wall_coast = 50 -bridge_wall_speed = 10 -bridge_wall_material_flow = 50 -bridge_skin_speed = 10 -bridge_skin_material_flow = 60 -bridge_skin_density = 80 -bridge_fan_speed = 80 -meshfix_maximum_resolution = 0.5 -meshfix_maximum_deviation = 0.04 \ No newline at end of file +skin_material_flow = 92 +skin_overlap = 5 +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 35 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 33/50) +speed_wall = =math.ceil(speed_print * 37/50) +speed_wall_0 = =math.ceil(speed_wall * 30/37) +support_angle = 45 +support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 3 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_COPA_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_COPA_C.inst.cfg index 94ec3e6142..2e40fa4052 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_COPA_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_COPA_C.inst.cfg @@ -1,64 +1,65 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_copa +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = 0 -material = emotiontech_copa variant = Standard 0.6 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -wall_0_wipe_dist = =machine_nozzle_size/2 -wall_line_count = 3 -speed_print = 35 -speed_wall = =math.ceil(speed_print * 40/55) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 37/55) -speed_layer_0 = =math.ceil(speed_print * 27/55) -speed_slowdown_layers = 2 +bridge_fan_speed = 80 +bridge_settings_enabled = True +bridge_skin_density = 80 +bridge_skin_material_flow = 60 +bridge_skin_speed = 10 +bridge_wall_coast = 50 +bridge_wall_material_flow = 50 +bridge_wall_speed = 10 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed = 20 cool_fan_speed_max = 80 -cool_min_layer_time_fan_speed_max = 20 -cool_min_layer_time = 3 -cool_fan_full_at_height = =layer_height_0 + 2 * layer_height -cool_min_speed = 4 cool_lift_head = True -support_angle = 45 -material_print_temperature = =default_material_print_temperature -material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_initial_print_temperature = =default_material_print_temperature +cool_min_layer_time = 3 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 4 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_final_print_temperature = =default_material_print_temperature material_flow = 90 -skin_material_flow = 92 -retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width -retraction_hop_only_when_collides = True -skin_overlap = 5 -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 +material_initial_print_temperature = =default_material_print_temperature +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +meshfix_maximum_deviation = 0.04 +meshfix_maximum_resolution = 0.5 prime_tower_enable = True retraction_amount = 3 +retraction_extra_prime_amount = 0.1 +retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width retraction_speed = 35 -bridge_settings_enabled = True -bridge_wall_coast = 50 -bridge_wall_speed = 10 -bridge_wall_material_flow = 50 -bridge_skin_speed = 10 -bridge_skin_material_flow = 60 -bridge_skin_density = 80 -bridge_fan_speed = 80 -meshfix_maximum_resolution = 0.5 -meshfix_maximum_deviation = 0.04 \ No newline at end of file +skin_material_flow = 92 +skin_overlap = 5 +speed_layer_0 = =math.ceil(speed_print * 27/55) +speed_print = 35 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_wall = =math.ceil(speed_print * 40/55) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 45 +support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 3 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_COPA_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_COPA_D.inst.cfg index 6ace0cb5b6..6d14d61282 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_COPA_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_COPA_D.inst.cfg @@ -1,64 +1,65 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_copa +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = -1 -material = emotiontech_copa variant = Standard 0.6 +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -wall_0_wipe_dist = =machine_nozzle_size/2 -wall_line_count = 3 -speed_print = 35 -speed_wall = =math.ceil(speed_print * 43/60) -speed_wall_0 = =math.ceil(speed_wall * 33/43) -speed_topbottom = =math.ceil(speed_print * 37/60) -speed_layer_0 = =math.ceil(speed_print * 25/60) -speed_slowdown_layers = 2 +bridge_fan_speed = 80 +bridge_settings_enabled = True +bridge_skin_density = 80 +bridge_skin_material_flow = 60 +bridge_skin_speed = 10 +bridge_wall_coast = 50 +bridge_wall_material_flow = 50 +bridge_wall_speed = 10 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height cool_fan_speed = 20 cool_fan_speed_max = 80 -cool_min_layer_time_fan_speed_max = 20 -cool_min_layer_time = 3 -cool_fan_full_at_height = =layer_height_0 + 6 * layer_height -cool_min_speed = 4 cool_lift_head = True -support_angle = 45 -material_print_temperature = =default_material_print_temperature -material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_initial_print_temperature = =default_material_print_temperature +cool_min_layer_time = 3 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 4 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_final_print_temperature = =default_material_print_temperature material_flow = 91 -skin_material_flow = 92 -retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width -retraction_hop_only_when_collides = True -skin_overlap = 5 -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 +material_initial_print_temperature = =default_material_print_temperature +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +meshfix_maximum_deviation = 0.04 +meshfix_maximum_resolution = 0.5 prime_tower_enable = True retraction_amount = 3 +retraction_extra_prime_amount = 0.1 +retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width retraction_speed = 35 -bridge_settings_enabled = True -bridge_wall_coast = 50 -bridge_wall_speed = 10 -bridge_wall_material_flow = 50 -bridge_skin_speed = 10 -bridge_skin_material_flow = 60 -bridge_skin_density = 80 -bridge_fan_speed = 80 -meshfix_maximum_resolution = 0.5 -meshfix_maximum_deviation = 0.04 \ No newline at end of file +skin_material_flow = 92 +skin_overlap = 5 +speed_layer_0 = =math.ceil(speed_print * 25/60) +speed_print = 35 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 37/60) +speed_wall = =math.ceil(speed_print * 43/60) +speed_wall_0 = =math.ceil(speed_wall * 33/43) +support_angle = 45 +support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 3 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_B.inst.cfg index 078ca75737..02fc70be02 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_B.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_hips +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 1 -material = emotiontech_hips variant = Standard 0.6 +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 9 * layer_height 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 + 9 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +material_flow = 95 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 95 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_C.inst.cfg index 7549e513b8..c8717c411e 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_C.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_hips +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = 0 -material = emotiontech_hips variant = Standard 0.6 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 9 * layer_height 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 + 9 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +material_flow = 95 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 95 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_D.inst.cfg index 2b97793cec..80e9f7bc38 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_HIPS_D.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_hips +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = -1 -material = emotiontech_hips variant = Standard 0.6 +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 9 * layer_height 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 + 9 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +material_flow = 95 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 95 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_Nylon-1030_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_Nylon-1030_C.inst.cfg index 8069983655..57f87b982f 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_Nylon-1030_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_Nylon-1030_C.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_nylon_1030 +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = 0 -material = emotiontech_nylon_1030 variant = Standard 0.6 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 55 -speed_wall = =math.ceil(speed_print * 40/55) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 35/55) -speed_layer_0 = =math.ceil(speed_print * 23/55) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height 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 + 4 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +material_flow = 93 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -material_flow = 93 +prime_tower_enable = True retraction_extra_prime_amount = 0 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 30 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 23/55) +speed_print = 55 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/55) +speed_wall = =math.ceil(speed_print * 40/55) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PC_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PC_B.inst.cfg index 8725b701d4..1464ac2f8c 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PC_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PC_B.inst.cfg @@ -1,59 +1,59 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_pc +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 1 -material = emotiontech_pc variant = Standard 0.6 +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 37/50) -speed_wall_0 = =math.ceil(speed_wall * 30/37) -speed_topbottom = =math.ceil(speed_print * 33/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 +bridge_fan_speed = 100 +bridge_settings_enabled = True +bridge_skin_density = 100 +bridge_skin_material_flow = 80 +bridge_skin_speed = 10 +bridge_wall_coast = 50 +bridge_wall_material_flow = 75 +bridge_wall_speed = 10 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed = 20 cool_fan_speed_max = 20 -cool_min_layer_time_fan_speed_max = 20 -cool_min_layer_time = 3 -cool_fan_full_at_height = =layer_height_0 + 2 * layer_height -cool_min_speed = 8 cool_lift_head = true -support_angle = 60 -material_print_temperature = 270 -material_print_temperature_layer_0 = 275 +cool_min_layer_time = 3 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 8 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 87 -retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width -retraction_hop_only_when_collides = True -skin_overlap = 5 -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 +material_print_temperature = 270 +material_print_temperature_layer_0 = 275 prime_tower_enable = True retraction_amount = 2 +retraction_extra_prime_amount = 0.1 +retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width retraction_speed = 25 +skin_overlap = 5 +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 33/50) +speed_wall = =math.ceil(speed_print * 37/50) +speed_wall_0 = =math.ceil(speed_wall * 30/37) +support_angle = 60 +support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -bridge_settings_enabled = True -bridge_wall_coast = 50 -bridge_wall_speed = 10 -bridge_wall_material_flow = 75 -bridge_skin_speed = 10 -bridge_skin_material_flow = 80 -bridge_skin_density = 100 -bridge_fan_speed = 100 \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PC_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PC_C.inst.cfg index 243f705f11..d338308101 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PC_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PC_C.inst.cfg @@ -1,59 +1,59 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_pc +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = 0 -material = emotiontech_pc variant = Standard 0.6 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 40/55) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 37/55) -speed_layer_0 = =math.ceil(speed_print * 27/55) -speed_slowdown_layers = 2 +bridge_fan_speed = 100 +bridge_settings_enabled = True +bridge_skin_density = 100 +bridge_skin_material_flow = 80 +bridge_skin_speed = 10 +bridge_wall_coast = 50 +bridge_wall_material_flow = 75 +bridge_wall_speed = 10 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed = 20 cool_fan_speed_max = 20 -cool_min_layer_time_fan_speed_max = 20 -cool_min_layer_time = 3 -cool_fan_full_at_height = =layer_height_0 + 2 * layer_height -cool_min_speed = 8 cool_lift_head = true -support_angle = 60 -material_print_temperature = 270 -material_print_temperature_layer_0 = 275 +cool_min_layer_time = 3 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 8 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 87 -retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width -retraction_hop_only_when_collides = True -skin_overlap = 5 -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 +material_print_temperature = 270 +material_print_temperature_layer_0 = 275 prime_tower_enable = True retraction_amount = 2 +retraction_extra_prime_amount = 0.1 +retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width retraction_speed = 25 +skin_overlap = 5 +speed_layer_0 = =math.ceil(speed_print * 27/55) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_wall = =math.ceil(speed_print * 40/55) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 60 +support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -bridge_settings_enabled = True -bridge_wall_coast = 50 -bridge_wall_speed = 10 -bridge_wall_material_flow = 75 -bridge_skin_speed = 10 -bridge_skin_material_flow = 80 -bridge_skin_density = 100 -bridge_fan_speed = 100 \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PC_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PC_D.inst.cfg index 113e15f27e..53510dc971 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PC_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PC_D.inst.cfg @@ -1,59 +1,59 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_pc +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = -1 -material = emotiontech_pc variant = Standard 0.6 +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 43/60) -speed_wall_0 = =math.ceil(speed_wall * 33/43) -speed_topbottom = =math.ceil(speed_print * 37/60) -speed_layer_0 = =math.ceil(speed_print * 25/60) -speed_slowdown_layers = 2 +bridge_fan_speed = 100 +bridge_settings_enabled = True +bridge_skin_density = 100 +bridge_skin_material_flow = 80 +bridge_skin_speed = 10 +bridge_wall_coast = 50 +bridge_wall_material_flow = 75 +bridge_wall_speed = 10 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height cool_fan_speed = 20 cool_fan_speed_max = 20 -cool_min_layer_time_fan_speed_max = 20 -cool_min_layer_time = 3 -cool_fan_full_at_height = =layer_height_0 + 6 * layer_height -cool_min_speed = 8 cool_lift_head = true -support_angle = 60 -material_print_temperature = 270 -material_print_temperature_layer_0 = 275 +cool_min_layer_time = 3 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 8 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_flow = 87 -retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width -retraction_hop_only_when_collides = True -skin_overlap = 5 -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 +material_print_temperature = 270 +material_print_temperature_layer_0 = 275 prime_tower_enable = True retraction_amount = 2 +retraction_extra_prime_amount = 0.1 +retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width retraction_speed = 25 +skin_overlap = 5 +speed_layer_0 = =math.ceil(speed_print * 25/60) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 37/60) +speed_wall = =math.ceil(speed_print * 43/60) +speed_wall_0 = =math.ceil(speed_wall * 33/43) +support_angle = 60 +support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -bridge_settings_enabled = True -bridge_wall_coast = 50 -bridge_wall_speed = 10 -bridge_wall_material_flow = 75 -bridge_skin_speed = 10 -bridge_skin_material_flow = 80 -bridge_skin_density = 100 -bridge_fan_speed = 100 \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg index 6849955c59..9ce468bfdc 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_B.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_petg +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 1 -material = emotiontech_petg variant = Standard 0.6 +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 45 -speed_wall = =math.ceil(speed_print * 33/45) -speed_wall_0 = =math.ceil(speed_wall * 23/33) -speed_topbottom = =math.ceil(speed_print * 30/45) -speed_layer_0 = =math.ceil(speed_print * 23/45) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height cool_fan_speed = 70 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 60 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +material_flow = 93 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 93 +prime_tower_enable = True retraction_extra_prime_amount = 0 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 23/45) +speed_print = 45 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 30/45) +speed_wall = =math.ceil(speed_print * 33/45) +speed_wall_0 = =math.ceil(speed_wall * 23/33) +support_angle = 60 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg index 300997493b..37f4271374 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_C.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_petg +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = 0 -material = emotiontech_petg variant = Standard 0.6 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 50 -speed_wall = =math.ceil(speed_print * 37/50) -speed_wall_0 = =math.ceil(speed_wall * 25/37) -speed_topbottom = =math.ceil(speed_print * 33/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height cool_fan_speed = 70 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +material_flow = 92 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 92 +prime_tower_enable = True retraction_extra_prime_amount = 0 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 33/50) +speed_wall = =math.ceil(speed_print * 37/50) +speed_wall_0 = =math.ceil(speed_wall * 25/37) +support_angle = 50 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg index 6bbb554f17..577cd3f88c 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PETG_D.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_petg +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = -1 -material = emotiontech_petg variant = Standard 0.6 +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 55 -speed_wall = =math.ceil(speed_print * 40/55) -speed_wall_0 = =math.ceil(speed_wall * 27/40) -speed_topbottom = =math.ceil(speed_print * 37/55) -speed_layer_0 = =math.ceil(speed_print * 27/55) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height cool_fan_speed = 70 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +material_flow = 91 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature +5 -material_flow = 91 +prime_tower_enable = True retraction_extra_prime_amount = 0 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 27/55) +speed_print = 55 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_wall = =math.ceil(speed_print * 40/55) +speed_wall_0 = =math.ceil(speed_wall * 27/40) +support_angle = 45 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg index 95b70cc1d2..5c5d8975d1 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_B.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_pla +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 1 -material = emotiontech_pla variant = Standard 0.6 +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 50 -speed_wall = =math.ceil(speed_print * 37/50) -speed_wall_0 = =math.ceil(speed_wall * 30/37) -speed_topbottom = =math.ceil(speed_print * 33/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 60 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +material_flow = 93 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 93 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 33/50) +speed_wall = =math.ceil(speed_print * 37/50) +speed_wall_0 = =math.ceil(speed_wall * 30/37) +support_angle = 60 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg index ef05e13339..53164cc4b5 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_C.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_pla +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = 0 -material = emotiontech_pla variant = Standard 0.6 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 55 -speed_wall = =math.ceil(speed_print * 40/55) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 37/55) -speed_layer_0 = =math.ceil(speed_print * 27/55) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +material_flow = 92 material_print_temperature = =default_material_print_temperature + 8 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -material_flow = 92 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 27/55) +speed_print = 55 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_wall = =math.ceil(speed_print * 40/55) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg index 02f327d85b..9fd5c2b54c 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_D.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_pla +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = -1 -material = emotiontech_pla variant = Standard 0.6 +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 60 -speed_wall = =math.ceil(speed_print * 45/60) -speed_wall_0 = =math.ceil(speed_wall * 33/45) -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_full_at_height = =layer_height_0 + 2 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +material_flow = 91 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_flow = 91 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_print = 60 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_wall = =math.ceil(speed_print * 45/60) +speed_wall_0 = =math.ceil(speed_wall * 33/45) +support_angle = 50 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_HT_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_HT_B.inst.cfg index c70411d6f2..4378f418d8 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_HT_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_HT_B.inst.cfg @@ -1,53 +1,54 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_pla_hr_870 +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 1 -material = emotiontech_pla_hr_870 variant = Standard 0.6 +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 37/50) -speed_wall_0 = =math.ceil(speed_wall * 30/37) -speed_topbottom = =math.ceil(speed_print * 33/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed = 100 cool_fan_speed_max = 100 -cool_min_layer_time_fan_speed_max = 20 +cool_lift_head = True cool_min_layer_time = 3 -cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 2 -support_angle = 60 -material_print_temperature = =default_material_print_temperature -material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_initial_print_temperature = =default_material_print_temperature +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_final_print_temperature = =default_material_print_temperature material_flow = 90 -skin_material_flow = 91 +material_initial_print_temperature = =default_material_print_temperature +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +meshfix_maximum_deviation = 0.04 +meshfix_maximum_resolution = 0.5 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width +skin_material_flow = 91 skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 33/50) +speed_wall = =math.ceil(speed_print * 37/50) +speed_wall_0 = =math.ceil(speed_wall * 30/37) +support_angle = 60 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 -meshfix_maximum_resolution = 0.5 -meshfix_maximum_deviation = 0.04 -cool_lift_head = True \ No newline at end of file +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_HT_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_HT_C.inst.cfg index 14854403d9..f0e008aec6 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_HT_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_HT_C.inst.cfg @@ -1,53 +1,54 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_pla_hr_870 +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = 0 -material = emotiontech_pla_hr_870 variant = Standard 0.6 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 40/55) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 37/55) -speed_layer_0 = =math.ceil(speed_print * 27/55) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed = 100 cool_fan_speed_max = 100 -cool_min_layer_time_fan_speed_max = 20 +cool_lift_head = True cool_min_layer_time = 3 -cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 2 -support_angle = 55 -material_print_temperature = =default_material_print_temperature -material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_initial_print_temperature = =default_material_print_temperature +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_final_print_temperature = =default_material_print_temperature material_flow = 90 -skin_material_flow = 91 +material_initial_print_temperature = =default_material_print_temperature +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +meshfix_maximum_deviation = 0.04 +meshfix_maximum_resolution = 0.5 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width +skin_material_flow = 91 skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 27/55) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_wall = =math.ceil(speed_print * 40/55) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 -meshfix_maximum_resolution = 0.5 -meshfix_maximum_deviation = 0.04 -cool_lift_head = True +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_HT_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_HT_D.inst.cfg index 86b318a446..8ea237b405 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_HT_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PLA_HT_D.inst.cfg @@ -1,53 +1,54 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_pla_hr_870 +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = -1 -material = emotiontech_pla_hr_870 variant = Standard 0.6 +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 45/60) -speed_wall_0 = =math.ceil(speed_wall * 33/45) -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_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed = 100 cool_fan_speed_max = 100 -cool_min_layer_time_fan_speed_max = 20 +cool_lift_head = True cool_min_layer_time = 3 -cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 2 -support_angle = 50 -material_print_temperature = =default_material_print_temperature -material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_initial_print_temperature = =default_material_print_temperature +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 material_final_print_temperature = =default_material_print_temperature material_flow = 90 -skin_material_flow = 91 +material_initial_print_temperature = =default_material_print_temperature +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +meshfix_maximum_deviation = 0.04 +meshfix_maximum_resolution = 0.5 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width +skin_material_flow = 91 skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_wall = =math.ceil(speed_print * 45/60) +speed_wall_0 = =math.ceil(speed_wall * 33/45) +support_angle = 50 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 -meshfix_maximum_resolution = 0.5 -meshfix_maximum_deviation = 0.04 -cool_lift_head = True \ No newline at end of file +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.5 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg index 5bd704010d..6820f41a71 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_B.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_pva-m +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 1 -material = emotiontech_pva-m variant = Standard 0.6 +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +material_flow = 95 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 95 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg index 6fe95c8ae7..7df8acfe87 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_C.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_pva-m +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = 0 -material = emotiontech_pva-m variant = Standard 0.6 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +material_flow = 95 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 95 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg index fade22ca39..fbd6d78d39 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-M_D.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_pva-m +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = -1 -material = emotiontech_pva-m variant = Standard 0.6 +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +material_flow = 95 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 95 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg index 9079b5e607..1019b58a5e 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_B.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_pva-s +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 1 -material = emotiontech_pva-s variant = Standard 0.6 +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +material_flow = 95 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 95 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg index b4076bdab9..0af6757139 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_C.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_pva-s +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = 0 -material = emotiontech_pva-s variant = Standard 0.6 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +material_flow = 95 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 95 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg index cfa80a2d8a..4977ab4d4d 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_PVA-S_D.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_pva-s +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = -1 -material = emotiontech_pva-s variant = Standard 0.6 +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +material_flow = 95 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 95 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.6 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.6 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg index 24baf961d0..f6a55286df 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_B.inst.cfg @@ -1,48 +1,49 @@ [general] -version = 4 -name = B definition = strateo3d +name = B +version = 4 [metadata] +material = emotiontech_tpu98a +quality_type = b setting_version = 20 type = quality -quality_type = b -weight = 1 -material = emotiontech_tpu98a variant = Standard 0.6 +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_0_wipe_dist = =machine_nozzle_size -speed_print = 35 -speed_wall = =math.ceil(speed_print * 35/35) -speed_wall_0 = =math.ceil(speed_wall * 30/35) -speed_topbottom = =math.ceil(speed_print * 25/35) -speed_support = =speed_wall_0 -speed_layer_0 = =math.ceil(speed_print * 20/35) -speed_slowdown_layers = 1 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +material_flow = 105 material_print_temperature = =default_material_print_temperature + 2 material_print_temperature_layer_0 = =default_material_print_temperature - 2 -material_flow = 105 +prime_tower_enable = True retraction_extra_prime_amount = 0.2 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = False +retraction_min_travel = =3*line_width skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 20/35) +speed_print = 35 +speed_slowdown_layers = 1 +speed_support = =speed_wall_0 +speed_topbottom = =math.ceil(speed_print * 25/35) +speed_wall = =math.ceil(speed_print * 35/35) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +support_angle = 50 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 0.7 support_xy_distance = =line_width * 2.5 support_xy_distance_overhang = =wall_line_width_0 -support_offset = 0.7 -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.55 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg index aae048a512..ebf49e3d01 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_C.inst.cfg @@ -1,48 +1,49 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_tpu98a +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = 0 -material = emotiontech_tpu98a variant = Standard 0.6 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_0_wipe_dist = =machine_nozzle_size -speed_print = 40 -speed_wall = =math.ceil(speed_print * 40/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 27/40) -speed_support = =speed_wall_0 -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 1 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +material_flow = 103 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 103 +prime_tower_enable = True retraction_extra_prime_amount = 0.2 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = False +retraction_min_travel = =3*line_width skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 1 +speed_support = =speed_wall_0 +speed_topbottom = =math.ceil(speed_print * 27/40) +speed_wall = =math.ceil(speed_print * 40/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 50 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 0.7 support_xy_distance = =line_width * 2.5 support_xy_distance_overhang = =wall_line_width_0 -support_offset = 0.7 -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.55 + diff --git a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg index f4c2a1d03b..1d68001c4f 100644 --- a/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.6/s3d_std0.6_TPU98A_D.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_tpu98a +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = -1 -material = emotiontech_tpu98a variant = Standard 0.6 +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.55 -wall_0_wipe_dist = =machine_nozzle_size -speed_print = 45 -speed_wall = =math.ceil(speed_print * 45/45) -speed_wall_0 = =math.ceil(speed_wall * 33/45) -speed_topbottom = =math.ceil(speed_print * 30/45) -speed_layer_0 = =math.ceil(speed_print * 20/45) -speed_slowdown_layers = 1 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +material_flow = 101 material_print_temperature = =default_material_print_temperature + 7 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -material_flow = 101 +prime_tower_enable = True retraction_extra_prime_amount = 0.2 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = False +retraction_min_travel = =3*line_width skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 20/45) +speed_print = 45 +speed_slowdown_layers = 1 +speed_topbottom = =math.ceil(speed_print * 30/45) +speed_wall = =math.ceil(speed_print * 45/45) +speed_wall_0 = =math.ceil(speed_wall * 33/45) +support_angle = 50 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 0.7 support_xy_distance = =line_width * 2.5 support_xy_distance_overhang = =wall_line_width_0 -support_offset = 0.7 -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.55 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.55 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS-X_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS-X_C.inst.cfg index ad01e7c4a2..b55269e464 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS-X_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS-X_C.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_absx +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = 1 -material = emotiontech_absx variant = Standard 0.8 +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 50 -speed_wall = =math.ceil(speed_print * 37/50) -speed_wall_0 = =math.ceil(speed_wall * 30/37) -speed_topbottom = =math.ceil(speed_print * 35/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +material_flow = 97 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature + 1 -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 37/50) +speed_wall_0 = =math.ceil(speed_wall * 30/37) +support_angle = 55 support_bottom_distance = =layer_height +support_interface_density = 100 +support_offset = 1 support_xy_distance = =line_width * 2 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS-X_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS-X_D.inst.cfg index 7926f5e019..a175aca88d 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS-X_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS-X_D.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_absx +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = 0 -material = emotiontech_absx variant = Standard 0.8 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 50 -speed_wall = =math.ceil(speed_print * 37/50) -speed_wall_0 = =math.ceil(speed_wall * 30/37) -speed_topbottom = =math.ceil(speed_print * 35/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +material_flow = 96 material_print_temperature = =default_material_print_temperature + 7 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -material_flow = 96 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 37/50) +speed_wall_0 = =math.ceil(speed_wall * 30/37) +support_angle = 50 support_bottom_distance = =layer_height +support_interface_density = 100 +support_offset = 1 support_xy_distance = =line_width * 2 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS-X_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS-X_E.inst.cfg index 7b6319067f..9a3341197d 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS-X_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS-X_E.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = E definition = strateo3d +name = E +version = 4 [metadata] +material = emotiontech_absx +quality_type = e setting_version = 20 type = quality -quality_type = e -weight = -1 -material = emotiontech_absx variant = Standard 0.8 +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 50 -speed_wall = =math.ceil(speed_print * 37/50) -speed_wall_0 = =math.ceil(speed_wall * 30/37) -speed_topbottom = =math.ceil(speed_print * 35/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +material_flow = 95 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_flow = 95 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 37/50) +speed_wall_0 = =math.ceil(speed_wall * 30/37) +support_angle = 45 support_bottom_distance = =layer_height +support_interface_density = 100 +support_offset = 1 support_xy_distance = =line_width * 2 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg index 05585acf45..1b3b01d5ae 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_C.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_abs +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = 1 -material = emotiontech_abs variant = Standard 0.8 +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 50 -speed_wall = =math.ceil(speed_print * 37/50) -speed_wall_0 = =math.ceil(speed_wall * 30/37) -speed_topbottom = =math.ceil(speed_print * 35/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +material_flow = 97 material_print_temperature = =default_material_print_temperature + 2 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 37/50) +speed_wall_0 = =math.ceil(speed_wall * 30/37) +support_angle = 55 support_bottom_distance = =layer_height +support_interface_density = 100 +support_offset = 1 support_xy_distance = =line_width * 2 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg index c4d5eecee5..22f658dc1d 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_D.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_abs +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = 0 -material = emotiontech_abs variant = Standard 0.8 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 50 -speed_wall = =math.ceil(speed_print * 37/50) -speed_wall_0 = =math.ceil(speed_wall * 30/37) -speed_topbottom = =math.ceil(speed_print * 35/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +material_flow = 96 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 2 -material_flow = 96 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 37/50) +speed_wall_0 = =math.ceil(speed_wall * 30/37) +support_angle = 50 support_bottom_distance = =layer_height +support_interface_density = 100 +support_offset = 1 support_xy_distance = =line_width * 2 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg index bcc4e4c899..dfdfb859e1 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ABS_E.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = E definition = strateo3d +name = E +version = 4 [metadata] +material = emotiontech_abs +quality_type = e setting_version = 20 type = quality -quality_type = e -weight = -1 -material = emotiontech_abs variant = Standard 0.8 +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 50 -speed_wall = =math.ceil(speed_print * 37/50) -speed_wall_0 = =math.ceil(speed_wall * 30/37) -speed_topbottom = =math.ceil(speed_print * 35/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +material_flow = 95 material_print_temperature = =default_material_print_temperature + 7 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_flow = 95 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 37/50) +speed_wall_0 = =math.ceil(speed_wall * 30/37) +support_angle = 45 support_bottom_distance = =layer_height +support_interface_density = 100 +support_offset = 1 support_xy_distance = =line_width * 2 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_C.inst.cfg index a6593d9206..29c6129b3e 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_C.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_asax +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = 1 -material = emotiontech_asax variant = Standard 0.8 +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 50 -speed_wall = =math.ceil(speed_print * 40/50) -speed_wall_0 = =math.ceil(speed_wall * 33/40) -speed_topbottom = =math.ceil(speed_print * 35/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height cool_fan_speed = 40 cool_fan_speed_max = 75 -cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 -cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +material_flow = 97 material_print_temperature = =default_material_print_temperature + 1 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 33/40) +support_angle = 55 support_bottom_distance = =layer_height +support_interface_density = 100 +support_offset = 1 support_xy_distance = =line_width * 1.5 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_D.inst.cfg index dcf6d1232e..94aca33b1f 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_D.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_asax +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = 0 -material = emotiontech_asax variant = Standard 0.8 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 50 -speed_wall = =math.ceil(speed_print * 40/50) -speed_wall_0 = =math.ceil(speed_wall * 33/40) -speed_topbottom = =math.ceil(speed_print * 35/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height cool_fan_speed = 40 cool_fan_speed_max = 75 -cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 -cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +material_flow = 96 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_flow = 96 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 33/40) +support_angle = 50 support_bottom_distance = =layer_height +support_interface_density = 100 +support_offset = 1 support_xy_distance = =line_width * 1.5 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_E.inst.cfg index 87cb8ddc6a..10ad6719a5 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_ASA-X_E.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = E definition = strateo3d +name = E +version = 4 [metadata] +material = emotiontech_asax +quality_type = e setting_version = 20 type = quality -quality_type = e -weight = -1 -material = emotiontech_asax variant = Standard 0.8 +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 50 -speed_wall = =math.ceil(speed_print * 40/50) -speed_wall_0 = =math.ceil(speed_wall * 33/40) -speed_topbottom = =math.ceil(speed_print * 35/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height cool_fan_speed = 40 cool_fan_speed_max = 75 -cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 -cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +material_flow = 95 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 7 -material_flow = 95 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 33/40) +support_angle = 45 support_bottom_distance = =layer_height +support_interface_density = 100 +support_offset = 1 support_xy_distance = =line_width * 1.5 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_BVOH_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_BVOH_C.inst.cfg index 8ef8c7df18..3c95c9edd4 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_BVOH_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_BVOH_C.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_bvoh +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = 1 -material = emotiontech_bvoh variant = Standard 0.8 +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 25/30) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 25/30) +support_angle = 50 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_BVOH_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_BVOH_D.inst.cfg index da523e962e..58485c0968 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_BVOH_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_BVOH_D.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_bvoh +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = 0 -material = emotiontech_bvoh variant = Standard 0.8 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 25/30) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 25/30) +support_angle = 50 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_BVOH_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_BVOH_E.inst.cfg index 928a433551..0329d3bf55 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_BVOH_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_BVOH_E.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = E definition = strateo3d +name = E +version = 4 [metadata] +material = emotiontech_bvoh +quality_type = e setting_version = 20 type = quality -quality_type = e -weight = -1 -material = emotiontech_bvoh variant = Standard 0.8 +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 25/30) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 25/30) +support_angle = 50 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_COPA_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_COPA_C.inst.cfg index eb791525c5..457144afa9 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_COPA_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_COPA_C.inst.cfg @@ -1,65 +1,66 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_copa +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = 1 -material = emotiontech_copa variant = Standard 0.8 +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_0_wipe_dist = =machine_nozzle_size/2 -wall_line_count = 4 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 40/50) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 35/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 +bridge_fan_speed = 80 +bridge_settings_enabled = True +bridge_skin_density = 80 +bridge_skin_material_flow = 60 +bridge_skin_speed = 10 +bridge_wall_coast = 50 +bridge_wall_material_flow = 50 +bridge_wall_speed = 10 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed = 20 cool_fan_speed_max = 80 -cool_min_layer_time_fan_speed_max = 20 -cool_min_layer_time = 4 -cool_fan_full_at_height = =layer_height_0 + 2 * layer_height -cool_min_speed = 8 cool_lift_head = True -support_angle = 45 -material_print_temperature = =default_material_print_temperature -material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_initial_print_temperature = =default_material_print_temperature +cool_min_layer_time = 4 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 8 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 material_final_print_temperature = =default_material_print_temperature material_flow = 93 -skin_material_flow = 94 +material_initial_print_temperature = =default_material_print_temperature +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +meshfix_maximum_deviation = 0.04 +meshfix_maximum_resolution = 0.5 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =2*line_width -retraction_hop_only_when_collides = True -retraction_hop_enabled = True retraction_hop = 2 +retraction_hop_enabled = True +retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width retraction_speed = 35 +skin_material_flow = 94 skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 45 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 -bridge_settings_enabled = True -bridge_wall_coast = 50 -bridge_wall_speed = 10 -bridge_wall_material_flow = 50 -bridge_skin_speed = 10 -bridge_skin_material_flow = 60 -bridge_skin_density = 80 -bridge_fan_speed = 80 -meshfix_maximum_resolution = 0.5 -meshfix_maximum_deviation = 0.04 \ No newline at end of file +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_COPA_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_COPA_D.inst.cfg index 5df7d47802..591c72b275 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_COPA_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_COPA_D.inst.cfg @@ -1,65 +1,66 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_copa +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = 0 -material = emotiontech_copa variant = Standard 0.8 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_0_wipe_dist = =machine_nozzle_size/2 -wall_line_count = 4 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 40/50) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 35/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 +bridge_fan_speed = 80 +bridge_settings_enabled = True +bridge_skin_density = 80 +bridge_skin_material_flow = 60 +bridge_skin_speed = 10 +bridge_wall_coast = 50 +bridge_wall_material_flow = 50 +bridge_wall_speed = 10 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed = 20 cool_fan_speed_max = 80 -cool_min_layer_time_fan_speed_max = 20 -cool_min_layer_time = 4 -cool_fan_full_at_height = =layer_height_0 + 2 * layer_height -cool_min_speed = 8 cool_lift_head = True -support_angle = 45 -material_print_temperature = =default_material_print_temperature -material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_initial_print_temperature = =default_material_print_temperature +cool_min_layer_time = 4 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 8 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 material_final_print_temperature = =default_material_print_temperature material_flow = 93 -skin_material_flow = 94 +material_initial_print_temperature = =default_material_print_temperature +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +meshfix_maximum_deviation = 0.04 +meshfix_maximum_resolution = 0.5 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =2*line_width -retraction_hop_only_when_collides = True -retraction_hop_enabled = True retraction_hop = 2 +retraction_hop_enabled = True +retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width retraction_speed = 35 +skin_material_flow = 94 skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 45 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 -bridge_settings_enabled = True -bridge_wall_coast = 50 -bridge_wall_speed = 10 -bridge_wall_material_flow = 50 -bridge_skin_speed = 10 -bridge_skin_material_flow = 60 -bridge_skin_density = 80 -bridge_fan_speed = 80 -meshfix_maximum_resolution = 0.5 -meshfix_maximum_deviation = 0.04 \ No newline at end of file +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_COPA_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_COPA_E.inst.cfg index b9ac1024ec..e5c76ecb26 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_COPA_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_COPA_E.inst.cfg @@ -1,65 +1,66 @@ [general] -version = 4 -name = E definition = strateo3d +name = E +version = 4 [metadata] +material = emotiontech_copa +quality_type = e setting_version = 20 type = quality -quality_type = e -weight = -1 -material = emotiontech_copa variant = Standard 0.8 +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_0_wipe_dist = =machine_nozzle_size/2 -wall_line_count = 4 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 40/50) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 35/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 +bridge_fan_speed = 80 +bridge_settings_enabled = True +bridge_skin_density = 80 +bridge_skin_material_flow = 60 +bridge_skin_speed = 10 +bridge_wall_coast = 50 +bridge_wall_material_flow = 50 +bridge_wall_speed = 10 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed = 20 cool_fan_speed_max = 80 -cool_min_layer_time_fan_speed_max = 20 -cool_min_layer_time = 4 -cool_fan_full_at_height = =layer_height_0 + 2 * layer_height -cool_min_speed = 8 cool_lift_head = True -support_angle = 45 -material_print_temperature = =default_material_print_temperature -material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_initial_print_temperature = =default_material_print_temperature +cool_min_layer_time = 4 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 8 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 material_final_print_temperature = =default_material_print_temperature material_flow = 93 -skin_material_flow = 94 +material_initial_print_temperature = =default_material_print_temperature +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +meshfix_maximum_deviation = 0.04 +meshfix_maximum_resolution = 0.5 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =2*line_width -retraction_hop_only_when_collides = True -retraction_hop_enabled = True retraction_hop = 2 +retraction_hop_enabled = True +retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width retraction_speed = 35 +skin_material_flow = 94 skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 45 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 -bridge_settings_enabled = True -bridge_wall_coast = 50 -bridge_wall_speed = 10 -bridge_wall_material_flow = 50 -bridge_skin_speed = 10 -bridge_skin_material_flow = 60 -bridge_skin_density = 80 -bridge_fan_speed = 80 -meshfix_maximum_resolution = 0.5 -meshfix_maximum_deviation = 0.04 \ No newline at end of file +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_C.inst.cfg index b47193ccab..eaa8190e06 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_C.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_hips +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = 1 -material = emotiontech_hips variant = Standard 0.8 +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 9 * layer_height 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 + 9 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 50 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_D.inst.cfg index ec5ae4da52..2325339356 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_D.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_hips +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = 0 -material = emotiontech_hips variant = Standard 0.8 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 9 * layer_height 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 + 9 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +material_flow = 97 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 50 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_E.inst.cfg index 5aa458e850..578be1d325 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_HIPS_E.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = E definition = strateo3d +name = E +version = 4 [metadata] +material = emotiontech_hips +quality_type = e setting_version = 20 type = quality -quality_type = e -weight = -1 -material = emotiontech_hips variant = Standard 0.8 +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 9 * layer_height 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 + 9 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +material_flow = 97 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 50 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PC_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PC_C.inst.cfg index 14b53258f7..654e5f1832 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PC_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PC_C.inst.cfg @@ -1,60 +1,60 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_pc +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = 1 -material = emotiontech_pc variant = Standard 0.8 +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_0_wipe_dist = =machine_nozzle_size/2 -wall_line_count = 2 -speed_print = 50 -speed_wall = =math.ceil(speed_print * 40/50) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 35/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 +bridge_fan_speed = 100 +bridge_settings_enabled = True +bridge_skin_density = 80 +bridge_skin_material_flow = 60 +bridge_skin_speed = 12 +bridge_wall_coast = 50 +bridge_wall_material_flow = 50 +bridge_wall_speed = 12 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed = 50 cool_fan_speed_max = 50 -cool_min_layer_time_fan_speed_max = 20 -cool_min_layer_time = 3 -cool_fan_full_at_height = =layer_height_0 + 2 * layer_height -cool_min_speed = 12 cool_lift_head = True -support_angle = 60 +cool_min_layer_time = 3 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 12 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +material_flow = 89 material_print_temperature = 280 material_print_temperature_layer_0 = 285 -material_flow = 89 +meshfix_maximum_deviation = 0.04 +meshfix_maximum_resolution = 0.5 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 retraction_min_travel = =2*line_width retraction_speed = 35 skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 60 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 -bridge_settings_enabled = True -bridge_wall_coast = 50 -bridge_wall_speed = 12 -bridge_wall_material_flow = 50 -bridge_skin_speed = 12 -bridge_skin_material_flow = 60 -bridge_skin_density = 80 -bridge_fan_speed = 100 -meshfix_maximum_resolution = 0.5 -meshfix_maximum_deviation = 0.04 \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PC_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PC_D.inst.cfg index fd782db11b..def3d0f9c9 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PC_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PC_D.inst.cfg @@ -1,61 +1,60 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_pc +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = 0 -material = emotiontech_pc variant = Standard 0.8 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_0_wipe_dist = =machine_nozzle_size/2 -wall_line_count = 2 -speed_print = 50 -speed_wall = =math.ceil(speed_print * 40/50) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 35/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 +bridge_fan_speed = 100 +bridge_settings_enabled = True +bridge_skin_density = 80 +bridge_skin_material_flow = 60 +bridge_skin_speed = 12 +bridge_wall_coast = 50 +bridge_wall_material_flow = 50 +bridge_wall_speed = 12 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed = 50 cool_fan_speed_max = 50 -cool_min_layer_time_fan_speed_max = 20 -cool_min_layer_time = 3 -cool_fan_full_at_height = =layer_height_0 + 2 * layer_height -cool_min_speed = 12 cool_lift_head = True -support_angle = 60 +cool_min_layer_time = 3 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 12 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +material_flow = 89 material_print_temperature = 280 material_print_temperature_layer_0 = 285 -material_flow = 89 +meshfix_maximum_deviation = 0.04 +meshfix_maximum_resolution = 0.5 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 retraction_min_travel = =2*line_width retraction_speed = 35 - skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 60 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 -bridge_settings_enabled = True -bridge_wall_coast = 50 -bridge_wall_speed = 12 -bridge_wall_material_flow = 50 -bridge_skin_speed = 12 -bridge_skin_material_flow = 60 -bridge_skin_density = 80 -bridge_fan_speed = 100 -meshfix_maximum_resolution = 0.5 -meshfix_maximum_deviation = 0.04 \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PC_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PC_E.inst.cfg index f6be3bd828..07abf8e210 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PC_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PC_E.inst.cfg @@ -1,60 +1,60 @@ [general] -version = 4 -name = E definition = strateo3d +name = E +version = 4 [metadata] +material = emotiontech_pc +quality_type = e setting_version = 20 type = quality -quality_type = e -weight = -1 -material = emotiontech_pc variant = Standard 0.8 +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_0_wipe_dist = =machine_nozzle_size/2 -wall_line_count = 2 -speed_print = 50 -speed_wall = =math.ceil(speed_print * 40/50) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 35/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 +bridge_fan_speed = 100 +bridge_settings_enabled = True +bridge_skin_density = 80 +bridge_skin_material_flow = 60 +bridge_skin_speed = 12 +bridge_wall_coast = 50 +bridge_wall_material_flow = 50 +bridge_wall_speed = 12 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed = 50 cool_fan_speed_max = 50 -cool_min_layer_time_fan_speed_max = 20 -cool_min_layer_time = 3 -cool_fan_full_at_height = =layer_height_0 + 2 * layer_height -cool_min_speed = 12 cool_lift_head = True -support_angle = 60 +cool_min_layer_time = 3 +cool_min_layer_time_fan_speed_max = 20 +cool_min_speed = 12 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +material_flow = 89 material_print_temperature = 280 material_print_temperature_layer_0 = 285 -material_flow = 89 +meshfix_maximum_deviation = 0.04 +meshfix_maximum_resolution = 0.5 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 retraction_min_travel = =2*line_width retraction_speed = 35 skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 60 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_count = 2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 -bridge_settings_enabled = True -bridge_wall_coast = 50 -bridge_wall_speed = 12 -bridge_wall_material_flow = 50 -bridge_skin_speed = 12 -bridge_skin_material_flow = 60 -bridge_skin_density = 80 -bridge_fan_speed = 100 -meshfix_maximum_resolution = 0.5 -meshfix_maximum_deviation = 0.04 \ No newline at end of file diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg index a2f71573d7..6bf784b468 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_C.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_petg +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = 1 -material = emotiontech_petg variant = Standard 0.8 +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 50 -speed_wall = =math.ceil(speed_print * 40/50) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 35/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height cool_fan_speed = 75 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.4 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg index 328469316a..bfdbbe8da1 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_D.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_petg +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = 0 -material = emotiontech_petg variant = Standard 0.8 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 50 -speed_wall = =math.ceil(speed_print * 40/50) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 35/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height cool_fan_speed = 75 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +material_flow = 95 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -material_flow = 95 +prime_tower_enable = True retraction_extra_prime_amount = 0.4 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 50 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg index abb7e6d75f..10488c8b96 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PETG_E.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = E definition = strateo3d +name = E +version = 4 [metadata] +material = emotiontech_petg +quality_type = e setting_version = 20 type = quality -quality_type = e -weight = -1 -material = emotiontech_petg variant = Standard 0.8 +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 50 -speed_wall = =math.ceil(speed_print * 40/50) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 35/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height cool_fan_speed = 75 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +material_flow = 93 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature +5 -material_flow = 93 +prime_tower_enable = True retraction_extra_prime_amount = 0.4 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 45 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg index a17825c4b8..460e194a4c 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_C.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_pla +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = 1 -material = emotiontech_pla variant = Standard 0.8 +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 50 -speed_wall = =math.ceil(speed_print * 40/50) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 35/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 55 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +material_flow = 99 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 99 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg index 3336e377fa..4f6b5b662d 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_D.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_pla +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = 0 -material = emotiontech_pla variant = Standard 0.8 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 50 -speed_wall = =math.ceil(speed_print * 40/50) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 35/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +material_flow = 98 material_print_temperature = =default_material_print_temperature + 7 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -material_flow = 98 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 50 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg index 8b849dd51b..23d2fc58be 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_E.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = E definition = strateo3d +name = E +version = 4 [metadata] +material = emotiontech_pla +quality_type = e setting_version = 20 type = quality -quality_type = e -weight = -1 -material = emotiontech_pla variant = Standard 0.8 +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 50 -speed_wall = =math.ceil(speed_print * 40/50) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 35/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +material_flow = 97 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 45 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_HT_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_HT_C.inst.cfg index 838fb43f78..b452ae3585 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_HT_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_HT_C.inst.cfg @@ -1,51 +1,52 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_pla_hr_870 +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = 1 -material = emotiontech_pla_hr_870 variant = Standard 0.8 +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 50 -speed_wall = =math.ceil(speed_print * 40/50) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 35/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed = 100 cool_fan_speed_max = 100 -cool_min_layer_time_fan_speed_max = 20 +cool_lift_head = True cool_min_layer_time = 4 -cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 2 -support_angle = 55 -material_print_temperature = =default_material_print_temperature -material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_initial_print_temperature = =default_material_print_temperature +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 material_final_print_temperature = =default_material_print_temperature material_flow = 93 -skin_material_flow = 94 +material_initial_print_temperature = =default_material_print_temperature +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width +skin_material_flow = 94 skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 55 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 -cool_lift_head = True \ No newline at end of file +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_HT_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_HT_D.inst.cfg index 133c99571b..686f9718c3 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_HT_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_HT_D.inst.cfg @@ -1,53 +1,54 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_pla_hr_870 +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = 0 -material = emotiontech_pla_hr_870 variant = Standard 0.8 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 50 -speed_wall = =math.ceil(speed_print * 40/50) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 35/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed = 100 cool_fan_speed_max = 100 -cool_min_layer_time_fan_speed_max = 20 +cool_lift_head = True cool_min_layer_time = 4 -cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 2 -support_angle = 50 -material_print_temperature = =default_material_print_temperature -material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_initial_print_temperature = =default_material_print_temperature +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 material_final_print_temperature = =default_material_print_temperature material_flow = 93 -skin_material_flow = 94 +material_initial_print_temperature = =default_material_print_temperature +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +meshfix_maximum_deviation = 0.04 +meshfix_maximum_resolution = 0.5 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width +skin_material_flow = 94 skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 50 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 -meshfix_maximum_resolution = 0.5 -meshfix_maximum_deviation = 0.04 -cool_lift_head = True \ No newline at end of file +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_HT_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_HT_E.inst.cfg index 8607c506b7..fc0420eb7c 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_HT_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PLA_HT_E.inst.cfg @@ -1,53 +1,54 @@ [general] -version = 4 -name = E definition = strateo3d +name = E +version = 4 [metadata] +material = emotiontech_pla_hr_870 +quality_type = e setting_version = 20 type = quality -quality_type = e -weight = -1 -material = emotiontech_pla_hr_870 variant = Standard 0.8 +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 50 -speed_wall = =math.ceil(speed_print * 40/50) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 35/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed = 100 cool_fan_speed_max = 100 -cool_min_layer_time_fan_speed_max = 20 +cool_lift_head = True cool_min_layer_time = 4 -cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 2 -support_angle = 45 -material_print_temperature = =default_material_print_temperature -material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_initial_print_temperature = =default_material_print_temperature +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 material_final_print_temperature = =default_material_print_temperature material_flow = 93 -skin_material_flow = 94 +material_initial_print_temperature = =default_material_print_temperature +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +meshfix_maximum_deviation = 0.04 +meshfix_maximum_resolution = 0.5 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width +skin_material_flow = 94 skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 45 support_bottom_distance = =support_z_distance*0.5 +support_interface_density = 100 +support_offset = 1 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 -meshfix_maximum_resolution = 0.5 -meshfix_maximum_deviation = 0.04 -cool_lift_head = True +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.75 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.75 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_C.inst.cfg index d5ba4b0f17..1bcf0841c2 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_C.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_pva-m +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = 1 -material = emotiontech_pva-m variant = Standard 0.8 +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 50 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_D.inst.cfg index 543a0635bb..a2f571c7fb 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_D.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_pva-m +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = 0 -material = emotiontech_pva-m variant = Standard 0.8 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 50 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_E.inst.cfg index 8746a59c69..a5697247a9 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-M_E.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = E definition = strateo3d +name = E +version = 4 [metadata] +material = emotiontech_pva-m +quality_type = e setting_version = 20 type = quality -quality_type = e -weight = -1 -material = emotiontech_pva-m variant = Standard 0.8 +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 50 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_C.inst.cfg index a5efacc14d..30ff27cce3 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_C.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_pva-s +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = 1 -material = emotiontech_pva-s variant = Standard 0.8 +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 50 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_D.inst.cfg index 6ca1c58e59..572821c58b 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_D.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_pva-s +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = 0 -material = emotiontech_pva-s variant = Standard 0.8 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 50 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_E.inst.cfg index abd3ada59b..098b2b426e 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_PVA-S_E.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = E definition = strateo3d +name = E +version = 4 [metadata] +material = emotiontech_pva-s +quality_type = e setting_version = 20 type = quality -quality_type = e -weight = -1 -material = emotiontech_pva-s variant = Standard 0.8 +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 50 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.8 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.8 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_C.inst.cfg index a621644dde..b34250eddb 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_C.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_tpu98a +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = 1 -material = emotiontech_tpu98a variant = Standard 0.8 +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.7 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.7 -wall_0_wipe_dist = =machine_nozzle_size -speed_print = 35 -speed_wall = =math.ceil(speed_print * 35/35) -speed_wall_0 = =math.ceil(speed_wall * 27/35) -speed_topbottom = =math.ceil(speed_print * 23/35) -speed_layer_0 = =math.ceil(speed_print * 20/35) -speed_slowdown_layers = 1 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +material_flow = 105 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 105 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = False +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 20/35) +speed_print = 35 +speed_slowdown_layers = 1 +speed_topbottom = =math.ceil(speed_print * 23/35) +speed_wall = =math.ceil(speed_print * 35/35) +speed_wall_0 = =math.ceil(speed_wall * 27/35) +support_angle = 50 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 0.7 support_xy_distance = =line_width * 2.5 support_xy_distance_overhang = =wall_line_width_0 -support_offset = 0.7 -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.7 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_D.inst.cfg index a802f1fae1..aa5c98468e 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_D.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_tpu98a +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = 0 -material = emotiontech_tpu98a variant = Standard 0.8 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.7 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.7 -wall_0_wipe_dist = =machine_nozzle_size -speed_print = 35 -speed_wall = =math.ceil(speed_print * 35/35) -speed_wall_0 = =math.ceil(speed_wall * 27/35) -speed_topbottom = =math.ceil(speed_print * 23/35) -speed_layer_0 = =math.ceil(speed_print * 20/35) -speed_slowdown_layers = 1 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +material_flow = 103 material_print_temperature = =default_material_print_temperature + 6 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -material_flow = 103 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = False +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 20/35) +speed_print = 35 +speed_slowdown_layers = 1 +speed_topbottom = =math.ceil(speed_print * 23/35) +speed_wall = =math.ceil(speed_print * 35/35) +speed_wall_0 = =math.ceil(speed_wall * 27/35) +support_angle = 50 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 0.7 support_xy_distance = =line_width * 2.5 support_xy_distance_overhang = =wall_line_width_0 -support_offset = 0.7 -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.7 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_E.inst.cfg index 8644e67409..ca7745fcc9 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU98A_E.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = E definition = strateo3d +name = E +version = 4 [metadata] +material = emotiontech_tpu98a +quality_type = e setting_version = 20 type = quality -quality_type = e -weight = -1 -material = emotiontech_tpu98a variant = Standard 0.8 +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.7 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.7 -wall_0_wipe_dist = =machine_nozzle_size -speed_print = 35 -speed_wall = =math.ceil(speed_print * 35/35) -speed_wall_0 = =math.ceil(speed_wall * 27/35) -speed_topbottom = =math.ceil(speed_print * 23/35) -speed_layer_0 = =math.ceil(speed_print * 20/35) -speed_slowdown_layers = 1 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +material_flow = 101 material_print_temperature = =default_material_print_temperature + 9 material_print_temperature_layer_0 = =default_material_print_temperature +5 -material_flow = 101 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = False +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 20/35) +speed_print = 35 +speed_slowdown_layers = 1 +speed_topbottom = =math.ceil(speed_print * 23/35) +speed_wall = =math.ceil(speed_print * 35/35) +speed_wall_0 = =math.ceil(speed_wall * 27/35) +support_angle = 50 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 0.7 support_xy_distance = =line_width * 2.5 support_xy_distance_overhang = =wall_line_width_0 -support_offset = 0.7 -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.7 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_C.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_C.inst.cfg index f7190f1f92..f914f3c569 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_C.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_C.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = C definition = strateo3d +name = C +version = 4 [metadata] +material = emotiontech_tpu +quality_type = c setting_version = 20 type = quality -quality_type = c -weight = 1 -material = emotiontech_tpu variant = Standard 0.8 +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.7 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.7 -wall_0_wipe_dist = =machine_nozzle_size -speed_print = 35 -speed_wall = =math.ceil(speed_print * 35/35) -speed_wall_0 = =math.ceil(speed_wall * 27/35) -speed_topbottom = =math.ceil(speed_print * 23/35) -speed_layer_0 = =math.ceil(speed_print * 20/35) -speed_slowdown_layers = 1 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +material_flow = 100 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 100 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = False +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 20/35) +speed_print = 35 +speed_slowdown_layers = 1 +speed_topbottom = =math.ceil(speed_print * 23/35) +speed_wall = =math.ceil(speed_print * 35/35) +speed_wall_0 = =math.ceil(speed_wall * 27/35) +support_angle = 50 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 0.7 support_xy_distance = =line_width * 2.5 support_xy_distance_overhang = =wall_line_width_0 -support_offset = 0.7 -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.7 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_D.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_D.inst.cfg index eef2b6a58a..396152907f 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_D.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_tpu +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = 0 -material = emotiontech_tpu variant = Standard 0.8 +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.7 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.7 -wall_0_wipe_dist = =machine_nozzle_size -speed_print = 35 -speed_wall = =math.ceil(speed_print * 35/35) -speed_wall_0 = =math.ceil(speed_wall * 27/35) -speed_topbottom = =math.ceil(speed_print * 23/35) -speed_layer_0 = =math.ceil(speed_print * 20/35) -speed_slowdown_layers = 1 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +material_flow = 100 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 100 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = False +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 20/35) +speed_print = 35 +speed_slowdown_layers = 1 +speed_topbottom = =math.ceil(speed_print * 23/35) +speed_wall = =math.ceil(speed_print * 35/35) +speed_wall_0 = =math.ceil(speed_wall * 27/35) +support_angle = 50 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 0.7 support_xy_distance = =line_width * 2.5 support_xy_distance_overhang = =wall_line_width_0 -support_offset = 0.7 -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.7 + diff --git a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_E.inst.cfg b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_E.inst.cfg index f9f8b76a39..989f1093f2 100644 --- a/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_0.8/s3d_std0.8_TPU_E.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = E definition = strateo3d +name = E +version = 4 [metadata] +material = emotiontech_tpu +quality_type = e setting_version = 20 type = quality -quality_type = e -weight = -1 -material = emotiontech_tpu variant = Standard 0.8 +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.7 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.7 -wall_0_wipe_dist = =machine_nozzle_size -speed_print = 35 -speed_wall = =math.ceil(speed_print * 35/35) -speed_wall_0 = =math.ceil(speed_wall * 27/35) -speed_topbottom = =math.ceil(speed_print * 23/35) -speed_layer_0 = =math.ceil(speed_print * 20/35) -speed_slowdown_layers = 1 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +material_flow = 100 material_print_temperature = =default_material_print_temperature + 7 material_print_temperature_layer_0 = =default_material_print_temperature +3 -material_flow = 100 +prime_tower_enable = True retraction_extra_prime_amount = 0.1 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = False +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height*2 +speed_layer_0 = =math.ceil(speed_print * 20/35) +speed_print = 35 +speed_slowdown_layers = 1 +speed_topbottom = =math.ceil(speed_print * 23/35) +speed_wall = =math.ceil(speed_print * 35/35) +speed_wall_0 = =math.ceil(speed_wall * 27/35) +support_angle = 50 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 0.7 support_xy_distance = =line_width * 2.5 support_xy_distance_overhang = =wall_line_width_0 -support_offset = 0.7 -support_interface_density = 100 -prime_tower_enable = True \ No newline at end of file +support_z_distance = =layer_height*2 +wall_0_wipe_dist = =machine_nozzle_size +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.7 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.7 + diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ABS_D.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ABS_D.inst.cfg index 6e6dca7892..cec853f4a2 100644 --- a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ABS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ABS_D.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_abs +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = 1 -material = emotiontech_abs variant = Standard 1.0 Experimental +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 45 -speed_wall = =math.ceil(speed_print * 37/45) -speed_wall_0 = =math.ceil(speed_wall * 30/37) -speed_topbottom = =math.ceil(speed_print * 35/45) -speed_layer_0 = =math.ceil(speed_print * 25/45) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +material_flow = 97 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/45) +speed_print = 45 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/45) +speed_wall = =math.ceil(speed_print * 37/45) +speed_wall_0 = =math.ceil(speed_wall * 30/37) +support_angle = 50 support_bottom_distance = =layer_height +support_interface_density = 100 +support_offset = 1 support_xy_distance = =line_width * 2 support_xy_distance_overhang = =wall_line_width_0 -support_offset = 1 -support_interface_density = 100 -prime_tower_enable = True +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 + diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ABS_E.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ABS_E.inst.cfg index 1a83890147..e0383410f5 100644 --- a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ABS_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ABS_E.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = E definition = strateo3d +name = E +version = 4 [metadata] +material = emotiontech_abs +quality_type = e setting_version = 20 type = quality -quality_type = e -weight = 0 -material = emotiontech_abs variant = Standard 1.0 Experimental +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 45 -speed_wall = =math.ceil(speed_print * 37/45) -speed_wall_0 = =math.ceil(speed_wall * 30/37) -speed_topbottom = =math.ceil(speed_print * 35/45) -speed_layer_0 = =math.ceil(speed_print * 25/45) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +material_flow = 97 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/45) +speed_print = 45 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/45) +speed_wall = =math.ceil(speed_print * 37/45) +speed_wall_0 = =math.ceil(speed_wall * 30/37) +support_angle = 45 support_bottom_distance = =layer_height +support_interface_density = 100 +support_offset = 1 support_xy_distance = =line_width * 2 support_xy_distance_overhang = =wall_line_width_0 -support_offset = 1 -support_interface_density = 100 -prime_tower_enable = True +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 + diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ABS_F.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ABS_F.inst.cfg index 26b1603c08..36c111a35d 100644 --- a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ABS_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ABS_F.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = F definition = strateo3d +name = F +version = 4 [metadata] +material = emotiontech_abs +quality_type = f setting_version = 20 type = quality -quality_type = f -weight = -1 -material = emotiontech_abs variant = Standard 1.0 Experimental +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 45 -speed_wall = =math.ceil(speed_print * 37/45) -speed_wall_0 = =math.ceil(speed_wall * 30/37) -speed_topbottom = =math.ceil(speed_print * 35/45) -speed_layer_0 = =math.ceil(speed_print * 25/45) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +material_flow = 97 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature +5 -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/45) +speed_print = 45 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/45) +speed_wall = =math.ceil(speed_print * 37/45) +speed_wall_0 = =math.ceil(speed_wall * 30/37) +support_angle = 45 support_bottom_distance = =layer_height +support_interface_density = 100 +support_offset = 1 support_xy_distance = =line_width * 2 support_xy_distance_overhang = =wall_line_width_0 -support_offset = 1 -support_interface_density = 100 -prime_tower_enable = True +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 + diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ASA-X_D.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ASA-X_D.inst.cfg index d69d428563..ca0957c939 100644 --- a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ASA-X_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ASA-X_D.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_asax +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = 1 -material = emotiontech_asax variant = Standard 1.0 Experimental +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 45 -speed_wall = =math.ceil(speed_print * 37/45) -speed_wall_0 = =math.ceil(speed_wall * 30/37) -speed_topbottom = =math.ceil(speed_print * 35/45) -speed_layer_0 = =math.ceil(speed_print * 25/45) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height cool_fan_speed = 40 cool_fan_speed_max = 75 -cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 -cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +material_flow = 100 material_print_temperature = =default_material_print_temperature + 1 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -material_flow = 100 +prime_tower_enable = True retraction_extra_prime_amount = 0.4 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/45) +speed_print = 45 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/45) +speed_wall = =math.ceil(speed_print * 37/45) +speed_wall_0 = =math.ceil(speed_wall * 30/37) +support_angle = 50 support_bottom_distance = =layer_height +support_interface_density = 100 +support_offset = 1 support_xy_distance = =line_width * 1.5 support_xy_distance_overhang = =wall_line_width_0 -support_offset = 1 -support_interface_density = 100 -prime_tower_enable = True +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 + diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ASA-X_E.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ASA-X_E.inst.cfg index 2fecb18776..1b2c222e7b 100644 --- a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ASA-X_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ASA-X_E.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = E definition = strateo3d +name = E +version = 4 [metadata] +material = emotiontech_asax +quality_type = e setting_version = 20 type = quality -quality_type = e -weight = 0 -material = emotiontech_asax variant = Standard 1.0 Experimental +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 45 -speed_wall = =math.ceil(speed_print * 37/45) -speed_wall_0 = =math.ceil(speed_wall * 30/37) -speed_topbottom = =math.ceil(speed_print * 35/45) -speed_layer_0 = =math.ceil(speed_print * 25/45) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height cool_fan_speed = 40 cool_fan_speed_max = 75 -cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 -cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +material_flow = 100 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_flow = 100 +prime_tower_enable = True retraction_extra_prime_amount = 0.4 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/45) +speed_print = 45 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/45) +speed_wall = =math.ceil(speed_print * 37/45) +speed_wall_0 = =math.ceil(speed_wall * 30/37) +support_angle = 45 support_bottom_distance = =layer_height +support_interface_density = 100 +support_offset = 1 support_xy_distance = =line_width * 1.5 support_xy_distance_overhang = =wall_line_width_0 -support_offset = 1 -support_interface_density = 100 -prime_tower_enable = True +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 + diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ASA-X_F.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ASA-X_F.inst.cfg index 877e3a8c6c..ea36b60d8e 100644 --- a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ASA-X_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_ASA-X_F.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = F definition = strateo3d +name = F +version = 4 [metadata] +material = emotiontech_asax +quality_type = f setting_version = 20 type = quality -quality_type = f -weight = -1 -material = emotiontech_asax variant = Standard 1.0 Experimental +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 45 -speed_wall = =math.ceil(speed_print * 37/45) -speed_wall_0 = =math.ceil(speed_wall * 30/37) -speed_topbottom = =math.ceil(speed_print * 35/45) -speed_layer_0 = =math.ceil(speed_print * 25/45) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height cool_fan_speed = 40 cool_fan_speed_max = 75 -cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 -cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +material_flow = 100 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 7 -material_flow = 100 +prime_tower_enable = True retraction_extra_prime_amount = 0.4 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/45) +speed_print = 45 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/45) +speed_wall = =math.ceil(speed_print * 37/45) +speed_wall_0 = =math.ceil(speed_wall * 30/37) +support_angle = 45 support_bottom_distance = =layer_height +support_interface_density = 100 +support_offset = 1 support_xy_distance = =line_width * 1.5 support_xy_distance_overhang = =wall_line_width_0 -support_offset = 1 -support_interface_density = 100 -prime_tower_enable = True +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 + diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_BVOH_D.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_BVOH_D.inst.cfg index 91dbe1228b..afb8eab3e0 100644 --- a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_BVOH_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_BVOH_D.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_bvoh +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = 1 -material = emotiontech_bvoh variant = Standard 1.0 Experimental +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 25/30) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 47 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 25/30) +support_angle = 47 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 + diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_BVOH_E.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_BVOH_E.inst.cfg index 6388f1d78d..984014e2ed 100644 --- a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_BVOH_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_BVOH_E.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = E definition = strateo3d +name = E +version = 4 [metadata] +material = emotiontech_bvoh +quality_type = e setting_version = 20 type = quality -quality_type = e -weight = 0 -material = emotiontech_bvoh variant = Standard 1.0 Experimental +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 25/30) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 47 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 25/30) +support_angle = 47 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 + diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_BVOH_F.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_BVOH_F.inst.cfg index ab12549af0..78fe42e28d 100644 --- a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_BVOH_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_BVOH_F.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = F definition = strateo3d +name = F +version = 4 [metadata] +material = emotiontech_bvoh +quality_type = f setting_version = 20 type = quality -quality_type = f -weight = -1 -material = emotiontech_bvoh variant = Standard 1.0 Experimental +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 25/30) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 47 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 25/30) +support_angle = 47 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 + diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_HIPS_D.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_HIPS_D.inst.cfg index 061cf8b9df..0ffd684c04 100644 --- a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_HIPS_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_HIPS_D.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_hips +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = 1 -material = emotiontech_hips variant = Standard 1.0 Experimental +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 47 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 47 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 + diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_HIPS_E.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_HIPS_E.inst.cfg index 6807ca0d37..675dee5392 100644 --- a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_HIPS_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_HIPS_E.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = E definition = strateo3d +name = E +version = 4 [metadata] +material = emotiontech_hips +quality_type = e setting_version = 20 type = quality -quality_type = e -weight = 0 -material = emotiontech_hips variant = Standard 1.0 Experimental +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 47 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +material_flow = 97 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 47 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 + diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_HIPS_F.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_HIPS_F.inst.cfg index 4d13fb530b..82bead6fbf 100644 --- a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_HIPS_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_HIPS_F.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = F definition = strateo3d +name = F +version = 4 [metadata] +material = emotiontech_hips +quality_type = f setting_version = 20 type = quality -quality_type = f -weight = -1 -material = emotiontech_hips variant = Standard 1.0 Experimental +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 47 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +material_flow = 97 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 47 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 + diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PETG_D.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PETG_D.inst.cfg index 5d1908d6e5..f4e96619a0 100644 --- a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PETG_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PETG_D.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_petg +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = 1 -material = emotiontech_petg variant = Standard 1.0 Experimental +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 45 -speed_wall = =math.ceil(speed_print * 40/45) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 35/45) -speed_layer_0 = =math.ceil(speed_print * 25/45) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height cool_fan_speed = 70 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +material_flow = 95 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 95 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/45) +speed_print = 45 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/45) +speed_wall = =math.ceil(speed_print * 40/45) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 50 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 + diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PETG_E.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PETG_E.inst.cfg index d61fbb4893..4cc97f860e 100644 --- a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PETG_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PETG_E.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = E definition = strateo3d +name = E +version = 4 [metadata] +material = emotiontech_petg +quality_type = e setting_version = 20 type = quality -quality_type = e -weight = 0 -material = emotiontech_petg variant = Standard 1.0 Experimental +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 45 -speed_wall = =math.ceil(speed_print * 40/45) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 35/45) -speed_layer_0 = =math.ceil(speed_print * 25/45) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height cool_fan_speed = 70 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +material_flow = 95 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -material_flow = 95 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/45) +speed_print = 45 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/45) +speed_wall = =math.ceil(speed_print * 40/45) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 45 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 + diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PETG_F.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PETG_F.inst.cfg index a82b191d0e..de1a81e71f 100644 --- a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PETG_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PETG_F.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = F definition = strateo3d +name = F +version = 4 [metadata] +material = emotiontech_petg +quality_type = f setting_version = 20 type = quality -quality_type = f -weight = -1 -material = emotiontech_petg variant = Standard 1.0 Experimental +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 45 -speed_wall = =math.ceil(speed_print * 40/45) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 35/45) -speed_layer_0 = =math.ceil(speed_print * 25/45) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height cool_fan_speed = 70 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +material_flow = 95 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_flow = 95 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/45) +speed_print = 45 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/45) +speed_wall = =math.ceil(speed_print * 40/45) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 45 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 + diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PLA_D.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PLA_D.inst.cfg index 30f8e02537..f7cab6a2b5 100644 --- a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PLA_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PLA_D.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_pla +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = 1 -material = emotiontech_pla variant = Standard 1.0 Experimental +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 50 -speed_wall = =math.ceil(speed_print * 40/50) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 35/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height 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 + 3 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +material_flow = 100 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 100 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 50 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 + diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PLA_E.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PLA_E.inst.cfg index 2f3d2e968d..791905d5af 100644 --- a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PLA_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PLA_E.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = E definition = strateo3d +name = E +version = 4 [metadata] +material = emotiontech_pla +quality_type = e setting_version = 20 type = quality -quality_type = e +variant = Standard 1.0 Experimental weight = 0 -material = emotiontech_pla -variant = Standard 1.0 Experimental [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 50 -speed_wall = =math.ceil(speed_print * 40/50) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 35/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height 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 + 3 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +material_flow = 100 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -material_flow = 100 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 45 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 + diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PLA_F.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PLA_F.inst.cfg index f3c9e225c1..42c1f1ea76 100644 --- a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PLA_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PLA_F.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = F definition = strateo3d +name = F +version = 4 [metadata] +material = emotiontech_pla +quality_type = f setting_version = 20 type = quality -quality_type = f -weight = -1 -material = emotiontech_pla variant = Standard 1.0 Experimental +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 50 -speed_wall = =math.ceil(speed_print * 40/50) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 35/50) -speed_layer_0 = =math.ceil(speed_print * 25/50) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height 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 + 3 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +material_flow = 100 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature +5 -material_flow = 100 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/50) +speed_print = 50 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_wall = =math.ceil(speed_print * 40/50) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 45 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.95 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 + diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-M_D.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-M_D.inst.cfg index 1d586b37a0..c396b28e62 100644 --- a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-M_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-M_D.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_pva-m +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = 1 -material = emotiontech_pva-m variant = Standard 1.0 Experimental +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 47 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 47 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 + diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-M_E.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-M_E.inst.cfg index eded361bc9..12ab11ecb3 100644 --- a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-M_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-M_E.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = E definition = strateo3d +name = E +version = 4 [metadata] +material = emotiontech_pva-m +quality_type = e setting_version = 20 type = quality -quality_type = e -weight = 0 -material = emotiontech_pva-m variant = Standard 1.0 Experimental +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 47 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 47 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 + diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-M_F.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-M_F.inst.cfg index 8aa787ba9e..63750e26db 100644 --- a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-M_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-M_F.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = F definition = strateo3d +name = F +version = 4 [metadata] +material = emotiontech_pva-m +quality_type = f setting_version = 20 type = quality -quality_type = f -weight = -1 -material = emotiontech_pva-m variant = Standard 1.0 Experimental +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 47 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 47 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 + diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-S_D.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-S_D.inst.cfg index 0b6504acfe..9765ed6d63 100644 --- a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-S_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-S_D.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_pva-s +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = 1 -material = emotiontech_pva-s variant = Standard 1.0 Experimental +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 47 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 47 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 + diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-S_E.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-S_E.inst.cfg index 18090c7765..fa933480fd 100644 --- a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-S_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-S_E.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = E definition = strateo3d +name = E +version = 4 [metadata] +material = emotiontech_pva-s +quality_type = e setting_version = 20 type = quality -quality_type = e -weight = 0 -material = emotiontech_pva-s variant = Standard 1.0 Experimental +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 47 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 47 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 + diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-S_F.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-S_F.inst.cfg index 77c2838306..5ba523e7a8 100644 --- a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-S_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_PVA-S_F.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = F definition = strateo3d +name = F +version = 4 [metadata] +material = emotiontech_pva-s +quality_type = f setting_version = 20 type = quality -quality_type = f -weight = -1 -material = emotiontech_pva-s variant = Standard 1.0 Experimental +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 47 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +material_flow = 97 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 97 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 47 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.0 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.0 + diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_TPU98A_D.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_TPU98A_D.inst.cfg index 36932cc955..29793b84dc 100644 --- a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_TPU98A_D.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_TPU98A_D.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = D definition = strateo3d +name = D +version = 4 [metadata] +material = emotiontech_tpu98a +quality_type = d setting_version = 20 type = quality -quality_type = d -weight = 1 -material = emotiontech_tpu98a variant = Standard 1.0 Experimental +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.9 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.9 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 -wall_0_wipe_dist = =machine_nozzle_size -speed_print = 35 -speed_wall = =math.ceil(speed_print * 35/35) -speed_wall_0 = =math.ceil(speed_wall * 27/35) -speed_topbottom = =math.ceil(speed_print * 23/35) -speed_layer_0 = =math.ceil(speed_print * 20/35) -speed_slowdown_layers = 1 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.9 +material_flow = 107 material_print_temperature = =default_material_print_temperature + 2 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 107 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = False +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 20/35) +speed_print = 35 +speed_slowdown_layers = 1 +speed_topbottom = =math.ceil(speed_print * 23/35) +speed_wall = =math.ceil(speed_print * 35/35) +speed_wall_0 = =math.ceil(speed_wall * 27/35) +support_angle = 50 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 0.7 support_xy_distance = =line_width * 2.5 support_xy_distance_overhang = =wall_line_width_0 -support_offset = 0.7 -support_interface_density = 100 -prime_tower_enable = True +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.9 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 + diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_TPU98A_E.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_TPU98A_E.inst.cfg index 1b30e0f37f..0c0e9f79d1 100644 --- a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_TPU98A_E.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_TPU98A_E.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = E definition = strateo3d +name = E +version = 4 [metadata] +material = emotiontech_tpu98a +quality_type = e setting_version = 20 type = quality -quality_type = e -weight = 0 -material = emotiontech_tpu98a variant = Standard 1.0 Experimental +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.9 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.9 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 -wall_0_wipe_dist = =machine_nozzle_size -speed_print = 35 -speed_wall = =math.ceil(speed_print * 35/35) -speed_wall_0 = =math.ceil(speed_wall * 27/35) -speed_topbottom = =math.ceil(speed_print * 23/35) -speed_layer_0 = =math.ceil(speed_print * 20/35) -speed_slowdown_layers = 1 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.9 +material_flow = 107 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -material_flow = 107 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = False +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 20/35) +speed_print = 35 +speed_slowdown_layers = 1 +speed_topbottom = =math.ceil(speed_print * 23/35) +speed_wall = =math.ceil(speed_print * 35/35) +speed_wall_0 = =math.ceil(speed_wall * 27/35) +support_angle = 50 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 0.7 support_xy_distance = =line_width * 2.5 support_xy_distance_overhang = =wall_line_width_0 -support_offset = 0.7 -support_interface_density = 100 -prime_tower_enable = True +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.9 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 + diff --git a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_TPU98A_F.inst.cfg b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_TPU98A_F.inst.cfg index 7f0e5a0aa4..abacbbf13f 100644 --- a/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_TPU98A_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.0_Experimental/s3d_std1.0_TPU98A_F.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = F definition = strateo3d +name = F +version = 4 [metadata] +material = emotiontech_tpu98a +quality_type = f setting_version = 20 type = quality -quality_type = f -weight = -1 -material = emotiontech_tpu98a variant = Standard 1.0 Experimental +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*0.9 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.9 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 -wall_0_wipe_dist = =machine_nozzle_size -speed_print = 35 -speed_wall = =math.ceil(speed_print * 35/35) -speed_wall_0 = =math.ceil(speed_wall * 27/35) -speed_topbottom = =math.ceil(speed_print * 23/35) -speed_layer_0 = =math.ceil(speed_print * 20/35) -speed_slowdown_layers = 1 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 50 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.9 +material_flow = 107 material_print_temperature = =default_material_print_temperature + 8 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_flow = 107 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = False +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 20/35) +speed_print = 35 +speed_slowdown_layers = 1 +speed_topbottom = =math.ceil(speed_print * 23/35) +speed_wall = =math.ceil(speed_print * 35/35) +speed_wall_0 = =math.ceil(speed_wall * 27/35) +support_angle = 50 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 0.7 support_xy_distance = =line_width * 2.5 support_xy_distance_overhang = =wall_line_width_0 -support_offset = 0.7 -support_interface_density = 100 -prime_tower_enable = True +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.9 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.9 + diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ABS_F.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ABS_F.inst.cfg index b05e4bbef4..0b4a8aa29a 100644 --- a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ABS_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ABS_F.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = F definition = strateo3d +name = F +version = 4 [metadata] +material = emotiontech_abs +quality_type = f setting_version = 20 type = quality -quality_type = f -weight = 1 -material = emotiontech_abs variant = Standard 1.2 Experimental +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_print * 25/40) -speed_topbottom = =math.ceil(speed_print * 35/40) -speed_layer_0 = =math.ceil(speed_print * 25/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +material_flow = 103 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 103 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_print * 25/40) +support_angle = 45 support_bottom_distance = =layer_height +support_interface_density = 100 +support_offset = 1 support_xy_distance = =line_width * 2 support_xy_distance_overhang = =wall_line_width_0 -support_offset = 1 -support_interface_density = 100 -prime_tower_enable = True +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 + diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ABS_G.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ABS_G.inst.cfg index 702bd79c19..581189040b 100644 --- a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ABS_G.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ABS_G.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = G definition = strateo3d +name = G +version = 4 [metadata] +material = emotiontech_abs +quality_type = g setting_version = 20 type = quality -quality_type = g -weight = 0 -material = emotiontech_abs variant = Standard 1.2 Experimental +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 37 -speed_wall = =math.ceil(speed_print * 30/37) -speed_wall_0 = =math.ceil(speed_print * 25/37) -speed_topbottom = =math.ceil(speed_print * 33/37) -speed_layer_0 = =math.ceil(speed_print * 25/37) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +material_flow = 102 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -material_flow = 102 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/37) +speed_print = 37 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 33/37) +speed_wall = =math.ceil(speed_print * 30/37) +speed_wall_0 = =math.ceil(speed_print * 25/37) +support_angle = 45 support_bottom_distance = =layer_height +support_interface_density = 100 +support_offset = 1 support_xy_distance = =line_width * 2 support_xy_distance_overhang = =wall_line_width_0 -support_offset = 1 -support_interface_density = 100 -prime_tower_enable = True +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 + diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ABS_H.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ABS_H.inst.cfg index 9af1330256..6dcbaf02ae 100644 --- a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ABS_H.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ABS_H.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = H definition = strateo3d +name = H +version = 4 [metadata] +material = emotiontech_abs +quality_type = h setting_version = 20 type = quality -quality_type = h -weight = -1 -material = emotiontech_abs variant = Standard 1.2 Experimental +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 35 -speed_wall = =math.ceil(speed_print * 27/35) -speed_wall_0 = =math.ceil(speed_print * 23/35) -speed_topbottom = =math.ceil(speed_print * 30/35) -speed_layer_0 = =math.ceil(speed_print * 25/35) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +material_flow = 101 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature +5 -material_flow = 101 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/35) +speed_print = 35 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 30/35) +speed_wall = =math.ceil(speed_print * 27/35) +speed_wall_0 = =math.ceil(speed_print * 23/35) +support_angle = 45 support_bottom_distance = =layer_height +support_interface_density = 100 +support_offset = 1 support_xy_distance = =line_width * 2 support_xy_distance_overhang = =wall_line_width_0 -support_offset = 1 -support_interface_density = 100 -prime_tower_enable = True +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 + diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ASA-X_F.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ASA-X_F.inst.cfg index 6c8250a030..8e7c62f88a 100644 --- a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ASA-X_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ASA-X_F.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = F definition = strateo3d +name = F +version = 4 [metadata] +material = emotiontech_asax +quality_type = f setting_version = 20 type = quality -quality_type = f -weight = 1 -material = emotiontech_asax variant = Standard 1.2 Experimental +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_print * 25/40) -speed_topbottom = =math.ceil(speed_print * 35/40) -speed_layer_0 = =math.ceil(speed_print * 25/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height cool_fan_speed = 40 cool_fan_speed_max = 75 -cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 -cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +material_flow = 100 material_print_temperature = =default_material_print_temperature + 1 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -material_flow = 100 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_print * 25/40) +support_angle = 45 support_bottom_distance = =layer_height +support_interface_density = 100 +support_offset = 1 support_xy_distance = =line_width * 1.5 support_xy_distance_overhang = =wall_line_width_0 -support_offset = 1 -support_interface_density = 100 -prime_tower_enable = True +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 + diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ASA-X_G.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ASA-X_G.inst.cfg index 45af3610a5..fd6dc67ccb 100644 --- a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ASA-X_G.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ASA-X_G.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = G definition = strateo3d +name = G +version = 4 [metadata] +material = emotiontech_asax +quality_type = g setting_version = 20 type = quality -quality_type = g -weight = 0 -material = emotiontech_asax variant = Standard 1.2 Experimental +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 37 -speed_wall = =math.ceil(speed_print * 30/37) -speed_wall_0 = =math.ceil(speed_print * 25/37) -speed_topbottom = =math.ceil(speed_print * 33/37) -speed_layer_0 = =math.ceil(speed_print * 25/37) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height cool_fan_speed = 40 cool_fan_speed_max = 75 -cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 -cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +material_flow = 100 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_flow = 100 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/37) +speed_print = 37 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 33/37) +speed_wall = =math.ceil(speed_print * 30/37) +speed_wall_0 = =math.ceil(speed_print * 25/37) +support_angle = 45 support_bottom_distance = =layer_height +support_interface_density = 100 +support_offset = 1 support_xy_distance = =line_width * 1.5 support_xy_distance_overhang = =wall_line_width_0 -support_offset = 1 -support_interface_density = 100 -prime_tower_enable = True +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 + diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ASA-X_H.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ASA-X_H.inst.cfg index 18b0a02971..f3825567a6 100644 --- a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ASA-X_H.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_ASA-X_H.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = H definition = strateo3d +name = H +version = 4 [metadata] +material = emotiontech_asax +quality_type = h setting_version = 20 type = quality -quality_type = h -weight = -1 -material = emotiontech_asax variant = Standard 1.2 Experimental +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 35 -speed_wall = =math.ceil(speed_print * 27/35) -speed_wall_0 = =math.ceil(speed_print * 23/35) -speed_topbottom = =math.ceil(speed_print * 30/35) -speed_layer_0 = =math.ceil(speed_print * 25/35) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height cool_fan_speed = 40 cool_fan_speed_max = 75 -cool_min_layer_time_fan_speed_max = 20 cool_min_layer_time = 11 -cool_fan_full_at_height = =layer_height_0 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +material_flow = 100 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 7 -material_flow = 100 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/35) +speed_print = 35 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 30/35) +speed_wall = =math.ceil(speed_print * 27/35) +speed_wall_0 = =math.ceil(speed_print * 23/35) +support_angle = 45 support_bottom_distance = =layer_height +support_interface_density = 100 +support_offset = 1 support_xy_distance = =line_width * 1.5 support_xy_distance_overhang = =wall_line_width_0 -support_offset = 1 -support_interface_density = 100 -prime_tower_enable = True +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 + diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_BVOH_F.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_BVOH_F.inst.cfg index b4389f3b46..445d23bece 100644 --- a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_BVOH_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_BVOH_F.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = F definition = strateo3d +name = F +version = 4 [metadata] +material = emotiontech_bvoh +quality_type = f setting_version = 20 type = quality -quality_type = f -weight = 1 -material = emotiontech_bvoh variant = Standard 1.2 Experimental +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 25/30) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +material_flow = 100 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 100 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 25/30) +support_angle = 45 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 + diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_BVOH_G.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_BVOH_G.inst.cfg index cd027171ed..1adb875373 100644 --- a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_BVOH_G.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_BVOH_G.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = G definition = strateo3d +name = G +version = 4 [metadata] +material = emotiontech_bvoh +quality_type = g setting_version = 20 type = quality -quality_type = g -weight = 0 -material = emotiontech_bvoh variant = Standard 1.2 Experimental +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 25/30) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +material_flow = 100 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 100 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 25/30) +support_angle = 45 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 + diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_BVOH_H.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_BVOH_H.inst.cfg index d32db692be..b165bec0cb 100644 --- a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_BVOH_H.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_BVOH_H.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = H definition = strateo3d +name = H +version = 4 [metadata] +material = emotiontech_bvoh +quality_type = h setting_version = 20 type = quality -quality_type = h -weight = -1 -material = emotiontech_bvoh variant = Standard 1.2 Experimental +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 25/30) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +material_flow = 100 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 100 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 25/30) +support_angle = 45 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 + diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_HIPS_F.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_HIPS_F.inst.cfg index 9e60fa0481..54732a802f 100644 --- a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_HIPS_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_HIPS_F.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = F definition = strateo3d +name = F +version = 4 [metadata] +material = emotiontech_hips +quality_type = f setting_version = 20 type = quality -quality_type = f -weight = 1 -material = emotiontech_hips variant = Standard 1.2 Experimental +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +material_flow = 103 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 103 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 45 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 + diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_HIPS_G.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_HIPS_G.inst.cfg index 531a98e7b4..53a05eddd8 100644 --- a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_HIPS_G.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_HIPS_G.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = G definition = strateo3d +name = G +version = 4 [metadata] +material = emotiontech_hips +quality_type = g setting_version = 20 type = quality -quality_type = g -weight = 0 -material = emotiontech_hips variant = Standard 1.2 Experimental +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +material_flow = 102 material_print_temperature = =default_material_print_temperature + 3 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 102 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 45 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 + diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_HIPS_H.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_HIPS_H.inst.cfg index 87f77831d9..de66271b96 100644 --- a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_HIPS_H.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_HIPS_H.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = H definition = strateo3d +name = H +version = 4 [metadata] +material = emotiontech_hips +quality_type = h setting_version = 20 type = quality -quality_type = h -weight = -1 -material = emotiontech_hips variant = Standard 1.2 Experimental +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +material_flow = 101 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 101 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 45 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 + diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PETG_F.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PETG_F.inst.cfg index 354e353f09..a14507d610 100644 --- a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PETG_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PETG_F.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = F definition = strateo3d +name = F +version = 4 [metadata] +material = emotiontech_petg +quality_type = f setting_version = 20 type = quality -quality_type = f -weight = 1 -material = emotiontech_petg variant = Standard 1.2 Experimental +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_print * 25/40) -speed_topbottom = =math.ceil(speed_print * 35/40) -speed_layer_0 = =math.ceil(speed_print * 25/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height cool_fan_speed = 70 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +material_flow = 100 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 100 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_print * 25/40) +support_angle = 45 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 + diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PETG_G.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PETG_G.inst.cfg index c89807e8ea..716ae76dd8 100644 --- a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PETG_G.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PETG_G.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = G definition = strateo3d +name = G +version = 4 [metadata] +material = emotiontech_petg +quality_type = g setting_version = 20 type = quality -quality_type = g -weight = 0 -material = emotiontech_petg variant = Standard 1.2 Experimental +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 37 -speed_wall = =math.ceil(speed_print * 30/37) -speed_wall_0 = =math.ceil(speed_print * 25/37) -speed_topbottom = =math.ceil(speed_print * 33/37) -speed_layer_0 = =math.ceil(speed_print * 25/37) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height cool_fan_speed = 70 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +material_flow = 100 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -material_flow = 100 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/37) +speed_print = 37 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 33/37) +speed_wall = =math.ceil(speed_print * 30/37) +speed_wall_0 = =math.ceil(speed_print * 25/37) +support_angle = 45 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 + diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PETG_H.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PETG_H.inst.cfg index ffac68a7f3..51b45b2f0c 100644 --- a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PETG_H.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PETG_H.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = H definition = strateo3d +name = H +version = 4 [metadata] +material = emotiontech_petg +quality_type = h setting_version = 20 type = quality -quality_type = h -weight = -1 -material = emotiontech_petg variant = Standard 1.2 Experimental +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 35 -speed_wall = =math.ceil(speed_print * 27/35) -speed_wall_0 = =math.ceil(speed_print * 23/35) -speed_topbottom = =math.ceil(speed_print * 30/35) -speed_layer_0 = =math.ceil(speed_print * 25/35) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height cool_fan_speed = 70 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_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +material_flow = 95 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_flow = 95 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/35) +speed_print = 35 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 30/35) +speed_wall = =math.ceil(speed_print * 27/35) +speed_wall_0 = =math.ceil(speed_print * 23/35) +support_angle = 45 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 + diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PLA_F.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PLA_F.inst.cfg index 153a782aaf..94b5d07243 100644 --- a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PLA_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PLA_F.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = F definition = strateo3d +name = F +version = 4 [metadata] +material = emotiontech_pla +quality_type = f setting_version = 20 type = quality -quality_type = f -weight = 1 -material = emotiontech_pla variant = Standard 1.2 Experimental +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_print * 25/40) -speed_topbottom = =math.ceil(speed_print * 35/40) -speed_layer_0 = =math.ceil(speed_print * 25/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height 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 + 3 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +material_flow = 107 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 107 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 35/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_print * 25/40) +support_angle = 45 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 + diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PLA_G.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PLA_G.inst.cfg index 46ce0b58c1..6f42f65543 100644 --- a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PLA_G.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PLA_G.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = G definition = strateo3d +name = G +version = 4 [metadata] +material = emotiontech_pla +quality_type = g setting_version = 20 type = quality -quality_type = g -weight = 0 -material = emotiontech_pla variant = Standard 1.2 Experimental +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 37 -speed_wall = =math.ceil(speed_print * 30/37) -speed_wall_0 = =math.ceil(speed_print * 25/37) -speed_topbottom = =math.ceil(speed_print * 33/37) -speed_layer_0 = =math.ceil(speed_print * 25/37) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height 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 + 3 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +material_flow = 105 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -material_flow = 105 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =2*line_width skin_overlap = 5 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/37) +speed_print = 37 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 33/37) +speed_wall = =math.ceil(speed_print * 30/37) +speed_wall_0 = =math.ceil(speed_print * 25/37) +support_angle = 45 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 + diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PLA_H.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PLA_H.inst.cfg index 13c7657339..7aa07a0ddf 100644 --- a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PLA_H.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PLA_H.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = H definition = strateo3d +name = H +version = 4 [metadata] +material = emotiontech_pla +quality_type = h setting_version = 20 type = quality -quality_type = h -weight = -1 -material = emotiontech_pla variant = Standard 1.2 Experimental +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 35 -speed_wall = =math.ceil(speed_print * 27/35) -speed_wall_0 = =math.ceil(speed_print * 23/35) -speed_topbottom = =math.ceil(speed_print * 30/35) -speed_layer_0 = =math.ceil(speed_print * 25/35) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height 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 + 3 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +material_flow = 103 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_flow = 103 +prime_tower_enable = True retraction_extra_prime_amount = 0.5 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 15 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 25/35) +speed_print = 35 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 30/35) +speed_wall = =math.ceil(speed_print * 27/35) +speed_wall_0 = =math.ceil(speed_print * 23/35) +support_angle = 45 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 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 +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.15 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 + diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-M_F.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-M_F.inst.cfg index 0bb86eecd0..06a56466b5 100644 --- a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-M_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-M_F.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = F definition = strateo3d +name = F +version = 4 [metadata] +material = emotiontech_pva-m +quality_type = f setting_version = 20 type = quality -quality_type = f -weight = 1 -material = emotiontech_pva-m variant = Standard 1.2 Experimental +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 37 -speed_wall = =math.ceil(speed_print * 30/37) -speed_wall_0 = =math.ceil(speed_print * 25/37) -speed_topbottom = =math.ceil(speed_print * 33/37) -speed_layer_0 = =math.ceil(speed_print * 25/37) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +material_flow = 100 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 100 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 25/37) +speed_print = 37 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 33/37) +speed_wall = =math.ceil(speed_print * 30/37) +speed_wall_0 = =math.ceil(speed_print * 25/37) +support_angle = 45 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 + diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-M_G.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-M_G.inst.cfg index 4481bc1fd2..d4c90a99ec 100644 --- a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-M_G.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-M_G.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = G definition = strateo3d +name = G +version = 4 [metadata] +material = emotiontech_pva-m +quality_type = g setting_version = 20 type = quality -quality_type = g -weight = 0 -material = emotiontech_pva-m variant = Standard 1.2 Experimental +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +material_flow = 100 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 100 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 45 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 + diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-M_H.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-M_H.inst.cfg index 061681923f..c05c5697fd 100644 --- a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-M_H.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-M_H.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = H definition = strateo3d +name = H +version = 4 [metadata] +material = emotiontech_pva-m +quality_type = h setting_version = 20 type = quality -quality_type = h -weight = -1 -material = emotiontech_pva-m variant = Standard 1.2 Experimental +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +material_flow = 100 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 100 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 45 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 + diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-S_F.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-S_F.inst.cfg index 150cb78b28..ef4ba55266 100644 --- a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-S_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-S_F.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = F definition = strateo3d +name = F +version = 4 [metadata] +material = emotiontech_pva-s +quality_type = f setting_version = 20 type = quality -quality_type = f -weight = 1 -material = emotiontech_pva-s variant = Standard 1.2 Experimental +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +material_flow = 100 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 100 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 45 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 + diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-S_G.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-S_G.inst.cfg index 1ec15cecb2..8f22c79540 100644 --- a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-S_G.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-S_G.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = G definition = strateo3d +name = G +version = 4 [metadata] +material = emotiontech_pva-s +quality_type = g setting_version = 20 type = quality -quality_type = g -weight = 0 -material = emotiontech_pva-s variant = Standard 1.2 Experimental +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +material_flow = 100 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 100 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 45 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 + diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-S_H.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-S_H.inst.cfg index 28be984377..6222a92c6c 100644 --- a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-S_H.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_PVA-S_H.inst.cfg @@ -1,50 +1,51 @@ [general] -version = 4 -name = H definition = strateo3d +name = H +version = 4 [metadata] +material = emotiontech_pva-s +quality_type = h setting_version = 20 type = quality -quality_type = h -weight = -1 -material = emotiontech_pva-s variant = Standard 1.2 Experimental +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 -wall_0_wipe_dist = =machine_nozzle_size/2 -speed_print = 40 -speed_wall = =math.ceil(speed_print * 30/40) -speed_wall_0 = =math.ceil(speed_wall * 30/40) -speed_topbottom = =math.ceil(speed_print * 20/40) -speed_layer_0 = =math.ceil(speed_print * 20/40) -speed_slowdown_layers = 2 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +material_flow = 100 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 100 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =3*line_width retraction_hop_only_when_collides = True +retraction_min_travel = =3*line_width skin_overlap = 10 +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_print = 40 +speed_slowdown_layers = 2 +speed_topbottom = =math.ceil(speed_print * 20/40) +speed_wall = =math.ceil(speed_print * 30/40) +speed_wall_0 = =math.ceil(speed_wall * 30/40) +support_angle = 45 +support_bottom_distance = =support_z_distance support_bottom_stair_step_height = 0 support_bottom_stair_step_width = 0 -support_z_distance = =layer_height-layer_height -support_bottom_distance = =support_z_distance -support_xy_distance = =line_width * 0.5 -support_xy_distance_overhang = =line_width*0 +support_interface_density = 100 support_offset = 3 support_pattern = grid -support_interface_density = 100 -prime_tower_enable = True +support_xy_distance = =line_width * 0.5 +support_xy_distance_overhang = =line_width*0 +support_z_distance = =layer_height-layer_height +wall_0_wipe_dist = =machine_nozzle_size/2 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.2 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.2 + diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_TPU98A_F.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_TPU98A_F.inst.cfg index d56727d5fb..4ca8c758da 100644 --- a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_TPU98A_F.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_TPU98A_F.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = F definition = strateo3d +name = F +version = 4 [metadata] +material = emotiontech_tpu98a +quality_type = f setting_version = 20 type = quality -quality_type = f -weight = 1 -material = emotiontech_tpu98a variant = Standard 1.2 Experimental +weight = 1 [values] -layer_height_0 = =round(0.5*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.1 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.1 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 -wall_0_wipe_dist = =machine_nozzle_size -speed_print = 35 -speed_wall = =math.ceil(speed_print * 35/35) -speed_wall_0 = =math.ceil(speed_wall * 27/35) -speed_topbottom = =math.ceil(speed_print * 23/35) -speed_layer_0 = =math.ceil(speed_print * 20/35) -speed_slowdown_layers = 1 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.1 +material_flow = 111 material_print_temperature = =default_material_print_temperature + 2 material_print_temperature_layer_0 = =default_material_print_temperature -material_flow = 111 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = False +retraction_min_travel = =2*line_width skin_overlap = 10 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 20/35) +speed_print = 35 +speed_slowdown_layers = 1 +speed_topbottom = =math.ceil(speed_print * 23/35) +speed_wall = =math.ceil(speed_print * 35/35) +speed_wall_0 = =math.ceil(speed_wall * 27/35) +support_angle = 45 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 support_xy_distance = =line_width * 2.5 support_xy_distance_overhang = =wall_line_width_0 -support_offset = 1 -support_interface_density = 100 -prime_tower_enable = True +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.1 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 + diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_TPU98A_G.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_TPU98A_G.inst.cfg index 9dc2029122..35aca049cf 100644 --- a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_TPU98A_G.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_TPU98A_G.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = G definition = strateo3d +name = G +version = 4 [metadata] +material = emotiontech_tpu98a +quality_type = g setting_version = 20 type = quality -quality_type = g -weight = 0 -material = emotiontech_tpu98a variant = Standard 1.2 Experimental +weight = 0 [values] -layer_height_0 = =round(0.67*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.1 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.1 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 -wall_0_wipe_dist = =machine_nozzle_size -speed_print = 35 -speed_wall = =math.ceil(speed_print * 35/35) -speed_wall_0 = =math.ceil(speed_wall * 27/35) -speed_topbottom = =math.ceil(speed_print * 23/35) -speed_layer_0 = =math.ceil(speed_print * 20/35) -speed_slowdown_layers = 1 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.67*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.1 +material_flow = 111 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =default_material_print_temperature + 3 -material_flow = 111 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = False +retraction_min_travel = =2*line_width skin_overlap = 10 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 20/35) +speed_print = 35 +speed_slowdown_layers = 1 +speed_topbottom = =math.ceil(speed_print * 23/35) +speed_wall = =math.ceil(speed_print * 35/35) +speed_wall_0 = =math.ceil(speed_wall * 27/35) +support_angle = 45 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 support_xy_distance = =line_width * 2.5 support_xy_distance_overhang = =wall_line_width_0 -support_offset = 1 -support_interface_density = 100 -prime_tower_enable = True +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.1 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 + diff --git a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_TPU98A_H.inst.cfg b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_TPU98A_H.inst.cfg index 11987cb51d..97aecc9587 100644 --- a/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_TPU98A_H.inst.cfg +++ b/resources/quality/strateo3d/Standard_1.2_Experimental/s3d_std1.2_TPU98A_H.inst.cfg @@ -1,47 +1,48 @@ [general] -version = 4 -name = H definition = strateo3d +name = H +version = 4 [metadata] +material = emotiontech_tpu98a +quality_type = h setting_version = 20 type = quality -quality_type = h -weight = -1 -material = emotiontech_tpu98a variant = Standard 1.2 Experimental +weight = -1 [values] -layer_height_0 = =round(0.75*machine_nozzle_size, 2) -line_width = =machine_nozzle_size/machine_nozzle_size*1.1 -wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.1 -wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 -wall_0_wipe_dist = =machine_nozzle_size -speed_print = 35 -speed_wall = =math.ceil(speed_print * 35/35) -speed_wall_0 = =math.ceil(speed_wall * 27/35) -speed_topbottom = =math.ceil(speed_print * 23/35) -speed_layer_0 = =math.ceil(speed_print * 20/35) -speed_slowdown_layers = 1 cool_fan_enabled = True +cool_fan_full_at_height = =layer_height_0 + 6 * layer_height 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 + 6 * layer_height +cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -support_angle = 45 +layer_height_0 = =round(0.75*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*1.1 +material_flow = 111 material_print_temperature = =default_material_print_temperature + 8 material_print_temperature_layer_0 = =default_material_print_temperature + 5 -material_flow = 111 +prime_tower_enable = True retraction_extra_prime_amount = 0.3 -retraction_min_travel = =2*line_width retraction_hop_only_when_collides = False +retraction_min_travel = =2*line_width skin_overlap = 10 -support_z_distance = =layer_height +speed_layer_0 = =math.ceil(speed_print * 20/35) +speed_print = 35 +speed_slowdown_layers = 1 +speed_topbottom = =math.ceil(speed_print * 23/35) +speed_wall = =math.ceil(speed_print * 35/35) +speed_wall_0 = =math.ceil(speed_wall * 27/35) +support_angle = 45 support_bottom_distance = =support_z_distance +support_interface_density = 100 +support_offset = 1 support_xy_distance = =line_width * 2.5 support_xy_distance_overhang = =wall_line_width_0 -support_offset = 1 -support_interface_density = 100 -prime_tower_enable = True +support_z_distance = =layer_height +wall_0_wipe_dist = =machine_nozzle_size +wall_line_width = =machine_nozzle_size/machine_nozzle_size*1.1 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*1.1 + diff --git a/resources/quality/strateo3d/s3d_global_A.inst.cfg b/resources/quality/strateo3d/s3d_global_A.inst.cfg index f6e897828b..b6fcea4f2c 100644 --- a/resources/quality/strateo3d/s3d_global_A.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_A.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Extra Fine Quality definition = strateo3d +name = Extra Fine Quality +version = 4 [metadata] +global_quality = True +quality_type = a setting_version = 20 type = quality -quality_type = a weight = 0 -global_quality = True [values] layer_height = 0.1 -top_bottom_thickness = =10*layer_height \ No newline at end of file +top_bottom_thickness = =10*layer_height + diff --git a/resources/quality/strateo3d/s3d_global_B.inst.cfg b/resources/quality/strateo3d/s3d_global_B.inst.cfg index 97e115f5d4..21cb677fcc 100644 --- a/resources/quality/strateo3d/s3d_global_B.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_B.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Fine Quality definition = strateo3d +name = Fine Quality +version = 4 [metadata] +global_quality = True +quality_type = b setting_version = 20 type = quality -quality_type = b weight = 0 -global_quality = True [values] layer_height = 0.2 -top_bottom_thickness = =7*layer_height \ No newline at end of file +top_bottom_thickness = =7*layer_height + diff --git a/resources/quality/strateo3d/s3d_global_C.inst.cfg b/resources/quality/strateo3d/s3d_global_C.inst.cfg index efab8b6554..0624841b7b 100644 --- a/resources/quality/strateo3d/s3d_global_C.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_C.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = High Quality definition = strateo3d +name = High Quality +version = 4 [metadata] +global_quality = True +quality_type = c setting_version = 20 type = quality -quality_type = c weight = 0 -global_quality = True [values] layer_height = 0.3 -top_bottom_thickness = =5*layer_height \ No newline at end of file +top_bottom_thickness = =5*layer_height + diff --git a/resources/quality/strateo3d/s3d_global_D.inst.cfg b/resources/quality/strateo3d/s3d_global_D.inst.cfg index e11e265230..9d98443f9a 100644 --- a/resources/quality/strateo3d/s3d_global_D.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_D.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Medium Quality definition = strateo3d +name = Medium Quality +version = 4 [metadata] +global_quality = True +quality_type = d setting_version = 20 type = quality -quality_type = d weight = 0 -global_quality = True [values] layer_height = 0.4 -top_bottom_thickness = =5*layer_height \ No newline at end of file +top_bottom_thickness = =5*layer_height + diff --git a/resources/quality/strateo3d/s3d_global_E.inst.cfg b/resources/quality/strateo3d/s3d_global_E.inst.cfg index 49113ac9d4..02273f4b1b 100644 --- a/resources/quality/strateo3d/s3d_global_E.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_E.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Low Quality definition = strateo3d +name = Low Quality +version = 4 [metadata] +global_quality = True +quality_type = e setting_version = 20 type = quality -quality_type = e weight = 0 -global_quality = True [values] layer_height = 0.5 -top_bottom_thickness = =4*layer_height \ No newline at end of file +top_bottom_thickness = =4*layer_height + diff --git a/resources/quality/strateo3d/s3d_global_F.inst.cfg b/resources/quality/strateo3d/s3d_global_F.inst.cfg index 9251b994a6..5dfb52dcef 100644 --- a/resources/quality/strateo3d/s3d_global_F.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_F.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Coarse Quality definition = strateo3d +name = Coarse Quality +version = 4 [metadata] +global_quality = True +quality_type = f setting_version = 20 type = quality -quality_type = f weight = 0 -global_quality = True [values] layer_height = 0.6 top_bottom_thickness = =4*layer_height + diff --git a/resources/quality/strateo3d/s3d_global_G.inst.cfg b/resources/quality/strateo3d/s3d_global_G.inst.cfg index 63af58d5fe..21636a43d5 100644 --- a/resources/quality/strateo3d/s3d_global_G.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_G.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Extra Coarse Quality definition = strateo3d +name = Extra Coarse Quality +version = 4 [metadata] +global_quality = True +quality_type = g setting_version = 20 type = quality -quality_type = g weight = 0 -global_quality = True [values] layer_height = 0.7 top_bottom_thickness = =3*layer_height + diff --git a/resources/quality/strateo3d/s3d_global_H.inst.cfg b/resources/quality/strateo3d/s3d_global_H.inst.cfg index 72fe2471e4..2b6f77d919 100644 --- a/resources/quality/strateo3d/s3d_global_H.inst.cfg +++ b/resources/quality/strateo3d/s3d_global_H.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Ultra Coarse Quality definition = strateo3d +name = Ultra Coarse Quality +version = 4 [metadata] +global_quality = True +quality_type = h setting_version = 20 type = quality -quality_type = h weight = 0 -global_quality = True [values] layer_height = 0.8 top_bottom_thickness = =3*layer_height + diff --git a/resources/quality/tank_m_base_global_draft.inst.cfg b/resources/quality/tank_m_base_global_draft.inst.cfg index cd5d1a23c0..0553984a58 100644 --- a/resources/quality/tank_m_base_global_draft.inst.cfg +++ b/resources/quality/tank_m_base_global_draft.inst.cfg @@ -1,17 +1,18 @@ -[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 +[general] +definition = tank_m_base +name = Draft Quality +version = 4 + +[metadata] +global_quality = True +quality_type = draft +setting_version = 20 +type = quality + +[values] +layer_height = 0.24 +layer_height_0 = 0.24 +support_interface_height = =layer_height*4 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 + diff --git a/resources/quality/tank_m_base_global_high.inst.cfg b/resources/quality/tank_m_base_global_high.inst.cfg index 26af4239b1..4d5ac5eb13 100644 --- a/resources/quality/tank_m_base_global_high.inst.cfg +++ b/resources/quality/tank_m_base_global_high.inst.cfg @@ -1,18 +1,19 @@ -[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 +[general] +definition = tank_m_base +name = Super Quality +version = 4 + +[metadata] +global_quality = True +quality_type = high +setting_version = 20 +type = quality +weight = -1 + +[values] +layer_height = 0.12 +layer_height_0 = 0.12 +support_interface_height = =layer_height*8 +top_bottom_thickness = =layer_height_0+layer_height*6 +wall_thickness = =line_width*3 + diff --git a/resources/quality/tank_m_base_global_standard.inst.cfg b/resources/quality/tank_m_base_global_standard.inst.cfg index eb7984c7ec..99d2bc6943 100644 --- a/resources/quality/tank_m_base_global_standard.inst.cfg +++ b/resources/quality/tank_m_base_global_standard.inst.cfg @@ -1,18 +1,19 @@ -[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 +[general] +definition = tank_m_base +name = Standard Quality +version = 4 + +[metadata] +global_quality = True +quality_type = standard +setting_version = 20 +type = quality +weight = -3 + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 +support_interface_height = =layer_height*4 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 + diff --git a/resources/quality/tevo_blackwidow/tevo_blackwidow_draft.inst.cfg b/resources/quality/tevo_blackwidow/tevo_blackwidow_draft.inst.cfg index cfa4f9d8b8..1a58f27d30 100644 --- a/resources/quality/tevo_blackwidow/tevo_blackwidow_draft.inst.cfg +++ b/resources/quality/tevo_blackwidow/tevo_blackwidow_draft.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Draft definition = tevo_blackwidow +name = Draft +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] brim_width = 4.0 @@ -30,3 +30,4 @@ support_use_towers = False support_xy_distance = 0.7 top_bottom_thickness = 1.2 wall_thickness = 1.2 + diff --git a/resources/quality/tevo_blackwidow/tevo_blackwidow_high.inst.cfg b/resources/quality/tevo_blackwidow/tevo_blackwidow_high.inst.cfg index 26591b50fe..03f4801740 100644 --- a/resources/quality/tevo_blackwidow/tevo_blackwidow_high.inst.cfg +++ b/resources/quality/tevo_blackwidow/tevo_blackwidow_high.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = High definition = tevo_blackwidow +name = High +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -global_quality = True [values] brim_width = 4.0 @@ -30,3 +30,4 @@ support_use_towers = False support_xy_distance = 0.7 top_bottom_thickness = 1.2 wall_thickness = 1.2 + diff --git a/resources/quality/tevo_blackwidow/tevo_blackwidow_normal.inst.cfg b/resources/quality/tevo_blackwidow/tevo_blackwidow_normal.inst.cfg index 7e0bd21d85..759a00b33a 100644 --- a/resources/quality/tevo_blackwidow/tevo_blackwidow_normal.inst.cfg +++ b/resources/quality/tevo_blackwidow/tevo_blackwidow_normal.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Normal definition = tevo_blackwidow +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] brim_width = 4.0 @@ -30,3 +30,4 @@ support_use_towers = False support_xy_distance = 0.7 top_bottom_thickness = 1.2 wall_thickness = 1.2 + diff --git a/resources/quality/tinyboy/tinyboy_e10_draft.inst.cfg b/resources/quality/tinyboy/tinyboy_e10_draft.inst.cfg index 40d417edfd..2827758d78 100644 --- a/resources/quality/tinyboy/tinyboy_e10_draft.inst.cfg +++ b/resources/quality/tinyboy/tinyboy_e10_draft.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Draft definition = tinyboy_e10 +name = Draft +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = 0 -global_quality = True [values] acceleration_enabled = True @@ -58,3 +58,4 @@ support_use_towers = False support_xy_distance = 0.7 top_bottom_thickness = 1.2 wall_thickness = 1.2 + diff --git a/resources/quality/tinyboy/tinyboy_e10_high.inst.cfg b/resources/quality/tinyboy/tinyboy_e10_high.inst.cfg index e25f53364f..532693f4ac 100644 --- a/resources/quality/tinyboy/tinyboy_e10_high.inst.cfg +++ b/resources/quality/tinyboy/tinyboy_e10_high.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = High definition = tinyboy_e10 +name = High +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 2 -global_quality = True [values] acceleration_enabled = True @@ -58,3 +58,4 @@ support_use_towers = False support_xy_distance = 0.7 top_bottom_thickness = 1.2 wall_thickness = 1.2 + diff --git a/resources/quality/tinyboy/tinyboy_e10_normal.inst.cfg b/resources/quality/tinyboy/tinyboy_e10_normal.inst.cfg index 8190c8e93b..7a90130457 100644 --- a/resources/quality/tinyboy/tinyboy_e10_normal.inst.cfg +++ b/resources/quality/tinyboy/tinyboy_e10_normal.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Normal definition = tinyboy_e10 +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 1 -global_quality = True [values] acceleration_enabled = True @@ -58,3 +58,4 @@ support_use_towers = False support_xy_distance = 0.7 top_bottom_thickness = 1.2 wall_thickness = 1.2 + diff --git a/resources/quality/tinyboy/tinyboy_e16_draft.inst.cfg b/resources/quality/tinyboy/tinyboy_e16_draft.inst.cfg index 4c2346e507..f7f4e84803 100644 --- a/resources/quality/tinyboy/tinyboy_e16_draft.inst.cfg +++ b/resources/quality/tinyboy/tinyboy_e16_draft.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Draft definition = tinyboy_e16 +name = Draft +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = 0 -global_quality = True [values] acceleration_enabled = True @@ -58,3 +58,4 @@ support_use_towers = False support_xy_distance = 0.7 top_bottom_thickness = 1.2 wall_thickness = 1.2 + diff --git a/resources/quality/tinyboy/tinyboy_e16_high.inst.cfg b/resources/quality/tinyboy/tinyboy_e16_high.inst.cfg index a8c2e0d7b4..d360b19ad9 100644 --- a/resources/quality/tinyboy/tinyboy_e16_high.inst.cfg +++ b/resources/quality/tinyboy/tinyboy_e16_high.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = High definition = tinyboy_e16 +name = High +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 2 -global_quality = True [values] acceleration_enabled = True @@ -58,3 +58,4 @@ support_use_towers = False support_xy_distance = 0.7 top_bottom_thickness = 1.2 wall_thickness = 1.2 + diff --git a/resources/quality/tinyboy/tinyboy_e16_normal.inst.cfg b/resources/quality/tinyboy/tinyboy_e16_normal.inst.cfg index e0de549db8..d39208ffd3 100644 --- a/resources/quality/tinyboy/tinyboy_e16_normal.inst.cfg +++ b/resources/quality/tinyboy/tinyboy_e16_normal.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Normal definition = tinyboy_e16 +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 1 -global_quality = True [values] acceleration_enabled = True @@ -58,3 +58,4 @@ support_use_towers = False support_xy_distance = 0.7 top_bottom_thickness = 1.2 wall_thickness = 1.2 + diff --git a/resources/quality/tinyboy/tinyboy_fabrikator15_draft.inst.cfg b/resources/quality/tinyboy/tinyboy_fabrikator15_draft.inst.cfg index cf6c5a01fd..d8a992b737 100644 --- a/resources/quality/tinyboy/tinyboy_fabrikator15_draft.inst.cfg +++ b/resources/quality/tinyboy/tinyboy_fabrikator15_draft.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Draft definition = tinyboy_fabrikator15 +name = Draft +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = 0 -global_quality = True [values] acceleration_enabled = True @@ -56,3 +56,4 @@ support_use_towers = False support_xy_distance = 0.7 top_bottom_thickness = 1.2 wall_thickness = 1.2 + diff --git a/resources/quality/tinyboy/tinyboy_fabrikator15_high.inst.cfg b/resources/quality/tinyboy/tinyboy_fabrikator15_high.inst.cfg index f458a2b6fb..36d7e3da9d 100644 --- a/resources/quality/tinyboy/tinyboy_fabrikator15_high.inst.cfg +++ b/resources/quality/tinyboy/tinyboy_fabrikator15_high.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = High definition = tinyboy_fabrikator15 +name = High +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 2 -global_quality = True [values] acceleration_enabled = True @@ -56,3 +56,4 @@ support_use_towers = False support_xy_distance = 0.7 top_bottom_thickness = 1.2 wall_thickness = 1.2 + diff --git a/resources/quality/tinyboy/tinyboy_fabrikator15_normal.inst.cfg b/resources/quality/tinyboy/tinyboy_fabrikator15_normal.inst.cfg index 21f06c3bff..2b9624eda7 100644 --- a/resources/quality/tinyboy/tinyboy_fabrikator15_normal.inst.cfg +++ b/resources/quality/tinyboy/tinyboy_fabrikator15_normal.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Normal definition = tinyboy_fabrikator15 +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 1 -global_quality = True [values] acceleration_enabled = True @@ -56,3 +56,4 @@ support_use_towers = False support_xy_distance = 0.7 top_bottom_thickness = 1.2 wall_thickness = 1.2 + diff --git a/resources/quality/tinyboy/tinyboy_ra20_draft.inst.cfg b/resources/quality/tinyboy/tinyboy_ra20_draft.inst.cfg index 5bca9cd870..e170e4f3ec 100644 --- a/resources/quality/tinyboy/tinyboy_ra20_draft.inst.cfg +++ b/resources/quality/tinyboy/tinyboy_ra20_draft.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Draft definition = tinyboy_ra20 +name = Draft +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = 0 -global_quality = True [values] acceleration_enabled = True @@ -58,3 +58,4 @@ support_use_towers = False support_xy_distance = 0.7 top_bottom_thickness = 1.2 wall_thickness = 1.2 + diff --git a/resources/quality/tinyboy/tinyboy_ra20_high.inst.cfg b/resources/quality/tinyboy/tinyboy_ra20_high.inst.cfg index bdf1717fe3..e262588409 100644 --- a/resources/quality/tinyboy/tinyboy_ra20_high.inst.cfg +++ b/resources/quality/tinyboy/tinyboy_ra20_high.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = High definition = tinyboy_ra20 +name = High +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 2 -global_quality = True [values] acceleration_enabled = True @@ -58,3 +58,4 @@ support_use_towers = False support_xy_distance = 0.7 top_bottom_thickness = 1.2 wall_thickness = 1.2 + diff --git a/resources/quality/tinyboy/tinyboy_ra20_normal.inst.cfg b/resources/quality/tinyboy/tinyboy_ra20_normal.inst.cfg index 03a67f7f8b..e1e7c9660e 100644 --- a/resources/quality/tinyboy/tinyboy_ra20_normal.inst.cfg +++ b/resources/quality/tinyboy/tinyboy_ra20_normal.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Normal definition = tinyboy_ra20 +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 1 -global_quality = True [values] acceleration_enabled = True @@ -58,3 +58,4 @@ support_use_towers = False support_xy_distance = 0.7 top_bottom_thickness = 1.2 wall_thickness = 1.2 + diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.2_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.2_abs_high.inst.cfg index a4a3cc585f..27d0e95bab 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.2_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.2_abs_high.inst.cfg @@ -1,16 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy +name = High +version = 4 [metadata] +material = generic_abs +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_abs variant = 0.2mm +weight = 1 [values] - diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.3_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.3_abs_high.inst.cfg index 41ef93fa02..f7d7654e75 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.3_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.3_abs_high.inst.cfg @@ -1,16 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy +name = High +version = 4 [metadata] +material = generic_abs +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_abs variant = 0.3mm +weight = 1 [values] - diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_high.inst.cfg index bf8ae72e3d..0353dd4fbe 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_high.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy +name = High +version = 4 [metadata] +material = generic_abs +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_abs variant = 0.4mm +weight = 1 [values] diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_normal.inst.cfg index 2cabac821f..89fdacbe81 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.4_abs_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = tizyx_evy +name = Normal +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_abs variant = 0.4mm +weight = 0 [values] diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_draft.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_draft.inst.cfg index 231947c3f0..571e666e36 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_draft.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_draft.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Coarse definition = tizyx_evy +name = Coarse +version = 4 [metadata] +material = generic_abs +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_abs variant = 0.5mm +weight = -2 [values] diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_high.inst.cfg index 3ae4c0fd39..66c68fdda1 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_high.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy +name = High +version = 4 [metadata] +material = generic_abs +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_abs variant = 0.5mm +weight = 1 [values] diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_normal.inst.cfg index 78b3c82d16..5a81b9ee1f 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.5_abs_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = tizyx_evy +name = Normal +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_abs variant = 0.5mm +weight = 0 [values] diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_coarse.inst.cfg index e5e1ba63ac..449df5702f 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_coarse.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Coarse definition = tizyx_evy +name = Coarse +version = 4 [metadata] +material = generic_abs +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -2 -material = generic_abs variant = 0.6mm +weight = -2 [values] diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_high.inst.cfg index 4611feee97..f9329ade59 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_high.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy +name = High +version = 4 [metadata] +material = generic_abs +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_abs variant = 0.6mm +weight = 1 [values] diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_normal.inst.cfg index 47d8295e76..a6a1660f3b 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.6_abs_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = tizyx_evy +name = Normal +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_abs variant = 0.6mm +weight = 0 [values] diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_extra_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_extra_coarse.inst.cfg index 6bf8fddeb8..66296fc59f 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_extra_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_extra_coarse.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Coarse definition = tizyx_evy +name = Coarse +version = 4 [metadata] +material = generic_abs +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -2 -material = generic_abs variant = 0.8mm +weight = -2 [values] diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_high.inst.cfg index 2c6fcd4c91..cd35bb8a83 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_high.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy +name = High +version = 4 [metadata] +material = generic_abs +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_abs variant = 0.8mm +weight = 1 [values] diff --git a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_normal.inst.cfg index 788977b879..2e62df1b4e 100644 --- a/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_0.8_abs_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = tizyx_evy +name = Normal +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_abs variant = 0.8mm +weight = 0 [values] diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.2_flex_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.2_flex_high.inst.cfg index 653b295db1..2fb3527443 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.2_flex_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.2_flex_high.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy +name = High +version = 4 [metadata] +material = tizyx_flex +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = tizyx_flex variant = 0.2mm +weight = 1 [values] speed_infill = 25 @@ -18,3 +18,4 @@ speed_print = 30 speed_topbottom = 25 speed_wall_0 = 20 speed_wall_x = 20 + diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.3_flex_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.3_flex_high.inst.cfg index 3450aeae89..21a6a4aa10 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.3_flex_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.3_flex_high.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy +name = High +version = 4 [metadata] +material = tizyx_flex +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = tizyx_flex variant = 0.3mm +weight = 1 [values] speed_infill = 25 @@ -18,3 +18,4 @@ speed_print = 30 speed_topbottom = 25 speed_wall_0 = 20 speed_wall_x = 20 + diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_high.inst.cfg index df89a0752f..bd0fcc31f8 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_high.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy +name = High +version = 4 [metadata] +material = tizyx_flex +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = tizyx_flex variant = 0.4mm +weight = 1 [values] speed_infill = 25 @@ -18,3 +18,4 @@ speed_print = 30 speed_topbottom = 25 speed_wall_0 = 20 speed_wall_x = 20 + diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_normal.inst.cfg index fcf892ac5a..3026dca422 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.4_flex_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = tizyx_evy +name = Normal +version = 4 [metadata] +material = tizyx_flex +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = tizyx_flex variant = 0.4mm +weight = 0 [values] speed_infill = 25 @@ -18,3 +18,4 @@ speed_print = 30 speed_topbottom = 25 speed_wall_0 = 20 speed_wall_x = 20 + diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_draft.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_draft.inst.cfg index e9a93be3a8..0ae854c193 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_draft.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_draft.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Draft definition = tizyx_evy +name = Draft +version = 4 [metadata] +material = tizyx_flex +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = tizyx_flex variant = 0.5mm +weight = -2 [values] speed_infill = 25 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_high.inst.cfg index d86fd060b5..21d9c47c9b 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_high.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy +name = High +version = 4 [metadata] +material = tizyx_flex +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = tizyx_flex variant = 0.5mm +weight = 1 [values] speed_infill = 25 @@ -18,3 +18,4 @@ speed_print = 30 speed_topbottom = 25 speed_wall_0 = 20 speed_wall_x = 20 + diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_normal.inst.cfg index 41e6dc80fe..3d3d91c2b5 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.5_flex_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = tizyx_evy +name = Normal +version = 4 [metadata] +material = tizyx_flex +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = tizyx_flex variant = 0.5mm +weight = 0 [values] speed_infill = 25 @@ -18,3 +18,4 @@ speed_print = 30 speed_topbottom = 25 speed_wall_0 = 20 speed_wall_x = 20 + diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_coarse.inst.cfg index b96af951d9..63b5a0cd0f 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_coarse.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Draft definition = tizyx_evy +name = Draft +version = 4 [metadata] +material = tizyx_flex +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -2 -material = tizyx_flex variant = 0.6mm +weight = -2 [values] speed_infill = 25 @@ -18,3 +18,4 @@ speed_print = 30 speed_topbottom = 25 speed_wall_0 = 20 speed_wall_x = 20 + diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_high.inst.cfg index 5aff229a5c..7a75200f6d 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_high.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy +name = High +version = 4 [metadata] +material = tizyx_flex +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = tizyx_flex variant = 0.6mm +weight = 1 [values] speed_infill = 25 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_normal.inst.cfg index b3ffaced4d..19cc16f9df 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.6_flex_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = tizyx_evy +name = Normal +version = 4 [metadata] +material = tizyx_flex +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = tizyx_flex variant = 0.6mm +weight = 0 [values] speed_infill = 25 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_extra_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_extra_coarse.inst.cfg index 95f44f8d87..8cf4b1847d 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_extra_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_extra_coarse.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Draft definition = tizyx_evy +name = Draft +version = 4 [metadata] +material = tizyx_flex +quality_type = extra coarse setting_version = 20 type = quality -quality_type = extra coarse -weight = -2 -material = tizyx_flex variant = 0.8mm +weight = -2 [values] speed_infill = 25 diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_high.inst.cfg index 6a9078795d..57f548d2c1 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_high.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy +name = High +version = 4 [metadata] +material = tizyx_flex +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = tizyx_flex variant = 0.8mm +weight = 1 [values] speed_infill = 25 @@ -18,3 +18,4 @@ speed_print = 30 speed_topbottom = 25 speed_wall_0 = 20 speed_wall_x = 20 + diff --git a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_normal.inst.cfg index a0940d2614..a03ef9db14 100644 --- a/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/flex/tizyx_evy_0.8_flex_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = tizyx_evy +name = Normal +version = 4 [metadata] +material = tizyx_flex +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = tizyx_flex variant = 0.8mm +weight = 0 [values] speed_infill = 25 @@ -18,3 +18,4 @@ speed_print = 30 speed_topbottom = 25 speed_wall_0 = 20 speed_wall_x = 20 + diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.2_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.2_petg_high.inst.cfg index 877bf4702b..f6c995b274 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.2_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.2_petg_high.inst.cfg @@ -1,16 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy +name = High +version = 4 [metadata] +material = generic_petg +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_petg variant = 0.2mm +weight = 1 [values] - diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.3_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.3_petg_high.inst.cfg index 65e464d18a..e17a1104cd 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.3_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.3_petg_high.inst.cfg @@ -1,16 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy +name = High +version = 4 [metadata] +material = generic_petg +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_petg variant = 0.3mm +weight = 1 [values] - diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_high.inst.cfg index 285e9ca6fc..ba02e838c7 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_high.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy +name = High +version = 4 [metadata] +material = generic_petg +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_petg variant = 0.4mm +weight = 1 [values] diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_normal.inst.cfg index 6c4e1ab358..a9eabd107b 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.4_petg_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = tizyx_evy +name = Normal +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_petg variant = 0.4mm +weight = 0 [values] diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_draft.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_draft.inst.cfg index c14de315f1..7d27443348 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_draft.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_draft.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Coarse definition = tizyx_evy +name = Coarse +version = 4 [metadata] +material = generic_petg +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_petg variant = 0.5mm +weight = -2 [values] diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_high.inst.cfg index d4d315f3e9..a91cd120f9 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_high.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy +name = High +version = 4 [metadata] +material = generic_petg +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_petg variant = 0.5mm +weight = 1 [values] diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_normal.inst.cfg index f5cb1d1323..407f20691b 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.5_petg_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = tizyx_evy +name = Normal +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_petg variant = 0.5mm +weight = 0 [values] diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_coarse.inst.cfg index f0ad843e3f..8d6bd85fb0 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_coarse.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Coarse definition = tizyx_evy +name = Coarse +version = 4 [metadata] +material = generic_petg +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -2 -material = generic_petg variant = 0.6mm +weight = -2 [values] diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_high.inst.cfg index 929f10a186..88feb7b6bd 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_high.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy +name = High +version = 4 [metadata] +material = generic_petg +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_petg variant = 0.6mm +weight = 1 [values] diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_normal.inst.cfg index a70078f8b8..c8b312fbbd 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = tizyx_evy +name = Normal +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_petg variant = 0.6mm +weight = 0 [values] diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_extra_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_extra_coarse.inst.cfg index e9a165b668..91b02dca20 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_extra_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_extra_coarse.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Coarse definition = tizyx_evy +name = Coarse +version = 4 [metadata] +material = generic_petg +quality_type = extra coarse setting_version = 20 type = quality -quality_type = extra coarse -weight = -2 -material = generic_petg variant = 0.8mm +weight = -2 [values] diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_high.inst.cfg index 2c7cde39f8..0424396e4a 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_high.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy +name = High +version = 4 [metadata] +material = generic_petg +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_petg variant = 0.8mm +weight = 1 [values] diff --git a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_normal.inst.cfg index 2e2516f110..8f3581ee0f 100644 --- a/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.8_petg_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = tizyx_evy +name = Normal +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_petg variant = 0.8mm +weight = 0 [values] diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.2_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.2_pla_high.inst.cfg index 2e3cc240ac..0c6e22e638 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.2_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.2_pla_high.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy +name = High +version = 4 [metadata] +material = generic_pla +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pla variant = 0.2mm +weight = 1 [values] + diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.3_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.3_pla_high.inst.cfg index c60cf04161..128c5faec4 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.3_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.3_pla_high.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy +name = High +version = 4 [metadata] +material = generic_pla +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pla variant = 0.3mm +weight = 1 [values] + diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_high.inst.cfg index 36cda26610..fb298572c6 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_high.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy +name = High +version = 4 [metadata] +material = generic_pla +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pla variant = 0.4mm +weight = 1 [values] + diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_normal.inst.cfg index 4f26254a60..c234437fb6 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.4_pla_normal.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Normal definition = tizyx_evy +name = Normal +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pla variant = 0.4mm +weight = 0 [values] + diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_draft.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_draft.inst.cfg index c45ba6d574..00ddac0066 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_draft.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_draft.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft definition = tizyx_evy +name = Draft +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pla variant = 0.5mm +weight = -2 [values] + diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_high.inst.cfg index 549f3abf5e..15810daca1 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_high.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy +name = High +version = 4 [metadata] +material = generic_pla +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pla variant = 0.5mm +weight = 1 [values] + diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_normal.inst.cfg index b51b5043ca..4af9dd7af3 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.5_pla_normal.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Normal definition = tizyx_evy +name = Normal +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pla variant = 0.5mm +weight = 0 [values] + diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_coarse.inst.cfg index 360ad97678..d58964b5ee 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_coarse.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft definition = tizyx_evy +name = Draft +version = 4 [metadata] +material = generic_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -2 -material = generic_pla variant = 0.6mm +weight = -2 [values] + diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_high.inst.cfg index 0fb0c69c81..50de20ba44 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_high.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy +name = High +version = 4 [metadata] +material = generic_pla +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pla variant = 0.6mm +weight = 1 [values] + diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_normal.inst.cfg index f1d5d994cc..eeaf667d6e 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.6_pla_normal.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Normal definition = tizyx_evy +name = Normal +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pla variant = 0.6mm +weight = 0 [values] + diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_extra_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_extra_coarse.inst.cfg index d4bdccc8ad..d945eaa77c 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_extra_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_extra_coarse.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Draft definition = tizyx_evy +name = Draft +version = 4 [metadata] +material = generic_pla +quality_type = extra coarse setting_version = 20 type = quality -quality_type = extra coarse -weight = -2 -material = generic_pla variant = 0.8mm +weight = -2 [values] diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_high.inst.cfg index 759b9e5aa7..80dae153df 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_high.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy +name = High +version = 4 [metadata] +material = generic_pla +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pla variant = 0.8mm +weight = 1 [values] + diff --git a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_normal.inst.cfg index e85c0e6fdb..d64c42e472 100644 --- a/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_normal.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Normal definition = tizyx_evy +name = Normal +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pla variant = 0.8mm +weight = 0 [values] + diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.2_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.2_pla_bois_high.inst.cfg index a6bd360e9d..a6586d905b 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.2_pla_bois_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.2_pla_bois_high.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy +name = High +version = 4 [metadata] +material = tizyx_pla_bois +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = tizyx_pla_bois variant = 0.2mm +weight = 1 [values] + diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.3_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.3_pla_bois_high.inst.cfg index ed4e92570a..73f04ada61 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.3_pla_bois_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.3_pla_bois_high.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy +name = High +version = 4 [metadata] +material = tizyx_pla_bois +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = tizyx_pla_bois variant = 0.3mm +weight = 1 [values] + diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_high.inst.cfg index 47b22b926d..7a90215b73 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_high.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy +name = High +version = 4 [metadata] +material = tizyx_pla_bois +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = tizyx_pla_bois variant = 0.4mm +weight = 1 [values] + diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_normal.inst.cfg index a01f816ea7..c1c012dbd5 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.4_pla_bois_normal.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Normal definition = tizyx_evy +name = Normal +version = 4 [metadata] +material = tizyx_pla_bois +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = tizyx_pla_bois variant = 0.4mm +weight = 0 [values] + diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_draft.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_draft.inst.cfg index 442e949948..8b78fde096 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_draft.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_draft.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Draft definition = tizyx_evy +name = Draft +version = 4 [metadata] +material = tizyx_pla_bois +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = tizyx_pla_bois variant = 0.5mm +weight = -2 [values] diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_high.inst.cfg index 51c7b2facc..c269192771 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_high.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy +name = High +version = 4 [metadata] +material = tizyx_pla_bois +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = tizyx_pla_bois variant = 0.5mm +weight = 1 [values] + diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_normal.inst.cfg index d95f294ebf..75df0eeae7 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.5_pla_bois_normal.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Normal definition = tizyx_evy +name = Normal +version = 4 [metadata] +material = tizyx_pla_bois +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = tizyx_pla_bois variant = 0.5mm +weight = 0 [values] + diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_coarse.inst.cfg index 0b21a7789c..083b3c4143 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_coarse.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft definition = tizyx_evy +name = Draft +version = 4 [metadata] +material = tizyx_pla_bois +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -2 -material = tizyx_pla_bois variant = 0.6mm +weight = -2 [values] + diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_high.inst.cfg index 8ba7d2fab0..139fdfa4f2 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_high.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy +name = High +version = 4 [metadata] +material = tizyx_pla_bois +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = tizyx_pla_bois variant = 0.6mm +weight = 1 [values] + diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_normal.inst.cfg index c055711c94..b57dd1e8cf 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.6_pla_bois_normal.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Normal definition = tizyx_evy +name = Normal +version = 4 [metadata] +material = tizyx_pla_bois +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = tizyx_pla_bois variant = 0.6mm +weight = 0 [values] + diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_extra_coarse.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_extra_coarse.inst.cfg index c6a66926e6..cf16ec8358 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_extra_coarse.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_extra_coarse.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Draft definition = tizyx_evy +name = Draft +version = 4 [metadata] +material = tizyx_pla_bois +quality_type = extra coarse setting_version = 20 type = quality -quality_type = extra coarse -weight = -2 -material = tizyx_pla_bois variant = 0.8mm +weight = -2 [values] diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_high.inst.cfg index 87ae5777c2..e74c50ee5b 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_high.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy +name = High +version = 4 [metadata] +material = tizyx_pla_bois +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = tizyx_pla_bois variant = 0.8mm +weight = 1 [values] + diff --git a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_normal.inst.cfg index 9ba555be30..e620152cc9 100644 --- a/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/pla_bois/tizyx_evy_0.8_pla_bois_normal.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Normal definition = tizyx_evy +name = Normal +version = 4 [metadata] +material = tizyx_pla_bois +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = tizyx_pla_bois variant = 0.8mm +weight = 0 [values] + diff --git a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Coarse_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Coarse_Quality.inst.cfg index cf1620cf12..de84ea5149 100644 --- a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Coarse_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Coarse_Quality.inst.cfg @@ -1,44 +1,45 @@ [general] -version = 4 -name = Draft definition = tizyx_evy +name = Draft +version = 4 [metadata] +global_quality = True +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = -2 -global_quality = True [values] -layer_height = 0.3 -layer_height_0 = =layer_height -initial_layer_line_width_factor = 90 -infill_overlap = 15 -material_flow_layer_0 = 93 -material_flow = 99 -retraction_amount = 5 -retraction_speed = 60 -speed_wall_0 = 45 -speed_wall_x = 50 -speed_topbottom = 45 -support_enable= True -support_angle = 70 adhesion_type = skirt -skirt_line_count = 2 -skirt_gap = 2 -fill_outline_gaps = True -infill_sparse_density = 15 -retraction_min_travel = 2 -speed_print = 60 +coasting_enable = False cool_fan_speed_0 = 10 cool_min_layer_time = 12 +fill_outline_gaps = True +infill_overlap = 15 +infill_sparse_density = 15 +initial_layer_line_width_factor = 90 +layer_height = 0.3 +layer_height_0 = =layer_height layer_start_x = 250 layer_start_y = 250 -coasting_enable = False +material_final_print_temperature = =material_print_temperature +material_flow = 99 +material_flow_layer_0 = 93 +material_initial_print_temperature = =material_print_temperature +material_print_temperature = =default_material_print_temperature +optimize_wall_printing_order = True +retraction_amount = 5 +retraction_min_travel = 2 +retraction_speed = 60 +skirt_gap = 2 +skirt_line_count = 2 +speed_print = 60 +speed_topbottom = 45 +speed_wall_0 = 45 +speed_wall_x = 50 +support_angle = 70 +support_enable = True wall_line_count = 2 -material_print_temperature = =default_material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_final_print_temperature = =material_print_temperature z_seam_corner = z_seam_corner_none -optimize_wall_printing_order = True \ No newline at end of file + diff --git a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Draft_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Draft_Quality.inst.cfg index dca9945e0e..19afd4fadc 100644 --- a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Draft_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Draft_Quality.inst.cfg @@ -1,44 +1,45 @@ [general] -version = 4 -name = Draft definition = tizyx_evy +name = Draft +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] -layer_height = 0.25 -layer_height_0 = =layer_height -initial_layer_line_width_factor = 90 -infill_overlap = 15 -material_flow_layer_0 = 93 -material_flow = 99 -retraction_amount = 5 -retraction_speed = 60 -speed_wall_0 = 45 -speed_wall_x = 50 -speed_topbottom = 45 -support_enable= True -support_angle = 70 adhesion_type = skirt -skirt_line_count = 2 -skirt_gap = 2 -fill_outline_gaps = True -infill_sparse_density = 15 -retraction_min_travel = 2 -speed_print = 60 +coasting_enable = False cool_fan_speed_0 = 10 cool_min_layer_time = 12 +fill_outline_gaps = True +infill_overlap = 15 +infill_sparse_density = 15 +initial_layer_line_width_factor = 90 +layer_height = 0.25 +layer_height_0 = =layer_height layer_start_x = 250 layer_start_y = 250 -coasting_enable = False +material_final_print_temperature = =material_print_temperature +material_flow = 99 +material_flow_layer_0 = 93 +material_initial_print_temperature = =material_print_temperature +material_print_temperature = =default_material_print_temperature +optimize_wall_printing_order = True +retraction_amount = 5 +retraction_min_travel = 2 +retraction_speed = 60 +skirt_gap = 2 +skirt_line_count = 2 +speed_print = 60 +speed_topbottom = 45 +speed_wall_0 = 45 +speed_wall_x = 50 +support_angle = 70 +support_enable = True wall_line_count = 2 -material_print_temperature = =default_material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_final_print_temperature = =material_print_temperature z_seam_corner = z_seam_corner_none -optimize_wall_printing_order = True \ No newline at end of file + diff --git a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Extra_Coarse_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Extra_Coarse_Quality.inst.cfg index 6839760843..57c6a94461 100644 --- a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Extra_Coarse_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Extra_Coarse_Quality.inst.cfg @@ -1,44 +1,45 @@ [general] -version = 4 -name = Draft definition = tizyx_evy +name = Draft +version = 4 [metadata] +global_quality = True +quality_type = extra coarse setting_version = 20 type = quality -quality_type = extra coarse weight = -2 -global_quality = True [values] -layer_height = 0.4 -layer_height_0 = =layer_height -initial_layer_line_width_factor = 90 -infill_overlap = 15 -material_flow_layer_0 = 93 -material_flow = 99 -retraction_amount = 5 -retraction_speed = 60 -speed_wall_0 = 45 -speed_wall_x = 50 -speed_topbottom = 45 -support_enable= True -support_angle = 70 adhesion_type = skirt -skirt_line_count = 2 -skirt_gap = 2 -fill_outline_gaps = True -infill_sparse_density = 15 -retraction_min_travel = 2 -speed_print = 60 +coasting_enable = False cool_fan_speed_0 = 10 cool_min_layer_time = 12 +fill_outline_gaps = True +infill_overlap = 15 +infill_sparse_density = 15 +initial_layer_line_width_factor = 90 +layer_height = 0.4 +layer_height_0 = =layer_height layer_start_x = 250 layer_start_y = 250 -coasting_enable = False +material_final_print_temperature = =material_print_temperature +material_flow = 99 +material_flow_layer_0 = 93 +material_initial_print_temperature = =material_print_temperature +material_print_temperature = =default_material_print_temperature +optimize_wall_printing_order = True +retraction_amount = 5 +retraction_min_travel = 2 +retraction_speed = 60 +skirt_gap = 2 +skirt_line_count = 2 +speed_print = 60 +speed_topbottom = 45 +speed_wall_0 = 45 +speed_wall_x = 50 +support_angle = 70 +support_enable = True wall_line_count = 2 -material_print_temperature = =default_material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_final_print_temperature = =material_print_temperature z_seam_corner = z_seam_corner_none -optimize_wall_printing_order = True \ No newline at end of file + diff --git a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_High_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_High_Quality.inst.cfg index 313fc8e774..b8e3789279 100644 --- a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_High_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_High_Quality.inst.cfg @@ -1,44 +1,45 @@ [general] -version = 4 -name = High definition = tizyx_evy +name = High +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -global_quality = True [values] -layer_height = 0.1 -layer_height_0 = 0.1 -initial_layer_line_width_factor = 90 -infill_overlap = 15 -material_flow_layer_0 = 93 -material_flow = 99 -retraction_amount = 5 -retraction_speed = 60 -speed_wall_0 = 45 -speed_wall_x = 50 -speed_topbottom = 45 -support_enable= True -support_angle = 70 adhesion_type = skirt -skirt_line_count = 2 -skirt_gap = 2 -fill_outline_gaps = True -infill_sparse_density = 15 -retraction_min_travel = 2 -speed_print = 60 +coasting_enable = False cool_fan_speed_0 = 10 cool_min_layer_time = 12 +fill_outline_gaps = True +infill_overlap = 15 +infill_sparse_density = 15 +initial_layer_line_width_factor = 90 +layer_height = 0.1 +layer_height_0 = 0.1 layer_start_x = 250 layer_start_y = 250 -coasting_enable = False +material_final_print_temperature = =material_print_temperature +material_flow = 99 +material_flow_layer_0 = 93 +material_initial_print_temperature = =material_print_temperature +material_print_temperature = =default_material_print_temperature +optimize_wall_printing_order = True +retraction_amount = 5 +retraction_min_travel = 2 +retraction_speed = 60 +skirt_gap = 2 +skirt_line_count = 2 +speed_print = 60 +speed_topbottom = 45 +speed_wall_0 = 45 +speed_wall_x = 50 +support_angle = 70 +support_enable = True wall_line_count = 2 -material_print_temperature = =default_material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_final_print_temperature = =material_print_temperature z_seam_corner = z_seam_corner_none -optimize_wall_printing_order = True \ No newline at end of file + diff --git a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Normal_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Normal_Quality.inst.cfg index 22f6e52139..d8c441706d 100644 --- a/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Normal_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy/tizyx_evy_global_Normal_Quality.inst.cfg @@ -1,44 +1,45 @@ [general] -version = 4 -name = Normal definition = tizyx_evy +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] -layer_height = 0.2 -layer_height_0 = 0.25 -initial_layer_line_width_factor = 90 -infill_overlap = 15 -material_flow_layer_0 = 93 -material_flow = 99 -retraction_amount = 5 -retraction_speed = 60 -speed_wall_0 = 45 -speed_wall_x = 50 -speed_topbottom = 45 -support_enable= True -support_angle = 70 adhesion_type = skirt -skirt_line_count = 2 -skirt_gap = 2 -fill_outline_gaps = True -infill_sparse_density = 15 -retraction_min_travel = 2 -speed_print = 60 +coasting_enable = False cool_fan_speed_0 = 10 cool_min_layer_time = 12 +fill_outline_gaps = True +infill_overlap = 15 +infill_sparse_density = 15 +initial_layer_line_width_factor = 90 +layer_height = 0.2 +layer_height_0 = 0.25 layer_start_x = 250 layer_start_y = 250 -coasting_enable = False +material_final_print_temperature = =material_print_temperature +material_flow = 99 +material_flow_layer_0 = 93 +material_initial_print_temperature = =material_print_temperature +material_print_temperature = =default_material_print_temperature +optimize_wall_printing_order = True +retraction_amount = 5 +retraction_min_travel = 2 +retraction_speed = 60 +skirt_gap = 2 +skirt_line_count = 2 +speed_print = 60 +speed_topbottom = 45 +speed_wall_0 = 45 +speed_wall_x = 50 +support_angle = 70 +support_enable = True wall_line_count = 2 -material_print_temperature = =default_material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_final_print_temperature = =material_print_temperature z_seam_corner = z_seam_corner_none -optimize_wall_printing_order = True \ No newline at end of file + diff --git a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_high.inst.cfg index 8ac155c871..0f1b3cfbfd 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_high.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy_dual +name = High +version = 4 [metadata] +material = generic_abs +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_abs variant = Classic Extruder +weight = 1 [values] cool_fan_speed_0 = 100 @@ -34,7 +34,8 @@ skirt_line_count = 2 speed_print = 60 speed_topbottom = 50 speed_wall_0 = 40 +switch_extruder_retraction_amount = 100 +switch_extruder_retraction_speeds = 70 top_layers = 4 wall_line_count = 2 -switch_extruder_retraction_amount = 100 -switch_extruder_retraction_speeds = 70 \ No newline at end of file + diff --git a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_normal.inst.cfg index 4f07cb96c1..2f32f2d135 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_classic_abs_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = tizyx_evy_dual +name = Normal +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_abs variant = Classic Extruder +weight = 0 [values] cool_fan_speed_0 = 100 @@ -34,7 +34,8 @@ skirt_line_count = 2 speed_print = 60 speed_topbottom = 50 speed_wall_0 = 40 +switch_extruder_retraction_amount = 100 +switch_extruder_retraction_speeds = 70 top_layers = 4 wall_line_count = 2 -switch_extruder_retraction_amount = 100 -switch_extruder_retraction_speeds = 70 \ No newline at end of file + diff --git a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_high.inst.cfg index 3901df9143..5eb47f921b 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_high.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy_dual +name = High +version = 4 [metadata] +material = generic_abs +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_abs variant = Direct Drive +weight = 1 [values] default_material_print_temperature = 210 @@ -28,3 +28,4 @@ retraction_hop_only_when_collides = False skirt_brim_minimal_length = 100 switch_extruder_retraction_amount = 72 switch_extruder_retraction_speeds = 70 + diff --git a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_normal.inst.cfg index cc20f3a9d6..390c7240d7 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/abs/tizyx_evy_dual_direct_drive_abs_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = tizyx_evy_dual +name = Normal +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_abs variant = Direct Drive +weight = 0 [values] default_material_print_temperature = 210 @@ -27,4 +27,5 @@ retraction_hop_enabled = True retraction_hop_only_when_collides = False skirt_brim_minimal_length = 100 switch_extruder_retraction_amount = 72 -switch_extruder_retraction_speeds = 70 \ No newline at end of file +switch_extruder_retraction_speeds = 70 + diff --git a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex.inst.cfg index 8748dd4e3a..18a4a84263 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Flex and PLA definition = tizyx_evy_dual +name = Flex and PLA +version = 4 [metadata] +material = tizyx_flex +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = tizyx_flex variant = Classic Extruder +weight = -2 [values] cool_fan_speed_0 = 100 @@ -34,7 +34,8 @@ skirt_line_count = 2 speed_print = 60 speed_topbottom = 50 speed_wall_0 = 40 +switch_extruder_retraction_amount = 100 +switch_extruder_retraction_speeds = 70 top_layers = 4 wall_line_count = 2 -switch_extruder_retraction_amount = 100 -switch_extruder_retraction_speeds = 70 \ No newline at end of file + diff --git a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex_only.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex_only.inst.cfg index 78a37cf084..18350794ce 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex_only.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_classic_flex_flex_only.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Flex Only definition = tizyx_evy_dual +name = Flex Only +version = 4 [metadata] +material = tizyx_flex +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = tizyx_flex variant = Classic Extruder +weight = -3 [values] switch_extruder_retraction_amount = 100 -switch_extruder_retraction_speeds = 70 \ No newline at end of file +switch_extruder_retraction_speeds = 70 + diff --git a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex.inst.cfg index 7be2c19ecf..db67983b86 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Flex and PLA definition = tizyx_evy_dual +name = Flex and PLA +version = 4 [metadata] +material = tizyx_flex +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = tizyx_flex variant = Direct Drive +weight = -2 [values] default_material_print_temperature = 210 @@ -25,7 +25,8 @@ retraction_enable = True retraction_extra_prime_amount = 0 retraction_hop_enabled = True retraction_hop_only_when_collides = False -speed_print = 30 skirt_brim_minimal_length = 100 +speed_print = 30 switch_extruder_retraction_amount = 72 -switch_extruder_retraction_speeds = 70 \ No newline at end of file +switch_extruder_retraction_speeds = 70 + diff --git a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex_only.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex_only.inst.cfg index 25c57ed31e..de74b6bd04 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex_only.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/flex/tizyx_evy_dual_direct_drive_flex_flex_only.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Flex Only definition = tizyx_evy_dual +name = Flex Only +version = 4 [metadata] +material = tizyx_flex +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = tizyx_flex variant = Direct Drive +weight = -3 [values] switch_extruder_retraction_amount = 72 switch_extruder_retraction_speeds = 70 + diff --git a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_high.inst.cfg index 5cd19e868c..b08c1be8bf 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_high.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy_dual +name = High +version = 4 [metadata] +material = generic_petg +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_petg variant = Classic Extruder +weight = 1 [values] cool_fan_speed_0 = 100 @@ -34,7 +34,8 @@ skirt_line_count = 2 speed_print = 60 speed_topbottom = 50 speed_wall_0 = 40 +switch_extruder_retraction_amount = 100 +switch_extruder_retraction_speeds = 70 top_layers = 4 wall_line_count = 2 -switch_extruder_retraction_amount = 100 -switch_extruder_retraction_speeds = 70 \ No newline at end of file + diff --git a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_normal.inst.cfg index af566e7368..c70cdf38e8 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_classic_petg_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = tizyx_evy_dual +name = Normal +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_petg variant = Classic Extruder +weight = 0 [values] cool_fan_speed_0 = 100 @@ -34,7 +34,8 @@ skirt_line_count = 2 speed_print = 60 speed_topbottom = 50 speed_wall_0 = 40 +switch_extruder_retraction_amount = 100 +switch_extruder_retraction_speeds = 70 top_layers = 4 wall_line_count = 2 -switch_extruder_retraction_amount = 100 -switch_extruder_retraction_speeds = 70 \ No newline at end of file + diff --git a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_high.inst.cfg index 204afef935..eec1011053 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_high.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy_dual +name = High +version = 4 [metadata] +material = generic_petg +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_petg variant = Direct Drive +weight = 1 [values] default_material_print_temperature = 210 @@ -27,4 +27,5 @@ retraction_hop_enabled = True retraction_hop_only_when_collides = False skirt_brim_minimal_length = 100 switch_extruder_retraction_amount = 72 -switch_extruder_retraction_speeds = 70 \ No newline at end of file +switch_extruder_retraction_speeds = 70 + diff --git a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_normal.inst.cfg index 118e35d09a..d57eb7fef2 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/petg/tizyx_evy_dual_direct_drive_petg_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = tizyx_evy_dual +name = Normal +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_petg variant = Direct Drive +weight = 0 [values] default_material_print_temperature = 210 @@ -27,4 +27,5 @@ retraction_hop_enabled = True retraction_hop_only_when_collides = False skirt_brim_minimal_length = 100 switch_extruder_retraction_amount = 72 -switch_extruder_retraction_speeds = 70 \ No newline at end of file +switch_extruder_retraction_speeds = 70 + diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex.inst.cfg index 9d4e3d8888..4154d44f73 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Flex and PLA definition = tizyx_evy_dual +name = Flex and PLA +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pla variant = Classic Extruder +weight = -2 [values] cool_fan_speed_0 = 100 @@ -34,7 +34,8 @@ skirt_line_count = 2 speed_print = 60 speed_topbottom = 50 speed_wall_0 = 40 +switch_extruder_retraction_amount = 100 +switch_extruder_retraction_speeds = 70 top_layers = 4 wall_line_count = 2 -switch_extruder_retraction_amount = 100 -switch_extruder_retraction_speeds = 70 \ No newline at end of file + diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex_only.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex_only.inst.cfg index 55c548ce5c..8ada5ea9c9 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex_only.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_flex_only.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Flex Only definition = tizyx_evy_dual +name = Flex Only +version = 4 [metadata] +material = generic_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = generic_pla variant = Classic Extruder +weight = -3 [values] + diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_high.inst.cfg index bbb665eff3..abfddcb9c2 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_high.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy_dual +name = High +version = 4 [metadata] +material = generic_pla +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pla variant = Classic Extruder +weight = 1 [values] cool_fan_speed_0 = 100 @@ -34,7 +34,8 @@ skirt_line_count = 2 speed_print = 60 speed_topbottom = 50 speed_wall_0 = 40 +switch_extruder_retraction_amount = 100 +switch_extruder_retraction_speeds = 70 top_layers = 4 wall_line_count = 2 -switch_extruder_retraction_amount = 100 -switch_extruder_retraction_speeds = 70 \ No newline at end of file + diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_normal.inst.cfg index 9cbc603c3b..a868726328 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = tizyx_evy_dual +name = Normal +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pla variant = Classic Extruder +weight = 0 [values] cool_fan_speed_0 = 100 @@ -34,7 +34,8 @@ skirt_line_count = 2 speed_print = 60 speed_topbottom = 50 speed_wall_0 = 40 +switch_extruder_retraction_amount = 100 +switch_extruder_retraction_speeds = 70 top_layers = 4 wall_line_count = 2 -switch_extruder_retraction_amount = 100 -switch_extruder_retraction_speeds = 70 \ No newline at end of file + diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_pva.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_pva.inst.cfg index 43067f894b..24097765e9 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_pva.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_classic_pla_pva.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = PVA and PLA definition = tizyx_evy_dual +name = PVA and PLA +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pla variant = Classic Extruder +weight = -2 [values] cool_fan_speed_0 = 100 @@ -34,7 +34,8 @@ skirt_line_count = 2 speed_print = 60 speed_topbottom = 50 speed_wall_0 = 40 +switch_extruder_retraction_amount = 100 +switch_extruder_retraction_speeds = 70 top_layers = 4 wall_line_count = 2 -switch_extruder_retraction_amount = 100 -switch_extruder_retraction_speeds = 70 \ No newline at end of file + diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex.inst.cfg index eee9b9055e..8e7984aacc 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Flex and PLA definition = tizyx_evy_dual +name = Flex and PLA +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pla variant = Direct Drive +weight = -2 [values] default_material_print_temperature = 210 @@ -25,7 +25,8 @@ retraction_enable = True retraction_extra_prime_amount = 0 retraction_hop_enabled = True retraction_hop_only_when_collides = False -speed_print = 30 skirt_brim_minimal_length = 100 +speed_print = 30 switch_extruder_retraction_amount = 72 -switch_extruder_retraction_speeds = 70 \ No newline at end of file +switch_extruder_retraction_speeds = 70 + diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex_only.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex_only.inst.cfg index 1c63e80837..67e79db08d 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex_only.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_flex_only.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Flex Only definition = tizyx_evy_dual +name = Flex Only +version = 4 [metadata] +material = generic_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = generic_pla variant = Direct Drive +weight = -3 [values] + diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_high.inst.cfg index 9b4968c9af..f44160f5b0 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_high.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy_dual +name = High +version = 4 [metadata] +material = generic_pla +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pla variant = Direct Drive +weight = 1 [values] default_material_print_temperature = 210 @@ -28,3 +28,4 @@ retraction_hop_only_when_collides = False skirt_brim_minimal_length = 100 switch_extruder_retraction_amount = 72 switch_extruder_retraction_speeds = 70 + diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_normal.inst.cfg index 3b699edd27..c59ecab5bc 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = tizyx_evy_dual +name = Normal +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pla variant = Direct Drive +weight = 0 [values] default_material_print_temperature = 210 @@ -27,4 +27,5 @@ retraction_hop_enabled = True retraction_hop_only_when_collides = False skirt_brim_minimal_length = 100 switch_extruder_retraction_amount = 72 -switch_extruder_retraction_speeds = 70 \ No newline at end of file +switch_extruder_retraction_speeds = 70 + diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_pva.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_pva.inst.cfg index 24e00e4d62..22f15d0eda 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_pva.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla/tizyx_evy_dual_direct_drive_pla_pva.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = PVA and PLA definition = tizyx_evy_dual +name = PVA and PLA +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pla variant = Direct Drive +weight = -2 [values] default_material_print_temperature = 210 @@ -25,7 +25,8 @@ retraction_enable = True retraction_extra_prime_amount = 0 retraction_hop_enabled = True retraction_hop_only_when_collides = False -speed_print = 30 skirt_brim_minimal_length = 100 +speed_print = 30 switch_extruder_retraction_amount = 72 -switch_extruder_retraction_speeds = 70 \ No newline at end of file +switch_extruder_retraction_speeds = 70 + diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_flex.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_flex.inst.cfg index 0a0c5674b5..2499298b27 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_flex.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_flex.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Flex and PLA definition = tizyx_evy_dual +name = Flex and PLA +version = 4 [metadata] +material = tizyx_pla_bois +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = tizyx_pla_bois variant = Classic Extruder +weight = -2 [values] cool_fan_speed_0 = 100 @@ -34,7 +34,8 @@ skirt_line_count = 2 speed_print = 60 speed_topbottom = 50 speed_wall_0 = 40 +switch_extruder_retraction_amount = 100 +switch_extruder_retraction_speeds = 70 top_layers = 4 wall_line_count = 2 -switch_extruder_retraction_amount = 100 -switch_extruder_retraction_speeds = 70 \ No newline at end of file + diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_high.inst.cfg index f2c3ce468a..e21777f9cd 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_high.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy_dual +name = High +version = 4 [metadata] +material = tizyx_pla_bois +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = tizyx_pla_bois variant = Classic Extruder +weight = 1 [values] cool_fan_speed_0 = 100 @@ -34,7 +34,8 @@ skirt_line_count = 2 speed_print = 60 speed_topbottom = 50 speed_wall_0 = 40 +switch_extruder_retraction_amount = 100 +switch_extruder_retraction_speeds = 70 top_layers = 4 wall_line_count = 2 -switch_extruder_retraction_amount = 100 -switch_extruder_retraction_speeds = 70 \ No newline at end of file + diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_normal.inst.cfg index e9e906ffdf..74970e34bf 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_classic_pla_bois_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = tizyx_evy_dual +name = Normal +version = 4 [metadata] +material = tizyx_pla_bois +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = tizyx_pla_bois variant = Classic Extruder +weight = 0 [values] cool_fan_speed_0 = 100 @@ -34,7 +34,8 @@ skirt_line_count = 2 speed_print = 60 speed_topbottom = 50 speed_wall_0 = 40 +switch_extruder_retraction_amount = 100 +switch_extruder_retraction_speeds = 70 top_layers = 4 wall_line_count = 2 -switch_extruder_retraction_amount = 100 -switch_extruder_retraction_speeds = 70 \ No newline at end of file + diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_flex.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_flex.inst.cfg index 809c276c41..243eaa4fd0 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_flex.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_flex.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Flex and PLA definition = tizyx_evy_dual +name = Flex and PLA +version = 4 [metadata] +material = tizyx_pla_bois +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = tizyx_pla_bois variant = Direct Drive +weight = -2 [values] default_material_print_temperature = 210 @@ -25,7 +25,8 @@ retraction_enable = True retraction_extra_prime_amount = 0 retraction_hop_enabled = True retraction_hop_only_when_collides = False -speed_print = 30 skirt_brim_minimal_length = 100 +speed_print = 30 switch_extruder_retraction_amount = 72 -switch_extruder_retraction_speeds = 70 \ No newline at end of file +switch_extruder_retraction_speeds = 70 + diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_high.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_high.inst.cfg index e8dadd1fed..ada642c73d 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_high.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = High definition = tizyx_evy_dual +name = High +version = 4 [metadata] +material = tizyx_pla_bois +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = tizyx_pla_bois variant = Direct Drive +weight = 1 [values] default_material_print_temperature = 210 @@ -28,3 +28,4 @@ retraction_hop_only_when_collides = False skirt_brim_minimal_length = 100 switch_extruder_retraction_amount = 72 switch_extruder_retraction_speeds = 70 + diff --git a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_normal.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_normal.inst.cfg index 87f079ccf9..7a00a4c4b0 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pla_bois/tizyx_evy_dual_direct_drive_pla_bois_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = tizyx_evy_dual +name = Normal +version = 4 [metadata] +material = tizyx_pla_bois +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = tizyx_pla_bois variant = Direct Drive +weight = 0 [values] default_material_print_temperature = 210 @@ -27,4 +27,5 @@ retraction_hop_enabled = True retraction_hop_only_when_collides = False skirt_brim_minimal_length = 100 switch_extruder_retraction_amount = 72 -switch_extruder_retraction_speeds = 70 \ No newline at end of file +switch_extruder_retraction_speeds = 70 + diff --git a/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_classic_pva_pva.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_classic_pva_pva.inst.cfg index 2dafcf4cdc..5c860bd0ed 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_classic_pva_pva.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_classic_pva_pva.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = PVA and PLA definition = tizyx_evy_dual +name = PVA and PLA +version = 4 [metadata] +material = tizyx_pva +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = tizyx_pva variant = Classic Extruder +weight = -2 [values] cool_fan_speed_0 = 100 @@ -34,7 +34,8 @@ skirt_line_count = 2 speed_print = 60 speed_topbottom = 50 speed_wall_0 = 40 +switch_extruder_retraction_amount = 100 +switch_extruder_retraction_speeds = 70 top_layers = 4 wall_line_count = 2 -switch_extruder_retraction_amount = 100 -switch_extruder_retraction_speeds = 70 \ No newline at end of file + diff --git a/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_direct_drive_pva_pva.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_direct_drive_pva_pva.inst.cfg index 5c6fc24736..3f4a425427 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_direct_drive_pva_pva.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/pva/tizyx_evy_dual_direct_drive_pva_pva.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = PVA and PLA definition = tizyx_evy_dual +name = PVA and PLA +version = 4 [metadata] +material = tizyx_pva +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = tizyx_pva variant = Direct Drive +weight = -2 [values] default_material_print_temperature = 210 @@ -25,7 +25,8 @@ retraction_enable = True retraction_extra_prime_amount = 0 retraction_hop_enabled = True retraction_hop_only_when_collides = False -speed_print = 30 skirt_brim_minimal_length = 100 +speed_print = 30 switch_extruder_retraction_amount = 72 -switch_extruder_retraction_speeds = 70 \ No newline at end of file +switch_extruder_retraction_speeds = 70 + diff --git a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Only_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Only_Quality.inst.cfg index 3a78a26d7e..c0ed8955f6 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Only_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Only_Quality.inst.cfg @@ -1,39 +1,40 @@ [general] -version = 4 -name = Flex Only definition = tizyx_evy_dual +name = Flex Only +version = 4 [metadata] +global_quality = True +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = -3 -global_quality = True [values] -layer_height = 0.2 -layer_height_0 = 0.25 adhesion_extruder_nr = 1 adhesion_type = skirt -skirt_line_count = 2 -skirt_gap = 2 +cool_min_layer_time = 11 fill_outline_gaps = True infill_sparse_density = 15 -retraction_min_travel = 2 -speed_print = 30 -speed_topbottom = 50 -speed_wall_0 = 40 -top_layers = 4 -wall_line_count = 2 -cool_min_layer_time = 11 -material_print_temperature = =default_material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_final_print_temperature = =material_print_temperature -support_enable = True +layer_height = 0.2 +layer_height_0 = 0.25 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = =default_material_print_temperature +optimize_wall_printing_order = True prime_tower_enable = True +prime_tower_flow = 110 prime_tower_position_x = 127.5 prime_tower_position_y = =math.ceil(250-prime_tower_size) prime_tower_size = 35 -prime_tower_flow = 110 +retraction_min_travel = 2 +skirt_gap = 2 +skirt_line_count = 2 +speed_print = 30 +speed_topbottom = 50 +speed_wall_0 = 40 +support_enable = True +top_layers = 4 +wall_line_count = 2 z_seam_corner = z_seam_corner_none -optimize_wall_printing_order = True + diff --git a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Quality.inst.cfg index 3df1f2f3f9..6c609f520d 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Quality.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Flex and PLA definition = tizyx_evy_dual +name = Flex and PLA +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] adhesion_extruder_nr = 0 adhesion_type = skirt layer_height = 0.2 layer_height_0 = 0.25 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = =default_material_print_temperature +optimize_wall_printing_order = True prime_tower_enable = True +prime_tower_flow = 110 prime_tower_position_x = 127.5 prime_tower_position_y = =math.ceil(250-prime_tower_size) prime_tower_size = 35 -prime_tower_flow = 110 -material_print_temperature = =default_material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_final_print_temperature = =material_print_temperature +retraction_hop_enabled = False support_enable = True z_seam_corner = z_seam_corner_none -optimize_wall_printing_order = True -retraction_hop_enabled = False + diff --git a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_High_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_High_Quality.inst.cfg index ab9ca9c82d..dbf6a2d14f 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_High_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_High_Quality.inst.cfg @@ -1,52 +1,53 @@ [general] -version = 4 -name = High definition = tizyx_evy_dual +name = High +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -global_quality = True [values] adhesion_extruder_nr = 0 adhesion_type = skirt +coasting_enable = False +cool_fan_speed_0 = 10 +cool_min_layer_time = 12 +fill_outline_gaps = True +infill_overlap = 15 +infill_sparse_density = 15 +initial_layer_line_width_factor = 90 layer_height = 0.1 layer_height_0 = 0.1 +layer_start_x = 250 +layer_start_y = 250 +material_final_print_temperature = =material_print_temperature +material_flow = 99 +material_flow_layer_0 = 93 +material_initial_print_temperature = =material_print_temperature +material_print_temperature = =default_material_print_temperature +optimize_wall_printing_order = True prime_tower_enable = True +prime_tower_flow = 110 prime_tower_position_x = 127.5 prime_tower_position_y = =math.ceil(250-prime_tower_size) prime_tower_size = 35 -prime_tower_flow = 110 -material_print_temperature = =default_material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_final_print_temperature = =material_print_temperature -support_enable = True -initial_layer_line_width_factor = 90 -infill_overlap = 15 -material_flow_layer_0 = 93 -material_flow = 99 retraction_amount = 5 +retraction_hop_enabled = False +retraction_min_travel = 2 retraction_speed = 60 +skirt_gap = 2 +skirt_line_count = 2 +speed_print = 60 +speed_topbottom = 45 speed_wall_0 = 45 speed_wall_x = 50 -speed_topbottom = 45 support_angle = 70 -skirt_line_count = 2 -skirt_gap = 2 -fill_outline_gaps = True -infill_sparse_density = 15 -retraction_min_travel = 2 -speed_print = 60 -cool_fan_speed_0 = 10 -cool_min_layer_time = 12 -layer_start_x = 250 -layer_start_y = 250 -coasting_enable = False +support_enable = True top_layers = 4 wall_line_count = 2 z_seam_corner = z_seam_corner_none -optimize_wall_printing_order = True -retraction_hop_enabled = False \ No newline at end of file + diff --git a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Normal_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Normal_Quality.inst.cfg index 5ffc19f532..56dbff79b6 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Normal_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Normal_Quality.inst.cfg @@ -1,52 +1,53 @@ [general] -version = 4 -name = Normal definition = tizyx_evy_dual +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] adhesion_extruder_nr = 0 adhesion_type = skirt +coasting_enable = False +cool_fan_speed_0 = 10 +cool_min_layer_time = 12 +fill_outline_gaps = True +infill_overlap = 15 +infill_sparse_density = 15 +initial_layer_line_width_factor = 90 layer_height = 0.2 layer_height_0 = 0.25 +layer_start_x = 250 +layer_start_y = 250 +material_final_print_temperature = =material_print_temperature +material_flow = 99 +material_flow_layer_0 = 93 +material_initial_print_temperature = =material_print_temperature +material_print_temperature = =default_material_print_temperature +optimize_wall_printing_order = True prime_tower_enable = True +prime_tower_flow = 110 prime_tower_position_x = 127.5 prime_tower_position_y = =math.ceil(250-prime_tower_size) prime_tower_size = 35 -prime_tower_flow = 110 -material_print_temperature = =default_material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_final_print_temperature = =material_print_temperature -support_enable = True -initial_layer_line_width_factor = 90 -infill_overlap = 15 -material_flow_layer_0 = 93 -material_flow = 99 retraction_amount = 5 +retraction_hop_enabled = False +retraction_min_travel = 2 retraction_speed = 60 +skirt_gap = 2 +skirt_line_count = 2 +speed_print = 60 +speed_topbottom = 45 speed_wall_0 = 45 speed_wall_x = 50 -speed_topbottom = 45 support_angle = 70 -skirt_line_count = 2 -skirt_gap = 2 -fill_outline_gaps = True -infill_sparse_density = 15 -retraction_min_travel = 2 -speed_print = 60 -cool_fan_speed_0 = 10 -cool_min_layer_time = 12 -layer_start_x = 250 -layer_start_y = 250 -coasting_enable = False +support_enable = True top_layers = 4 wall_line_count = 2 z_seam_corner = z_seam_corner_none -optimize_wall_printing_order = True -retraction_hop_enabled = False \ No newline at end of file + diff --git a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_PVA_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_PVA_Quality.inst.cfg index e98452b57b..b7cab8b398 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_PVA_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_PVA_Quality.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = PVA and PLA definition = tizyx_evy_dual +name = PVA and PLA +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] adhesion_extruder_nr = 0 adhesion_type = skirt layer_height = 0.2 layer_height_0 = 0.25 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = =default_material_print_temperature +optimize_wall_printing_order = True prime_tower_enable = True +prime_tower_flow = 110 prime_tower_position_x = 127.5 prime_tower_position_y = =math.ceil(250-prime_tower_size) prime_tower_size = 35 -prime_tower_flow = 110 -material_print_temperature = =default_material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_final_print_temperature = =material_print_temperature +retraction_hop_enabled = False support_enable = True z_seam_corner = z_seam_corner_none -optimize_wall_printing_order = True -retraction_hop_enabled = False \ No newline at end of file + diff --git a/resources/quality/tizyx/tizyx_k25/tizyx_k25_high.inst.cfg b/resources/quality/tizyx/tizyx_k25/tizyx_k25_high.inst.cfg index 1368427a4a..48a506a6d0 100644 --- a/resources/quality/tizyx/tizyx_k25/tizyx_k25_high.inst.cfg +++ b/resources/quality/tizyx/tizyx_k25/tizyx_k25_high.inst.cfg @@ -1,40 +1,41 @@ [general] -version = 4 -name = High definition = tizyx_k25 +name = High +version = 4 [metadata] +global_quality = True quality_type = draft setting_version = 20 type = quality -global_quality = True [values] -layer_height = 0.1 -initial_layer_line_width_factor = 90 -infill_overlap = 15 -material_flow_layer_0 = 93 -material_flow = 99 -speed_wall_0 = 45 -speed_wall_x = 50 -speed_topbottom = 45 -support_enable= True -support_angle = 70 adhesion_type = skirt -skirt_line_count = 2 -skirt_gap = 2 -fill_outline_gaps = True -infill_sparse_density = 15 -retraction_min_travel = 2 -speed_print = 60 +coasting_enable = False cool_fan_speed_0 = 10 cool_min_layer_time = 12 +fill_outline_gaps = True +infill_overlap = 15 +infill_sparse_density = 15 +initial_layer_line_width_factor = 90 +layer_height = 0.1 layer_start_x = 250 layer_start_y = 250 -coasting_enable = False -wall_line_count = 2 -material_print_temperature = =default_material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_final_print_temperature = =material_print_temperature -z_seam_corner = z_seam_corner_none +material_final_print_temperature = =material_print_temperature +material_flow = 99 +material_flow_layer_0 = 93 +material_initial_print_temperature = =material_print_temperature +material_print_temperature = =default_material_print_temperature optimize_wall_printing_order = True +retraction_min_travel = 2 +skirt_gap = 2 +skirt_line_count = 2 +speed_print = 60 +speed_topbottom = 45 +speed_wall_0 = 45 +speed_wall_x = 50 +support_angle = 70 +support_enable = True +wall_line_count = 2 +z_seam_corner = z_seam_corner_none + diff --git a/resources/quality/tizyx/tizyx_k25/tizyx_k25_normal.inst.cfg b/resources/quality/tizyx/tizyx_k25/tizyx_k25_normal.inst.cfg index 199ebb5393..3fb4d9b63a 100644 --- a/resources/quality/tizyx/tizyx_k25/tizyx_k25_normal.inst.cfg +++ b/resources/quality/tizyx/tizyx_k25/tizyx_k25_normal.inst.cfg @@ -1,40 +1,41 @@ [general] -version = 4 -name = Normal definition = tizyx_k25 +name = Normal +version = 4 [metadata] +global_quality = True quality_type = normal setting_version = 20 type = quality -global_quality = True [values] -layer_height = 0.2 -initial_layer_line_width_factor = 90 -infill_overlap = 15 -material_flow_layer_0 = 93 -material_flow = 99 -speed_wall_0 = 45 -speed_wall_x = 50 -speed_topbottom = 45 -support_enable= True -support_angle = 70 adhesion_type = skirt -skirt_line_count = 2 -skirt_gap = 2 -fill_outline_gaps = True -infill_sparse_density = 15 -retraction_min_travel = 2 -speed_print = 60 +coasting_enable = False cool_fan_speed_0 = 10 cool_min_layer_time = 12 +fill_outline_gaps = True +infill_overlap = 15 +infill_sparse_density = 15 +initial_layer_line_width_factor = 90 +layer_height = 0.2 layer_start_x = 250 layer_start_y = 250 -coasting_enable = False -wall_line_count = 2 -material_print_temperature = =default_material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -z_seam_corner = z_seam_corner_none +material_flow = 99 +material_flow_layer_0 = 93 +material_initial_print_temperature = =material_print_temperature +material_print_temperature = =default_material_print_temperature optimize_wall_printing_order = True +retraction_min_travel = 2 +skirt_gap = 2 +skirt_line_count = 2 +speed_print = 60 +speed_topbottom = 45 +speed_wall_0 = 45 +speed_wall_x = 50 +support_angle = 70 +support_enable = True +wall_line_count = 2 +z_seam_corner = z_seam_corner_none + diff --git a/resources/quality/trimaker_cosmosII/trimaker_cosmosII_fast.inst.cfg b/resources/quality/trimaker_cosmosII/trimaker_cosmosII_fast.inst.cfg index 070a95fa80..4446992aa9 100644 --- a/resources/quality/trimaker_cosmosII/trimaker_cosmosII_fast.inst.cfg +++ b/resources/quality/trimaker_cosmosII/trimaker_cosmosII_fast.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Fast definition = trimaker_cosmosII +name = Fast +version = 4 [metadata] +global_quality = True +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = 1 -global_quality = True [values] layer_height = 0.3 -speed_print = 60 \ No newline at end of file +speed_print = 60 + diff --git a/resources/quality/trimaker_cosmosII/trimaker_cosmosII_normal.inst.cfg b/resources/quality/trimaker_cosmosII/trimaker_cosmosII_normal.inst.cfg index dfa1c3afbe..88ae2287c8 100644 --- a/resources/quality/trimaker_cosmosII/trimaker_cosmosII_normal.inst.cfg +++ b/resources/quality/trimaker_cosmosII/trimaker_cosmosII_normal.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Normal definition = trimaker_cosmosII +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] layer_height = 0.2 speed_print = 45 + diff --git a/resources/quality/trimaker_cosmosII/trimaker_cosmosII_slow.inst.cfg b/resources/quality/trimaker_cosmosII/trimaker_cosmosII_slow.inst.cfg index 23adf9c3e7..0f923b8bed 100644 --- a/resources/quality/trimaker_cosmosII/trimaker_cosmosII_slow.inst.cfg +++ b/resources/quality/trimaker_cosmosII/trimaker_cosmosII_slow.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Slow definition = trimaker_cosmosII +name = Slow +version = 4 [metadata] +global_quality = True +quality_type = slow setting_version = 20 type = quality -quality_type = slow weight = -1 -global_quality = True [values] layer_height = 0.1 -speed_print = 30 \ No newline at end of file +speed_print = 30 + diff --git a/resources/quality/trimaker_nebula/trimaker_nebula_fast.inst.cfg b/resources/quality/trimaker_nebula/trimaker_nebula_fast.inst.cfg index b5110ffca4..ee60c6c5ce 100644 --- a/resources/quality/trimaker_nebula/trimaker_nebula_fast.inst.cfg +++ b/resources/quality/trimaker_nebula/trimaker_nebula_fast.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Fast definition = trimaker_nebula +name = Fast +version = 4 [metadata] +global_quality = True +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = 1 -global_quality = True [values] layer_height = 0.3 -speed_print = 60 \ No newline at end of file +speed_print = 60 + diff --git a/resources/quality/trimaker_nebula/trimaker_nebula_normal.inst.cfg b/resources/quality/trimaker_nebula/trimaker_nebula_normal.inst.cfg index 8569442703..2d08352384 100644 --- a/resources/quality/trimaker_nebula/trimaker_nebula_normal.inst.cfg +++ b/resources/quality/trimaker_nebula/trimaker_nebula_normal.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Normal definition = trimaker_nebula +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] layer_height = 0.2 speed_print = 45 + diff --git a/resources/quality/trimaker_nebula/trimaker_nebula_slow.inst.cfg b/resources/quality/trimaker_nebula/trimaker_nebula_slow.inst.cfg index 782b876425..22622608e9 100644 --- a/resources/quality/trimaker_nebula/trimaker_nebula_slow.inst.cfg +++ b/resources/quality/trimaker_nebula/trimaker_nebula_slow.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Slow definition = trimaker_nebula +name = Slow +version = 4 [metadata] +global_quality = True +quality_type = slow setting_version = 20 type = quality -quality_type = slow weight = -1 -global_quality = True [values] layer_height = 0.1 -speed_print = 30 \ No newline at end of file +speed_print = 30 + diff --git a/resources/quality/tronxy/tronxy_0.2_ABS_extra.inst.cfg b/resources/quality/tronxy/tronxy_0.2_ABS_extra.inst.cfg index a006b27907..0e38e4e995 100644 --- a/resources/quality/tronxy/tronxy_0.2_ABS_extra.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.2_ABS_extra.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Extra Fine Quality definition = tronxy_x +name = Extra Fine Quality +version = 4 [metadata] +material = generic_abs +quality_type = extra setting_version = 20 type = quality -quality_type = extra -material = generic_abs variant = 0.2mm Nozzle [values] +cool_fan_enabled = False wall_thickness = =line_width*8 -cool_fan_enabled = False \ No newline at end of file + diff --git a/resources/quality/tronxy/tronxy_0.2_ABS_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.2_ABS_fine.inst.cfg index 7095910071..7dd28b2f06 100644 --- a/resources/quality/tronxy/tronxy_0.2_ABS_fine.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.2_ABS_fine.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Fine Quality definition = tronxy_x +name = Fine Quality +version = 4 [metadata] +material = generic_abs +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_abs variant = 0.2mm Nozzle [values] +cool_fan_enabled = False wall_thickness = =line_width*8 -cool_fan_enabled = False \ No newline at end of file + diff --git a/resources/quality/tronxy/tronxy_0.2_ABS_super.inst.cfg b/resources/quality/tronxy/tronxy_0.2_ABS_super.inst.cfg index 2559055437..dc69badea1 100644 --- a/resources/quality/tronxy/tronxy_0.2_ABS_super.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.2_ABS_super.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Super Fine Quality definition = tronxy_x +name = Super Fine Quality +version = 4 [metadata] +material = generic_abs +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_abs variant = 0.2mm Nozzle [values] +cool_fan_enabled = False wall_thickness = =line_width*8 -cool_fan_enabled = False \ No newline at end of file + diff --git a/resources/quality/tronxy/tronxy_0.2_PETG_extra.inst.cfg b/resources/quality/tronxy/tronxy_0.2_PETG_extra.inst.cfg index e3a854b92a..d29348ec72 100644 --- a/resources/quality/tronxy/tronxy_0.2_PETG_extra.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.2_PETG_extra.inst.cfg @@ -1,18 +1,18 @@ [general] -version = 4 -name = Extra Fine Quality definition = tronxy_x +name = Extra Fine Quality +version = 4 [metadata] +material = generic_petg +quality_type = extra setting_version = 20 type = quality -quality_type = extra -material = generic_petg variant = 0.2mm Nozzle [values] layer_height_0 = 0.14 +retraction_extra_prime_amount = 0.25 speed_layer_0 = 15 wall_thickness = =line_width*4 -retraction_extra_prime_amount = 0.25 diff --git a/resources/quality/tronxy/tronxy_0.2_PETG_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.2_PETG_fine.inst.cfg index fcfe0a0252..6618d38789 100644 --- a/resources/quality/tronxy/tronxy_0.2_PETG_fine.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.2_PETG_fine.inst.cfg @@ -1,18 +1,18 @@ [general] -version = 4 -name = Fine Quality definition = tronxy_x +name = Fine Quality +version = 4 [metadata] +material = generic_petg +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_petg variant = 0.2mm Nozzle [values] layer_height_0 = 0.14 +retraction_extra_prime_amount = 0.25 speed_layer_0 = 15 wall_thickness = =line_width*4 -retraction_extra_prime_amount = 0.25 diff --git a/resources/quality/tronxy/tronxy_0.2_PETG_super.inst.cfg b/resources/quality/tronxy/tronxy_0.2_PETG_super.inst.cfg index c0ad31fbff..45b429eb0f 100644 --- a/resources/quality/tronxy/tronxy_0.2_PETG_super.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.2_PETG_super.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Super Fine Quality definition = tronxy_x +name = Super Fine Quality +version = 4 [metadata] +material = generic_petg +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_petg variant = 0.2mm Nozzle [values] layer_height_0 = 0.14 +retraction_extra_prime_amount = 0.25 speed_layer_0 = 15 wall_thickness = =line_width*4 -retraction_extra_prime_amount = 0.25 + diff --git a/resources/quality/tronxy/tronxy_0.2_PLA_extra.inst.cfg b/resources/quality/tronxy/tronxy_0.2_PLA_extra.inst.cfg index bbec003448..9a95b339e3 100644 --- a/resources/quality/tronxy/tronxy_0.2_PLA_extra.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.2_PLA_extra.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Extra Fine Quality definition = tronxy_x +name = Extra Fine Quality +version = 4 [metadata] +material = generic_pla +quality_type = extra setting_version = 20 type = quality -quality_type = extra -material = generic_pla variant = 0.2mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.2_PLA_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.2_PLA_fine.inst.cfg index aaf66e1127..2c7fff6ce7 100644 --- a/resources/quality/tronxy/tronxy_0.2_PLA_fine.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.2_PLA_fine.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Fine Quality definition = tronxy_x +name = Fine Quality +version = 4 [metadata] +material = generic_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_pla variant = 0.2mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.2_PLA_super.inst.cfg b/resources/quality/tronxy/tronxy_0.2_PLA_super.inst.cfg index 436135531e..10aa08894c 100644 --- a/resources/quality/tronxy/tronxy_0.2_PLA_super.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.2_PLA_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Fine Quality definition = tronxy_x +name = Super Fine Quality +version = 4 [metadata] +material = generic_pla +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla variant = 0.2mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.3_ABS_extra.inst.cfg b/resources/quality/tronxy/tronxy_0.3_ABS_extra.inst.cfg index b9f8e634ac..cc3d48379d 100644 --- a/resources/quality/tronxy/tronxy_0.3_ABS_extra.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.3_ABS_extra.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Extra Fine Quality definition = tronxy_x +name = Extra Fine Quality +version = 4 [metadata] +material = generic_abs +quality_type = extra setting_version = 20 type = quality -quality_type = extra -material = generic_abs variant = 0.3mm Nozzle [values] +cool_fan_enabled = False wall_thickness = =line_width*4 -cool_fan_enabled = False \ No newline at end of file + diff --git a/resources/quality/tronxy/tronxy_0.3_ABS_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.3_ABS_fine.inst.cfg index 719ee2c12b..501cfa9737 100644 --- a/resources/quality/tronxy/tronxy_0.3_ABS_fine.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.3_ABS_fine.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Fine Quality definition = tronxy_x +name = Fine Quality +version = 4 [metadata] +material = generic_abs +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_abs variant = 0.3mm Nozzle [values] +cool_fan_enabled = False wall_thickness = =line_width*4 -cool_fan_enabled = False \ No newline at end of file + diff --git a/resources/quality/tronxy/tronxy_0.3_ABS_low.inst.cfg b/resources/quality/tronxy/tronxy_0.3_ABS_low.inst.cfg index f0d1101f6e..a3b737506d 100644 --- a/resources/quality/tronxy/tronxy_0.3_ABS_low.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.3_ABS_low.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Low Quality definition = tronxy_x +name = Low Quality +version = 4 [metadata] +material = generic_abs +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_abs variant = 0.3mm Nozzle [values] +cool_fan_enabled = False wall_thickness = =line_width*4 -cool_fan_enabled = False \ No newline at end of file + diff --git a/resources/quality/tronxy/tronxy_0.3_ABS_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.3_ABS_normal.inst.cfg index 6ca53f0dda..9bd313e9d2 100644 --- a/resources/quality/tronxy/tronxy_0.3_ABS_normal.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.3_ABS_normal.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Normal Quality definition = tronxy_x +name = Normal Quality +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_abs variant = 0.3mm Nozzle [values] +cool_fan_enabled = False wall_thickness = =line_width*4 -cool_fan_enabled = False \ No newline at end of file + diff --git a/resources/quality/tronxy/tronxy_0.3_PETG_extra.inst.cfg b/resources/quality/tronxy/tronxy_0.3_PETG_extra.inst.cfg index 10b4fedb35..5f7302897b 100644 --- a/resources/quality/tronxy/tronxy_0.3_PETG_extra.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.3_PETG_extra.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Extra Fine Quality definition = tronxy_x +name = Extra Fine Quality +version = 4 [metadata] +material = generic_petg +quality_type = extra setting_version = 20 type = quality -quality_type = extra -material = generic_petg variant = 0.3mm Nozzle [values] layer_height_0 = 0.18 +retraction_extra_prime_amount = 0.25 speed_layer_0 = 15 wall_thickness = =line_width*4 -retraction_extra_prime_amount = 0.25 + diff --git a/resources/quality/tronxy/tronxy_0.3_PETG_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.3_PETG_fine.inst.cfg index 5100bd1ec1..f054dc8190 100644 --- a/resources/quality/tronxy/tronxy_0.3_PETG_fine.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.3_PETG_fine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Fine Quality definition = tronxy_x +name = Fine Quality +version = 4 [metadata] +material = generic_petg +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_petg variant = 0.3mm Nozzle [values] layer_height_0 = 0.18 +retraction_extra_prime_amount = 0.25 speed_layer_0 = 15 wall_thickness = =line_width*4 -retraction_extra_prime_amount = 0.25 + diff --git a/resources/quality/tronxy/tronxy_0.3_PETG_low.inst.cfg b/resources/quality/tronxy/tronxy_0.3_PETG_low.inst.cfg index ce84236a85..7b65917764 100644 --- a/resources/quality/tronxy/tronxy_0.3_PETG_low.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.3_PETG_low.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Low Quality definition = tronxy_x +name = Low Quality +version = 4 [metadata] +material = generic_petg +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_petg variant = 0.3mm Nozzle [values] layer_height_0 = 0.18 +retraction_extra_prime_amount = 0.25 speed_layer_0 = 15 wall_thickness = =line_width*4 -retraction_extra_prime_amount = 0.25 + diff --git a/resources/quality/tronxy/tronxy_0.3_PETG_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.3_PETG_normal.inst.cfg index acb9f8148e..bcc770178d 100644 --- a/resources/quality/tronxy/tronxy_0.3_PETG_normal.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.3_PETG_normal.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Normal Quality definition = tronxy_x +name = Normal Quality +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_petg variant = 0.3mm Nozzle [values] layer_height_0 = 0.18 +retraction_extra_prime_amount = 0.25 speed_layer_0 = 15 wall_thickness = =line_width*4 -retraction_extra_prime_amount = 0.25 + diff --git a/resources/quality/tronxy/tronxy_0.3_PLA_extra.inst.cfg b/resources/quality/tronxy/tronxy_0.3_PLA_extra.inst.cfg index e01e547d74..444c89c31a 100644 --- a/resources/quality/tronxy/tronxy_0.3_PLA_extra.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.3_PLA_extra.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Extra Fine Quality definition = tronxy_x +name = Extra Fine Quality +version = 4 [metadata] +material = generic_pla +quality_type = extra setting_version = 20 type = quality -quality_type = extra -material = generic_pla variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.3_PLA_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.3_PLA_fine.inst.cfg index 3ef0a39f54..806c755232 100644 --- a/resources/quality/tronxy/tronxy_0.3_PLA_fine.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.3_PLA_fine.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Fine Quality definition = tronxy_x +name = Fine Quality +version = 4 [metadata] +material = generic_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_pla variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.3_PLA_low.inst.cfg b/resources/quality/tronxy/tronxy_0.3_PLA_low.inst.cfg index a84745f8f5..2f88bb720f 100644 --- a/resources/quality/tronxy/tronxy_0.3_PLA_low.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.3_PLA_low.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low Quality definition = tronxy_x +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.3_PLA_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.3_PLA_normal.inst.cfg index f1b287540d..81cf9e1614 100644 --- a/resources/quality/tronxy/tronxy_0.3_PLA_normal.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.3_PLA_normal.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Normal Quality definition = tronxy_x +name = Normal Quality +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_pla variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.3_TPU_extra.inst.cfg b/resources/quality/tronxy/tronxy_0.3_TPU_extra.inst.cfg index d35548a0e8..596d4d758b 100644 --- a/resources/quality/tronxy/tronxy_0.3_TPU_extra.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.3_TPU_extra.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Extra Fine Quality definition = tronxy_x +name = Extra Fine Quality +version = 4 [metadata] +material = generic_tpu +quality_type = extra setting_version = 20 type = quality -quality_type = extra -material = generic_tpu variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.3_TPU_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.3_TPU_fine.inst.cfg index d3534c2a15..1e9234911f 100644 --- a/resources/quality/tronxy/tronxy_0.3_TPU_fine.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.3_TPU_fine.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Fine Quality definition = tronxy_x +name = Fine Quality +version = 4 [metadata] +material = generic_tpu +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_tpu variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.3_TPU_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.3_TPU_normal.inst.cfg index 4a923641ec..e90e41f2c5 100644 --- a/resources/quality/tronxy/tronxy_0.3_TPU_normal.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.3_TPU_normal.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Normal Quality definition = tronxy_x +name = Normal Quality +version = 4 [metadata] +material = generic_tpu +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_tpu variant = 0.3mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.4_ABS_extra.inst.cfg b/resources/quality/tronxy/tronxy_0.4_ABS_extra.inst.cfg index bd223d714a..a0cb05f123 100644 --- a/resources/quality/tronxy/tronxy_0.4_ABS_extra.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_ABS_extra.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Extra Fine Quality definition = tronxy_x +name = Extra Fine Quality +version = 4 [metadata] +material = generic_abs +quality_type = extra setting_version = 20 type = quality -quality_type = extra -material = generic_abs variant = 0.4mm Nozzle [values] +cool_fan_enabled = False wall_thickness = =line_width*4 -cool_fan_enabled = False \ No newline at end of file + diff --git a/resources/quality/tronxy/tronxy_0.4_ABS_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.4_ABS_fine.inst.cfg index e28b5c2918..f1575dabbd 100644 --- a/resources/quality/tronxy/tronxy_0.4_ABS_fine.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_ABS_fine.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Fine Quality definition = tronxy_x +name = Fine Quality +version = 4 [metadata] +material = generic_abs +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_abs variant = 0.4mm Nozzle [values] +cool_fan_enabled = False wall_thickness = =line_width*4 -cool_fan_enabled = False \ No newline at end of file + diff --git a/resources/quality/tronxy/tronxy_0.4_ABS_low.inst.cfg b/resources/quality/tronxy/tronxy_0.4_ABS_low.inst.cfg index 446c6e36f5..089eb49777 100644 --- a/resources/quality/tronxy/tronxy_0.4_ABS_low.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_ABS_low.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Low Quality definition = tronxy_x +name = Low Quality +version = 4 [metadata] +material = generic_abs +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_abs variant = 0.4mm Nozzle [values] +cool_fan_enabled = False wall_thickness = =line_width*4 -cool_fan_enabled = False \ No newline at end of file + diff --git a/resources/quality/tronxy/tronxy_0.4_ABS_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.4_ABS_normal.inst.cfg index 19f02a0035..1064ea03f8 100644 --- a/resources/quality/tronxy/tronxy_0.4_ABS_normal.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_ABS_normal.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Normal Quality definition = tronxy_x +name = Normal Quality +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_abs variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 cool_fan_enabled = False cool_fan_speed = 0.0 -cool_fan_speed_min = 0.0 \ No newline at end of file +cool_fan_speed_min = 0.0 +wall_thickness = =line_width*4 + diff --git a/resources/quality/tronxy/tronxy_0.4_ABS_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.4_ABS_rough.inst.cfg index 7a520728da..8102f8f7c5 100644 --- a/resources/quality/tronxy/tronxy_0.4_ABS_rough.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_ABS_rough.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Rough Quality definition = tronxy_x +name = Rough Quality +version = 4 [metadata] +material = generic_abs +quality_type = rough setting_version = 20 type = quality -quality_type = rough -material = generic_abs variant = 0.4mm Nozzle [values] -wall_thickness = =line_width*4 cool_fan_enabled = False +wall_thickness = =line_width*4 + diff --git a/resources/quality/tronxy/tronxy_0.4_PETG_extra.inst.cfg b/resources/quality/tronxy/tronxy_0.4_PETG_extra.inst.cfg index 76eec53379..4e7564ea01 100644 --- a/resources/quality/tronxy/tronxy_0.4_PETG_extra.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_PETG_extra.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Extra Fine Quality definition = tronxy_x +name = Extra Fine Quality +version = 4 [metadata] +material = generic_petg +quality_type = extra setting_version = 20 type = quality -quality_type = extra -material = generic_petg variant = 0.4mm Nozzle [values] layer_height_0 = 0.25 +retraction_extra_prime_amount = 0.25 speed_layer_0 = 15 wall_thickness = =line_width*4 -retraction_extra_prime_amount = 0.25 + diff --git a/resources/quality/tronxy/tronxy_0.4_PETG_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.4_PETG_fine.inst.cfg index 7c62df111d..e454bc9fc1 100644 --- a/resources/quality/tronxy/tronxy_0.4_PETG_fine.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_PETG_fine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Fine Quality definition = tronxy_x +name = Fine Quality +version = 4 [metadata] +material = generic_petg +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_petg variant = 0.4mm Nozzle [values] layer_height_0 = 0.25 +retraction_extra_prime_amount = 0.25 speed_layer_0 = 15 wall_thickness = =line_width*4 -retraction_extra_prime_amount = 0.25 + diff --git a/resources/quality/tronxy/tronxy_0.4_PETG_low.inst.cfg b/resources/quality/tronxy/tronxy_0.4_PETG_low.inst.cfg index ac35008aa8..2b2502c55e 100644 --- a/resources/quality/tronxy/tronxy_0.4_PETG_low.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_PETG_low.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Low Quality definition = tronxy_x +name = Low Quality +version = 4 [metadata] +material = generic_petg +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_petg variant = 0.4mm Nozzle [values] layer_height_0 = 0.25 +retraction_extra_prime_amount = 0.25 speed_layer_0 = 15 wall_thickness = =line_width*4 -retraction_extra_prime_amount = 0.25 + diff --git a/resources/quality/tronxy/tronxy_0.4_PETG_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.4_PETG_normal.inst.cfg index a6b7cb8ec5..2d85e464ea 100644 --- a/resources/quality/tronxy/tronxy_0.4_PETG_normal.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_PETG_normal.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Normal Quality definition = tronxy_x +name = Normal Quality +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_petg variant = 0.4mm Nozzle [values] layer_height_0 = 0.25 +retraction_extra_prime_amount = 0.25 speed_layer_0 = 15 wall_thickness = =line_width*4 -retraction_extra_prime_amount = 0.25 + diff --git a/resources/quality/tronxy/tronxy_0.4_PETG_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.4_PETG_rough.inst.cfg index a64b012484..2add1f8a1d 100644 --- a/resources/quality/tronxy/tronxy_0.4_PETG_rough.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_PETG_rough.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Rough Quality definition = tronxy_x +name = Rough Quality +version = 4 [metadata] +material = generic_petg +quality_type = rough setting_version = 20 type = quality -quality_type = rough -material = generic_petg variant = 0.4mm Nozzle [values] layer_height_0 = 0.25 +retraction_extra_prime_amount = 0.25 speed_layer_0 = 15 wall_thickness = =line_width*4 -retraction_extra_prime_amount = 0.25 + diff --git a/resources/quality/tronxy/tronxy_0.4_PLA_extra.inst.cfg b/resources/quality/tronxy/tronxy_0.4_PLA_extra.inst.cfg index c40af7ac79..2f7a5bc55a 100644 --- a/resources/quality/tronxy/tronxy_0.4_PLA_extra.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_PLA_extra.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Extra Fine Quality definition = tronxy_x +name = Extra Fine Quality +version = 4 [metadata] +material = generic_pla +quality_type = extra setting_version = 20 type = quality -quality_type = extra -material = generic_pla variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.4_PLA_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.4_PLA_fine.inst.cfg index f92f9b5c9b..4fed10092b 100644 --- a/resources/quality/tronxy/tronxy_0.4_PLA_fine.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_PLA_fine.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Fine Quality definition = tronxy_x +name = Fine Quality +version = 4 [metadata] +material = generic_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_pla variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.4_PLA_low.inst.cfg b/resources/quality/tronxy/tronxy_0.4_PLA_low.inst.cfg index 5a56b8faef..c502494eaf 100644 --- a/resources/quality/tronxy/tronxy_0.4_PLA_low.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_PLA_low.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low Quality definition = tronxy_x +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.4_PLA_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.4_PLA_normal.inst.cfg index 193b62d23b..dd15accffa 100644 --- a/resources/quality/tronxy/tronxy_0.4_PLA_normal.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_PLA_normal.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Normal Quality definition = tronxy_x +name = Normal Quality +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_pla variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.4_PLA_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.4_PLA_rough.inst.cfg index ee4e3e35dc..de13748aa3 100644 --- a/resources/quality/tronxy/tronxy_0.4_PLA_rough.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_PLA_rough.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Rough Quality definition = tronxy_x +name = Rough Quality +version = 4 [metadata] +material = generic_pla +quality_type = rough setting_version = 20 type = quality -quality_type = rough -material = generic_pla variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.4_TPU_extra.inst.cfg b/resources/quality/tronxy/tronxy_0.4_TPU_extra.inst.cfg index 5f9792fd46..4b51706cea 100644 --- a/resources/quality/tronxy/tronxy_0.4_TPU_extra.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_TPU_extra.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Extra Fine Quality definition = tronxy_x +name = Extra Fine Quality +version = 4 [metadata] +material = generic_tpu +quality_type = extra setting_version = 20 type = quality -quality_type = extra -material = generic_tpu variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.4_TPU_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.4_TPU_fine.inst.cfg index 9cb094b7d7..502502e235 100644 --- a/resources/quality/tronxy/tronxy_0.4_TPU_fine.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_TPU_fine.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Fine Quality definition = tronxy_x +name = Fine Quality +version = 4 [metadata] +material = generic_tpu +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_tpu variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.4_TPU_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.4_TPU_normal.inst.cfg index d121d448f5..c6769022da 100644 --- a/resources/quality/tronxy/tronxy_0.4_TPU_normal.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.4_TPU_normal.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Normal Quality definition = tronxy_x +name = Normal Quality +version = 4 [metadata] +material = generic_tpu +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_tpu variant = 0.4mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.5_ABS_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.5_ABS_fine.inst.cfg index cc9d519300..f97a287d76 100644 --- a/resources/quality/tronxy/tronxy_0.5_ABS_fine.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_ABS_fine.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Fine Quality definition = tronxy_x +name = Fine Quality +version = 4 [metadata] +material = generic_abs +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_abs variant = 0.5mm Nozzle [values] +cool_fan_enabled = False wall_thickness = =line_width*4 -cool_fan_enabled = False \ No newline at end of file + diff --git a/resources/quality/tronxy/tronxy_0.5_ABS_low.inst.cfg b/resources/quality/tronxy/tronxy_0.5_ABS_low.inst.cfg index becdfb5ab9..c8cd33ed14 100644 --- a/resources/quality/tronxy/tronxy_0.5_ABS_low.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_ABS_low.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Low Quality definition = tronxy_x +name = Low Quality +version = 4 [metadata] +material = generic_abs +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_abs variant = 0.5mm Nozzle [values] +cool_fan_enabled = False wall_thickness = =line_width*4 -cool_fan_enabled = False \ No newline at end of file + diff --git a/resources/quality/tronxy/tronxy_0.5_ABS_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.5_ABS_normal.inst.cfg index 6474914ab0..c06a7685fb 100644 --- a/resources/quality/tronxy/tronxy_0.5_ABS_normal.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_ABS_normal.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Normal Quality definition = tronxy_x +name = Normal Quality +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_abs variant = 0.5mm Nozzle [values] +cool_fan_enabled = False wall_thickness = =line_width*4 -cool_fan_enabled = False \ No newline at end of file + diff --git a/resources/quality/tronxy/tronxy_0.5_ABS_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.5_ABS_rapid.inst.cfg index d98ed92c68..a9e12ce779 100644 --- a/resources/quality/tronxy/tronxy_0.5_ABS_rapid.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_ABS_rapid.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Rough/Fast Quality definition = tronxy_x +name = Rough/Fast Quality +version = 4 [metadata] +material = generic_abs +quality_type = rapid setting_version = 20 type = quality -quality_type = rapid -material = generic_abs variant = 0.5mm Nozzle [values] +cool_fan_enabled = False wall_thickness = =line_width*4 -cool_fan_enabled = False \ No newline at end of file + diff --git a/resources/quality/tronxy/tronxy_0.5_ABS_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.5_ABS_rough.inst.cfg index cdca6d471f..99ca4b7e80 100644 --- a/resources/quality/tronxy/tronxy_0.5_ABS_rough.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_ABS_rough.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Rough Quality definition = tronxy_x +name = Rough Quality +version = 4 [metadata] +material = generic_abs +quality_type = rough setting_version = 20 type = quality -quality_type = rough -material = generic_abs variant = 0.5mm Nozzle [values] -wall_thickness = =line_width*4 cool_fan_enabled = False +wall_thickness = =line_width*4 + diff --git a/resources/quality/tronxy/tronxy_0.5_PETG_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.5_PETG_fine.inst.cfg index aeb39736ac..9ced746c76 100644 --- a/resources/quality/tronxy/tronxy_0.5_PETG_fine.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_PETG_fine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Fine Quality definition = tronxy_x +name = Fine Quality +version = 4 [metadata] +material = generic_petg +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_petg variant = 0.5mm Nozzle [values] layer_height_0 = 0.3 +retraction_extra_prime_amount = 0.25 speed_layer_0 = 15 wall_thickness = =line_width*4 -retraction_extra_prime_amount = 0.25 + diff --git a/resources/quality/tronxy/tronxy_0.5_PETG_low.inst.cfg b/resources/quality/tronxy/tronxy_0.5_PETG_low.inst.cfg index dfc36aec6a..3646635880 100644 --- a/resources/quality/tronxy/tronxy_0.5_PETG_low.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_PETG_low.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Low Quality definition = tronxy_x +name = Low Quality +version = 4 [metadata] +material = generic_petg +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_petg variant = 0.5mm Nozzle [values] layer_height_0 = 0.3 +retraction_extra_prime_amount = 0.25 speed_layer_0 = 15 wall_thickness = =line_width*4 -retraction_extra_prime_amount = 0.25 + diff --git a/resources/quality/tronxy/tronxy_0.5_PETG_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.5_PETG_normal.inst.cfg index 109e10b206..d918e306c7 100644 --- a/resources/quality/tronxy/tronxy_0.5_PETG_normal.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_PETG_normal.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Normal Quality definition = tronxy_x +name = Normal Quality +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_petg variant = 0.5mm Nozzle [values] layer_height_0 = 0.3 +retraction_extra_prime_amount = 0.25 speed_layer_0 = 15 wall_thickness = =line_width*4 -retraction_extra_prime_amount = 0.25 + diff --git a/resources/quality/tronxy/tronxy_0.5_PETG_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.5_PETG_rapid.inst.cfg index a2d85141a0..043d6fa52f 100644 --- a/resources/quality/tronxy/tronxy_0.5_PETG_rapid.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_PETG_rapid.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Rough/Fast Quality definition = tronxy_x +name = Rough/Fast Quality +version = 4 [metadata] +material = generic_petg +quality_type = rapid setting_version = 20 type = quality -quality_type = rapid -material = generic_petg variant = 0.5mm Nozzle [values] +retraction_extra_prime_amount = 0.25 speed_layer_0 = 15 wall_thickness = =line_width*4 -retraction_extra_prime_amount = 0.25 + diff --git a/resources/quality/tronxy/tronxy_0.5_PETG_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.5_PETG_rough.inst.cfg index 35882a4003..4d696b91e8 100644 --- a/resources/quality/tronxy/tronxy_0.5_PETG_rough.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_PETG_rough.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Rough Quality definition = tronxy_x +name = Rough Quality +version = 4 [metadata] +material = generic_petg +quality_type = rough setting_version = 20 type = quality -quality_type = rough -material = generic_petg variant = 0.5mm Nozzle [values] layer_height_0 = 0.25 +retraction_extra_prime_amount = 0.25 speed_layer_0 = 15 wall_thickness = =line_width*4 -retraction_extra_prime_amount = 0.25 + diff --git a/resources/quality/tronxy/tronxy_0.5_PLA_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.5_PLA_fine.inst.cfg index deeed2a841..d0009fa2d7 100644 --- a/resources/quality/tronxy/tronxy_0.5_PLA_fine.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_PLA_fine.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Fine Quality definition = tronxy_x +name = Fine Quality +version = 4 [metadata] +material = generic_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_pla variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.5_PLA_low.inst.cfg b/resources/quality/tronxy/tronxy_0.5_PLA_low.inst.cfg index 974d87a753..3bbf249008 100644 --- a/resources/quality/tronxy/tronxy_0.5_PLA_low.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_PLA_low.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low Quality definition = tronxy_x +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.5_PLA_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.5_PLA_normal.inst.cfg index 64cd5298bd..41c8eab044 100644 --- a/resources/quality/tronxy/tronxy_0.5_PLA_normal.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_PLA_normal.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Normal Quality definition = tronxy_x +name = Normal Quality +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_pla variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.5_PLA_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.5_PLA_rapid.inst.cfg index 92131afa62..d0b52ff2c5 100644 --- a/resources/quality/tronxy/tronxy_0.5_PLA_rapid.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_PLA_rapid.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Rough/Fast Quality definition = tronxy_x +name = Rough/Fast Quality +version = 4 [metadata] +material = generic_pla +quality_type = rapid setting_version = 20 type = quality -quality_type = rapid -material = generic_pla variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.5_PLA_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.5_PLA_rough.inst.cfg index b8595e68ad..c651849de8 100644 --- a/resources/quality/tronxy/tronxy_0.5_PLA_rough.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_PLA_rough.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Rough Quality definition = tronxy_x +name = Rough Quality +version = 4 [metadata] +material = generic_pla +quality_type = rough setting_version = 20 type = quality -quality_type = rough -material = generic_pla variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.5_TPU_fine.inst.cfg b/resources/quality/tronxy/tronxy_0.5_TPU_fine.inst.cfg index 4014a44bab..02dcc52db4 100644 --- a/resources/quality/tronxy/tronxy_0.5_TPU_fine.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_TPU_fine.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Fine Quality definition = tronxy_x +name = Fine Quality +version = 4 [metadata] +material = generic_tpu +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_tpu variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.5_TPU_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.5_TPU_normal.inst.cfg index 0dd03b99dd..7c636c6e9e 100644 --- a/resources/quality/tronxy/tronxy_0.5_TPU_normal.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_TPU_normal.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Normal Quality definition = tronxy_x +name = Normal Quality +version = 4 [metadata] +material = generic_tpu +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_tpu variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.5_TPU_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.5_TPU_rapid.inst.cfg index 1fc3de5d64..547dd69d24 100644 --- a/resources/quality/tronxy/tronxy_0.5_TPU_rapid.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.5_TPU_rapid.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Rough/Fast Quality definition = tronxy_x +name = Rough/Fast Quality +version = 4 [metadata] +material = generic_tpu +quality_type = rapid setting_version = 20 type = quality -quality_type = rapid -material = generic_tpu variant = 0.5mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.6_ABS_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.6_ABS_normal.inst.cfg index c7d0dda244..7622581df9 100644 --- a/resources/quality/tronxy/tronxy_0.6_ABS_normal.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.6_ABS_normal.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Normal Quality definition = tronxy_x +name = Normal Quality +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_abs variant = 0.6mm Nozzle [values] +cool_fan_enabled = False wall_thickness = =line_width*3 -cool_fan_enabled = False \ No newline at end of file + diff --git a/resources/quality/tronxy/tronxy_0.6_ABS_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.6_ABS_rapid.inst.cfg index 9bb5552d36..e1ba65564e 100644 --- a/resources/quality/tronxy/tronxy_0.6_ABS_rapid.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.6_ABS_rapid.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Rough/Fast Quality definition = tronxy_x +name = Rough/Fast Quality +version = 4 [metadata] +material = generic_abs +quality_type = rapid setting_version = 20 type = quality -quality_type = rapid -material = generic_abs variant = 0.6mm Nozzle [values] +cool_fan_enabled = False wall_thickness = =line_width*4 -cool_fan_enabled = False \ No newline at end of file + diff --git a/resources/quality/tronxy/tronxy_0.6_ABS_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.6_ABS_rough.inst.cfg index c08d405097..a4d938c395 100644 --- a/resources/quality/tronxy/tronxy_0.6_ABS_rough.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.6_ABS_rough.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Rough Quality definition = tronxy_x +name = Rough Quality +version = 4 [metadata] +material = generic_abs +quality_type = rough setting_version = 20 type = quality -quality_type = rough -material = generic_abs variant = 0.6mm Nozzle [values] -wall_thickness = =line_width*4 cool_fan_enabled = False +wall_thickness = =line_width*4 + diff --git a/resources/quality/tronxy/tronxy_0.6_PETG_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.6_PETG_normal.inst.cfg index be593398b0..197b3f4bbb 100644 --- a/resources/quality/tronxy/tronxy_0.6_PETG_normal.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.6_PETG_normal.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Normal Quality definition = tronxy_x +name = Normal Quality +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_petg variant = 0.6mm Nozzle [values] layer_height_0 = 0.4 +retraction_extra_prime_amount = 0.25 speed_layer_0 = 15 wall_thickness = =line_width*3 -retraction_extra_prime_amount = 0.25 + diff --git a/resources/quality/tronxy/tronxy_0.6_PETG_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.6_PETG_rapid.inst.cfg index ee10d3266d..884f66b43b 100644 --- a/resources/quality/tronxy/tronxy_0.6_PETG_rapid.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.6_PETG_rapid.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Rough/Fast Quality definition = tronxy_x +name = Rough/Fast Quality +version = 4 [metadata] +material = generic_petg +quality_type = rapid setting_version = 20 type = quality -quality_type = rapid -material = generic_petg variant = 0.6mm Nozzle [values] +retraction_extra_prime_amount = 0.25 speed_layer_0 = 15 wall_thickness = =line_width*4 -retraction_extra_prime_amount = 0.25 + diff --git a/resources/quality/tronxy/tronxy_0.6_PETG_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.6_PETG_rough.inst.cfg index 15b9d3a9d7..4fe90c91df 100644 --- a/resources/quality/tronxy/tronxy_0.6_PETG_rough.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.6_PETG_rough.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Rough Quality definition = tronxy_x +name = Rough Quality +version = 4 [metadata] +material = generic_petg +quality_type = rough setting_version = 20 type = quality -quality_type = rough -material = generic_petg variant = 0.6mm Nozzle [values] layer_height_0 = 0.25 +retraction_extra_prime_amount = 0.25 speed_layer_0 = 15 wall_thickness = =line_width*4 -retraction_extra_prime_amount = 0.25 + diff --git a/resources/quality/tronxy/tronxy_0.6_PLA_low.inst.cfg b/resources/quality/tronxy/tronxy_0.6_PLA_low.inst.cfg index 589e307e1a..73c97ef391 100644 --- a/resources/quality/tronxy/tronxy_0.6_PLA_low.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.6_PLA_low.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low Quality definition = tronxy_x +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla variant = 0.6mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.6_PLA_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.6_PLA_normal.inst.cfg index b1f143d897..35ad15637f 100644 --- a/resources/quality/tronxy/tronxy_0.6_PLA_normal.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.6_PLA_normal.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Normal Quality definition = tronxy_x +name = Normal Quality +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_pla variant = 0.6mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.6_PLA_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.6_PLA_rapid.inst.cfg index 318f67eaba..531b50b59c 100644 --- a/resources/quality/tronxy/tronxy_0.6_PLA_rapid.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.6_PLA_rapid.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Rough/Fast Quality definition = tronxy_x +name = Rough/Fast Quality +version = 4 [metadata] +material = generic_pla +quality_type = rapid setting_version = 20 type = quality -quality_type = rapid -material = generic_pla variant = 0.6mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.6_PLA_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.6_PLA_rough.inst.cfg index aa79f1b367..ef071f8aab 100644 --- a/resources/quality/tronxy/tronxy_0.6_PLA_rough.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.6_PLA_rough.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Rough Quality definition = tronxy_x +name = Rough Quality +version = 4 [metadata] +material = generic_pla +quality_type = rough setting_version = 20 type = quality -quality_type = rough -material = generic_pla variant = 0.6mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.6_TPU_normal.inst.cfg b/resources/quality/tronxy/tronxy_0.6_TPU_normal.inst.cfg index 3c2ccad01f..9945de580f 100644 --- a/resources/quality/tronxy/tronxy_0.6_TPU_normal.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.6_TPU_normal.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Normal Quality definition = tronxy_x +name = Normal Quality +version = 4 [metadata] +material = generic_tpu +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_tpu variant = 0.6mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.6_TPU_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.6_TPU_rapid.inst.cfg index a01cd631a4..21d3045fb3 100644 --- a/resources/quality/tronxy/tronxy_0.6_TPU_rapid.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.6_TPU_rapid.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Rough/Fast Quality definition = tronxy_x +name = Rough/Fast Quality +version = 4 [metadata] +material = generic_tpu +quality_type = rapid setting_version = 20 type = quality -quality_type = rapid -material = generic_tpu variant = 0.6mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.8_ABS_low.inst.cfg b/resources/quality/tronxy/tronxy_0.8_ABS_low.inst.cfg index 0c1ce75772..3825d72413 100644 --- a/resources/quality/tronxy/tronxy_0.8_ABS_low.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.8_ABS_low.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Low definition = tronxy_x +name = Low +version = 4 [metadata] +material = generic_abs +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_abs variant = 0.8mm Nozzle [values] +cool_fan_enabled = False wall_thickness = =line_width*3 -cool_fan_enabled = False \ No newline at end of file + diff --git a/resources/quality/tronxy/tronxy_0.8_ABS_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.8_ABS_rapid.inst.cfg index 991b561447..b4b5c1698f 100644 --- a/resources/quality/tronxy/tronxy_0.8_ABS_rapid.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.8_ABS_rapid.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Rough/Fast Quality definition = tronxy_x +name = Rough/Fast Quality +version = 4 [metadata] +material = generic_abs +quality_type = rapid setting_version = 20 type = quality -quality_type = rapid -material = generic_abs variant = 0.8mm Nozzle [values] +cool_fan_enabled = False wall_thickness = =line_width*3 -cool_fan_enabled = False \ No newline at end of file + diff --git a/resources/quality/tronxy/tronxy_0.8_ABS_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.8_ABS_rough.inst.cfg index a2cf2da8e8..f920a0ef7b 100644 --- a/resources/quality/tronxy/tronxy_0.8_ABS_rough.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.8_ABS_rough.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Rough Quality definition = tronxy_x +name = Rough Quality +version = 4 [metadata] +material = generic_abs +quality_type = rough setting_version = 20 type = quality -quality_type = rough -material = generic_abs variant = 0.8mm Nozzle [values] +cool_fan_enabled = False wall_thickness = =line_width*3 -cool_fan_enabled = False \ No newline at end of file + diff --git a/resources/quality/tronxy/tronxy_0.8_PETG_low.inst.cfg b/resources/quality/tronxy/tronxy_0.8_PETG_low.inst.cfg index 63c7aa4533..1f1a9a00fe 100644 --- a/resources/quality/tronxy/tronxy_0.8_PETG_low.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.8_PETG_low.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Low definition = tronxy_x +name = Low +version = 4 [metadata] +material = generic_petg +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_petg variant = 0.8mm Nozzle [values] layer_height_0 = 0.5 +retraction_extra_prime_amount = 0.25 speed_layer_0 = 15 wall_thickness = =line_width*3 -retraction_extra_prime_amount = 0.25 + diff --git a/resources/quality/tronxy/tronxy_0.8_PETG_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.8_PETG_rapid.inst.cfg index 4ac1aed6b4..73bb94d51f 100644 --- a/resources/quality/tronxy/tronxy_0.8_PETG_rapid.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.8_PETG_rapid.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Rough/Fast Quality definition = tronxy_x +name = Rough/Fast Quality +version = 4 [metadata] +material = generic_petg +quality_type = rapid setting_version = 20 type = quality -quality_type = rapid -material = generic_petg variant = 0.8mm Nozzle [values] layer_height_0 = 0.5 +retraction_extra_prime_amount = 0.25 speed_layer_0 = 15 wall_thickness = =line_width*3 -retraction_extra_prime_amount = 0.25 + diff --git a/resources/quality/tronxy/tronxy_0.8_PETG_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.8_PETG_rough.inst.cfg index a1a39da8bd..9ea64a77fb 100644 --- a/resources/quality/tronxy/tronxy_0.8_PETG_rough.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.8_PETG_rough.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Rough Quality definition = tronxy_x +name = Rough Quality +version = 4 [metadata] +material = generic_petg +quality_type = rough setting_version = 20 type = quality -quality_type = rough -material = generic_petg variant = 0.8mm Nozzle [values] layer_height_0 = 0.5 +retraction_extra_prime_amount = 0.25 speed_layer_0 = 15 wall_thickness = =line_width*3 -retraction_extra_prime_amount = 0.25 + diff --git a/resources/quality/tronxy/tronxy_0.8_PLA_low.inst.cfg b/resources/quality/tronxy/tronxy_0.8_PLA_low.inst.cfg index 830d35254d..448500b450 100644 --- a/resources/quality/tronxy/tronxy_0.8_PLA_low.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.8_PLA_low.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low definition = tronxy_x +name = Low +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla variant = 0.8mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.8_PLA_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.8_PLA_rapid.inst.cfg index 346b83a8ef..8cd699247c 100644 --- a/resources/quality/tronxy/tronxy_0.8_PLA_rapid.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.8_PLA_rapid.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Rough/Fast Quality definition = tronxy_x +name = Rough/Fast Quality +version = 4 [metadata] +material = generic_pla +quality_type = rapid setting_version = 20 type = quality -quality_type = rapid -material = generic_pla variant = 0.8mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.8_PLA_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.8_PLA_rough.inst.cfg index 07be90d1ff..dfd176a5f6 100644 --- a/resources/quality/tronxy/tronxy_0.8_PLA_rough.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.8_PLA_rough.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Rough Quality definition = tronxy_x +name = Rough Quality +version = 4 [metadata] +material = generic_pla +quality_type = rough setting_version = 20 type = quality -quality_type = rough -material = generic_pla variant = 0.8mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.8_TPU_low.inst.cfg b/resources/quality/tronxy/tronxy_0.8_TPU_low.inst.cfg index 6d301f38ba..971af86701 100644 --- a/resources/quality/tronxy/tronxy_0.8_TPU_low.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.8_TPU_low.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low definition = tronxy_x +name = Low +version = 4 [metadata] +material = generic_tpu +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_tpu variant = 0.8mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.8_TPU_rapid.inst.cfg b/resources/quality/tronxy/tronxy_0.8_TPU_rapid.inst.cfg index 5bfb7673f6..216078413c 100644 --- a/resources/quality/tronxy/tronxy_0.8_TPU_rapid.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.8_TPU_rapid.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Rough/Fast Quality definition = tronxy_x +name = Rough/Fast Quality +version = 4 [metadata] +material = generic_tpu +quality_type = rapid setting_version = 20 type = quality -quality_type = rapid -material = generic_tpu variant = 0.8mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_0.8_TPU_rough.inst.cfg b/resources/quality/tronxy/tronxy_0.8_TPU_rough.inst.cfg index 8482d36170..240e1cdd08 100644 --- a/resources/quality/tronxy/tronxy_0.8_TPU_rough.inst.cfg +++ b/resources/quality/tronxy/tronxy_0.8_TPU_rough.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Rough Quality definition = tronxy_x +name = Rough Quality +version = 4 [metadata] +material = generic_tpu +quality_type = rough setting_version = 20 type = quality -quality_type = rough -material = generic_tpu variant = 0.8mm Nozzle [values] + diff --git a/resources/quality/tronxy/tronxy_global_extra.inst.cfg b/resources/quality/tronxy/tronxy_global_extra.inst.cfg index 573de7d6d2..d905d0d3de 100644 --- a/resources/quality/tronxy/tronxy_global_extra.inst.cfg +++ b/resources/quality/tronxy/tronxy_global_extra.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Extra Fine Quality definition = tronxy_x +name = Extra Fine Quality +version = 4 [metadata] +global_quality = True +quality_type = extra setting_version = 20 type = quality -quality_type = extra weight = -1 -global_quality = True [values] layer_height = 0.12 layer_height_0 = 0.12 +support_interface_height = =layer_height*8 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/tronxy/tronxy_global_fine.inst.cfg b/resources/quality/tronxy/tronxy_global_fine.inst.cfg index 93122201d9..30b873ee56 100644 --- a/resources/quality/tronxy/tronxy_global_fine.inst.cfg +++ b/resources/quality/tronxy/tronxy_global_fine.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Fine Quality definition = tronxy_x +name = Fine Quality +version = 4 [metadata] +global_quality = True +quality_type = fine setting_version = 20 type = quality -quality_type = fine weight = -2 -global_quality = True [values] +adaptive_layer_height_enabled = true layer_height = 0.15 layer_height_0 = 0.20 +support_interface_height = =layer_height*6 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/tronxy/tronxy_global_low.inst.cfg b/resources/quality/tronxy/tronxy_global_low.inst.cfg index 0404b6c590..050c136809 100644 --- a/resources/quality/tronxy/tronxy_global_low.inst.cfg +++ b/resources/quality/tronxy/tronxy_global_low.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Low Quality definition = tronxy_x +name = Low Quality +version = 4 [metadata] +global_quality = True +quality_type = low setting_version = 20 type = quality -quality_type = low weight = -4 -global_quality = True [values] layer_height = 0.25 layer_height_0 = 0.25 +support_interface_height = =layer_height*4 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/tronxy/tronxy_global_normal.inst.cfg b/resources/quality/tronxy/tronxy_global_normal.inst.cfg index 94139c2e64..81e2aae47b 100644 --- a/resources/quality/tronxy/tronxy_global_normal.inst.cfg +++ b/resources/quality/tronxy/tronxy_global_normal.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Normal Quality definition = tronxy_x +name = Normal Quality +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = -3 -global_quality = True [values] layer_height = 0.2 layer_height_0 = 0.2 +support_interface_height = =layer_height*4 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/tronxy/tronxy_global_rapid.inst.cfg b/resources/quality/tronxy/tronxy_global_rapid.inst.cfg index 928b841356..b0058ff484 100644 --- a/resources/quality/tronxy/tronxy_global_rapid.inst.cfg +++ b/resources/quality/tronxy/tronxy_global_rapid.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Rough/Fast Quality definition = tronxy_x +name = Rough/Fast Quality +version = 4 [metadata] +global_quality = True +quality_type = rapid setting_version = 20 type = quality -quality_type = rapid weight = -5 -global_quality = True [values] layer_height = 0.375 layer_height_0 = 0.3 +support_interface_height = =layer_height*4 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/tronxy/tronxy_global_rough.inst.cfg b/resources/quality/tronxy/tronxy_global_rough.inst.cfg index 61fdeda2ab..2584da5ae4 100644 --- a/resources/quality/tronxy/tronxy_global_rough.inst.cfg +++ b/resources/quality/tronxy/tronxy_global_rough.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Rough Quality definition = tronxy_x +name = Rough Quality +version = 4 [metadata] +global_quality = True +quality_type = rough setting_version = 20 type = quality -quality_type = rough weight = -5 -global_quality = True [values] layer_height = 0.3 layer_height_0 = 0.3 +support_interface_height = =layer_height*4 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/tronxy/tronxy_global_super.inst.cfg b/resources/quality/tronxy/tronxy_global_super.inst.cfg index 7c67a42717..3d19cf1806 100644 --- a/resources/quality/tronxy/tronxy_global_super.inst.cfg +++ b/resources/quality/tronxy/tronxy_global_super.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Super Fine Quality definition = tronxy_x +name = Super Fine Quality +version = 4 [metadata] +global_quality = True +quality_type = super setting_version = 20 type = quality -quality_type = super weight = 0 -global_quality = True [values] layer_height = 0.08 layer_height_0 = 0.12 +support_interface_height = =layer_height*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/twotrees/abs/two_trees_0.2_ABS_super.inst.cfg b/resources/quality/twotrees/abs/two_trees_0.2_ABS_super.inst.cfg index 9f3f44f131..873c124d9b 100644 --- a/resources/quality/twotrees/abs/two_trees_0.2_ABS_super.inst.cfg +++ b/resources/quality/twotrees/abs/two_trees_0.2_ABS_super.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Super Quality definition = two_trees_base +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_abs variant = 0.2mm Nozzle [values] -material_bed_temperature = 100 -material_print_temperature_layer_0 = 245 -material_print_temperature = 240 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = False +material_bed_temperature = 100 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 240 +material_print_temperature_layer_0 = 245 +material_standby_temperature = =material_print_temperature retraction_hop = 0.2 -retraction_hop_only_when_collides = True \ No newline at end of file +retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/abs/two_trees_0.2_ABS_ultra.inst.cfg b/resources/quality/twotrees/abs/two_trees_0.2_ABS_ultra.inst.cfg index bfdfde10a8..cc88e374a8 100644 --- a/resources/quality/twotrees/abs/two_trees_0.2_ABS_ultra.inst.cfg +++ b/resources/quality/twotrees/abs/two_trees_0.2_ABS_ultra.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Ultra Quality definition = two_trees_base +name = Ultra Quality +version = 4 [metadata] +material = generic_abs +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra -material = generic_abs variant = 0.2mm Nozzle [values] -material_bed_temperature = 100 -material_print_temperature_layer_0 = 245 -material_print_temperature = 240 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = False +material_bed_temperature = 100 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 240 +material_print_temperature_layer_0 = 245 +material_standby_temperature = =material_print_temperature retraction_hop = 0.2 retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/abs/two_trees_0.3_ABS_adaptive.inst.cfg b/resources/quality/twotrees/abs/two_trees_0.3_ABS_adaptive.inst.cfg index a2184712d3..6cd9f98a38 100644 --- a/resources/quality/twotrees/abs/two_trees_0.3_ABS_adaptive.inst.cfg +++ b/resources/quality/twotrees/abs/two_trees_0.3_ABS_adaptive.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Dynamic Quality definition = two_trees_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_abs +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_abs variant = 0.3mm Nozzle [values] -material_bed_temperature = 100 -material_print_temperature_layer_0 = 245 -material_print_temperature = 240 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = False +material_bed_temperature = 100 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 240 +material_print_temperature_layer_0 = 245 +material_standby_temperature = =material_print_temperature retraction_hop = 0.2 retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/abs/two_trees_0.3_ABS_low.inst.cfg b/resources/quality/twotrees/abs/two_trees_0.3_ABS_low.inst.cfg index e33cbe5ca7..d0c7c5734e 100644 --- a/resources/quality/twotrees/abs/two_trees_0.3_ABS_low.inst.cfg +++ b/resources/quality/twotrees/abs/two_trees_0.3_ABS_low.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Low Quality definition = two_trees_base +name = Low Quality +version = 4 [metadata] +material = generic_abs +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_abs variant = 0.3mm Nozzle [values] -material_bed_temperature = 100 -material_print_temperature_layer_0 = 245 -material_print_temperature = 240 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = False +material_bed_temperature = 100 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 240 +material_print_temperature_layer_0 = 245 +material_standby_temperature = =material_print_temperature retraction_hop = 0.4 retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/abs/two_trees_0.3_ABS_standard.inst.cfg b/resources/quality/twotrees/abs/two_trees_0.3_ABS_standard.inst.cfg index bc94cd25bf..d6d86c4dcf 100644 --- a/resources/quality/twotrees/abs/two_trees_0.3_ABS_standard.inst.cfg +++ b/resources/quality/twotrees/abs/two_trees_0.3_ABS_standard.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Standard Quality definition = two_trees_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_abs variant = 0.3mm Nozzle [values] -material_bed_temperature = 100 -material_print_temperature_layer_0 = 245 -material_print_temperature = 240 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = False +material_bed_temperature = 100 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 240 +material_print_temperature_layer_0 = 245 +material_standby_temperature = =material_print_temperature retraction_hop = 0.3 -retraction_hop_only_when_collides = True \ No newline at end of file +retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/abs/two_trees_0.3_ABS_super.inst.cfg b/resources/quality/twotrees/abs/two_trees_0.3_ABS_super.inst.cfg index 92337b8515..d86759a9d1 100644 --- a/resources/quality/twotrees/abs/two_trees_0.3_ABS_super.inst.cfg +++ b/resources/quality/twotrees/abs/two_trees_0.3_ABS_super.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Super Quality definition = two_trees_base +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_abs variant = 0.3mm Nozzle [values] -material_bed_temperature = 100 -material_print_temperature_layer_0 = 245 -material_print_temperature = 240 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = False +material_bed_temperature = 100 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 240 +material_print_temperature_layer_0 = 245 +material_standby_temperature = =material_print_temperature retraction_hop = 0.2 -retraction_hop_only_when_collides = True \ No newline at end of file +retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/abs/two_trees_0.4_ABS_adaptive.inst.cfg b/resources/quality/twotrees/abs/two_trees_0.4_ABS_adaptive.inst.cfg index 3413006ab5..4044d7091d 100644 --- a/resources/quality/twotrees/abs/two_trees_0.4_ABS_adaptive.inst.cfg +++ b/resources/quality/twotrees/abs/two_trees_0.4_ABS_adaptive.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Dynamic Quality definition = two_trees_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_abs +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_abs variant = 0.4mm Nozzle [values] -material_bed_temperature = 100 -material_print_temperature_layer_0 = 245 -material_print_temperature = 240 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = False +material_bed_temperature = 100 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 240 +material_print_temperature_layer_0 = 245 +material_standby_temperature = =material_print_temperature retraction_hop = 0.2 -retraction_hop_only_when_collides = True \ No newline at end of file +retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/abs/two_trees_0.4_ABS_low.inst.cfg b/resources/quality/twotrees/abs/two_trees_0.4_ABS_low.inst.cfg index f130baf47a..235c471662 100644 --- a/resources/quality/twotrees/abs/two_trees_0.4_ABS_low.inst.cfg +++ b/resources/quality/twotrees/abs/two_trees_0.4_ABS_low.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Low Quality definition = two_trees_base +name = Low Quality +version = 4 [metadata] +material = generic_abs +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_abs variant = 0.4mm Nozzle [values] -material_bed_temperature = 100 -material_print_temperature_layer_0 = 245 -material_print_temperature = 240 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = False +material_bed_temperature = 100 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 240 +material_print_temperature_layer_0 = 245 +material_standby_temperature = =material_print_temperature retraction_hop = 0.4 retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/abs/two_trees_0.4_ABS_standard.inst.cfg b/resources/quality/twotrees/abs/two_trees_0.4_ABS_standard.inst.cfg index 56d7a094db..4b70897c44 100644 --- a/resources/quality/twotrees/abs/two_trees_0.4_ABS_standard.inst.cfg +++ b/resources/quality/twotrees/abs/two_trees_0.4_ABS_standard.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Standard Quality definition = two_trees_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_abs variant = 0.4mm Nozzle [values] -material_bed_temperature = 100 -material_print_temperature_layer_0 = 245 -material_print_temperature = 240 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = False +material_bed_temperature = 100 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 240 +material_print_temperature_layer_0 = 245 +material_standby_temperature = =material_print_temperature retraction_hop = 0.3 retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/abs/two_trees_0.4_ABS_super.inst.cfg b/resources/quality/twotrees/abs/two_trees_0.4_ABS_super.inst.cfg index c23654fcba..9e387e0f66 100644 --- a/resources/quality/twotrees/abs/two_trees_0.4_ABS_super.inst.cfg +++ b/resources/quality/twotrees/abs/two_trees_0.4_ABS_super.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Super Quality definition = two_trees_base +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_abs variant = 0.4mm Nozzle [values] -material_bed_temperature = 100 -material_print_temperature_layer_0 = 245 -material_print_temperature = 240 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = False +material_bed_temperature = 100 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 240 +material_print_temperature_layer_0 = 245 +material_standby_temperature = =material_print_temperature retraction_hop = 0.2 -retraction_hop_only_when_collides = True \ No newline at end of file +retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/abs/two_trees_0.5_ABS_adaptive.inst.cfg b/resources/quality/twotrees/abs/two_trees_0.5_ABS_adaptive.inst.cfg index 3f61d53aaf..ceb6494124 100644 --- a/resources/quality/twotrees/abs/two_trees_0.5_ABS_adaptive.inst.cfg +++ b/resources/quality/twotrees/abs/two_trees_0.5_ABS_adaptive.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Dynamic Quality definition = two_trees_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_abs +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_abs variant = 0.5mm Nozzle [values] -material_bed_temperature = 100 -material_print_temperature_layer_0 = 245 -material_print_temperature = 240 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = False +material_bed_temperature = 100 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 240 +material_print_temperature_layer_0 = 245 +material_standby_temperature = =material_print_temperature retraction_hop = 0.2 -retraction_hop_only_when_collides = True \ No newline at end of file +retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/abs/two_trees_0.5_ABS_low.inst.cfg b/resources/quality/twotrees/abs/two_trees_0.5_ABS_low.inst.cfg index 68a7f9e6d7..ce12082ccc 100644 --- a/resources/quality/twotrees/abs/two_trees_0.5_ABS_low.inst.cfg +++ b/resources/quality/twotrees/abs/two_trees_0.5_ABS_low.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Low Quality definition = two_trees_base +name = Low Quality +version = 4 [metadata] +material = generic_abs +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_abs variant = 0.5mm Nozzle [values] -material_bed_temperature = 100 -material_print_temperature_layer_0 = 245 -material_print_temperature = 240 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = False +material_bed_temperature = 100 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 240 +material_print_temperature_layer_0 = 245 +material_standby_temperature = =material_print_temperature retraction_hop = 0.4 -retraction_hop_only_when_collides = True \ No newline at end of file +retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/abs/two_trees_0.5_ABS_standard.inst.cfg b/resources/quality/twotrees/abs/two_trees_0.5_ABS_standard.inst.cfg index 7c50c3b1b4..6bc129a4de 100644 --- a/resources/quality/twotrees/abs/two_trees_0.5_ABS_standard.inst.cfg +++ b/resources/quality/twotrees/abs/two_trees_0.5_ABS_standard.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Standard Quality definition = two_trees_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_abs variant = 0.5mm Nozzle [values] -material_bed_temperature = 100 -material_print_temperature_layer_0 = 245 -material_print_temperature = 240 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = False +material_bed_temperature = 100 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 240 +material_print_temperature_layer_0 = 245 +material_standby_temperature = =material_print_temperature retraction_hop = 0.3 -retraction_hop_only_when_collides = True \ No newline at end of file +retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/abs/two_trees_0.5_ABS_super.inst.cfg b/resources/quality/twotrees/abs/two_trees_0.5_ABS_super.inst.cfg index 41b32d064c..804094d66b 100644 --- a/resources/quality/twotrees/abs/two_trees_0.5_ABS_super.inst.cfg +++ b/resources/quality/twotrees/abs/two_trees_0.5_ABS_super.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Super Quality definition = two_trees_base +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_abs variant = 0.5mm Nozzle [values] -material_bed_temperature = 100 -material_print_temperature_layer_0 = 245 -material_print_temperature = 240 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = False +material_bed_temperature = 100 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 240 +material_print_temperature_layer_0 = 245 +material_standby_temperature = =material_print_temperature retraction_hop = 0.2 -retraction_hop_only_when_collides = True \ No newline at end of file +retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/abs/two_trees_0.6_ABS_standard.inst.cfg b/resources/quality/twotrees/abs/two_trees_0.6_ABS_standard.inst.cfg index 470ba364c2..1bab40f6fb 100644 --- a/resources/quality/twotrees/abs/two_trees_0.6_ABS_standard.inst.cfg +++ b/resources/quality/twotrees/abs/two_trees_0.6_ABS_standard.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Standard Quality definition = two_trees_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_abs variant = 0.6mm Nozzle [values] -material_bed_temperature = 100 -material_print_temperature_layer_0 = 245 -material_print_temperature = 240 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = False +material_bed_temperature = 100 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 240 +material_print_temperature_layer_0 = 245 +material_standby_temperature = =material_print_temperature retraction_hop = 0.3 -retraction_hop_only_when_collides = True \ No newline at end of file +retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/abs/two_trees_0.8_ABS_draft.inst.cfg b/resources/quality/twotrees/abs/two_trees_0.8_ABS_draft.inst.cfg index ff5440db3f..521089d3d0 100644 --- a/resources/quality/twotrees/abs/two_trees_0.8_ABS_draft.inst.cfg +++ b/resources/quality/twotrees/abs/two_trees_0.8_ABS_draft.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Draft Quality definition = two_trees_base +name = Draft Quality +version = 4 [metadata] +material = generic_abs +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_abs variant = 0.8mm Nozzle [values] -material_bed_temperature = 100 -material_print_temperature_layer_0 = 245 -material_print_temperature = 240 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = False +material_bed_temperature = 100 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 240 +material_print_temperature_layer_0 = 245 +material_standby_temperature = =material_print_temperature retraction_hop = 0.4 -retraction_hop_only_when_collides = True \ No newline at end of file +retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/abs/two_trees_1.0_ABS_draft.inst.cfg b/resources/quality/twotrees/abs/two_trees_1.0_ABS_draft.inst.cfg index 92ce9a5fca..e990eb0841 100644 --- a/resources/quality/twotrees/abs/two_trees_1.0_ABS_draft.inst.cfg +++ b/resources/quality/twotrees/abs/two_trees_1.0_ABS_draft.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Draft Quality definition = two_trees_base +name = Draft Quality +version = 4 [metadata] +material = generic_abs +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_abs variant = 1.0mm Nozzle [values] -material_bed_temperature = 100 -material_print_temperature_layer_0 = 245 -material_print_temperature = 240 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = False +material_bed_temperature = 100 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 240 +material_print_temperature_layer_0 = 245 +material_standby_temperature = =material_print_temperature retraction_hop = 0.4 -retraction_hop_only_when_collides = True \ No newline at end of file +retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/petg/two_trees_0.2_PETG_super.inst.cfg b/resources/quality/twotrees/petg/two_trees_0.2_PETG_super.inst.cfg index 70051b2c31..abfa630321 100644 --- a/resources/quality/twotrees/petg/two_trees_0.2_PETG_super.inst.cfg +++ b/resources/quality/twotrees/petg/two_trees_0.2_PETG_super.inst.cfg @@ -1,23 +1,23 @@ [general] -version = 4 -name = Super Quality definition = two_trees_base +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_petg variant = 0.2mm Nozzle [values] -material_bed_temperature = 80 -material_print_temperature_layer_0 = 225 -material_print_temperature = 220 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 80 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 220 +material_print_temperature_layer_0 = 225 +material_standby_temperature = =material_print_temperature retraction_hop = 0.2 retraction_hop_only_when_collides = True diff --git a/resources/quality/twotrees/petg/two_trees_0.2_PETG_ultra.inst.cfg b/resources/quality/twotrees/petg/two_trees_0.2_PETG_ultra.inst.cfg index 7405a270df..65738cc9f0 100644 --- a/resources/quality/twotrees/petg/two_trees_0.2_PETG_ultra.inst.cfg +++ b/resources/quality/twotrees/petg/two_trees_0.2_PETG_ultra.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Ultra Quality definition = two_trees_base +name = Ultra Quality +version = 4 [metadata] +material = generic_petg +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra -material = generic_petg variant = 0.2mm Nozzle [values] -material_bed_temperature = 80 -material_print_temperature_layer_0 = 225 -material_print_temperature = 220 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 80 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 220 +material_print_temperature_layer_0 = 225 +material_standby_temperature = =material_print_temperature retraction_hop = 0.2 -retraction_hop_only_when_collides = True \ No newline at end of file +retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/petg/two_trees_0.3_PETG_adaptive.inst.cfg b/resources/quality/twotrees/petg/two_trees_0.3_PETG_adaptive.inst.cfg index 61e2f82046..f45f9b7679 100644 --- a/resources/quality/twotrees/petg/two_trees_0.3_PETG_adaptive.inst.cfg +++ b/resources/quality/twotrees/petg/two_trees_0.3_PETG_adaptive.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Dynamic Quality definition = two_trees_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_petg +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_petg variant = 0.3mm Nozzle [values] -material_bed_temperature = 80 -material_print_temperature_layer_0 = 225 -material_print_temperature = 220 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 80 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 220 +material_print_temperature_layer_0 = 225 +material_standby_temperature = =material_print_temperature retraction_hop = 0.2 retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/petg/two_trees_0.3_PETG_low.inst.cfg b/resources/quality/twotrees/petg/two_trees_0.3_PETG_low.inst.cfg index 2b8aff662c..b88dd7d824 100644 --- a/resources/quality/twotrees/petg/two_trees_0.3_PETG_low.inst.cfg +++ b/resources/quality/twotrees/petg/two_trees_0.3_PETG_low.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Low Quality definition = two_trees_base +name = Low Quality +version = 4 [metadata] +material = generic_petg +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_petg variant = 0.3mm Nozzle [values] -material_bed_temperature = 80 -material_print_temperature_layer_0 = 225 -material_print_temperature = 220 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 80 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 220 +material_print_temperature_layer_0 = 225 +material_standby_temperature = =material_print_temperature retraction_hop = 0.4 retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/petg/two_trees_0.3_PETG_standard.inst.cfg b/resources/quality/twotrees/petg/two_trees_0.3_PETG_standard.inst.cfg index 6ead273e63..dd2dd890c5 100644 --- a/resources/quality/twotrees/petg/two_trees_0.3_PETG_standard.inst.cfg +++ b/resources/quality/twotrees/petg/two_trees_0.3_PETG_standard.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Standard Quality definition = two_trees_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_petg variant = 0.3mm Nozzle [values] -material_bed_temperature = 80 -material_print_temperature_layer_0 = 225 -material_print_temperature = 220 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 80 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 220 +material_print_temperature_layer_0 = 225 +material_standby_temperature = =material_print_temperature retraction_hop = 0.3 retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/petg/two_trees_0.3_PETG_super.inst.cfg b/resources/quality/twotrees/petg/two_trees_0.3_PETG_super.inst.cfg index 4aafba3846..6f7718978e 100644 --- a/resources/quality/twotrees/petg/two_trees_0.3_PETG_super.inst.cfg +++ b/resources/quality/twotrees/petg/two_trees_0.3_PETG_super.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Super Quality definition = two_trees_base +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_petg variant = 0.3mm Nozzle [values] -material_bed_temperature = 80 -material_print_temperature_layer_0 = 225 -material_print_temperature = 220 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 80 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 220 +material_print_temperature_layer_0 = 225 +material_standby_temperature = =material_print_temperature retraction_hop = 0.2 retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/petg/two_trees_0.4_PETG_adaptive.inst.cfg b/resources/quality/twotrees/petg/two_trees_0.4_PETG_adaptive.inst.cfg index a66dcc5f86..7b1c337701 100644 --- a/resources/quality/twotrees/petg/two_trees_0.4_PETG_adaptive.inst.cfg +++ b/resources/quality/twotrees/petg/two_trees_0.4_PETG_adaptive.inst.cfg @@ -1,23 +1,23 @@ [general] -version = 4 -name = Dynamic Quality definition = two_trees_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_petg +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_petg variant = 0.4mm Nozzle [values] -material_bed_temperature = 80 -material_print_temperature_layer_0 = 225 -material_print_temperature = 220 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 80 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 220 +material_print_temperature_layer_0 = 225 +material_standby_temperature = =material_print_temperature retraction_hop = 0.2 retraction_hop_only_when_collides = True -#retraction_extra_prime_amount = 0.5 + diff --git a/resources/quality/twotrees/petg/two_trees_0.4_PETG_low.inst.cfg b/resources/quality/twotrees/petg/two_trees_0.4_PETG_low.inst.cfg index af33a87f32..9ae37cf6e9 100644 --- a/resources/quality/twotrees/petg/two_trees_0.4_PETG_low.inst.cfg +++ b/resources/quality/twotrees/petg/two_trees_0.4_PETG_low.inst.cfg @@ -1,23 +1,23 @@ [general] -version = 4 -name = Low Quality definition = two_trees_base +name = Low Quality +version = 4 [metadata] +material = generic_petg +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_petg variant = 0.4mm Nozzle [values] -material_bed_temperature = 80 -material_print_temperature_layer_0 = 225 -material_print_temperature = 220 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 80 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 220 +material_print_temperature_layer_0 = 225 +material_standby_temperature = =material_print_temperature retraction_hop = 0.4 retraction_hop_only_when_collides = True -#retraction_extra_prime_amount = 0.5 + diff --git a/resources/quality/twotrees/petg/two_trees_0.4_PETG_standard.inst.cfg b/resources/quality/twotrees/petg/two_trees_0.4_PETG_standard.inst.cfg index c3e80864bf..200fd30997 100644 --- a/resources/quality/twotrees/petg/two_trees_0.4_PETG_standard.inst.cfg +++ b/resources/quality/twotrees/petg/two_trees_0.4_PETG_standard.inst.cfg @@ -1,23 +1,23 @@ [general] -version = 4 -name = Standard Quality definition = two_trees_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_petg variant = 0.4mm Nozzle [values] -material_bed_temperature = 80 -material_print_temperature_layer_0 = 225 -material_print_temperature = 220 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 80 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 220 +material_print_temperature_layer_0 = 225 +material_standby_temperature = =material_print_temperature retraction_hop = 0.3 retraction_hop_only_when_collides = True -#retraction_extra_prime_amount = 0.5 + diff --git a/resources/quality/twotrees/petg/two_trees_0.4_PETG_super.inst.cfg b/resources/quality/twotrees/petg/two_trees_0.4_PETG_super.inst.cfg index 6c151b5302..66e9d6a5c6 100644 --- a/resources/quality/twotrees/petg/two_trees_0.4_PETG_super.inst.cfg +++ b/resources/quality/twotrees/petg/two_trees_0.4_PETG_super.inst.cfg @@ -1,23 +1,23 @@ [general] -version = 4 -name = Super Quality definition = two_trees_base +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_petg variant = 0.4mm Nozzle [values] -material_bed_temperature = 80 -material_print_temperature_layer_0 = 225 -material_print_temperature = 220 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 80 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 220 +material_print_temperature_layer_0 = 225 +material_standby_temperature = =material_print_temperature retraction_hop = 0.2 retraction_hop_only_when_collides = True -#retraction_extra_prime_amount = 0.5 + diff --git a/resources/quality/twotrees/petg/two_trees_0.5_PETG_adaptive.inst.cfg b/resources/quality/twotrees/petg/two_trees_0.5_PETG_adaptive.inst.cfg index 9ff213bdb6..764985f69d 100644 --- a/resources/quality/twotrees/petg/two_trees_0.5_PETG_adaptive.inst.cfg +++ b/resources/quality/twotrees/petg/two_trees_0.5_PETG_adaptive.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Dynamic Quality definition = two_trees_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_petg +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_petg variant = 0.5mm Nozzle [values] -material_bed_temperature = 80 -material_print_temperature_layer_0 = 225 -material_print_temperature = 220 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 80 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 220 +material_print_temperature_layer_0 = 225 +material_standby_temperature = =material_print_temperature retraction_hop = 0.2 retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/petg/two_trees_0.5_PETG_low.inst.cfg b/resources/quality/twotrees/petg/two_trees_0.5_PETG_low.inst.cfg index 16ce1a9cb8..2c1e05f584 100644 --- a/resources/quality/twotrees/petg/two_trees_0.5_PETG_low.inst.cfg +++ b/resources/quality/twotrees/petg/two_trees_0.5_PETG_low.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Low Quality definition = two_trees_base +name = Low Quality +version = 4 [metadata] +material = generic_petg +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_petg variant = 0.5mm Nozzle [values] -material_bed_temperature = 80 -material_print_temperature_layer_0 = 225 -material_print_temperature = 220 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 80 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 220 +material_print_temperature_layer_0 = 225 +material_standby_temperature = =material_print_temperature retraction_hop = 0.4 retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/petg/two_trees_0.5_PETG_standard.inst.cfg b/resources/quality/twotrees/petg/two_trees_0.5_PETG_standard.inst.cfg index dc6b5df289..141335211e 100644 --- a/resources/quality/twotrees/petg/two_trees_0.5_PETG_standard.inst.cfg +++ b/resources/quality/twotrees/petg/two_trees_0.5_PETG_standard.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Standard Quality definition = two_trees_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_petg variant = 0.5mm Nozzle [values] -material_bed_temperature = 80 -material_print_temperature_layer_0 = 225 -material_print_temperature = 220 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 80 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 220 +material_print_temperature_layer_0 = 225 +material_standby_temperature = =material_print_temperature retraction_hop = 0.3 retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/petg/two_trees_0.5_PETG_super.inst.cfg b/resources/quality/twotrees/petg/two_trees_0.5_PETG_super.inst.cfg index 7ab27818ea..47231eaba8 100644 --- a/resources/quality/twotrees/petg/two_trees_0.5_PETG_super.inst.cfg +++ b/resources/quality/twotrees/petg/two_trees_0.5_PETG_super.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Super Quality definition = two_trees_base +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_petg variant = 0.5mm Nozzle [values] -material_bed_temperature = 80 -material_print_temperature_layer_0 = 225 -material_print_temperature = 220 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 80 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 220 +material_print_temperature_layer_0 = 225 +material_standby_temperature = =material_print_temperature retraction_hop = 0.2 retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/petg/two_trees_0.6_PETG_standard.inst.cfg b/resources/quality/twotrees/petg/two_trees_0.6_PETG_standard.inst.cfg index e1336b8fd6..662e1e751e 100644 --- a/resources/quality/twotrees/petg/two_trees_0.6_PETG_standard.inst.cfg +++ b/resources/quality/twotrees/petg/two_trees_0.6_PETG_standard.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Standard Quality definition = two_trees_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_petg variant = 0.6mm Nozzle [values] -material_bed_temperature = 80 -material_print_temperature_layer_0 = 225 -material_print_temperature = 220 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 80 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 220 +material_print_temperature_layer_0 = 225 +material_standby_temperature = =material_print_temperature retraction_hop = 0.3 retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/petg/two_trees_0.8_PETG_draft.inst.cfg b/resources/quality/twotrees/petg/two_trees_0.8_PETG_draft.inst.cfg index f4bda8e470..f7189b394b 100644 --- a/resources/quality/twotrees/petg/two_trees_0.8_PETG_draft.inst.cfg +++ b/resources/quality/twotrees/petg/two_trees_0.8_PETG_draft.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Draft Quality definition = two_trees_base +name = Draft Quality +version = 4 [metadata] +material = generic_petg +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_petg variant = 0.8mm Nozzle [values] -material_bed_temperature = 80 -material_print_temperature_layer_0 = 225 -material_print_temperature = 220 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 80 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 220 +material_print_temperature_layer_0 = 225 +material_standby_temperature = =material_print_temperature retraction_hop = 0.4 retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/petg/two_trees_1.0_PETG_draft.inst.cfg b/resources/quality/twotrees/petg/two_trees_1.0_PETG_draft.inst.cfg index 8668d1fd4f..6aa4e88920 100644 --- a/resources/quality/twotrees/petg/two_trees_1.0_PETG_draft.inst.cfg +++ b/resources/quality/twotrees/petg/two_trees_1.0_PETG_draft.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Draft Quality definition = two_trees_base +name = Draft Quality +version = 4 [metadata] +material = generic_petg +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_petg variant = 1.0mm Nozzle [values] -material_bed_temperature = 80 -material_print_temperature_layer_0 = 225 -material_print_temperature = 220 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 80 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 220 +material_print_temperature_layer_0 = 225 +material_standby_temperature = =material_print_temperature retraction_hop = 0.4 retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/pla/two_trees_0.2_PLA_super.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.2_PLA_super.inst.cfg index 5997cd25c2..32a0c83383 100644 --- a/resources/quality/twotrees/pla/two_trees_0.2_PLA_super.inst.cfg +++ b/resources/quality/twotrees/pla/two_trees_0.2_PLA_super.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Super Quality definition = two_trees_base +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla variant = 0.2mm Nozzle [values] -material_bed_temperature = 60 -material_print_temperature_layer_0 = 195 -material_print_temperature = 190 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 60 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 190 +material_print_temperature_layer_0 = 195 +material_standby_temperature = =material_print_temperature retraction_hop = 0.2 -retraction_hop_only_when_collides = True \ No newline at end of file +retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/pla/two_trees_0.2_PLA_ultra.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.2_PLA_ultra.inst.cfg index 972c1517f4..4c0b634367 100644 --- a/resources/quality/twotrees/pla/two_trees_0.2_PLA_ultra.inst.cfg +++ b/resources/quality/twotrees/pla/two_trees_0.2_PLA_ultra.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Ultra Quality definition = two_trees_base +name = Ultra Quality +version = 4 [metadata] +material = generic_pla +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra -material = generic_pla variant = 0.2mm Nozzle [values] -material_bed_temperature = 60 -material_print_temperature_layer_0 = 195 -material_print_temperature = 190 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 60 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 190 +material_print_temperature_layer_0 = 195 +material_standby_temperature = =material_print_temperature retraction_hop = 0.2 -retraction_hop_only_when_collides = True \ No newline at end of file +retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/pla/two_trees_0.3_PLA_adaptive.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.3_PLA_adaptive.inst.cfg index 9e1247beb2..8718f21525 100644 --- a/resources/quality/twotrees/pla/two_trees_0.3_PLA_adaptive.inst.cfg +++ b/resources/quality/twotrees/pla/two_trees_0.3_PLA_adaptive.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Dynamic Quality definition = two_trees_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_pla +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_pla variant = 0.3mm Nozzle [values] -material_bed_temperature = 60 -material_print_temperature_layer_0 = 195 -material_print_temperature = 190 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 60 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 190 +material_print_temperature_layer_0 = 195 +material_standby_temperature = =material_print_temperature retraction_hop = 0.2 -retraction_hop_only_when_collides = True \ No newline at end of file +retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/pla/two_trees_0.3_PLA_low.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.3_PLA_low.inst.cfg index 0145f0286a..1540cf7e94 100644 --- a/resources/quality/twotrees/pla/two_trees_0.3_PLA_low.inst.cfg +++ b/resources/quality/twotrees/pla/two_trees_0.3_PLA_low.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Low Quality definition = two_trees_base +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla variant = 0.3mm Nozzle [values] -material_bed_temperature = 60 -material_print_temperature_layer_0 = 195 -material_print_temperature = 190 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 60 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 190 +material_print_temperature_layer_0 = 195 +material_standby_temperature = =material_print_temperature retraction_hop = 0.4 -retraction_hop_only_when_collides = True \ No newline at end of file +retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/pla/two_trees_0.3_PLA_standard.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.3_PLA_standard.inst.cfg index c042e712cb..e76c3c470e 100644 --- a/resources/quality/twotrees/pla/two_trees_0.3_PLA_standard.inst.cfg +++ b/resources/quality/twotrees/pla/two_trees_0.3_PLA_standard.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Standard Quality definition = two_trees_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_pla variant = 0.3mm Nozzle [values] -material_bed_temperature = 60 -material_print_temperature_layer_0 = 195 -material_print_temperature = 190 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 60 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 190 +material_print_temperature_layer_0 = 195 +material_standby_temperature = =material_print_temperature retraction_hop = 0.3 -retraction_hop_only_when_collides = True \ No newline at end of file +retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/pla/two_trees_0.3_PLA_super.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.3_PLA_super.inst.cfg index d2a116ba08..8ab756a24b 100644 --- a/resources/quality/twotrees/pla/two_trees_0.3_PLA_super.inst.cfg +++ b/resources/quality/twotrees/pla/two_trees_0.3_PLA_super.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Super Quality definition = two_trees_base +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla variant = 0.3mm Nozzle [values] -material_bed_temperature = 60 -material_print_temperature_layer_0 = 195 -material_print_temperature = 190 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 60 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 190 +material_print_temperature_layer_0 = 195 +material_standby_temperature = =material_print_temperature retraction_hop = 0.2 -retraction_hop_only_when_collides = True \ No newline at end of file +retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/pla/two_trees_0.4_PLA_adaptive.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.4_PLA_adaptive.inst.cfg index ef212a821a..e7726a6f87 100644 --- a/resources/quality/twotrees/pla/two_trees_0.4_PLA_adaptive.inst.cfg +++ b/resources/quality/twotrees/pla/two_trees_0.4_PLA_adaptive.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Dynamic Quality definition = two_trees_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_pla +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_pla variant = 0.4mm Nozzle [values] -material_bed_temperature = 60 -material_print_temperature_layer_0 = 195 -material_print_temperature = 190 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 60 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 190 +material_print_temperature_layer_0 = 195 +material_standby_temperature = =material_print_temperature retraction_hop = 0.2 -retraction_hop_only_when_collides = True \ No newline at end of file +retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/pla/two_trees_0.4_PLA_low.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.4_PLA_low.inst.cfg index c63e900988..fd46b8d74e 100644 --- a/resources/quality/twotrees/pla/two_trees_0.4_PLA_low.inst.cfg +++ b/resources/quality/twotrees/pla/two_trees_0.4_PLA_low.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Low Quality definition = two_trees_base +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla variant = 0.4mm Nozzle [values] -material_bed_temperature = 60 -material_print_temperature_layer_0 = 195 -material_print_temperature = 190 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 60 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 190 +material_print_temperature_layer_0 = 195 +material_standby_temperature = =material_print_temperature retraction_hop = 0.4 -retraction_hop_only_when_collides = True \ No newline at end of file +retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/pla/two_trees_0.4_PLA_standard.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.4_PLA_standard.inst.cfg index ba41f9aa84..98a05cf1bf 100644 --- a/resources/quality/twotrees/pla/two_trees_0.4_PLA_standard.inst.cfg +++ b/resources/quality/twotrees/pla/two_trees_0.4_PLA_standard.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Standard Quality definition = two_trees_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_pla variant = 0.4mm Nozzle [values] -material_bed_temperature = 60 -material_print_temperature_layer_0 = 195 -material_print_temperature = 190 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 60 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 190 +material_print_temperature_layer_0 = 195 +material_standby_temperature = =material_print_temperature retraction_hop = 0.3 -retraction_hop_only_when_collides = True \ No newline at end of file +retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/pla/two_trees_0.4_PLA_super.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.4_PLA_super.inst.cfg index cbb507f87d..fe8e880298 100644 --- a/resources/quality/twotrees/pla/two_trees_0.4_PLA_super.inst.cfg +++ b/resources/quality/twotrees/pla/two_trees_0.4_PLA_super.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Super Quality definition = two_trees_base +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla variant = 0.4mm Nozzle [values] -material_bed_temperature = 60 -material_print_temperature_layer_0 = 195 -material_print_temperature = 190 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 60 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 190 +material_print_temperature_layer_0 = 195 +material_standby_temperature = =material_print_temperature retraction_hop = 0.2 -retraction_hop_only_when_collides = True \ No newline at end of file +retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/pla/two_trees_0.5_PLA_adaptive.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.5_PLA_adaptive.inst.cfg index 3ff70c24ee..9d34634486 100644 --- a/resources/quality/twotrees/pla/two_trees_0.5_PLA_adaptive.inst.cfg +++ b/resources/quality/twotrees/pla/two_trees_0.5_PLA_adaptive.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Dynamic Quality definition = two_trees_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_pla +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_pla variant = 0.5mm Nozzle [values] -material_bed_temperature = 60 -material_print_temperature_layer_0 = 195 -material_print_temperature = 190 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 60 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 190 +material_print_temperature_layer_0 = 195 +material_standby_temperature = =material_print_temperature retraction_hop = 0.2 -retraction_hop_only_when_collides = True \ No newline at end of file +retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/pla/two_trees_0.5_PLA_low.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.5_PLA_low.inst.cfg index 68b8fd6cf3..f1d5947664 100644 --- a/resources/quality/twotrees/pla/two_trees_0.5_PLA_low.inst.cfg +++ b/resources/quality/twotrees/pla/two_trees_0.5_PLA_low.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Low Quality definition = two_trees_base +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla variant = 0.5mm Nozzle [values] -material_bed_temperature = 60 -material_print_temperature_layer_0 = 195 -material_print_temperature = 190 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 60 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 190 +material_print_temperature_layer_0 = 195 +material_standby_temperature = =material_print_temperature retraction_hop = 0.4 -retraction_hop_only_when_collides = True \ No newline at end of file +retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/pla/two_trees_0.5_PLA_standard.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.5_PLA_standard.inst.cfg index 5db1da8667..235188223e 100644 --- a/resources/quality/twotrees/pla/two_trees_0.5_PLA_standard.inst.cfg +++ b/resources/quality/twotrees/pla/two_trees_0.5_PLA_standard.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Standard Quality definition = two_trees_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_pla variant = 0.5mm Nozzle [values] -material_bed_temperature = 60 -material_print_temperature_layer_0 = 195 -material_print_temperature = 190 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 60 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 190 +material_print_temperature_layer_0 = 195 +material_standby_temperature = =material_print_temperature retraction_hop = 0.3 -retraction_hop_only_when_collides = True \ No newline at end of file +retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/pla/two_trees_0.5_PLA_super.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.5_PLA_super.inst.cfg index 89c685a149..7394f3226b 100644 --- a/resources/quality/twotrees/pla/two_trees_0.5_PLA_super.inst.cfg +++ b/resources/quality/twotrees/pla/two_trees_0.5_PLA_super.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Super Quality definition = two_trees_base +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_pla variant = 0.5mm Nozzle [values] -material_bed_temperature = 60 -material_print_temperature_layer_0 = 195 -material_print_temperature = 190 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 60 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 190 +material_print_temperature_layer_0 = 195 +material_standby_temperature = =material_print_temperature retraction_hop = 0.2 -retraction_hop_only_when_collides = True \ No newline at end of file +retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/pla/two_trees_0.6_PLA_draft.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.6_PLA_draft.inst.cfg index 9f2df02e7c..44e9356948 100644 --- a/resources/quality/twotrees/pla/two_trees_0.6_PLA_draft.inst.cfg +++ b/resources/quality/twotrees/pla/two_trees_0.6_PLA_draft.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Draft Quality definition = two_trees_base +name = Draft Quality +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_pla variant = 0.6mm Nozzle [values] -material_bed_temperature = 60 -material_print_temperature_layer_0 = 195 -material_print_temperature = 190 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 60 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 190 +material_print_temperature_layer_0 = 195 +material_standby_temperature = =material_print_temperature retraction_hop = 0.4 -retraction_hop_only_when_collides = True \ No newline at end of file +retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/pla/two_trees_0.6_PLA_low.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.6_PLA_low.inst.cfg index 00d634cd58..cf78799ca6 100644 --- a/resources/quality/twotrees/pla/two_trees_0.6_PLA_low.inst.cfg +++ b/resources/quality/twotrees/pla/two_trees_0.6_PLA_low.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Low Quality definition = two_trees_base +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low setting_version = 20 type = quality -quality_type = low -material = generic_pla variant = 0.6mm Nozzle [values] -material_bed_temperature = 60 -material_print_temperature_layer_0 = 195 -material_print_temperature = 190 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 60 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 190 +material_print_temperature_layer_0 = 195 +material_standby_temperature = =material_print_temperature retraction_hop = 0.4 -retraction_hop_only_when_collides = True \ No newline at end of file +retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/pla/two_trees_0.6_PLA_standard.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.6_PLA_standard.inst.cfg index 3cb70a94b7..ac495c416e 100644 --- a/resources/quality/twotrees/pla/two_trees_0.6_PLA_standard.inst.cfg +++ b/resources/quality/twotrees/pla/two_trees_0.6_PLA_standard.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Standard Quality definition = two_trees_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_pla variant = 0.6mm Nozzle [values] -material_bed_temperature = 60 -material_print_temperature_layer_0 = 195 -material_print_temperature = 190 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 60 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 190 +material_print_temperature_layer_0 = 195 +material_standby_temperature = =material_print_temperature retraction_hop = 0.3 -retraction_hop_only_when_collides = True \ No newline at end of file +retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/pla/two_trees_0.8_PLA_draft.inst.cfg b/resources/quality/twotrees/pla/two_trees_0.8_PLA_draft.inst.cfg index 512efad800..8b8836a3eb 100644 --- a/resources/quality/twotrees/pla/two_trees_0.8_PLA_draft.inst.cfg +++ b/resources/quality/twotrees/pla/two_trees_0.8_PLA_draft.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Draft Quality definition = two_trees_base +name = Draft Quality +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_pla variant = 0.8mm Nozzle [values] -material_bed_temperature = 60 -material_print_temperature_layer_0 = 195 -material_print_temperature = 190 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 60 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 190 +material_print_temperature_layer_0 = 195 +material_standby_temperature = =material_print_temperature retraction_hop = 0.4 -retraction_hop_only_when_collides = True \ No newline at end of file +retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/pla/two_trees_1.0_PLA_draft.inst.cfg b/resources/quality/twotrees/pla/two_trees_1.0_PLA_draft.inst.cfg index 27c2d7fbcc..6280251bf5 100644 --- a/resources/quality/twotrees/pla/two_trees_1.0_PLA_draft.inst.cfg +++ b/resources/quality/twotrees/pla/two_trees_1.0_PLA_draft.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Draft Quality definition = two_trees_base +name = Draft Quality +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_pla variant = 1.0mm Nozzle [values] -material_bed_temperature = 60 -material_print_temperature_layer_0 = 195 -material_print_temperature = 190 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 60 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 190 +material_print_temperature_layer_0 = 195 +material_standby_temperature = =material_print_temperature retraction_hop = 0.4 -retraction_hop_only_when_collides = True \ No newline at end of file +retraction_hop_only_when_collides = True + diff --git a/resources/quality/twotrees/tpu/two_trees_0.3_TPU_adaptive.inst.cfg b/resources/quality/twotrees/tpu/two_trees_0.3_TPU_adaptive.inst.cfg index 5039db8121..03bb352b17 100644 --- a/resources/quality/twotrees/tpu/two_trees_0.3_TPU_adaptive.inst.cfg +++ b/resources/quality/twotrees/tpu/two_trees_0.3_TPU_adaptive.inst.cfg @@ -1,25 +1,26 @@ [general] -version = 4 -name = Dynamic Quality definition = two_trees_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_tpu +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_tpu variant = 0.3mm Nozzle [values] -material_bed_temperature = 0 -material_print_temperature_layer_0 = 210 -material_print_temperature = 210 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 0 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 210 +material_print_temperature_layer_0 = 210 +material_standby_temperature = =material_print_temperature +retraction_amount = 7 retraction_hop = 0.2 retraction_hop_only_when_collides = True -speed_print = 20 retraction_speed = 40 -retraction_amount = 7 \ No newline at end of file +speed_print = 20 + diff --git a/resources/quality/twotrees/tpu/two_trees_0.3_TPU_standard.inst.cfg b/resources/quality/twotrees/tpu/two_trees_0.3_TPU_standard.inst.cfg index 650150fc7d..3b0465afba 100644 --- a/resources/quality/twotrees/tpu/two_trees_0.3_TPU_standard.inst.cfg +++ b/resources/quality/twotrees/tpu/two_trees_0.3_TPU_standard.inst.cfg @@ -1,25 +1,26 @@ [general] -version = 4 -name = Standard Quality definition = two_trees_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_tpu variant = 0.3mm Nozzle [values] -material_bed_temperature = 0 -material_print_temperature_layer_0 = 210 -material_print_temperature = 210 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 0 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 210 +material_print_temperature_layer_0 = 210 +material_standby_temperature = =material_print_temperature +retraction_amount = 7 retraction_hop = 0.4 retraction_hop_only_when_collides = True -speed_print = 20 retraction_speed = 40 -retraction_amount = 7 \ No newline at end of file +speed_print = 20 + diff --git a/resources/quality/twotrees/tpu/two_trees_0.3_TPU_super.inst.cfg b/resources/quality/twotrees/tpu/two_trees_0.3_TPU_super.inst.cfg index 6d2c8a17e6..1d694f0459 100644 --- a/resources/quality/twotrees/tpu/two_trees_0.3_TPU_super.inst.cfg +++ b/resources/quality/twotrees/tpu/two_trees_0.3_TPU_super.inst.cfg @@ -1,25 +1,26 @@ [general] -version = 4 -name = Super Quality definition = two_trees_base +name = Super Quality +version = 4 [metadata] +material = generic_tpu +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_tpu variant = 0.3mm Nozzle [values] -material_bed_temperature = 0 -material_print_temperature_layer_0 = 210 -material_print_temperature = 210 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 0 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 210 +material_print_temperature_layer_0 = 210 +material_standby_temperature = =material_print_temperature +retraction_amount = 7 retraction_hop = 0.2 retraction_hop_only_when_collides = True -speed_print = 20 retraction_speed = 40 -retraction_amount = 7 \ No newline at end of file +speed_print = 20 + diff --git a/resources/quality/twotrees/tpu/two_trees_0.4_TPU_adaptive.inst.cfg b/resources/quality/twotrees/tpu/two_trees_0.4_TPU_adaptive.inst.cfg index 6b7053a97c..ea7f2af869 100644 --- a/resources/quality/twotrees/tpu/two_trees_0.4_TPU_adaptive.inst.cfg +++ b/resources/quality/twotrees/tpu/two_trees_0.4_TPU_adaptive.inst.cfg @@ -1,25 +1,26 @@ [general] -version = 4 -name = Dynamic Quality definition = two_trees_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_tpu +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_tpu variant = 0.4mm Nozzle [values] -material_bed_temperature = 0 -material_print_temperature_layer_0 = 210 -material_print_temperature = 210 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 0 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 210 +material_print_temperature_layer_0 = 210 +material_standby_temperature = =material_print_temperature +retraction_amount = 7 retraction_hop = 0.2 retraction_hop_only_when_collides = True -speed_print = 20 retraction_speed = 40 -retraction_amount = 7 \ No newline at end of file +speed_print = 20 + diff --git a/resources/quality/twotrees/tpu/two_trees_0.4_TPU_standard.inst.cfg b/resources/quality/twotrees/tpu/two_trees_0.4_TPU_standard.inst.cfg index f38faa8f47..d9c9ff173f 100644 --- a/resources/quality/twotrees/tpu/two_trees_0.4_TPU_standard.inst.cfg +++ b/resources/quality/twotrees/tpu/two_trees_0.4_TPU_standard.inst.cfg @@ -1,25 +1,26 @@ [general] -version = 4 -name = Standard Quality definition = two_trees_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_tpu variant = 0.4mm Nozzle [values] -material_bed_temperature = 0 -material_print_temperature_layer_0 = 210 -material_print_temperature = 210 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 0 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 210 +material_print_temperature_layer_0 = 210 +material_standby_temperature = =material_print_temperature +retraction_amount = 7 retraction_hop = 0.3 retraction_hop_only_when_collides = True -speed_print = 20 retraction_speed = 40 -retraction_amount = 7 \ No newline at end of file +speed_print = 20 + diff --git a/resources/quality/twotrees/tpu/two_trees_0.4_TPU_super.inst.cfg b/resources/quality/twotrees/tpu/two_trees_0.4_TPU_super.inst.cfg index 7bea507d9c..f70e3fcf87 100644 --- a/resources/quality/twotrees/tpu/two_trees_0.4_TPU_super.inst.cfg +++ b/resources/quality/twotrees/tpu/two_trees_0.4_TPU_super.inst.cfg @@ -1,25 +1,26 @@ [general] -version = 4 -name = Super Quality definition = two_trees_base +name = Super Quality +version = 4 [metadata] +material = generic_tpu +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_tpu variant = 0.4mm Nozzle [values] -material_bed_temperature = 0 -material_print_temperature_layer_0 = 210 -material_print_temperature = 210 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 0 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 210 +material_print_temperature_layer_0 = 210 +material_standby_temperature = =material_print_temperature +retraction_amount = 7 retraction_hop = 0.2 retraction_hop_only_when_collides = True -speed_print = 20 retraction_speed = 40 -retraction_amount = 7 \ No newline at end of file +speed_print = 20 + diff --git a/resources/quality/twotrees/tpu/two_trees_0.5_TPU_adaptive.inst.cfg b/resources/quality/twotrees/tpu/two_trees_0.5_TPU_adaptive.inst.cfg index 588ab9d5f2..98c45d0f28 100644 --- a/resources/quality/twotrees/tpu/two_trees_0.5_TPU_adaptive.inst.cfg +++ b/resources/quality/twotrees/tpu/two_trees_0.5_TPU_adaptive.inst.cfg @@ -1,25 +1,26 @@ [general] -version = 4 -name = Dynamic Quality definition = two_trees_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_tpu +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive -material = generic_tpu variant = 0.5mm Nozzle [values] -material_bed_temperature = 0 -material_print_temperature_layer_0 = 210 -material_print_temperature = 210 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 0 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 210 +material_print_temperature_layer_0 = 210 +material_standby_temperature = =material_print_temperature +retraction_amount = 7 retraction_hop = 0.2 retraction_hop_only_when_collides = True -speed_print = 20 retraction_speed = 40 -retraction_amount = 7 \ No newline at end of file +speed_print = 20 + diff --git a/resources/quality/twotrees/tpu/two_trees_0.5_TPU_standard.inst.cfg b/resources/quality/twotrees/tpu/two_trees_0.5_TPU_standard.inst.cfg index 50e43883e7..d8cfda0e53 100644 --- a/resources/quality/twotrees/tpu/two_trees_0.5_TPU_standard.inst.cfg +++ b/resources/quality/twotrees/tpu/two_trees_0.5_TPU_standard.inst.cfg @@ -1,25 +1,26 @@ [general] -version = 4 -name = Standard Quality definition = two_trees_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_tpu variant = 0.5mm Nozzle [values] -material_bed_temperature = 0 -material_print_temperature_layer_0 = 210 -material_print_temperature = 210 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 0 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 210 +material_print_temperature_layer_0 = 210 +material_standby_temperature = =material_print_temperature +retraction_amount = 7 retraction_hop = 0.3 retraction_hop_only_when_collides = True -speed_print = 20 retraction_speed = 40 -retraction_amount = 7 \ No newline at end of file +speed_print = 20 + diff --git a/resources/quality/twotrees/tpu/two_trees_0.5_TPU_super.inst.cfg b/resources/quality/twotrees/tpu/two_trees_0.5_TPU_super.inst.cfg index d9f9fd2990..c20f9427dd 100644 --- a/resources/quality/twotrees/tpu/two_trees_0.5_TPU_super.inst.cfg +++ b/resources/quality/twotrees/tpu/two_trees_0.5_TPU_super.inst.cfg @@ -1,25 +1,26 @@ [general] -version = 4 -name = Super Quality definition = two_trees_base +name = Super Quality +version = 4 [metadata] +material = generic_tpu +quality_type = super setting_version = 20 type = quality -quality_type = super -material = generic_tpu variant = 0.5mm Nozzle [values] -material_bed_temperature = 0 -material_print_temperature_layer_0 = 210 -material_print_temperature = 210 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 0 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 210 +material_print_temperature_layer_0 = 210 +material_standby_temperature = =material_print_temperature +retraction_amount = 7 retraction_hop = 0.2 retraction_hop_only_when_collides = True -speed_print = 20 retraction_speed = 40 -retraction_amount = 7 \ No newline at end of file +speed_print = 20 + diff --git a/resources/quality/twotrees/tpu/two_trees_0.6_TPU_standard.inst.cfg b/resources/quality/twotrees/tpu/two_trees_0.6_TPU_standard.inst.cfg index 42ec5e7a4c..3f786ac0d0 100644 --- a/resources/quality/twotrees/tpu/two_trees_0.6_TPU_standard.inst.cfg +++ b/resources/quality/twotrees/tpu/two_trees_0.6_TPU_standard.inst.cfg @@ -1,25 +1,26 @@ [general] -version = 4 -name = Standard Quality definition = two_trees_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = standard setting_version = 20 type = quality -quality_type = standard -material = generic_tpu variant = 0.6mm Nozzle [values] -material_bed_temperature = 0 -material_print_temperature_layer_0 = 210 -material_print_temperature = 210 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 0 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 210 +material_print_temperature_layer_0 = 210 +material_standby_temperature = =material_print_temperature +retraction_amount = 7 retraction_hop = 0.3 retraction_hop_only_when_collides = True -speed_print = 20 retraction_speed = 40 -retraction_amount = 7 \ No newline at end of file +speed_print = 20 + diff --git a/resources/quality/twotrees/tpu/two_trees_0.8_TPU_draft.inst.cfg b/resources/quality/twotrees/tpu/two_trees_0.8_TPU_draft.inst.cfg index ecd64d1231..b7af53eba3 100644 --- a/resources/quality/twotrees/tpu/two_trees_0.8_TPU_draft.inst.cfg +++ b/resources/quality/twotrees/tpu/two_trees_0.8_TPU_draft.inst.cfg @@ -1,25 +1,26 @@ [general] -version = 4 -name = Draft Quality definition = two_trees_base +name = Draft Quality +version = 4 [metadata] +material = generic_tpu +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_tpu variant = 0.8mm Nozzle [values] -material_bed_temperature = 0 -material_print_temperature_layer_0 = 210 -material_print_temperature = 210 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 0 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 210 +material_print_temperature_layer_0 = 210 +material_standby_temperature = =material_print_temperature +retraction_amount = 7 retraction_hop = 0.4 retraction_hop_only_when_collides = True -speed_print = 20 retraction_speed = 40 -retraction_amount = 7 \ No newline at end of file +speed_print = 20 + diff --git a/resources/quality/twotrees/tpu/two_trees_1.0_TPU_draft.inst.cfg b/resources/quality/twotrees/tpu/two_trees_1.0_TPU_draft.inst.cfg index a3e3f2f391..fbb82f4491 100644 --- a/resources/quality/twotrees/tpu/two_trees_1.0_TPU_draft.inst.cfg +++ b/resources/quality/twotrees/tpu/two_trees_1.0_TPU_draft.inst.cfg @@ -1,25 +1,26 @@ [general] -version = 4 -name = Draft Quality definition = two_trees_base +name = Draft Quality +version = 4 [metadata] +material = generic_tpu +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_tpu variant = 1.0mm Nozzle [values] -material_bed_temperature = 0 -material_print_temperature_layer_0 = 210 -material_print_temperature = 210 -material_standby_temperature = =material_print_temperature -material_initial_print_temperature= =material_print_temperature -material_final_print_temperature= =material_print_temperature cool_fan_enabled = True +material_bed_temperature = 0 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature = 210 +material_print_temperature_layer_0 = 210 +material_standby_temperature = =material_print_temperature +retraction_amount = 7 retraction_hop = 0.4 retraction_hop_only_when_collides = True -speed_print = 20 retraction_speed = 40 -retraction_amount = 7 \ No newline at end of file +speed_print = 20 + diff --git a/resources/quality/twotrees/two_trees_global_adaptive.inst.cfg b/resources/quality/twotrees/two_trees_global_adaptive.inst.cfg index 1ed3987563..b29ee926b6 100644 --- a/resources/quality/twotrees/two_trees_global_adaptive.inst.cfg +++ b/resources/quality/twotrees/two_trees_global_adaptive.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Dynamic Quality definition = two_trees_base +name = Dynamic Quality +version = 4 [metadata] +global_quality = True +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive weight = -2 -global_quality = True [values] +adaptive_layer_height_enabled = true layer_height = 0.16 layer_height_0 = 0.2 +support_interface_height = =layer_height*6 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/twotrees/two_trees_global_draft.inst.cfg b/resources/quality/twotrees/two_trees_global_draft.inst.cfg index dd8122df7b..233f15bdf6 100644 --- a/resources/quality/twotrees/two_trees_global_draft.inst.cfg +++ b/resources/quality/twotrees/two_trees_global_draft.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Draft Quality definition = two_trees_base +name = Draft Quality +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -5 -global_quality = True [values] layer_height = 0.32 layer_height_0 = 0.32 +support_interface_height = =layer_height*4 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/twotrees/two_trees_global_low.inst.cfg b/resources/quality/twotrees/two_trees_global_low.inst.cfg index e90ad4125a..9ae5001888 100644 --- a/resources/quality/twotrees/two_trees_global_low.inst.cfg +++ b/resources/quality/twotrees/two_trees_global_low.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Low Quality definition = two_trees_base +name = Low Quality +version = 4 [metadata] +global_quality = True +quality_type = low setting_version = 20 type = quality -quality_type = low weight = -4 -global_quality = True [values] layer_height = 0.28 layer_height_0 = 0.28 +support_interface_height = =layer_height*4 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/twotrees/two_trees_global_standard.inst.cfg b/resources/quality/twotrees/two_trees_global_standard.inst.cfg index 59913e3631..ea1c5756c5 100644 --- a/resources/quality/twotrees/two_trees_global_standard.inst.cfg +++ b/resources/quality/twotrees/two_trees_global_standard.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Standard Quality definition = two_trees_base +name = Standard Quality +version = 4 [metadata] +global_quality = True +quality_type = standard setting_version = 20 type = quality -quality_type = standard weight = -3 -global_quality = True [values] layer_height = 0.2 layer_height_0 = 0.2 +support_interface_height = =layer_height*4 top_bottom_thickness = =layer_height_0+layer_height*3 wall_thickness = =line_width*3 -support_interface_height = =layer_height*4 + diff --git a/resources/quality/twotrees/two_trees_global_super.inst.cfg b/resources/quality/twotrees/two_trees_global_super.inst.cfg index 83a10a0fc2..e300773d2d 100644 --- a/resources/quality/twotrees/two_trees_global_super.inst.cfg +++ b/resources/quality/twotrees/two_trees_global_super.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Super Quality definition = two_trees_base +name = Super Quality +version = 4 [metadata] +global_quality = True +quality_type = super setting_version = 20 type = quality -quality_type = super weight = -1 -global_quality = True [values] layer_height = 0.12 layer_height_0 = 0.2 +support_interface_height = =layer_height*8 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/twotrees/two_trees_global_ultra.inst.cfg b/resources/quality/twotrees/two_trees_global_ultra.inst.cfg index 4dc7bcec10..1303e7a9be 100644 --- a/resources/quality/twotrees/two_trees_global_ultra.inst.cfg +++ b/resources/quality/twotrees/two_trees_global_ultra.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Ultra Quality definition = two_trees_base +name = Ultra Quality +version = 4 [metadata] +global_quality = True +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra weight = 0 -global_quality = True [values] layer_height = 0.08 layer_height_0 = 0.12 +support_interface_height = =layer_height*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/ultimaker2/um2_draft.inst.cfg b/resources/quality/ultimaker2/um2_draft.inst.cfg index b986603b55..534b4610c1 100644 --- a/resources/quality/ultimaker2/um2_draft.inst.cfg +++ b/resources/quality/ultimaker2/um2_draft.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft definition = ultimaker2 +name = Draft +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] layer_height = 0.2 + diff --git a/resources/quality/ultimaker2/um2_fast.inst.cfg b/resources/quality/ultimaker2/um2_fast.inst.cfg index 8daf9ed499..e4c2b000c6 100644 --- a/resources/quality/ultimaker2/um2_fast.inst.cfg +++ b/resources/quality/ultimaker2/um2_fast.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker2 +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -1 -global_quality = True [values] layer_height = 0.15 + diff --git a/resources/quality/ultimaker2/um2_high.inst.cfg b/resources/quality/ultimaker2/um2_high.inst.cfg index 13c83048bb..c38605530f 100644 --- a/resources/quality/ultimaker2/um2_high.inst.cfg +++ b/resources/quality/ultimaker2/um2_high.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker2 +name = Extra Fine +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -global_quality = True [values] layer_height = 0.06 + diff --git a/resources/quality/ultimaker2/um2_normal.inst.cfg b/resources/quality/ultimaker2/um2_normal.inst.cfg index dc102ed605..205e605d26 100644 --- a/resources/quality/ultimaker2/um2_normal.inst.cfg +++ b/resources/quality/ultimaker2/um2_normal.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Fine definition = ultimaker2 +name = Fine +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] + diff --git a/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg index 17368a6f3e..c73858ec4c 100644 --- a/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker2_plus +name = Extra Fine +version = 4 [metadata] +material = generic_pla +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pla variant = 0.25 mm +weight = 1 [values] cool_min_layer_time = 5 @@ -18,3 +18,4 @@ infill_sparse_density = 22 speed_layer_0 = =round(speed_print * 30 / 30) speed_print = 30 top_bottom_thickness = 0.72 + diff --git a/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg index 9d89812565..8d2ddbc649 100644 --- a/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker2_plus +name = Normal +version = 4 [metadata] +material = generic_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_pla variant = 0.4 mm +weight = -1 [values] cool_min_layer_time = 5 @@ -21,3 +21,4 @@ speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_travel = 150 speed_wall = =math.ceil(speed_print * 50 / 60) top_bottom_thickness = 0.75 + diff --git a/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg index a5f788b631..4040a35907 100644 --- a/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker2_plus +name = Extra Fine +version = 4 [metadata] +material = generic_pla +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pla variant = 0.4 mm +weight = 1 [values] cool_min_layer_time = 5 @@ -19,3 +19,4 @@ speed_layer_0 = =round(speed_print * 30 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 20 / 50) top_bottom_thickness = 0.72 + diff --git a/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg index 6f810a8f3a..40ec223213 100644 --- a/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus +name = Fine +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pla variant = 0.4 mm +weight = 0 [values] cool_min_layer_time = 5 @@ -19,3 +19,4 @@ speed_layer_0 = =round(speed_print * 30 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 20 / 50) top_bottom_thickness = 0.8 + diff --git a/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg index 345d524be9..4e38457e34 100644 --- a/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus +name = Fine +version = 4 [metadata] +material = generic_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = 0 -material = generic_pla variant = 0.6 mm +weight = 0 [values] cool_min_layer_time = 5 @@ -21,3 +21,4 @@ speed_topbottom = =math.ceil(speed_print * 20 / 55) speed_wall = =math.ceil(speed_print * 40 / 55) speed_wall_0 = =math.ceil(speed_print * 25 / 55) top_bottom_thickness = 1.2 + diff --git a/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg index 252dc2d25f..97d514c819 100644 --- a/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker2_plus +name = Normal +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -1 -material = generic_pla variant = 0.8 mm +weight = -1 [values] cool_min_layer_time = 5 @@ -19,3 +19,4 @@ speed_layer_0 = =round(speed_print * 30 / 40) speed_print = 40 speed_wall_0 = =math.ceil(speed_print * 25 / 40) top_bottom_thickness = 1.2 + diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg index b71cb1818e..249984318b 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker2_plus +name = Extra Fine +version = 4 [metadata] +material = generic_abs +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_abs variant = 0.25 mm +weight = 1 [values] cool_fan_speed_min = =cool_fan_speed * 0.2 @@ -19,3 +19,4 @@ cool_min_speed = 10 infill_sparse_density = 22 speed_print = 30 top_bottom_thickness = 0.72 + diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg index 636d80f88c..1470182aad 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker2_plus +name = Normal +version = 4 [metadata] +material = generic_abs +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_abs variant = 0.4 mm +weight = -1 [values] cool_fan_speed_min = =cool_fan_speed * 0.2 @@ -17,11 +17,12 @@ cool_min_layer_time = 3 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 10 infill_sparse_density = 18 +speed_infill = =math.ceil(speed_print * 100 / 55) speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_travel = 150 speed_wall = =math.ceil(speed_print * 40 / 55) -top_bottom_thickness = 0.75 speed_wall_0 = =math.ceil(speed_print * 40 / 55) speed_wall_x = =math.ceil(speed_print * 80 / 55) -speed_infill = =math.ceil(speed_print * 100 / 55) +top_bottom_thickness = 0.75 + diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg index 0b379b030f..34392a830b 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker2_plus +name = Extra Fine +version = 4 [metadata] +material = generic_abs +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_abs variant = 0.4 mm +weight = 1 [values] cool_fan_speed_min = =cool_fan_speed * 0.2 @@ -17,8 +17,9 @@ cool_min_layer_time = 3 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 10 infill_sparse_density = 22 +speed_infill = =math.ceil(speed_print * 45 / 45) speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 15 / 45) speed_wall = =math.ceil(speed_print * 30 / 45) top_bottom_thickness = 0.72 -speed_topbottom = =math.ceil(speed_print * 15 / 45) -speed_infill = =math.ceil(speed_print * 45 / 45) + diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg index 7c53dbae9b..b617a14541 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus +name = Fine +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_abs variant = 0.4 mm +weight = 0 [values] cool_fan_speed_min = =cool_fan_speed * 0.2 @@ -20,3 +20,4 @@ infill_sparse_density = 20 speed_print = 45 speed_wall = =math.ceil(speed_print * 30 / 45) top_bottom_thickness = 0.8 + diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg index 88d9cfd75f..d81e61607d 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus +name = Fine +version = 4 [metadata] +material = generic_abs +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = 0 -material = generic_abs variant = 0.6 mm +weight = 0 [values] cool_fan_speed_min = =cool_fan_speed * 0.5 @@ -20,3 +20,4 @@ infill_sparse_density = 20 speed_infill = =math.ceil(speed_print * 55 / 40) speed_print = 40 top_bottom_thickness = 1.2 + diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg index 13dff6de33..e61afa871f 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker2_plus +name = Normal +version = 4 [metadata] +material = generic_abs +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -1 -material = generic_abs variant = 0.8 mm +weight = -1 [values] cool_fan_speed_min = =cool_fan_speed * 0.5 @@ -19,3 +19,4 @@ cool_min_speed = 15 infill_sparse_density = 20 speed_print = 40 top_bottom_thickness = 1.2 + diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg index 0e67f00011..183fb8b576 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker2_plus +name = Extra Fine +version = 4 [metadata] +material = generic_cpe +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_cpe variant = 0.25 mm +weight = 1 [values] cool_fan_speed_min = =cool_fan_speed * 0.2 @@ -19,3 +19,4 @@ cool_min_speed = 15 infill_sparse_density = 22 speed_print = 30 top_bottom_thickness = 0.72 + diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg index bcd95dcfe2..4bfac562f5 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker2_plus +name = Normal +version = 4 [metadata] +material = generic_cpe +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_cpe variant = 0.4 mm +weight = -1 [values] cool_fan_speed_min = =cool_fan_speed * 0.8 @@ -17,11 +17,12 @@ cool_min_layer_time = 3 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 10 infill_sparse_density = 18 +speed_infill = =math.ceil(speed_print * 45 / 45) speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_travel = 150 speed_wall = =math.ceil(speed_print * 40 / 45) -top_bottom_thickness = 0.75 speed_wall_0 = =math.ceil(speed_print * 30 / 45) -speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_wall_x = =math.ceil(speed_print * 40 / 45) -speed_infill = =math.ceil(speed_print * 45 / 45) +top_bottom_thickness = 0.75 + diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg index 1bcbd78cf4..7fbb5fe24a 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker2_plus +name = Extra Fine +version = 4 [metadata] +material = generic_cpe +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_cpe variant = 0.4 mm +weight = 1 [values] cool_fan_speed_min = =cool_fan_speed * 0.8 @@ -17,8 +17,9 @@ cool_min_layer_time = 2 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 15 infill_sparse_density = 22 +speed_infill = =math.ceil(speed_print * 45 / 45) speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 15 / 45) speed_wall = =math.ceil(speed_print * 30 / 45) top_bottom_thickness = 0.72 -speed_topbottom = =math.ceil(speed_print * 15 / 45) -speed_infill = =math.ceil(speed_print * 45 / 45) + diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg index 51695edcb6..9417d38a91 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus +name = Fine +version = 4 [metadata] +material = generic_cpe +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_cpe variant = 0.4 mm +weight = 0 [values] cool_fan_speed_min = =cool_fan_speed * 0.8 @@ -20,3 +20,4 @@ infill_sparse_density = 20 speed_print = 45 speed_wall = =math.ceil(speed_print * 30 / 45) top_bottom_thickness = 0.8 + diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg index 6fc2e01428..2e7bfbe72a 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus +name = Fine +version = 4 [metadata] +material = generic_cpe +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = 0 -material = generic_cpe variant = 0.6 mm +weight = 0 [values] cool_fan_speed_min = =cool_fan_speed * 0.8 @@ -19,3 +19,4 @@ cool_min_speed = 8 infill_sparse_density = 20 speed_print = 40 top_bottom_thickness = 1.2 + diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg index 771f0acb92..4e5244ee19 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker2_plus +name = Normal +version = 4 [metadata] +material = generic_cpe +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -1 -material = generic_cpe variant = 0.8 mm +weight = -1 [values] cool_fan_speed_min = =cool_fan_speed * 0.8 @@ -19,3 +19,4 @@ cool_min_speed = 8 infill_sparse_density = 20 speed_print = 40 top_bottom_thickness = 1.2 + 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 fa23153639..8c613976cb 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker2_plus +name = Fast +version = 4 [metadata] +material = generic_cpe_plus +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_cpe_plus variant = 0.4 mm +weight = -2 [values] adhesion_type = raft @@ -29,3 +29,4 @@ support_angle = 45 support_enable = True support_z_distance = 0.26 top_bottom_thickness = 1.5 + 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 dea75d9ed9..bb2d9f6620 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus +name = Fine +version = 4 [metadata] +material = generic_cpe_plus +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = 0 -material = generic_cpe_plus variant = 0.4 mm +weight = 0 [values] adhesion_type = raft @@ -29,3 +29,4 @@ support_angle = 45 support_enable = True support_z_distance = 0.26 top_bottom_thickness = 1.5 + 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 6474270331..0642fb0795 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker2_plus +name = Fast +version = 4 [metadata] +material = generic_cpe_plus +quality_type = slightlycoarse setting_version = 20 type = quality -quality_type = slightlycoarse -weight = -2 -material = generic_cpe_plus variant = 0.6 mm +weight = -2 [values] adhesion_type = raft @@ -20,7 +20,6 @@ cool_min_speed = 8 infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 35 layer_0_z_overlap = 0.22 - raft_airgap = 0.37 speed_print = 25 speed_topbottom = =math.ceil(speed_print * 20 / 25) @@ -31,3 +30,4 @@ support_angle = 45 support_enable = True support_z_distance = 0.22 top_bottom_thickness = 0.75 + 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 615d33e045..9ef0197132 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus +name = Fine +version = 4 [metadata] +material = generic_cpe_plus +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = 0 -material = generic_cpe_plus variant = 0.6 mm +weight = 0 [values] adhesion_type = raft @@ -20,7 +20,6 @@ cool_min_speed = 8 infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 35 layer_0_z_overlap = 0.22 - raft_airgap = 0.37 speed_print = 35 speed_topbottom = =math.ceil(speed_print * 20 / 35) @@ -31,3 +30,4 @@ support_angle = 45 support_enable = True support_z_distance = 0.22 top_bottom_thickness = 0.75 + 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 8892494cdd..c20222ba11 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker2_plus +name = Fast +version = 4 [metadata] +material = generic_cpe_plus +quality_type = slightlycoarse setting_version = 20 type = quality -quality_type = slightlycoarse -weight = -2 -material = generic_cpe_plus variant = 0.8 mm +weight = -2 [values] adhesion_type = raft @@ -29,3 +29,4 @@ support_angle = 45 support_enable = True support_z_distance = 0.26 top_bottom_thickness = 1.2 + 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 f8772fd96c..f3b7f5a56d 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus +name = Fine +version = 4 [metadata] +material = generic_cpe_plus +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = 0 -material = generic_cpe_plus variant = 0.8 mm +weight = 0 [values] adhesion_type = raft @@ -29,3 +29,4 @@ support_angle = 45 support_enable = True support_z_distance = 0.26 top_bottom_thickness = 1.2 + diff --git a/resources/quality/ultimaker2_plus/um2p_global_Coarse_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Coarse_Quality.inst.cfg index f1ebc4d1dd..1971ac56c7 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_Coarse_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_Coarse_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Coarse Quality definition = ultimaker2_plus +name = Coarse Quality +version = 4 [metadata] +global_quality = True +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = -4 -global_quality = True [values] layer_height = 0.4 + diff --git a/resources/quality/ultimaker2_plus/um2p_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Draft_Quality.inst.cfg index f5d13298f5..662120cb2f 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_Draft_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = ultimaker2_plus +name = Draft Quality +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] layer_height = 0.2 + diff --git a/resources/quality/ultimaker2_plus/um2p_global_Extra_Coarse_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Extra_Coarse_Quality.inst.cfg index 3850ec551c..08e2966530 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_Extra_Coarse_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_Extra_Coarse_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Extra Coarse Quality definition = ultimaker2_plus +name = Extra Coarse Quality +version = 4 [metadata] +global_quality = True +quality_type = extracoarse setting_version = 20 type = quality -quality_type = extracoarse weight = -3 -global_quality = True [values] layer_height = 0.6 + diff --git a/resources/quality/ultimaker2_plus/um2p_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Fast_Quality.inst.cfg index 94d11dea2b..9966b0d05a 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_Fast_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker2_plus +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -1 -global_quality = True [values] layer_height = 0.15 + diff --git a/resources/quality/ultimaker2_plus/um2p_global_High_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_High_Quality.inst.cfg index e30aa178c4..a2c379b145 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_High_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker2_plus +name = Extra Fine +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -global_quality = True [values] layer_height = 0.06 + diff --git a/resources/quality/ultimaker2_plus/um2p_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Normal_Quality.inst.cfg index 56867a3212..0effaf7f07 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_Normal_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus +name = Fine +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] layer_height = 0.1 + diff --git a/resources/quality/ultimaker2_plus/um2p_global_Slightly_Coarse_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Slightly_Coarse_Quality.inst.cfg index 631fc2bcf3..73e5c40d98 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_Slightly_Coarse_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_Slightly_Coarse_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Coarse Quality definition = ultimaker2_plus +name = Coarse Quality +version = 4 [metadata] +global_quality = True +quality_type = slightlycoarse setting_version = 20 type = quality -quality_type = slightlycoarse weight = -4 -global_quality = True [values] layer_height = 0.3 + 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 601a7a8c89..77b8466a4c 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker2_plus +name = Extra Fine +version = 4 [metadata] +material = generic_nylon +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_nylon variant = 0.25 mm +weight = 1 [values] adhesion_type = raft @@ -22,6 +22,7 @@ infill_sparse_density = 25 layer_0_z_overlap = 0.1 raft_airgap = 0.15 retraction_hop_enabled = 0.2 +speed_infill = =math.ceil(speed_print * 40 / 40) speed_print = 40 speed_support = 40 speed_topbottom = =math.ceil(speed_print * 35 / 40) @@ -31,4 +32,4 @@ speed_wall_x = =speed_print support_enable = True support_z_distance = =layer_height * 2 top_bottom_thickness = 1.2 -speed_infill = =math.ceil(speed_print * 40 / 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 2d7a1b9fbf..d8f5f0d1be 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus +name = Fine +version = 4 [metadata] +material = generic_nylon +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_nylon variant = 0.25 mm +weight = 0 [values] adhesion_type = raft @@ -31,3 +31,4 @@ speed_wall_x = =speed_print support_enable = True support_z_distance = =layer_height * 2 top_bottom_thickness = 1.2 + 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 ad9b46daf5..9229c2b724 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker2_plus +name = Normal +version = 4 [metadata] +material = generic_nylon +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -1 -material = generic_nylon variant = 0.4 mm +weight = -1 [values] adhesion_type = raft @@ -20,14 +20,15 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 30 layer_0_z_overlap = 0.22 raft_airgap = 0.57 +speed_infill = =math.ceil(speed_print * 45 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 20 / 45) speed_travel = 150 speed_wall = =math.ceil(speed_print * 40 / 45) +speed_wall_0 = =math.ceil(speed_print * 30 / 45) +speed_wall_x = =math.ceil(speed_print * 40 / 45) support_angle = 45 support_enable = True support_z_distance = =layer_height * 2 top_bottom_thickness = 0.75 -speed_wall_0 = =math.ceil(speed_print * 30 / 45) -speed_wall_x = =math.ceil(speed_print * 40 / 45) -speed_infill = =math.ceil(speed_print * 45 / 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 6a6af68820..5044fd364a 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus +name = Fine +version = 4 [metadata] +material = generic_nylon +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = 0 -material = generic_nylon variant = 0.4 mm +weight = 0 [values] adhesion_type = raft @@ -27,3 +27,4 @@ support_angle = 45 support_enable = True support_z_distance = =layer_height * 2 top_bottom_thickness = 0.75 + 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 3b913494f9..522aaf8b47 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker2_plus +name = Normal +version = 4 [metadata] +material = generic_nylon +quality_type = slightlycoarse setting_version = 20 type = quality -quality_type = slightlycoarse -weight = -1 -material = generic_nylon variant = 0.6 mm +weight = -1 [values] adhesion_type = raft @@ -21,6 +21,7 @@ infill_sparse_density = 35 layer_0_z_overlap = 0.22 raft_airgap = 0.44 retraction_hop_enabled = 0.2 +speed_infill = =math.ceil(speed_print * 55 / 55) speed_print = 55 speed_support = 40 speed_topbottom = =math.ceil(speed_print * 35 / 55) @@ -31,4 +32,4 @@ support_angle = 45 support_enable = True support_z_distance = 0.55 top_bottom_thickness = 1.2 -speed_infill = =math.ceil(speed_print * 55 / 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 793368305e..f1e5971291 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus +name = Fine +version = 4 [metadata] +material = generic_nylon +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = 0 -material = generic_nylon variant = 0.6 mm +weight = 0 [values] adhesion_type = raft @@ -31,3 +31,4 @@ support_angle = 45 support_enable = True support_z_distance = =layer_height * 2 top_bottom_thickness = 1.2 + 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 9c2c83a3e8..8934dcb9fb 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker2_plus +name = Fast +version = 4 [metadata] +material = generic_nylon +quality_type = slightlycoarse setting_version = 20 type = quality -quality_type = slightlycoarse -weight = -2 -material = generic_nylon variant = 0.8 mm +weight = -2 [values] adhesion_type = raft @@ -28,7 +28,8 @@ speed_travel = 150 speed_wall_0 = =math.ceil(speed_print * 15 / 55) speed_wall_x = =math.ceil(speed_print * 40 / 55) support_angle = 45 +support_bottom_distance = 0.65 support_enable = True support_z_distance = 0.5 -support_bottom_distance = 0.65 top_bottom_thickness = 1.2 + 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 58910f9ee1..6c7684ba74 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus +name = Fine +version = 4 [metadata] +material = generic_nylon +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = 0 -material = generic_nylon variant = 0.8 mm +weight = 0 [values] adhesion_type = raft @@ -33,3 +33,4 @@ support_enable = True support_top_distance = 0.5 support_z_distance = =layer_height * 2 top_bottom_thickness = 1.2 + 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 1d86f0e63f..0e824b8aff 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker2_plus +name = Extra Fine +version = 4 [metadata] +material = generic_pc +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pc variant = 0.25 mm +weight = 1 [values] adhesion_type = raft @@ -22,8 +22,9 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 25 layer_0_z_overlap = 0.2 raft_airgap = 0.25 +speed_infill = =math.ceil(speed_print * 80 / 30) speed_print = 30 +speed_topbottom = =math.ceil(speed_print * 15 / 30) support_enable = True support_z_distance = 0.19 -speed_topbottom = =math.ceil(speed_print * 15 / 30) -speed_infill = =math.ceil(speed_print * 80 / 30) + 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 aad6d28b15..7e638e064e 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus +name = Fine +version = 4 [metadata] +material = generic_pc +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pc variant = 0.25 mm +weight = 0 [values] adhesion_type = raft @@ -25,3 +25,4 @@ raft_airgap = 0.25 speed_print = 30 support_enable = True support_z_distance = 0.19 + 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 4b0cef2987..52283c7d19 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker2_plus +name = Normal +version = 4 [metadata] +material = generic_pc +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -1 -material = generic_pc variant = 0.4 mm +weight = -1 [values] adhesion_type = raft @@ -21,11 +21,12 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 30 layer_0_z_overlap = 0.3 raft_airgap = 0.35 +speed_infill = =math.ceil(speed_print * 45 / 45) speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_wall_0 = =math.ceil(speed_print * 20 / 45) speed_wall_x = =math.ceil(speed_print * 30 / 45) support_angle = 45 support_enable = True support_z_distance = 0.19 -speed_topbottom = =math.ceil(speed_print * 30 / 45) -speed_infill = =math.ceil(speed_print * 45 / 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 3bfce297fc..d1edaf4fa8 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus +name = Fine +version = 4 [metadata] +material = generic_pc +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pc variant = 0.4 mm +weight = 0 [values] adhesion_type = raft @@ -27,3 +27,4 @@ speed_wall_x = =math.ceil(speed_print * 30 / 45) support_angle = 45 support_enable = True support_z_distance = 0.19 + 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 5f876392cc..5d87ec78ff 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker2_plus +name = Normal +version = 4 [metadata] +material = generic_pc +quality_type = slightlycoarse setting_version = 20 type = quality -quality_type = slightlycoarse -weight = -1 -material = generic_pc variant = 0.6 mm +weight = -1 [values] adhesion_type = raft @@ -21,6 +21,7 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 35 layer_0_z_overlap = 0.22 raft_airgap = 0.52 +speed_infill = =math.ceil(speed_print * 45 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 20 / 45) speed_travel = 150 @@ -30,4 +31,4 @@ support_angle = 45 support_enable = True support_z_distance = 0.21 top_bottom_thickness = 0.75 -speed_infill = =math.ceil(speed_print * 45 / 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 278a79a883..95a86c873d 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus +name = Fine +version = 4 [metadata] +material = generic_pc +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = 0 -material = generic_pc variant = 0.6 mm +weight = 0 [values] adhesion_type = raft @@ -30,3 +30,4 @@ support_angle = 45 support_enable = True support_z_distance = 0.21 top_bottom_thickness = 0.75 + 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 eeb3980a83..026b126e4d 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker2_plus +name = Fast +version = 4 [metadata] +material = generic_pc +quality_type = extracoarse setting_version = 20 type = quality -quality_type = extracoarse -weight = -2 -material = generic_pc variant = 0.8 mm +weight = -2 [values] adhesion_type = raft @@ -26,3 +26,4 @@ support_angle = 45 support_enable = True support_z_distance = 0.26 top_bottom_thickness = 2.0 + 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 a464366220..3cb7b4fbea 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus +name = Fine +version = 4 [metadata] +material = generic_pc +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = 0 -material = generic_pc variant = 0.8 mm +weight = 0 [values] adhesion_type = raft @@ -26,3 +26,4 @@ support_angle = 45 support_enable = True support_z_distance = 0.26 top_bottom_thickness = 1.2 + diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg index 12343fc6f9..559e0809e3 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker2_plus +name = Normal +version = 4 [metadata] +material = generic_pp +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_pp variant = 0.4 mm +weight = -1 [values] acceleration_enabled = True @@ -35,6 +35,7 @@ retraction_hop_only_when_collides = True retraction_min_travel = 0.5 retraction_prime_speed = 15 skin_overlap = 10 +speed_infill = =math.ceil(speed_print * 25 / 25) speed_prime_tower = =speed_topbottom speed_print = 25 speed_support_interface = =speed_topbottom @@ -42,10 +43,10 @@ speed_topbottom = =math.ceil(speed_print * 25 / 25) speed_travel = 250 speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 20 / 25) +speed_wall_x = =math.ceil(speed_print * 25 / 25) support_angle = 60 -support_z_distance = =layer_height * 2 support_bottom_distance = =support_z_distance / 2 +support_z_distance = =layer_height * 2 travel_avoid_distance = 3 wall_0_inset = 0 -speed_wall_x = =math.ceil(speed_print * 25 / 25) -speed_infill = =math.ceil(speed_print * 25 / 25) + diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg index 317e519f28..ac977dc4e3 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus +name = Fine +version = 4 [metadata] +material = generic_pp +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pp variant = 0.4 mm +weight = 0 [values] acceleration_enabled = True @@ -43,7 +43,8 @@ speed_travel = 250 speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 20 / 25) support_angle = 60 -support_z_distance = =layer_height * 2 support_bottom_distance = =support_z_distance / 2 +support_z_distance = =layer_height * 2 travel_avoid_distance = 3 wall_0_inset = 0 + diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg index 709d5e9be6..d73d80c817 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker2_plus +name = Fast +version = 4 [metadata] +material = generic_pp +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pp variant = 0.6 mm +weight = -2 [values] acceleration_enabled = True @@ -42,8 +42,9 @@ speed_travel = 250 speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 20 / 25) support_angle = 60 -support_z_distance = =layer_height * 2 support_bottom_distance = =support_z_distance / 2 +support_z_distance = =layer_height * 2 top_bottom_thickness = 1.1 travel_avoid_distance = 3 wall_0_inset = 0 + 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 781efbeb66..c63eea967d 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker2_plus +name = Normal +version = 4 [metadata] +material = generic_pp +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_pp variant = 0.6 mm +weight = -1 [values] acceleration_enabled = True @@ -34,6 +34,7 @@ retraction_hop_enabled = True retraction_hop_only_when_collides = True retraction_prime_speed = 15 skin_overlap = 10 +speed_infill = =math.ceil(speed_print * 25 / 25) speed_prime_tower = =speed_topbottom speed_print = 25 speed_support_interface = =speed_topbottom @@ -41,11 +42,11 @@ speed_topbottom = =math.ceil(speed_print * 25 / 25) speed_travel = 250 speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 20 / 25) +speed_wall_x = =math.ceil(speed_print * 25 / 25) support_angle = 60 -support_z_distance = =layer_height * 2 support_bottom_distance = =support_z_distance / 2 +support_z_distance = =layer_height * 2 top_bottom_thickness = 1.1 travel_avoid_distance = 3 wall_0_inset = 0 -speed_wall_x = =math.ceil(speed_print * 25 / 25) -speed_infill = =math.ceil(speed_print * 25 / 25) + diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg index 6e11c55e5a..60929a784a 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker2_plus +name = Fast +version = 4 [metadata] +material = generic_pp +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pp variant = 0.8 mm +weight = -2 [values] acceleration_enabled = True @@ -42,8 +42,9 @@ speed_travel = 250 speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 20 / 25) support_angle = 60 -support_z_distance = =layer_height * 2 support_bottom_distance = =support_z_distance / 2 +support_z_distance = =layer_height * 2 top_bottom_thickness = 1.5 travel_avoid_distance = 3 wall_0_inset = 0 + 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 e123522dc6..7c70118f7a 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fast definition = ultimaker2_plus +name = Extra Fast +version = 4 [metadata] +material = generic_pp +quality_type = slightlycoarse setting_version = 20 type = quality -quality_type = slightlycoarse -weight = -3 -material = generic_pp variant = 0.8 mm +weight = -3 [values] acceleration_enabled = True @@ -42,8 +42,9 @@ speed_travel = 250 speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 20 / 25) support_angle = 60 -support_z_distance = =layer_height * 2 support_bottom_distance = =support_z_distance / 2 +support_z_distance = =layer_height * 2 top_bottom_thickness = 1.5 travel_avoid_distance = 3 wall_0_inset = 0 + 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 bbc8553caf..ee3aface25 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker2_plus +name = Extra Fine +version = 4 [metadata] +material = generic_tpu +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_tpu variant = 0.25 mm +weight = 1 [values] adhesion_type = brim @@ -23,6 +23,7 @@ layer_0_z_overlap = 0.1 raft_airgap = 0.2 retraction_count_max = 15 retraction_hop_enabled = 0.2 +speed_infill = =math.ceil(speed_print * 40 / 40) speed_print = 40 speed_support = 40 speed_topbottom = =math.ceil(speed_print * 35 / 40) @@ -33,4 +34,4 @@ support_angle = 45 support_enable = True support_z_distance = =layer_height * 2 top_bottom_thickness = 1.2 -speed_infill = =math.ceil(speed_print * 40 / 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 9db8ba979b..f9726f162e 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus +name = Fine +version = 4 [metadata] +material = generic_tpu +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_tpu variant = 0.4 mm +weight = 0 [values] adhesion_type = brim @@ -31,3 +31,4 @@ support_angle = 45 support_enable = True support_z_distance = =layer_height * 2 top_bottom_thickness = 1.2 + 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 85cfcadeca..4e2020ceda 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker2_plus +name = Normal +version = 4 [metadata] +material = generic_tpu +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_tpu variant = 0.6 mm +weight = -1 [values] adhesion_type = brim @@ -22,6 +22,7 @@ layer_0_z_overlap = 0.12 raft_airgap = 0.24 retraction_count_max = 15 retraction_hop_enabled = 0.2 +speed_infill = =math.ceil(speed_print * 45 / 45) speed_print = 45 speed_support = 40 speed_topbottom = =math.ceil(speed_print * 35 / 45) @@ -32,4 +33,4 @@ support_angle = 45 support_enable = True support_z_distance = =layer_height * 2 top_bottom_thickness = 1.2 -speed_infill = =math.ceil(speed_print * 45 / 45) + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.25_normal.inst.cfg index 8de70e8bb4..49ed112fca 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.25_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker2_plus_connect +name = Extra Fine +version = 4 [metadata] +material = generic_abs +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_abs variant = 0.25 mm +weight = 1 [values] cool_fan_speed_min = =cool_fan_speed * 0.2 @@ -19,3 +19,4 @@ cool_min_speed = 10 infill_sparse_density = 20 speed_print = 30 top_bottom_thickness = 0.72 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_fast.inst.cfg index 69901fb504..d5b4cfdd32 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_fast.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker2_plus_connect +name = Normal +version = 4 [metadata] +material = generic_abs +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_abs variant = 0.4 mm +weight = -1 [values] cool_fan_speed_min = =cool_fan_speed * 0.2 @@ -17,9 +17,10 @@ cool_min_layer_time = 3 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 10 infill_sparse_density = 20 -top_bottom_thickness = 0.75 +speed_infill = =math.ceil(speed_print * 55 / 55) speed_print = 55 +speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_travel = 150 speed_wall = =math.ceil(speed_print * 40 / 55) -speed_topbottom = =math.ceil(speed_print * 30 / 55) -speed_infill = =math.ceil(speed_print * 55 / 55) +top_bottom_thickness = 0.75 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_high.inst.cfg index d8c0c750af..24810d1f52 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_high.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_high.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker2_plus_connect +name = Extra Fine +version = 4 [metadata] +material = generic_abs +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_abs variant = 0.4 mm +weight = 1 [values] cool_fan_speed_min = =cool_fan_speed * 0.2 @@ -17,8 +17,9 @@ cool_min_layer_time = 3 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 10 infill_sparse_density = 20 -top_bottom_thickness = 0.72 -speed_print = 45 -speed_wall = =math.ceil(speed_print * 30 / 45) -speed_topbottom = =math.ceil(speed_print * 15 / 45) speed_infill = =math.ceil(speed_print * 45 / 45) +speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 15 / 45) +speed_wall = =math.ceil(speed_print * 30 / 45) +top_bottom_thickness = 0.72 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_normal.inst.cfg index c460fc345e..06e8a2a943 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus_connect +name = Fine +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_abs variant = 0.4 mm +weight = 0 [values] cool_fan_speed_min = =cool_fan_speed * 0.2 @@ -17,8 +17,9 @@ cool_min_layer_time = 3 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 10 infill_sparse_density = 20 -top_bottom_thickness = 0.8 +speed_infill = =math.ceil(speed_print * 45 / 45) speed_print = 45 -speed_wall = =math.ceil(speed_print * 30 / 45) speed_topbottom = =math.ceil(speed_print * 20 / 45) -speed_infill = =math.ceil(speed_print * 45 / 45) \ No newline at end of file +speed_wall = =math.ceil(speed_print * 30 / 45) +top_bottom_thickness = 0.8 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.6_normal.inst.cfg index 343dcbde31..6a26a18094 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.6_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus_connect +name = Fine +version = 4 [metadata] +material = generic_abs +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = 0 -material = generic_abs variant = 0.6 mm +weight = 0 [values] cool_fan_speed_min = =cool_fan_speed * 0.5 @@ -20,3 +20,4 @@ infill_sparse_density = 20 speed_infill = =math.ceil(speed_print * 55 / 40) speed_print = 40 top_bottom_thickness = 1.2 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.8_normal.inst.cfg index eeb7eeb9ad..a307064d42 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_abs_0.8_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker2_plus_connect +name = Normal +version = 4 [metadata] +material = generic_abs +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -1 -material = generic_abs variant = 0.8 mm +weight = -1 [values] cool_fan_speed_min = =cool_fan_speed * 0.5 @@ -19,3 +19,4 @@ cool_min_speed = 15 infill_sparse_density = 20 speed_print = 40 top_bottom_thickness = 1.2 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.25_normal.inst.cfg index 59183e1226..2154030565 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.25_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker2_plus_connect +name = Extra Fine +version = 4 [metadata] +material = generic_cpe +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_cpe variant = 0.25 mm +weight = 1 [values] cool_fan_speed_min = =cool_fan_speed * 0.2 @@ -18,4 +18,5 @@ cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 15 infill_sparse_density = 20 speed_print = 30 -top_bottom_thickness = 0.72 \ No newline at end of file +top_bottom_thickness = 0.72 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_fast.inst.cfg index 131196e4f2..0485a67e74 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_fast.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker2_plus_connect +name = Normal +version = 4 [metadata] +material = generic_cpe +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_cpe variant = 0.4 mm +weight = -1 [values] cool_fan_speed_min = =cool_fan_speed * 0.8 @@ -18,11 +18,12 @@ cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 10 infill_sparse_density = 20 retraction_prime_speed = =retraction_speed +speed_infill = =math.ceil(speed_print * 45 / 45) speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_travel = 150 speed_wall = =math.ceil(speed_print * 40 / 45) -top_bottom_thickness = 0.75 speed_wall_0 = =math.ceil(speed_print * 30 / 45) -speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_wall_x = =math.ceil(speed_print * 40 / 45) -speed_infill = =math.ceil(speed_print * 45 / 45) \ No newline at end of file +top_bottom_thickness = 0.75 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_high.inst.cfg index 21e4815242..7f8e6c1199 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_high.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_high.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker2_plus_connect +name = Extra Fine +version = 4 [metadata] +material = generic_cpe +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_cpe variant = 0.4 mm +weight = 1 [values] cool_fan_speed_min = =cool_fan_speed * 0.8 @@ -18,8 +18,9 @@ cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 15 infill_sparse_density = 20 retraction_prime_speed = =retraction_speed +speed_infill = =math.ceil(speed_print * 45 / 45) speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 15 / 45) speed_wall = =math.ceil(speed_print * 30 / 45) top_bottom_thickness = 0.72 -speed_topbottom = =math.ceil(speed_print * 15 / 45) -speed_infill = =math.ceil(speed_print * 45 / 45) \ No newline at end of file + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_normal.inst.cfg index a5bc52107a..ba08ff62bf 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus_connect +name = Fine +version = 4 [metadata] +material = generic_cpe +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_cpe variant = 0.4 mm +weight = 0 [values] cool_fan_speed_min = =cool_fan_speed * 0.8 @@ -21,3 +21,4 @@ retraction_prime_speed = =retraction_speed speed_print = 45 speed_wall = =math.ceil(speed_print * 30 / 45) top_bottom_thickness = 0.8 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.6_normal.inst.cfg index f9bb6000df..184cd4f418 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.6_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus_connect +name = Fine +version = 4 [metadata] +material = generic_cpe +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = 0 -material = generic_cpe variant = 0.6 mm +weight = 0 [values] cool_fan_speed_min = =cool_fan_speed * 0.8 @@ -20,3 +20,4 @@ infill_sparse_density = 20 retraction_prime_speed = =retraction_speed speed_print = 40 top_bottom_thickness = 1.2 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.8_normal.inst.cfg index ab3546eda5..60aeec3154 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.8_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker2_plus_connect +name = Normal +version = 4 [metadata] +material = generic_cpe +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -1 -material = generic_cpe variant = 0.8 mm +weight = -1 [values] cool_fan_speed_min = =cool_fan_speed * 0.8 @@ -18,4 +18,5 @@ cool_min_layer_time_fan_speed_max = 25 cool_min_speed = 8 infill_sparse_density = 20 speed_print = 40 -top_bottom_thickness = 1.2 \ No newline at end of file +top_bottom_thickness = 1.2 + 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 1a617d5a7b..c170d189a5 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker2_plus_connect +name = Fast +version = 4 [metadata] +material = generic_cpe_plus +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_cpe_plus variant = 0.4 mm +weight = -2 [values] cool_fan_speed = 50 @@ -29,3 +29,4 @@ support_angle = 45 support_enable = True support_z_distance = 0.26 top_bottom_thickness = 1.5 + 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 e7b4596e32..9269b27fac 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus_connect +name = Fine +version = 4 [metadata] +material = generic_cpe_plus +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = 0 -material = generic_cpe_plus variant = 0.4 mm +weight = 0 [values] cool_fan_speed = 50 @@ -29,3 +29,4 @@ support_angle = 45 support_enable = True support_z_distance = 0.26 top_bottom_thickness = 1.5 + 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 d8390ebf5e..6bc57d10f9 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker2_plus_connect +name = Fast +version = 4 [metadata] +material = generic_cpe_plus +quality_type = slightlycoarse setting_version = 20 type = quality -quality_type = slightlycoarse -weight = -2 -material = generic_cpe_plus variant = 0.6 mm +weight = -2 [values] cool_fan_speed = 45 @@ -30,3 +30,4 @@ support_angle = 45 support_enable = True support_z_distance = 0.22 top_bottom_thickness = 0.75 + 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 780e81c8ec..0781301fe7 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus_connect +name = Fine +version = 4 [metadata] +material = generic_cpe_plus +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = 0 -material = generic_cpe_plus variant = 0.6 mm +weight = 0 [values] cool_fan_speed = 45 @@ -30,3 +30,4 @@ support_angle = 45 support_enable = True support_z_distance = 0.22 top_bottom_thickness = 0.75 + 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 1fcd6241b0..57b681c6b1 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker2_plus_connect +name = Fast +version = 4 [metadata] +material = generic_cpe_plus +quality_type = slightlycoarse setting_version = 20 type = quality -quality_type = slightlycoarse -weight = -2 -material = generic_cpe_plus variant = 0.8 mm +weight = -2 [values] brim_line_count = 10 @@ -27,4 +27,5 @@ speed_wall_x = =speed_print support_angle = 45 support_enable = True support_z_distance = 0.26 -top_bottom_thickness = 1.2 \ No newline at end of file +top_bottom_thickness = 1.2 + 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 156c0cb434..4949cce616 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus_connect +name = Fine +version = 4 [metadata] +material = generic_cpe_plus +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = 0 -material = generic_cpe_plus variant = 0.8 mm +weight = 0 [values] brim_line_count = 10 @@ -28,3 +28,4 @@ support_angle = 45 support_enable = True support_z_distance = 0.26 top_bottom_thickness = 1.2 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_global_Coarse_Quality.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_global_Coarse_Quality.inst.cfg index 2fa3c80a01..7987e30e16 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_global_Coarse_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_global_Coarse_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Coarse Quality definition = ultimaker2_plus_connect +name = Coarse Quality +version = 4 [metadata] +global_quality = True +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = -4 -global_quality = True [values] layer_height = 0.4 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_global_Draft_Quality.inst.cfg index 59feaf6573..2f79a0b701 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_global_Draft_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = ultimaker2_plus_connect +name = Draft Quality +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] layer_height = 0.2 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_global_Extra_Coarse_Quality.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_global_Extra_Coarse_Quality.inst.cfg index af664876b1..86b479c596 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_global_Extra_Coarse_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_global_Extra_Coarse_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Extra Coarse Quality definition = ultimaker2_plus_connect +name = Extra Coarse Quality +version = 4 [metadata] +global_quality = True +quality_type = extracoarse setting_version = 20 type = quality -quality_type = extracoarse weight = -3 -global_quality = True [values] layer_height = 0.6 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_global_Fast_Quality.inst.cfg index ad1c0c9c20..383d19bdeb 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_global_Fast_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker2_plus_connect +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -1 -global_quality = True [values] layer_height = 0.15 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_global_High_Quality.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_global_High_Quality.inst.cfg index c907d4a7ec..f3bab11754 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_global_High_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker2_plus_connect +name = Extra Fine +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -global_quality = True [values] layer_height = 0.06 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_global_Normal_Quality.inst.cfg index 45d0adef7d..24bb30c870 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_global_Normal_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus_connect +name = Fine +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] layer_height = 0.1 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_global_Slightly_Coarse_Quality.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_global_Slightly_Coarse_Quality.inst.cfg index 4886ab1d02..3e1c0cc88c 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_global_Slightly_Coarse_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_global_Slightly_Coarse_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Coarse Quality definition = ultimaker2_plus_connect +name = Coarse Quality +version = 4 [metadata] +global_quality = True +quality_type = slightlycoarse setting_version = 20 type = quality -quality_type = slightlycoarse weight = -4 -global_quality = True [values] layer_height = 0.3 + 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 6524490255..9ef8ceba94 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker2_plus_connect +name = Extra Fine +version = 4 [metadata] +material = generic_nylon +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_nylon variant = 0.25 mm +weight = 1 [values] brim_line_count = 8 @@ -21,6 +21,7 @@ infill_sparse_density = 20 layer_0_z_overlap = 0.1 raft_airgap = 0.15 retraction_hop_enabled = 0.2 +speed_infill = =math.ceil(speed_print * 40 / 40) speed_print = 40 speed_support = 40 speed_topbottom = =math.ceil(speed_print * 35 / 40) @@ -30,4 +31,4 @@ speed_wall_x = =speed_print support_enable = True support_z_distance = =layer_height * 2 top_bottom_thickness = 1.2 -speed_infill = =math.ceil(speed_print * 40 / 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 2d06b19389..2dd408cf24 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus_connect +name = Fine +version = 4 [metadata] +material = generic_nylon +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_nylon variant = 0.25 mm +weight = 0 [values] brim_line_count = 8 @@ -30,3 +30,4 @@ speed_wall_x = =speed_print support_enable = True support_z_distance = =layer_height * 2 top_bottom_thickness = 1.2 + 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 c17d9a62c9..68134f5979 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker2_plus_connect +name = Normal +version = 4 [metadata] +material = generic_nylon +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -1 -material = generic_nylon variant = 0.4 mm +weight = -1 [values] cool_fan_speed_min = =cool_fan_speed * 0.35 @@ -20,14 +20,15 @@ infill_sparse_density = 20 layer_0_z_overlap = 0.22 raft_airgap = 0.57 retraction_prime_speed = =retraction_speed +speed_infill = =math.ceil(speed_print * 45 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 20 / 45) speed_travel = 150 speed_wall = =math.ceil(speed_print * 40 / 45) +speed_wall_0 = =math.ceil(speed_print * 30 / 45) +speed_wall_x = =math.ceil(speed_print * 40 / 45) support_angle = 45 support_enable = True support_z_distance = =layer_height * 2 top_bottom_thickness = 0.75 -speed_wall_0 = =math.ceil(speed_print * 30 / 45) -speed_wall_x = =math.ceil(speed_print * 40 / 45) -speed_infill = =math.ceil(speed_print * 45 / 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 edeacb4f46..885fe0d7a5 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus_connect +name = Fine +version = 4 [metadata] +material = generic_nylon +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = 0 -material = generic_nylon variant = 0.4 mm +weight = 0 [values] cool_fan_speed_min = =cool_fan_speed * 0.35 @@ -27,3 +27,4 @@ support_angle = 45 support_enable = True support_z_distance = =layer_height * 2 top_bottom_thickness = 0.75 + 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 ce30e7a0c3..b2fe2d748b 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker2_plus_connect +name = Normal +version = 4 [metadata] +material = generic_nylon +quality_type = slightlycoarse setting_version = 20 type = quality -quality_type = slightlycoarse -weight = -1 -material = generic_nylon variant = 0.6 mm +weight = -1 [values] brim_line_count = 8 @@ -21,6 +21,7 @@ layer_0_z_overlap = 0.22 raft_airgap = 0.44 retraction_hop_enabled = 0.2 retraction_prime_speed = =retraction_speed +speed_infill = =math.ceil(speed_print * 55 / 55) speed_print = 55 speed_support = 40 speed_topbottom = =math.ceil(speed_print * 35 / 55) @@ -31,4 +32,4 @@ support_angle = 45 support_enable = True support_z_distance = 0.55 top_bottom_thickness = 1.2 -speed_infill = =math.ceil(speed_print * 55 / 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 e5b8b1127e..e4b83ea1c8 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus_connect +name = Fine +version = 4 [metadata] +material = generic_nylon +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = 0 -material = generic_nylon variant = 0.6 mm +weight = 0 [values] brim_line_count = 8 @@ -31,3 +31,4 @@ support_angle = 45 support_enable = True support_z_distance = =layer_height * 2 top_bottom_thickness = 1.2 + 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 fc949cbbaf..bdc3cd3329 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker2_plus_connect +name = Fast +version = 4 [metadata] +material = generic_nylon +quality_type = slightlycoarse setting_version = 20 type = quality -quality_type = slightlycoarse -weight = -2 -material = generic_nylon variant = 0.8 mm +weight = -2 [values] brim_line_count = 8 @@ -27,7 +27,8 @@ speed_travel = 150 speed_wall_0 = =math.ceil(speed_print * 15 / 55) speed_wall_x = =math.ceil(speed_print * 40 / 55) support_angle = 45 +support_bottom_distance = 0.65 support_enable = True support_z_distance = 0.5 -support_bottom_distance = 0.65 top_bottom_thickness = 1.2 + 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 505aa6e130..01c114cf3e 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus_connect +name = Fine +version = 4 [metadata] +material = generic_nylon +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = 0 -material = generic_nylon variant = 0.8 mm +weight = 0 [values] brim_line_count = 8 @@ -32,3 +32,4 @@ support_enable = True support_top_distance = 0.5 support_z_distance = =layer_height * 2 top_bottom_thickness = 1.2 + 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 9b99b78ae7..8b4cf4ca38 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker2_plus_connect +name = Extra Fine +version = 4 [metadata] +material = generic_pc +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pc variant = 0.25 mm +weight = 1 [values] brim_line_count = 32 @@ -22,6 +22,7 @@ infill_sparse_density = 20 layer_0_z_overlap = 0.2 raft_airgap = 0.25 speed_print = 30 +speed_topbottom = =math.ceil(speed_print * 15 / 30) support_enable = True support_z_distance = 0.19 -speed_topbottom = =math.ceil(speed_print * 15 / 30) \ No newline at end of file + 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 806d75813b..f9060e9205 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus_connect +name = Fine +version = 4 [metadata] +material = generic_pc +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pc variant = 0.25 mm +weight = 0 [values] brim_line_count = 32 @@ -24,3 +24,4 @@ raft_airgap = 0.25 speed_print = 30 support_enable = True support_z_distance = 0.19 + 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 c4226d776a..2315c767bf 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker2_plus_connect +name = Normal +version = 4 [metadata] +material = generic_pc +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -1 -material = generic_pc variant = 0.4 mm +weight = -1 [values] cool_fan_speed = 50 @@ -20,11 +20,12 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 20 layer_0_z_overlap = 0.3 raft_airgap = 0.35 +speed_infill = =math.ceil(speed_print * 45 / 45) speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_wall_0 = =math.ceil(speed_print * 20 / 45) speed_wall_x = =math.ceil(speed_print * 30 / 45) support_angle = 45 support_enable = True support_z_distance = 0.19 -speed_topbottom = =math.ceil(speed_print * 30 / 45) -speed_infill = =math.ceil(speed_print * 45 / 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 b9f3b55207..b96e2b0d60 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus_connect +name = Fine +version = 4 [metadata] +material = generic_pc +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pc variant = 0.4 mm +weight = 0 [values] cool_fan_speed = 50 @@ -26,3 +26,4 @@ speed_wall_x = =math.ceil(speed_print * 30 / 45) support_angle = 45 support_enable = True support_z_distance = 0.19 + 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 3e9f3d0deb..a46ee93e50 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker2_plus_connect +name = Normal +version = 4 [metadata] +material = generic_pc +quality_type = slightlycoarse setting_version = 20 type = quality -quality_type = slightlycoarse -weight = -1 -material = generic_pc variant = 0.6 mm +weight = -1 [values] cool_fan_speed = 50 @@ -20,6 +20,7 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 20 layer_0_z_overlap = 0.22 raft_airgap = 0.52 +speed_infill = =math.ceil(speed_print * 45 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 20 / 45) speed_travel = 150 @@ -29,4 +30,4 @@ support_angle = 45 support_enable = True support_z_distance = 0.21 top_bottom_thickness = 0.75 -speed_infill = =math.ceil(speed_print * 45 / 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 a4d35b8323..5d0da48645 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus_connect +name = Fine +version = 4 [metadata] +material = generic_pc +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = 0 -material = generic_pc variant = 0.6 mm +weight = 0 [values] cool_fan_speed = 50 @@ -29,3 +29,4 @@ support_angle = 45 support_enable = True support_z_distance = 0.21 top_bottom_thickness = 0.75 + 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 8969be2004..83a68d0fa4 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus_connect +name = Fine +version = 4 [metadata] +material = generic_pc +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = 0 -material = generic_pc variant = 0.8 mm +weight = 0 [values] brim_line_count = 10 @@ -25,3 +25,4 @@ support_angle = 45 support_enable = True support_z_distance = 0.26 top_bottom_thickness = 1.2 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.25_normal.inst.cfg index 6aaf960862..d29c38d8b8 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.25_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker2_plus_connect +name = Extra Fine +version = 4 [metadata] +material = generic_petg +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_petg variant = 0.25 mm +weight = 1 [values] cool_fan_speed_min = =cool_fan_speed * 0.2 @@ -18,4 +18,5 @@ cool_min_layer_time_fan_speed_max = 25 cool_min_speed = 15 infill_sparse_density = 20 speed_print = 30 -top_bottom_thickness = 0.72 \ No newline at end of file +top_bottom_thickness = 0.72 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_draft.inst.cfg index 4880801cc4..bde8d5917d 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_draft.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker2_plus_connect +name = Fast +version = 4 [metadata] +material = generic_petg +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_petg variant = 0.4 mm +weight = -2 [values] cool_fan_speed_min = =cool_fan_speed * 0.8 @@ -17,11 +17,12 @@ cool_min_layer_time = 3 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 10 infill_sparse_density = 20 +speed_infill = =math.ceil(speed_print * 45 / 45) speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_travel = 150 speed_wall = =math.ceil(speed_print * 40 / 45) -top_bottom_thickness = 0.75 speed_wall_0 = =math.ceil(speed_print * 30 / 45) -speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_wall_x = =math.ceil(speed_print * 40 / 45) -speed_infill = =math.ceil(speed_print * 45 / 45) \ No newline at end of file +top_bottom_thickness = 0.75 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_fast.inst.cfg index 242094359e..0cff366bbc 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_fast.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker2_plus_connect +name = Normal +version = 4 [metadata] +material = generic_petg +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_petg variant = 0.4 mm +weight = -1 [values] cool_fan_speed_min = =cool_fan_speed * 0.8 @@ -17,11 +17,12 @@ cool_min_layer_time = 3 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 10 infill_sparse_density = 20 +speed_infill = =math.ceil(speed_print * 45 / 45) speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_travel = 150 speed_wall = =math.ceil(speed_print * 40 / 45) -top_bottom_thickness = 0.75 speed_wall_0 = =math.ceil(speed_print * 30 / 45) -speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_wall_x = =math.ceil(speed_print * 40 / 45) -speed_infill = =math.ceil(speed_print * 45 / 45) \ No newline at end of file +top_bottom_thickness = 0.75 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_normal.inst.cfg index 9eabf0f070..464c2adc61 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus_connect +name = Fine +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_petg variant = 0.4 mm +weight = 0 [values] cool_fan_speed_min = =cool_fan_speed * 0.8 @@ -19,4 +19,5 @@ cool_min_speed = 10 infill_sparse_density = 20 speed_print = 45 speed_wall = =math.ceil(speed_print * 30 / 45) -top_bottom_thickness = 0.8 \ No newline at end of file +top_bottom_thickness = 0.8 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.6_normal.inst.cfg index fa4835b5e0..39df9004fa 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.6_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus_connect +name = Fine +version = 4 [metadata] +material = generic_petg +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = 0 -material = generic_petg variant = 0.6 mm +weight = 0 [values] cool_fan_speed_min = =cool_fan_speed * 0.8 @@ -18,4 +18,5 @@ cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 8 infill_sparse_density = 20 speed_print = 40 -top_bottom_thickness = 1.2 \ No newline at end of file +top_bottom_thickness = 1.2 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.8_normal.inst.cfg index e816088c5e..49c898628d 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_petg_0.8_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker2_plus_connect +name = Normal +version = 4 [metadata] +material = generic_petg +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -1 -material = generic_petg variant = 0.8 mm +weight = -1 [values] cool_fan_speed_min = =cool_fan_speed * 0.8 @@ -18,4 +18,5 @@ cool_min_layer_time_fan_speed_max = 25 cool_min_speed = 8 infill_sparse_density = 20 speed_print = 40 -top_bottom_thickness = 1.2 \ No newline at end of file +top_bottom_thickness = 1.2 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.25_normal.inst.cfg index bddaf0b110..631e7805c6 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.25_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker2_plus_connect +name = Extra Fine +version = 4 [metadata] +material = generic_pla +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pla variant = 0.25 mm +weight = 1 [values] cool_min_layer_time = 5 @@ -17,3 +17,4 @@ cool_min_speed = 10 infill_sparse_density = 20 speed_print = 30 top_bottom_thickness = 0.72 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_draft.inst.cfg index 03ae96c36f..9a76478fb6 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_draft.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker2_plus_connect +name = Fast +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pla variant = 0.4 mm +weight = -2 [values] cool_min_layer_time = 5 @@ -21,3 +21,4 @@ speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_travel = 150 speed_wall = =math.ceil(speed_print * 50 / 60) top_bottom_thickness = 0.75 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_fast.inst.cfg index 8f8f854d8f..23514b25ca 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_fast.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker2_plus_connect +name = Normal +version = 4 [metadata] +material = generic_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_pla variant = 0.4 mm +weight = -1 [values] cool_min_layer_time = 5 @@ -21,3 +21,4 @@ speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_travel = 150 speed_wall = =math.ceil(speed_print * 50 / 60) top_bottom_thickness = 0.75 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_high.inst.cfg index 7080b95b0b..c43b869c9c 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_high.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_high.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker2_plus_connect +name = Extra Fine +version = 4 [metadata] +material = generic_pla +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pla variant = 0.4 mm +weight = 1 [values] cool_min_layer_time = 5 @@ -19,3 +19,4 @@ retraction_prime_speed = =retraction_speed speed_print = 50 speed_topbottom = =math.ceil(speed_print * 20 / 50) top_bottom_thickness = 0.72 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_normal.inst.cfg index 902eb481e5..e38e92819c 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.4_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus_connect +name = Fine +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pla variant = 0.4 mm +weight = 0 [values] cool_min_layer_time = 5 @@ -19,3 +19,4 @@ retraction_prime_speed = =retraction_speed speed_print = 50 speed_topbottom = =math.ceil(speed_print * 20 / 50) top_bottom_thickness = 0.8 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.6_normal.inst.cfg index e4ea633592..9498af5202 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.6_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus_connect +name = Fine +version = 4 [metadata] +material = generic_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = 0 -material = generic_pla variant = 0.6 mm +weight = 0 [values] cool_min_layer_time = 5 @@ -21,3 +21,4 @@ speed_topbottom = =math.ceil(speed_print * 20 / 55) speed_wall = =math.ceil(speed_print * 40 / 55) speed_wall_0 = =math.ceil(speed_print * 25 / 55) top_bottom_thickness = 1.2 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.8_normal.inst.cfg index 9d2d858c32..b0d4e0ad18 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pla_0.8_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker2_plus_connect +name = Normal +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -1 -material = generic_pla variant = 0.8 mm +weight = -1 [values] cool_min_layer_time = 5 @@ -18,3 +18,4 @@ infill_sparse_density = 20 speed_print = 40 speed_wall_0 = =math.ceil(speed_print * 25 / 40) top_bottom_thickness = 1.2 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg index 37a63d3aa1..d9783d7fd1 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker2_plus_connect +name = Normal +version = 4 [metadata] +material = generic_pp +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_pp variant = 0.4 mm +weight = -1 [values] acceleration_enabled = True @@ -34,6 +34,7 @@ retraction_hop_enabled = True retraction_hop_only_when_collides = True retraction_min_travel = 0.5 skin_overlap = 10 +speed_infill = =math.ceil(speed_print * 25 / 25) speed_prime_tower = =speed_topbottom speed_print = 25 speed_support_interface = =speed_topbottom @@ -41,10 +42,10 @@ speed_topbottom = =math.ceil(speed_print * 25 / 25) speed_travel = 250 speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 20 / 25) +speed_wall_x = =math.ceil(speed_print * 25 / 25) support_angle = 60 -support_z_distance = =layer_height * 2 support_bottom_distance = =support_z_distance / 2 +support_z_distance = =layer_height * 2 travel_avoid_distance = 3 wall_0_inset = 0 -speed_wall_x = =math.ceil(speed_print * 25 / 25) -speed_infill = =math.ceil(speed_print * 25 / 25) + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg index f854fd3f1a..0b9ee0865a 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus_connect +name = Fine +version = 4 [metadata] +material = generic_pp +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pp variant = 0.4 mm +weight = 0 [values] acceleration_enabled = True @@ -42,7 +42,8 @@ speed_travel = 250 speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 20 / 25) support_angle = 60 -support_z_distance = =layer_height * 2 support_bottom_distance = =support_z_distance / 2 +support_z_distance = =layer_height * 2 travel_avoid_distance = 3 wall_0_inset = 0 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg index bc011fc04e..b8f832047f 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker2_plus_connect +name = Fast +version = 4 [metadata] +material = generic_pp +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pp variant = 0.6 mm +weight = -2 [values] acceleration_enabled = True @@ -41,8 +41,9 @@ speed_travel = 250 speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 20 / 25) support_angle = 60 -support_z_distance = =layer_height * 2 support_bottom_distance = =support_z_distance / 2 +support_z_distance = =layer_height * 2 top_bottom_thickness = 1.1 travel_avoid_distance = 3 wall_0_inset = 0 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg index 25dfb54159..1beb7a972f 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker2_plus_connect +name = Normal +version = 4 [metadata] +material = generic_pp +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_pp variant = 0.6 mm +weight = -1 [values] acceleration_enabled = True @@ -33,6 +33,7 @@ retraction_hop = 0.15 retraction_hop_enabled = True retraction_hop_only_when_collides = True skin_overlap = 10 +speed_infill = =math.ceil(speed_print * 25 / 25) speed_prime_tower = =speed_topbottom speed_print = 25 speed_support_interface = =speed_topbottom @@ -40,11 +41,11 @@ speed_topbottom = =math.ceil(speed_print * 25 / 25) speed_travel = 250 speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 20 / 25) +speed_wall_x = =math.ceil(speed_print * 25 / 25) support_angle = 60 -support_z_distance = =layer_height * 2 support_bottom_distance = =support_z_distance / 2 +support_z_distance = =layer_height * 2 top_bottom_thickness = 1.1 travel_avoid_distance = 3 wall_0_inset = 0 -speed_wall_x = =math.ceil(speed_print * 25 / 25) -speed_infill = =math.ceil(speed_print * 25 / 25) + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_draft.inst.cfg index df8cd3a5a6..e86deb2229 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker2_plus_connect +name = Fast +version = 4 [metadata] +material = generic_pp +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pp variant = 0.8 mm +weight = -2 [values] acceleration_enabled = True @@ -48,3 +48,4 @@ support_z_distance = =layer_height * 2 top_bottom_thickness = 1.5 travel_avoid_distance = 3 wall_0_inset = 0 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_verydraft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_verydraft.inst.cfg index 459244683a..9b41aea1bd 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_verydraft.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_verydraft.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fast definition = ultimaker2_plus_connect +name = Extra Fast +version = 4 [metadata] +material = generic_pp +quality_type = slightlycoarse setting_version = 20 type = quality -quality_type = slightlycoarse -weight = -3 -material = generic_pp variant = 0.8 mm +weight = -3 [values] acceleration_enabled = True @@ -48,3 +48,4 @@ support_z_distance = =layer_height * 2 top_bottom_thickness = 1.5 travel_avoid_distance = 3 wall_0_inset = 0 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.25_normal.inst.cfg index 20e86a3c3e..2825af26c8 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.25_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker2_plus_connect +name = Extra Fine +version = 4 [metadata] +material = generic_tough_pla +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_tough_pla variant = 0.25 mm +weight = 1 [values] cool_min_layer_time = 5 @@ -17,3 +17,4 @@ cool_min_speed = 10 infill_sparse_density = 20 speed_print = 30 top_bottom_thickness = 0.72 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_draft.inst.cfg index 18663a8b66..a587f89df9 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_draft.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker2_plus_connect +name = Fast +version = 4 [metadata] +material = generic_tough_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_tough_pla variant = 0.4 mm +weight = -2 [values] cool_min_layer_time = 5 @@ -21,3 +21,4 @@ speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_travel = 150 speed_wall = =math.ceil(speed_print * 40 / 50) top_bottom_thickness = 0.75 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_fast.inst.cfg index 09b2f6b210..2f2ab1d7e5 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_fast.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker2_plus_connect +name = Normal +version = 4 [metadata] +material = generic_tough_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_tough_pla variant = 0.4 mm +weight = -1 [values] cool_min_layer_time = 5 @@ -21,3 +21,4 @@ speed_topbottom = =math.ceil(speed_print * 30 / 40) speed_travel = 150 speed_wall = =math.ceil(speed_print * 30 / 40) top_bottom_thickness = 0.75 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_normal.inst.cfg index 4e61dbc2f5..01a78033af 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.4_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus_connect +name = Fine +version = 4 [metadata] +material = generic_tough_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_tough_pla variant = 0.4 mm +weight = 0 [values] cool_min_layer_time = 5 @@ -20,3 +20,4 @@ speed_print = 40 speed_topbottom = =math.ceil(speed_print * 20 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) top_bottom_thickness = 0.8 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.6_normal.inst.cfg index 6a9a55ff57..1b79f1c74b 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.6_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus_connect +name = Fine +version = 4 [metadata] +material = generic_tough_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = 0 -material = generic_tough_pla variant = 0.6 mm +weight = 0 [values] cool_min_layer_time = 5 @@ -21,3 +21,4 @@ speed_topbottom = =math.ceil(speed_print * 20 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_print * 30 / 50) top_bottom_thickness = 1.2 + diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.8_normal.inst.cfg index 4954006e74..e10c02c411 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpla_0.8_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker2_plus_connect +name = Normal +version = 4 [metadata] +material = generic_tough_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -1 -material = generic_tough_pla variant = 0.8 mm +weight = -1 [values] cool_min_layer_time = 5 @@ -18,3 +18,4 @@ infill_sparse_density = 20 speed_print = 40 speed_wall_0 = =math.ceil(speed_print * 25 / 40) top_bottom_thickness = 1.2 + 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 e33248cc93..0090163f2c 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker2_plus_connect +name = Extra Fine +version = 4 [metadata] +material = generic_tpu +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_tpu variant = 0.25 mm +weight = 1 [values] adhesion_type = brim @@ -23,6 +23,7 @@ layer_0_z_overlap = 0.1 raft_airgap = 0.2 retraction_count_max = 15 retraction_hop_enabled = 0.2 +speed_infill = =math.ceil(speed_print * 40 / 40) speed_print = 40 speed_support = 40 speed_topbottom = =math.ceil(speed_print * 35 / 40) @@ -33,4 +34,4 @@ support_angle = 45 support_enable = True support_z_distance = =layer_height * 2 top_bottom_thickness = 1.2 -speed_infill = =math.ceil(speed_print * 40 / 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 8541c3bf97..5bfcc6b3e2 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker2_plus_connect +name = Fine +version = 4 [metadata] +material = generic_tpu +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_tpu variant = 0.4 mm +weight = 0 [values] adhesion_type = brim @@ -31,3 +31,4 @@ support_angle = 45 support_enable = True support_z_distance = =layer_height * 2 top_bottom_thickness = 1.2 + 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 0ca418bb82..bb4c98dd93 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker2_plus_connect +name = Normal +version = 4 [metadata] +material = generic_tpu +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_tpu variant = 0.6 mm +weight = -1 [values] adhesion_type = brim @@ -22,6 +22,7 @@ layer_0_z_overlap = 0.12 raft_airgap = 0.24 retraction_count_max = 15 retraction_hop_enabled = 0.2 +speed_infill = =math.ceil(speed_print * 45 / 45) speed_print = 45 speed_support = 40 speed_topbottom = =math.ceil(speed_print * 35 / 45) @@ -32,4 +33,4 @@ support_angle = 45 support_enable = True support_z_distance = =layer_height * 2 top_bottom_thickness = 1.2 -speed_infill = =math.ceil(speed_print * 45 / 45) + diff --git a/resources/quality/ultimaker3/um3_aa0.25_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_ABS_Normal_Quality.inst.cfg index 13423278e2..043e8e5b89 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_ABS_Normal_Quality.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker3 +name = Fine +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_abs variant = AA 0.25 +weight = 0 [values] cool_fan_speed = 40 @@ -17,3 +17,4 @@ infill_overlap = =0 if infill_sparse_density > 80 else 15 material_final_print_temperature = =material_print_temperature - 5 retraction_prime_speed = 25 speed_topbottom = =math.ceil(speed_print * 30 / 55) + diff --git a/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg index a24b18563d..af70683a38 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_CPE_Normal_Quality.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Fine definition = ultimaker3 +name = Fine +version = 4 [metadata] +material = generic_cpe +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_cpe variant = AA 0.25 +weight = 0 [values] speed_infill = =math.ceil(speed_print * 40 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) top_bottom_thickness = 0.8 + 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 7cb72ef3e0..6edb9c30e2 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker3 +name = Fine +version = 4 [metadata] +material = generic_nylon +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_nylon variant = AA 0.25 +weight = 0 [values] cool_min_layer_time_fan_speed_max = 20 @@ -26,3 +26,4 @@ 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/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg index ba388dc90f..b74f0144cf 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Fine - Experimental definition = ultimaker3 +name = Fine - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_pc +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pc variant = AA 0.25 -is_experimental = True +weight = 0 [values] adhesion_type = brim @@ -41,3 +41,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 + diff --git a/resources/quality/ultimaker3/um3_aa0.25_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PETG_Normal_Quality.inst.cfg index c9a96ecf1c..90259e19cb 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_PETG_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_PETG_Normal_Quality.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Fine definition = ultimaker3 +name = Fine +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_petg variant = AA 0.25 +weight = 0 [values] +material_print_temperature = =default_material_print_temperature - 5 +retraction_combing = all speed_infill = =math.ceil(speed_print * 40 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) top_bottom_thickness = 0.8 -material_print_temperature = =default_material_print_temperature - 5 -retraction_combing = all + diff --git a/resources/quality/ultimaker3/um3_aa0.25_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PLA_Normal_Quality.inst.cfg index 063d8acd7c..3a66f71ef9 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_PLA_Normal_Quality.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker3 +name = Fine +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pla variant = AA 0.25 +weight = 0 [values] brim_width = 8 @@ -30,3 +30,4 @@ top_bottom_thickness = 0.72 travel_avoid_distance = 0.4 wall_0_inset = 0.015 wall_0_wipe_dist = 0.25 + 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 9a30ad71bd..24f86ab617 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Fine - Experimental definition = ultimaker3 +name = Fine - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_pp +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pp variant = AA 0.25 -is_experimental = True +weight = 0 [values] brim_width = 10 @@ -44,3 +44,4 @@ switch_extruder_retraction_speeds = 35 top_bottom_thickness = 1 travel_avoid_distance = 3 wall_0_inset = 0 + diff --git a/resources/quality/ultimaker3/um3_aa0.25_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_TPLA_Normal_Quality.inst.cfg index 667123dd52..4b179fa8e1 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_TPLA_Normal_Quality.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker3 +name = Fine +version = 4 [metadata] +material = generic_tough_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_tough_pla variant = AA 0.25 +weight = 0 [values] brim_width = 8 @@ -29,3 +29,4 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 30) top_bottom_thickness = 0.72 wall_0_inset = 0.015 wall_0_wipe_dist = 0.25 + diff --git a/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg index 747f2b3567..624c43a868 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg @@ -1,25 +1,26 @@ [general] -version = 4 -name = Fast definition = ultimaker3 +name = Fast +version = 4 [metadata] +material = generic_abs +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_abs variant = AA 0.4 +weight = -2 [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 - 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 prime_tower_enable = False skin_overlap = 20 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) + 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 8361839ecb..17c22a389e 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 @@ -1,25 +1,26 @@ [general] -version = 4 -name = Normal definition = ultimaker3 +name = Normal +version = 4 [metadata] +material = generic_abs +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_abs variant = AA 0.4 +weight = -1 [values] 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 + 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 prime_tower_enable = False 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) + 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 522ae7a37a..28c9827383 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 @@ -1,24 +1,25 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker3 +name = Extra Fine +version = 4 [metadata] +material = generic_abs +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_abs variant = AA 0.4 +weight = 1 [values] 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 - 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 prime_tower_enable = False speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) + 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 9ec2372730..3f8b59fc39 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 @@ -1,22 +1,23 @@ [general] -version = 4 -name = Fine definition = ultimaker3 +name = Fine +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_abs variant = AA 0.4 +weight = 0 [values] 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 prime_tower_enable = False speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) + diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg index 6dcc71dd4a..c0d5c16708 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker3 +name = Fast +version = 4 [metadata] +material = generic_bam +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_bam variant = AA 0.4 +weight = -2 [values] brim_replaces_support = False @@ -17,16 +17,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_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/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg index 4267cb7eab..0f02db1240 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg @@ -1,32 +1,32 @@ [general] -version = 4 -name = Normal definition = ultimaker3 +name = Normal +version = 4 [metadata] +material = generic_bam +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_bam variant = AA 0.4 +weight = -1 [values] -support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False 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_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/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg index ac99f45ed2..3730f4896e 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg @@ -1,18 +1,17 @@ [general] -version = 4 -name = Fine definition = ultimaker3 +name = Fine +version = 4 [metadata] +material = generic_bam +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_bam variant = AA 0.4 +weight = 0 [values] -support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_speed_max = =cool_fan_speed cool_min_speed = 7 @@ -20,10 +19,12 @@ machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 skin_overlap = 10 -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/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg index 2b3acb9b00..803198ad40 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker3 +name = Fast +version = 4 [metadata] +material = generic_cpe_plus +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_cpe_plus variant = AA 0.4 +weight = -2 [values] cool_fan_speed_max = 80 @@ -36,3 +36,4 @@ speed_wall = =math.ceil(speed_print * 50 / 50) speed_wall_0 = =math.ceil(speed_wall * 40 / 50) support_z_distance = =layer_height wall_0_inset = 0 + diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg index 05cc9f63ba..d815b74c8a 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker3 +name = Normal +version = 4 [metadata] +material = generic_cpe_plus +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_cpe_plus variant = AA 0.4 +weight = -1 [values] cool_fan_speed_max = 80 @@ -36,3 +36,4 @@ speed_wall = =math.ceil(speed_print * 45 / 45) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) support_z_distance = =layer_height wall_0_inset = 0 + diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg index 1a7b681d54..b8ad5cc5ae 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker3 +name = Extra Fine +version = 4 [metadata] +material = generic_cpe_plus +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_cpe_plus variant = AA 0.4 +weight = 1 [values] cool_fan_speed_max = 50 @@ -38,3 +38,4 @@ speed_wall = =math.ceil(speed_print * 35 / 40) speed_wall_0 = =math.ceil(speed_wall * 30 / 35) support_z_distance = =layer_height wall_0_inset = 0 + diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg index c44ecbffe4..678f025daa 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker3 +name = Fine +version = 4 [metadata] +material = generic_cpe_plus +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_cpe_plus variant = AA 0.4 +weight = 0 [values] cool_fan_speed_max = 50 @@ -37,3 +37,4 @@ speed_wall = =math.ceil(speed_print * 35 / 40) speed_wall_0 = =math.ceil(speed_wall * 30 / 35) support_z_distance = =layer_height wall_0_inset = 0 + 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 0cda32b1f5..9a12fe7b66 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 @@ -1,22 +1,23 @@ [general] -version = 4 -name = Fast definition = ultimaker3 +name = Fast +version = 4 [metadata] +material = generic_cpe +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_cpe variant = AA 0.4 +weight = -2 [values] -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_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature = =default_material_print_temperature + 10 skin_overlap = 20 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) + 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 348a7d3510..3ed0013d2c 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 @@ -1,22 +1,23 @@ [general] -version = 4 -name = Normal definition = ultimaker3 +name = Normal +version = 4 [metadata] +material = generic_cpe +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_cpe variant = AA 0.4 +weight = -1 [values] 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_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature = =default_material_print_temperature + 5 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) + 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 a83d597f8d..87cc2a36e1 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 @@ -1,23 +1,24 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker3 +name = Extra Fine +version = 4 [metadata] +material = generic_cpe +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_cpe variant = AA 0.4 +weight = 1 [values] cool_min_speed = 12 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 speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =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 7c1d03f592..0a00769674 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 @@ -1,21 +1,22 @@ [general] -version = 4 -name = Fine definition = ultimaker3 +name = Fine +version = 4 [metadata] +material = generic_cpe +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_cpe variant = AA 0.4 +weight = 0 [values] 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 speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =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 af122af470..19eb056ebb 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 @@ -1,26 +1,27 @@ [general] -version = 4 -name = Fast definition = ultimaker3 +name = Fast +version = 4 [metadata] +material = generic_nylon +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_nylon variant = AA 0.4 +weight = -2 [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_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature = =default_material_print_temperature + 10 ooze_shield_angle = 40 raft_airgap = 0.25 skin_overlap = 50 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 + 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 74087e7b13..590aee330e 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 @@ -1,26 +1,27 @@ [general] -version = 4 -name = Normal definition = ultimaker3 +name = Normal +version = 4 [metadata] +material = generic_nylon +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_nylon variant = AA 0.4 +weight = -1 [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_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature = =default_material_print_temperature + 5 ooze_shield_angle = 40 raft_airgap = 0.25 skin_overlap = 50 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 + 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 6b081c5bd7..673efb37ca 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 @@ -1,25 +1,26 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker3 +name = Extra Fine +version = 4 [metadata] +material = generic_nylon +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_nylon variant = AA 0.4 +weight = 1 [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_initial_print_temperature = =material_print_temperature - 5 ooze_shield_angle = 40 raft_airgap = 0.25 skin_overlap = 50 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 + 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 ef63c3afe0..5479c59155 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 @@ -1,25 +1,26 @@ [general] -version = 4 -name = Fine definition = ultimaker3 +name = Fine +version = 4 [metadata] +material = generic_nylon +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_nylon variant = AA 0.4 +weight = 0 [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_initial_print_temperature = =material_print_temperature - 5 ooze_shield_angle = 40 raft_airgap = 0.25 skin_overlap = 50 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 + 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 81812e7ea2..d74e1c1764 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker3 +name = Fast +version = 4 [metadata] +material = generic_pc +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pc variant = AA 0.4 +weight = -2 [values] adhesion_type = raft @@ -17,7 +17,6 @@ brim_width = 20 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' @@ -49,3 +48,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 + 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 8a0a874aff..bb8eb1e7b2 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker3 +name = Normal +version = 4 [metadata] +material = generic_pc +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_pc variant = AA 0.4 +weight = -1 [values] adhesion_type = raft @@ -47,3 +47,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 + 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 81707cdc26..17b7a1d706 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker3 +name = Extra Fine +version = 4 [metadata] +material = generic_pc +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pc variant = AA 0.4 +weight = 1 [values] adhesion_type = raft @@ -17,7 +17,6 @@ brim_width = 20 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' @@ -49,3 +48,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 + 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 67a45c439f..6a33a444f8 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker3 +name = Fine +version = 4 [metadata] +material = generic_pc +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pc variant = AA 0.4 +weight = 0 [values] adhesion_type = raft @@ -17,7 +17,6 @@ brim_width = 20 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 @@ -46,3 +45,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 + 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 398f4be2a0..0eda31a404 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 @@ -1,23 +1,24 @@ [general] -version = 4 -name = Fast definition = ultimaker3 +name = Fast +version = 4 [metadata] +material = generic_petg +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_petg variant = AA 0.4 +weight = -2 [values] -material_print_temperature = =default_material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature 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 = all skin_overlap = 20 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) -retraction_combing = all + 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 292389472c..693e97ebc0 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 @@ -1,24 +1,25 @@ [general] -version = 4 -name = Normal definition = ultimaker3 +name = Normal +version = 4 [metadata] +material = generic_petg +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_petg variant = AA 0.4 +weight = -1 [values] 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_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature = =default_material_print_temperature +retraction_combing = all +speed_infill = =math.ceil(speed_print * 50 / 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) -speed_infill = =math.ceil(speed_print * 50 / 60) -retraction_combing = all + 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 69bff08818..20af1130c7 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 @@ -1,24 +1,25 @@ [general] -version = 4 -name = Fine definition = ultimaker3 +name = Fine +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_petg variant = AA 0.4 +weight = 0 [values] 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 = all +speed_infill = =math.ceil(speed_print * 45 / 55) 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 * 45 / 55) -retraction_combing = all + 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 707a7fa097..af2805a5fb 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker3 +name = Fast +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pla variant = AA 0.4 +weight = -2 [values] cool_fan_speed_max = =cool_fan_speed @@ -22,3 +22,4 @@ 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 = 1 + 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 972963a1a1..1b66447ba9 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker3 +name = Normal +version = 4 [metadata] +material = generic_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_pla variant = AA 0.4 +weight = -1 [values] cool_fan_speed_max = =cool_fan_speed @@ -21,3 +21,4 @@ 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 + 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 458915a78d..e74f1fd0e8 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker3 +name = Extra Fine +version = 4 [metadata] +material = generic_pla +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pla variant = AA 0.4 +weight = 1 [values] cool_fan_speed_max = =cool_fan_speed @@ -23,3 +23,4 @@ speed_print = 60 speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_wall = =math.ceil(speed_print * 30 / 60) top_bottom_thickness = 1 + 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 e22c5ee79e..e1c1b61130 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker3 +name = Fine +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pla variant = AA 0.4 +weight = 0 [values] cool_fan_speed_max = =cool_fan_speed @@ -19,3 +19,4 @@ machine_nozzle_heat_up_speed = 1.6 prime_tower_enable = False skin_overlap = 10 top_bottom_thickness = 1 + 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 a2e6e5e86a..dd923d0711 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker3 +name = Fast +version = 4 [metadata] +material = generic_pp +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pp variant = AA 0.4 +weight = -2 [values] brim_width = 20 @@ -17,7 +17,6 @@ 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 @@ -49,3 +48,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 + 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 bec4a32c6d..bf095428bb 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker3 +name = Normal +version = 4 [metadata] +material = generic_pp +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_pp variant = AA 0.4 +weight = -1 [values] brim_width = 20 @@ -17,7 +17,6 @@ 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 @@ -49,3 +48,4 @@ switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 top_bottom_thickness = 1.1 wall_0_inset = 0 + 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 f665bad106..828f9701e0 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker3 +name = Fine +version = 4 [metadata] +material = generic_pp +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pp variant = AA 0.4 +weight = 0 [values] brim_width = 20 @@ -17,7 +17,6 @@ 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 @@ -48,3 +47,4 @@ switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 top_bottom_thickness = 1 wall_0_inset = 0 + 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 8edb6d184b..ce45fa5825 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker3 +name = Fast +version = 4 [metadata] +material = generic_tough_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_tough_pla variant = AA 0.4 +weight = -2 [values] cool_fan_speed_max = =cool_fan_speed @@ -25,3 +25,4 @@ speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 36 / 50) speed_wall_0 = =math.ceil(speed_print * 26 / 50) top_bottom_thickness = 1.2 + 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 1dcd7de37d..ec649ef965 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker3 +name = Normal +version = 4 [metadata] +material = generic_tough_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_tough_pla variant = AA 0.4 +weight = -1 [values] cool_fan_speed_max = =cool_fan_speed @@ -22,3 +22,4 @@ 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 + 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 226568fc85..e4b25dd1b7 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker3 +name = Fine +version = 4 [metadata] +material = generic_tough_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_tough_pla variant = AA 0.4 +weight = 0 [values] cool_fan_speed_max = =cool_fan_speed @@ -24,3 +24,4 @@ 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 + 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 a155163995..74efb5fddf 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker3 +name = Fast +version = 4 [metadata] +material = generic_tpu +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_tpu variant = AA 0.4 +weight = -2 [values] brim_width = 8.75 @@ -17,7 +17,6 @@ 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 @@ -52,3 +51,4 @@ switch_extruder_retraction_speeds = 35 top_bottom_thickness = 0.7 travel_avoid_distance = 1.5 wall_0_inset = 0 + 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 3adf9b510c..d42521e136 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker3 +name = Normal +version = 4 [metadata] +material = generic_tpu +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_tpu variant = AA 0.4 +weight = -1 [values] brim_width = 8.75 @@ -17,7 +17,6 @@ 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 @@ -53,3 +52,4 @@ switch_extruder_retraction_speeds = 35 top_bottom_thickness = 0.7 travel_avoid_distance = 1.5 wall_0_inset = 0 + 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 e4ec049a25..1209f7877c 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker3 +name = Fine +version = 4 [metadata] +material = generic_tpu +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_tpu variant = AA 0.4 +weight = 0 [values] brim_width = 8.75 @@ -17,7 +17,6 @@ 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 @@ -50,3 +49,4 @@ switch_extruder_retraction_speeds = 35 top_bottom_thickness = 0.7 travel_avoid_distance = 1.5 wall_0_inset = 0 + 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 af0ac8c663..5a678b88fb 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker3 +name = Fast +version = 4 [metadata] +material = generic_abs +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_abs variant = AA 0.8 +weight = -2 [values] material_print_temperature = =default_material_print_temperature + 25 @@ -17,3 +17,4 @@ 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) + 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 f28d24c04c..30baf623bf 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 @@ -1,21 +1,22 @@ [general] -version = 4 -name = Sprint definition = ultimaker3 +name = Sprint +version = 4 [metadata] +material = generic_abs +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_abs variant = AA 0.8 +weight = -4 [values] layer_height = 0.4 material_print_temperature = =default_material_print_temperature + 30 +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) + 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 8ee24fed22..18660eb7a9 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fast definition = ultimaker3 +name = Extra Fast +version = 4 [metadata] +material = generic_abs +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_abs variant = AA 0.8 +weight = -3 [values] layer_height = 0.3 @@ -18,3 +18,4 @@ 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) + 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 5af95b2969..cb99b9e80c 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Fast - Experimental definition = ultimaker3 +name = Fast - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_cpe_plus +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_cpe_plus variant = AA 0.8 -is_experimental = True +weight = -2 [values] brim_width = 14 @@ -27,3 +27,4 @@ speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_z_distance = =layer_height top_bottom_thickness = 1.2 + diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg index ef7eaf4120..c3bd18059d 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Sprint - Experimental definition = ultimaker3 +name = Sprint - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_cpe_plus +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_cpe_plus variant = AA 0.8 -is_experimental = True +weight = -4 [values] brim_width = 14 @@ -22,10 +22,11 @@ prime_tower_enable = True retraction_hop = 0.1 retraction_hop_enabled = False skin_overlap = 0 +speed_infill = =math.ceil(speed_print * 40 / 50) speed_print = 50 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/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg index d6bd7b5e23..142cdb865f 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 @@ -1,20 +1,19 @@ [general] -version = 4 -name = Extra Fast - Experimental definition = ultimaker3 +name = Extra Fast - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_cpe_plus +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_cpe_plus variant = AA 0.8 -is_experimental = True +weight = -3 [values] brim_width = 14 - layer_height = 0.3 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 @@ -29,3 +28,4 @@ speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_z_distance = =layer_height top_bottom_thickness = 1.2 + diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg index cd77fa7a1b..eaef1adadb 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker3 +name = Fast +version = 4 [metadata] +material = generic_cpe +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_cpe variant = AA 0.8 +weight = -2 [values] brim_width = 15 @@ -18,3 +18,4 @@ prime_tower_enable = True speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 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 3758ea96f7..08278228d1 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 @@ -1,23 +1,24 @@ [general] -version = 4 -name = Sprint definition = ultimaker3 +name = Sprint +version = 4 [metadata] +material = generic_cpe +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_cpe variant = AA 0.8 +weight = -4 [values] brim_width = 15 layer_height = 0.4 material_print_temperature = =default_material_print_temperature + 20 prime_tower_enable = True +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/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg index 9061c25db4..f2bab4227f 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fast definition = ultimaker3 +name = Extra Fast +version = 4 [metadata] +material = generic_cpe +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_cpe variant = AA 0.8 +weight = -3 [values] brim_width = 15 @@ -19,3 +19,4 @@ prime_tower_enable = True speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 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 a171427548..e2455db667 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker3 +name = Fast +version = 4 [metadata] +material = generic_nylon +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_nylon variant = AA 0.8 +weight = -2 [values] brim_width = 5.6 @@ -24,3 +24,4 @@ support_angle = 70 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 + 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 e80a6c73fd..ee541bebe6 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Sprint definition = ultimaker3 +name = Sprint +version = 4 [metadata] +material = generic_nylon +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_nylon variant = AA 0.8 +weight = -4 [values] brim_width = 5.6 @@ -25,3 +25,4 @@ support_angle = 70 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 + 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 a2ca3a769f..3393c6fe87 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fast definition = ultimaker3 +name = Extra Fast +version = 4 [metadata] +material = generic_nylon +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_nylon variant = AA 0.8 +weight = -3 [values] brim_width = 5.6 @@ -25,3 +25,4 @@ support_angle = 70 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 + diff --git a/resources/quality/ultimaker3/um3_aa0.8_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PC_Fast_Print.inst.cfg index 3f9aa0989c..33bf4180b4 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Fast - Experimental definition = ultimaker3 +name = Fast - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_pc +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pc variant = AA 0.8 -is_experimental = True +weight = -2 [values] brim_width = 14 @@ -21,3 +21,4 @@ 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 * 30 / 40) + 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 de4767cdfb..098056d4c2 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 @@ -1,25 +1,25 @@ [general] -version = 4 -name = Sprint - Experimental definition = ultimaker3 +name = Sprint - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_pc +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_pc variant = AA 0.8 -is_experimental = True +weight = -4 [values] brim_width = 14 - layer_height = 0.4 raft_airgap = 0.5 skin_overlap = 0 +speed_infill = =math.ceil(speed_print * 37 / 50) speed_print = 50 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/ultimaker3/um3_aa0.8_PC_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PC_Verydraft_Print.inst.cfg index 5042e8eed3..328a8963ce 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 @@ -1,20 +1,19 @@ [general] -version = 4 -name = Extra Fast - Experimental definition = ultimaker3 +name = Extra Fast - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_pc +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_pc variant = AA 0.8 -is_experimental = True +weight = -3 [values] brim_width = 14 - layer_height = 0.3 material_print_temperature = =default_material_print_temperature - 2 raft_airgap = 0.5 @@ -23,3 +22,4 @@ 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 * 30 / 40) + 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 caa2516bb4..c7383caf78 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 @@ -1,21 +1,22 @@ [general] -version = 4 -name = Fast definition = ultimaker3 +name = Fast +version = 4 [metadata] +material = generic_petg +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_petg variant = AA 0.8 +weight = -2 [values] brim_width = 7 material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = True +retraction_combing = all speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) -retraction_combing = all + 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 c36030f0f6..b4d46adf25 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 @@ -1,24 +1,25 @@ [general] -version = 4 -name = Sprint definition = ultimaker3 +name = Sprint +version = 4 [metadata] +material = generic_petg +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_petg variant = AA 0.8 +weight = -4 [values] brim_width = 7 layer_height = 0.4 material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = True +retraction_combing = all +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) -retraction_combing = all + 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 0dbd21ea00..5c90d97da6 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 @@ -1,22 +1,23 @@ [general] -version = 4 -name = Extra Fast definition = ultimaker3 +name = Extra Fast +version = 4 [metadata] +material = generic_petg +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_petg variant = AA 0.8 +weight = -3 [values] brim_width = 7 layer_height = 0.3 material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = True +retraction_combing = all speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) -retraction_combing = all + 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 2ae8ebc003..b55de20d03 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker3 +name = Fast +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pla variant = AA 0.8 +weight = -2 [values] cool_fan_speed_max = =100 @@ -25,7 +25,8 @@ prime_tower_enable = True 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/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg index 712658ed00..8bde58257f 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Sprint definition = ultimaker3 +name = Sprint +version = 4 [metadata] +material = generic_pla +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_pla variant = AA 0.8 +weight = -4 [values] cool_fan_speed_max = =100 @@ -23,11 +23,12 @@ 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 +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) +speed_wall_x = =speed_wall support_angle = 70 top_bottom_thickness = =layer_height * 4 + 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 558f365e9f..3ff54d4173 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fast definition = ultimaker3 +name = Extra Fast +version = 4 [metadata] +material = generic_pla +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_pla variant = AA 0.8 +weight = -3 [values] cool_fan_speed_max = =100 @@ -26,7 +26,8 @@ prime_tower_enable = True 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/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg index f55ca31b1e..be1ca9b03f 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 @@ -1,21 +1,20 @@ [general] -version = 4 -name = Fast definition = ultimaker3 +name = Fast +version = 4 [metadata] +material = generic_pp +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pp variant = AA 0.8 +weight = -2 [values] 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_print_temperature = =default_material_print_temperature - 2 multiple_mesh_overlap = 0.2 @@ -33,4 +32,6 @@ 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/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg index 71d6d72525..4d3ca3987b 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 @@ -1,21 +1,20 @@ [general] -version = 4 -name = Sprint definition = ultimaker3 +name = Sprint +version = 4 [metadata] +material = generic_pp +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_pp variant = AA 0.8 +weight = -4 [values] 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_print_temperature = =default_material_print_temperature + 2 multiple_mesh_overlap = 0.2 @@ -27,11 +26,13 @@ retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 retraction_min_travel = 1.5 retraction_prime_speed = 15 +speed_infill = =math.ceil(speed_wall * 30 / 30) speed_travel = 300 speed_wall_x = =math.ceil(speed_wall * 30 / 30) -speed_infill = =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/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg index 7bfa548002..5891b233f5 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 @@ -1,21 +1,20 @@ [general] -version = 4 -name = Extra Fast definition = ultimaker3 +name = Extra Fast +version = 4 [metadata] +material = generic_pp +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_pp variant = AA 0.8 +weight = -3 [values] 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' layer_height = 0.3 multiple_mesh_overlap = 0.2 @@ -33,4 +32,6 @@ 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/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg index 29ec865027..fe1ae6236f 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker3 +name = Fast +version = 4 [metadata] +material = generic_tough_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_tough_pla variant = AA 0.8 +weight = -2 [values] cool_fan_speed_max = =100 @@ -25,3 +25,4 @@ prime_tower_enable = 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 15da6a27a0..fc6e75f3e6 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Sprint definition = ultimaker3 +name = Sprint +version = 4 [metadata] +material = generic_tough_pla +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_tough_pla variant = AA 0.8 +weight = -4 [values] cool_fan_speed_max = =100 @@ -29,3 +29,4 @@ speed_wall = =math.ceil(speed_print * 25/ 30) speed_wall_0 = =math.ceil(speed_print * 20 / 30) support_angle = 70 top_bottom_thickness = =layer_height * 4 + 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 4b874d5e25..8e7e29f329 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fast definition = ultimaker3 +name = Extra Fast +version = 4 [metadata] +material = generic_tough_pla +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_tough_pla variant = AA 0.8 +weight = -3 [values] cool_fan_speed_max = =100 @@ -28,3 +28,4 @@ speed_wall = =math.ceil(speed_print * 25/ 35) speed_wall_0 = =math.ceil(speed_print * 20 / 35) support_angle = 70 top_bottom_thickness = =layer_height * 4 + 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 6d93e867f2..1e8ab8909e 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 @@ -1,20 +1,19 @@ [general] -version = 4 -name = Fast definition = ultimaker3 +name = Fast +version = 4 [metadata] +material = generic_tpu +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_tpu variant = AA 0.8 +weight = -2 [values] brim_width = 8.75 cool_min_layer_time_fan_speed_max = 6 -top_skin_expand_distance = =line_width * 2 gradual_infill_step_height = =4 * layer_height infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 15 @@ -43,5 +42,7 @@ 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/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg index f3e59695c8..f97a8fc9eb 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 @@ -1,20 +1,19 @@ [general] -version = 4 -name = Sprint definition = ultimaker3 +name = Sprint +version = 4 [metadata] +material = generic_tpu +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_tpu variant = AA 0.8 +weight = -4 [values] brim_width = 8.75 cool_min_layer_time_fan_speed_max = 6 -top_skin_expand_distance = =line_width * 2 gradual_infill_step_height = =4 * layer_height infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 15 @@ -34,16 +33,18 @@ 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_travel = 300 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/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg index c1c2246884..bde52f06e7 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 @@ -1,20 +1,19 @@ [general] -version = 4 -name = Extra Fast definition = ultimaker3 +name = Extra Fast +version = 4 [metadata] +material = generic_tpu +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_tpu variant = AA 0.8 +weight = -3 [values] brim_width = 8.75 cool_min_layer_time_fan_speed_max = 6 -top_skin_expand_distance = =line_width * 2 gradual_infill_step_height = =4 * layer_height infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 15 @@ -43,5 +42,7 @@ 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/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg index d04b46e2d6..db96413367 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 @@ -1,24 +1,25 @@ [general] -version = 4 -name = Fast definition = ultimaker3 +name = Fast +version = 4 [metadata] +material = generic_pva +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pva variant = BB 0.4 +weight = -2 [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 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/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg index e3d7255d36..3e6a4d56b7 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 @@ -1,25 +1,26 @@ [general] -version = 4 -name = Normal definition = ultimaker3 +name = Normal +version = 4 [metadata] +material = generic_pva +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_pva variant = BB 0.4 +weight = -1 [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 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/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg index e68bf36fc8..bbbf968a90 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 @@ -1,23 +1,24 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker3 +name = Extra Fine +version = 4 [metadata] +material = generic_pva +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pva variant = BB 0.4 +weight = 1 [values] -support_infill_sparse_thickness = =3*layer_height brim_replaces_support = False +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/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg index e96a8afcfb..bf2ad329a0 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 @@ -1,23 +1,24 @@ [general] -version = 4 -name = Fine definition = ultimaker3 +name = Fine +version = 4 [metadata] +material = generic_pva +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pva variant = BB 0.4 +weight = 0 [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)) 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/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg index 21cce522c3..cd9e5b6472 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 @@ -1,22 +1,23 @@ [general] -version = 4 -name = Fast definition = ultimaker3 +name = Fast +version = 4 [metadata] +material = generic_pva +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pva variant = BB 0.8 +weight = -2 [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 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/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg index fba29334a2..2765233a1d 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 @@ -1,21 +1,22 @@ [general] -version = 4 -name = Sprint definition = ultimaker3 +name = Sprint +version = 4 [metadata] +material = generic_pva +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_pva variant = BB 0.8 +weight = -4 [values] brim_replaces_support = False +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/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg index 606515e129..9ad4b814b7 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 @@ -1,21 +1,22 @@ [general] -version = 4 -name = Extra Fast definition = ultimaker3 +name = Extra Fast +version = 4 [metadata] +material = generic_pva +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_pva variant = BB 0.8 +weight = -3 [values] brim_replaces_support = False +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/ultimaker3/um3_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Draft_Quality.inst.cfg index d0a429231c..3a4a80ad83 100644 --- a/resources/quality/ultimaker3/um3_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_Draft_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker3 +name = Fast +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] layer_height = 0.2 + diff --git a/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg index 048708b0d1..a5132046ff 100644 --- a/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker3 +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -1 -global_quality = True [values] -layer_height = 0.15 \ No newline at end of file +layer_height = 0.15 + diff --git a/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg index a67d97a78e..341224def3 100644 --- a/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker3 +name = Extra Fine +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -global_quality = True [values] -layer_height = 0.06 \ No newline at end of file +layer_height = 0.06 + diff --git a/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg index 4a68719014..f03d53a43c 100644 --- a/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker3 +name = Fine +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] layer_height = 0.1 + diff --git a/resources/quality/ultimaker3/um3_global_Superdraft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Superdraft_Quality.inst.cfg index 0fb3a6e514..1eae3b4d61 100644 --- a/resources/quality/ultimaker3/um3_global_Superdraft_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_Superdraft_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Sprint definition = ultimaker3 +name = Sprint +version = 4 [metadata] +global_quality = True +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft weight = -4 -global_quality = True [values] layer_height = 0.4 + diff --git a/resources/quality/ultimaker3/um3_global_Verydraft_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Verydraft_Quality.inst.cfg index 4d0613d444..369b67741a 100644 --- a/resources/quality/ultimaker3/um3_global_Verydraft_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_Verydraft_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Extra Fast definition = ultimaker3 +name = Extra Fast +version = 4 [metadata] +global_quality = True +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft weight = -3 -global_quality = True [values] layer_height = 0.3 + diff --git a/resources/quality/ultimaker_original/umo_global_Coarse_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_Coarse_Quality.inst.cfg index 1d845be30d..dbd2f02ce4 100644 --- a/resources/quality/ultimaker_original/umo_global_Coarse_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_Coarse_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Coarse Quality definition = ultimaker_original +name = Coarse Quality +version = 4 [metadata] +global_quality = True +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = -3 -global_quality = True [values] layer_height = 0.4 + diff --git a/resources/quality/ultimaker_original/umo_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_Draft_Quality.inst.cfg index aab6bf55a9..70861c74e8 100644 --- a/resources/quality/ultimaker_original/umo_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_Draft_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = ultimaker_original +name = Draft Quality +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] layer_height = 0.2 + diff --git a/resources/quality/ultimaker_original/umo_global_Extra_Coarse_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_Extra_Coarse_Quality.inst.cfg index 4ea763039b..b59780eb48 100644 --- a/resources/quality/ultimaker_original/umo_global_Extra_Coarse_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_Extra_Coarse_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Extra Coarse Quality definition = ultimaker_original +name = Extra Coarse Quality +version = 4 [metadata] +global_quality = True +quality_type = extra coarse setting_version = 20 type = quality -quality_type = extra coarse weight = -4 -global_quality = True [values] layer_height = 0.6 + diff --git a/resources/quality/ultimaker_original/umo_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_Fast_Quality.inst.cfg index 2c182407e6..675b7e15b1 100644 --- a/resources/quality/ultimaker_original/umo_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_Fast_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker_original +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -1 -global_quality = True [values] layer_height = 0.15 + diff --git a/resources/quality/ultimaker_original/umo_global_High_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_High_Quality.inst.cfg index b3cce73f97..bddbd84331 100644 --- a/resources/quality/ultimaker_original/umo_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_High_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker_original +name = Extra Fine +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -global_quality = True [values] layer_height = 0.06 + diff --git a/resources/quality/ultimaker_original/umo_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_Normal_Quality.inst.cfg index db21b37b30..69caa49846 100644 --- a/resources/quality/ultimaker_original/umo_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_Normal_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker_original +name = Fine +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] layer_height = 0.1 + diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_ABS_Normal_Quality.inst.cfg index a45773f596..817d40c68b 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_ABS_Normal_Quality.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Fine definition = ultimaker_s3 +name = Fine +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_abs variant = AA 0.25 +weight = 0 [values] cool_fan_speed = 40 infill_overlap = =0 if infill_sparse_density > 80 else 15 material_final_print_temperature = =material_print_temperature - 5 speed_topbottom = =math.ceil(speed_print * 30 / 55) + diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_CPE_Normal_Quality.inst.cfg index 2c7b1f63f3..4bb8b938a9 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_CPE_Normal_Quality.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Fine definition = ultimaker_s3 +name = Fine +version = 4 [metadata] +material = generic_cpe +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_cpe variant = AA 0.25 +weight = 0 [values] speed_infill = =math.ceil(speed_print * 40 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) top_bottom_thickness = 0.8 + 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 91c3f81eea..a48823d701 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker_s3 +name = Fine +version = 4 [metadata] +material = generic_nylon +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_nylon variant = AA 0.25 +weight = 0 [values] cool_min_layer_time_fan_speed_max = 20 @@ -26,3 +26,4 @@ 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_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 1a8fc2da7f..af6c22f380 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Fine - Experimental definition = ultimaker_s3 +name = Fine - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_pc +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pc variant = AA 0.25 -is_experimental = True +weight = 0 [values] brim_width = 20 @@ -38,3 +38,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 + 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 45afd4501a..743bc71e4b 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 @@ -1,18 +1,19 @@ [general] -version = 4 -name = Fine definition = ultimaker_s3 +name = Fine +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_petg variant = AA 0.25 +weight = 0 [values] material_print_temperature = =default_material_print_temperature - 5 speed_infill = =math.ceil(speed_print * 40 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) top_bottom_thickness = 0.8 + diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg index 0ee56dc531..79fbd5fb3f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker_s3 +name = Fine +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pla variant = AA 0.25 +weight = 0 [values] brim_width = 8 @@ -30,3 +30,4 @@ top_bottom_thickness = 0.72 travel_avoid_distance = 0.4 wall_0_inset = 0.015 wall_0_wipe_dist = 0.25 + 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 7cb833c4fb..1d31bc4d02 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Fine - Experimental definition = ultimaker_s3 +name = Fine - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_pp +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pp variant = AA 0.25 -is_experimental = True +weight = 0 [values] brim_width = 10 @@ -43,3 +43,4 @@ switch_extruder_retraction_speeds = 35 top_bottom_thickness = 1 travel_avoid_distance = 3 wall_0_inset = 0 + diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg index 151d5a8a74..07abaf27d2 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker_s3 +name = Fine +version = 4 [metadata] +material = generic_tough_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_tough_pla variant = AA 0.25 +weight = 0 [values] brim_width = 8 @@ -29,3 +29,4 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 30) top_bottom_thickness = 0.72 wall_0_inset = 0.015 wall_0_wipe_dist = 0.25 + 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 2e93a0254a..f42461bc5d 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s3 +name = Fast +version = 4 [metadata] +material = generic_abs +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_abs variant = AA 0.4 +weight = -2 [values] machine_nozzle_cool_down_speed = 0.85 @@ -25,3 +25,4 @@ 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) + 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 1c59a448ac..64ad2fe16d 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker_s3 +name = Normal +version = 4 [metadata] +material = generic_abs +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_abs variant = AA 0.4 +weight = -1 [values] cool_min_speed = 7 @@ -25,3 +25,4 @@ 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) + 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 fcf6269d9f..c1fea9c2ec 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker_s3 +name = Extra Fine +version = 4 [metadata] +material = generic_abs +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_abs variant = AA 0.4 +weight = 1 [values] cool_min_speed = 12 @@ -24,3 +24,4 @@ speed_infill = =math.ceil(speed_print * 40 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) + 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 d112a72d0b..67d858a39c 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker_s3 +name = Fine +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_abs variant = AA 0.4 +weight = 0 [values] machine_nozzle_cool_down_speed = 0.85 @@ -23,3 +23,4 @@ speed_infill = =math.ceil(speed_print * 40 / 55) speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) + 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 7bbb926874..54ced73b77 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s3 +name = Fast +version = 4 [metadata] +material = generic_bam +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_bam variant = AA 0.4 +weight = -2 [values] brim_replaces_support = False @@ -29,3 +29,4 @@ 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 2d933bcabe..c5ef1145c6 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker_s3 +name = Normal +version = 4 [metadata] +material = generic_bam +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_bam variant = AA 0.4 +weight = -1 [values] brim_replaces_support = False @@ -29,3 +29,4 @@ 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 8b3a0033db..2fb261cfc2 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker_s3 +name = Fine +version = 4 [metadata] +material = generic_bam +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_bam variant = AA 0.4 +weight = 0 [values] brim_replaces_support = False @@ -27,3 +27,4 @@ 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 1780774511..8ee0f99a4f 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,16 +1,16 @@ [general] -version = 4 -name = Extra Fast - Experimental definition = ultimaker_s3 +name = Extra Fast - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_bam +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_bam variant = AA 0.4 -is_experimental = True +weight = -3 [values] brim_replaces_support = False @@ -30,3 +30,4 @@ 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 177290c551..8a9cfee214 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s3 +name = Fast +version = 4 [metadata] +material = generic_cpe_plus +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_cpe_plus variant = AA 0.4 +weight = -2 [values] cool_fan_speed_max = 80 @@ -34,3 +34,4 @@ speed_wall = =math.ceil(speed_print * 50 / 50) speed_wall_0 = =math.ceil(speed_wall * 40 / 50) support_z_distance = =layer_height wall_0_inset = 0 + 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 ebb934c56c..017434db39 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker_s3 +name = Normal +version = 4 [metadata] +material = generic_cpe_plus +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_cpe_plus variant = AA 0.4 +weight = -1 [values] cool_fan_speed_max = 80 @@ -34,3 +34,4 @@ speed_wall = =math.ceil(speed_print * 45 / 45) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) support_z_distance = =layer_height wall_0_inset = 0 + 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 42faffdd88..21fed3c3b3 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker_s3 +name = Extra Fine +version = 4 [metadata] +material = generic_cpe_plus +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_cpe_plus variant = AA 0.4 +weight = 1 [values] cool_fan_speed_max = 50 @@ -36,3 +36,4 @@ speed_wall = =math.ceil(speed_print * 35 / 40) speed_wall_0 = =math.ceil(speed_wall * 30 / 35) support_z_distance = =layer_height wall_0_inset = 0 + 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 bbbf14001b..9179d8af62 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker_s3 +name = Fine +version = 4 [metadata] +material = generic_cpe_plus +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_cpe_plus variant = AA 0.4 +weight = 0 [values] cool_fan_speed_max = 50 @@ -36,3 +36,4 @@ speed_wall = =math.ceil(speed_print * 35 / 40) speed_wall_0 = =math.ceil(speed_wall * 30 / 35) support_z_distance = =layer_height wall_0_inset = 0 + 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 7a0115080e..aeedff8998 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s3 +name = Fast +version = 4 [metadata] +material = generic_cpe +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_cpe variant = AA 0.4 +weight = -2 [values] infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' @@ -23,3 +23,4 @@ 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) + 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 5759d4d710..91ed7ba782 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker_s3 +name = Normal +version = 4 [metadata] +material = generic_cpe +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_cpe variant = AA 0.4 +weight = -1 [values] cool_min_speed = 7 @@ -23,3 +23,4 @@ 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) + 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 df2df7d58f..afd2d38e56 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker_s3 +name = Extra Fine +version = 4 [metadata] +material = generic_cpe +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_cpe variant = AA 0.4 +weight = 1 [values] cool_min_speed = 12 @@ -24,3 +24,4 @@ speed_infill = =math.ceil(speed_print * 40 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) + 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 5c182298a0..df84db28f8 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker_s3 +name = Fine +version = 4 [metadata] +material = generic_cpe +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_cpe variant = AA 0.4 +weight = 0 [values] infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' @@ -22,3 +22,4 @@ speed_infill = =math.ceil(speed_print * 45 / 55) speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) + 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 ebbb7eeb68..f7f8156ad3 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s3 +name = Fast +version = 4 [metadata] +material = generic_nylon +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_nylon variant = AA 0.4 +weight = -2 [values] cool_min_layer_time_fan_speed_max = 20 @@ -24,3 +24,4 @@ skin_overlap = 50 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 + 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 1bb66377e8..af1202de58 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker_s3 +name = Normal +version = 4 [metadata] +material = generic_nylon +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_nylon variant = AA 0.4 +weight = -1 [values] cool_min_layer_time_fan_speed_max = 20 @@ -24,3 +24,4 @@ skin_overlap = 50 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 + 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 6f43c2550b..eb10afdb8a 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker_s3 +name = Extra Fine +version = 4 [metadata] +material = generic_nylon +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_nylon variant = AA 0.4 +weight = 1 [values] cool_min_layer_time_fan_speed_max = 20 @@ -23,3 +23,4 @@ skin_overlap = 50 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 + 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 80d4ca4e4a..52f26ae65f 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker_s3 +name = Fine +version = 4 [metadata] +material = generic_nylon +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_nylon variant = AA 0.4 +weight = 0 [values] cool_min_layer_time_fan_speed_max = 20 @@ -23,3 +23,4 @@ skin_overlap = 50 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 + 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 fbe76fded3..7f8904cf57 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s3 +name = Fast +version = 4 [metadata] +material = generic_pc +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pc variant = AA 0.4 +weight = -2 [values] brim_width = 20 @@ -44,3 +44,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 + 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 1b2b210a85..1161154f07 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker_s3 +name = Normal +version = 4 [metadata] +material = generic_pc +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_pc variant = AA 0.4 +weight = -1 [values] brim_width = 20 @@ -43,3 +43,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 + 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 7a63a8f58b..501ea8235c 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker_s3 +name = Extra Fine +version = 4 [metadata] +material = generic_pc +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pc variant = AA 0.4 +weight = 1 [values] brim_width = 20 @@ -44,3 +44,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 + 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 11fdc84815..d497ff41c8 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker_s3 +name = Fine +version = 4 [metadata] +material = generic_pc +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pc variant = AA 0.4 +weight = 0 [values] brim_width = 20 @@ -42,3 +42,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 + 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 5630992467..fd890d3314 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s3 +name = Fast +version = 4 [metadata] +material = generic_petg +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_petg variant = AA 0.4 +weight = -2 [values] infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' @@ -22,3 +22,4 @@ 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) + 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 d7a21b7db9..f0ed49dfde 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker_s3 +name = Normal +version = 4 [metadata] +material = generic_petg +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_petg variant = AA 0.4 +weight = -1 [values] cool_min_speed = 7 @@ -22,3 +22,4 @@ 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) + 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 7dc95765e5..5a42f43c24 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker_s3 +name = Extra Fine +version = 4 [metadata] +material = generic_petg +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_petg variant = AA 0.4 +weight = 1 [values] cool_min_speed = 12 @@ -23,3 +23,4 @@ speed_infill = =math.ceil(speed_print * 40 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) + 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 0d4448d7c5..9d3249ed8d 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker_s3 +name = Fine +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_petg variant = AA 0.4 +weight = 0 [values] infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' @@ -22,3 +22,4 @@ speed_infill = =math.ceil(speed_print * 45 / 55) speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) + 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 0df61743ba..0d7b235ad5 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s3 +name = Fast +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pla variant = AA 0.4 +weight = -2 [values] acceleration_wall = 2000 @@ -27,3 +27,4 @@ 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 + 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 66311afea4..7370ecccb4 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker_s3 +name = Normal +version = 4 [metadata] +material = generic_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_pla variant = AA 0.4 +weight = -1 [values] cool_fan_speed_max = =cool_fan_speed @@ -23,3 +23,4 @@ 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 + 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 9dd2c0802a..fd9da71e89 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker_s3 +name = Extra Fine +version = 4 [metadata] +material = generic_pla +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pla variant = AA 0.4 +weight = 1 [values] cool_fan_speed_max = =cool_fan_speed @@ -25,3 +25,4 @@ speed_print = 50 speed_topbottom = =math.ceil(speed_print * 35 / 50) speed_wall = =math.ceil(speed_print * 35 / 50) top_bottom_thickness = 1 + 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 89f1a107b4..78748eb806 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker_s3 +name = Fine +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pla variant = AA 0.4 +weight = 0 [values] cool_fan_speed_max = =cool_fan_speed @@ -21,3 +21,4 @@ raft_airgap = 0.25 retraction_prime_speed = =retraction_speed skin_overlap = 10 top_bottom_thickness = 1 + 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 6220b0052a..4aca476737 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,16 +1,16 @@ [general] -version = 4 -name = Extra Fast - Experimental definition = ultimaker_s3 +name = Extra Fast - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_pla +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_pla variant = AA 0.4 -is_experimental = True +weight = -3 [values] acceleration_print = 2000 @@ -31,3 +31,4 @@ speed_print = 50 speed_wall = 50 top_bottom_thickness = 0.9 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 fcccbb7822..b6d8dd79d5 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s3 +name = Fast +version = 4 [metadata] +material = generic_pp +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pp variant = AA 0.4 +weight = -2 [values] brim_width = 20 @@ -44,3 +44,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 + 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 d3d5fa432d..77a56842e1 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker_s3 +name = Normal +version = 4 [metadata] +material = generic_pp +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_pp variant = AA 0.4 +weight = -1 [values] brim_width = 20 @@ -45,3 +45,4 @@ switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 top_bottom_thickness = 1.1 wall_0_inset = 0 + 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 75605e851a..0d5b0366f6 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker_s3 +name = Fine +version = 4 [metadata] +material = generic_pp +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pp variant = AA 0.4 +weight = 0 [values] brim_width = 20 @@ -45,3 +45,4 @@ switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 top_bottom_thickness = 1 wall_0_inset = 0 + 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 685e41e7d5..b67f85ba54 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s3 +name = Fast +version = 4 [metadata] +material = generic_tough_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_tough_pla variant = AA 0.4 +weight = -2 [values] cool_fan_speed_max = =cool_fan_speed @@ -26,3 +26,4 @@ speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 36 / 50) speed_wall_0 = =math.ceil(speed_print * 26 / 50) top_bottom_thickness = 1.2 + 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 beac1f0e68..60b2039da4 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker_s3 +name = Normal +version = 4 [metadata] +material = generic_tough_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_tough_pla variant = AA 0.4 +weight = -1 [values] cool_fan_speed_max = =cool_fan_speed @@ -23,3 +23,4 @@ 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 + 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 e019b421f8..e416692c27 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker_s3 +name = Extra Fine +version = 4 [metadata] +material = generic_tough_pla +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_tough_pla variant = AA 0.4 +weight = 1 [values] cool_fan_speed_max = =cool_fan_speed @@ -25,3 +25,4 @@ 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 + 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 d744f942c8..1b03631e3a 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker_s3 +name = Fine +version = 4 [metadata] +material = generic_tough_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_tough_pla variant = AA 0.4 +weight = 0 [values] cool_fan_speed_max = =cool_fan_speed @@ -25,3 +25,4 @@ 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 + 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 bd146c9165..cb82b94078 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,16 +1,16 @@ [general] -version = 4 -name = Extra Fast - Experimental definition = ultimaker_s3 +name = Extra Fast - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_tough_pla +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_tough_pla variant = AA 0.4 -is_experimental = True +weight = -3 [values] acceleration_print = 2000 @@ -31,3 +31,4 @@ speed_print = 50 speed_wall = 50 top_bottom_thickness = 1.2 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 82cc41840b..d8217cd241 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s3 +name = Fast +version = 4 [metadata] +material = generic_tpu +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_tpu variant = AA 0.4 +weight = -2 [values] brim_width = 8.75 @@ -47,3 +47,4 @@ switch_extruder_retraction_speeds = 35 top_bottom_thickness = 0.7 travel_avoid_distance = 1.5 wall_0_inset = 0 + 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 92fc4c3996..988514be80 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker_s3 +name = Normal +version = 4 [metadata] +material = generic_tpu +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_tpu variant = AA 0.4 +weight = -1 [values] brim_width = 8.75 @@ -47,3 +47,4 @@ switch_extruder_retraction_speeds = 35 top_bottom_thickness = 0.7 travel_avoid_distance = 1.5 wall_0_inset = 0 + 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 efb47d8c4b..55046f2294 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker_s3 +name = Fine +version = 4 [metadata] +material = generic_tpu +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_tpu variant = AA 0.4 +weight = 0 [values] brim_width = 8.75 @@ -46,3 +46,4 @@ switch_extruder_retraction_speeds = 35 top_bottom_thickness = 0.7 travel_avoid_distance = 1.5 wall_0_inset = 0 + 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 7afbea4788..e679ec24db 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s3 +name = Fast +version = 4 [metadata] +material = generic_abs +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_abs variant = AA 0.8 +weight = -2 [values] material_print_temperature = =default_material_print_temperature + 20 @@ -17,3 +17,4 @@ 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) + 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 e473cd6f28..3f2642e390 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Sprint definition = ultimaker_s3 +name = Sprint +version = 4 [metadata] +material = generic_abs +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_abs variant = AA 0.8 +weight = -4 [values] material_print_temperature = =default_material_print_temperature + 25 @@ -18,3 +18,4 @@ 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) + 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 2571776d35..004f664575 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fast definition = ultimaker_s3 +name = Extra Fast +version = 4 [metadata] +material = generic_abs +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_abs variant = AA 0.8 +weight = -3 [values] material_print_temperature = =default_material_print_temperature + 22 @@ -17,3 +17,4 @@ 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) + 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 a04f4ce184..3a58d31e34 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,16 +1,16 @@ [general] -version = 4 -name = Normal - Experimental definition = ultimaker_s3 +name = Fast - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_cpe_plus +quality_type = draft setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_cpe_plus variant = AA 0.8 -is_experimental = True +weight = -2 [values] brim_width = 14 @@ -27,3 +27,4 @@ speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_z_distance = =layer_height top_bottom_thickness = 1.2 + diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg index 8d93a7cc86..6f92c8a327 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Sprint - Experimental definition = ultimaker_s3 +name = Sprint - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_cpe_plus +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_cpe_plus variant = AA 0.8 -is_experimental = True +weight = -4 [values] brim_width = 14 @@ -28,3 +28,4 @@ speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 35 / 40) 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 d68a2fa7a5..1e1d517531 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Extra Fast - Experimental definition = ultimaker_s3 +name = Extra Fast - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_cpe_plus +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_cpe_plus variant = AA 0.8 -is_experimental = True +weight = -3 [values] brim_width = 14 @@ -27,3 +27,4 @@ speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_z_distance = =layer_height top_bottom_thickness = 1.2 + diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg index 7672b99659..8aa6e6f052 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s3 +name = Fast +version = 4 [metadata] +material = generic_cpe +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_cpe variant = AA 0.8 +weight = -2 [values] brim_width = 15 @@ -18,3 +18,4 @@ prime_tower_enable = True speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 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 c5fd2c0955..a093ecdca4 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Sprint definition = ultimaker_s3 +name = Sprint +version = 4 [metadata] +material = generic_cpe +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_cpe variant = AA 0.8 +weight = -4 [values] brim_width = 15 @@ -20,3 +20,4 @@ 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) + 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 e0b9362e0b..07abbef7f6 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fast definition = ultimaker_s3 +name = Extra Fast +version = 4 [metadata] +material = generic_cpe +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_cpe variant = AA 0.8 +weight = -3 [values] brim_width = 15 @@ -18,3 +18,4 @@ prime_tower_enable = True speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 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 c11350773c..8e7bb18368 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s3 +name = Fast +version = 4 [metadata] +material = generic_nylon +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_nylon variant = AA 0.8 +weight = -2 [values] brim_width = 5.6 @@ -24,3 +24,4 @@ support_angle = 70 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 + 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 4539cab117..7d55314764 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Sprint definition = ultimaker_s3 +name = Sprint +version = 4 [metadata] +material = generic_nylon +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_nylon variant = AA 0.8 +weight = -4 [values] brim_width = 5.6 @@ -24,3 +24,4 @@ support_angle = 70 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 + 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 3736e729e9..a1b785b98c 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fast definition = ultimaker_s3 +name = Extra Fast +version = 4 [metadata] +material = generic_nylon +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_nylon variant = AA 0.8 +weight = -3 [values] brim_width = 5.6 @@ -24,3 +24,4 @@ support_angle = 70 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 + 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 82db443247..2e986643f5 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,16 +1,16 @@ [general] -version = 4 -name = Normal - Experimental definition = ultimaker_s3 +name = Fast - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_pc +quality_type = draft setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_pc variant = AA 0.8 -is_experimental = True +weight = -2 [values] brim_width = 14 @@ -21,3 +21,4 @@ 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 * 30 / 40) + 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 0c697ecde5..34f81d4996 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Sprint - Experimental definition = ultimaker_s3 +name = Sprint - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_pc +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_pc variant = AA 0.8 -is_experimental = True +weight = -4 [values] brim_width = 14 @@ -21,3 +21,4 @@ speed_print = 50 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) + 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 ad163f9b89..ed555cc334 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Extra Fast - Experimental definition = ultimaker_s3 +name = Extra Fast - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_pc +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_pc variant = AA 0.8 -is_experimental = True +weight = -3 [values] brim_width = 14 @@ -21,3 +21,4 @@ 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 * 30 / 40) + 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 b4ff2efe6c..ad38d0ce8b 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s3 +name = Fast +version = 4 [metadata] +material = generic_petg +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_petg variant = AA 0.8 +weight = -2 [values] brim_width = 7 @@ -19,3 +19,4 @@ prime_tower_enable = True speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) + 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 437c9a8a1e..dca9d6772a 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Sprint definition = ultimaker_s3 +name = Sprint +version = 4 [metadata] +material = generic_petg +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_petg variant = AA 0.8 +weight = -4 [values] brim_width = 7 @@ -21,3 +21,4 @@ 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) + 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 3c115ddec1..3f32a815d0 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fast definition = ultimaker_s3 +name = Extra Fast +version = 4 [metadata] +material = generic_petg +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_petg variant = AA 0.8 +weight = -3 [values] brim_width = 7 @@ -19,3 +19,4 @@ prime_tower_enable = True speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) + 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 58d9c33fa2..de3559f53c 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s3 +name = Fast +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pla variant = AA 0.8 +weight = -2 [values] cool_fan_speed_max = =100 @@ -28,3 +28,4 @@ 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_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg index 93125940c5..7496b0139b 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Sprint definition = ultimaker_s3 +name = Sprint +version = 4 [metadata] +material = generic_pla +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_pla variant = AA 0.8 +weight = -4 [values] cool_fan_speed_max = =100 @@ -29,3 +29,4 @@ 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_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg index a7cd84fd76..5affcfe474 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fast definition = ultimaker_s3 +name = Extra Fast +version = 4 [metadata] +material = generic_pla +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_pla variant = AA 0.8 +weight = -3 [values] cool_fan_speed_max = =100 @@ -28,3 +28,4 @@ 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_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg index eb174a4f02..f2d8b3b255 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s3 +name = Fast +version = 4 [metadata] +material = generic_pp +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pp variant = AA 0.8 +weight = -2 [values] brim_width = 25 @@ -33,3 +33,4 @@ 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 817bdf4b3c..b0e913732b 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Sprint definition = ultimaker_s3 +name = Sprint +version = 4 [metadata] +material = generic_pp +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_pp variant = AA 0.8 +weight = -4 [values] brim_width = 25 @@ -34,3 +34,4 @@ 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 25a2ca571d..baeea6d9c2 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fast definition = ultimaker_s3 +name = Extra Fast +version = 4 [metadata] +material = generic_pp +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_pp variant = AA 0.8 +weight = -3 [values] brim_width = 25 @@ -32,3 +32,4 @@ 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 5ac1c01482..104a0c544b 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s3 +name = Fast +version = 4 [metadata] +material = generic_tough_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_tough_pla variant = AA 0.8 +weight = -2 [values] cool_fan_speed_max = =100 @@ -28,3 +28,4 @@ speed_wall = =round(speed_print * 40 / 45) speed_wall_0 = =round(speed_print * 35 / 45) support_angle = 70 top_bottom_thickness = =layer_height * 6 + 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 30f1ce88df..adaad5e219 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Sprint definition = ultimaker_s3 +name = Sprint +version = 4 [metadata] +material = generic_tough_pla +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_tough_pla variant = AA 0.8 +weight = -4 [values] cool_fan_speed_max = =100 @@ -29,3 +29,4 @@ speed_wall = =math.ceil(speed_print * 25 / 30) speed_wall_0 = =math.ceil(speed_print * 20 / 30) support_angle = 70 top_bottom_thickness = =layer_height * 4 + 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 f1c3e6d442..1488d10d6d 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fast definition = ultimaker_s3 +name = Extra Fast +version = 4 [metadata] +material = generic_tough_pla +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_tough_pla variant = AA 0.8 +weight = -3 [values] cool_fan_speed_max = =100 @@ -29,3 +29,4 @@ speed_wall = =math.ceil(speed_print * 25 / 35) speed_wall_0 = =math.ceil(speed_print * 20 / 35) support_angle = 70 top_bottom_thickness = =layer_height * 4 + 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 cd0492a425..2ebe1b1560 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s3 +name = Fast +version = 4 [metadata] +material = generic_tpu +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_tpu variant = AA 0.8 +weight = -2 [values] brim_width = 8.75 @@ -42,3 +42,4 @@ 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 a20bbc6718..dc177e6ada 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Sprint definition = ultimaker_s3 +name = Sprint +version = 4 [metadata] +material = generic_tpu +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_tpu variant = AA 0.8 +weight = -4 [values] brim_width = 8.75 @@ -44,3 +44,4 @@ 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 c55b5315cc..d8c4e83988 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fast definition = ultimaker_s3 +name = Extra Fast +version = 4 [metadata] +material = generic_tpu +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_tpu variant = AA 0.8 +weight = -3 [values] brim_width = 8.75 @@ -42,3 +42,4 @@ 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_cc0.4_CFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Draft_Print.inst.cfg index 910ac6aba8..82d06f717c 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s3 +name = Fast +version = 4 [metadata] +material = generic_cffcpe +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_cffcpe variant = CC 0.4 +weight = -2 [values] cool_fan_enabled = True @@ -21,3 +21,4 @@ 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 5c47cb2f7f..6081146858 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker_s3 +name = Normal +version = 4 [metadata] +material = generic_cffcpe +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_cffcpe variant = CC 0.4 +weight = -1 [values] cool_fan_enabled = True @@ -21,3 +21,4 @@ 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 b3c2ff1651..8baaf95bea 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s3 +name = Fast +version = 4 [metadata] +material = generic_cffpa +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_cffpa variant = CC 0.4 +weight = -2 [values] cool_fan_enabled = True @@ -21,3 +21,4 @@ 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 644c7d88fa..ef35e17861 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker_s3 +name = Normal +version = 4 [metadata] +material = generic_cffpa +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_cffpa variant = CC 0.4 +weight = -1 [values] cool_fan_enabled = True @@ -21,3 +21,4 @@ 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 80b0ea88a4..f890fb06a9 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s3 +name = Fast +version = 4 [metadata] +material = generic_gffcpe +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_gffcpe variant = CC 0.4 +weight = -2 [values] cool_fan_enabled = True @@ -21,3 +21,4 @@ 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 6550be6809..d0acef0a86 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker_s3 +name = Normal +version = 4 [metadata] +material = generic_gffcpe +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_gffcpe variant = CC 0.4 +weight = -1 [values] cool_fan_enabled = True @@ -21,3 +21,4 @@ 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 f9d2cc3021..a68e2af5e7 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s3 +name = Fast +version = 4 [metadata] +material = generic_gffpa +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_gffpa variant = CC 0.4 +weight = -2 [values] cool_fan_enabled = True @@ -21,3 +21,4 @@ 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 b57d1bbe69..22366fe5e4 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker_s3 +name = Normal +version = 4 [metadata] +material = generic_gffpa +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_gffpa variant = CC 0.4 +weight = -1 [values] cool_fan_enabled = True @@ -21,3 +21,4 @@ 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 9cb4a91bfa..48d1e7aeaf 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,16 +1,16 @@ [general] -version = 4 -name = Fast - Experimental definition = ultimaker_s3 +name = Fast - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pla variant = CC 0.4 -is_experimental = True +weight = -2 [values] cool_fan_speed_max = =100 @@ -30,3 +30,4 @@ 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 7207ac1163..59e6720194 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,16 +1,16 @@ [general] -version = 4 -name = Normal - Experimental definition = ultimaker_s3 +name = Normal - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_pla variant = CC 0.4 -is_experimental = True +weight = -1 [values] cool_fan_speed_max = =100 @@ -30,3 +30,4 @@ 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 b51b1d11a8..04a3cc0d0e 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s3 +name = Fast +version = 4 [metadata] +material = generic_cffcpe +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_cffcpe variant = CC 0.6 +weight = -2 [values] cool_fan_enabled = True @@ -21,3 +21,4 @@ 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 270b3f31a9..7656fb6022 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s3 +name = Fast +version = 4 [metadata] +material = generic_cffpa +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_cffpa variant = CC 0.6 +weight = -2 [values] cool_fan_enabled = True @@ -21,3 +21,4 @@ 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 7fed4541c4..7febb06210 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s3 +name = Fast +version = 4 [metadata] +material = generic_gffcpe +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_gffcpe variant = CC 0.6 +weight = -2 [values] cool_fan_enabled = True @@ -21,3 +21,4 @@ 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 9ef1840f02..03a5f140b2 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s3 +name = Fast +version = 4 [metadata] +material = generic_gffpa +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_gffpa variant = CC 0.6 +weight = -2 [values] cool_fan_enabled = True @@ -21,3 +21,4 @@ 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 16306b708c..f12041f5b6 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,16 +1,16 @@ [general] -version = 4 -name = Fast - Experimental definition = ultimaker_s3 +name = Fast - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pla variant = CC 0.6 -is_experimental = True +weight = -2 [values] cool_fan_speed_max = =100 @@ -30,3 +30,4 @@ 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 5f73d921cd..87561bf301 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,16 +1,16 @@ [general] -version = 4 -name = Normal - Experimental definition = ultimaker_s3 +name = Normal - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_pla variant = CC 0.6 -is_experimental = True +weight = -1 [values] cool_fan_speed_max = =100 @@ -30,3 +30,4 @@ 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_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_Draft_Quality.inst.cfg index e621b4da79..723a145a90 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_Draft_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s3 +name = Fast +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] layer_height = 0.2 + diff --git a/resources/quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg index 5d2618a02d..d3c84ef185 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker_s3 +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -1 -global_quality = True [values] layer_height = 0.15 + diff --git a/resources/quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg index 88d6049ff9..c4ac4d15ab 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker_s3 +name = Extra Fine +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -global_quality = True [values] layer_height = 0.06 + diff --git a/resources/quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg index eccccc6d42..1bf7d5fd80 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker_s3 +name = Fine +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] layer_height = 0.1 + diff --git a/resources/quality/ultimaker_s3/um_s3_global_Superdraft_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_Superdraft_Quality.inst.cfg index 5fbfe49654..9de2eea9cf 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_Superdraft_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_Superdraft_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Sprint definition = ultimaker_s3 +name = Sprint +version = 4 [metadata] +global_quality = True +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft weight = -4 -global_quality = True [values] layer_height = 0.4 + diff --git a/resources/quality/ultimaker_s3/um_s3_global_Verydraft_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_Verydraft_Quality.inst.cfg index 0493de7ed4..4729cfde45 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_Verydraft_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_Verydraft_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Extra Fast definition = ultimaker_s3 +name = Extra Fast +version = 4 [metadata] +global_quality = True +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft weight = -3 -global_quality = True [values] layer_height = 0.3 + diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg index 563bddc534..1759095efb 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_ABS_Normal_Quality.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Fine definition = ultimaker_s5 +name = Fine +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_abs variant = AA 0.25 +weight = 0 [values] cool_fan_speed = 40 infill_overlap = =0 if infill_sparse_density > 80 else 15 material_final_print_temperature = =material_print_temperature - 5 speed_topbottom = =math.ceil(speed_print * 30 / 55) + diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg index 5220dc917c..a499030912 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_CPE_Normal_Quality.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Fine definition = ultimaker_s5 +name = Fine +version = 4 [metadata] +material = generic_cpe +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_cpe variant = AA 0.25 +weight = 0 [values] speed_infill = =math.ceil(speed_print * 40 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) top_bottom_thickness = 0.8 + 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 f31ea87a5c..35cc04f676 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker_s5 +name = Fine +version = 4 [metadata] +material = generic_nylon +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_nylon variant = AA 0.25 +weight = 0 [values] cool_min_layer_time_fan_speed_max = 20 @@ -26,3 +26,4 @@ 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 65e3cfee97..f2f6c3df23 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Fine - Experimental definition = ultimaker_s5 +name = Fine - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_pc +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pc variant = AA 0.25 -is_experimental = True +weight = 0 [values] brim_width = 20 @@ -38,3 +38,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 + 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 3f99451398..aecac1ded0 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 @@ -1,18 +1,19 @@ [general] -version = 4 -name = Fine definition = ultimaker_s5 +name = Fine +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_petg variant = AA 0.25 +weight = 0 [values] material_print_temperature = =default_material_print_temperature - 5 speed_infill = =math.ceil(speed_print * 40 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) top_bottom_thickness = 0.8 + diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg index 3186bc57f3..086b5518e3 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker_s5 +name = Fine +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pla variant = AA 0.25 +weight = 0 [values] brim_width = 8 @@ -30,3 +30,4 @@ top_bottom_thickness = 0.72 travel_avoid_distance = 0.4 wall_0_inset = 0.015 wall_0_wipe_dist = 0.25 + 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 fd061d3cdc..9a371c0459 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Fine - Experimental definition = ultimaker_s5 +name = Fine - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_pp +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pp variant = AA 0.25 -is_experimental = True +weight = 0 [values] brim_width = 10 @@ -43,3 +43,4 @@ switch_extruder_retraction_speeds = 35 top_bottom_thickness = 1 travel_avoid_distance = 3 wall_0_inset = 0 + diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg index 5da606dd84..33efa8a7ae 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker_s5 +name = Fine +version = 4 [metadata] +material = generic_tough_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_tough_pla variant = AA 0.25 +weight = 0 [values] brim_width = 8 @@ -29,3 +29,4 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 30) top_bottom_thickness = 0.72 wall_0_inset = 0.015 wall_0_wipe_dist = 0.25 + 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 c1914f7973..eaefaf67c9 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s5 +name = Fast +version = 4 [metadata] +material = generic_abs +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_abs variant = AA 0.4 +weight = -2 [values] machine_nozzle_cool_down_speed = 0.85 @@ -25,3 +25,4 @@ 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) + 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 5f3542bd1d..84fed52bd8 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker_s5 +name = Normal +version = 4 [metadata] +material = generic_abs +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_abs variant = AA 0.4 +weight = -1 [values] cool_min_speed = 7 @@ -25,3 +25,4 @@ 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) + 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 ff36c99604..59c414497f 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker_s5 +name = Extra Fine +version = 4 [metadata] +material = generic_abs +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_abs variant = AA 0.4 +weight = 1 [values] cool_min_speed = 12 @@ -24,3 +24,4 @@ speed_infill = =math.ceil(speed_print * 40 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) + 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 14f84d5505..06d03f31b5 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker_s5 +name = Fine +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_abs variant = AA 0.4 +weight = 0 [values] machine_nozzle_cool_down_speed = 0.85 @@ -23,3 +23,4 @@ speed_infill = =math.ceil(speed_print * 40 / 55) speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) + 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 c7c5cbc075..5628421c5e 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s5 +name = Fast +version = 4 [metadata] +material = generic_bam +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_bam variant = AA 0.4 +weight = -2 [values] brim_replaces_support = False @@ -29,3 +29,4 @@ 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 5caaca15d8..9e4733469b 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker_s5 +name = Normal +version = 4 [metadata] +material = generic_bam +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_bam variant = AA 0.4 +weight = -1 [values] brim_replaces_support = False @@ -29,3 +29,4 @@ 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 2bbaae315b..c38bac8faf 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker_s5 +name = Fine +version = 4 [metadata] +material = generic_bam +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_bam variant = AA 0.4 +weight = 0 [values] brim_replaces_support = False @@ -27,3 +27,4 @@ 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 78711f7e95..8efec70ad6 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,16 +1,16 @@ [general] -version = 4 -name = Extra Fast - Experimental definition = ultimaker_s5 +name = Extra Fast - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_bam +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_bam variant = AA 0.4 -is_experimental = True +weight = -3 [values] brim_replaces_support = False @@ -30,3 +30,4 @@ 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 6a7089ebe5..1d4b06e66d 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s5 +name = Fast +version = 4 [metadata] +material = generic_cpe_plus +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_cpe_plus variant = AA 0.4 +weight = -2 [values] cool_fan_speed_max = 80 @@ -34,3 +34,4 @@ speed_wall = =math.ceil(speed_print * 50 / 50) speed_wall_0 = =math.ceil(speed_wall * 40 / 50) support_z_distance = =layer_height wall_0_inset = 0 + 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 06f2cc19b6..0ccaf4e58d 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker_s5 +name = Normal +version = 4 [metadata] +material = generic_cpe_plus +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_cpe_plus variant = AA 0.4 +weight = -1 [values] cool_fan_speed_max = 80 @@ -34,3 +34,4 @@ speed_wall = =math.ceil(speed_print * 45 / 45) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) support_z_distance = =layer_height wall_0_inset = 0 + 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 be93585e5b..50f39740c7 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker_s5 +name = Extra Fine +version = 4 [metadata] +material = generic_cpe_plus +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_cpe_plus variant = AA 0.4 +weight = 1 [values] cool_fan_speed_max = 50 @@ -36,3 +36,4 @@ speed_wall = =math.ceil(speed_print * 35 / 40) speed_wall_0 = =math.ceil(speed_wall * 30 / 35) support_z_distance = =layer_height wall_0_inset = 0 + 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 1dce2eff05..820616411e 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker_s5 +name = Fine +version = 4 [metadata] +material = generic_cpe_plus +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_cpe_plus variant = AA 0.4 +weight = 0 [values] cool_fan_speed_max = 50 @@ -36,3 +36,4 @@ speed_wall = =math.ceil(speed_print * 35 / 40) speed_wall_0 = =math.ceil(speed_wall * 30 / 35) support_z_distance = =layer_height wall_0_inset = 0 + 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 b961ede473..152aaaf6f2 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s5 +name = Fast +version = 4 [metadata] +material = generic_cpe +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_cpe variant = AA 0.4 +weight = -2 [values] infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' @@ -23,3 +23,4 @@ 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) + 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 cf0eab0fca..5375d4772d 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker_s5 +name = Normal +version = 4 [metadata] +material = generic_cpe +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_cpe variant = AA 0.4 +weight = -1 [values] cool_min_speed = 7 @@ -23,3 +23,4 @@ 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) + 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 68a04f4f61..cb2a038c93 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker_s5 +name = Extra Fine +version = 4 [metadata] +material = generic_cpe +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_cpe variant = AA 0.4 +weight = 1 [values] cool_min_speed = 12 @@ -24,3 +24,4 @@ speed_infill = =math.ceil(speed_print * 40 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) + 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 3a136fdd40..679c88b5b4 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker_s5 +name = Fine +version = 4 [metadata] +material = generic_cpe +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_cpe variant = AA 0.4 +weight = 0 [values] infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' @@ -22,3 +22,4 @@ speed_infill = =math.ceil(speed_print * 45 / 55) speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) + 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 76a2cc1550..2799240ff1 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s5 +name = Fast +version = 4 [metadata] +material = generic_nylon +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_nylon variant = AA 0.4 +weight = -2 [values] cool_min_layer_time_fan_speed_max = 20 @@ -24,3 +24,4 @@ skin_overlap = 50 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.4_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg index bd78a8e8c1..b58583034c 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker_s5 +name = Normal +version = 4 [metadata] +material = generic_nylon +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_nylon variant = AA 0.4 +weight = -1 [values] cool_min_layer_time_fan_speed_max = 20 @@ -24,3 +24,4 @@ skin_overlap = 50 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.4_Nylon_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg index c2a7194a2f..7ba484b9db 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker_s5 +name = Extra Fine +version = 4 [metadata] +material = generic_nylon +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_nylon variant = AA 0.4 +weight = 1 [values] cool_min_layer_time_fan_speed_max = 20 @@ -23,3 +23,4 @@ skin_overlap = 50 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.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg index b51a5c98e3..40e33d1228 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker_s5 +name = Fine +version = 4 [metadata] +material = generic_nylon +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_nylon variant = AA 0.4 +weight = 0 [values] cool_min_layer_time_fan_speed_max = 20 @@ -23,3 +23,4 @@ skin_overlap = 50 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.4_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg index be3b5b2e92..8dbf664eca 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s5 +name = Fast +version = 4 [metadata] +material = generic_pc +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pc variant = AA 0.4 +weight = -2 [values] brim_width = 20 @@ -44,3 +44,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 + 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 c8c5846857..ce1e5d41f8 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker_s5 +name = Normal +version = 4 [metadata] +material = generic_pc +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_pc variant = AA 0.4 +weight = -1 [values] brim_width = 20 @@ -43,3 +43,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 + 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 abae8129a3..06eb45b523 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker_s5 +name = Extra Fine +version = 4 [metadata] +material = generic_pc +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pc variant = AA 0.4 +weight = 1 [values] brim_width = 20 @@ -44,3 +44,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 + 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 b1ecd60f3f..718c94772f 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker_s5 +name = Fine +version = 4 [metadata] +material = generic_pc +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pc variant = AA 0.4 +weight = 0 [values] brim_width = 20 @@ -42,3 +42,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 + 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 b07d4d37f1..917b472727 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s5 +name = Fast +version = 4 [metadata] +material = generic_petg +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_petg variant = AA 0.4 +weight = -2 [values] infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' @@ -22,3 +22,4 @@ 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) + 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 97b6d52fa8..b342939fdc 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker_s5 +name = Normal +version = 4 [metadata] +material = generic_petg +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_petg variant = AA 0.4 +weight = -1 [values] cool_min_speed = 7 @@ -22,3 +22,4 @@ 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) + 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 118dbded28..591c01c85e 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker_s5 +name = Extra Fine +version = 4 [metadata] +material = generic_petg +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_petg variant = AA 0.4 +weight = 1 [values] cool_min_speed = 12 @@ -23,3 +23,4 @@ speed_infill = =math.ceil(speed_print * 40 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) + 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 20c4c73716..3dbe301e60 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker_s5 +name = Fine +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_petg variant = AA 0.4 +weight = 0 [values] infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' @@ -22,3 +22,4 @@ speed_infill = =math.ceil(speed_print * 45 / 55) speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) + 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 c90d22e44c..c002aba42a 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s5 +name = Fast +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pla variant = AA 0.4 +weight = -2 [values] acceleration_wall = 2000 @@ -27,3 +27,4 @@ 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 + 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 0fe89909db..3702579fa1 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker_s5 +name = Normal +version = 4 [metadata] +material = generic_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_pla variant = AA 0.4 +weight = -1 [values] cool_fan_speed_max = =cool_fan_speed @@ -23,3 +23,4 @@ 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 + 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 47abbdcfd4..a9ddd4dc23 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker_s5 +name = Extra Fine +version = 4 [metadata] +material = generic_pla +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_pla variant = AA 0.4 +weight = 1 [values] cool_fan_speed_max = =cool_fan_speed @@ -25,3 +25,4 @@ speed_print = 50 speed_topbottom = =math.ceil(speed_print * 35 / 50) speed_wall = =math.ceil(speed_print * 35 / 50) top_bottom_thickness = 1 + 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 2f73079408..703a980f41 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker_s5 +name = Fine +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pla variant = AA 0.4 +weight = 0 [values] cool_fan_speed_max = =cool_fan_speed @@ -21,3 +21,4 @@ raft_airgap = 0.25 retraction_prime_speed = =retraction_speed skin_overlap = 10 top_bottom_thickness = 1 + 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 563abd29d5..a7703a004e 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,16 +1,16 @@ [general] -version = 4 -name = Extra Fast - Experimental definition = ultimaker_s5 +name = Extra Fast - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_pla +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_pla variant = AA 0.4 -is_experimental = True +weight = -3 [values] acceleration_print = 2000 @@ -31,3 +31,4 @@ speed_print = 50 speed_wall = 50 top_bottom_thickness = 0.9 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 9747742c87..51173784db 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s5 +name = Fast +version = 4 [metadata] +material = generic_pp +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pp variant = AA 0.4 +weight = -2 [values] brim_width = 20 @@ -44,3 +44,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 + 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 2b4373e5c6..2a7b2163c3 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker_s5 +name = Normal +version = 4 [metadata] +material = generic_pp +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_pp variant = AA 0.4 +weight = -1 [values] brim_width = 20 @@ -45,3 +45,4 @@ switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 top_bottom_thickness = 1.1 wall_0_inset = 0 + 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 6c7a4afe1d..29f064a672 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker_s5 +name = Fine +version = 4 [metadata] +material = generic_pp +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pp variant = AA 0.4 +weight = 0 [values] brim_width = 20 @@ -45,3 +45,4 @@ switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 top_bottom_thickness = 1 wall_0_inset = 0 + 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 b4de80af0c..e22219b805 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s5 +name = Fast +version = 4 [metadata] +material = generic_tough_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_tough_pla variant = AA 0.4 +weight = -2 [values] cool_fan_speed_max = =cool_fan_speed @@ -26,3 +26,4 @@ speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 36 / 50) speed_wall_0 = =math.ceil(speed_print * 26 / 50) top_bottom_thickness = 1.2 + 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 46fc3ed093..86059425d7 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker_s5 +name = Normal +version = 4 [metadata] +material = generic_tough_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_tough_pla variant = AA 0.4 +weight = -1 [values] cool_fan_speed_max = =cool_fan_speed @@ -23,3 +23,4 @@ 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 + 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 b3874c5d54..cd9af15e41 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker_s5 +name = Extra Fine +version = 4 [metadata] +material = generic_tough_pla +quality_type = high setting_version = 20 type = quality -quality_type = high -weight = 1 -material = generic_tough_pla variant = AA 0.4 +weight = 1 [values] cool_fan_speed_max = =cool_fan_speed @@ -25,3 +25,4 @@ 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 + 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 a3c314db6f..10422804d0 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker_s5 +name = Fine +version = 4 [metadata] +material = generic_tough_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_tough_pla variant = AA 0.4 +weight = 0 [values] cool_fan_speed_max = =cool_fan_speed @@ -25,3 +25,4 @@ 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 + 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 9075aa0083..7b27a5a859 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,16 +1,16 @@ [general] -version = 4 -name = Extra Fast - Experimental definition = ultimaker_s5 +name = Extra Fast - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_tough_pla +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_tough_pla variant = AA 0.4 -is_experimental = True +weight = -3 [values] acceleration_print = 2000 @@ -31,3 +31,4 @@ speed_print = 50 speed_wall = 50 top_bottom_thickness = 1.2 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 18962e1e2b..4610cd7d2a 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s5 +name = Fast +version = 4 [metadata] +material = generic_tpu +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_tpu variant = AA 0.4 +weight = -2 [values] brim_width = 8.75 @@ -47,3 +47,4 @@ switch_extruder_retraction_speeds = 35 top_bottom_thickness = 0.7 travel_avoid_distance = 1.5 wall_0_inset = 0 + 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 6481d0e513..5a9a6ed0e4 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker_s5 +name = Normal +version = 4 [metadata] +material = generic_tpu +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_tpu variant = AA 0.4 +weight = -1 [values] brim_width = 8.75 @@ -47,3 +47,4 @@ switch_extruder_retraction_speeds = 35 top_bottom_thickness = 0.7 travel_avoid_distance = 1.5 wall_0_inset = 0 + 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 f842089f21..64f18492ec 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker_s5 +name = Fine +version = 4 [metadata] +material = generic_tpu +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_tpu variant = AA 0.4 +weight = 0 [values] brim_width = 8.75 @@ -46,3 +46,4 @@ switch_extruder_retraction_speeds = 35 top_bottom_thickness = 0.7 travel_avoid_distance = 1.5 wall_0_inset = 0 + 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 72f29e606b..a41701f240 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s5 +name = Fast +version = 4 [metadata] +material = generic_abs +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_abs variant = AA 0.8 +weight = -2 [values] material_print_temperature = =default_material_print_temperature + 20 @@ -17,3 +17,4 @@ 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) + 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 6b352edb2d..1e1a88b02d 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Sprint definition = ultimaker_s5 +name = Sprint +version = 4 [metadata] +material = generic_abs +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_abs variant = AA 0.8 +weight = -4 [values] material_print_temperature = =default_material_print_temperature + 25 @@ -18,3 +18,4 @@ 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) + 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 b90f30046d..b5c4881a36 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fast definition = ultimaker_s5 +name = Extra Fast +version = 4 [metadata] +material = generic_abs +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_abs variant = AA 0.8 +weight = -3 [values] material_print_temperature = =default_material_print_temperature + 22 @@ -17,3 +17,4 @@ 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) + 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 e014c6ae90..c37ab61582 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,16 +1,16 @@ [general] -version = 4 -name = Normal - Experimental definition = ultimaker_s5 +name = Fast - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_cpe_plus +quality_type = draft setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_cpe_plus variant = AA 0.8 -is_experimental = True +weight = -2 [values] brim_width = 14 @@ -27,3 +27,4 @@ speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_z_distance = =layer_height top_bottom_thickness = 1.2 + diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg index a4e265c4cf..e271a4b8c4 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Sprint - Experimental definition = ultimaker_s5 +name = Sprint - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_cpe_plus +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_cpe_plus variant = AA 0.8 -is_experimental = True +weight = -4 [values] brim_width = 14 @@ -28,3 +28,4 @@ speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 35 / 40) 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 c27a37dafb..b2c7787077 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Extra Fast - Experimental definition = ultimaker_s5 +name = Extra Fast - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_cpe_plus +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_cpe_plus variant = AA 0.8 -is_experimental = True +weight = -3 [values] brim_width = 14 @@ -27,3 +27,4 @@ speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_z_distance = =layer_height top_bottom_thickness = 1.2 + diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg index d10b520869..aabd5c4ff1 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s5 +name = Fast +version = 4 [metadata] +material = generic_cpe +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_cpe variant = AA 0.8 +weight = -2 [values] brim_width = 15 @@ -18,3 +18,4 @@ prime_tower_enable = True speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 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 4745f45d52..dd94f7e9bf 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Sprint definition = ultimaker_s5 +name = Sprint +version = 4 [metadata] +material = generic_cpe +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_cpe variant = AA 0.8 +weight = -4 [values] brim_width = 15 @@ -20,3 +20,4 @@ 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) + 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 3e2317aea2..49d34ce5ff 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fast definition = ultimaker_s5 +name = Extra Fast +version = 4 [metadata] +material = generic_cpe +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_cpe variant = AA 0.8 +weight = -3 [values] brim_width = 15 @@ -18,3 +18,4 @@ prime_tower_enable = True speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 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 addfe52641..7e2f1605c0 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s5 +name = Fast +version = 4 [metadata] +material = generic_nylon +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_nylon variant = AA 0.8 +weight = -2 [values] brim_width = 5.6 @@ -24,3 +24,4 @@ support_angle = 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.8_Nylon_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg index aec980aa48..74849301ab 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Sprint definition = ultimaker_s5 +name = Sprint +version = 4 [metadata] +material = generic_nylon +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_nylon variant = AA 0.8 +weight = -4 [values] brim_width = 5.6 @@ -24,3 +24,4 @@ support_angle = 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.8_Nylon_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg index 8e73a5a755..ffa93b088c 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fast definition = ultimaker_s5 +name = Extra Fast +version = 4 [metadata] +material = generic_nylon +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_nylon variant = AA 0.8 +weight = -3 [values] brim_width = 5.6 @@ -24,3 +24,4 @@ support_angle = 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.8_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg index 3951bb8ccc..2a5fa59681 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,16 +1,16 @@ [general] -version = 4 -name = Normal - Experimental definition = ultimaker_s5 +name = Fast - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_pc +quality_type = draft setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_pc variant = AA 0.8 -is_experimental = True +weight = -2 [values] brim_width = 14 @@ -21,3 +21,4 @@ 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 * 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 9baadb9951..517f965a35 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Sprint - Experimental definition = ultimaker_s5 +name = Sprint - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_pc +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_pc variant = AA 0.8 -is_experimental = True +weight = -4 [values] brim_width = 14 @@ -21,3 +21,4 @@ speed_print = 50 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) + 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 24489bdfcf..44244a23be 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Extra Fast - Experimental definition = ultimaker_s5 +name = Extra Fast - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_pc +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_pc variant = AA 0.8 -is_experimental = True +weight = -3 [values] brim_width = 14 @@ -21,3 +21,4 @@ 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 * 30 / 40) + 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 c38b26a764..66933a99f6 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s5 +name = Fast +version = 4 [metadata] +material = generic_petg +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_petg variant = AA 0.8 +weight = -2 [values] brim_width = 7 @@ -19,3 +19,4 @@ prime_tower_enable = True speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) + 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 2c627b32ca..b9f880954b 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Sprint definition = ultimaker_s5 +name = Sprint +version = 4 [metadata] +material = generic_petg +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_petg variant = AA 0.8 +weight = -4 [values] brim_width = 7 @@ -21,3 +21,4 @@ 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) + 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 036943bba7..99a31122ed 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fast definition = ultimaker_s5 +name = Extra Fast +version = 4 [metadata] +material = generic_petg +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_petg variant = AA 0.8 +weight = -3 [values] brim_width = 7 @@ -19,3 +19,4 @@ prime_tower_enable = True speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) + 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 25ddb22822..c7444b4ca6 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s5 +name = Fast +version = 4 [metadata] +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pla variant = AA 0.8 +weight = -2 [values] cool_fan_speed_max = =100 @@ -28,3 +28,4 @@ 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.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg index a56e09f355..89827b95d6 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Sprint definition = ultimaker_s5 +name = Sprint +version = 4 [metadata] +material = generic_pla +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_pla variant = AA 0.8 +weight = -4 [values] cool_fan_speed_max = =100 @@ -29,3 +29,4 @@ 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.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg index 455796d4a2..c90342a58c 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fast definition = ultimaker_s5 +name = Extra Fast +version = 4 [metadata] +material = generic_pla +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_pla variant = AA 0.8 +weight = -3 [values] cool_fan_speed_max = =100 @@ -28,3 +28,4 @@ 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.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg index 4ab569df51..3bb0f6187b 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s5 +name = Fast +version = 4 [metadata] +material = generic_pp +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pp variant = AA 0.8 +weight = -2 [values] brim_width = 25 @@ -33,3 +33,4 @@ 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 0def2f48f7..17ec868b67 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Sprint definition = ultimaker_s5 +name = Sprint +version = 4 [metadata] +material = generic_pp +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_pp variant = AA 0.8 +weight = -4 [values] brim_width = 25 @@ -34,3 +34,4 @@ 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 c0df85c64a..117f0b7235 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fast definition = ultimaker_s5 +name = Extra Fast +version = 4 [metadata] +material = generic_pp +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_pp variant = AA 0.8 +weight = -3 [values] brim_width = 25 @@ -32,3 +32,4 @@ 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 258e00a7f2..fd0a7f1fc3 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s5 +name = Fast +version = 4 [metadata] +material = generic_tough_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_tough_pla variant = AA 0.8 +weight = -2 [values] cool_fan_speed_max = =100 @@ -28,3 +28,4 @@ speed_wall = =round(speed_print * 40 / 45) speed_wall_0 = =round(speed_print * 35 / 45) support_angle = 70 top_bottom_thickness = =layer_height * 6 + 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 8910082407..440e241879 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Sprint definition = ultimaker_s5 +name = Sprint +version = 4 [metadata] +material = generic_tough_pla +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_tough_pla variant = AA 0.8 +weight = -4 [values] cool_fan_speed_max = =100 @@ -29,3 +29,4 @@ speed_wall = =math.ceil(speed_print * 25 / 30) speed_wall_0 = =math.ceil(speed_print * 20 / 30) support_angle = 70 top_bottom_thickness = =layer_height * 4 + 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 fd4c6ecb35..985bd71634 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fast definition = ultimaker_s5 +name = Extra Fast +version = 4 [metadata] +material = generic_tough_pla +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_tough_pla variant = AA 0.8 +weight = -3 [values] cool_fan_speed_max = =100 @@ -29,3 +29,4 @@ speed_wall = =math.ceil(speed_print * 25 / 35) speed_wall_0 = =math.ceil(speed_print * 20 / 35) support_angle = 70 top_bottom_thickness = =layer_height * 4 + 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 c1f1d01180..ba4e75eaec 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s5 +name = Fast +version = 4 [metadata] +material = generic_tpu +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_tpu variant = AA 0.8 +weight = -2 [values] brim_width = 8.75 @@ -42,3 +42,4 @@ 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 36ab5dccf6..b041b561ca 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Sprint definition = ultimaker_s5 +name = Sprint +version = 4 [metadata] +material = generic_tpu +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft -weight = -4 -material = generic_tpu variant = AA 0.8 +weight = -4 [values] brim_width = 8.75 @@ -43,3 +43,4 @@ 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 24bfc609d6..4bfbd2fbe8 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Extra Fast definition = ultimaker_s5 +name = Extra Fast +version = 4 [metadata] +material = generic_tpu +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft -weight = -3 -material = generic_tpu variant = AA 0.8 +weight = -3 [values] brim_width = 8.75 @@ -42,3 +42,4 @@ 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_cc0.4_CFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Draft_Print.inst.cfg index 44c86a6bac..10d5a7ea58 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s5 +name = Fast +version = 4 [metadata] +material = generic_cffcpe +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_cffcpe variant = CC 0.4 +weight = -2 [values] cool_fan_enabled = True @@ -21,3 +21,4 @@ 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 3fbdba351a..759947a9d9 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker_s5 +name = Normal +version = 4 [metadata] +material = generic_cffcpe +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_cffcpe variant = CC 0.4 +weight = -1 [values] cool_fan_enabled = True @@ -21,3 +21,4 @@ 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 91294dfc61..f827c27684 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s5 +name = Fast +version = 4 [metadata] +material = generic_cffpa +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_cffpa variant = CC 0.4 +weight = -2 [values] cool_fan_enabled = True @@ -21,3 +21,4 @@ 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 519522714d..f78603b4b3 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker_s5 +name = Normal +version = 4 [metadata] +material = generic_cffpa +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_cffpa variant = CC 0.4 +weight = -1 [values] cool_fan_enabled = True @@ -21,3 +21,4 @@ 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 5d9207a80b..b13908a819 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s5 +name = Fast +version = 4 [metadata] +material = generic_gffcpe +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_gffcpe variant = CC 0.4 +weight = -2 [values] cool_fan_enabled = True @@ -21,3 +21,4 @@ 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 614b01500a..cfcc73e496 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker_s5 +name = Normal +version = 4 [metadata] +material = generic_gffcpe +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_gffcpe variant = CC 0.4 +weight = -1 [values] cool_fan_enabled = True @@ -21,3 +21,4 @@ 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 57d55d1986..8f8969f41e 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s5 +name = Fast +version = 4 [metadata] +material = generic_gffpa +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_gffpa variant = CC 0.4 +weight = -2 [values] cool_fan_enabled = True @@ -21,3 +21,4 @@ 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 82b9c68b93..f1b89fdda9 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker_s5 +name = Normal +version = 4 [metadata] +material = generic_gffpa +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_gffpa variant = CC 0.4 +weight = -1 [values] cool_fan_enabled = True @@ -21,3 +21,4 @@ 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 80da69140f..e675ee0538 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,16 +1,16 @@ [general] -version = 4 -name = Fast - Experimental definition = ultimaker_s5 +name = Fast - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pla variant = CC 0.4 -is_experimental = True +weight = -2 [values] cool_fan_speed_max = =100 @@ -30,3 +30,4 @@ 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 8f30298b41..13c301968e 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,16 +1,16 @@ [general] -version = 4 -name = Normal - Experimental definition = ultimaker_s5 +name = Normal - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_pla variant = CC 0.4 -is_experimental = True +weight = -1 [values] cool_fan_speed_max = =100 @@ -30,3 +30,4 @@ 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 f5b810ac65..93ec0022c1 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s5 +name = Fast +version = 4 [metadata] +material = generic_cffcpe +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_cffcpe variant = CC 0.6 +weight = -2 [values] cool_fan_enabled = True @@ -21,3 +21,4 @@ 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 64b0fd615a..9d4d75498f 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s5 +name = Fast +version = 4 [metadata] +material = generic_cffpa +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_cffpa variant = CC 0.6 +weight = -2 [values] cool_fan_enabled = True @@ -21,3 +21,4 @@ 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 03f7e23870..619b090ed5 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s5 +name = Fast +version = 4 [metadata] +material = generic_gffcpe +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_gffcpe variant = CC 0.6 +weight = -2 [values] cool_fan_enabled = True @@ -21,3 +21,4 @@ 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 30eac47f51..6409ca81f6 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 @@ -1,15 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s5 +name = Fast +version = 4 [metadata] +material = generic_gffpa +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_gffpa variant = CC 0.6 +weight = -2 [values] cool_fan_enabled = True @@ -21,3 +21,4 @@ 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 af6b17cb41..f880fd435d 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,16 +1,16 @@ [general] -version = 4 -name = Fast - Experimental definition = ultimaker_s5 +name = Fast - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = generic_pla variant = CC 0.6 -is_experimental = True +weight = -2 [values] cool_fan_speed_max = =100 @@ -30,3 +30,4 @@ 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 573d84dd2d..4631c84728 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,16 +1,16 @@ [general] -version = 4 -name = Normal - Experimental definition = ultimaker_s5 +name = Normal - Experimental +version = 4 [metadata] +is_experimental = True +material = generic_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast -weight = -1 -material = generic_pla variant = CC 0.6 -is_experimental = True +weight = -1 [values] cool_fan_speed_max = =100 @@ -30,3 +30,4 @@ 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_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Draft_Quality.inst.cfg index 9bf9fad6bf..14a23ad2ce 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_Draft_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Fast definition = ultimaker_s5 +name = Fast +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] layer_height = 0.2 + diff --git a/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg index 8ab6de530f..c343f1af8f 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Normal definition = ultimaker_s5 +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -1 -global_quality = True [values] layer_height = 0.15 + diff --git a/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg index a3153e8718..2d01da9d7f 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = ultimaker_s5 +name = Extra Fine +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -global_quality = True [values] layer_height = 0.06 + diff --git a/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg index ef68e808dc..7b490c8d2c 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Fine definition = ultimaker_s5 +name = Fine +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] layer_height = 0.1 + diff --git a/resources/quality/ultimaker_s5/um_s5_global_Superdraft_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Superdraft_Quality.inst.cfg index 9ba5f03ce0..1ac23cff91 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_Superdraft_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_Superdraft_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Sprint definition = ultimaker_s5 +name = Sprint +version = 4 [metadata] +global_quality = True +quality_type = superdraft setting_version = 20 type = quality -quality_type = superdraft weight = -4 -global_quality = True [values] layer_height = 0.4 + diff --git a/resources/quality/ultimaker_s5/um_s5_global_Verydraft_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Verydraft_Quality.inst.cfg index e83e547fa9..22a6f3537e 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_Verydraft_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_Verydraft_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Extra Fast definition = ultimaker_s5 +name = Extra Fast +version = 4 [metadata] +global_quality = True +quality_type = verydraft setting_version = 20 type = quality -quality_type = verydraft weight = -3 -global_quality = True [values] layer_height = 0.3 + diff --git a/resources/quality/uni_base/abs/nozzle_0.30/abs_nozzle_0.30_layer_0.10.inst.cfg b/resources/quality/uni_base/abs/nozzle_0.30/abs_nozzle_0.30_layer_0.10.inst.cfg index 5506728111..278cf5d6c1 100644 --- a/resources/quality/uni_base/abs/nozzle_0.30/abs_nozzle_0.30_layer_0.10.inst.cfg +++ b/resources/quality/uni_base/abs/nozzle_0.30/abs_nozzle_0.30_layer_0.10.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_n0.30_l0.10 definition = uni_base +name = abs_n0.30_l0.10 +version = 4 [metadata] +material = generic_abs +quality_type = q010 setting_version = 20 type = quality -quality_type = q010 -material = generic_abs variant = 0.30mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/uni_base/abs/nozzle_0.30/abs_nozzle_0.30_layer_0.15.inst.cfg b/resources/quality/uni_base/abs/nozzle_0.30/abs_nozzle_0.30_layer_0.15.inst.cfg index d24e5b0cb3..246be4c3be 100644 --- a/resources/quality/uni_base/abs/nozzle_0.30/abs_nozzle_0.30_layer_0.15.inst.cfg +++ b/resources/quality/uni_base/abs/nozzle_0.30/abs_nozzle_0.30_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_n0.30_l0.15 definition = uni_base +name = abs_n0.30_l0.15 +version = 4 [metadata] +material = generic_abs +quality_type = q015 setting_version = 20 type = quality -quality_type = q015 -material = generic_abs variant = 0.30mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/uni_base/abs/nozzle_0.30/abs_nozzle_0.30_layer_0.20.inst.cfg b/resources/quality/uni_base/abs/nozzle_0.30/abs_nozzle_0.30_layer_0.20.inst.cfg index de92c21f94..07c45beb37 100644 --- a/resources/quality/uni_base/abs/nozzle_0.30/abs_nozzle_0.30_layer_0.20.inst.cfg +++ b/resources/quality/uni_base/abs/nozzle_0.30/abs_nozzle_0.30_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_n0.30_l0.20 definition = uni_base +name = abs_n0.30_l0.20 +version = 4 [metadata] +material = generic_abs +quality_type = q020 setting_version = 20 type = quality -quality_type = q020 -material = generic_abs variant = 0.30mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/uni_base/abs/nozzle_0.30/abs_nozzle_0.30_layer_0.25.inst.cfg b/resources/quality/uni_base/abs/nozzle_0.30/abs_nozzle_0.30_layer_0.25.inst.cfg index 5e7ad3ce18..6f05e2d495 100644 --- a/resources/quality/uni_base/abs/nozzle_0.30/abs_nozzle_0.30_layer_0.25.inst.cfg +++ b/resources/quality/uni_base/abs/nozzle_0.30/abs_nozzle_0.30_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_n0.30_l0.25 definition = uni_base +name = abs_n0.30_l0.25 +version = 4 [metadata] +material = generic_abs +quality_type = q025 setting_version = 20 type = quality -quality_type = q025 -material = generic_abs variant = 0.30mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.10.inst.cfg b/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.10.inst.cfg index 2a472929d4..c5b110750e 100644 --- a/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.10.inst.cfg +++ b/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.10.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_n0.40_l0.10 definition = uni_base +name = abs_n0.40_l0.10 +version = 4 [metadata] +material = generic_abs +quality_type = q010 setting_version = 20 type = quality -quality_type = q010 -material = generic_abs variant = 0.40mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.15.inst.cfg b/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.15.inst.cfg index c0283fe416..3bfaf72444 100644 --- a/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.15.inst.cfg +++ b/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_n0.40_l0.15 definition = uni_base +name = abs_n0.40_l0.15 +version = 4 [metadata] +material = generic_abs +quality_type = q015 setting_version = 20 type = quality -quality_type = q015 -material = generic_abs variant = 0.40mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.20.inst.cfg b/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.20.inst.cfg index 074c67c1fc..8cb4985952 100644 --- a/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.20.inst.cfg +++ b/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_n0.40_l0.20 definition = uni_base +name = abs_n0.40_l0.20 +version = 4 [metadata] +material = generic_abs +quality_type = q020 setting_version = 20 type = quality -quality_type = q020 -material = generic_abs variant = 0.40mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.25.inst.cfg b/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.25.inst.cfg index 4370079bfc..183637b3dc 100644 --- a/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.25.inst.cfg +++ b/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_n0.40_l0.25 definition = uni_base +name = abs_n0.40_l0.25 +version = 4 [metadata] +material = generic_abs +quality_type = q025 setting_version = 20 type = quality -quality_type = q025 -material = generic_abs variant = 0.40mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.30.inst.cfg b/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.30.inst.cfg index 31fba6ca82..0e3e6d1b44 100644 --- a/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.30.inst.cfg +++ b/resources/quality/uni_base/abs/nozzle_0.40/abs_nozzle_0.40_layer_0.30.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_n0.40_l0.30 definition = uni_base +name = abs_n0.40_l0.30 +version = 4 [metadata] +material = generic_abs +quality_type = q030 setting_version = 20 type = quality -quality_type = q030 -material = generic_abs variant = 0.40mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.15.inst.cfg b/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.15.inst.cfg index 159e182d24..69b6e70674 100644 --- a/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.15.inst.cfg +++ b/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_n0.50_l0.15 definition = uni_base +name = abs_n0.50_l0.15 +version = 4 [metadata] +material = generic_abs +quality_type = q015 setting_version = 20 type = quality -quality_type = q015 -material = generic_abs variant = 0.50mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.20.inst.cfg b/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.20.inst.cfg index 0b631eab51..6118378906 100644 --- a/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.20.inst.cfg +++ b/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_n0.50_l0.20 definition = uni_base +name = abs_n0.50_l0.20 +version = 4 [metadata] +material = generic_abs +quality_type = q020 setting_version = 20 type = quality -quality_type = q020 -material = generic_abs variant = 0.50mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.25.inst.cfg b/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.25.inst.cfg index 94e74cbed8..1f50612881 100644 --- a/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.25.inst.cfg +++ b/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_n0.50_l0.25 definition = uni_base +name = abs_n0.50_l0.25 +version = 4 [metadata] +material = generic_abs +quality_type = q025 setting_version = 20 type = quality -quality_type = q025 -material = generic_abs variant = 0.50mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.30.inst.cfg b/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.30.inst.cfg index bc00c22dab..570b0bde3f 100644 --- a/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.30.inst.cfg +++ b/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.30.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_n0.50_l0.30 definition = uni_base +name = abs_n0.50_l0.30 +version = 4 [metadata] +material = generic_abs +quality_type = q030 setting_version = 20 type = quality -quality_type = q030 -material = generic_abs variant = 0.50mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.35.inst.cfg b/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.35.inst.cfg index e9ecb81ef4..3ec1228b34 100644 --- a/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.35.inst.cfg +++ b/resources/quality/uni_base/abs/nozzle_0.50/abs_nozzle_0.50_layer_0.35.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_n0.50_l0.35 definition = uni_base +name = abs_n0.50_l0.35 +version = 4 [metadata] +material = generic_abs +quality_type = q035 setting_version = 20 type = quality -quality_type = q035 -material = generic_abs variant = 0.50mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/hips/nozzle_0.30/hips_nozzle_0.30_layer_0.10.inst.cfg b/resources/quality/uni_base/hips/nozzle_0.30/hips_nozzle_0.30_layer_0.10.inst.cfg index fe5ca4229b..c1eaed5bc0 100644 --- a/resources/quality/uni_base/hips/nozzle_0.30/hips_nozzle_0.30_layer_0.10.inst.cfg +++ b/resources/quality/uni_base/hips/nozzle_0.30/hips_nozzle_0.30_layer_0.10.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = hips_n0.30_l0.10 definition = uni_base +name = hips_n0.30_l0.10 +version = 4 [metadata] +material = generic_hips +quality_type = q010 setting_version = 20 type = quality -quality_type = q010 -material = generic_hips variant = 0.30mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/uni_base/hips/nozzle_0.30/hips_nozzle_0.30_layer_0.15.inst.cfg b/resources/quality/uni_base/hips/nozzle_0.30/hips_nozzle_0.30_layer_0.15.inst.cfg index 1940e8b57f..4d83d89cf4 100644 --- a/resources/quality/uni_base/hips/nozzle_0.30/hips_nozzle_0.30_layer_0.15.inst.cfg +++ b/resources/quality/uni_base/hips/nozzle_0.30/hips_nozzle_0.30_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = hips_n0.30_l0.15 definition = uni_base +name = hips_n0.30_l0.15 +version = 4 [metadata] +material = generic_hips +quality_type = q015 setting_version = 20 type = quality -quality_type = q015 -material = generic_hips variant = 0.30mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/uni_base/hips/nozzle_0.30/hips_nozzle_0.30_layer_0.20.inst.cfg b/resources/quality/uni_base/hips/nozzle_0.30/hips_nozzle_0.30_layer_0.20.inst.cfg index cbdc08f761..169aa7bf43 100644 --- a/resources/quality/uni_base/hips/nozzle_0.30/hips_nozzle_0.30_layer_0.20.inst.cfg +++ b/resources/quality/uni_base/hips/nozzle_0.30/hips_nozzle_0.30_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = hips_n0.30_l0.20 definition = uni_base +name = hips_n0.30_l0.20 +version = 4 [metadata] +material = generic_hips +quality_type = q020 setting_version = 20 type = quality -quality_type = q020 -material = generic_hips variant = 0.30mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/uni_base/hips/nozzle_0.30/hips_nozzle_0.30_layer_0.25.inst.cfg b/resources/quality/uni_base/hips/nozzle_0.30/hips_nozzle_0.30_layer_0.25.inst.cfg index 7a2e12c983..e75ad0de55 100644 --- a/resources/quality/uni_base/hips/nozzle_0.30/hips_nozzle_0.30_layer_0.25.inst.cfg +++ b/resources/quality/uni_base/hips/nozzle_0.30/hips_nozzle_0.30_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = hips_n0.30_l0.25 definition = uni_base +name = hips_n0.30_l0.25 +version = 4 [metadata] +material = generic_hips +quality_type = q025 setting_version = 20 type = quality -quality_type = q025 -material = generic_hips variant = 0.30mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.10.inst.cfg b/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.10.inst.cfg index 8d79a7610e..bbf42affcb 100644 --- a/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.10.inst.cfg +++ b/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.10.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = hips_n0.40_l0.10 definition = uni_base +name = hips_n0.40_l0.10 +version = 4 [metadata] +material = generic_hips +quality_type = q010 setting_version = 20 type = quality -quality_type = q010 -material = generic_hips variant = 0.40mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.15.inst.cfg b/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.15.inst.cfg index d53c5800dd..ec802be629 100644 --- a/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.15.inst.cfg +++ b/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = hips_n0.40_l0.15 definition = uni_base +name = hips_n0.40_l0.15 +version = 4 [metadata] +material = generic_hips +quality_type = q015 setting_version = 20 type = quality -quality_type = q015 -material = generic_hips variant = 0.40mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.20.inst.cfg b/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.20.inst.cfg index 06587f30c1..a374ca5a12 100644 --- a/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.20.inst.cfg +++ b/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = hips_n0.40_l0.20 definition = uni_base +name = hips_n0.40_l0.20 +version = 4 [metadata] +material = generic_hips +quality_type = q020 setting_version = 20 type = quality -quality_type = q020 -material = generic_hips variant = 0.40mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.25.inst.cfg b/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.25.inst.cfg index 733cb16855..4fc23eb961 100644 --- a/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.25.inst.cfg +++ b/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = hips_n0.40_l0.25 definition = uni_base +name = hips_n0.40_l0.25 +version = 4 [metadata] +material = generic_abs +quality_type = q025 setting_version = 20 type = quality -quality_type = q025 -material = generic_abs variant = 0.40mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.30.inst.cfg b/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.30.inst.cfg index c129080c6a..563bd30267 100644 --- a/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.30.inst.cfg +++ b/resources/quality/uni_base/hips/nozzle_0.40/hips_nozzle_0.40_layer_0.30.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = hips_n0.40_l0.30 definition = uni_base +name = hips_n0.40_l0.30 +version = 4 [metadata] +material = generic_hips +quality_type = q030 setting_version = 20 type = quality -quality_type = q030 -material = generic_hips variant = 0.40mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.15.inst.cfg b/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.15.inst.cfg index 5a3d1b6335..5b8e4df553 100644 --- a/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.15.inst.cfg +++ b/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = hips_n0.50_l0.15 definition = uni_base +name = hips_n0.50_l0.15 +version = 4 [metadata] +material = generic_hips +quality_type = q015 setting_version = 20 type = quality -quality_type = q015 -material = generic_hips variant = 0.50mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.20.inst.cfg b/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.20.inst.cfg index 4a3755f45d..e27f9bbc14 100644 --- a/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.20.inst.cfg +++ b/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = hips_n0.50_l0.20 definition = uni_base +name = hips_n0.50_l0.20 +version = 4 [metadata] +material = generic_hips +quality_type = q020 setting_version = 20 type = quality -quality_type = q020 -material = generic_hips variant = 0.50mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.25.inst.cfg b/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.25.inst.cfg index 55ffd52613..47f602e7e4 100644 --- a/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.25.inst.cfg +++ b/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = hips_n0.50_l0.25 definition = uni_base +name = hips_n0.50_l0.25 +version = 4 [metadata] +material = generic_hips +quality_type = q025 setting_version = 20 type = quality -quality_type = q025 -material = generic_hips variant = 0.50mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.30.inst.cfg b/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.30.inst.cfg index 430b0c5013..d00028eb27 100644 --- a/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.30.inst.cfg +++ b/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.30.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = hips_n0.50_l0.30 definition = uni_base +name = hips_n0.50_l0.30 +version = 4 [metadata] +material = generic_hips +quality_type = q030 setting_version = 20 type = quality -quality_type = q030 -material = generic_hips variant = 0.50mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.35.inst.cfg b/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.35.inst.cfg index 35bf3b0468..548f9c0f3a 100644 --- a/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.35.inst.cfg +++ b/resources/quality/uni_base/hips/nozzle_0.50/hips_nozzle_0.50_layer_0.35.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = hips_n0.50_l0.35 definition = uni_base +name = hips_n0.50_l0.35 +version = 4 [metadata] +material = generic_hips +quality_type = q035 setting_version = 20 type = quality -quality_type = q035 -material = generic_hips variant = 0.50mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/layer_0.05.inst.cfg b/resources/quality/uni_base/layer_0.05.inst.cfg index abc4d4b549..a8d5f648b2 100644 --- a/resources/quality/uni_base/layer_0.05.inst.cfg +++ b/resources/quality/uni_base/layer_0.05.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Ultra Quality definition = uni_base +name = Ultra Quality +version = 4 [metadata] +global_quality = True +quality_type = q005 setting_version = 20 type = quality -quality_type = q005 weight = -1 -global_quality = True [values] layer_height = 0.05 layer_height_0 = 0.12 + diff --git a/resources/quality/uni_base/layer_0.10.inst.cfg b/resources/quality/uni_base/layer_0.10.inst.cfg index 2d5fa84e97..e91d61a26a 100644 --- a/resources/quality/uni_base/layer_0.10.inst.cfg +++ b/resources/quality/uni_base/layer_0.10.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Super Quality definition = uni_base +name = Super Quality +version = 4 [metadata] +global_quality = True +quality_type = q010 setting_version = 20 type = quality -quality_type = q010 weight = -2 -global_quality = True [values] layer_height = 0.10 layer_height_0 = 0.12 + diff --git a/resources/quality/uni_base/layer_0.15.inst.cfg b/resources/quality/uni_base/layer_0.15.inst.cfg index fdf325677d..65ea2154cf 100644 --- a/resources/quality/uni_base/layer_0.15.inst.cfg +++ b/resources/quality/uni_base/layer_0.15.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Fast Super Quality definition = uni_base +name = Fast Super Quality +version = 4 [metadata] +global_quality = True +quality_type = q015 setting_version = 20 type = quality -quality_type = q015 weight = -3 -global_quality = True [values] layer_height = 0.15 layer_height_0 = 0.15 + diff --git a/resources/quality/uni_base/layer_0.20.inst.cfg b/resources/quality/uni_base/layer_0.20.inst.cfg index 5fc4201fef..61f5ce3d74 100644 --- a/resources/quality/uni_base/layer_0.20.inst.cfg +++ b/resources/quality/uni_base/layer_0.20.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = uni_base +name = Standard Quality +version = 4 [metadata] +global_quality = True +quality_type = q020 setting_version = 20 type = quality -quality_type = q020 weight = -4 -global_quality = True [values] layer_height = 0.20 layer_height_0 = 0.20 + diff --git a/resources/quality/uni_base/layer_0.25.inst.cfg b/resources/quality/uni_base/layer_0.25.inst.cfg index cbb90a9a72..57318295c5 100644 --- a/resources/quality/uni_base/layer_0.25.inst.cfg +++ b/resources/quality/uni_base/layer_0.25.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Fast Standard Quality definition = uni_base +name = Fast Standard Quality +version = 4 [metadata] +global_quality = True +quality_type = q025 setting_version = 20 type = quality -quality_type = q025 weight = -5 -global_quality = True [values] layer_height = 0.25 layer_height_0 = 0.25 + diff --git a/resources/quality/uni_base/layer_0.30.inst.cfg b/resources/quality/uni_base/layer_0.30.inst.cfg index 325821c366..0d5efcb39c 100644 --- a/resources/quality/uni_base/layer_0.30.inst.cfg +++ b/resources/quality/uni_base/layer_0.30.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Fast Print Quality definition = uni_base +name = Fast Print Quality +version = 4 [metadata] +global_quality = True +quality_type = q030 setting_version = 20 type = quality -quality_type = q030 weight = -6 -global_quality = True [values] layer_height = 0.30 layer_height_0 = 0.30 + diff --git a/resources/quality/uni_base/layer_0.35.inst.cfg b/resources/quality/uni_base/layer_0.35.inst.cfg index 1a15f97ac6..2d71ee30b6 100644 --- a/resources/quality/uni_base/layer_0.35.inst.cfg +++ b/resources/quality/uni_base/layer_0.35.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Draft Quality definition = uni_base +name = Draft Quality +version = 4 [metadata] +global_quality = True +quality_type = q035 setting_version = 20 type = quality -quality_type = q035 weight = -7 -global_quality = True [values] layer_height = 0.35 layer_height_0 = 0.35 + diff --git a/resources/quality/uni_base/layer_0.40.inst.cfg b/resources/quality/uni_base/layer_0.40.inst.cfg index 15c46490fe..e7be686507 100644 --- a/resources/quality/uni_base/layer_0.40.inst.cfg +++ b/resources/quality/uni_base/layer_0.40.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Poor Draft Quality definition = uni_base +name = Poor Draft Quality +version = 4 [metadata] +global_quality = True +quality_type = q040 setting_version = 20 type = quality -quality_type = q040 weight = -8 -global_quality = True [values] layer_height = 0.40 layer_height_0 = 0.40 + diff --git a/resources/quality/uni_base/petg/nozzle_0.30/petg_nozzle_0.30_layer_0.10.inst.cfg b/resources/quality/uni_base/petg/nozzle_0.30/petg_nozzle_0.30_layer_0.10.inst.cfg index 9db310e755..b447ed2d21 100644 --- a/resources/quality/uni_base/petg/nozzle_0.30/petg_nozzle_0.30_layer_0.10.inst.cfg +++ b/resources/quality/uni_base/petg/nozzle_0.30/petg_nozzle_0.30_layer_0.10.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_n0.30_l0.10 definition = uni_base +name = petg_n0.30_l0.10 +version = 4 [metadata] +material = generic_petg +quality_type = q010 setting_version = 20 type = quality -quality_type = q010 -material = generic_petg variant = 0.30mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/uni_base/petg/nozzle_0.30/petg_nozzle_0.30_layer_0.15.inst.cfg b/resources/quality/uni_base/petg/nozzle_0.30/petg_nozzle_0.30_layer_0.15.inst.cfg index 0a744f0355..d2a8efff85 100644 --- a/resources/quality/uni_base/petg/nozzle_0.30/petg_nozzle_0.30_layer_0.15.inst.cfg +++ b/resources/quality/uni_base/petg/nozzle_0.30/petg_nozzle_0.30_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_n0.30_l0.15 definition = uni_base +name = petg_n0.30_l0.15 +version = 4 [metadata] +material = generic_petg +quality_type = q015 setting_version = 20 type = quality -quality_type = q015 -material = generic_petg variant = 0.30mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/uni_base/petg/nozzle_0.30/petg_nozzle_0.30_layer_0.20.inst.cfg b/resources/quality/uni_base/petg/nozzle_0.30/petg_nozzle_0.30_layer_0.20.inst.cfg index 747af047df..be05a7dc32 100644 --- a/resources/quality/uni_base/petg/nozzle_0.30/petg_nozzle_0.30_layer_0.20.inst.cfg +++ b/resources/quality/uni_base/petg/nozzle_0.30/petg_nozzle_0.30_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_n0.30_l0.20 definition = uni_base +name = petg_n0.30_l0.20 +version = 4 [metadata] +material = generic_petg +quality_type = q020 setting_version = 20 type = quality -quality_type = q020 -material = generic_petg variant = 0.30mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/uni_base/petg/nozzle_0.30/petg_nozzle_0.30_layer_0.25.inst.cfg b/resources/quality/uni_base/petg/nozzle_0.30/petg_nozzle_0.30_layer_0.25.inst.cfg index 0300413561..eea0830440 100644 --- a/resources/quality/uni_base/petg/nozzle_0.30/petg_nozzle_0.30_layer_0.25.inst.cfg +++ b/resources/quality/uni_base/petg/nozzle_0.30/petg_nozzle_0.30_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_n0.30_l0.25 definition = uni_base +name = petg_n0.30_l0.25 +version = 4 [metadata] +material = generic_petg +quality_type = q025 setting_version = 20 type = quality -quality_type = q025 -material = generic_petg variant = 0.30mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.10.inst.cfg b/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.10.inst.cfg index 6e17a7d0af..ed888694b7 100644 --- a/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.10.inst.cfg +++ b/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.10.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_n0.40_l0.10 definition = uni_base +name = petg_n0.40_l0.10 +version = 4 [metadata] +material = generic_petg +quality_type = q010 setting_version = 20 type = quality -quality_type = q010 -material = generic_petg variant = 0.40mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.15.inst.cfg b/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.15.inst.cfg index cbb4a58160..67e0ca6469 100644 --- a/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.15.inst.cfg +++ b/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_n0.40_l0.15 definition = uni_base +name = petg_n0.40_l0.15 +version = 4 [metadata] +material = generic_petg +quality_type = q015 setting_version = 20 type = quality -quality_type = q015 -material = generic_petg variant = 0.40mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.20.inst.cfg b/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.20.inst.cfg index c294a00fa0..9d803c4e18 100644 --- a/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.20.inst.cfg +++ b/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_n0.40_l0.20 definition = uni_base +name = petg_n0.40_l0.20 +version = 4 [metadata] +material = generic_petg +quality_type = q020 setting_version = 20 type = quality -quality_type = q020 -material = generic_petg variant = 0.40mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.25.inst.cfg b/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.25.inst.cfg index ba0976ec16..24668ebf52 100644 --- a/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.25.inst.cfg +++ b/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_n0.40_l0.25 definition = uni_base +name = petg_n0.40_l0.25 +version = 4 [metadata] +material = generic_petg +quality_type = q025 setting_version = 20 type = quality -quality_type = q025 -material = generic_petg variant = 0.40mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.30.inst.cfg b/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.30.inst.cfg index be326c3869..9913882e0f 100644 --- a/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.30.inst.cfg +++ b/resources/quality/uni_base/petg/nozzle_0.40/petg_nozzle_0.40_layer_0.30.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_n0.40_l0.30 definition = uni_base +name = petg_n0.40_l0.30 +version = 4 [metadata] +material = generic_petg +quality_type = q030 setting_version = 20 type = quality -quality_type = q030 -material = generic_petg variant = 0.40mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.15.inst.cfg b/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.15.inst.cfg index 774955edc1..2f49495352 100644 --- a/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.15.inst.cfg +++ b/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_n0.50_l0.15 definition = uni_base +name = petg_n0.50_l0.15 +version = 4 [metadata] +material = generic_petg +quality_type = q015 setting_version = 20 type = quality -quality_type = q015 -material = generic_petg variant = 0.50mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.20.inst.cfg b/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.20.inst.cfg index 300a4c5d98..24074de5b1 100644 --- a/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.20.inst.cfg +++ b/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_n0.50_l0.20 definition = uni_base +name = petg_n0.50_l0.20 +version = 4 [metadata] +material = generic_petg +quality_type = q020 setting_version = 20 type = quality -quality_type = q020 -material = generic_petg variant = 0.50mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.25.inst.cfg b/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.25.inst.cfg index 1adcaba8a5..a7192adaf1 100644 --- a/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.25.inst.cfg +++ b/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_n0.50_l0.25 definition = uni_base +name = petg_n0.50_l0.25 +version = 4 [metadata] +material = generic_petg +quality_type = q025 setting_version = 20 type = quality -quality_type = q025 -material = generic_petg variant = 0.50mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.30.inst.cfg b/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.30.inst.cfg index 80f16b3bcf..fdc5a152e9 100644 --- a/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.30.inst.cfg +++ b/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.30.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_n0.50_l0.30 definition = uni_base +name = petg_n0.50_l0.30 +version = 4 [metadata] +material = generic_petg +quality_type = q030 setting_version = 20 type = quality -quality_type = q030 -material = generic_petg variant = 0.50mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.35.inst.cfg b/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.35.inst.cfg index cb92609a68..8a80029377 100644 --- a/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.35.inst.cfg +++ b/resources/quality/uni_base/petg/nozzle_0.50/petg_nozzle_0.50_layer_0.35.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_n0.50_l0.35 definition = uni_base +name = petg_n0.50_l0.35 +version = 4 [metadata] +material = generic_petg +quality_type = q035 setting_version = 20 type = quality -quality_type = q035 -material = generic_petg variant = 0.50mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/pla/nozzle_0.30/pla_nozzle_0.30_layer_0.10.inst.cfg b/resources/quality/uni_base/pla/nozzle_0.30/pla_nozzle_0.30_layer_0.10.inst.cfg index 0c2dbc3d3a..7a7d15fe2e 100644 --- a/resources/quality/uni_base/pla/nozzle_0.30/pla_nozzle_0.30_layer_0.10.inst.cfg +++ b/resources/quality/uni_base/pla/nozzle_0.30/pla_nozzle_0.30_layer_0.10.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_n0.30_l0.10 definition = uni_base +name = pla_n0.30_l0.10 +version = 4 [metadata] +material = generic_pla +quality_type = q010 setting_version = 20 type = quality -quality_type = q010 -material = generic_pla variant = 0.30mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/uni_base/pla/nozzle_0.30/pla_nozzle_0.30_layer_0.15.inst.cfg b/resources/quality/uni_base/pla/nozzle_0.30/pla_nozzle_0.30_layer_0.15.inst.cfg index ac4c4ae939..37d8d2b4dc 100644 --- a/resources/quality/uni_base/pla/nozzle_0.30/pla_nozzle_0.30_layer_0.15.inst.cfg +++ b/resources/quality/uni_base/pla/nozzle_0.30/pla_nozzle_0.30_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_n0.30_l0.15 definition = uni_base +name = pla_n0.30_l0.15 +version = 4 [metadata] +material = generic_pla +quality_type = q015 setting_version = 20 type = quality -quality_type = q015 -material = generic_pla variant = 0.30mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/uni_base/pla/nozzle_0.30/pla_nozzle_0.30_layer_0.20.inst.cfg b/resources/quality/uni_base/pla/nozzle_0.30/pla_nozzle_0.30_layer_0.20.inst.cfg index 36bd73cae1..7acb22da28 100644 --- a/resources/quality/uni_base/pla/nozzle_0.30/pla_nozzle_0.30_layer_0.20.inst.cfg +++ b/resources/quality/uni_base/pla/nozzle_0.30/pla_nozzle_0.30_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_n0.30_l0.20 definition = uni_base +name = pla_n0.30_l0.20 +version = 4 [metadata] +material = generic_pla +quality_type = q020 setting_version = 20 type = quality -quality_type = q020 -material = generic_pla variant = 0.30mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/uni_base/pla/nozzle_0.30/pla_nozzle_0.30_layer_0.25.inst.cfg b/resources/quality/uni_base/pla/nozzle_0.30/pla_nozzle_0.30_layer_0.25.inst.cfg index 0e89e7d591..f56c9608c8 100644 --- a/resources/quality/uni_base/pla/nozzle_0.30/pla_nozzle_0.30_layer_0.25.inst.cfg +++ b/resources/quality/uni_base/pla/nozzle_0.30/pla_nozzle_0.30_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_n0.30_l0.25 definition = uni_base +name = pla_n0.30_l0.25 +version = 4 [metadata] +material = generic_pla +quality_type = q025 setting_version = 20 type = quality -quality_type = q025 -material = generic_pla variant = 0.30mm Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.10.inst.cfg b/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.10.inst.cfg index af75eaf2e5..dbc481d3fb 100644 --- a/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.10.inst.cfg +++ b/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.10.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_n0.40_l0.10 definition = uni_base +name = pla_n0.40_l0.10 +version = 4 [metadata] +material = generic_pla +quality_type = q010 setting_version = 20 type = quality -quality_type = q010 -material = generic_pla variant = 0.40mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.15.inst.cfg b/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.15.inst.cfg index 8306845eca..0e81e9990e 100644 --- a/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.15.inst.cfg +++ b/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_n0.40_l0.15 definition = uni_base +name = pla_n0.40_l0.15 +version = 4 [metadata] +material = generic_pla +quality_type = q015 setting_version = 20 type = quality -quality_type = q015 -material = generic_pla variant = 0.40mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.20.inst.cfg b/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.20.inst.cfg index 8974965527..42cd205bee 100644 --- a/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.20.inst.cfg +++ b/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_n0.40_l0.20 definition = uni_base +name = pla_n0.40_l0.20 +version = 4 [metadata] +material = generic_pla +quality_type = q020 setting_version = 20 type = quality -quality_type = q020 -material = generic_pla variant = 0.40mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.25.inst.cfg b/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.25.inst.cfg index 2a952da98e..9b82eb69e8 100644 --- a/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.25.inst.cfg +++ b/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_n0.40_l0.25 definition = uni_base +name = pla_n0.40_l0.25 +version = 4 [metadata] +material = generic_pla +quality_type = q025 setting_version = 20 type = quality -quality_type = q025 -material = generic_pla variant = 0.40mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.30.inst.cfg b/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.30.inst.cfg index 2e6afa9656..4a85fc5619 100644 --- a/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.30.inst.cfg +++ b/resources/quality/uni_base/pla/nozzle_0.40/pla_nozzle_0.40_layer_0.30.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_n0.40_l0.30 definition = uni_base +name = pla_n0.40_l0.30 +version = 4 [metadata] +material = generic_pla +quality_type = q030 setting_version = 20 type = quality -quality_type = q030 -material = generic_pla variant = 0.40mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.15.inst.cfg b/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.15.inst.cfg index ace2b29ff6..acaaa11e7f 100644 --- a/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.15.inst.cfg +++ b/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_n0.50_l0.15 definition = uni_base +name = pla_n0.50_l0.15 +version = 4 [metadata] +material = generic_pla +quality_type = q015 setting_version = 20 type = quality -quality_type = q015 -material = generic_pla variant = 0.50mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.20.inst.cfg b/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.20.inst.cfg index c63ef305af..18f14979c5 100644 --- a/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.20.inst.cfg +++ b/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_n0.50_l0.20 definition = uni_base +name = pla_n0.50_l0.20 +version = 4 [metadata] +material = generic_pla +quality_type = q020 setting_version = 20 type = quality -quality_type = q020 -material = generic_pla variant = 0.50mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.25.inst.cfg b/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.25.inst.cfg index 59a3cdec09..c207405737 100644 --- a/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.25.inst.cfg +++ b/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_n0.50_l0.25 definition = uni_base +name = pla_n0.50_l0.25 +version = 4 [metadata] +material = generic_pla +quality_type = q025 setting_version = 20 type = quality -quality_type = q025 -material = generic_pla variant = 0.50mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.30.inst.cfg b/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.30.inst.cfg index 0590f6aa2b..fe20a7a076 100644 --- a/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.30.inst.cfg +++ b/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.30.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_n0.50_l0.30 definition = uni_base +name = pla_n0.50_l0.30 +version = 4 [metadata] +material = generic_pla +quality_type = q030 setting_version = 20 type = quality -quality_type = q030 -material = generic_pla variant = 0.50mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.35.inst.cfg b/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.35.inst.cfg index 935154eda3..38a50082b7 100644 --- a/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.35.inst.cfg +++ b/resources/quality/uni_base/pla/nozzle_0.50/pla_nozzle_0.50_layer_0.35.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_n0.50_l0.35 definition = uni_base +name = pla_n0.50_l0.35 +version = 4 [metadata] +material = generic_pla +quality_type = q035 setting_version = 20 type = quality -quality_type = q035 -material = generic_pla variant = 0.50mm Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/vertex_delta_k8800/k8800_ABS_Extreme_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_ABS_Extreme_Quality.inst.cfg index c7e8c087af..3da052588e 100644 --- a/resources/quality/vertex_delta_k8800/k8800_ABS_Extreme_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_ABS_Extreme_Quality.inst.cfg @@ -1,21 +1,21 @@ [general] -version = 4 -name = Extreme definition = vertex_delta_k8800 +name = Extreme +version = 4 [metadata] +material = Vertex_Delta_ABS +quality_type = extreme setting_version = 20 type = quality -quality_type = extreme weight = 2 -material = Vertex_Delta_ABS [values] +cool_fan_speed = 0 layer_height_0 = 0.2 - material_final_print_temperature = 250 material_initial_print_temperature = 250 material_print_temperature = 250 -retraction_amount = 3 material_standby_temperature = 225 -cool_fan_speed = 0 +retraction_amount = 3 + diff --git a/resources/quality/vertex_delta_k8800/k8800_ABS_High_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_ABS_High_Quality.inst.cfg index 115caecb08..eb9fd8317e 100644 --- a/resources/quality/vertex_delta_k8800/k8800_ABS_High_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_ABS_High_Quality.inst.cfg @@ -1,21 +1,21 @@ [general] -version = 4 -name = High definition = vertex_delta_k8800 +name = High +version = 4 [metadata] +material = Vertex_Delta_ABS +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -material = Vertex_Delta_ABS [values] +cool_fan_speed = 0 layer_height_0 = 0.2 - material_final_print_temperature = 250 material_initial_print_temperature = 250 material_print_temperature = 250 -retraction_amount = 3 material_standby_temperature = 225 -cool_fan_speed = 0 +retraction_amount = 3 + diff --git a/resources/quality/vertex_delta_k8800/k8800_ABS_Normal_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_ABS_Normal_Quality.inst.cfg index 1418d67e2c..caf1fcf38a 100644 --- a/resources/quality/vertex_delta_k8800/k8800_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_ABS_Normal_Quality.inst.cfg @@ -1,21 +1,21 @@ [general] -version = 4 -name = Normal definition = vertex_delta_k8800 +name = Normal +version = 4 [metadata] +material = Vertex_Delta_ABS +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = Vertex_Delta_ABS [values] +cool_fan_speed = 00 layer_height_0 = 0.2 - material_final_print_temperature = 250 material_initial_print_temperature = 250 material_print_temperature = 250 -retraction_amount = 3 material_standby_temperature = 225 -cool_fan_speed = 00 +retraction_amount = 3 + diff --git a/resources/quality/vertex_delta_k8800/k8800_Global_Extreme_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_Global_Extreme_Quality.inst.cfg index 5c00d00628..ba7d9094ff 100644 --- a/resources/quality/vertex_delta_k8800/k8800_Global_Extreme_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_Global_Extreme_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Extreme definition = vertex_delta_k8800 +name = Extreme +version = 4 [metadata] +global_quality = True +quality_type = extreme setting_version = 20 type = quality -quality_type = extreme weight = 2 -global_quality = True [values] layer_height = 0.05 + diff --git a/resources/quality/vertex_delta_k8800/k8800_Global_High_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_Global_High_Quality.inst.cfg index 49ffcced75..2b22720827 100644 --- a/resources/quality/vertex_delta_k8800/k8800_Global_High_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_Global_High_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = High definition = vertex_delta_k8800 +name = High +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -global_quality = True [values] layer_height = 0.1 + diff --git a/resources/quality/vertex_delta_k8800/k8800_Global_Normal_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_Global_Normal_Quality.inst.cfg index 599a1b57c4..4c4463320c 100644 --- a/resources/quality/vertex_delta_k8800/k8800_Global_Normal_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_Global_Normal_Quality.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Normal definition = vertex_delta_k8800 +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] layer_height = 0.2 + diff --git a/resources/quality/vertex_delta_k8800/k8800_PET_Extreme_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_PET_Extreme_Quality.inst.cfg index b201095b0a..73cb5b6eff 100644 --- a/resources/quality/vertex_delta_k8800/k8800_PET_Extreme_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_PET_Extreme_Quality.inst.cfg @@ -1,21 +1,21 @@ [general] -version = 4 -name = Extreme definition = vertex_delta_k8800 +name = Extreme +version = 4 [metadata] +material = Vertex_Delta_PET +quality_type = extreme setting_version = 20 type = quality -quality_type = extreme weight = 2 -material = Vertex_Delta_PET [values] +cool_fan_speed = 10 layer_height_0 = 0.2 - material_final_print_temperature = 240 material_initial_print_temperature = 240 material_print_temperature = 240 -retraction_amount = 3 material_standby_temperature = 215 -cool_fan_speed = 10 +retraction_amount = 3 + diff --git a/resources/quality/vertex_delta_k8800/k8800_PET_High_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_PET_High_Quality.inst.cfg index 14406b9367..7b6e04a940 100644 --- a/resources/quality/vertex_delta_k8800/k8800_PET_High_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_PET_High_Quality.inst.cfg @@ -1,21 +1,21 @@ [general] -version = 4 -name = High definition = vertex_delta_k8800 +name = High +version = 4 [metadata] +material = Vertex_Delta_PET +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -material = Vertex_Delta_PET [values] +cool_fan_speed = 10 layer_height_0 = 0.2 - material_final_print_temperature = 240 material_initial_print_temperature = 240 material_print_temperature = 240 -retraction_amount = 3 material_standby_temperature = 215 -cool_fan_speed = 10 +retraction_amount = 3 + diff --git a/resources/quality/vertex_delta_k8800/k8800_PET_Normal_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_PET_Normal_Quality.inst.cfg index b4e5dd6f66..fd6d16234c 100644 --- a/resources/quality/vertex_delta_k8800/k8800_PET_Normal_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_PET_Normal_Quality.inst.cfg @@ -1,21 +1,21 @@ [general] -version = 4 -name = Normal definition = vertex_delta_k8800 +name = Normal +version = 4 [metadata] +material = Vertex_Delta_PET +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = Vertex_Delta_PET [values] +cool_fan_speed = 10 layer_height_0 = 0.2 - material_final_print_temperature = 240 material_initial_print_temperature = 240 material_print_temperature = 240 -retraction_amount = 3 material_standby_temperature = 215 -cool_fan_speed = 10 +retraction_amount = 3 + diff --git a/resources/quality/vertex_delta_k8800/k8800_PLA_Extreme_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_PLA_Extreme_Quality.inst.cfg index 5d805dbee2..c6e22810ce 100644 --- a/resources/quality/vertex_delta_k8800/k8800_PLA_Extreme_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_PLA_Extreme_Quality.inst.cfg @@ -1,21 +1,21 @@ [general] -version = 4 -name = Extreme definition = vertex_delta_k8800 +name = Extreme +version = 4 [metadata] +material = Vertex_Delta_PLA +quality_type = extreme setting_version = 20 type = quality -quality_type = extreme weight = 2 -material = Vertex_Delta_PLA [values] +cool_fan_speed = 40 layer_height_0 = 0.2 - material_final_print_temperature = 200 material_initial_print_temperature = 200 material_print_temperature = 200 -retraction_amount = 3 material_standby_temperature = 175 -cool_fan_speed = 40 +retraction_amount = 3 + diff --git a/resources/quality/vertex_delta_k8800/k8800_PLA_High_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_PLA_High_Quality.inst.cfg index 2b82c80f88..5233486030 100644 --- a/resources/quality/vertex_delta_k8800/k8800_PLA_High_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_PLA_High_Quality.inst.cfg @@ -1,21 +1,21 @@ [general] -version = 4 -name = High definition = vertex_delta_k8800 +name = High +version = 4 [metadata] +material = Vertex_Delta_PLA +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -material = Vertex_Delta_PLA [values] +cool_fan_speed = 40 layer_height_0 = 0.2 - material_final_print_temperature = 200 material_initial_print_temperature = 200 material_print_temperature = 200 -retraction_amount = 3 material_standby_temperature = 175 -cool_fan_speed = 40 +retraction_amount = 3 + diff --git a/resources/quality/vertex_delta_k8800/k8800_PLA_Normal_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_PLA_Normal_Quality.inst.cfg index a8f986954b..96dcc5a9e3 100644 --- a/resources/quality/vertex_delta_k8800/k8800_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_PLA_Normal_Quality.inst.cfg @@ -1,21 +1,21 @@ [general] -version = 4 -name = Normal definition = vertex_delta_k8800 +name = Normal +version = 4 [metadata] +material = Vertex_Delta_PLA +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = Vertex_Delta_PLA [values] +cool_fan_speed = 40 layer_height_0 = 0.2 - material_final_print_temperature = 200 material_initial_print_temperature = 200 material_print_temperature = 200 -retraction_amount = 3 material_standby_temperature = 175 -cool_fan_speed = 40 +retraction_amount = 3 + diff --git a/resources/quality/vertex_delta_k8800/k8800_TPU_Extreme_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_TPU_Extreme_Quality.inst.cfg index e3e8cbd4e7..6f283fd479 100644 --- a/resources/quality/vertex_delta_k8800/k8800_TPU_Extreme_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_TPU_Extreme_Quality.inst.cfg @@ -1,21 +1,21 @@ [general] -version = 4 -name = Extreme definition = vertex_delta_k8800 +name = Extreme +version = 4 [metadata] +material = Vertex_Delta_TPU +quality_type = extreme setting_version = 20 type = quality -quality_type = extreme weight = 2 -material = Vertex_Delta_TPU [values] +cool_fan_speed = 20 layer_height_0 = 0.2 - material_final_print_temperature = 220 material_initial_print_temperature = 220 material_print_temperature = 220 -retraction_amount = 3 material_standby_temperature = 195 -cool_fan_speed = 20 +retraction_amount = 3 + diff --git a/resources/quality/vertex_delta_k8800/k8800_TPU_High_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_TPU_High_Quality.inst.cfg index 42dba4b8f6..c02c824414 100644 --- a/resources/quality/vertex_delta_k8800/k8800_TPU_High_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_TPU_High_Quality.inst.cfg @@ -1,21 +1,21 @@ [general] -version = 4 -name = High definition = vertex_delta_k8800 +name = High +version = 4 [metadata] +material = Vertex_Delta_TPU +quality_type = high setting_version = 20 type = quality -quality_type = high weight = 1 -material = Vertex_Delta_TPU [values] +cool_fan_speed = 20 layer_height_0 = 0.2 - material_final_print_temperature = 220 material_initial_print_temperature = 220 material_print_temperature = 220 -retraction_amount = 3 material_standby_temperature = 195 -cool_fan_speed = 20 +retraction_amount = 3 + diff --git a/resources/quality/vertex_delta_k8800/k8800_TPU_Normal_Quality.inst.cfg b/resources/quality/vertex_delta_k8800/k8800_TPU_Normal_Quality.inst.cfg index 67209fbab7..5f61247cbd 100644 --- a/resources/quality/vertex_delta_k8800/k8800_TPU_Normal_Quality.inst.cfg +++ b/resources/quality/vertex_delta_k8800/k8800_TPU_Normal_Quality.inst.cfg @@ -1,21 +1,21 @@ [general] -version = 4 -name = Normal definition = vertex_delta_k8800 +name = Normal +version = 4 [metadata] +material = Vertex_Delta_TPU +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = Vertex_Delta_TPU [values] +cool_fan_speed = 20 layer_height_0 = 0.2 - material_final_print_temperature = 220 material_initial_print_temperature = 220 material_print_temperature = 220 -retraction_amount = 3 material_standby_temperature = 195 -cool_fan_speed = 20 +retraction_amount = 3 + 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 index f99ae5b6b6..315865203b 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_0.2_ABS_super.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.2_ABS_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = vivedino_trex2plus +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super 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 index 98f0cec759..b5536c1cfa 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_0.2_ABS_ultra.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.2_ABS_ultra.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Ultra Quality definition = vivedino_trex2plus +name = Ultra Quality +version = 4 [metadata] +material = generic_abs +quality_type = ultra 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 index 46bd7ff59c..a4b3e90120 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_0.2_PETG_super.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.2_PETG_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = vivedino_trex2plus +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super 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 index c1ca8cdaec..3bae31d3f7 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_0.2_PETG_ultra.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.2_PETG_ultra.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Ultra Quality definition = vivedino_trex2plus +name = Ultra Quality +version = 4 [metadata] +material = generic_petg +quality_type = ultra 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 index cd77d27698..70d0cc4c55 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_0.2_PLA_super.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.2_PLA_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = vivedino_trex2plus +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super 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 index 4ce7e57ab8..4b7e7790ea 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_0.2_PLA_ultra.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.2_PLA_ultra.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Ultra Quality definition = vivedino_trex2plus +name = Ultra Quality +version = 4 [metadata] +material = generic_pla +quality_type = ultra 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 index 96491e5f33..c900f31cd4 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_0.4_ABS_adaptive.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.4_ABS_adaptive.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = vivedino_trex2plus +name = Dynamic Quality +version = 4 [metadata] +material = generic_abs +quality_type = adaptive 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 index 78c7d967bf..efc064b77e 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_0.4_ABS_low.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.4_ABS_low.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = vivedino_trex2plus +name = Low Quality +version = 4 [metadata] +material = generic_abs +quality_type = low 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 index b25bf07d6d..6353796248 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_0.4_ABS_standard.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.4_ABS_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = vivedino_trex2plus +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = standard 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 index 5481bbb7fa..24c67ee5ea 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_0.4_ABS_super.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.4_ABS_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = vivedino_trex2plus +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super 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 index 40461e12bd..dcbc5ec115 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_0.4_PETG_adaptive.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.4_PETG_adaptive.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = vivedino_trex2plus +name = Dynamic Quality +version = 4 [metadata] +material = generic_petg +quality_type = adaptive 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 index 6ab649f390..cc02a8c93a 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_0.4_PETG_low.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.4_PETG_low.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = vivedino_trex2plus +name = Low Quality +version = 4 [metadata] +material = generic_petg +quality_type = low 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 index fc39cfe622..9175d838d5 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_0.4_PETG_standard.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.4_PETG_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = vivedino_trex2plus +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = standard 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 index 777f3bd180..219927db6d 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_0.4_PETG_super.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.4_PETG_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = vivedino_trex2plus +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super 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 index 4a39782cfe..6d00eae2db 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_0.4_PLA_adaptive.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.4_PLA_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = vivedino_trex2plus +name = Dynamic Quality +version = 4 [metadata] +material = generic_pla +quality_type = adaptive 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 index 0c0ee0e14d..736cf6e417 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_0.4_PLA_low.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.4_PLA_low.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low Quality definition = vivedino_trex2plus +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low 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 index 39dd4ce0cc..a8c905271e 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_0.4_PLA_standard.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.4_PLA_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = vivedino_trex2plus +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = standard 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 index 6d3befd8ab..044c5a984c 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_0.4_PLA_super.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.4_PLA_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = vivedino_trex2plus +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super 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 index 6d956519d1..5e80959147 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_0.4_TPU_adaptive.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.4_TPU_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = vivedino_trex2plus +name = Dynamic Quality +version = 4 [metadata] +material = generic_tpu +quality_type = adaptive 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 index 3374e6a002..c1060e3e91 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_0.4_TPU_standard.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.4_TPU_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = vivedino_trex2plus +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = standard 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 index f52548b0eb..67bf283f15 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_0.4_TPU_super.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.4_TPU_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = vivedino_trex2plus +name = Super Quality +version = 4 [metadata] +material = generic_tpu +quality_type = super 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 index c39987c4e6..83046fb42f 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_0.6_ABS_standard.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.6_ABS_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = vivedino_trex2plus +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = standard 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 index b4f13906f6..0027941b86 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_0.6_PETG_standard.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.6_PETG_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = vivedino_trex2plus +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = standard 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 index 4bd83c9467..5bb7791a39 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_0.6_PLA_draft.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.6_PLA_draft.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = vivedino_trex2plus +name = Draft Quality +version = 4 [metadata] +material = generic_pla +quality_type = draft 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 index 35810aec66..420b30098c 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_0.6_PLA_low.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.6_PLA_low.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low Quality definition = vivedino_trex2plus +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low 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 index 9fdce8acb6..30385adddc 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_0.6_PLA_standard.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.6_PLA_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = vivedino_trex2plus +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = standard 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 index 4214a1084c..707fd9862e 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_0.6_TPU_standard.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.6_TPU_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = vivedino_trex2plus +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = standard 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 index a5c6a69ab6..90b75c1aff 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_0.8_ABS_draft.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.8_ABS_draft.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = vivedino_trex2plus +name = Draft Quality +version = 4 [metadata] +material = generic_abs +quality_type = draft 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 index f8acd86c0a..c4e16c0e0e 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_0.8_PETG_draft.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.8_PETG_draft.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = vivedino_trex2plus +name = Draft Quality +version = 4 [metadata] +material = generic_petg +quality_type = draft 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 index d4c0d0d998..f3516ce179 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_0.8_PLA_draft.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.8_PLA_draft.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = vivedino_trex2plus +name = Draft Quality +version = 4 [metadata] +material = generic_pla +quality_type = draft 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 index b17d0c9130..b238b4908a 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_0.8_TPU_draft.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.8_TPU_draft.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = vivedino_trex2plus +name = Draft Quality +version = 4 [metadata] +material = generic_tpu +quality_type = draft 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 index 749bbc7a7d..00beb6454a 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_global_adaptive.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_global_adaptive.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Dynamic Quality definition = vivedino_trex2plus +name = Dynamic Quality +version = 4 [metadata] +global_quality = True +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive weight = -2 -global_quality = True [values] +adaptive_layer_height_enabled = true layer_height = 0.16 layer_height_0 = 0.20 +support_interface_height = =layer_height*6 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 index 6d1beff1ec..f333d78315 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_global_draft.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_global_draft.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Draft Quality definition = vivedino_trex2plus +name = Draft Quality +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -5 -global_quality = True [values] layer_height = 0.32 layer_height_0 = 0.32 +support_interface_height = =layer_height*4 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 index a6610dcad4..a4cb0beff7 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_global_low.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_global_low.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Low Quality definition = vivedino_trex2plus +name = Low Quality +version = 4 [metadata] +global_quality = True +quality_type = low setting_version = 20 type = quality -quality_type = low weight = -4 -global_quality = True [values] layer_height = 0.28 layer_height_0 = 0.28 +support_interface_height = =layer_height*4 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 index e577d3f20a..00affea218 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_global_standard.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_global_standard.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Standard Quality definition = vivedino_trex2plus +name = Standard Quality +version = 4 [metadata] +global_quality = True +quality_type = standard setting_version = 20 type = quality -quality_type = standard weight = -3 -global_quality = True [values] layer_height = 0.2 layer_height_0 = 0.2 +support_interface_height = =layer_height*5 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 index 4355434c6a..4521e4536e 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_global_super.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_global_super.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Super Quality definition = vivedino_trex2plus +name = Super Quality +version = 4 [metadata] +global_quality = True +quality_type = super setting_version = 20 type = quality -quality_type = super weight = -1 -global_quality = True [values] layer_height = 0.12 layer_height_0 = 0.12 +support_interface_height = =layer_height*8 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 index 98cc762a68..24977ea4fb 100644 --- a/resources/quality/vivedino/trex2plus/trex2plus_global_ultra.inst.cfg +++ b/resources/quality/vivedino/trex2plus/trex2plus_global_ultra.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Ultra Quality definition = vivedino_trex2plus +name = Ultra Quality +version = 4 [metadata] +global_quality = True +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra weight = 0 -global_quality = True [values] layer_height = 0.08 layer_height_0 = 0.12 +support_interface_height = =layer_height*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 index c7a0b6b9bb..5d364a9887 100644 --- a/resources/quality/vivedino/trex3/trex3_0.2_ABS_super.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_0.2_ABS_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = vivedino_trex3 +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super 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 index aa52a8ae49..e60973456f 100644 --- a/resources/quality/vivedino/trex3/trex3_0.2_ABS_ultra.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_0.2_ABS_ultra.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Ultra Quality definition = vivedino_trex3 +name = Ultra Quality +version = 4 [metadata] +material = generic_abs +quality_type = ultra 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 index b465c69bf6..66bd70084b 100644 --- a/resources/quality/vivedino/trex3/trex3_0.2_PETG_super.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_0.2_PETG_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = vivedino_trex3 +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super 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 index c7d5a6cc27..0b574e3cf5 100644 --- a/resources/quality/vivedino/trex3/trex3_0.2_PETG_ultra.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_0.2_PETG_ultra.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Ultra Quality definition = vivedino_trex3 +name = Ultra Quality +version = 4 [metadata] +material = generic_petg +quality_type = ultra 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 index 852182aff7..1b54e10425 100644 --- a/resources/quality/vivedino/trex3/trex3_0.2_PLA_super.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_0.2_PLA_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = vivedino_trex3 +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super 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 index 69c24a35b3..1f9a8fb1db 100644 --- a/resources/quality/vivedino/trex3/trex3_0.2_PLA_ultra.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_0.2_PLA_ultra.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Ultra Quality definition = vivedino_trex3 +name = Ultra Quality +version = 4 [metadata] +material = generic_pla +quality_type = ultra 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 index 29cdecbf6e..ec0f6ef1e5 100644 --- a/resources/quality/vivedino/trex3/trex3_0.4_ABS_adaptive.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_0.4_ABS_adaptive.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = vivedino_trex3 +name = Dynamic Quality +version = 4 [metadata] +material = generic_abs +quality_type = adaptive 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 index 7ea9d32ef7..f7904e6239 100644 --- a/resources/quality/vivedino/trex3/trex3_0.4_ABS_low.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_0.4_ABS_low.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = vivedino_trex3 +name = Low Quality +version = 4 [metadata] +material = generic_abs +quality_type = low 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 index efa77a35c4..f4ee8a21a7 100644 --- a/resources/quality/vivedino/trex3/trex3_0.4_ABS_standard.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_0.4_ABS_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = vivedino_trex3 +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = standard 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 index 94fe6aaffe..94383d0c94 100644 --- a/resources/quality/vivedino/trex3/trex3_0.4_ABS_super.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_0.4_ABS_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = vivedino_trex3 +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super 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 index c733acc63a..c6561f5dfe 100644 --- a/resources/quality/vivedino/trex3/trex3_0.4_PETG_adaptive.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_0.4_PETG_adaptive.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = vivedino_trex3 +name = Dynamic Quality +version = 4 [metadata] +material = generic_petg +quality_type = adaptive 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 index 23e2890a9f..b5abcf82ae 100644 --- a/resources/quality/vivedino/trex3/trex3_0.4_PETG_low.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_0.4_PETG_low.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = vivedino_trex3 +name = Low Quality +version = 4 [metadata] +material = generic_petg +quality_type = low 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 index 81bb778563..67ee300fe3 100644 --- a/resources/quality/vivedino/trex3/trex3_0.4_PETG_standard.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_0.4_PETG_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = vivedino_trex3 +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = standard 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 index bc71d9fc30..0ec8642487 100644 --- a/resources/quality/vivedino/trex3/trex3_0.4_PETG_super.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_0.4_PETG_super.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = vivedino_trex3 +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super 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 index 5ffc041592..9ca1f3154f 100644 --- a/resources/quality/vivedino/trex3/trex3_0.4_PLA_adaptive.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_0.4_PLA_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = vivedino_trex3 +name = Dynamic Quality +version = 4 [metadata] +material = generic_pla +quality_type = adaptive 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 index 9dc6038f71..3927a8a350 100644 --- a/resources/quality/vivedino/trex3/trex3_0.4_PLA_low.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_0.4_PLA_low.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low Quality definition = vivedino_trex3 +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low 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 index e943c737ec..42d69abca1 100644 --- a/resources/quality/vivedino/trex3/trex3_0.4_PLA_standard.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_0.4_PLA_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = vivedino_trex3 +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = standard 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 index 9f21138eaa..5bb8c5da10 100644 --- a/resources/quality/vivedino/trex3/trex3_0.4_PLA_super.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_0.4_PLA_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = vivedino_trex3 +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super 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 index 3fcfe4fc0d..15e2ed598e 100644 --- a/resources/quality/vivedino/trex3/trex3_0.4_TPU_adaptive.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_0.4_TPU_adaptive.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = vivedino_trex3 +name = Dynamic Quality +version = 4 [metadata] +material = generic_tpu +quality_type = adaptive 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 index 0d7a47db26..a1a0021655 100644 --- a/resources/quality/vivedino/trex3/trex3_0.4_TPU_standard.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_0.4_TPU_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = vivedino_trex3 +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = standard 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 index 5ac8c78775..41d884851f 100644 --- a/resources/quality/vivedino/trex3/trex3_0.4_TPU_super.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_0.4_TPU_super.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = vivedino_trex3 +name = Super Quality +version = 4 [metadata] +material = generic_tpu +quality_type = super 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 index 255fc6a027..ed9573b738 100644 --- a/resources/quality/vivedino/trex3/trex3_0.6_ABS_standard.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_0.6_ABS_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = vivedino_trex3 +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = standard 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 index 7aa80259c3..23a4e43bf6 100644 --- a/resources/quality/vivedino/trex3/trex3_0.6_PETG_standard.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_0.6_PETG_standard.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = vivedino_trex3 +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = standard 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 index 79243dffc6..de8545d70f 100644 --- a/resources/quality/vivedino/trex3/trex3_0.6_PLA_draft.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_0.6_PLA_draft.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = vivedino_trex3 +name = Draft Quality +version = 4 [metadata] +material = generic_pla +quality_type = draft 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 index a7a6ca0ff4..2994e433ac 100644 --- a/resources/quality/vivedino/trex3/trex3_0.6_PLA_low.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_0.6_PLA_low.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low Quality definition = vivedino_trex3 +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low 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 index 2adc9d9df2..35195bd510 100644 --- a/resources/quality/vivedino/trex3/trex3_0.6_PLA_standard.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_0.6_PLA_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = vivedino_trex3 +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = standard 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 index 3f9d1b4357..b8913a82a2 100644 --- a/resources/quality/vivedino/trex3/trex3_0.6_TPU_standard.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_0.6_TPU_standard.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = vivedino_trex3 +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = standard 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 index aa4f49fded..7ef89617cd 100644 --- a/resources/quality/vivedino/trex3/trex3_0.8_ABS_draft.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_0.8_ABS_draft.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = vivedino_trex3 +name = Draft Quality +version = 4 [metadata] +material = generic_abs +quality_type = draft 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 index 18c0196048..207f50434a 100644 --- a/resources/quality/vivedino/trex3/trex3_0.8_PETG_draft.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_0.8_PETG_draft.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = vivedino_trex3 +name = Draft Quality +version = 4 [metadata] +material = generic_petg +quality_type = draft 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 index 1807b92ec0..4b5e5abed5 100644 --- a/resources/quality/vivedino/trex3/trex3_0.8_PLA_draft.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_0.8_PLA_draft.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = vivedino_trex3 +name = Draft Quality +version = 4 [metadata] +material = generic_pla +quality_type = draft 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 index c61b71e642..3e018ccf9b 100644 --- a/resources/quality/vivedino/trex3/trex3_0.8_TPU_draft.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_0.8_TPU_draft.inst.cfg @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = vivedino_trex3 +name = Draft Quality +version = 4 [metadata] +material = generic_tpu +quality_type = draft 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 index acd544c611..94f092aedc 100644 --- a/resources/quality/vivedino/trex3/trex3_global_adaptive.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_global_adaptive.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Dynamic Quality definition = vivedino_trex3 +name = Dynamic Quality +version = 4 [metadata] +global_quality = True +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive weight = -2 -global_quality = True [values] +adaptive_layer_height_enabled = true layer_height = 0.16 layer_height_0 = 0.20 +support_interface_height = =layer_height*6 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 index fbb8559ca1..b55e82cc69 100644 --- a/resources/quality/vivedino/trex3/trex3_global_draft.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_global_draft.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Draft Quality definition = vivedino_trex3 +name = Draft Quality +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -5 -global_quality = True [values] layer_height = 0.32 layer_height_0 = 0.32 +support_interface_height = =layer_height*4 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 index b0d02b9202..2b1a1fed31 100644 --- a/resources/quality/vivedino/trex3/trex3_global_low.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_global_low.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Low Quality definition = vivedino_trex3 +name = Low Quality +version = 4 [metadata] +global_quality = True +quality_type = low setting_version = 20 type = quality -quality_type = low weight = -4 -global_quality = True [values] layer_height = 0.28 layer_height_0 = 0.28 +support_interface_height = =layer_height*4 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 index eba6690e88..e70feeb374 100644 --- a/resources/quality/vivedino/trex3/trex3_global_standard.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_global_standard.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Standard Quality definition = vivedino_trex3 +name = Standard Quality +version = 4 [metadata] +global_quality = True +quality_type = standard setting_version = 20 type = quality -quality_type = standard weight = -3 -global_quality = True [values] layer_height = 0.2 layer_height_0 = 0.2 +support_interface_height = =layer_height*5 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 index 5e440bfd03..568f6b0114 100644 --- a/resources/quality/vivedino/trex3/trex3_global_super.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_global_super.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Super Quality definition = vivedino_trex3 +name = Super Quality +version = 4 [metadata] +global_quality = True +quality_type = super setting_version = 20 type = quality -quality_type = super weight = -1 -global_quality = True [values] layer_height = 0.12 layer_height_0 = 0.12 +support_interface_height = =layer_height*8 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 index 219d13b6dc..b63035201e 100644 --- a/resources/quality/vivedino/trex3/trex3_global_ultra.inst.cfg +++ b/resources/quality/vivedino/trex3/trex3_global_ultra.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Ultra Quality definition = vivedino_trex3 +name = Ultra Quality +version = 4 [metadata] +global_quality = True +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra weight = 0 -global_quality = True [values] layer_height = 0.08 layer_height_0 = 0.12 +support_interface_height = =layer_height*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/volumic/sh65_coarse.inst.cfg b/resources/quality/volumic/sh65_coarse.inst.cfg index e32a0a9b4d..daee35ca63 100644 --- a/resources/quality/volumic/sh65_coarse.inst.cfg +++ b/resources/quality/volumic/sh65_coarse.inst.cfg @@ -1,26 +1,27 @@ -[general] -version = 4 -name = Low -definition = sh65 - -[metadata] -setting_version = 20 -type = quality -quality_type = coarse -weight = -1 -global_quality = True - -[values] -layer_height = 0.250 -top_bottom_thickness = 1 -wall_thickness = 1.2 -line_width = 0.4 -travel_avoid_distance = 1 -speed_infill = 100 -speed_layer_0 = 40 -speed_print = 100 -speed_topbottom = 80 -speed_travel = 140 -speed_wall = 40 -speed_wall_0 = 40 -speed_wall_x = 60 \ No newline at end of file +[general] +definition = sh65 +name = Low +version = 4 + +[metadata] +global_quality = True +quality_type = coarse +setting_version = 20 +type = quality +weight = -1 + +[values] +layer_height = 0.250 +line_width = 0.4 +speed_infill = 100 +speed_layer_0 = 40 +speed_print = 100 +speed_topbottom = 80 +speed_travel = 140 +speed_wall = 40 +speed_wall_0 = 40 +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/sh65_draft.inst.cfg b/resources/quality/volumic/sh65_draft.inst.cfg index 654a49df67..196910cf17 100644 --- a/resources/quality/volumic/sh65_draft.inst.cfg +++ b/resources/quality/volumic/sh65_draft.inst.cfg @@ -1,26 +1,27 @@ -[general] -version = 4 -name = Standard -definition = sh65 - -[metadata] -setting_version = 20 -type = quality -quality_type = draft -weight = -2 -global_quality = True - -[values] -layer_height = 0.2 -top_bottom_thickness = 1 -wall_thickness = 1.2 -line_width = 0.4 -travel_avoid_distance = 1 -speed_infill = 100 -speed_layer_0 = 40 -speed_print = 100 -speed_topbottom = 80 -speed_travel = 140 -speed_wall = 40 -speed_wall_0 = 40 -speed_wall_x = 60 \ No newline at end of file +[general] +definition = sh65 +name = Standard +version = 4 + +[metadata] +global_quality = True +quality_type = draft +setting_version = 20 +type = quality +weight = -2 + +[values] +layer_height = 0.2 +line_width = 0.4 +speed_infill = 100 +speed_layer_0 = 40 +speed_print = 100 +speed_topbottom = 80 +speed_travel = 140 +speed_wall = 40 +speed_wall_0 = 40 +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/sh65_extra_coarse.inst.cfg b/resources/quality/volumic/sh65_extra_coarse.inst.cfg index 94fa087483..b7d6f22333 100644 --- a/resources/quality/volumic/sh65_extra_coarse.inst.cfg +++ b/resources/quality/volumic/sh65_extra_coarse.inst.cfg @@ -1,26 +1,27 @@ -[general] -version = 4 -name = Very low -definition = sh65 - -[metadata] -setting_version = 20 -type = quality -quality_type = extra coarse -weight = 0 -global_quality = True - -[values] -layer_height = 0.3 -top_bottom_thickness = 1.1 -wall_thickness = 1.2 -line_width = 0.4 -travel_avoid_distance = 1 -speed_infill = 100 -speed_layer_0 = 40 -speed_print = 100 -speed_topbottom = 80 -speed_travel = 140 -speed_wall = 40 -speed_wall_0 = 40 -speed_wall_x = 60 \ No newline at end of file +[general] +definition = sh65 +name = Very low +version = 4 + +[metadata] +global_quality = True +quality_type = extra coarse +setting_version = 20 +type = quality +weight = 0 + +[values] +layer_height = 0.3 +line_width = 0.4 +speed_infill = 100 +speed_layer_0 = 40 +speed_print = 100 +speed_topbottom = 80 +speed_travel = 140 +speed_wall = 40 +speed_wall_0 = 40 +speed_wall_x = 60 +top_bottom_thickness = 1.1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/sh65_fast.inst.cfg b/resources/quality/volumic/sh65_fast.inst.cfg index dc096fe89e..e39236b647 100644 --- a/resources/quality/volumic/sh65_fast.inst.cfg +++ b/resources/quality/volumic/sh65_fast.inst.cfg @@ -1,26 +1,27 @@ -[general] -version = 4 -name = Medium -definition = sh65 - -[metadata] -setting_version = 20 -type = quality -quality_type = fast -weight = -3 -global_quality = True - -[values] -layer_height = 0.15 -top_bottom_thickness = 1.05 -wall_thickness = 1.2 -line_width = 0.4 -travel_avoid_distance = 1 -speed_infill = 100 -speed_layer_0 = 40 -speed_print = 100 -speed_topbottom = 80 -speed_travel = 140 -speed_wall = 40 -speed_wall_0 = 40 -speed_wall_x = 60 \ No newline at end of file +[general] +definition = sh65 +name = Medium +version = 4 + +[metadata] +global_quality = True +quality_type = fast +setting_version = 20 +type = quality +weight = -3 + +[values] +layer_height = 0.15 +line_width = 0.4 +speed_infill = 100 +speed_layer_0 = 40 +speed_print = 100 +speed_topbottom = 80 +speed_travel = 140 +speed_wall = 40 +speed_wall_0 = 40 +speed_wall_x = 60 +top_bottom_thickness = 1.05 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/sh65_high.inst.cfg b/resources/quality/volumic/sh65_high.inst.cfg index 89ba3c4ba8..f63b278b5e 100644 --- a/resources/quality/volumic/sh65_high.inst.cfg +++ b/resources/quality/volumic/sh65_high.inst.cfg @@ -1,26 +1,27 @@ -[general] -version = 4 -name = Very high -definition = sh65 - -[metadata] -setting_version = 20 -type = quality -quality_type = high -weight = -5 -global_quality = True - -[values] -layer_height = 0.05 -top_bottom_thickness = 1 -wall_thickness = 1.2 -line_width = 0.4 -travel_avoid_distance = 1 -speed_infill = 100 -speed_layer_0 = 40 -speed_print = 100 -speed_topbottom = 80 -speed_travel = 140 -speed_wall = 40 -speed_wall_0 = 40 -speed_wall_x = 60 \ No newline at end of file +[general] +definition = sh65 +name = Very high +version = 4 + +[metadata] +global_quality = True +quality_type = high +setting_version = 20 +type = quality +weight = -5 + +[values] +layer_height = 0.05 +line_width = 0.4 +speed_infill = 100 +speed_layer_0 = 40 +speed_print = 100 +speed_topbottom = 80 +speed_travel = 140 +speed_wall = 40 +speed_wall_0 = 40 +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/sh65_normal.inst.cfg b/resources/quality/volumic/sh65_normal.inst.cfg index 3b6e81a86f..a0d987a73d 100644 --- a/resources/quality/volumic/sh65_normal.inst.cfg +++ b/resources/quality/volumic/sh65_normal.inst.cfg @@ -1,26 +1,27 @@ -[general] -version = 4 -name = High -definition = sh65 - -[metadata] -setting_version = 20 -type = quality -quality_type = normal -weight = -4 -global_quality = True - -[values] -layer_height = 0.1 -top_bottom_thickness = 1 -wall_thickness = 1.2 -line_width = 0.4 -travel_avoid_distance = 1 -speed_infill = 100 -speed_layer_0 = 40 -speed_print = 100 -speed_topbottom = 80 -speed_travel = 140 -speed_wall = 40 -speed_wall_0 = 40 -speed_wall_x = 60 \ No newline at end of file +[general] +definition = sh65 +name = High +version = 4 + +[metadata] +global_quality = True +quality_type = normal +setting_version = 20 +type = quality +weight = -4 + +[values] +layer_height = 0.1 +line_width = 0.4 +speed_infill = 100 +speed_layer_0 = 40 +speed_print = 100 +speed_topbottom = 80 +speed_travel = 140 +speed_wall = 40 +speed_wall_0 = 40 +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream20dual_mk2_coarse.inst.cfg b/resources/quality/volumic/stream20dual_mk2_coarse.inst.cfg index 228bee32fb..b400c85a4d 100644 --- a/resources/quality/volumic/stream20dual_mk2_coarse.inst.cfg +++ b/resources/quality/volumic/stream20dual_mk2_coarse.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = Low definition = stream20dual_mk2 +name = Low +version = 4 [metadata] +global_quality = True +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = -1 -global_quality = True [values] layer_height = 0.250 -top_bottom_thickness = 1 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 60 speed_layer_0 = 30 speed_print = 60 @@ -23,4 +20,8 @@ speed_topbottom = 48 speed_travel = 100 speed_wall = 30 speed_wall_0 = 30 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream20dual_mk2_draft.inst.cfg b/resources/quality/volumic/stream20dual_mk2_draft.inst.cfg index 0135e0b598..601dd67b59 100644 --- a/resources/quality/volumic/stream20dual_mk2_draft.inst.cfg +++ b/resources/quality/volumic/stream20dual_mk2_draft.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = Standard definition = stream20dual_mk2 +name = Standard +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] layer_height = 0.2 -top_bottom_thickness = 1 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 60 speed_layer_0 = 30 speed_print = 60 @@ -23,4 +20,8 @@ speed_topbottom = 48 speed_travel = 100 speed_wall = 30 speed_wall_0 = 30 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream20dual_mk2_extra_coarse.inst.cfg b/resources/quality/volumic/stream20dual_mk2_extra_coarse.inst.cfg index 4197fe7755..800c877741 100644 --- a/resources/quality/volumic/stream20dual_mk2_extra_coarse.inst.cfg +++ b/resources/quality/volumic/stream20dual_mk2_extra_coarse.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = Very low definition = stream20dual_mk2 +name = Very low +version = 4 [metadata] +global_quality = True +quality_type = extra coarse setting_version = 20 type = quality -quality_type = extra coarse weight = 0 -global_quality = True [values] layer_height = 0.275 -top_bottom_thickness = 1.1 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 60 speed_layer_0 = 30 speed_print = 60 @@ -23,4 +20,8 @@ speed_topbottom = 48 speed_travel = 100 speed_wall = 30 speed_wall_0 = 30 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1.1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream20dual_mk2_fast.inst.cfg b/resources/quality/volumic/stream20dual_mk2_fast.inst.cfg index 89fe7a6bc5..a56c6698ca 100644 --- a/resources/quality/volumic/stream20dual_mk2_fast.inst.cfg +++ b/resources/quality/volumic/stream20dual_mk2_fast.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = Medium definition = stream20dual_mk2 +name = Medium +version = 4 [metadata] +global_quality = True +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -3 -global_quality = True [values] layer_height = 0.15 -top_bottom_thickness = 1.05 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 60 speed_layer_0 = 30 speed_print = 60 @@ -23,4 +20,8 @@ speed_topbottom = 48 speed_travel = 100 speed_wall = 30 speed_wall_0 = 30 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1.05 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream20dual_mk2_high.inst.cfg b/resources/quality/volumic/stream20dual_mk2_high.inst.cfg index 66274d9186..18bcddc577 100644 --- a/resources/quality/volumic/stream20dual_mk2_high.inst.cfg +++ b/resources/quality/volumic/stream20dual_mk2_high.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = Very high definition = stream20dual_mk2 +name = Very high +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = -5 -global_quality = True [values] layer_height = 0.05 -top_bottom_thickness = 1 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 60 speed_layer_0 = 30 speed_print = 60 @@ -23,4 +20,8 @@ speed_topbottom = 48 speed_travel = 100 speed_wall = 30 speed_wall_0 = 30 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream20dual_mk2_normal.inst.cfg b/resources/quality/volumic/stream20dual_mk2_normal.inst.cfg index 2cd0119d83..fa8a7230f0 100644 --- a/resources/quality/volumic/stream20dual_mk2_normal.inst.cfg +++ b/resources/quality/volumic/stream20dual_mk2_normal.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = High definition = stream20dual_mk2 +name = High +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = -4 -global_quality = True [values] layer_height = 0.1 -top_bottom_thickness = 1 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 60 speed_layer_0 = 30 speed_print = 60 @@ -23,4 +20,8 @@ speed_topbottom = 48 speed_travel = 100 speed_wall = 30 speed_wall_0 = 30 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream20pro_mk2_coarse.inst.cfg b/resources/quality/volumic/stream20pro_mk2_coarse.inst.cfg index 5546342dee..aa7c10953b 100644 --- a/resources/quality/volumic/stream20pro_mk2_coarse.inst.cfg +++ b/resources/quality/volumic/stream20pro_mk2_coarse.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = Low definition = stream20pro_mk2 +name = Low +version = 4 [metadata] +global_quality = True +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = -1 -global_quality = True [values] layer_height = 0.250 -top_bottom_thickness = 1 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 60 speed_layer_0 = 30 speed_print = 60 @@ -23,4 +20,8 @@ speed_topbottom = 48 speed_travel = 100 speed_wall = 30 speed_wall_0 = 30 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream20pro_mk2_draft.inst.cfg b/resources/quality/volumic/stream20pro_mk2_draft.inst.cfg index 388db2627c..f522eb1179 100644 --- a/resources/quality/volumic/stream20pro_mk2_draft.inst.cfg +++ b/resources/quality/volumic/stream20pro_mk2_draft.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = Standard definition = stream20pro_mk2 +name = Standard +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] layer_height = 0.2 -top_bottom_thickness = 1 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 60 speed_layer_0 = 30 speed_print = 60 @@ -23,4 +20,8 @@ speed_topbottom = 48 speed_travel = 100 speed_wall = 30 speed_wall_0 = 30 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream20pro_mk2_extra_coarse.inst.cfg b/resources/quality/volumic/stream20pro_mk2_extra_coarse.inst.cfg index 5f2e89c2e5..a8085b95c1 100644 --- a/resources/quality/volumic/stream20pro_mk2_extra_coarse.inst.cfg +++ b/resources/quality/volumic/stream20pro_mk2_extra_coarse.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = Very low definition = stream20pro_mk2 +name = Very low +version = 4 [metadata] +global_quality = True +quality_type = extra coarse setting_version = 20 type = quality -quality_type = extra coarse weight = 0 -global_quality = True [values] layer_height = 0.275 -top_bottom_thickness = 1.1 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 60 speed_layer_0 = 30 speed_print = 60 @@ -23,4 +20,8 @@ speed_topbottom = 48 speed_travel = 100 speed_wall = 30 speed_wall_0 = 30 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1.1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream20pro_mk2_fast.inst.cfg b/resources/quality/volumic/stream20pro_mk2_fast.inst.cfg index b9fcf8d32c..ba26004ff7 100644 --- a/resources/quality/volumic/stream20pro_mk2_fast.inst.cfg +++ b/resources/quality/volumic/stream20pro_mk2_fast.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = Medium definition = stream20pro_mk2 +name = Medium +version = 4 [metadata] +global_quality = True +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -3 -global_quality = True [values] layer_height = 0.15 -top_bottom_thickness = 1.05 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 60 speed_layer_0 = 30 speed_print = 60 @@ -23,4 +20,8 @@ speed_topbottom = 48 speed_travel = 100 speed_wall = 30 speed_wall_0 = 30 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1.05 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream20pro_mk2_high.inst.cfg b/resources/quality/volumic/stream20pro_mk2_high.inst.cfg index 84612ad732..ba0200d422 100644 --- a/resources/quality/volumic/stream20pro_mk2_high.inst.cfg +++ b/resources/quality/volumic/stream20pro_mk2_high.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = Very high definition = stream20pro_mk2 +name = Very high +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = -5 -global_quality = True [values] layer_height = 0.05 -top_bottom_thickness = 1 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 60 speed_layer_0 = 30 speed_print = 60 @@ -23,4 +20,8 @@ speed_topbottom = 48 speed_travel = 100 speed_wall = 30 speed_wall_0 = 30 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream20pro_mk2_normal.inst.cfg b/resources/quality/volumic/stream20pro_mk2_normal.inst.cfg index 167cef382a..d3aec7ba5d 100644 --- a/resources/quality/volumic/stream20pro_mk2_normal.inst.cfg +++ b/resources/quality/volumic/stream20pro_mk2_normal.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = High definition = stream20pro_mk2 +name = High +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = -4 -global_quality = True [values] layer_height = 0.1 -top_bottom_thickness = 1 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 60 speed_layer_0 = 30 speed_print = 60 @@ -23,4 +20,8 @@ speed_topbottom = 48 speed_travel = 100 speed_wall = 30 speed_wall_0 = 30 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30dual_mk2_coarse.inst.cfg b/resources/quality/volumic/stream30dual_mk2_coarse.inst.cfg index 48fac53987..650ea47ceb 100644 --- a/resources/quality/volumic/stream30dual_mk2_coarse.inst.cfg +++ b/resources/quality/volumic/stream30dual_mk2_coarse.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = Low definition = stream30dual_mk2 +name = Low +version = 4 [metadata] +global_quality = True +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = -1 -global_quality = True [values] layer_height = 0.250 -top_bottom_thickness = 1 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 60 speed_layer_0 = 30 speed_print = 60 @@ -23,4 +20,8 @@ speed_topbottom = 48 speed_travel = 100 speed_wall = 30 speed_wall_0 = 30 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30dual_mk2_draft.inst.cfg b/resources/quality/volumic/stream30dual_mk2_draft.inst.cfg index 2fbe861a9f..4d35e6f132 100644 --- a/resources/quality/volumic/stream30dual_mk2_draft.inst.cfg +++ b/resources/quality/volumic/stream30dual_mk2_draft.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = Standard definition = stream30dual_mk2 +name = Standard +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] layer_height = 0.2 -top_bottom_thickness = 1 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 60 speed_layer_0 = 30 speed_print = 60 @@ -23,4 +20,8 @@ speed_topbottom = 48 speed_travel = 100 speed_wall = 30 speed_wall_0 = 30 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30dual_mk2_extra_coarse.inst.cfg b/resources/quality/volumic/stream30dual_mk2_extra_coarse.inst.cfg index 8cd0ba36ff..f91b87df13 100644 --- a/resources/quality/volumic/stream30dual_mk2_extra_coarse.inst.cfg +++ b/resources/quality/volumic/stream30dual_mk2_extra_coarse.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = Very low definition = stream30dual_mk2 +name = Very low +version = 4 [metadata] +global_quality = True +quality_type = extra coarse setting_version = 20 type = quality -quality_type = extra coarse weight = 0 -global_quality = True [values] layer_height = 0.275 -top_bottom_thickness = 1.1 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 60 speed_layer_0 = 30 speed_print = 60 @@ -23,4 +20,8 @@ speed_topbottom = 48 speed_travel = 100 speed_wall = 30 speed_wall_0 = 30 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1.1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30dual_mk2_fast.inst.cfg b/resources/quality/volumic/stream30dual_mk2_fast.inst.cfg index 7e046f8809..5a93fd5781 100644 --- a/resources/quality/volumic/stream30dual_mk2_fast.inst.cfg +++ b/resources/quality/volumic/stream30dual_mk2_fast.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = Medium definition = stream30dual_mk2 +name = Medium +version = 4 [metadata] +global_quality = True +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -3 -global_quality = True [values] layer_height = 0.15 -top_bottom_thickness = 1.05 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 60 speed_layer_0 = 30 speed_print = 60 @@ -23,4 +20,8 @@ speed_topbottom = 48 speed_travel = 100 speed_wall = 30 speed_wall_0 = 30 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1.05 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30dual_mk2_high.inst.cfg b/resources/quality/volumic/stream30dual_mk2_high.inst.cfg index b473a0fff9..e673a62901 100644 --- a/resources/quality/volumic/stream30dual_mk2_high.inst.cfg +++ b/resources/quality/volumic/stream30dual_mk2_high.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = Very high definition = stream30dual_mk2 +name = Very high +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = -5 -global_quality = True [values] layer_height = 0.05 -top_bottom_thickness = 1 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 60 speed_layer_0 = 30 speed_print = 60 @@ -23,4 +20,8 @@ speed_topbottom = 48 speed_travel = 100 speed_wall = 30 speed_wall_0 = 30 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30dual_mk2_normal.inst.cfg b/resources/quality/volumic/stream30dual_mk2_normal.inst.cfg index d86b2a8cff..2e05603d45 100644 --- a/resources/quality/volumic/stream30dual_mk2_normal.inst.cfg +++ b/resources/quality/volumic/stream30dual_mk2_normal.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = High definition = stream30dual_mk2 +name = High +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = -4 -global_quality = True [values] layer_height = 0.1 -top_bottom_thickness = 1 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 60 speed_layer_0 = 30 speed_print = 60 @@ -23,4 +20,8 @@ speed_topbottom = 48 speed_travel = 100 speed_wall = 30 speed_wall_0 = 30 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30mk3_coarse.inst.cfg b/resources/quality/volumic/stream30mk3_coarse.inst.cfg index 4efbac012d..458efc0b18 100644 --- a/resources/quality/volumic/stream30mk3_coarse.inst.cfg +++ b/resources/quality/volumic/stream30mk3_coarse.inst.cfg @@ -1,26 +1,27 @@ -[general] -version = 4 -name = Low -definition = stream30mk3 - -[metadata] -setting_version = 20 -type = quality -quality_type = coarse -weight = -1 -global_quality = True - -[values] -layer_height = 0.250 -top_bottom_thickness = 1 -wall_thickness = 1.2 -line_width = 0.4 -travel_avoid_distance = 1 -speed_infill = 100 -speed_layer_0 = 40 -speed_print = 100 -speed_topbottom = 80 -speed_travel = 140 -speed_wall = 40 -speed_wall_0 = 40 -speed_wall_x = 60 \ No newline at end of file +[general] +definition = stream30mk3 +name = Low +version = 4 + +[metadata] +global_quality = True +quality_type = coarse +setting_version = 20 +type = quality +weight = -1 + +[values] +layer_height = 0.250 +line_width = 0.4 +speed_infill = 100 +speed_layer_0 = 40 +speed_print = 100 +speed_topbottom = 80 +speed_travel = 140 +speed_wall = 40 +speed_wall_0 = 40 +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30mk3_draft.inst.cfg b/resources/quality/volumic/stream30mk3_draft.inst.cfg index 467a650ea5..034121cefd 100644 --- a/resources/quality/volumic/stream30mk3_draft.inst.cfg +++ b/resources/quality/volumic/stream30mk3_draft.inst.cfg @@ -1,26 +1,27 @@ -[general] -version = 4 -name = Standard -definition = stream30mk3 - -[metadata] -setting_version = 20 -type = quality -quality_type = draft -weight = -2 -global_quality = True - -[values] -layer_height = 0.2 -top_bottom_thickness = 1 -wall_thickness = 1.2 -line_width = 0.4 -travel_avoid_distance = 1 -speed_infill = 100 -speed_layer_0 = 40 -speed_print = 100 -speed_topbottom = 80 -speed_travel = 140 -speed_wall = 40 -speed_wall_0 = 40 -speed_wall_x = 60 \ No newline at end of file +[general] +definition = stream30mk3 +name = Standard +version = 4 + +[metadata] +global_quality = True +quality_type = draft +setting_version = 20 +type = quality +weight = -2 + +[values] +layer_height = 0.2 +line_width = 0.4 +speed_infill = 100 +speed_layer_0 = 40 +speed_print = 100 +speed_topbottom = 80 +speed_travel = 140 +speed_wall = 40 +speed_wall_0 = 40 +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30mk3_extra_coarse.inst.cfg b/resources/quality/volumic/stream30mk3_extra_coarse.inst.cfg index 5136ffc965..8581364c9f 100644 --- a/resources/quality/volumic/stream30mk3_extra_coarse.inst.cfg +++ b/resources/quality/volumic/stream30mk3_extra_coarse.inst.cfg @@ -1,26 +1,27 @@ -[general] -version = 4 -name = Very low -definition = stream30mk3 - -[metadata] -setting_version = 20 -type = quality -quality_type = extra coarse -weight = 0 -global_quality = True - -[values] -layer_height = 0.3 -top_bottom_thickness = 1.1 -wall_thickness = 1.2 -line_width = 0.4 -travel_avoid_distance = 1 -speed_infill = 100 -speed_layer_0 = 40 -speed_print = 100 -speed_topbottom = 80 -speed_travel = 140 -speed_wall = 40 -speed_wall_0 = 40 -speed_wall_x = 60 \ No newline at end of file +[general] +definition = stream30mk3 +name = Very low +version = 4 + +[metadata] +global_quality = True +quality_type = extra coarse +setting_version = 20 +type = quality +weight = 0 + +[values] +layer_height = 0.3 +line_width = 0.4 +speed_infill = 100 +speed_layer_0 = 40 +speed_print = 100 +speed_topbottom = 80 +speed_travel = 140 +speed_wall = 40 +speed_wall_0 = 40 +speed_wall_x = 60 +top_bottom_thickness = 1.1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30mk3_fast.inst.cfg b/resources/quality/volumic/stream30mk3_fast.inst.cfg index 80f523e686..840b1bedb9 100644 --- a/resources/quality/volumic/stream30mk3_fast.inst.cfg +++ b/resources/quality/volumic/stream30mk3_fast.inst.cfg @@ -1,26 +1,27 @@ -[general] -version = 4 -name = Medium -definition = stream30mk3 - -[metadata] -setting_version = 20 -type = quality -quality_type = fast -weight = -3 -global_quality = True - -[values] -layer_height = 0.15 -top_bottom_thickness = 1.05 -wall_thickness = 1.2 -line_width = 0.4 -travel_avoid_distance = 1 -speed_infill = 100 -speed_layer_0 = 40 -speed_print = 100 -speed_topbottom = 80 -speed_travel = 140 -speed_wall = 40 -speed_wall_0 = 40 -speed_wall_x = 60 \ No newline at end of file +[general] +definition = stream30mk3 +name = Medium +version = 4 + +[metadata] +global_quality = True +quality_type = fast +setting_version = 20 +type = quality +weight = -3 + +[values] +layer_height = 0.15 +line_width = 0.4 +speed_infill = 100 +speed_layer_0 = 40 +speed_print = 100 +speed_topbottom = 80 +speed_travel = 140 +speed_wall = 40 +speed_wall_0 = 40 +speed_wall_x = 60 +top_bottom_thickness = 1.05 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30mk3_high.inst.cfg b/resources/quality/volumic/stream30mk3_high.inst.cfg index 7632275dea..c0d0f3b877 100644 --- a/resources/quality/volumic/stream30mk3_high.inst.cfg +++ b/resources/quality/volumic/stream30mk3_high.inst.cfg @@ -1,26 +1,27 @@ -[general] -version = 4 -name = Very high -definition = stream30mk3 - -[metadata] -setting_version = 20 -type = quality -quality_type = high -weight = -5 -global_quality = True - -[values] -layer_height = 0.05 -top_bottom_thickness = 1 -wall_thickness = 1.2 -line_width = 0.4 -travel_avoid_distance = 1 -speed_infill = 100 -speed_layer_0 = 40 -speed_print = 100 -speed_topbottom = 80 -speed_travel = 140 -speed_wall = 40 -speed_wall_0 = 40 -speed_wall_x = 60 \ No newline at end of file +[general] +definition = stream30mk3 +name = Very high +version = 4 + +[metadata] +global_quality = True +quality_type = high +setting_version = 20 +type = quality +weight = -5 + +[values] +layer_height = 0.05 +line_width = 0.4 +speed_infill = 100 +speed_layer_0 = 40 +speed_print = 100 +speed_topbottom = 80 +speed_travel = 140 +speed_wall = 40 +speed_wall_0 = 40 +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30mk3_normal.inst.cfg b/resources/quality/volumic/stream30mk3_normal.inst.cfg index 9465951bb1..641af0159e 100644 --- a/resources/quality/volumic/stream30mk3_normal.inst.cfg +++ b/resources/quality/volumic/stream30mk3_normal.inst.cfg @@ -1,26 +1,27 @@ -[general] -version = 4 -name = High -definition = stream30mk3 - -[metadata] -setting_version = 20 -type = quality -quality_type = normal -weight = -4 -global_quality = True - -[values] -layer_height = 0.1 -top_bottom_thickness = 1 -wall_thickness = 1.2 -line_width = 0.4 -travel_avoid_distance = 1 -speed_infill = 100 -speed_layer_0 = 40 -speed_print = 100 -speed_topbottom = 80 -speed_travel = 140 -speed_wall = 40 -speed_wall_0 = 40 -speed_wall_x = 60 \ No newline at end of file +[general] +definition = stream30mk3 +name = High +version = 4 + +[metadata] +global_quality = True +quality_type = normal +setting_version = 20 +type = quality +weight = -4 + +[values] +layer_height = 0.1 +line_width = 0.4 +speed_infill = 100 +speed_layer_0 = 40 +speed_print = 100 +speed_topbottom = 80 +speed_travel = 140 +speed_wall = 40 +speed_wall_0 = 40 +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30pro_mk2_coarse.inst.cfg b/resources/quality/volumic/stream30pro_mk2_coarse.inst.cfg index faae4a013a..aea3d7b37a 100644 --- a/resources/quality/volumic/stream30pro_mk2_coarse.inst.cfg +++ b/resources/quality/volumic/stream30pro_mk2_coarse.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = Low definition = stream30pro_mk2 +name = Low +version = 4 [metadata] +global_quality = True +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = -1 -global_quality = True [values] layer_height = 0.250 -top_bottom_thickness = 1 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 60 speed_layer_0 = 30 speed_print = 60 @@ -23,4 +20,8 @@ speed_topbottom = 48 speed_travel = 100 speed_wall = 30 speed_wall_0 = 30 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30pro_mk2_draft.inst.cfg b/resources/quality/volumic/stream30pro_mk2_draft.inst.cfg index 04b7df91b0..3d1156bcf1 100644 --- a/resources/quality/volumic/stream30pro_mk2_draft.inst.cfg +++ b/resources/quality/volumic/stream30pro_mk2_draft.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = Standard definition = stream30pro_mk2 +name = Standard +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] layer_height = 0.2 -top_bottom_thickness = 1 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 60 speed_layer_0 = 30 speed_print = 60 @@ -23,4 +20,8 @@ speed_topbottom = 48 speed_travel = 100 speed_wall = 30 speed_wall_0 = 30 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30pro_mk2_extra_coarse.inst.cfg b/resources/quality/volumic/stream30pro_mk2_extra_coarse.inst.cfg index d7ec009191..cb433d9173 100644 --- a/resources/quality/volumic/stream30pro_mk2_extra_coarse.inst.cfg +++ b/resources/quality/volumic/stream30pro_mk2_extra_coarse.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = Very low definition = stream30pro_mk2 +name = Very low +version = 4 [metadata] +global_quality = True +quality_type = extra coarse setting_version = 20 type = quality -quality_type = extra coarse weight = 0 -global_quality = True [values] layer_height = 0.275 -top_bottom_thickness = 1.1 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 60 speed_layer_0 = 30 speed_print = 60 @@ -23,4 +20,8 @@ speed_topbottom = 48 speed_travel = 100 speed_wall = 30 speed_wall_0 = 30 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1.1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30pro_mk2_fast.inst.cfg b/resources/quality/volumic/stream30pro_mk2_fast.inst.cfg index b86ef52c26..93d1f6383b 100644 --- a/resources/quality/volumic/stream30pro_mk2_fast.inst.cfg +++ b/resources/quality/volumic/stream30pro_mk2_fast.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = Medium definition = stream30pro_mk2 +name = Medium +version = 4 [metadata] +global_quality = True +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -3 -global_quality = True [values] layer_height = 0.15 -top_bottom_thickness = 1.05 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 60 speed_layer_0 = 30 speed_print = 60 @@ -23,4 +20,8 @@ speed_topbottom = 48 speed_travel = 100 speed_wall = 30 speed_wall_0 = 30 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1.05 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30pro_mk2_high.inst.cfg b/resources/quality/volumic/stream30pro_mk2_high.inst.cfg index 319337d2d8..116492b3af 100644 --- a/resources/quality/volumic/stream30pro_mk2_high.inst.cfg +++ b/resources/quality/volumic/stream30pro_mk2_high.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = Very high definition = stream30pro_mk2 +name = Very high +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = -5 -global_quality = True [values] layer_height = 0.05 -top_bottom_thickness = 1 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 60 speed_layer_0 = 30 speed_print = 60 @@ -23,4 +20,8 @@ speed_topbottom = 48 speed_travel = 100 speed_wall = 30 speed_wall_0 = 30 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30pro_mk2_normal.inst.cfg b/resources/quality/volumic/stream30pro_mk2_normal.inst.cfg index a622b94858..f7d94cd7d8 100644 --- a/resources/quality/volumic/stream30pro_mk2_normal.inst.cfg +++ b/resources/quality/volumic/stream30pro_mk2_normal.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = High definition = stream30pro_mk2 +name = High +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = -4 -global_quality = True [values] layer_height = 0.1 -top_bottom_thickness = 1 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 60 speed_layer_0 = 30 speed_print = 60 @@ -23,4 +20,8 @@ speed_topbottom = 48 speed_travel = 100 speed_wall = 30 speed_wall_0 = 30 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30ultra_coarse.inst.cfg b/resources/quality/volumic/stream30ultra_coarse.inst.cfg index 027a51b970..9682766d81 100644 --- a/resources/quality/volumic/stream30ultra_coarse.inst.cfg +++ b/resources/quality/volumic/stream30ultra_coarse.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = Low definition = stream30ultra +name = Low +version = 4 [metadata] +global_quality = True +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = -1 -global_quality = True [values] layer_height = 0.250 -top_bottom_thickness = 1 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 100 speed_layer_0 = 40 speed_print = 100 @@ -23,4 +20,8 @@ speed_topbottom = 80 speed_travel = 140 speed_wall = 40 speed_wall_0 = 40 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30ultra_draft.inst.cfg b/resources/quality/volumic/stream30ultra_draft.inst.cfg index e9542cf8c3..d15c09574a 100644 --- a/resources/quality/volumic/stream30ultra_draft.inst.cfg +++ b/resources/quality/volumic/stream30ultra_draft.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = Standard definition = stream30ultra +name = Standard +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] layer_height = 0.2 -top_bottom_thickness = 1 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 100 speed_layer_0 = 40 speed_print = 100 @@ -23,4 +20,8 @@ speed_topbottom = 80 speed_travel = 140 speed_wall = 40 speed_wall_0 = 40 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30ultra_extra_coarse.inst.cfg b/resources/quality/volumic/stream30ultra_extra_coarse.inst.cfg index 58e4574ad9..c852ef908e 100644 --- a/resources/quality/volumic/stream30ultra_extra_coarse.inst.cfg +++ b/resources/quality/volumic/stream30ultra_extra_coarse.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = Very low definition = stream30ultra +name = Very low +version = 4 [metadata] +global_quality = True +quality_type = extra coarse setting_version = 20 type = quality -quality_type = extra coarse weight = 0 -global_quality = True [values] layer_height = 0.3 -top_bottom_thickness = 1.1 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 100 speed_layer_0 = 40 speed_print = 100 @@ -23,4 +20,8 @@ speed_topbottom = 80 speed_travel = 140 speed_wall = 40 speed_wall_0 = 40 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1.1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30ultra_fast.inst.cfg b/resources/quality/volumic/stream30ultra_fast.inst.cfg index 8d65a81c9c..e0db7271b1 100644 --- a/resources/quality/volumic/stream30ultra_fast.inst.cfg +++ b/resources/quality/volumic/stream30ultra_fast.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = Medium definition = stream30ultra +name = Medium +version = 4 [metadata] +global_quality = True +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -3 -global_quality = True [values] layer_height = 0.15 -top_bottom_thickness = 1.05 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 100 speed_layer_0 = 40 speed_print = 100 @@ -23,4 +20,8 @@ speed_topbottom = 80 speed_travel = 140 speed_wall = 40 speed_wall_0 = 40 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1.05 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30ultra_high.inst.cfg b/resources/quality/volumic/stream30ultra_high.inst.cfg index 330b7aba80..a2af86337e 100644 --- a/resources/quality/volumic/stream30ultra_high.inst.cfg +++ b/resources/quality/volumic/stream30ultra_high.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = Very high definition = stream30ultra +name = Very high +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = -5 -global_quality = True [values] layer_height = 0.05 -top_bottom_thickness = 1 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 100 speed_layer_0 = 40 speed_print = 100 @@ -23,4 +20,8 @@ speed_topbottom = 80 speed_travel = 140 speed_wall = 40 speed_wall_0 = 40 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30ultra_normal.inst.cfg b/resources/quality/volumic/stream30ultra_normal.inst.cfg index 41d66a8db8..ae59882ded 100644 --- a/resources/quality/volumic/stream30ultra_normal.inst.cfg +++ b/resources/quality/volumic/stream30ultra_normal.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = High definition = stream30ultra +name = High +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = -4 -global_quality = True [values] layer_height = 0.1 -top_bottom_thickness = 1 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 100 speed_layer_0 = 40 speed_print = 100 @@ -23,4 +20,8 @@ speed_topbottom = 80 speed_travel = 140 speed_wall = 40 speed_wall_0 = 40 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30ultrasc2_coarse.inst.cfg b/resources/quality/volumic/stream30ultrasc2_coarse.inst.cfg index f6586f2197..300a30b4b1 100644 --- a/resources/quality/volumic/stream30ultrasc2_coarse.inst.cfg +++ b/resources/quality/volumic/stream30ultrasc2_coarse.inst.cfg @@ -1,26 +1,27 @@ -[general] -version = 4 -name = Low -definition = stream30ultrasc2 - -[metadata] -setting_version = 20 -type = quality -quality_type = coarse -weight = -1 -global_quality = True - -[values] -layer_height = 0.250 -top_bottom_thickness = 1 -wall_thickness = 1.2 -line_width = 0.4 -travel_avoid_distance = 1 -speed_infill = 100 -speed_layer_0 = 40 -speed_print = 100 -speed_topbottom = 80 -speed_travel = 140 -speed_wall = 40 -speed_wall_0 = 40 -speed_wall_x = 60 \ No newline at end of file +[general] +definition = stream30ultrasc2 +name = Low +version = 4 + +[metadata] +global_quality = True +quality_type = coarse +setting_version = 20 +type = quality +weight = -1 + +[values] +layer_height = 0.250 +line_width = 0.4 +speed_infill = 100 +speed_layer_0 = 40 +speed_print = 100 +speed_topbottom = 80 +speed_travel = 140 +speed_wall = 40 +speed_wall_0 = 40 +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30ultrasc2_draft.inst.cfg b/resources/quality/volumic/stream30ultrasc2_draft.inst.cfg index ea9e86cf26..2c3fbc1054 100644 --- a/resources/quality/volumic/stream30ultrasc2_draft.inst.cfg +++ b/resources/quality/volumic/stream30ultrasc2_draft.inst.cfg @@ -1,26 +1,27 @@ -[general] -version = 4 -name = Standard -definition = stream30ultrasc2 - -[metadata] -setting_version = 20 -type = quality -quality_type = draft -weight = -2 -global_quality = True - -[values] -layer_height = 0.2 -top_bottom_thickness = 1 -wall_thickness = 1.2 -line_width = 0.4 -travel_avoid_distance = 1 -speed_infill = 100 -speed_layer_0 = 40 -speed_print = 100 -speed_topbottom = 80 -speed_travel = 140 -speed_wall = 40 -speed_wall_0 = 40 -speed_wall_x = 60 \ No newline at end of file +[general] +definition = stream30ultrasc2 +name = Standard +version = 4 + +[metadata] +global_quality = True +quality_type = draft +setting_version = 20 +type = quality +weight = -2 + +[values] +layer_height = 0.2 +line_width = 0.4 +speed_infill = 100 +speed_layer_0 = 40 +speed_print = 100 +speed_topbottom = 80 +speed_travel = 140 +speed_wall = 40 +speed_wall_0 = 40 +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30ultrasc2_extra_coarse.inst.cfg b/resources/quality/volumic/stream30ultrasc2_extra_coarse.inst.cfg index 37d9d5fed6..fd71bef368 100644 --- a/resources/quality/volumic/stream30ultrasc2_extra_coarse.inst.cfg +++ b/resources/quality/volumic/stream30ultrasc2_extra_coarse.inst.cfg @@ -1,26 +1,27 @@ -[general] -version = 4 -name = Very low -definition = stream30ultrasc2 - -[metadata] -setting_version = 20 -type = quality -quality_type = extra coarse -weight = 0 -global_quality = True - -[values] -layer_height = 0.3 -top_bottom_thickness = 1.1 -wall_thickness = 1.2 -line_width = 0.4 -travel_avoid_distance = 1 -speed_infill = 100 -speed_layer_0 = 40 -speed_print = 100 -speed_topbottom = 80 -speed_travel = 140 -speed_wall = 40 -speed_wall_0 = 40 -speed_wall_x = 60 \ No newline at end of file +[general] +definition = stream30ultrasc2 +name = Very low +version = 4 + +[metadata] +global_quality = True +quality_type = extra coarse +setting_version = 20 +type = quality +weight = 0 + +[values] +layer_height = 0.3 +line_width = 0.4 +speed_infill = 100 +speed_layer_0 = 40 +speed_print = 100 +speed_topbottom = 80 +speed_travel = 140 +speed_wall = 40 +speed_wall_0 = 40 +speed_wall_x = 60 +top_bottom_thickness = 1.1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30ultrasc2_fast.inst.cfg b/resources/quality/volumic/stream30ultrasc2_fast.inst.cfg index 24529efb8b..c71d9ad690 100644 --- a/resources/quality/volumic/stream30ultrasc2_fast.inst.cfg +++ b/resources/quality/volumic/stream30ultrasc2_fast.inst.cfg @@ -1,26 +1,27 @@ -[general] -version = 4 -name = Medium -definition = stream30ultrasc2 - -[metadata] -setting_version = 20 -type = quality -quality_type = fast -weight = -3 -global_quality = True - -[values] -layer_height = 0.15 -top_bottom_thickness = 1.05 -wall_thickness = 1.2 -line_width = 0.4 -travel_avoid_distance = 1 -speed_infill = 100 -speed_layer_0 = 40 -speed_print = 100 -speed_topbottom = 80 -speed_travel = 140 -speed_wall = 40 -speed_wall_0 = 40 -speed_wall_x = 60 \ No newline at end of file +[general] +definition = stream30ultrasc2 +name = Medium +version = 4 + +[metadata] +global_quality = True +quality_type = fast +setting_version = 20 +type = quality +weight = -3 + +[values] +layer_height = 0.15 +line_width = 0.4 +speed_infill = 100 +speed_layer_0 = 40 +speed_print = 100 +speed_topbottom = 80 +speed_travel = 140 +speed_wall = 40 +speed_wall_0 = 40 +speed_wall_x = 60 +top_bottom_thickness = 1.05 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30ultrasc2_high.inst.cfg b/resources/quality/volumic/stream30ultrasc2_high.inst.cfg index 3898524647..e683e8fd5d 100644 --- a/resources/quality/volumic/stream30ultrasc2_high.inst.cfg +++ b/resources/quality/volumic/stream30ultrasc2_high.inst.cfg @@ -1,26 +1,27 @@ -[general] -version = 4 -name = Very high -definition = stream30ultrasc2 - -[metadata] -setting_version = 20 -type = quality -quality_type = high -weight = -5 -global_quality = True - -[values] -layer_height = 0.05 -top_bottom_thickness = 1 -wall_thickness = 1.2 -line_width = 0.4 -travel_avoid_distance = 1 -speed_infill = 100 -speed_layer_0 = 40 -speed_print = 100 -speed_topbottom = 80 -speed_travel = 140 -speed_wall = 40 -speed_wall_0 = 40 -speed_wall_x = 60 \ No newline at end of file +[general] +definition = stream30ultrasc2 +name = Very high +version = 4 + +[metadata] +global_quality = True +quality_type = high +setting_version = 20 +type = quality +weight = -5 + +[values] +layer_height = 0.05 +line_width = 0.4 +speed_infill = 100 +speed_layer_0 = 40 +speed_print = 100 +speed_topbottom = 80 +speed_travel = 140 +speed_wall = 40 +speed_wall_0 = 40 +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30ultrasc2_normal.inst.cfg b/resources/quality/volumic/stream30ultrasc2_normal.inst.cfg index d680bf8e0f..f49517eb85 100644 --- a/resources/quality/volumic/stream30ultrasc2_normal.inst.cfg +++ b/resources/quality/volumic/stream30ultrasc2_normal.inst.cfg @@ -1,26 +1,27 @@ -[general] -version = 4 -name = High -definition = stream30ultrasc2 - -[metadata] -setting_version = 20 -type = quality -quality_type = normal -weight = -4 -global_quality = True - -[values] -layer_height = 0.1 -top_bottom_thickness = 1 -wall_thickness = 1.2 -line_width = 0.4 -travel_avoid_distance = 1 -speed_infill = 100 -speed_layer_0 = 40 -speed_print = 100 -speed_topbottom = 80 -speed_travel = 140 -speed_wall = 40 -speed_wall_0 = 40 -speed_wall_x = 60 \ No newline at end of file +[general] +definition = stream30ultrasc2 +name = High +version = 4 + +[metadata] +global_quality = True +quality_type = normal +setting_version = 20 +type = quality +weight = -4 + +[values] +layer_height = 0.1 +line_width = 0.4 +speed_infill = 100 +speed_layer_0 = 40 +speed_print = 100 +speed_topbottom = 80 +speed_travel = 140 +speed_wall = 40 +speed_wall_0 = 40 +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30ultrasc_coarse.inst.cfg b/resources/quality/volumic/stream30ultrasc_coarse.inst.cfg index 0ff20a2879..750bf9e4d4 100644 --- a/resources/quality/volumic/stream30ultrasc_coarse.inst.cfg +++ b/resources/quality/volumic/stream30ultrasc_coarse.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = Low definition = stream30ultrasc +name = Low +version = 4 [metadata] +global_quality = True +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = -1 -global_quality = True [values] layer_height = 0.250 -top_bottom_thickness = 1 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 100 speed_layer_0 = 40 speed_print = 100 @@ -23,4 +20,8 @@ speed_topbottom = 80 speed_travel = 140 speed_wall = 40 speed_wall_0 = 40 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30ultrasc_draft.inst.cfg b/resources/quality/volumic/stream30ultrasc_draft.inst.cfg index 4ffa18507d..5c3315e508 100644 --- a/resources/quality/volumic/stream30ultrasc_draft.inst.cfg +++ b/resources/quality/volumic/stream30ultrasc_draft.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = Standard definition = stream30ultrasc +name = Standard +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] layer_height = 0.2 -top_bottom_thickness = 1 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 100 speed_layer_0 = 40 speed_print = 100 @@ -23,4 +20,8 @@ speed_topbottom = 80 speed_travel = 140 speed_wall = 40 speed_wall_0 = 40 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30ultrasc_extra_coarse.inst.cfg b/resources/quality/volumic/stream30ultrasc_extra_coarse.inst.cfg index 467dfef316..f1474fd667 100644 --- a/resources/quality/volumic/stream30ultrasc_extra_coarse.inst.cfg +++ b/resources/quality/volumic/stream30ultrasc_extra_coarse.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = Very low definition = stream30ultrasc +name = Very low +version = 4 [metadata] +global_quality = True +quality_type = extra coarse setting_version = 20 type = quality -quality_type = extra coarse weight = 0 -global_quality = True [values] layer_height = 0.3 -top_bottom_thickness = 1.1 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 100 speed_layer_0 = 40 speed_print = 100 @@ -23,4 +20,8 @@ speed_topbottom = 80 speed_travel = 140 speed_wall = 40 speed_wall_0 = 40 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1.1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30ultrasc_fast.inst.cfg b/resources/quality/volumic/stream30ultrasc_fast.inst.cfg index d56c5f841c..5f9c257176 100644 --- a/resources/quality/volumic/stream30ultrasc_fast.inst.cfg +++ b/resources/quality/volumic/stream30ultrasc_fast.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = Medium definition = stream30ultrasc +name = Medium +version = 4 [metadata] +global_quality = True +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = -3 -global_quality = True [values] layer_height = 0.15 -top_bottom_thickness = 1.05 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 100 speed_layer_0 = 40 speed_print = 100 @@ -23,4 +20,8 @@ speed_topbottom = 80 speed_travel = 140 speed_wall = 40 speed_wall_0 = 40 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1.05 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30ultrasc_high.inst.cfg b/resources/quality/volumic/stream30ultrasc_high.inst.cfg index 031f32fbdd..06bd31ed20 100644 --- a/resources/quality/volumic/stream30ultrasc_high.inst.cfg +++ b/resources/quality/volumic/stream30ultrasc_high.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = Very high definition = stream30ultrasc +name = Very high +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = -5 -global_quality = True [values] layer_height = 0.05 -top_bottom_thickness = 1 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 100 speed_layer_0 = 40 speed_print = 100 @@ -23,4 +20,8 @@ speed_topbottom = 80 speed_travel = 140 speed_wall = 40 speed_wall_0 = 40 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/volumic/stream30ultrasc_normal.inst.cfg b/resources/quality/volumic/stream30ultrasc_normal.inst.cfg index 15f9cfdb7a..8d57435bab 100644 --- a/resources/quality/volumic/stream30ultrasc_normal.inst.cfg +++ b/resources/quality/volumic/stream30ultrasc_normal.inst.cfg @@ -1,21 +1,18 @@ [general] -version = 4 -name = High definition = stream30ultrasc +name = High +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = -4 -global_quality = True [values] layer_height = 0.1 -top_bottom_thickness = 1 -wall_thickness = 1.2 line_width = 0.4 -travel_avoid_distance = 1 speed_infill = 100 speed_layer_0 = 40 speed_print = 100 @@ -23,4 +20,8 @@ speed_topbottom = 80 speed_travel = 140 speed_wall = 40 speed_wall_0 = 40 -speed_wall_x = 60 \ No newline at end of file +speed_wall_x = 60 +top_bottom_thickness = 1 +travel_avoid_distance = 1 +wall_thickness = 1.2 + diff --git a/resources/quality/voron2/voron2_global_extrafast_quality.inst.cfg b/resources/quality/voron2/voron2_global_extrafast_quality.inst.cfg index fa8fa697cc..c8a1edc91a 100644 --- a/resources/quality/voron2/voron2_global_extrafast_quality.inst.cfg +++ b/resources/quality/voron2/voron2_global_extrafast_quality.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +global_quality = True +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -global_quality = True [values] layer_height = 0.3 diff --git a/resources/quality/voron2/voron2_global_extrafine_quality.inst.cfg b/resources/quality/voron2/voron2_global_extrafine_quality.inst.cfg index ff2a3a49cc..9be8efe6a1 100644 --- a/resources/quality/voron2/voron2_global_extrafine_quality.inst.cfg +++ b/resources/quality/voron2/voron2_global_extrafine_quality.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fine definition = voron2_base +name = Extra Fine +version = 4 [metadata] +global_quality = True +quality_type = extrafine setting_version = 20 type = quality -quality_type = extrafine -global_quality = True [values] layer_height = 0.06 diff --git a/resources/quality/voron2/voron2_global_fast_quality.inst.cfg b/resources/quality/voron2/voron2_global_fast_quality.inst.cfg index f873a2a2fa..0edd0b0223 100644 --- a/resources/quality/voron2/voron2_global_fast_quality.inst.cfg +++ b/resources/quality/voron2/voron2_global_fast_quality.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +global_quality = True +quality_type = fast setting_version = 20 type = quality -quality_type = fast -global_quality = True [values] layer_height = 0.2 diff --git a/resources/quality/voron2/voron2_global_fine_quality.inst.cfg b/resources/quality/voron2/voron2_global_fine_quality.inst.cfg index f261822a1d..1b4d2b044d 100644 --- a/resources/quality/voron2/voron2_global_fine_quality.inst.cfg +++ b/resources/quality/voron2/voron2_global_fine_quality.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fine definition = voron2_base +name = Fine +version = 4 [metadata] +global_quality = True +quality_type = fine setting_version = 20 type = quality -quality_type = fine -global_quality = True [values] layer_height = 0.1 diff --git a/resources/quality/voron2/voron2_global_normal_quality.inst.cfg b/resources/quality/voron2/voron2_global_normal_quality.inst.cfg index 1441fc6129..526b5687a7 100644 --- a/resources/quality/voron2/voron2_global_normal_quality.inst.cfg +++ b/resources/quality/voron2/voron2_global_normal_quality.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Normal definition = voron2_base +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal -global_quality = True [values] layer_height = 0.15 diff --git a/resources/quality/voron2/voron2_global_sprint_quality.inst.cfg b/resources/quality/voron2/voron2_global_sprint_quality.inst.cfg index 2f1ebd08b6..c7b72adc60 100644 --- a/resources/quality/voron2/voron2_global_sprint_quality.inst.cfg +++ b/resources/quality/voron2/voron2_global_sprint_quality.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +global_quality = True +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -global_quality = True [values] layer_height = 0.4 diff --git a/resources/quality/voron2/voron2_global_supersprint_quality.inst.cfg b/resources/quality/voron2/voron2_global_supersprint_quality.inst.cfg index 6238363e2a..0ea6da6785 100644 --- a/resources/quality/voron2/voron2_global_supersprint_quality.inst.cfg +++ b/resources/quality/voron2/voron2_global_supersprint_quality.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Super Sprint definition = voron2_base +name = Super Sprint +version = 4 [metadata] +global_quality = True +quality_type = supersprint setting_version = 20 type = quality -quality_type = supersprint -global_quality = True [values] layer_height = 0.5 diff --git a/resources/quality/voron2/voron2_global_ultrasprint_quality.inst.cfg b/resources/quality/voron2/voron2_global_ultrasprint_quality.inst.cfg index 72dd547a25..a1d4970701 100644 --- a/resources/quality/voron2/voron2_global_ultrasprint_quality.inst.cfg +++ b/resources/quality/voron2/voron2_global_ultrasprint_quality.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Ultra Sprint definition = voron2_base +name = Ultra Sprint +version = 4 [metadata] +global_quality = True +quality_type = ultrasprint setting_version = 20 type = quality -quality_type = ultrasprint -global_quality = True [values] layer_height = 0.6 diff --git a/resources/quality/voron2/voron2_v6_0.25_ABS_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ABS_extrafine.inst.cfg index 54bc61204a..4dcb00f15a 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ABS_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ABS_extrafine.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = voron2_base +name = Extra Fine +version = 4 [metadata] +material = generic_abs +quality_type = extrafine setting_version = 20 type = quality -quality_type = extrafine -material = generic_abs variant = V6 0.25mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.25_ABS_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ABS_fast.inst.cfg index 2ba5358b52..eb88ba6e54 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ABS_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ABS_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_abs +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_abs variant = V6 0.25mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.25_ABS_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ABS_fine.inst.cfg index 377a8e172e..5a359db818 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ABS_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ABS_fine.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fine definition = voron2_base +name = Fine +version = 4 [metadata] +material = generic_abs +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_abs variant = V6 0.25mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.25_ABS_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_ABS_normal.inst.cfg index da2e6bcbb9..13296b6d5f 100644 --- a/resources/quality/voron2/voron2_v6_0.25_ABS_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_ABS_normal.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Normal definition = voron2_base +name = Normal +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_abs variant = V6 0.25mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.25_Nylon_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_Nylon_extrafine.inst.cfg index add63fe194..3e9e46e6b5 100644 --- a/resources/quality/voron2/voron2_v6_0.25_Nylon_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_Nylon_extrafine.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = voron2_base +name = Extra Fine +version = 4 [metadata] +material = generic_nylon +quality_type = extrafine setting_version = 20 type = quality -quality_type = extrafine -material = generic_nylon variant = V6 0.25mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.25_Nylon_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_Nylon_fast.inst.cfg index 8450279109..2ea643c485 100644 --- a/resources/quality/voron2/voron2_v6_0.25_Nylon_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_Nylon_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_nylon +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_nylon variant = V6 0.25mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.25_Nylon_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_Nylon_fine.inst.cfg index 718926500b..d3c4d6affd 100644 --- a/resources/quality/voron2/voron2_v6_0.25_Nylon_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_Nylon_fine.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fine definition = voron2_base +name = Fine +version = 4 [metadata] +material = generic_nylon +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_nylon variant = V6 0.25mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.25_Nylon_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_Nylon_normal.inst.cfg index 93563b3cc5..bc7ee1ad8d 100644 --- a/resources/quality/voron2/voron2_v6_0.25_Nylon_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_Nylon_normal.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Normal definition = voron2_base +name = Normal +version = 4 [metadata] +material = generic_nylon +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_nylon variant = V6 0.25mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.25_PC_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PC_extrafine.inst.cfg index e88bd12d86..3019b11bcf 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PC_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PC_extrafine.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = voron2_base +name = Extra Fine +version = 4 [metadata] +material = generic_pc +quality_type = extrafine setting_version = 20 type = quality -quality_type = extrafine -material = generic_pc variant = V6 0.25mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.25_PC_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PC_fast.inst.cfg index 61e7f3414d..7664c450c8 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PC_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PC_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_pc +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_pc variant = V6 0.25mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.25_PC_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PC_fine.inst.cfg index f552755692..8b6a95d847 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PC_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PC_fine.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fine definition = voron2_base +name = Fine +version = 4 [metadata] +material = generic_pc +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_pc variant = V6 0.25mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.25_PC_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PC_normal.inst.cfg index fcdd2c70e5..6617055340 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PC_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PC_normal.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Normal definition = voron2_base +name = Normal +version = 4 [metadata] +material = generic_pc +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_pc variant = V6 0.25mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.25_PETG_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PETG_extrafine.inst.cfg index 4da4cf9bc3..85b120ceb4 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PETG_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PETG_extrafine.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = voron2_base +name = Extra Fine +version = 4 [metadata] +material = generic_petg +quality_type = extrafine setting_version = 20 type = quality -quality_type = extrafine -material = generic_petg variant = V6 0.25mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.25_PETG_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PETG_fast.inst.cfg index 62473d6348..e7e974ec93 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PETG_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PETG_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_petg +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_petg variant = V6 0.25mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.25_PETG_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PETG_fine.inst.cfg index 2587c9dd2d..acc0d99519 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PETG_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PETG_fine.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fine definition = voron2_base +name = Fine +version = 4 [metadata] +material = generic_petg +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_petg variant = V6 0.25mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.25_PETG_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PETG_normal.inst.cfg index 297d04a3b0..9b883d99e3 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PETG_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PETG_normal.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Normal definition = voron2_base +name = Normal +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_petg variant = V6 0.25mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.25_PLA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PLA_extrafine.inst.cfg index fbb8fd2268..6d13dde3a8 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PLA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PLA_extrafine.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = voron2_base +name = Extra Fine +version = 4 [metadata] +material = generic_pla +quality_type = extrafine setting_version = 20 type = quality -quality_type = extrafine -material = generic_pla variant = V6 0.25mm [values] speed_print = 300 + diff --git a/resources/quality/voron2/voron2_v6_0.25_PLA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PLA_fast.inst.cfg index 404f3682e0..72d3a4b944 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PLA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PLA_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_pla variant = V6 0.25mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.25_PLA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PLA_fine.inst.cfg index 1ef5ff5651..44dadad95d 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PLA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PLA_fine.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fine definition = voron2_base +name = Fine +version = 4 [metadata] +material = generic_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_pla variant = V6 0.25mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.25_PLA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.25_PLA_normal.inst.cfg index 47972a417c..d795dced4b 100644 --- a/resources/quality/voron2/voron2_v6_0.25_PLA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.25_PLA_normal.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Normal definition = voron2_base +name = Normal +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_pla variant = V6 0.25mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.30_ABS_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ABS_extrafine.inst.cfg index 1997fc9f6c..d69afd3080 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ABS_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ABS_extrafine.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fine definition = voron2_base +name = Extra Fine +version = 4 [metadata] +material = generic_abs +quality_type = extrafine setting_version = 20 type = quality -quality_type = extrafine -material = generic_abs variant = V6 0.30mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.30_ABS_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ABS_fast.inst.cfg index 10abf9d278..aaa71acc15 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ABS_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ABS_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_abs +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_abs variant = V6 0.30mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.30_ABS_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ABS_fine.inst.cfg index 1d0beca9c5..e19ea17bf7 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ABS_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ABS_fine.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fine definition = voron2_base +name = Fine +version = 4 [metadata] +material = generic_abs +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_abs variant = V6 0.30mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.30_ABS_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_ABS_normal.inst.cfg index f0158ac0bf..4adfc2dc44 100644 --- a/resources/quality/voron2/voron2_v6_0.30_ABS_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_ABS_normal.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Normal definition = voron2_base +name = Normal +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_abs variant = V6 0.30mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.30_Nylon_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_Nylon_extrafine.inst.cfg index 43dd7d7ae0..3bc9948c30 100644 --- a/resources/quality/voron2/voron2_v6_0.30_Nylon_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_Nylon_extrafine.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fine definition = voron2_base +name = Extra Fine +version = 4 [metadata] +material = generic_nylon +quality_type = extrafine setting_version = 20 type = quality -quality_type = extrafine -material = generic_nylon variant = V6 0.30mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.30_Nylon_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_Nylon_fast.inst.cfg index b92d1e1813..6f0524848c 100644 --- a/resources/quality/voron2/voron2_v6_0.30_Nylon_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_Nylon_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_nylon +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_nylon variant = V6 0.30mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.30_Nylon_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_Nylon_fine.inst.cfg index b794161566..4ea474bc86 100644 --- a/resources/quality/voron2/voron2_v6_0.30_Nylon_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_Nylon_fine.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fine definition = voron2_base +name = Fine +version = 4 [metadata] +material = generic_nylon +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_nylon variant = V6 0.30mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.30_Nylon_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_Nylon_normal.inst.cfg index 0d8c896d63..4e66290ec4 100644 --- a/resources/quality/voron2/voron2_v6_0.30_Nylon_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_Nylon_normal.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Normal definition = voron2_base +name = Normal +version = 4 [metadata] +material = generic_nylon +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_nylon variant = V6 0.30mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.30_PC_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PC_extrafine.inst.cfg index 1e111b3583..afa057bc22 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PC_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PC_extrafine.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fine definition = voron2_base +name = Extra Fine +version = 4 [metadata] +material = generic_pc +quality_type = extrafine setting_version = 20 type = quality -quality_type = extrafine -material = generic_pc variant = V6 0.30mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.30_PC_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PC_fast.inst.cfg index f3460cddd5..2c9e6213b6 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PC_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PC_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_pc +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_pc variant = V6 0.30mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.30_PC_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PC_fine.inst.cfg index 38caee8b40..ca998ab95d 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PC_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PC_fine.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fine definition = voron2_base +name = Fine +version = 4 [metadata] +material = generic_pc +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_pc variant = V6 0.30mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.30_PC_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PC_normal.inst.cfg index bd39c08fc4..f014f948ca 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PC_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PC_normal.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Normal definition = voron2_base +name = Normal +version = 4 [metadata] +material = generic_pc +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_pc variant = V6 0.30mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.30_PETG_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PETG_extrafine.inst.cfg index 87499d87c0..f241add584 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PETG_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PETG_extrafine.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fine definition = voron2_base +name = Extra Fine +version = 4 [metadata] +material = generic_petg +quality_type = extrafine setting_version = 20 type = quality -quality_type = extrafine -material = generic_petg variant = V6 0.30mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.30_PETG_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PETG_fast.inst.cfg index ff5ef6051c..b8ab81d7bf 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PETG_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PETG_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_petg +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_petg variant = V6 0.30mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.30_PETG_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PETG_fine.inst.cfg index ca572e1f0e..8cd133b196 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PETG_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PETG_fine.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fine definition = voron2_base +name = Fine +version = 4 [metadata] +material = generic_petg +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_petg variant = V6 0.30mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.30_PETG_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PETG_normal.inst.cfg index d17a5e2753..71863305b1 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PETG_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PETG_normal.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Normal definition = voron2_base +name = Normal +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_petg variant = V6 0.30mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.30_PLA_extrafine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PLA_extrafine.inst.cfg index 75f3c95e87..0e9bd58634 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PLA_extrafine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PLA_extrafine.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fine definition = voron2_base +name = Extra Fine +version = 4 [metadata] +material = generic_pla +quality_type = extrafine setting_version = 20 type = quality -quality_type = extrafine -material = generic_pla variant = V6 0.30mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.30_PLA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PLA_fast.inst.cfg index 3e54c4bf1d..0b96357428 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PLA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PLA_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_pla variant = V6 0.30mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.30_PLA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PLA_fine.inst.cfg index d01f87561b..87331b8555 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PLA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PLA_fine.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fine definition = voron2_base +name = Fine +version = 4 [metadata] +material = generic_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_pla variant = V6 0.30mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.30_PLA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.30_PLA_normal.inst.cfg index 438ab19e75..eecb3efc6a 100644 --- a/resources/quality/voron2/voron2_v6_0.30_PLA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.30_PLA_normal.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Normal definition = voron2_base +name = Normal +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_pla variant = V6 0.30mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.35_ABS_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ABS_fast.inst.cfg index f83acb0af0..4c8272d993 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ABS_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ABS_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_abs +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_abs variant = V6 0.35mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.35_ABS_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ABS_fine.inst.cfg index b943b0fbe9..32f1686c39 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ABS_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ABS_fine.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fine definition = voron2_base +name = Fine +version = 4 [metadata] +material = generic_abs +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_abs variant = V6 0.35mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.35_ABS_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_ABS_normal.inst.cfg index dd6cb8ba65..8b611f35c5 100644 --- a/resources/quality/voron2/voron2_v6_0.35_ABS_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_ABS_normal.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Normal definition = voron2_base +name = Normal +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_abs variant = V6 0.35mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.35_Nylon_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_Nylon_fast.inst.cfg index 1345d29c66..95cde85204 100644 --- a/resources/quality/voron2/voron2_v6_0.35_Nylon_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_Nylon_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_nylon +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_nylon variant = V6 0.35mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.35_Nylon_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_Nylon_fine.inst.cfg index 141c25a2a0..54cf9727cd 100644 --- a/resources/quality/voron2/voron2_v6_0.35_Nylon_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_Nylon_fine.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fine definition = voron2_base +name = Fine +version = 4 [metadata] +material = generic_nylon +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_nylon variant = V6 0.35mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.35_Nylon_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_Nylon_normal.inst.cfg index 8039fc0c64..2987f3822a 100644 --- a/resources/quality/voron2/voron2_v6_0.35_Nylon_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_Nylon_normal.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Normal definition = voron2_base +name = Normal +version = 4 [metadata] +material = generic_nylon +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_nylon variant = V6 0.35mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.35_PC_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PC_fast.inst.cfg index 7d160463df..c84482a855 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PC_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PC_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_pc +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_pc variant = V6 0.35mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.35_PC_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PC_fine.inst.cfg index b23a053d23..8890c024be 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PC_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PC_fine.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fine definition = voron2_base +name = Fine +version = 4 [metadata] +material = generic_pc +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_pc variant = V6 0.35mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.35_PC_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PC_normal.inst.cfg index 368df77d69..76b77b38e7 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PC_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PC_normal.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Normal definition = voron2_base +name = Normal +version = 4 [metadata] +material = generic_pc +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_pc variant = V6 0.35mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.35_PETG_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PETG_fast.inst.cfg index fe038df871..8b523f40f4 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PETG_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PETG_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_petg +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_petg variant = V6 0.35mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.35_PETG_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PETG_fine.inst.cfg index ad01b6349c..584eb5a509 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PETG_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PETG_fine.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fine definition = voron2_base +name = Fine +version = 4 [metadata] +material = generic_petg +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_petg variant = V6 0.35mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.35_PETG_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PETG_normal.inst.cfg index 728a8c283a..1d212fafad 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PETG_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PETG_normal.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Normal definition = voron2_base +name = Normal +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_petg variant = V6 0.35mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.35_PLA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PLA_fast.inst.cfg index 79aa3ea2d0..f91dd8052a 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PLA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PLA_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_pla variant = V6 0.35mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.35_PLA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PLA_fine.inst.cfg index 4b32102019..686b8506cc 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PLA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PLA_fine.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fine definition = voron2_base +name = Fine +version = 4 [metadata] +material = generic_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_pla variant = V6 0.35mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.35_PLA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.35_PLA_normal.inst.cfg index b7cdd86be3..808b690c01 100644 --- a/resources/quality/voron2/voron2_v6_0.35_PLA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.35_PLA_normal.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Normal definition = voron2_base +name = Normal +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_pla variant = V6 0.35mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.40_ABS_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ABS_extrafast.inst.cfg index 45cea30d4b..69ef4baa28 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ABS_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ABS_extrafast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +material = generic_abs +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_abs variant = V6 0.40mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.40_ABS_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ABS_fast.inst.cfg index f8c9c2aee0..41c8565a8b 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ABS_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ABS_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_abs +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_abs variant = V6 0.40mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.40_ABS_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ABS_fine.inst.cfg index b4751632b4..a27b5043ba 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ABS_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ABS_fine.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fine definition = voron2_base +name = Fine +version = 4 [metadata] +material = generic_abs +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_abs variant = V6 0.40mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.40_ABS_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_ABS_normal.inst.cfg index 5672bb90bd..f95aafb8a5 100644 --- a/resources/quality/voron2/voron2_v6_0.40_ABS_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_ABS_normal.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Normal definition = voron2_base +name = Normal +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_abs variant = V6 0.40mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.40_Nylon_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_Nylon_extrafast.inst.cfg index 3febbe8bbc..b3c1c26f8f 100644 --- a/resources/quality/voron2/voron2_v6_0.40_Nylon_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_Nylon_extrafast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +material = generic_nylon +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_nylon variant = V6 0.40mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.40_Nylon_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_Nylon_fast.inst.cfg index 32cdd99202..099602948f 100644 --- a/resources/quality/voron2/voron2_v6_0.40_Nylon_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_Nylon_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_nylon +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_nylon variant = V6 0.40mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.40_Nylon_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_Nylon_fine.inst.cfg index 4f8fa06e94..a0011b98c2 100644 --- a/resources/quality/voron2/voron2_v6_0.40_Nylon_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_Nylon_fine.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fine definition = voron2_base +name = Fine +version = 4 [metadata] +material = generic_nylon +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_nylon variant = V6 0.40mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.40_Nylon_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_Nylon_normal.inst.cfg index a22bd23d0b..eb8aba938f 100644 --- a/resources/quality/voron2/voron2_v6_0.40_Nylon_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_Nylon_normal.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Normal definition = voron2_base +name = Normal +version = 4 [metadata] +material = generic_nylon +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_nylon variant = V6 0.40mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.40_PC_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PC_extrafast.inst.cfg index 2a33d9ed39..7d9b7b98a7 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PC_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PC_extrafast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +material = generic_pc +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_pc variant = V6 0.40mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.40_PC_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PC_fast.inst.cfg index 291bbea2b9..30510001ee 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PC_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PC_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_pc +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_pc variant = V6 0.40mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.40_PC_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PC_fine.inst.cfg index 94a864b051..7daec09371 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PC_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PC_fine.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fine definition = voron2_base +name = Fine +version = 4 [metadata] +material = generic_pc +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_pc variant = V6 0.40mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.40_PC_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PC_normal.inst.cfg index 44234382be..061f777f60 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PC_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PC_normal.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Normal definition = voron2_base +name = Normal +version = 4 [metadata] +material = generic_pc +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_pc variant = V6 0.40mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.40_PETG_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PETG_extrafast.inst.cfg index e708523632..555bf300ad 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PETG_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PETG_extrafast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +material = generic_petg +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_petg variant = V6 0.40mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.40_PETG_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PETG_fast.inst.cfg index 37b2482c15..a1bf61baf1 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PETG_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PETG_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_petg +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_petg variant = V6 0.40mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.40_PETG_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PETG_fine.inst.cfg index 7b6cca1784..e9fc9f09f2 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PETG_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PETG_fine.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fine definition = voron2_base +name = Fine +version = 4 [metadata] +material = generic_petg +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_petg variant = V6 0.40mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.40_PETG_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PETG_normal.inst.cfg index 2876df2fad..13033b226f 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PETG_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PETG_normal.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Normal definition = voron2_base +name = Normal +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_petg variant = V6 0.40mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.40_PLA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PLA_extrafast.inst.cfg index 7aeb059723..7a07be5604 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PLA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PLA_extrafast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +material = generic_pla +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_pla variant = V6 0.40mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.40_PLA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PLA_fast.inst.cfg index d8ebfb27c9..344d5fb46a 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PLA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PLA_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_pla variant = V6 0.40mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.40_PLA_fine.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PLA_fine.inst.cfg index cc8aedbd9e..efe512aa99 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PLA_fine.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PLA_fine.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fine definition = voron2_base +name = Fine +version = 4 [metadata] +material = generic_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_pla variant = V6 0.40mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.40_PLA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.40_PLA_normal.inst.cfg index 344b83442b..865ce0012c 100644 --- a/resources/quality/voron2/voron2_v6_0.40_PLA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.40_PLA_normal.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Normal definition = voron2_base +name = Normal +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_pla variant = V6 0.40mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.50_ABS_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ABS_extrafast.inst.cfg index cc72ef9e56..25a5be37f2 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ABS_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ABS_extrafast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +material = generic_abs +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_abs variant = V6 0.50mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.50_ABS_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ABS_fast.inst.cfg index dce6716da4..c2b059ec19 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ABS_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ABS_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_abs +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_abs variant = V6 0.50mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.50_ABS_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ABS_normal.inst.cfg index c6986089ba..271d625b10 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ABS_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ABS_normal.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Normal definition = voron2_base +name = Normal +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_abs variant = V6 0.50mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.50_ABS_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_ABS_sprint.inst.cfg index 9200f4f418..cdf4e5e997 100644 --- a/resources/quality/voron2/voron2_v6_0.50_ABS_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_ABS_sprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +material = generic_abs +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_abs variant = V6 0.50mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.50_Nylon_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_Nylon_extrafast.inst.cfg index c505f6f1eb..a856689265 100644 --- a/resources/quality/voron2/voron2_v6_0.50_Nylon_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_Nylon_extrafast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +material = generic_nylon +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_nylon variant = V6 0.50mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.50_Nylon_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_Nylon_fast.inst.cfg index e8e465cfca..c769352cae 100644 --- a/resources/quality/voron2/voron2_v6_0.50_Nylon_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_Nylon_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_nylon +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_nylon variant = V6 0.50mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.50_Nylon_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_Nylon_normal.inst.cfg index 7f6954e7aa..e5daba733e 100644 --- a/resources/quality/voron2/voron2_v6_0.50_Nylon_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_Nylon_normal.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Normal definition = voron2_base +name = Normal +version = 4 [metadata] +material = generic_nylon +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_nylon variant = V6 0.50mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.50_Nylon_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_Nylon_sprint.inst.cfg index 716790277c..4085c72aa0 100644 --- a/resources/quality/voron2/voron2_v6_0.50_Nylon_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_Nylon_sprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +material = generic_nylon +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_nylon variant = V6 0.50mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.50_PC_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PC_extrafast.inst.cfg index a291a8c639..efeadeebce 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PC_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PC_extrafast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +material = generic_pc +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_pc variant = V6 0.50mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.50_PC_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PC_fast.inst.cfg index d7bb176b5f..c5e8f11139 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PC_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PC_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_pc +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_pc variant = V6 0.50mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.50_PC_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PC_normal.inst.cfg index 06a419b385..0ac1ac6763 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PC_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PC_normal.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Normal definition = voron2_base +name = Normal +version = 4 [metadata] +material = generic_pc +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_pc variant = V6 0.50mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.50_PC_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PC_sprint.inst.cfg index 147f6647b1..159cce4cd8 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PC_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PC_sprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +material = generic_pc +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_pc variant = V6 0.50mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.50_PETG_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PETG_extrafast.inst.cfg index 249a083926..8bd94ca16d 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PETG_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PETG_extrafast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +material = generic_petg +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_petg variant = V6 0.50mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.50_PETG_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PETG_fast.inst.cfg index 075ddffc75..1d594f3cd6 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PETG_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PETG_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_petg +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_petg variant = V6 0.50mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.50_PETG_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PETG_normal.inst.cfg index 7d56fab9b1..5d5d1ef31f 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PETG_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PETG_normal.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Normal definition = voron2_base +name = Normal +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_petg variant = V6 0.50mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.50_PETG_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PETG_sprint.inst.cfg index 8c3166015b..19d0948c17 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PETG_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PETG_sprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +material = generic_petg +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_petg variant = V6 0.50mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.50_PLA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PLA_extrafast.inst.cfg index bdaa3ac7b5..3bf963d3a7 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PLA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PLA_extrafast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +material = generic_pla +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_pla variant = V6 0.50mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.50_PLA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PLA_fast.inst.cfg index c39ed9e7b8..4dc047e8c0 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PLA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PLA_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_pla variant = V6 0.50mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.50_PLA_normal.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PLA_normal.inst.cfg index bc67de8c55..7ac79fd08f 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PLA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PLA_normal.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Normal definition = voron2_base +name = Normal +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_pla variant = V6 0.50mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.50_PLA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.50_PLA_sprint.inst.cfg index e4cdd12f50..f11b6e3275 100644 --- a/resources/quality/voron2/voron2_v6_0.50_PLA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.50_PLA_sprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +material = generic_pla +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_pla variant = V6 0.50mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.60_ABS_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ABS_extrafast.inst.cfg index 28f6423759..6aa6dfc875 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ABS_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ABS_extrafast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +material = generic_abs +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_abs variant = V6 0.60mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.60_ABS_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ABS_fast.inst.cfg index 6ca1623138..ff66063820 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ABS_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ABS_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_abs +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_abs variant = V6 0.60mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.60_ABS_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_ABS_sprint.inst.cfg index 63b443999b..6ddc55c094 100644 --- a/resources/quality/voron2/voron2_v6_0.60_ABS_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_ABS_sprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +material = generic_abs +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_abs variant = V6 0.60mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.60_Nylon_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_Nylon_extrafast.inst.cfg index 8ddd2e7950..d86dea4fd1 100644 --- a/resources/quality/voron2/voron2_v6_0.60_Nylon_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_Nylon_extrafast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +material = generic_nylon +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_nylon variant = V6 0.60mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.60_Nylon_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_Nylon_fast.inst.cfg index 766a32f72d..47f81c8aae 100644 --- a/resources/quality/voron2/voron2_v6_0.60_Nylon_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_Nylon_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_nylon +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_nylon variant = V6 0.60mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.60_Nylon_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_Nylon_sprint.inst.cfg index bee752d22f..d660d5ed78 100644 --- a/resources/quality/voron2/voron2_v6_0.60_Nylon_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_Nylon_sprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +material = generic_nylon +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_nylon variant = V6 0.60mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.60_PC_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PC_extrafast.inst.cfg index 818676283a..3a1d0c37a4 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PC_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PC_extrafast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +material = generic_pc +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_pc variant = V6 0.60mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.60_PC_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PC_fast.inst.cfg index 8b06ab8d13..30b3c68b37 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PC_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PC_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_pc +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_pc variant = V6 0.60mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.60_PC_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PC_sprint.inst.cfg index 41783c365c..0be863a2ff 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PC_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PC_sprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +material = generic_pc +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_pc variant = V6 0.60mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.60_PETG_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PETG_extrafast.inst.cfg index 476945f98d..17490eca90 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PETG_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PETG_extrafast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +material = generic_petg +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_petg variant = V6 0.60mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.60_PETG_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PETG_fast.inst.cfg index ab9adb5cce..4ad0a88ba3 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PETG_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PETG_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_petg +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_petg variant = V6 0.60mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.60_PETG_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PETG_sprint.inst.cfg index 77afe937e6..c7a1bf336e 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PETG_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PETG_sprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +material = generic_petg +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_petg variant = V6 0.60mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.60_PLA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PLA_extrafast.inst.cfg index d091676141..e3af696b58 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PLA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PLA_extrafast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +material = generic_pla +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_pla variant = V6 0.60mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.60_PLA_fast.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PLA_fast.inst.cfg index 25bbf43a31..25bfd82517 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PLA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PLA_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_pla variant = V6 0.60mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.60_PLA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.60_PLA_sprint.inst.cfg index e06deae44a..1695d79351 100644 --- a/resources/quality/voron2/voron2_v6_0.60_PLA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.60_PLA_sprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +material = generic_pla +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_pla variant = V6 0.60mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.80_ABS_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ABS_extrafast.inst.cfg index cf55cbbd2f..d1ab1c5b0c 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ABS_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ABS_extrafast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +material = generic_abs +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_abs variant = V6 0.80mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.80_ABS_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ABS_sprint.inst.cfg index 226a615d80..1a72d4acfe 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ABS_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ABS_sprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +material = generic_abs +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_abs variant = V6 0.80mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.80_ABS_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_ABS_supersprint.inst.cfg index d8e87ea6c7..6bd15108a4 100644 --- a/resources/quality/voron2/voron2_v6_0.80_ABS_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_ABS_supersprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Super Sprint definition = voron2_base +name = Super Sprint +version = 4 [metadata] +material = generic_abs +quality_type = supersprint setting_version = 20 type = quality -quality_type = supersprint -material = generic_abs variant = V6 0.80mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.80_Nylon_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_Nylon_extrafast.inst.cfg index bae0fa7091..f09639bc45 100644 --- a/resources/quality/voron2/voron2_v6_0.80_Nylon_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_Nylon_extrafast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +material = generic_nylon +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_nylon variant = V6 0.80mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.80_Nylon_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_Nylon_sprint.inst.cfg index 8571daecd4..99fe5bd2ff 100644 --- a/resources/quality/voron2/voron2_v6_0.80_Nylon_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_Nylon_sprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +material = generic_nylon +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_nylon variant = V6 0.80mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.80_Nylon_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_Nylon_supersprint.inst.cfg index f82ce951f1..142f0835e7 100644 --- a/resources/quality/voron2/voron2_v6_0.80_Nylon_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_Nylon_supersprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Super Sprint definition = voron2_base +name = Super Sprint +version = 4 [metadata] +material = generic_nylon +quality_type = supersprint setting_version = 20 type = quality -quality_type = supersprint -material = generic_nylon variant = V6 0.80mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.80_PC_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PC_extrafast.inst.cfg index f9c38db792..d659945790 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PC_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PC_extrafast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +material = generic_pc +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_pc variant = V6 0.80mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.80_PC_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PC_sprint.inst.cfg index 9a63a1f5d5..a61dd93749 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PC_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PC_sprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +material = generic_pc +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_pc variant = V6 0.80mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.80_PC_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PC_supersprint.inst.cfg index e2f91c96bc..ea69b5991d 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PC_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PC_supersprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Super Sprint definition = voron2_base +name = Super Sprint +version = 4 [metadata] +material = generic_pc +quality_type = supersprint setting_version = 20 type = quality -quality_type = supersprint -material = generic_pc variant = V6 0.80mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.80_PETG_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PETG_extrafast.inst.cfg index 51f7b84f17..8e0280ec51 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PETG_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PETG_extrafast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +material = generic_petg +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_petg variant = V6 0.80mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.80_PETG_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PETG_sprint.inst.cfg index f1012f0931..4383321533 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PETG_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PETG_sprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +material = generic_petg +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_petg variant = V6 0.80mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.80_PETG_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PETG_supersprint.inst.cfg index 347df078c7..d84510fd6c 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PETG_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PETG_supersprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Super Sprint definition = voron2_base +name = Super Sprint +version = 4 [metadata] +material = generic_petg +quality_type = supersprint setting_version = 20 type = quality -quality_type = supersprint -material = generic_petg variant = V6 0.80mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.80_PLA_extrafast.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PLA_extrafast.inst.cfg index c46398712a..5dcffb56a9 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PLA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PLA_extrafast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +material = generic_pla +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_pla variant = V6 0.80mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.80_PLA_sprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PLA_sprint.inst.cfg index 25adc282ca..3e42cb7f67 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PLA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PLA_sprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +material = generic_pla +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_pla variant = V6 0.80mm [values] diff --git a/resources/quality/voron2/voron2_v6_0.80_PLA_supersprint.inst.cfg b/resources/quality/voron2/voron2_v6_0.80_PLA_supersprint.inst.cfg index b772a7d385..b79ed2c124 100644 --- a/resources/quality/voron2/voron2_v6_0.80_PLA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_v6_0.80_PLA_supersprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Super Sprint definition = voron2_base +name = Super Sprint +version = 4 [metadata] +material = generic_pla +quality_type = supersprint setting_version = 20 type = quality -quality_type = supersprint -material = generic_pla variant = V6 0.80mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.40_ABS_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ABS_extrafast.inst.cfg index 6c282dfe80..4a541cd118 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ABS_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ABS_extrafast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +material = generic_abs +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_abs variant = Volcano 0.40mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.40_ABS_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ABS_fast.inst.cfg index cdf294b3cf..0dfc3bde86 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ABS_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ABS_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_abs +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_abs variant = Volcano 0.40mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.40_ABS_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_ABS_normal.inst.cfg index edf099b54e..abdf78fe17 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_ABS_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_ABS_normal.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Normal definition = voron2_base +name = Normal +version = 4 [metadata] +material = generic_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_abs variant = Volcano 0.40mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.40_Nylon_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_Nylon_extrafast.inst.cfg index 9a7c64fe76..5258c052c1 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_Nylon_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_Nylon_extrafast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +material = generic_nylon +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_nylon variant = Volcano 0.40mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.40_Nylon_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_Nylon_fast.inst.cfg index 402285d965..547809f958 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_Nylon_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_Nylon_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_nylon +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_nylon variant = Volcano 0.40mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.40_Nylon_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_Nylon_normal.inst.cfg index 290273cf7a..d94083bf02 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_Nylon_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_Nylon_normal.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Normal definition = voron2_base +name = Normal +version = 4 [metadata] +material = generic_nylon +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_nylon variant = Volcano 0.40mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.40_PC_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PC_extrafast.inst.cfg index 72dceec9b6..d27781b62b 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PC_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PC_extrafast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +material = generic_pc +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_pc variant = Volcano 0.40mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.40_PC_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PC_fast.inst.cfg index bad8822fb1..a631f1d8ea 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PC_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PC_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_pc +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_pc variant = Volcano 0.40mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.40_PC_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PC_normal.inst.cfg index 403008ccfc..0f0aee915a 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PC_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PC_normal.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Normal definition = voron2_base +name = Normal +version = 4 [metadata] +material = generic_pc +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_pc variant = Volcano 0.40mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.40_PETG_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PETG_extrafast.inst.cfg index f3678b1383..322ba42496 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PETG_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PETG_extrafast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +material = generic_petg +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_petg variant = Volcano 0.40mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.40_PETG_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PETG_fast.inst.cfg index 586dbef5f8..fa55f3fb64 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PETG_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PETG_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_petg +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_petg variant = Volcano 0.40mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.40_PETG_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PETG_normal.inst.cfg index 9d0222479a..11acd81158 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PETG_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PETG_normal.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Normal definition = voron2_base +name = Normal +version = 4 [metadata] +material = generic_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_petg variant = Volcano 0.40mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.40_PLA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PLA_extrafast.inst.cfg index ea772b8572..bf9380979e 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PLA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PLA_extrafast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +material = generic_pla +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_pla variant = Volcano 0.40mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.40_PLA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PLA_fast.inst.cfg index dc2e2b6820..721f31dada 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PLA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PLA_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_pla variant = Volcano 0.40mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.40_PLA_normal.inst.cfg b/resources/quality/voron2/voron2_volcano_0.40_PLA_normal.inst.cfg index b370c748af..258fe5a757 100644 --- a/resources/quality/voron2/voron2_volcano_0.40_PLA_normal.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.40_PLA_normal.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Normal definition = voron2_base +name = Normal +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_pla variant = Volcano 0.40mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.60_ABS_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ABS_extrafast.inst.cfg index ecaaf8407a..5fb6e0d92e 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ABS_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ABS_extrafast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +material = generic_abs +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_abs variant = Volcano 0.60mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.60_ABS_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ABS_fast.inst.cfg index c5f28602d3..231e8f1e4a 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ABS_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ABS_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_abs +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_abs variant = Volcano 0.60mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.60_ABS_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_ABS_sprint.inst.cfg index eacc496297..e05c9376dc 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_ABS_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_ABS_sprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +material = generic_abs +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_abs variant = Volcano 0.60mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.60_Nylon_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_Nylon_extrafast.inst.cfg index 78ba037a5e..0be45dcc10 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_Nylon_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_Nylon_extrafast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +material = generic_nylon +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_nylon variant = Volcano 0.60mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.60_Nylon_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_Nylon_fast.inst.cfg index fe9dbe4496..687c6847d9 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_Nylon_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_Nylon_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_nylon +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_nylon variant = Volcano 0.60mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.60_Nylon_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_Nylon_sprint.inst.cfg index 21213622cd..746884158d 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_Nylon_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_Nylon_sprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +material = generic_nylon +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_nylon variant = Volcano 0.60mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.60_PC_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PC_extrafast.inst.cfg index 4c8b7441ce..d1796ff1b6 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PC_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PC_extrafast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +material = generic_pc +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_pc variant = Volcano 0.60mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.60_PC_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PC_fast.inst.cfg index 91c154102b..c0ea6a4ed1 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PC_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PC_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_pc +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_pc variant = Volcano 0.60mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.60_PC_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PC_sprint.inst.cfg index 1c8ebda507..3bd52bc28f 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PC_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PC_sprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +material = generic_pc +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_pc variant = Volcano 0.60mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.60_PETG_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PETG_extrafast.inst.cfg index c0ae3cb57d..52a546496d 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PETG_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PETG_extrafast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +material = generic_petg +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_petg variant = Volcano 0.60mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.60_PETG_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PETG_fast.inst.cfg index 0cdf3982a5..3c419782d0 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PETG_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PETG_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_petg +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_petg variant = Volcano 0.60mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.60_PETG_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PETG_sprint.inst.cfg index bbb640b8fe..45273c215b 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PETG_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PETG_sprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +material = generic_petg +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_petg variant = Volcano 0.60mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.60_PLA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PLA_extrafast.inst.cfg index a9cb7ab432..aa92df677f 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PLA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PLA_extrafast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +material = generic_pla +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_pla variant = Volcano 0.60mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.60_PLA_fast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PLA_fast.inst.cfg index 1eedd2852d..5a1a240651 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PLA_fast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PLA_fast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Fast definition = voron2_base +name = Fast +version = 4 [metadata] +material = generic_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast -material = generic_pla variant = Volcano 0.60mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.60_PLA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.60_PLA_sprint.inst.cfg index a1a2cba822..f3ca1ac17d 100644 --- a/resources/quality/voron2/voron2_volcano_0.60_PLA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.60_PLA_sprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +material = generic_pla +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_pla variant = Volcano 0.60mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.80_ABS_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ABS_extrafast.inst.cfg index a54c8838a5..a48a3ddc8f 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ABS_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ABS_extrafast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +material = generic_abs +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_abs variant = Volcano 0.80mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.80_ABS_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ABS_sprint.inst.cfg index 6077096e70..5ee185f312 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ABS_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ABS_sprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +material = generic_abs +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_abs variant = Volcano 0.80mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.80_ABS_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_ABS_supersprint.inst.cfg index 8ecb7fe418..8e1d883092 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_ABS_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_ABS_supersprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Super Sprint definition = voron2_base +name = Super Sprint +version = 4 [metadata] +material = generic_abs +quality_type = supersprint setting_version = 20 type = quality -quality_type = supersprint -material = generic_abs variant = Volcano 0.80mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.80_Nylon_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_Nylon_extrafast.inst.cfg index 28a9bc13ee..e5e7251cbc 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_Nylon_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_Nylon_extrafast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +material = generic_nylon +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_nylon variant = Volcano 0.80mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.80_Nylon_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_Nylon_sprint.inst.cfg index a80a1e67f0..60b03c336f 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_Nylon_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_Nylon_sprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +material = generic_nylon +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_nylon variant = Volcano 0.80mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.80_Nylon_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_Nylon_supersprint.inst.cfg index 8b6219c0f2..bcbd2d29b8 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_Nylon_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_Nylon_supersprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Super Sprint definition = voron2_base +name = Super Sprint +version = 4 [metadata] +material = generic_nylon +quality_type = supersprint setting_version = 20 type = quality -quality_type = supersprint -material = generic_nylon variant = Volcano 0.80mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.80_PC_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PC_extrafast.inst.cfg index 7d93999ed5..e92b9bd3b3 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PC_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PC_extrafast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +material = generic_pc +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_pc variant = Volcano 0.80mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.80_PC_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PC_sprint.inst.cfg index f219ca753a..b494810d28 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PC_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PC_sprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +material = generic_pc +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_pc variant = Volcano 0.80mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.80_PC_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PC_supersprint.inst.cfg index ba67f4abc5..adce6b1a12 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PC_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PC_supersprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Super Sprint definition = voron2_base +name = Super Sprint +version = 4 [metadata] +material = generic_pc +quality_type = supersprint setting_version = 20 type = quality -quality_type = supersprint -material = generic_pc variant = Volcano 0.80mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.80_PETG_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PETG_extrafast.inst.cfg index 25bba48c74..bf8f89d947 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PETG_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PETG_extrafast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +material = generic_petg +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_petg variant = Volcano 0.80mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.80_PETG_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PETG_sprint.inst.cfg index 00b096684f..609353f0e4 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PETG_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PETG_sprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +material = generic_petg +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_petg variant = Volcano 0.80mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.80_PETG_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PETG_supersprint.inst.cfg index dfccf16612..d6f841fd86 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PETG_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PETG_supersprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Super Sprint definition = voron2_base +name = Super Sprint +version = 4 [metadata] +material = generic_petg +quality_type = supersprint setting_version = 20 type = quality -quality_type = supersprint -material = generic_petg variant = Volcano 0.80mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.80_PLA_extrafast.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PLA_extrafast.inst.cfg index d651d54a22..52a550016b 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PLA_extrafast.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PLA_extrafast.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Extra Fast definition = voron2_base +name = Extra Fast +version = 4 [metadata] +material = generic_pla +quality_type = extrafast setting_version = 20 type = quality -quality_type = extrafast -material = generic_pla variant = Volcano 0.80mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.80_PLA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PLA_sprint.inst.cfg index 1bd3084343..04ce91ab0f 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PLA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PLA_sprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +material = generic_pla +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_pla variant = Volcano 0.80mm [values] diff --git a/resources/quality/voron2/voron2_volcano_0.80_PLA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_0.80_PLA_supersprint.inst.cfg index 2631bdb0b6..86e6bb1f0a 100644 --- a/resources/quality/voron2/voron2_volcano_0.80_PLA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_0.80_PLA_supersprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Super Sprint definition = voron2_base +name = Super Sprint +version = 4 [metadata] +material = generic_pla +quality_type = supersprint setting_version = 20 type = quality -quality_type = supersprint -material = generic_pla variant = Volcano 0.80mm [values] diff --git a/resources/quality/voron2/voron2_volcano_1.00_ABS_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ABS_sprint.inst.cfg index 913c2bb117..4b9a8b1b22 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ABS_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ABS_sprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +material = generic_abs +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_abs variant = Volcano 1.00mm [values] diff --git a/resources/quality/voron2/voron2_volcano_1.00_ABS_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ABS_supersprint.inst.cfg index 4d8b5bca42..1ec3d8ba5a 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ABS_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ABS_supersprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Super Sprint definition = voron2_base +name = Super Sprint +version = 4 [metadata] +material = generic_abs +quality_type = supersprint setting_version = 20 type = quality -quality_type = supersprint -material = generic_abs variant = Volcano 1.00mm [values] diff --git a/resources/quality/voron2/voron2_volcano_1.00_ABS_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_ABS_ultrasprint.inst.cfg index 11376dfb61..8e9360815a 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_ABS_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_ABS_ultrasprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Ultra Sprint definition = voron2_base +name = Ultra Sprint +version = 4 [metadata] +material = generic_abs +quality_type = ultrasprint setting_version = 20 type = quality -quality_type = ultrasprint -material = generic_abs variant = Volcano 1.00mm [values] diff --git a/resources/quality/voron2/voron2_volcano_1.00_Nylon_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_Nylon_sprint.inst.cfg index b0e4e38442..5fec881121 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_Nylon_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_Nylon_sprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +material = generic_nylon +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_nylon variant = Volcano 1.00mm [values] diff --git a/resources/quality/voron2/voron2_volcano_1.00_Nylon_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_Nylon_supersprint.inst.cfg index ec55bdc9e6..0a4bd23fb1 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_Nylon_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_Nylon_supersprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Super Sprint definition = voron2_base +name = Super Sprint +version = 4 [metadata] +material = generic_nylon +quality_type = supersprint setting_version = 20 type = quality -quality_type = supersprint -material = generic_nylon variant = Volcano 1.00mm [values] diff --git a/resources/quality/voron2/voron2_volcano_1.00_Nylon_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_Nylon_ultrasprint.inst.cfg index 8c2c152ac6..feaed8baf0 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_Nylon_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_Nylon_ultrasprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Ultra Sprint definition = voron2_base +name = Ultra Sprint +version = 4 [metadata] +material = generic_nylon +quality_type = ultrasprint setting_version = 20 type = quality -quality_type = ultrasprint -material = generic_nylon variant = Volcano 1.00mm [values] diff --git a/resources/quality/voron2/voron2_volcano_1.00_PC_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PC_sprint.inst.cfg index 9b8d6cb34e..05bc81c809 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PC_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PC_sprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +material = generic_pc +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_pc variant = Volcano 1.00mm [values] diff --git a/resources/quality/voron2/voron2_volcano_1.00_PC_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PC_supersprint.inst.cfg index eec96a71b5..0f8d8849f0 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PC_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PC_supersprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Super Sprint definition = voron2_base +name = Super Sprint +version = 4 [metadata] +material = generic_pc +quality_type = supersprint setting_version = 20 type = quality -quality_type = supersprint -material = generic_pc variant = Volcano 1.00mm [values] diff --git a/resources/quality/voron2/voron2_volcano_1.00_PC_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PC_ultrasprint.inst.cfg index 3f7751bf15..dc1da29112 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PC_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PC_ultrasprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Ultra Sprint definition = voron2_base +name = Ultra Sprint +version = 4 [metadata] +material = generic_pc +quality_type = ultrasprint setting_version = 20 type = quality -quality_type = ultrasprint -material = generic_pc variant = Volcano 1.00mm [values] diff --git a/resources/quality/voron2/voron2_volcano_1.00_PETG_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PETG_sprint.inst.cfg index d38499f1c4..c87061ac8e 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PETG_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PETG_sprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +material = generic_petg +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_petg variant = Volcano 1.00mm [values] diff --git a/resources/quality/voron2/voron2_volcano_1.00_PETG_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PETG_supersprint.inst.cfg index fb0a0923e0..4fd8417a6f 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PETG_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PETG_supersprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Super Sprint definition = voron2_base +name = Super Sprint +version = 4 [metadata] +material = generic_petg +quality_type = supersprint setting_version = 20 type = quality -quality_type = supersprint -material = generic_petg variant = Volcano 1.00mm [values] diff --git a/resources/quality/voron2/voron2_volcano_1.00_PETG_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PETG_ultrasprint.inst.cfg index 4c3df9b92e..ca05a5497d 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PETG_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PETG_ultrasprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Ultra Sprint definition = voron2_base +name = Ultra Sprint +version = 4 [metadata] +material = generic_petg +quality_type = ultrasprint setting_version = 20 type = quality -quality_type = ultrasprint -material = generic_petg variant = Volcano 1.00mm [values] diff --git a/resources/quality/voron2/voron2_volcano_1.00_PLA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PLA_sprint.inst.cfg index bb25fb6148..0d3d313154 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PLA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PLA_sprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +material = generic_pla +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_pla variant = Volcano 1.00mm [values] diff --git a/resources/quality/voron2/voron2_volcano_1.00_PLA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PLA_supersprint.inst.cfg index 40729794bb..48848d7afc 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PLA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PLA_supersprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Super Sprint definition = voron2_base +name = Super Sprint +version = 4 [metadata] +material = generic_pla +quality_type = supersprint setting_version = 20 type = quality -quality_type = supersprint -material = generic_pla variant = Volcano 1.00mm [values] diff --git a/resources/quality/voron2/voron2_volcano_1.00_PLA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.00_PLA_ultrasprint.inst.cfg index 6ba8485c48..7b944ae372 100644 --- a/resources/quality/voron2/voron2_volcano_1.00_PLA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.00_PLA_ultrasprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Ultra Sprint definition = voron2_base +name = Ultra Sprint +version = 4 [metadata] +material = generic_pla +quality_type = ultrasprint setting_version = 20 type = quality -quality_type = ultrasprint -material = generic_pla variant = Volcano 1.00mm [values] diff --git a/resources/quality/voron2/voron2_volcano_1.20_ABS_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ABS_sprint.inst.cfg index 29b11ecaa9..c856fae8ec 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ABS_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ABS_sprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +material = generic_abs +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_abs variant = Volcano 1.20mm [values] diff --git a/resources/quality/voron2/voron2_volcano_1.20_ABS_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ABS_supersprint.inst.cfg index ac005af7c8..ab3b88127c 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ABS_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ABS_supersprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Super Sprint definition = voron2_base +name = Super Sprint +version = 4 [metadata] +material = generic_abs +quality_type = supersprint setting_version = 20 type = quality -quality_type = supersprint -material = generic_abs variant = Volcano 1.20mm [values] diff --git a/resources/quality/voron2/voron2_volcano_1.20_ABS_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_ABS_ultrasprint.inst.cfg index e445354c80..06e4bc144d 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_ABS_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_ABS_ultrasprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Ultra Sprint definition = voron2_base +name = Ultra Sprint +version = 4 [metadata] +material = generic_abs +quality_type = ultrasprint setting_version = 20 type = quality -quality_type = ultrasprint -material = generic_abs variant = Volcano 1.20mm [values] diff --git a/resources/quality/voron2/voron2_volcano_1.20_Nylon_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_Nylon_sprint.inst.cfg index 9969ab06a8..5cefc52db6 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_Nylon_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_Nylon_sprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +material = generic_nylon +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_nylon variant = Volcano 1.20mm [values] diff --git a/resources/quality/voron2/voron2_volcano_1.20_Nylon_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_Nylon_supersprint.inst.cfg index 3bbb15c972..213f2cef80 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_Nylon_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_Nylon_supersprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Super Sprint definition = voron2_base +name = Super Sprint +version = 4 [metadata] +material = generic_nylon +quality_type = supersprint setting_version = 20 type = quality -quality_type = supersprint -material = generic_nylon variant = Volcano 1.20mm [values] diff --git a/resources/quality/voron2/voron2_volcano_1.20_Nylon_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_Nylon_ultrasprint.inst.cfg index fff73c8953..9f064d1dd9 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_Nylon_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_Nylon_ultrasprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Ultra Sprint definition = voron2_base +name = Ultra Sprint +version = 4 [metadata] +material = generic_nylon +quality_type = ultrasprint setting_version = 20 type = quality -quality_type = ultrasprint -material = generic_nylon variant = Volcano 1.20mm [values] diff --git a/resources/quality/voron2/voron2_volcano_1.20_PC_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PC_sprint.inst.cfg index d38ca85d1c..120c32e57c 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PC_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PC_sprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +material = generic_pc +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_pc variant = Volcano 1.20mm [values] diff --git a/resources/quality/voron2/voron2_volcano_1.20_PC_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PC_supersprint.inst.cfg index f1b6fb2972..218397d196 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PC_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PC_supersprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Super Sprint definition = voron2_base +name = Super Sprint +version = 4 [metadata] +material = generic_pc +quality_type = supersprint setting_version = 20 type = quality -quality_type = supersprint -material = generic_pc variant = Volcano 1.20mm [values] diff --git a/resources/quality/voron2/voron2_volcano_1.20_PC_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PC_ultrasprint.inst.cfg index 879d3c40d8..96510d42f9 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PC_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PC_ultrasprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Ultra Sprint definition = voron2_base +name = Ultra Sprint +version = 4 [metadata] +material = generic_pc +quality_type = ultrasprint setting_version = 20 type = quality -quality_type = ultrasprint -material = generic_pc variant = Volcano 1.20mm [values] diff --git a/resources/quality/voron2/voron2_volcano_1.20_PETG_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PETG_sprint.inst.cfg index cc2171aaab..262e5ea786 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PETG_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PETG_sprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +material = generic_petg +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_petg variant = Volcano 1.20mm [values] diff --git a/resources/quality/voron2/voron2_volcano_1.20_PETG_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PETG_supersprint.inst.cfg index 243322f8d6..2c49bd4dbd 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PETG_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PETG_supersprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Super Sprint definition = voron2_base +name = Super Sprint +version = 4 [metadata] +material = generic_petg +quality_type = supersprint setting_version = 20 type = quality -quality_type = supersprint -material = generic_petg variant = Volcano 1.20mm [values] diff --git a/resources/quality/voron2/voron2_volcano_1.20_PETG_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PETG_ultrasprint.inst.cfg index 050d941410..c01e8887f9 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PETG_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PETG_ultrasprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Ultra Sprint definition = voron2_base +name = Ultra Sprint +version = 4 [metadata] +material = generic_petg +quality_type = ultrasprint setting_version = 20 type = quality -quality_type = ultrasprint -material = generic_petg variant = Volcano 1.20mm [values] diff --git a/resources/quality/voron2/voron2_volcano_1.20_PLA_sprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PLA_sprint.inst.cfg index 554088534a..7c967b9472 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PLA_sprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PLA_sprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Sprint definition = voron2_base +name = Sprint +version = 4 [metadata] +material = generic_pla +quality_type = sprint setting_version = 20 type = quality -quality_type = sprint -material = generic_pla variant = Volcano 1.20mm [values] diff --git a/resources/quality/voron2/voron2_volcano_1.20_PLA_supersprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PLA_supersprint.inst.cfg index bffe80f8f2..eebf471d87 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PLA_supersprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PLA_supersprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Super Sprint definition = voron2_base +name = Super Sprint +version = 4 [metadata] +material = generic_pla +quality_type = supersprint setting_version = 20 type = quality -quality_type = supersprint -material = generic_pla variant = Volcano 1.20mm [values] diff --git a/resources/quality/voron2/voron2_volcano_1.20_PLA_ultrasprint.inst.cfg b/resources/quality/voron2/voron2_volcano_1.20_PLA_ultrasprint.inst.cfg index 002e636f7c..b839f2bfeb 100644 --- a/resources/quality/voron2/voron2_volcano_1.20_PLA_ultrasprint.inst.cfg +++ b/resources/quality/voron2/voron2_volcano_1.20_PLA_ultrasprint.inst.cfg @@ -1,13 +1,13 @@ [general] -version = 4 -name = Ultra Sprint definition = voron2_base +name = Ultra Sprint +version = 4 [metadata] +material = generic_pla +quality_type = ultrasprint setting_version = 20 type = quality -quality_type = ultrasprint -material = generic_pla variant = Volcano 1.20mm [values] 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 index 1172d8936e..f3c8806a59 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = vzbot_base +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super 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 index 0edb3cc21e..245db9c2ae 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Ultra Quality definition = vzbot_base +name = Ultra Quality +version = 4 [metadata] +material = generic_abs +quality_type = ultra 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 index 4e0838328b..0b88df1002 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = vzbot_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_abs +quality_type = adaptive 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 index b7e74e6828..d30d22ee03 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = vzbot_base +name = Low Quality +version = 4 [metadata] +material = generic_abs +quality_type = low 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 index ffb06a5ed5..41f909e965 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = vzbot_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = standard 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 index 096008f445..b654dd7e32 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = vzbot_base +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super 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 index 44330c66ff..72316e106a 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = vzbot_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_abs +quality_type = adaptive 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 index db55af0707..e71186bcb7 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = vzbot_base +name = Low Quality +version = 4 [metadata] +material = generic_abs +quality_type = low 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 index c900d791dc..e891b60df2 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = vzbot_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = standard 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 index dee4930c45..d54a73f847 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = vzbot_base +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super 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 index 62503a0e57..861ace2d01 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = vzbot_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_abs +quality_type = adaptive 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 index 3893a57516..c5501b7ac4 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = vzbot_base +name = Low Quality +version = 4 [metadata] +material = generic_abs +quality_type = low 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 index 074f737974..a6c94ab453 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = vzbot_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = standard 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 index d38191adf6..9ab052cc49 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = vzbot_base +name = Super Quality +version = 4 [metadata] +material = generic_abs +quality_type = super 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 index ff2a7be6f8..1c57655a91 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = vzbot_base +name = Standard Quality +version = 4 [metadata] +material = generic_abs +quality_type = standard 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 index f9f87c4bde..5aae226c8e 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = vzbot_base +name = Draft Quality +version = 4 [metadata] +material = generic_abs +quality_type = draft 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 index 49acfd6c32..335066686d 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = vzbot_base +name = Draft Quality +version = 4 [metadata] +material = generic_abs +quality_type = draft 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 index d81e378b7e..cede8f3326 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = vzbot_base +name = Super Quality +version = 4 [metadata] +material = generic_pc +quality_type = super 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 index 0138d8a2b1..aa8083d80b 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Ultra Quality definition = vzbot_base +name = Ultra Quality +version = 4 [metadata] +material = generic_pc +quality_type = ultra 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 index b05b418263..d520acc8d0 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = vzbot_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_pc +quality_type = adaptive 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 index 9ef0d4a9d5..b04dced371 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = vzbot_base +name = Low Quality +version = 4 [metadata] +material = generic_pc +quality_type = low 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 index ce4fa4ec3b..a6b4f96914 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = vzbot_base +name = Standard Quality +version = 4 [metadata] +material = generic_pc +quality_type = standard 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 index bccbe5fd30..4615aada10 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = vzbot_base +name = Super Quality +version = 4 [metadata] +material = generic_pc +quality_type = super 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 index 007bf4a739..2e2c3eccb6 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = vzbot_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_pc +quality_type = adaptive 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 index 258b44c446..9e65fe7a20 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = vzbot_base +name = Low Quality +version = 4 [metadata] +material = generic_pc +quality_type = low 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 index 066563b61e..1cede9e217 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = vzbot_base +name = Standard Quality +version = 4 [metadata] +material = generic_pc +quality_type = standard 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 index 4064f8105d..78f9c102ec 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = vzbot_base +name = Super Quality +version = 4 [metadata] +material = generic_pc +quality_type = super 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 index d05afb5d20..71b6d48b52 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = vzbot_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_pc +quality_type = adaptive 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 index 237b0f5143..8f715720d4 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = vzbot_base +name = Low Quality +version = 4 [metadata] +material = generic_pc +quality_type = low 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 index 5a80deba10..188344badc 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = vzbot_base +name = Standard Quality +version = 4 [metadata] +material = generic_pc +quality_type = standard 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 index 274d9a325d..e5a0b9d70f 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = vzbot_base +name = Super Quality +version = 4 [metadata] +material = generic_pc +quality_type = super 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 index 24f08de191..08042e4434 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = vzbot_base +name = Standard Quality +version = 4 [metadata] +material = generic_pc +quality_type = standard 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 index 4b677368fc..459bac8bec 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = vzbot_base +name = Draft Quality +version = 4 [metadata] +material = generic_pc +quality_type = draft 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 index e50c5f689f..9a08b2894d 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = vzbot_base +name = Draft Quality +version = 4 [metadata] +material = generic_pc +quality_type = draft 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 index 04d751e946..f379a0b450 100644 --- 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 @@ -1,17 +1,16 @@ [general] -version = 4 -name = Super Quality definition = vzbot_base +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super 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 index 476c1d668b..0ef63d7dc3 100644 --- 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Ultra Quality definition = vzbot_base +name = Ultra Quality +version = 4 [metadata] +material = generic_petg +quality_type = ultra 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 index a06d17c654..f1600d4d0a 100644 --- 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = vzbot_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_petg +quality_type = adaptive 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 index d6ee8ad833..e8465f3ed0 100644 --- 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Low Quality definition = vzbot_base +name = Low Quality +version = 4 [metadata] +material = generic_petg +quality_type = low 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 index 043ba4c6c9..fb0972ae71 100644 --- 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = vzbot_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = standard 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 index 9d4c369e21..282c30cfb8 100644 --- 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Super Quality definition = vzbot_base +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super 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 index 9fdd362428..49a189a94a 100644 --- 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = vzbot_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_petg +quality_type = adaptive 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 index 235f85aac9..d0f96dba8e 100644 --- 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Low Quality definition = vzbot_base +name = Low Quality +version = 4 [metadata] +material = generic_petg +quality_type = low 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 index 5d7cbd0316..6e517bf626 100644 --- 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = vzbot_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = standard 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 index 9bd75af91e..e4420d6546 100644 --- 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Super Quality definition = vzbot_base +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super 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 index 2c81e446cd..b5141f10ab 100644 --- 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = vzbot_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_petg +quality_type = adaptive 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 index 9ac33529c2..d9159cb10f 100644 --- 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Low Quality definition = vzbot_base +name = Low Quality +version = 4 [metadata] +material = generic_petg +quality_type = low 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 index 041afa5a51..eacf638059 100644 --- 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = vzbot_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = standard 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 index 1774c159c8..6f885e955a 100644 --- 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Super Quality definition = vzbot_base +name = Super Quality +version = 4 [metadata] +material = generic_petg +quality_type = super 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 index b8bb0b9c2e..d247d29ebb 100644 --- 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = vzbot_base +name = Standard Quality +version = 4 [metadata] +material = generic_petg +quality_type = standard 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 index 6743af5426..e702677ed8 100644 --- 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Draft Quality definition = vzbot_base +name = Draft Quality +version = 4 [metadata] +material = generic_petg +quality_type = draft 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 index 2d5ce7738a..1730afbbfc 100644 --- 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 @@ -1,16 +1,16 @@ [general] -version = 4 -name = Draft Quality definition = vzbot_base +name = Draft Quality +version = 4 [metadata] +material = generic_petg +quality_type = draft 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 index 33a189c97a..cc4e0672dd 100644 --- 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 @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = vzbot_base +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super 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 index bdb0837012..b45ee7accb 100644 --- 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 @@ -1,13 +1,14 @@ [general] -version = 4 -name = Ultra Quality definition = vzbot_base +name = Ultra Quality +version = 4 [metadata] +material = generic_pla +quality_type = ultra 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 index e3b1f21133..6c358485e1 100644 --- 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 @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = vzbot_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_pla +quality_type = adaptive 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 index 5c10f5fe44..959b9a59fa 100644 --- 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 @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low Quality definition = vzbot_base +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low 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 index 31cc0964cc..0ca84bfdfc 100644 --- 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 @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = vzbot_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = standard 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 index db65a7a5fd..9accc5f250 100644 --- 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 @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = vzbot_base +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super 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 index 5168a91040..2d99ca87e9 100644 --- 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 @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = vzbot_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_pla +quality_type = adaptive 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 index fb1bc859aa..3d4f43f2ee 100644 --- 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 @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low Quality definition = vzbot_base +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low 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 index dbc0304fb1..b8b6b5ff0d 100644 --- 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 @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = vzbot_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = standard 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 index 5d7ed6eda2..46749397e7 100644 --- 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 @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = vzbot_base +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super 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 index 1f34441e00..ba0a2ba905 100644 --- 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 @@ -1,13 +1,14 @@ [general] -version = 4 -name = Dynamic Quality definition = vzbot_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_pla +quality_type = adaptive 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 index 600905790b..064607effa 100644 --- 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 @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low Quality definition = vzbot_base +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low 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 index 9beb4f15ed..2f238a8af7 100644 --- 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 @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = vzbot_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = standard 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 index df89cc112f..afc90a2942 100644 --- 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 @@ -1,13 +1,14 @@ [general] -version = 4 -name = Super Quality definition = vzbot_base +name = Super Quality +version = 4 [metadata] +material = generic_pla +quality_type = super 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 index ea70262be7..032d994e0f 100644 --- 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 @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = vzbot_base +name = Draft Quality +version = 4 [metadata] +material = generic_pla +quality_type = draft 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 index 7b2de73fb6..69ec7c3494 100644 --- 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 @@ -1,13 +1,14 @@ [general] -version = 4 -name = Low Quality definition = vzbot_base +name = Low Quality +version = 4 [metadata] +material = generic_pla +quality_type = low 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 index 0cf308feed..ebeb3c7fc8 100644 --- 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 @@ -1,13 +1,14 @@ [general] -version = 4 -name = Standard Quality definition = vzbot_base +name = Standard Quality +version = 4 [metadata] +material = generic_pla +quality_type = standard 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 index f57384d4f8..84c2321212 100644 --- 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 @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = vzbot_base +name = Draft Quality +version = 4 [metadata] +material = generic_pla +quality_type = draft 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 index a8ff4828cf..e46787ae95 100644 --- 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 @@ -1,13 +1,14 @@ [general] -version = 4 -name = Draft Quality definition = vzbot_base +name = Draft Quality +version = 4 [metadata] +material = generic_pla +quality_type = draft 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 index 44cd9ab901..1c751fddf1 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = vzbot_base +name = Super Quality +version = 4 [metadata] +material = generic_pva +quality_type = super 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 index da03a40dbc..f6947f6601 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Ultra Quality definition = vzbot_base +name = Ultra Quality +version = 4 [metadata] +material = generic_pva +quality_type = ultra 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 index 8d123ae44a..d8df063bad 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = vzbot_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_pva +quality_type = adaptive 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 index 028c68fc97..5635bd8dda 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = vzbot_base +name = Low Quality +version = 4 [metadata] +material = generic_pva +quality_type = low 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 index 430edb0ef4..b47c0f8e0b 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = vzbot_base +name = Standard Quality +version = 4 [metadata] +material = generic_pva +quality_type = standard 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 index be21aab260..61cfa4eb2b 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = vzbot_base +name = Super Quality +version = 4 [metadata] +material = generic_pva +quality_type = super 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 index e5cb2b3206..df72128cf2 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = vzbot_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_pva +quality_type = adaptive 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 index 8b40061ad9..334f14e01e 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = vzbot_base +name = Low Quality +version = 4 [metadata] +material = generic_pva +quality_type = low 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 index fd3ae9365e..329652fc86 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = vzbot_base +name = Standard Quality +version = 4 [metadata] +material = generic_pva +quality_type = standard 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 index 51b94b8f25..0cf105e33b 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = vzbot_base +name = Super Quality +version = 4 [metadata] +material = generic_pva +quality_type = super 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 index 71582cac63..9103cb533b 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = vzbot_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_pva +quality_type = adaptive 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 index 4d05101be5..ab5ab93aad 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = vzbot_base +name = Low Quality +version = 4 [metadata] +material = generic_pva +quality_type = low 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 index 64033125b5..dd70c9e532 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = vzbot_base +name = Standard Quality +version = 4 [metadata] +material = generic_pva +quality_type = standard 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 index cf53742dd9..0b9f1e6c66 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = vzbot_base +name = Super Quality +version = 4 [metadata] +material = generic_pva +quality_type = super 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 index fcd17e7c77..748fad245b 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = vzbot_base +name = Standard Quality +version = 4 [metadata] +material = generic_pva +quality_type = standard 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 index b38d437bb6..f4108b8b3b 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = vzbot_base +name = Draft Quality +version = 4 [metadata] +material = generic_pva +quality_type = draft 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 index ef83c1e707..44c012a70e 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = vzbot_base +name = Draft Quality +version = 4 [metadata] +material = generic_pva +quality_type = draft 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 index 9ca773979e..368c6bc7f4 100644 --- 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 @@ -1,15 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = vzbot_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_tpu +quality_type = adaptive 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 index db460cc2ae..97439fd2a2 100644 --- 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 @@ -1,15 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = vzbot_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = standard 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 index d19f4e96ea..5a446882e7 100644 --- 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 @@ -1,15 +1,16 @@ [general] -version = 4 -name = Super Quality definition = vzbot_base +name = Super Quality +version = 4 [metadata] +material = generic_tpu +quality_type = super 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 index 4d40a7a6ac..f9affe03fc 100644 --- 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 @@ -1,15 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = vzbot_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_tpu +quality_type = adaptive 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 index e3ba8d9aa2..cc4a5252a0 100644 --- 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 @@ -1,15 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = vzbot_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = standard 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 index 26d5dd1e9e..fa90392ae8 100644 --- 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 @@ -1,15 +1,16 @@ [general] -version = 4 -name = Super Quality definition = vzbot_base +name = Super Quality +version = 4 [metadata] +material = generic_tpu +quality_type = super 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 index 14a2dce709..423635ae7b 100644 --- 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 @@ -1,15 +1,16 @@ [general] -version = 4 -name = Dynamic Quality definition = vzbot_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_tpu +quality_type = adaptive 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 index e139231910..b68f97b3bd 100644 --- 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 @@ -1,15 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = vzbot_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = standard 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 index ac167cee50..dbac11c772 100644 --- 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 @@ -1,15 +1,16 @@ [general] -version = 4 -name = Super Quality definition = vzbot_base +name = Super Quality +version = 4 [metadata] +material = generic_tpu +quality_type = super 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 index c1b93cdb67..346ff12284 100644 --- 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 @@ -1,15 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = vzbot_base +name = Standard Quality +version = 4 [metadata] +material = generic_tpu +quality_type = standard 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 index 26fac84680..bb032fbd50 100644 --- 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 @@ -1,15 +1,16 @@ [general] -version = 4 -name = Draft Quality definition = vzbot_base +name = Draft Quality +version = 4 [metadata] +material = generic_tpu +quality_type = draft 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 index 3e0586e119..d824e02036 100644 --- 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 @@ -1,15 +1,16 @@ [general] -version = 4 -name = Draft Quality definition = vzbot_base +name = Draft Quality +version = 4 [metadata] +material = generic_tpu +quality_type = draft 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 index e6a89b1c87..b8298fcccb 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = vzbot_base +name = Super Quality +version = 4 [metadata] +material = generic_nylon +quality_type = super 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 index 9c86dcd8b1..01bc3737d9 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Ultra Quality definition = vzbot_base +name = Ultra Quality +version = 4 [metadata] +material = generic_nylon +quality_type = ultra 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 index 1a81dca16b..c0e3677410 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = vzbot_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_nylon +quality_type = adaptive 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 index 8aa09c3fad..222c517444 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = vzbot_base +name = Low Quality +version = 4 [metadata] +material = generic_nylon +quality_type = low 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 index f7686ef1e9..c00c3167e0 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = vzbot_base +name = Standard Quality +version = 4 [metadata] +material = generic_nylon +quality_type = standard 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 index b9c5d88753..d73976e836 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = vzbot_base +name = Super Quality +version = 4 [metadata] +material = generic_nylon +quality_type = super 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 index b50b782a2c..8f8409795a 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = vzbot_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_nylon +quality_type = adaptive 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 index 0cceeee6ba..3026265274 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = vzbot_base +name = Low Quality +version = 4 [metadata] +material = generic_nylon +quality_type = low 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 index 23e7d27895..81023182da 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = vzbot_base +name = Standard Quality +version = 4 [metadata] +material = generic_nylon +quality_type = standard 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 index 2f94a9aa13..8a1cc10273 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = vzbot_base +name = Super Quality +version = 4 [metadata] +material = generic_nylon +quality_type = super 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 index ccd20b204d..a604a7d7ff 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Dynamic Quality definition = vzbot_base +name = Dynamic Quality +version = 4 [metadata] +material = generic_nylon +quality_type = adaptive 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 index cba8ccba33..c1b7912146 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Low Quality definition = vzbot_base +name = Low Quality +version = 4 [metadata] +material = generic_nylon +quality_type = low 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 index 964a50083b..90ff6bf638 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = vzbot_base +name = Standard Quality +version = 4 [metadata] +material = generic_nylon +quality_type = standard 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 index f2c7dab429..354a3196fa 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Super Quality definition = vzbot_base +name = Super Quality +version = 4 [metadata] +material = generic_nylon +quality_type = super 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 index 966e963d61..753ab7d382 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Standard Quality definition = vzbot_base +name = Standard Quality +version = 4 [metadata] +material = generic_nylon +quality_type = standard 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 index 82589b81ac..705205d1cb 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = vzbot_base +name = Draft Quality +version = 4 [metadata] +material = generic_nylon +quality_type = draft 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 index bd465e599e..d93f2fb329 100644 --- 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 @@ -1,14 +1,15 @@ [general] -version = 4 -name = Draft Quality definition = vzbot_base +name = Draft Quality +version = 4 [metadata] +material = generic_nylon +quality_type = draft 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 index 118d1d406d..5ff6053a3d 100644 --- a/resources/quality/vzbot/base/vzbot_global_adaptive.inst.cfg +++ b/resources/quality/vzbot/base/vzbot_global_adaptive.inst.cfg @@ -1,19 +1,20 @@ [general] -version = 4 -name = Dynamic Quality definition = vzbot_base +name = Dynamic Quality +version = 4 [metadata] +global_quality = True +quality_type = adaptive setting_version = 20 type = quality -quality_type = adaptive weight = -2 -global_quality = True [values] +adaptive_layer_height_enabled = true layer_height = 0.16 layer_height_0 = 0.20 +support_interface_height = =layer_height*6 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 index 5aa89ed91b..d07bc67212 100644 --- a/resources/quality/vzbot/base/vzbot_global_draft.inst.cfg +++ b/resources/quality/vzbot/base/vzbot_global_draft.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Draft Quality definition = vzbot_base +name = Draft Quality +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -5 -global_quality = True [values] layer_height = 0.32 layer_height_0 = 0.32 +support_interface_height = =layer_height*4 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 index 096f6243cc..47d519e959 100644 --- a/resources/quality/vzbot/base/vzbot_global_low.inst.cfg +++ b/resources/quality/vzbot/base/vzbot_global_low.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Low Quality definition = vzbot_base +name = Low Quality +version = 4 [metadata] +global_quality = True +quality_type = low setting_version = 20 type = quality -quality_type = low weight = -4 -global_quality = True [values] layer_height = 0.28 layer_height_0 = 0.28 +support_interface_height = =layer_height*4 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 index 1728f05845..a3a4681651 100644 --- a/resources/quality/vzbot/base/vzbot_global_standard.inst.cfg +++ b/resources/quality/vzbot/base/vzbot_global_standard.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Standard Quality definition = vzbot_base +name = Standard Quality +version = 4 [metadata] +global_quality = True +quality_type = standard setting_version = 20 type = quality -quality_type = standard weight = -3 -global_quality = True [values] layer_height = 0.2 layer_height_0 = 0.2 +support_interface_height = =layer_height*4 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 index edaab249fd..58c344bd20 100644 --- a/resources/quality/vzbot/base/vzbot_global_super.inst.cfg +++ b/resources/quality/vzbot/base/vzbot_global_super.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Super Quality definition = vzbot_base +name = Super Quality +version = 4 [metadata] +global_quality = True +quality_type = super setting_version = 20 type = quality -quality_type = super weight = -1 -global_quality = True [values] layer_height = 0.12 layer_height_0 = 0.12 +support_interface_height = =layer_height*8 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 index b0be2d68d1..471b4a65f7 100644 --- a/resources/quality/vzbot/base/vzbot_global_ultra.inst.cfg +++ b/resources/quality/vzbot/base/vzbot_global_ultra.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Ultra Quality definition = vzbot_base +name = Ultra Quality +version = 4 [metadata] +global_quality = True +quality_type = ultra setting_version = 20 type = quality -quality_type = ultra weight = 0 -global_quality = True [values] layer_height = 0.08 layer_height_0 = 0.12 +support_interface_height = =layer_height*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/weedo_x40/Extrudr/weedo_x40_0.4_extrudr_GreenTECPro_Black_Draft.inst.cfg b/resources/quality/weedo_x40/Extrudr/weedo_x40_0.4_extrudr_GreenTECPro_Black_Draft.inst.cfg index 988b9bbacb..1f71d32432 100644 --- a/resources/quality/weedo_x40/Extrudr/weedo_x40_0.4_extrudr_GreenTECPro_Black_Draft.inst.cfg +++ b/resources/quality/weedo_x40/Extrudr/weedo_x40_0.4_extrudr_GreenTECPro_Black_Draft.inst.cfg @@ -1,27 +1,27 @@ [general] -version = 4 -name = Draft definition = weedo_x40 +name = Draft +version = 4 [metadata] +material = Extrudr_GreenTECPro_Black_175 +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = 0 -material = Extrudr_GreenTECPro_Black_175 variant = 0.4mm Nozzle +weight = 0 [values] -speed_print = 60 layer_height_0 = =round(layer_height * 1.25, 2) -material_print_temperature_layer_0 = =material_print_temperature + 10 -material_initial_print_temperature = =material_print_temperature - 5 -material_final_print_temperature = =material_print_temperature - 5 material_bed_temperature = =default_material_bed_temperature -material_bed_temperature_layer_0= =material_bed_temperature + 10 +material_bed_temperature_layer_0 = =material_bed_temperature + 10 +material_final_print_temperature = =material_print_temperature - 5 material_flow_layer_0 = =material_flow + 4 -skirt_brim_material_flow= =material_flow + 4 +material_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature_layer_0 = =material_print_temperature + 10 material_standby_temperature = 100 -support_z_distance = 0.2 +skirt_brim_material_flow = =material_flow + 4 +speed_print = 60 support_xy_distance = 0.8 +support_z_distance = 0.2 diff --git a/resources/quality/weedo_x40/Extrudr/weedo_x40_0.4_extrudr_GreenTECPro_Black_Extra_Fine.inst.cfg b/resources/quality/weedo_x40/Extrudr/weedo_x40_0.4_extrudr_GreenTECPro_Black_Extra_Fine.inst.cfg index cec8414864..fd5462412d 100644 --- a/resources/quality/weedo_x40/Extrudr/weedo_x40_0.4_extrudr_GreenTECPro_Black_Extra_Fine.inst.cfg +++ b/resources/quality/weedo_x40/Extrudr/weedo_x40_0.4_extrudr_GreenTECPro_Black_Extra_Fine.inst.cfg @@ -1,26 +1,26 @@ [general] -version = 4 -name = Extra Fine definition = weedo_x40 +name = Extra Fine +version = 4 [metadata] +material = Extrudr_GreenTECPro_Black_175 +quality_type = extra fine setting_version = 20 type = quality -quality_type = extra fine -weight = 0 -material = Extrudr_GreenTECPro_Black_175 variant = 0.4mm Nozzle +weight = 0 [values] -speed_print = 30 -material_print_temperature_layer_0 = =material_print_temperature + 10 -material_initial_print_temperature = =material_print_temperature - 5 -material_final_print_temperature = =material_print_temperature - 5 material_bed_temperature = =default_material_bed_temperature -material_bed_temperature_layer_0= =material_bed_temperature + 10 +material_bed_temperature_layer_0 = =material_bed_temperature + 10 +material_final_print_temperature = =material_print_temperature - 5 material_flow_layer_0 = =material_flow + 4 -skirt_brim_material_flow= =material_flow + 4 +material_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature_layer_0 = =material_print_temperature + 10 material_standby_temperature = 100 -support_z_distance = 0.2 +skirt_brim_material_flow = =material_flow + 4 +speed_print = 30 support_xy_distance = 0.8 +support_z_distance = 0.2 diff --git a/resources/quality/weedo_x40/Extrudr/weedo_x40_0.4_extrudr_GreenTECPro_Black_Fine.inst.cfg b/resources/quality/weedo_x40/Extrudr/weedo_x40_0.4_extrudr_GreenTECPro_Black_Fine.inst.cfg index 8359062e11..78a98b4117 100644 --- a/resources/quality/weedo_x40/Extrudr/weedo_x40_0.4_extrudr_GreenTECPro_Black_Fine.inst.cfg +++ b/resources/quality/weedo_x40/Extrudr/weedo_x40_0.4_extrudr_GreenTECPro_Black_Fine.inst.cfg @@ -1,26 +1,26 @@ [general] -version = 4 -name = Fine definition = weedo_x40 +name = Fine +version = 4 [metadata] +material = Extrudr_GreenTECPro_Black_175 +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = Extrudr_GreenTECPro_Black_175 variant = 0.4mm Nozzle +weight = 0 [values] -speed_print = 40 -material_print_temperature_layer_0 = =material_print_temperature + 10 -material_initial_print_temperature = =material_print_temperature - 5 -material_final_print_temperature = =material_print_temperature - 5 material_bed_temperature = =default_material_bed_temperature -material_bed_temperature_layer_0= =material_bed_temperature + 10 +material_bed_temperature_layer_0 = =material_bed_temperature + 10 +material_final_print_temperature = =material_print_temperature - 5 material_flow_layer_0 = =material_flow + 4 -skirt_brim_material_flow= =material_flow + 4 +material_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature_layer_0 = =material_print_temperature + 10 material_standby_temperature = 100 -support_z_distance = 0.2 +skirt_brim_material_flow = =material_flow + 4 +speed_print = 40 support_xy_distance = 0.8 +support_z_distance = 0.2 diff --git a/resources/quality/weedo_x40/Extrudr/weedo_x40_0.4_extrudr_GreenTECPro_Black_Normal.inst.cfg b/resources/quality/weedo_x40/Extrudr/weedo_x40_0.4_extrudr_GreenTECPro_Black_Normal.inst.cfg index f507065654..c80b982cda 100644 --- a/resources/quality/weedo_x40/Extrudr/weedo_x40_0.4_extrudr_GreenTECPro_Black_Normal.inst.cfg +++ b/resources/quality/weedo_x40/Extrudr/weedo_x40_0.4_extrudr_GreenTECPro_Black_Normal.inst.cfg @@ -1,42 +1,26 @@ [general] -version = 4 -name = Normal definition = weedo_x40 +name = Normal +version = 4 [metadata] +material = Extrudr_GreenTECPro_Black_175 +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = Extrudr_GreenTECPro_Black_175 variant = 0.4mm Nozzle +weight = 0 [values] -speed_print = 50 -material_print_temperature_layer_0 = =material_print_temperature + 10 -material_initial_print_temperature = =material_print_temperature - 5 -material_final_print_temperature = =material_print_temperature - 5 material_bed_temperature = =default_material_bed_temperature -material_bed_temperature_layer_0= =material_bed_temperature + 10 +material_bed_temperature_layer_0 = =material_bed_temperature + 10 +material_final_print_temperature = =material_print_temperature - 5 material_flow_layer_0 = =material_flow + 4 -skirt_brim_material_flow= =material_flow + 4 +material_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature_layer_0 = =material_print_temperature + 10 material_standby_temperature = 100 -support_z_distance = 0.2 +skirt_brim_material_flow = =material_flow + 4 +speed_print = 50 support_xy_distance = 0.8 - - - - - - - - - - - - - - - - +support_z_distance = 0.2 diff --git a/resources/quality/weedo_x40/Verbatim/weedo_x40_0.4_Verbatim_BVOH_Draft.inst.cfg b/resources/quality/weedo_x40/Verbatim/weedo_x40_0.4_Verbatim_BVOH_Draft.inst.cfg index 15542545f5..76b985d04b 100644 --- a/resources/quality/weedo_x40/Verbatim/weedo_x40_0.4_Verbatim_BVOH_Draft.inst.cfg +++ b/resources/quality/weedo_x40/Verbatim/weedo_x40_0.4_Verbatim_BVOH_Draft.inst.cfg @@ -1,19 +1,19 @@ [general] -version = 4 -name = Draft definition = weedo_x40 +name = Draft +version = 4 [metadata] +material = verbatim_bvoh_175 +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = 0 -material = verbatim_bvoh_175 variant = 0.4mm Nozzle +weight = 0 [values] layer_height_0 = =round(layer_height * 1.25, 2) speed_print = 30 -support_z_distance = 0 support_xy_distance = 0.2 +support_z_distance = 0 diff --git a/resources/quality/weedo_x40/Verbatim/weedo_x40_0.4_Verbatim_BVOH_Extra_Fine.inst.cfg b/resources/quality/weedo_x40/Verbatim/weedo_x40_0.4_Verbatim_BVOH_Extra_Fine.inst.cfg index 1f386cef5e..fb31c2957d 100644 --- a/resources/quality/weedo_x40/Verbatim/weedo_x40_0.4_Verbatim_BVOH_Extra_Fine.inst.cfg +++ b/resources/quality/weedo_x40/Verbatim/weedo_x40_0.4_Verbatim_BVOH_Extra_Fine.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Extra Fine definition = weedo_x40 +name = Extra Fine +version = 4 [metadata] +material = verbatim_bvoh_175 +quality_type = extra fine setting_version = 20 type = quality -quality_type = extra fine -weight = 0 -material = verbatim_bvoh_175 variant = 0.4mm Nozzle +weight = 0 [values] layer_height_0 = =round(layer_height * 1.5, 2) speed_print = 30 -support_z_distance = 0 support_xy_distance = 0.2 +support_z_distance = 0 + diff --git a/resources/quality/weedo_x40/Verbatim/weedo_x40_0.4_Verbatim_BVOH_Fine.inst.cfg b/resources/quality/weedo_x40/Verbatim/weedo_x40_0.4_Verbatim_BVOH_Fine.inst.cfg index 2e067944ac..f81c29a958 100644 --- a/resources/quality/weedo_x40/Verbatim/weedo_x40_0.4_Verbatim_BVOH_Fine.inst.cfg +++ b/resources/quality/weedo_x40/Verbatim/weedo_x40_0.4_Verbatim_BVOH_Fine.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Fine definition = weedo_x40 +name = Fine +version = 4 [metadata] +material = verbatim_bvoh_175 +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = verbatim_bvoh_175 variant = 0.4mm Nozzle +weight = 0 [values] layer_height_0 = =round(layer_height * 1.5, 2) speed_print = 30 -support_z_distance = 0 support_xy_distance = 0.2 +support_z_distance = 0 + diff --git a/resources/quality/weedo_x40/Verbatim/weedo_x40_0.4_Verbatim_BVOH_Normal.inst.cfg b/resources/quality/weedo_x40/Verbatim/weedo_x40_0.4_Verbatim_BVOH_Normal.inst.cfg index ae4bd81ca2..0b3af470bf 100644 --- a/resources/quality/weedo_x40/Verbatim/weedo_x40_0.4_Verbatim_BVOH_Normal.inst.cfg +++ b/resources/quality/weedo_x40/Verbatim/weedo_x40_0.4_Verbatim_BVOH_Normal.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Normal definition = weedo_x40 +name = Normal +version = 4 [metadata] +material = verbatim_bvoh_175 +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = verbatim_bvoh_175 variant = 0.4mm Nozzle +weight = 0 [values] layer_height_0 = =round(layer_height * 1.5, 2) speed_print = 30 -support_z_distance = 0 support_xy_distance = 0.2 +support_z_distance = 0 + diff --git a/resources/quality/weedo_x40/Verbatim/weedo_x40_0.6_Verbatim_BVOH_Coarse.inst.cfg b/resources/quality/weedo_x40/Verbatim/weedo_x40_0.6_Verbatim_BVOH_Coarse.inst.cfg index db94cb8022..b21b14210c 100644 --- a/resources/quality/weedo_x40/Verbatim/weedo_x40_0.6_Verbatim_BVOH_Coarse.inst.cfg +++ b/resources/quality/weedo_x40/Verbatim/weedo_x40_0.6_Verbatim_BVOH_Coarse.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Draft definition = weedo_x40 +name = Draft +version = 4 [metadata] +material = verbatim_bvoh_175 +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = 0 -material = verbatim_bvoh_175 variant = 0.6mm Nozzle +weight = 0 [values] layer_height_0 = =round(layer_height * 1.25, 2) speed_print = 30 -support_z_distance = 0 support_xy_distance = 0.2 +support_z_distance = 0 + diff --git a/resources/quality/weedo_x40/Verbatim/weedo_x40_0.6_Verbatim_BVOH_Draft.inst.cfg b/resources/quality/weedo_x40/Verbatim/weedo_x40_0.6_Verbatim_BVOH_Draft.inst.cfg index c6aa0d67e5..8339342261 100644 --- a/resources/quality/weedo_x40/Verbatim/weedo_x40_0.6_Verbatim_BVOH_Draft.inst.cfg +++ b/resources/quality/weedo_x40/Verbatim/weedo_x40_0.6_Verbatim_BVOH_Draft.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Draft definition = weedo_x40 +name = Draft +version = 4 [metadata] +material = verbatim_bvoh_175 +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = 0 -material = verbatim_bvoh_175 variant = 0.6mm Nozzle +weight = 0 [values] layer_height_0 = =round(layer_height * 1.25, 2) speed_print = 30 -support_z_distance = 0 support_xy_distance = 0.2 +support_z_distance = 0 + diff --git a/resources/quality/weedo_x40/Verbatim/weedo_x40_0.6_Verbatim_BVOH_Fine.inst.cfg b/resources/quality/weedo_x40/Verbatim/weedo_x40_0.6_Verbatim_BVOH_Fine.inst.cfg index 746524f862..b57df65348 100644 --- a/resources/quality/weedo_x40/Verbatim/weedo_x40_0.6_Verbatim_BVOH_Fine.inst.cfg +++ b/resources/quality/weedo_x40/Verbatim/weedo_x40_0.6_Verbatim_BVOH_Fine.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Fine definition = weedo_x40 +name = Fine +version = 4 [metadata] +material = verbatim_bvoh_175 +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = verbatim_bvoh_175 variant = 0.6mm Nozzle +weight = 0 [values] layer_height_0 = =round(layer_height * 1.5, 2) speed_print = 30 -support_z_distance = 0 support_xy_distance = 0.2 +support_z_distance = 0 + diff --git a/resources/quality/weedo_x40/Verbatim/weedo_x40_0.6_Verbatim_BVOH_Normal.inst.cfg b/resources/quality/weedo_x40/Verbatim/weedo_x40_0.6_Verbatim_BVOH_Normal.inst.cfg index 67c2d82eb7..e1f669752b 100644 --- a/resources/quality/weedo_x40/Verbatim/weedo_x40_0.6_Verbatim_BVOH_Normal.inst.cfg +++ b/resources/quality/weedo_x40/Verbatim/weedo_x40_0.6_Verbatim_BVOH_Normal.inst.cfg @@ -1,18 +1,19 @@ [general] -version = 4 -name = Normal definition = weedo_x40 +name = Normal +version = 4 [metadata] +material = verbatim_bvoh_175 +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = verbatim_bvoh_175 variant = 0.6mm Nozzle +weight = 0 [values] layer_height_0 = =round(layer_height * 1.5, 2) speed_print = 30 -support_z_distance = 0 support_xy_distance = 0.2 +support_z_distance = 0 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_ABS_Draft.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_ABS_Draft.inst.cfg index 05e0b77b26..79fdcc0fc1 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_ABS_Draft.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_ABS_Draft.inst.cfg @@ -1,17 +1,17 @@ -[general] -version = 4 -name = Draft -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = draft -weight = -1 -material = generic_abs_175 -variant = 0.4mm Nozzle - -[values] -layer_height_0 = =round(layer_height * 1.25, 2) -speed_print = 60 - +[general] +definition = weedo_x40 +name = Draft +version = 4 + +[metadata] +material = generic_abs_175 +quality_type = draft +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = -1 + +[values] +layer_height_0 = =round(layer_height * 1.25, 2) +speed_print = 60 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_ABS_Extra_Fine.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_ABS_Extra_Fine.inst.cfg index 1d66f651b3..5ec2d2d5ed 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_ABS_Extra_Fine.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_ABS_Extra_Fine.inst.cfg @@ -1,16 +1,16 @@ -[general] -version = 4 -name = Extra Fine -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = extra fine -weight = 1 -material = generic_abs_175 -variant = 0.4mm Nozzle - - -[values] -speed_print = 30 +[general] +definition = weedo_x40 +name = Extra Fine +version = 4 + +[metadata] +material = generic_abs_175 +quality_type = extra fine +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 1 + +[values] +speed_print = 30 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_ABS_Fine.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_ABS_Fine.inst.cfg index 924d1c4db9..7e0ad1ab0e 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_ABS_Fine.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_ABS_Fine.inst.cfg @@ -1,17 +1,16 @@ -[general] -version = 4 -name = Fine -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = fine -weight = 0 -material = generic_abs_175 -variant = 0.4mm Nozzle - - -[values] -speed_print = 35 - +[general] +definition = weedo_x40 +name = Fine +version = 4 + +[metadata] +material = generic_abs_175 +quality_type = fine +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 0 + +[values] +speed_print = 35 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_ABS_Normal.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_ABS_Normal.inst.cfg index 258fe641ee..47a531f917 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_ABS_Normal.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_ABS_Normal.inst.cfg @@ -1,17 +1,16 @@ -[general] -version = 4 -name = Normal -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = normal -weight = 0 -material = generic_abs_175 -variant = 0.4mm Nozzle - -[values] -speed_print = 40 - - +[general] +definition = weedo_x40 +name = Normal +version = 4 + +[metadata] +material = generic_abs_175 +quality_type = normal +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 0 + +[values] +speed_print = 40 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_ASA_Draft.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_ASA_Draft.inst.cfg index ab40d8c336..6ed4843237 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_ASA_Draft.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_ASA_Draft.inst.cfg @@ -1,17 +1,17 @@ -[general] -version = 4 -name = Draft -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = draft -weight = 0 -material = generic_asa_175 -variant = 0.4mm Nozzle - -[values] -layer_height_0 = =round(layer_height * 1.25, 2) -speed_print = 60 - +[general] +definition = weedo_x40 +name = Draft +version = 4 + +[metadata] +material = generic_asa_175 +quality_type = draft +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 0 + +[values] +layer_height_0 = =round(layer_height * 1.25, 2) +speed_print = 60 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_ASA_Extra_Fine.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_ASA_Extra_Fine.inst.cfg index 10f0dfda19..212d8b30c9 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_ASA_Extra_Fine.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_ASA_Extra_Fine.inst.cfg @@ -1,16 +1,16 @@ -[general] -version = 4 -name = Extra Fine -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = extra fine -weight = 1 -material = generic_asa_175 -variant = 0.4mm Nozzle - - -[values] -speed_print = 30 +[general] +definition = weedo_x40 +name = Extra Fine +version = 4 + +[metadata] +material = generic_asa_175 +quality_type = extra fine +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 1 + +[values] +speed_print = 30 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_ASA_Fine.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_ASA_Fine.inst.cfg index 1a06b16fc4..b13c3afd56 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_ASA_Fine.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_ASA_Fine.inst.cfg @@ -1,16 +1,16 @@ -[general] -version = 4 -name = Fine -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = fine -weight = 0 -material = generic_asa_175 -variant = 0.4mm Nozzle - - -[values] -speed_print = 35 +[general] +definition = weedo_x40 +name = Fine +version = 4 + +[metadata] +material = generic_asa_175 +quality_type = fine +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 0 + +[values] +speed_print = 35 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_ASA_Normal.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_ASA_Normal.inst.cfg index 9fc019b203..6fd7720b9b 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_ASA_Normal.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_ASA_Normal.inst.cfg @@ -1,16 +1,16 @@ -[general] -version = 4 -name = Normal -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = normal -weight = 0 -material = generic_asa_175 -variant = 0.4mm Nozzle - -[values] -speed_print = 40 - +[general] +definition = weedo_x40 +name = Normal +version = 4 + +[metadata] +material = generic_asa_175 +quality_type = normal +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 0 + +[values] +speed_print = 40 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_BVOH_Draft.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_BVOH_Draft.inst.cfg index f7bb4e49c7..9c6768dfed 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_BVOH_Draft.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_BVOH_Draft.inst.cfg @@ -1,21 +1,21 @@ -[general] -version = 4 -name = Draft -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = draft -weight = 0 -material = generic_bvoh_175 -variant = 0.4mm Nozzle - -[values] -layer_height_0 = =round(layer_height * 1.25, 2) -speed_print = 30 -support_z_distance = 0 -support_xy_distance = 0.2 -support_brim_enable = True -support_interface_enable = True - +[general] +definition = weedo_x40 +name = Draft +version = 4 + +[metadata] +material = generic_bvoh_175 +quality_type = draft +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 0 + +[values] +layer_height_0 = =round(layer_height * 1.25, 2) +speed_print = 30 +support_brim_enable = True +support_interface_enable = True +support_xy_distance = 0.2 +support_z_distance = 0 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_BVOH_Extra_Fine.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_BVOH_Extra_Fine.inst.cfg index 39166e900a..9c84cd3f0d 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_BVOH_Extra_Fine.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_BVOH_Extra_Fine.inst.cfg @@ -1,20 +1,20 @@ -[general] -version = 4 -name = Extra Fine -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = extra fine -weight = 0 -material = generic_bvoh_175 -variant = 0.4mm Nozzle - -[values] -speed_print = 30 -support_z_distance = 0 -support_xy_distance = 0.2 -support_brim_enable = True -support_interface_enable = True - +[general] +definition = weedo_x40 +name = Extra Fine +version = 4 + +[metadata] +material = generic_bvoh_175 +quality_type = extra fine +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 0 + +[values] +speed_print = 30 +support_brim_enable = True +support_interface_enable = True +support_xy_distance = 0.2 +support_z_distance = 0 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_BVOH_Fine.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_BVOH_Fine.inst.cfg index 1464fe02d4..2b41165b8d 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_BVOH_Fine.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_BVOH_Fine.inst.cfg @@ -1,20 +1,20 @@ -[general] -version = 4 -name = Fine -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = fine -weight = 0 -material = generic_bvoh_175 -variant = 0.4mm Nozzle - -[values] -speed_print = 30 -support_z_distance = 0 -support_xy_distance = 0.2 -support_brim_enable = True -support_interface_enable = True - +[general] +definition = weedo_x40 +name = Fine +version = 4 + +[metadata] +material = generic_bvoh_175 +quality_type = fine +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 0 + +[values] +speed_print = 30 +support_brim_enable = True +support_interface_enable = True +support_xy_distance = 0.2 +support_z_distance = 0 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_BVOH_Normal.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_BVOH_Normal.inst.cfg index 1dbe07e8a0..0f2034da9b 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_BVOH_Normal.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_BVOH_Normal.inst.cfg @@ -1,20 +1,20 @@ -[general] -version = 4 -name = Normal -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = normal -weight = 0 -material = generic_bvoh_175 -variant = 0.4mm Nozzle - -[values] -speed_print = 30 -support_z_distance = 0 -support_xy_distance = 0.2 -support_brim_enable = True -support_interface_enable = True - +[general] +definition = weedo_x40 +name = Normal +version = 4 + +[metadata] +material = generic_bvoh_175 +quality_type = normal +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 0 + +[values] +speed_print = 30 +support_brim_enable = True +support_interface_enable = True +support_xy_distance = 0.2 +support_z_distance = 0 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_CPE_Draft.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_CPE_Draft.inst.cfg index c964cf9e19..66a2f989e1 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_CPE_Draft.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_CPE_Draft.inst.cfg @@ -1,18 +1,17 @@ -[general] -version = 4 -name = Draft -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = draft -weight = 0 -material = generic_cpe_175 -variant = 0.4mm Nozzle - -[values] -layer_height_0 = =round(layer_height * 1.25, 2) -speed_print = 60 - - +[general] +definition = weedo_x40 +name = Draft +version = 4 + +[metadata] +material = generic_cpe_175 +quality_type = draft +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 0 + +[values] +layer_height_0 = =round(layer_height * 1.25, 2) +speed_print = 60 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_CPE_Extra_Fine.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_CPE_Extra_Fine.inst.cfg index 3f3c0d4b0a..aa3f7569fe 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_CPE_Extra_Fine.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_CPE_Extra_Fine.inst.cfg @@ -1,17 +1,16 @@ -[general] -version = 4 -name = Extra Fine -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = extra fine -weight = 1 -material = generic_cpe_175 -variant = 0.4mm Nozzle - - -[values] -speed_print = 30 - +[general] +definition = weedo_x40 +name = Extra Fine +version = 4 + +[metadata] +material = generic_cpe_175 +quality_type = extra fine +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 1 + +[values] +speed_print = 30 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_CPE_Fine.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_CPE_Fine.inst.cfg index 4e5669a4ba..2bf9a740bc 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_CPE_Fine.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_CPE_Fine.inst.cfg @@ -1,16 +1,16 @@ -[general] -version = 4 -name = Fine -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = fine -weight = 0 -material = generic_cpe_175 -variant = 0.4mm Nozzle - - -[values] -speed_print = 35 +[general] +definition = weedo_x40 +name = Fine +version = 4 + +[metadata] +material = generic_cpe_175 +quality_type = fine +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 0 + +[values] +speed_print = 35 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_CPE_Normal.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_CPE_Normal.inst.cfg index e60ceda27c..df2c6293e8 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_CPE_Normal.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_CPE_Normal.inst.cfg @@ -1,17 +1,16 @@ -[general] -version = 4 -name = Normal -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = normal -weight = 0 -material = generic_cpe_175 -variant = 0.4mm Nozzle - -[values] -speed_print = 40 - - +[general] +definition = weedo_x40 +name = Normal +version = 4 + +[metadata] +material = generic_cpe_175 +quality_type = normal +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 0 + +[values] +speed_print = 40 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_HIPS_Draft.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_HIPS_Draft.inst.cfg index 344cdf9111..e0c9ae87e2 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_HIPS_Draft.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_HIPS_Draft.inst.cfg @@ -1,18 +1,17 @@ -[general] -version = 4 -name = Draft -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = draft -weight = 0 -material = generic_hips_175 -variant = 0.4mm Nozzle - -[values] -layer_height_0 = =round(layer_height * 1.25, 2) -speed_print = 60 - - +[general] +definition = weedo_x40 +name = Draft +version = 4 + +[metadata] +material = generic_hips_175 +quality_type = draft +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 0 + +[values] +layer_height_0 = =round(layer_height * 1.25, 2) +speed_print = 60 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_HIPS_Extra_Fine.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_HIPS_Extra_Fine.inst.cfg index bd65a7edaf..3802ce93e5 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_HIPS_Extra_Fine.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_HIPS_Extra_Fine.inst.cfg @@ -1,16 +1,16 @@ -[general] -version = 4 -name = Extra Fine -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = extra fine -weight = 1 -material = generic_hips_175 -variant = 0.4mm Nozzle - - -[values] -speed_print = 30 +[general] +definition = weedo_x40 +name = Extra Fine +version = 4 + +[metadata] +material = generic_hips_175 +quality_type = extra fine +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 1 + +[values] +speed_print = 30 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_HIPS_Fine.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_HIPS_Fine.inst.cfg index 8ad87675e7..71fc305a31 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_HIPS_Fine.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_HIPS_Fine.inst.cfg @@ -1,17 +1,16 @@ -[general] -version = 4 -name = Fine -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = fine -weight = 0 -material = generic_hips_175 -variant = 0.4mm Nozzle - - -[values] -speed_print = 35 - +[general] +definition = weedo_x40 +name = Fine +version = 4 + +[metadata] +material = generic_hips_175 +quality_type = fine +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 0 + +[values] +speed_print = 35 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_HIPS_Normal.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_HIPS_Normal.inst.cfg index e057284762..4cce9b72c3 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_HIPS_Normal.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_HIPS_Normal.inst.cfg @@ -1,17 +1,16 @@ -[general] -version = 4 -name = Normal -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = normal -weight = 0 -material = generic_hips_175 -variant = 0.4mm Nozzle - -[values] -speed_print = 40 - - +[general] +definition = weedo_x40 +name = Normal +version = 4 + +[metadata] +material = generic_hips_175 +quality_type = normal +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 0 + +[values] +speed_print = 40 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_PETG_Draft.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_PETG_Draft.inst.cfg index c919bb7dc7..89a91d3e23 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_PETG_Draft.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_PETG_Draft.inst.cfg @@ -1,18 +1,17 @@ -[general] -version = 4 -name = Draft -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = draft -weight = 0 -material = generic_petg_175 -variant = 0.4mm Nozzle - -[values] -layer_height_0 = =round(layer_height * 1.25, 2) -speed_print = 60 - - +[general] +definition = weedo_x40 +name = Draft +version = 4 + +[metadata] +material = generic_petg_175 +quality_type = draft +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 0 + +[values] +layer_height_0 = =round(layer_height * 1.25, 2) +speed_print = 60 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_PETG_Extra_Fine.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_PETG_Extra_Fine.inst.cfg index ef7425e745..d2dd6bc407 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_PETG_Extra_Fine.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_PETG_Extra_Fine.inst.cfg @@ -1,17 +1,16 @@ -[general] -version = 4 -name = Extra Fine -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = extra fine -weight = 1 -material = generic_petg_175 -variant = 0.4mm Nozzle - - -[values] -speed_print = 30 - +[general] +definition = weedo_x40 +name = Extra Fine +version = 4 + +[metadata] +material = generic_petg_175 +quality_type = extra fine +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 1 + +[values] +speed_print = 30 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_PETG_Fine.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_PETG_Fine.inst.cfg index 32915bd4d7..84d402f23f 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_PETG_Fine.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_PETG_Fine.inst.cfg @@ -1,18 +1,16 @@ -[general] -version = 4 -name = Fine -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = fine -weight = 0 -material = generic_petg_175 -variant = 0.4mm Nozzle - - -[values] -speed_print = 35 - - +[general] +definition = weedo_x40 +name = Fine +version = 4 + +[metadata] +material = generic_petg_175 +quality_type = fine +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 0 + +[values] +speed_print = 35 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_PETG_Normal.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_PETG_Normal.inst.cfg index df2c4d6c21..c1ba18a7c4 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_PETG_Normal.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_PETG_Normal.inst.cfg @@ -1,16 +1,16 @@ -[general] -version = 4 -name = Normal -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = normal -weight = 0 -material = generic_petg_175 -variant = 0.4mm Nozzle - -[values] -speed_print = 40 - +[general] +definition = weedo_x40 +name = Normal +version = 4 + +[metadata] +material = generic_petg_175 +quality_type = normal +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 0 + +[values] +speed_print = 40 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_PLA_Draft.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_PLA_Draft.inst.cfg index a56f72ca70..38bd56055d 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_PLA_Draft.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_PLA_Draft.inst.cfg @@ -1,17 +1,17 @@ -[general] -version = 4 -name = Draft -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = draft -weight = 0 -material = generic_pla_175 -variant = 0.4mm Nozzle - -[values] -layer_height_0 = =round(layer_height * 1.25, 2) -speed_print = 60 - +[general] +definition = weedo_x40 +name = Draft +version = 4 + +[metadata] +material = generic_pla_175 +quality_type = draft +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 0 + +[values] +layer_height_0 = =round(layer_height * 1.25, 2) +speed_print = 60 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_PLA_Extra_Fine.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_PLA_Extra_Fine.inst.cfg index 1482e697a5..fb37e51d96 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_PLA_Extra_Fine.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_PLA_Extra_Fine.inst.cfg @@ -1,16 +1,16 @@ -[general] -version = 4 -name = Extra Fine -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = extra fine -weight = 1 -material = generic_pla_175 -variant = 0.4mm Nozzle - - -[values] -speed_print = 30 +[general] +definition = weedo_x40 +name = Extra Fine +version = 4 + +[metadata] +material = generic_pla_175 +quality_type = extra fine +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 1 + +[values] +speed_print = 30 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_PLA_Fine.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_PLA_Fine.inst.cfg index a4b13ee4fa..e5a5c7dc0a 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_PLA_Fine.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_PLA_Fine.inst.cfg @@ -1,17 +1,16 @@ -[general] -version = 4 -name = Fine -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = fine -weight = 0 -material = generic_pla_175 -variant = 0.4mm Nozzle - - -[values] -speed_print = 35 - +[general] +definition = weedo_x40 +name = Fine +version = 4 + +[metadata] +material = generic_pla_175 +quality_type = fine +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 0 + +[values] +speed_print = 35 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_PLA_Normal.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_PLA_Normal.inst.cfg index e6e9da2507..e2d8310a89 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_PLA_Normal.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_PLA_Normal.inst.cfg @@ -1,15 +1,16 @@ -[general] -version = 4 -name = Normal -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = normal -weight = 0 -material = generic_pla_175 -variant = 0.4mm Nozzle - -[values] -speed_print = 40 +[general] +definition = weedo_x40 +name = Normal +version = 4 + +[metadata] +material = generic_pla_175 +quality_type = normal +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 0 + +[values] +speed_print = 40 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_PVA_Draft.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_PVA_Draft.inst.cfg index 33f2750a77..38296a9daa 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_PVA_Draft.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_PVA_Draft.inst.cfg @@ -1,21 +1,21 @@ -[general] -version = 4 -name = Draft -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = draft -weight = 0 -material = generic_pva_175 -variant = 0.4mm Nozzle - -[values] -layer_height_0 = =round(layer_height * 1.25, 2) -speed_print = 30 -support_z_distance = 0 -support_xy_distance = 0.2 -support_brim_enable = True -support_interface_enable = True - +[general] +definition = weedo_x40 +name = Draft +version = 4 + +[metadata] +material = generic_pva_175 +quality_type = draft +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 0 + +[values] +layer_height_0 = =round(layer_height * 1.25, 2) +speed_print = 30 +support_brim_enable = True +support_interface_enable = True +support_xy_distance = 0.2 +support_z_distance = 0 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_PVA_Extra_Fine.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_PVA_Extra_Fine.inst.cfg index a7e97ff27b..91391fe2b0 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_PVA_Extra_Fine.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_PVA_Extra_Fine.inst.cfg @@ -1,20 +1,20 @@ -[general] -version = 4 -name = Extra Fine -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = extra fine -weight = 0 -material = generic_pva_175 -variant = 0.4mm Nozzle - -[values] -speed_print = 30 -support_z_distance = 0 -support_xy_distance = 0.2 -support_brim_enable = True -support_interface_enable = True - +[general] +definition = weedo_x40 +name = Extra Fine +version = 4 + +[metadata] +material = generic_pva_175 +quality_type = extra fine +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 0 + +[values] +speed_print = 30 +support_brim_enable = True +support_interface_enable = True +support_xy_distance = 0.2 +support_z_distance = 0 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_PVA_Fine.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_PVA_Fine.inst.cfg index edc0d1e320..0aa3682f2a 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_PVA_Fine.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_PVA_Fine.inst.cfg @@ -1,20 +1,20 @@ -[general] -version = 4 -name = Fine -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = fine -weight = 0 -material = generic_pva_175 -variant = 0.4mm Nozzle - -[values] -speed_print = 30 -support_z_distance = 0 -support_xy_distance = 0.2 -support_brim_enable = True -support_interface_enable = True - +[general] +definition = weedo_x40 +name = Fine +version = 4 + +[metadata] +material = generic_pva_175 +quality_type = fine +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 0 + +[values] +speed_print = 30 +support_brim_enable = True +support_interface_enable = True +support_xy_distance = 0.2 +support_z_distance = 0 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_PVA_Normal.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_PVA_Normal.inst.cfg index 76264fa7e7..81778ec8f1 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_PVA_Normal.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_PVA_Normal.inst.cfg @@ -1,20 +1,20 @@ -[general] -version = 4 -name = Normal -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = normal -weight = 0 -material = generic_pva_175 -variant = 0.4mm Nozzle - -[values] -speed_print = 30 -support_z_distance = 0 -support_xy_distance = 0.2 -support_brim_enable = True -support_interface_enable = True - +[general] +definition = weedo_x40 +name = Normal +version = 4 + +[metadata] +material = generic_pva_175 +quality_type = normal +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 0 + +[values] +speed_print = 30 +support_brim_enable = True +support_interface_enable = True +support_xy_distance = 0.2 +support_z_distance = 0 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_TPU_Draft.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_TPU_Draft.inst.cfg index c65c43d4b1..4237e59472 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_TPU_Draft.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_TPU_Draft.inst.cfg @@ -1,16 +1,17 @@ -[general] -version = 4 -name = Draft -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = draft -weight = 0 -material = generic_tpu_175 -variant = 0.4mm Nozzle - -[values] -layer_height_0 = =round(layer_height * 1.25, 2) -speed_print = 60 +[general] +definition = weedo_x40 +name = Draft +version = 4 + +[metadata] +material = generic_tpu_175 +quality_type = draft +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 0 + +[values] +layer_height_0 = =round(layer_height * 1.25, 2) +speed_print = 60 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_TPU_Extra_Fine.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_TPU_Extra_Fine.inst.cfg index ad0635b33c..7c958b4a31 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_TPU_Extra_Fine.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_TPU_Extra_Fine.inst.cfg @@ -1,16 +1,16 @@ -[general] -version = 4 -name = Extra Fine -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = extra fine -weight = 1 -material = generic_tpu_175 -variant = 0.4mm Nozzle - - -[values] -speed_print = 30 +[general] +definition = weedo_x40 +name = Extra Fine +version = 4 + +[metadata] +material = generic_tpu_175 +quality_type = extra fine +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 1 + +[values] +speed_print = 30 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_TPU_Fine.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_TPU_Fine.inst.cfg index 1e022547f9..2ef41f4e3d 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_TPU_Fine.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_TPU_Fine.inst.cfg @@ -1,17 +1,16 @@ -[general] -version = 4 -name = Fine -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = fine -weight = 0 -material = generic_tpu_175 -variant = 0.4mm Nozzle - - -[values] -speed_print = 35 - +[general] +definition = weedo_x40 +name = Fine +version = 4 + +[metadata] +material = generic_tpu_175 +quality_type = fine +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 0 + +[values] +speed_print = 35 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.4_generic_TPU_Normal.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.4_generic_TPU_Normal.inst.cfg index 04dfacdbc9..0442f8b4ba 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.4_generic_TPU_Normal.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.4_generic_TPU_Normal.inst.cfg @@ -1,16 +1,16 @@ -[general] -version = 4 -name = Normal -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = normal -weight = 0 -material = generic_tpu_175 -variant = 0.4mm Nozzle - -[values] -speed_print = 40 - +[general] +definition = weedo_x40 +name = Normal +version = 4 + +[metadata] +material = generic_tpu_175 +quality_type = normal +setting_version = 20 +type = quality +variant = 0.4mm Nozzle +weight = 0 + +[values] +speed_print = 40 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_ABS_Coarse.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_ABS_Coarse.inst.cfg index 4ff41d1c2e..fb772e7d4e 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_ABS_Coarse.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_ABS_Coarse.inst.cfg @@ -1,17 +1,17 @@ -[general] -version = 4 -name = Coarse -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = coarse -weight = -1 -material = generic_abs_175 -variant = 0.6mm Nozzle - -[values] -layer_height_0 = =round(layer_height * 1.25, 2) -speed_print = 60 - +[general] +definition = weedo_x40 +name = Coarse +version = 4 + +[metadata] +material = generic_abs_175 +quality_type = coarse +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = -1 + +[values] +layer_height_0 = =round(layer_height * 1.25, 2) +speed_print = 60 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_ABS_Draft.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_ABS_Draft.inst.cfg index 7bba35d6f3..7fb95256e7 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_ABS_Draft.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_ABS_Draft.inst.cfg @@ -1,17 +1,17 @@ -[general] -version = 4 -name = Draft -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = draft -weight = -1 -material = generic_abs_175 -variant = 0.6mm Nozzle - -[values] -layer_height_0 = =round(layer_height * 1.25, 2) -speed_print = 50 - +[general] +definition = weedo_x40 +name = Draft +version = 4 + +[metadata] +material = generic_abs_175 +quality_type = draft +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = -1 + +[values] +layer_height_0 = =round(layer_height * 1.25, 2) +speed_print = 50 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_ABS_Fine.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_ABS_Fine.inst.cfg index d339710508..142bc6950b 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_ABS_Fine.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_ABS_Fine.inst.cfg @@ -1,17 +1,16 @@ -[general] -version = 4 -name = Fine -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = fine -weight = 0 -material = generic_abs_175 -variant = 0.6mm Nozzle - - -[values] -speed_print = 30 - +[general] +definition = weedo_x40 +name = Fine +version = 4 + +[metadata] +material = generic_abs_175 +quality_type = fine +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = 0 + +[values] +speed_print = 30 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_ABS_Normal.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_ABS_Normal.inst.cfg index 3b7b73d031..23b853da88 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_ABS_Normal.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_ABS_Normal.inst.cfg @@ -1,17 +1,16 @@ -[general] -version = 4 -name = Normal -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = normal -weight = 0 -material = generic_abs_175 -variant = 0.6mm Nozzle - -[values] -speed_print = 40 - - +[general] +definition = weedo_x40 +name = Normal +version = 4 + +[metadata] +material = generic_abs_175 +quality_type = normal +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = 0 + +[values] +speed_print = 40 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_ASA_Coarse.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_ASA_Coarse.inst.cfg index 2d3d91081f..a479f8e1a6 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_ASA_Coarse.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_ASA_Coarse.inst.cfg @@ -1,17 +1,17 @@ -[general] -version = 4 -name = Coarse -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = coarse -weight = 0 -material = generic_asa_175 -variant = 0.6mm Nozzle - -[values] -layer_height_0 = =round(layer_height * 1.25, 2) -speed_print = 60 - +[general] +definition = weedo_x40 +name = Coarse +version = 4 + +[metadata] +material = generic_asa_175 +quality_type = coarse +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = 0 + +[values] +layer_height_0 = =round(layer_height * 1.25, 2) +speed_print = 60 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_ASA_Draft.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_ASA_Draft.inst.cfg index 9def859470..9e543fa0d6 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_ASA_Draft.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_ASA_Draft.inst.cfg @@ -1,17 +1,17 @@ -[general] -version = 4 -name = Draft -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = draft -weight = 0 -material = generic_asa_175 -variant = 0.6mm Nozzle - -[values] -layer_height_0 = =round(layer_height * 1.25, 2) -speed_print = 50 - +[general] +definition = weedo_x40 +name = Draft +version = 4 + +[metadata] +material = generic_asa_175 +quality_type = draft +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = 0 + +[values] +layer_height_0 = =round(layer_height * 1.25, 2) +speed_print = 50 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_ASA_Fine.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_ASA_Fine.inst.cfg index 3a5b5dbaae..269ad7f294 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_ASA_Fine.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_ASA_Fine.inst.cfg @@ -1,16 +1,16 @@ -[general] -version = 4 -name = Fine -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = fine -weight = 0 -material = generic_asa_175 -variant = 0.6mm Nozzle - - -[values] -speed_print = 30 +[general] +definition = weedo_x40 +name = Fine +version = 4 + +[metadata] +material = generic_asa_175 +quality_type = fine +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = 0 + +[values] +speed_print = 30 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_ASA_Normal.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_ASA_Normal.inst.cfg index ac122e936e..c51c3644bf 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_ASA_Normal.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_ASA_Normal.inst.cfg @@ -1,16 +1,16 @@ -[general] -version = 4 -name = Normal -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = normal -weight = 0 -material = generic_asa_175 -variant = 0.6mm Nozzle - -[values] -speed_print = 40 - +[general] +definition = weedo_x40 +name = Normal +version = 4 + +[metadata] +material = generic_asa_175 +quality_type = normal +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = 0 + +[values] +speed_print = 40 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_BVOH_Coarse.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_BVOH_Coarse.inst.cfg index ad67b7cdc0..df3214718d 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_BVOH_Coarse.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_BVOH_Coarse.inst.cfg @@ -1,21 +1,21 @@ -[general] -version = 4 -name = Draft -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = coarse -weight = 0 -material = generic_bvoh_175 -variant = 0.6mm Nozzle - -[values] -layer_height_0 = =round(layer_height * 1.25, 2) -speed_print = 30 -support_z_distance = 0 -support_xy_distance = 0.2 -support_brim_enable = True -support_interface_enable = True - +[general] +definition = weedo_x40 +name = Draft +version = 4 + +[metadata] +material = generic_bvoh_175 +quality_type = coarse +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = 0 + +[values] +layer_height_0 = =round(layer_height * 1.25, 2) +speed_print = 30 +support_brim_enable = True +support_interface_enable = True +support_xy_distance = 0.2 +support_z_distance = 0 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_BVOH_Draft.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_BVOH_Draft.inst.cfg index ebcf5cf0e3..f7b7150d63 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_BVOH_Draft.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_BVOH_Draft.inst.cfg @@ -1,21 +1,21 @@ -[general] -version = 4 -name = Draft -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = draft -weight = 0 -material = generic_bvoh_175 -variant = 0.6mm Nozzle - -[values] -layer_height_0 = =round(layer_height * 1.25, 2) -speed_print = 30 -support_z_distance = 0 -support_xy_distance = 0.2 -support_brim_enable = True -support_interface_enable = True - +[general] +definition = weedo_x40 +name = Draft +version = 4 + +[metadata] +material = generic_bvoh_175 +quality_type = draft +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = 0 + +[values] +layer_height_0 = =round(layer_height * 1.25, 2) +speed_print = 30 +support_brim_enable = True +support_interface_enable = True +support_xy_distance = 0.2 +support_z_distance = 0 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_BVOH_Fine.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_BVOH_Fine.inst.cfg index 9baed28e4f..26c27926ff 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_BVOH_Fine.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_BVOH_Fine.inst.cfg @@ -1,20 +1,20 @@ -[general] -version = 4 -name = Fine -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = fine -weight = 0 -material = generic_bvoh_175 -variant = 0.6mm Nozzle - -[values] -speed_print = 30 -support_z_distance = 0 -support_xy_distance = 0.2 -support_brim_enable = True -support_interface_enable = True - +[general] +definition = weedo_x40 +name = Fine +version = 4 + +[metadata] +material = generic_bvoh_175 +quality_type = fine +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = 0 + +[values] +speed_print = 30 +support_brim_enable = True +support_interface_enable = True +support_xy_distance = 0.2 +support_z_distance = 0 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_BVOH_Normal.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_BVOH_Normal.inst.cfg index cd44894bf7..0b37ff11e9 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_BVOH_Normal.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_BVOH_Normal.inst.cfg @@ -1,20 +1,20 @@ -[general] -version = 4 -name = Normal -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = normal -weight = 0 -material = generic_bvoh_175 -variant = 0.6mm Nozzle - -[values] -speed_print = 30 -support_z_distance = 0 -support_xy_distance = 0.2 -support_brim_enable = True -support_interface_enable = True - +[general] +definition = weedo_x40 +name = Normal +version = 4 + +[metadata] +material = generic_bvoh_175 +quality_type = normal +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = 0 + +[values] +speed_print = 30 +support_brim_enable = True +support_interface_enable = True +support_xy_distance = 0.2 +support_z_distance = 0 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_CPE_Coarse.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_CPE_Coarse.inst.cfg index 82f214ca36..c943b09929 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_CPE_Coarse.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_CPE_Coarse.inst.cfg @@ -1,18 +1,17 @@ -[general] -version = 4 -name = Coarse -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = coarse -weight = 0 -material = generic_cpe_175 -variant = 0.6mm Nozzle - -[values] -layer_height_0 = =round(layer_height * 1.25, 2) -speed_print = 60 - - +[general] +definition = weedo_x40 +name = Coarse +version = 4 + +[metadata] +material = generic_cpe_175 +quality_type = coarse +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = 0 + +[values] +layer_height_0 = =round(layer_height * 1.25, 2) +speed_print = 60 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_CPE_Draft.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_CPE_Draft.inst.cfg index 38553f64f9..a8b4cfae29 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_CPE_Draft.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_CPE_Draft.inst.cfg @@ -1,18 +1,17 @@ -[general] -version = 4 -name = Draft -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = draft -weight = 0 -material = generic_cpe_175 -variant = 0.6mm Nozzle - -[values] -layer_height_0 = =round(layer_height * 1.25, 2) -speed_print = 50 - - +[general] +definition = weedo_x40 +name = Draft +version = 4 + +[metadata] +material = generic_cpe_175 +quality_type = draft +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = 0 + +[values] +layer_height_0 = =round(layer_height * 1.25, 2) +speed_print = 50 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_CPE_Fine.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_CPE_Fine.inst.cfg index e812cc0117..2758113028 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_CPE_Fine.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_CPE_Fine.inst.cfg @@ -1,16 +1,16 @@ -[general] -version = 4 -name = Fine -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = fine -weight = 0 -material = generic_cpe_175 -variant = 0.6mm Nozzle - - -[values] -speed_print = 30 +[general] +definition = weedo_x40 +name = Fine +version = 4 + +[metadata] +material = generic_cpe_175 +quality_type = fine +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = 0 + +[values] +speed_print = 30 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_CPE_Normal.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_CPE_Normal.inst.cfg index fb903b8068..fba9c0994d 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_CPE_Normal.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_CPE_Normal.inst.cfg @@ -1,17 +1,16 @@ -[general] -version = 4 -name = Normal -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = normal -weight = 0 -material = generic_cpe_175 -variant = 0.6mm Nozzle - -[values] -speed_print = 40 - - +[general] +definition = weedo_x40 +name = Normal +version = 4 + +[metadata] +material = generic_cpe_175 +quality_type = normal +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = 0 + +[values] +speed_print = 40 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_HIPS_Coarse.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_HIPS_Coarse.inst.cfg index 0ea4b1864a..1a4e198f6d 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_HIPS_Coarse.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_HIPS_Coarse.inst.cfg @@ -1,18 +1,17 @@ -[general] -version = 4 -name = Draft -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = coarse -weight = 0 -material = generic_hips_175 -variant = 0.6mm Nozzle - -[values] -layer_height_0 = =round(layer_height * 1.25, 2) -speed_print = 60 - - +[general] +definition = weedo_x40 +name = Draft +version = 4 + +[metadata] +material = generic_hips_175 +quality_type = coarse +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = 0 + +[values] +layer_height_0 = =round(layer_height * 1.25, 2) +speed_print = 60 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_HIPS_Draft.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_HIPS_Draft.inst.cfg index d7936bcac5..80bb988c86 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_HIPS_Draft.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_HIPS_Draft.inst.cfg @@ -1,18 +1,17 @@ -[general] -version = 4 -name = Draft -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = draft -weight = 0 -material = generic_hips_175 -variant = 0.6mm Nozzle - -[values] -layer_height_0 = =round(layer_height * 1.25, 2) -speed_print = 50 - - +[general] +definition = weedo_x40 +name = Draft +version = 4 + +[metadata] +material = generic_hips_175 +quality_type = draft +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = 0 + +[values] +layer_height_0 = =round(layer_height * 1.25, 2) +speed_print = 50 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_HIPS_Fine.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_HIPS_Fine.inst.cfg index 31a982e224..54e38e12a5 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_HIPS_Fine.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_HIPS_Fine.inst.cfg @@ -1,17 +1,16 @@ -[general] -version = 4 -name = Fine -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = fine -weight = 0 -material = generic_hips_175 -variant = 0.6mm Nozzle - - -[values] -speed_print = 30 - +[general] +definition = weedo_x40 +name = Fine +version = 4 + +[metadata] +material = generic_hips_175 +quality_type = fine +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = 0 + +[values] +speed_print = 30 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_HIPS_Normal.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_HIPS_Normal.inst.cfg index 2890cc9409..9ef43231b5 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_HIPS_Normal.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_HIPS_Normal.inst.cfg @@ -1,17 +1,16 @@ -[general] -version = 4 -name = Normal -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = normal -weight = 0 -material = generic_hips_175 -variant = 0.6mm Nozzle - -[values] -speed_print = 40 - - +[general] +definition = weedo_x40 +name = Normal +version = 4 + +[metadata] +material = generic_hips_175 +quality_type = normal +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = 0 + +[values] +speed_print = 40 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_PETG_Coarse.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_PETG_Coarse.inst.cfg index f39f431da4..f29bd9b69d 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_PETG_Coarse.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_PETG_Coarse.inst.cfg @@ -1,18 +1,17 @@ -[general] -version = 4 -name = Draft -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = coarse -weight = 0 -material = generic_petg_175 -variant = 0.6mm Nozzle - -[values] -layer_height_0 = =round(layer_height * 1.25, 2) -speed_print = 60 - - +[general] +definition = weedo_x40 +name = Draft +version = 4 + +[metadata] +material = generic_petg_175 +quality_type = coarse +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = 0 + +[values] +layer_height_0 = =round(layer_height * 1.25, 2) +speed_print = 60 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_PETG_Draft.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_PETG_Draft.inst.cfg index a562dc72d7..6060ce0880 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_PETG_Draft.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_PETG_Draft.inst.cfg @@ -1,18 +1,17 @@ -[general] -version = 4 -name = Draft -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = draft -weight = 0 -material = generic_petg_175 -variant = 0.6mm Nozzle - -[values] -layer_height_0 = =round(layer_height * 1.25, 2) -speed_print = 50 - - +[general] +definition = weedo_x40 +name = Draft +version = 4 + +[metadata] +material = generic_petg_175 +quality_type = draft +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = 0 + +[values] +layer_height_0 = =round(layer_height * 1.25, 2) +speed_print = 50 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_PETG_Fine.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_PETG_Fine.inst.cfg index deb1a627af..39ba4d7ada 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_PETG_Fine.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_PETG_Fine.inst.cfg @@ -1,18 +1,16 @@ -[general] -version = 4 -name = Fine -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = fine -weight = 0 -material = generic_petg_175 -variant = 0.6mm Nozzle - - -[values] -speed_print = 30 - - +[general] +definition = weedo_x40 +name = Fine +version = 4 + +[metadata] +material = generic_petg_175 +quality_type = fine +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = 0 + +[values] +speed_print = 30 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_PETG_Normal.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_PETG_Normal.inst.cfg index 2630fb8f80..1b43dec143 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_PETG_Normal.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_PETG_Normal.inst.cfg @@ -1,16 +1,16 @@ -[general] -version = 4 -name = Normal -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = normal -weight = 0 -material = generic_petg_175 -variant = 0.6mm Nozzle - -[values] -speed_print = 40 - +[general] +definition = weedo_x40 +name = Normal +version = 4 + +[metadata] +material = generic_petg_175 +quality_type = normal +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = 0 + +[values] +speed_print = 40 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_PLA_Coarse.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_PLA_Coarse.inst.cfg index 01e8391e3b..8fc8a0f107 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_PLA_Coarse.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_PLA_Coarse.inst.cfg @@ -1,17 +1,17 @@ -[general] -version = 4 -name = Coarse -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = coarse -weight = 0 -material = generic_pla_175 -variant = 0.6mm Nozzle - -[values] -layer_height_0 = =round(layer_height * 1.25, 2) -speed_print = 60 - +[general] +definition = weedo_x40 +name = Coarse +version = 4 + +[metadata] +material = generic_pla_175 +quality_type = coarse +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = 0 + +[values] +layer_height_0 = =round(layer_height * 1.25, 2) +speed_print = 60 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_PLA_Draft.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_PLA_Draft.inst.cfg index 38781c67ee..b86a8f1cf7 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_PLA_Draft.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_PLA_Draft.inst.cfg @@ -1,17 +1,17 @@ -[general] -version = 4 -name = Draft -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = draft -weight = 0 -material = generic_pla_175 -variant = 0.6mm Nozzle - -[values] -layer_height_0 = =round(layer_height * 1.25, 2) -speed_print = 50 - +[general] +definition = weedo_x40 +name = Draft +version = 4 + +[metadata] +material = generic_pla_175 +quality_type = draft +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = 0 + +[values] +layer_height_0 = =round(layer_height * 1.25, 2) +speed_print = 50 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_PLA_Fine.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_PLA_Fine.inst.cfg index f7ef1d2338..85f4cab43a 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_PLA_Fine.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_PLA_Fine.inst.cfg @@ -1,17 +1,16 @@ -[general] -version = 4 -name = Fine -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = fine -weight = 0 -material = generic_pla_175 -variant = 0.6mm Nozzle - - -[values] -speed_print = 30 - +[general] +definition = weedo_x40 +name = Fine +version = 4 + +[metadata] +material = generic_pla_175 +quality_type = fine +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = 0 + +[values] +speed_print = 30 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_PLA_Normal.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_PLA_Normal.inst.cfg index e4a1a47391..75fcd0d65a 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_PLA_Normal.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_PLA_Normal.inst.cfg @@ -1,15 +1,16 @@ -[general] -version = 4 -name = Normal -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = normal -weight = 0 -material = generic_pla_175 -variant = 0.6mm Nozzle - -[values] -speed_print = 40 +[general] +definition = weedo_x40 +name = Normal +version = 4 + +[metadata] +material = generic_pla_175 +quality_type = normal +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = 0 + +[values] +speed_print = 40 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_PVA_Coarse.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_PVA_Coarse.inst.cfg index b94d1a21a5..e72482816b 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_PVA_Coarse.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_PVA_Coarse.inst.cfg @@ -1,21 +1,21 @@ -[general] -version = 4 -name = Coarse -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = coarse -weight = 0 -material = generic_pva_175 -variant = 0.6mm Nozzle - -[values] -layer_height_0 = =round(layer_height * 1.25, 2) -speed_print = 30 -support_z_distance = 0 -support_xy_distance = 0.2 -support_brim_enable = True -support_interface_enable = True - +[general] +definition = weedo_x40 +name = Coarse +version = 4 + +[metadata] +material = generic_pva_175 +quality_type = coarse +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = 0 + +[values] +layer_height_0 = =round(layer_height * 1.25, 2) +speed_print = 30 +support_brim_enable = True +support_interface_enable = True +support_xy_distance = 0.2 +support_z_distance = 0 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_PVA_Draft.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_PVA_Draft.inst.cfg index 7b534e56c3..c6f9492017 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_PVA_Draft.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_PVA_Draft.inst.cfg @@ -1,21 +1,21 @@ -[general] -version = 4 -name = Draft -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = draft -weight = 0 -material = generic_pva_175 -variant = 0.6mm Nozzle - -[values] -layer_height_0 = =round(layer_height * 1.25, 2) -speed_print = 30 -support_z_distance = 0 -support_xy_distance = 0.2 -support_brim_enable = True -support_interface_enable = True - +[general] +definition = weedo_x40 +name = Draft +version = 4 + +[metadata] +material = generic_pva_175 +quality_type = draft +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = 0 + +[values] +layer_height_0 = =round(layer_height * 1.25, 2) +speed_print = 30 +support_brim_enable = True +support_interface_enable = True +support_xy_distance = 0.2 +support_z_distance = 0 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_PVA_Fine.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_PVA_Fine.inst.cfg index ca36d6315d..4a93cb67cf 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_PVA_Fine.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_PVA_Fine.inst.cfg @@ -1,20 +1,20 @@ -[general] -version = 4 -name = Fine -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = fine -weight = 0 -material = generic_pva_175 -variant = 0.6mm Nozzle - -[values] -speed_print = 30 -support_z_distance = 0 -support_xy_distance = 0.2 -support_brim_enable = True -support_interface_enable = True - +[general] +definition = weedo_x40 +name = Fine +version = 4 + +[metadata] +material = generic_pva_175 +quality_type = fine +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = 0 + +[values] +speed_print = 30 +support_brim_enable = True +support_interface_enable = True +support_xy_distance = 0.2 +support_z_distance = 0 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_PVA_Normal.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_PVA_Normal.inst.cfg index 4b50ec5196..8a33934391 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_PVA_Normal.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_PVA_Normal.inst.cfg @@ -1,20 +1,20 @@ -[general] -version = 4 -name = Normal -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = normal -weight = 0 -material = generic_pva_175 -variant = 0.6mm Nozzle - -[values] -speed_print = 30 -support_z_distance = 0 -support_xy_distance = 0.2 -support_brim_enable = True -support_interface_enable = True - +[general] +definition = weedo_x40 +name = Normal +version = 4 + +[metadata] +material = generic_pva_175 +quality_type = normal +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = 0 + +[values] +speed_print = 30 +support_brim_enable = True +support_interface_enable = True +support_xy_distance = 0.2 +support_z_distance = 0 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_TPU_Coarse.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_TPU_Coarse.inst.cfg index e6cdaa09d9..e204c3b326 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_TPU_Coarse.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_TPU_Coarse.inst.cfg @@ -1,16 +1,17 @@ -[general] -version = 4 -name = Coarse -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = coarse -weight = 0 -material = generic_tpu_175 -variant = 0.6mm Nozzle - -[values] -layer_height_0 = =round(layer_height * 1.25, 2) -speed_print = 60 +[general] +definition = weedo_x40 +name = Coarse +version = 4 + +[metadata] +material = generic_tpu_175 +quality_type = coarse +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = 0 + +[values] +layer_height_0 = =round(layer_height * 1.25, 2) +speed_print = 60 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_TPU_Draft.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_TPU_Draft.inst.cfg index 3c9cd7b8db..89cd59365f 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_TPU_Draft.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_TPU_Draft.inst.cfg @@ -1,16 +1,17 @@ -[general] -version = 4 -name = Draft -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = draft -weight = 0 -material = generic_tpu_175 -variant = 0.6mm Nozzle - -[values] -layer_height_0 = =round(layer_height * 1.25, 2) -speed_print = 60 +[general] +definition = weedo_x40 +name = Draft +version = 4 + +[metadata] +material = generic_tpu_175 +quality_type = draft +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = 0 + +[values] +layer_height_0 = =round(layer_height * 1.25, 2) +speed_print = 60 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_TPU_Fine.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_TPU_Fine.inst.cfg index 14f892ac71..08e35c821a 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_TPU_Fine.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_TPU_Fine.inst.cfg @@ -1,17 +1,16 @@ -[general] -version = 4 -name = Fine -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = fine -weight = 0 -material = generic_tpu_175 -variant = 0.6mm Nozzle - - -[values] -speed_print = 30 - +[general] +definition = weedo_x40 +name = Fine +version = 4 + +[metadata] +material = generic_tpu_175 +quality_type = fine +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = 0 + +[values] +speed_print = 30 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.6_generic_TPU_Normal.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.6_generic_TPU_Normal.inst.cfg index 754e12a43d..c5d688a54c 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.6_generic_TPU_Normal.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.6_generic_TPU_Normal.inst.cfg @@ -1,16 +1,16 @@ -[general] -version = 4 -name = Normal -definition = weedo_x40 - -[metadata] -setting_version = 20 -type = quality -quality_type = normal -weight = 0 -material = generic_tpu_175 -variant = 0.6mm Nozzle - -[values] -speed_print = 40 - +[general] +definition = weedo_x40 +name = Normal +version = 4 + +[metadata] +material = generic_tpu_175 +quality_type = normal +setting_version = 20 +type = quality +variant = 0.6mm Nozzle +weight = 0 + +[values] +speed_print = 40 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_ABS_Coarse.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_ABS_Coarse.inst.cfg index 45faeae37d..040340f26c 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_ABS_Coarse.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_ABS_Coarse.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Coarse definition = weedo_x40 +name = Coarse +version = 4 [metadata] +material = generic_abs_175 +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -1 -material = generic_abs_175 variant = 0.8mm Nozzle +weight = -1 [values] layer_height_0 = =round(layer_height * 1.25, 2) diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_ABS_Draft.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_ABS_Draft.inst.cfg index 04e725d08e..3606272391 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_ABS_Draft.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_ABS_Draft.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Draft definition = weedo_x40 +name = Draft +version = 4 [metadata] +material = generic_abs_175 +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -1 -material = generic_abs_175 variant = 0.8mm Nozzle +weight = -1 [values] layer_height_0 = =round(layer_height * 1.25, 2) diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_ABS_Extra_Coarse.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_ABS_Extra_Coarse.inst.cfg index f6aacd037d..72385a998d 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_ABS_Extra_Coarse.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_ABS_Extra_Coarse.inst.cfg @@ -1,16 +1,15 @@ [general] -version = 4 -name = Extra Coarse definition = weedo_x40 +name = Extra Coarse +version = 4 [metadata] +material = generic_abs_175 +quality_type = extra coarse setting_version = 20 type = quality -quality_type = extra coarse -weight = 0 -material = generic_abs_175 variant = 0.8mm Nozzle - +weight = 0 [values] speed_print = 30 diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_ABS_Normal.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_ABS_Normal.inst.cfg index ec3e0a7c5c..1c2f3f6f58 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_ABS_Normal.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_ABS_Normal.inst.cfg @@ -1,17 +1,16 @@ [general] -version = 4 -name = Normal definition = weedo_x40 +name = Normal +version = 4 [metadata] +material = generic_abs_175 +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_abs_175 variant = 0.8mm Nozzle +weight = 0 [values] speed_print = 40 - diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_ASA_Coarse.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_ASA_Coarse.inst.cfg index c6b58af1ed..e525329d04 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_ASA_Coarse.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_ASA_Coarse.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Coarse definition = weedo_x40 +name = Coarse +version = 4 [metadata] +material = generic_asa_175 +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = 0 -material = generic_asa_175 variant = 0.8mm Nozzle +weight = 0 [values] layer_height_0 = =round(layer_height * 1.25, 2) diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_ASA_Draft.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_ASA_Draft.inst.cfg index ef0e4783ee..a501a32cb3 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_ASA_Draft.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_ASA_Draft.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Draft definition = weedo_x40 +name = Draft +version = 4 [metadata] +material = generic_asa_175 +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = 0 -material = generic_asa_175 variant = 0.8mm Nozzle +weight = 0 [values] layer_height_0 = =round(layer_height * 1.25, 2) diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_ASA_Extra_Coarse.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_ASA_Extra_Coarse.inst.cfg index a3ec5251f4..9de69a0bcd 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_ASA_Extra_Coarse.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_ASA_Extra_Coarse.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Extra Coarse definition = weedo_x40 +name = Extra Coarse +version = 4 [metadata] +material = generic_asa_175 +quality_type = extra coarse setting_version = 20 type = quality -quality_type = extra coarse -weight = 0 -material = generic_asa_175 variant = 0.8mm Nozzle - +weight = 0 [values] speed_print = 30 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_ASA_Normal.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_ASA_Normal.inst.cfg index 82b9ed2754..bce97061a4 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_ASA_Normal.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_ASA_Normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = weedo_x40 +name = Normal +version = 4 [metadata] +material = generic_asa_175 +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_asa_175 variant = 0.8mm Nozzle +weight = 0 [values] speed_print = 40 diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_BVOH_Coarse.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_BVOH_Coarse.inst.cfg index 386f918d8a..a0ec083334 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_BVOH_Coarse.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_BVOH_Coarse.inst.cfg @@ -1,21 +1,21 @@ [general] -version = 4 -name = Coarse definition = weedo_x40 +name = Coarse +version = 4 [metadata] +material = generic_bvoh_175 +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = 0 -material = generic_bvoh_175 variant = 0.8mm Nozzle +weight = 0 [values] layer_height_0 = =round(layer_height * 1.25, 2) speed_print = 30 -support_z_distance = 0 -support_xy_distance = 0.2 support_brim_enable = True support_interface_enable = True +support_xy_distance = 0.2 +support_z_distance = 0 diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_BVOH_Draft.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_BVOH_Draft.inst.cfg index 0aa537f638..6bc3c9ea44 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_BVOH_Draft.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_BVOH_Draft.inst.cfg @@ -1,21 +1,21 @@ [general] -version = 4 -name = Draft definition = weedo_x40 +name = Draft +version = 4 [metadata] +material = generic_bvoh_175 +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = 0 -material = generic_bvoh_175 variant = 0.8mm Nozzle +weight = 0 [values] layer_height_0 = =round(layer_height * 1.25, 2) speed_print = 30 -support_z_distance = 0 -support_xy_distance = 0.2 support_brim_enable = True support_interface_enable = True +support_xy_distance = 0.2 +support_z_distance = 0 diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_BVOH_Extra_Coarse.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_BVOH_Extra_Coarse.inst.cfg index 651fa8013a..c141f02c39 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_BVOH_Extra_Coarse.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_BVOH_Extra_Coarse.inst.cfg @@ -1,20 +1,20 @@ [general] -version = 4 -name = Extra Coarse definition = weedo_x40 +name = Extra Coarse +version = 4 [metadata] +material = generic_bvoh_175 +quality_type = extra coarse setting_version = 20 type = quality -quality_type = extra coarse -weight = 0 -material = generic_bvoh_175 variant = 0.8mm Nozzle +weight = 0 [values] speed_print = 30 -support_z_distance = 0 -support_xy_distance = 0.2 support_brim_enable = True support_interface_enable = True +support_xy_distance = 0.2 +support_z_distance = 0 diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_BVOH_Normal.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_BVOH_Normal.inst.cfg index 14e847507e..7ffc22e12f 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_BVOH_Normal.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_BVOH_Normal.inst.cfg @@ -1,20 +1,20 @@ [general] -version = 4 -name = Normal definition = weedo_x40 +name = Normal +version = 4 [metadata] +material = generic_bvoh_175 +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_bvoh_175 variant = 0.8mm Nozzle +weight = 0 [values] speed_print = 30 -support_z_distance = 0 -support_xy_distance = 0.2 support_brim_enable = True support_interface_enable = True +support_xy_distance = 0.2 +support_z_distance = 0 diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_CPE_Coarse.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_CPE_Coarse.inst.cfg index 371650bac9..9fbae4968a 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_CPE_Coarse.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_CPE_Coarse.inst.cfg @@ -1,18 +1,17 @@ [general] -version = 4 -name = Coarse definition = weedo_x40 +name = Coarse +version = 4 [metadata] +material = generic_cpe_175 +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = 0 -material = generic_cpe_175 variant = 0.8mm Nozzle +weight = 0 [values] layer_height_0 = =round(layer_height * 1.25, 2) speed_print = 60 - diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_CPE_Draft.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_CPE_Draft.inst.cfg index 59c93d613d..2844df33aa 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_CPE_Draft.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_CPE_Draft.inst.cfg @@ -1,18 +1,17 @@ [general] -version = 4 -name = Draft definition = weedo_x40 +name = Draft +version = 4 [metadata] +material = generic_cpe_175 +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = 0 -material = generic_cpe_175 variant = 0.8mm Nozzle +weight = 0 [values] layer_height_0 = =round(layer_height * 1.25, 2) speed_print = 50 - diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_CPE_Extra_Coarse.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_CPE_Extra_Coarse.inst.cfg index 731ab0067d..cab72466cb 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_CPE_Extra_Coarse.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_CPE_Extra_Coarse.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Extra Coarse definition = weedo_x40 +name = Extra Coarse +version = 4 [metadata] +material = generic_cpe_175 +quality_type = extra coarse setting_version = 20 type = quality -quality_type = extra coarse -weight = 0 -material = generic_cpe_175 variant = 0.8mm Nozzle - +weight = 0 [values] speed_print = 30 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_CPE_Normal.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_CPE_Normal.inst.cfg index 24443be282..4eb13503b3 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_CPE_Normal.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_CPE_Normal.inst.cfg @@ -1,17 +1,16 @@ [general] -version = 4 -name = Normal definition = weedo_x40 +name = Normal +version = 4 [metadata] +material = generic_cpe_175 +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_cpe_175 variant = 0.8mm Nozzle +weight = 0 [values] speed_print = 40 - diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_HIPS_Coarse.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_HIPS_Coarse.inst.cfg index 21a063e5e5..37d77a4e99 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_HIPS_Coarse.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_HIPS_Coarse.inst.cfg @@ -1,18 +1,17 @@ [general] -version = 4 -name = Coarse definition = weedo_x40 +name = Coarse +version = 4 [metadata] +material = generic_hips_175 +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = 0 -material = generic_hips_175 variant = 0.8mm Nozzle +weight = 0 [values] layer_height_0 = =round(layer_height * 1.25, 2) speed_print = 60 - diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_HIPS_Draft.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_HIPS_Draft.inst.cfg index 35408f4b64..b4b65e174c 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_HIPS_Draft.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_HIPS_Draft.inst.cfg @@ -1,18 +1,17 @@ [general] -version = 4 -name = Draft definition = weedo_x40 +name = Draft +version = 4 [metadata] +material = generic_hips_175 +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = 0 -material = generic_hips_175 variant = 0.8mm Nozzle +weight = 0 [values] layer_height_0 = =round(layer_height * 1.25, 2) speed_print = 50 - diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_HIPS_Extra_Coarse.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_HIPS_Extra_Coarse.inst.cfg index a6db95f9f2..d176a99b36 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_HIPS_Extra_Coarse.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_HIPS_Extra_Coarse.inst.cfg @@ -1,16 +1,15 @@ [general] -version = 4 -name = Extra Coarse definition = weedo_x40 +name = Extra Coarse +version = 4 [metadata] +material = generic_hips_175 +quality_type = extra coarse setting_version = 20 type = quality -quality_type = extra coarse -weight = 0 -material = generic_hips_175 variant = 0.8mm Nozzle - +weight = 0 [values] speed_print = 30 diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_HIPS_Normal.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_HIPS_Normal.inst.cfg index 4c66ba53ca..ec4e1fbeff 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_HIPS_Normal.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_HIPS_Normal.inst.cfg @@ -1,17 +1,16 @@ [general] -version = 4 -name = Normal definition = weedo_x40 +name = Normal +version = 4 [metadata] +material = generic_hips_175 +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_hips_175 variant = 0.8mm Nozzle +weight = 0 [values] speed_print = 40 - diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_PETG_Coarse.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_PETG_Coarse.inst.cfg index f7a0d51465..0a00951182 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_PETG_Coarse.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_PETG_Coarse.inst.cfg @@ -1,18 +1,17 @@ [general] -version = 4 -name = Coarse definition = weedo_x40 +name = Coarse +version = 4 [metadata] +material = generic_petg_175 +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = 0 -material = generic_petg_175 variant = 0.8mm Nozzle +weight = 0 [values] layer_height_0 = =round(layer_height * 1.25, 2) speed_print = 60 - diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_PETG_Draft.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_PETG_Draft.inst.cfg index 7b69cedb39..34e8628c07 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_PETG_Draft.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_PETG_Draft.inst.cfg @@ -1,18 +1,17 @@ [general] -version = 4 -name = Draft definition = weedo_x40 +name = Draft +version = 4 [metadata] +material = generic_petg_175 +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = 0 -material = generic_petg_175 variant = 0.8mm Nozzle +weight = 0 [values] layer_height_0 = =round(layer_height * 1.25, 2) speed_print = 50 - diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_PETG_Extra_Coarse.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_PETG_Extra_Coarse.inst.cfg index 1bee071836..da0ef60156 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_PETG_Extra_Coarse.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_PETG_Extra_Coarse.inst.cfg @@ -1,18 +1,16 @@ [general] -version = 4 -name = Extra Coarse definition = weedo_x40 +name = Extra Coarse +version = 4 [metadata] +material = generic_petg_175 +quality_type = extra coarse setting_version = 20 type = quality -quality_type = extra coarse -weight = 0 -material = generic_petg_175 variant = 0.8mm Nozzle - +weight = 0 [values] speed_print = 30 - diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_PETG_Normal.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_PETG_Normal.inst.cfg index f8c1a46e85..5127737545 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_PETG_Normal.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_PETG_Normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = weedo_x40 +name = Normal +version = 4 [metadata] +material = generic_petg_175 +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_petg_175 variant = 0.8mm Nozzle +weight = 0 [values] speed_print = 40 diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_PLA_Coarse.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_PLA_Coarse.inst.cfg index 16ca883ad4..95765a46b9 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_PLA_Coarse.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_PLA_Coarse.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Coarse definition = weedo_x40 +name = Coarse +version = 4 [metadata] +material = generic_pla_175 +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = 0 -material = generic_pla_175 variant = 0.8mm Nozzle +weight = 0 [values] layer_height_0 = =round(layer_height * 1.25, 2) diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_PLA_Draft.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_PLA_Draft.inst.cfg index 4d2ea969a5..0245bc1ca7 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_PLA_Draft.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_PLA_Draft.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Draft definition = weedo_x40 +name = Draft +version = 4 [metadata] +material = generic_pla_175 +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = 0 -material = generic_pla_175 variant = 0.8mm Nozzle +weight = 0 [values] layer_height_0 = =round(layer_height * 1.25, 2) diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_PLA_Extra_Coarse.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_PLA_Extra_Coarse.inst.cfg index b0dcb0b6d3..db59e86ed6 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_PLA_Extra_Coarse.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_PLA_Extra_Coarse.inst.cfg @@ -1,16 +1,15 @@ [general] -version = 4 -name = Extra Coarse definition = weedo_x40 +name = Extra Coarse +version = 4 [metadata] +material = generic_pla_175 +quality_type = extra coarse setting_version = 20 type = quality -quality_type = extra coarse -weight = 0 -material = generic_pla_175 variant = 0.8mm Nozzle - +weight = 0 [values] speed_print = 30 diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_PLA_Normal.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_PLA_Normal.inst.cfg index 9db1dfe22b..11b3b49d51 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_PLA_Normal.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_PLA_Normal.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Normal definition = weedo_x40 +name = Normal +version = 4 [metadata] +material = generic_pla_175 +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pla_175 variant = 0.8mm Nozzle +weight = 0 [values] cool_fan_speed = 100 speed_print = 40 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_PVA_Coarse.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_PVA_Coarse.inst.cfg index 2b72cb5909..074f8baf5b 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_PVA_Coarse.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_PVA_Coarse.inst.cfg @@ -1,21 +1,21 @@ [general] -version = 4 -name = Coarse definition = weedo_x40 +name = Coarse +version = 4 [metadata] +material = generic_pva_175 +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = 0 -material = generic_pva_175 variant = 0.8mm Nozzle +weight = 0 [values] layer_height_0 = =round(layer_height * 1.25, 2) speed_print = 30 -support_z_distance = 0 -support_xy_distance = 0.2 support_brim_enable = True support_interface_enable = True +support_xy_distance = 0.2 +support_z_distance = 0 diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_PVA_Draft.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_PVA_Draft.inst.cfg index 34fe97eb6e..a553239cd0 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_PVA_Draft.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_PVA_Draft.inst.cfg @@ -1,22 +1,21 @@ [general] -version = 4 -name = Draft definition = weedo_x40 +name = Draft +version = 4 [metadata] +material = generic_pva_175 +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = 0 -material = generic_pva_175 variant = 0.8mm Nozzle +weight = 0 [values] layer_height_0 = =round(layer_height * 1.25, 2) - speed_print = 30 -support_z_distance = 0 -support_xy_distance = 0.2 support_brim_enable = True support_interface_enable = True +support_xy_distance = 0.2 +support_z_distance = 0 diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_PVA_Extra_Coarse.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_PVA_Extra_Coarse.inst.cfg index 94e2f6e4fc..e2bb6d50d0 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_PVA_Extra_Coarse.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_PVA_Extra_Coarse.inst.cfg @@ -1,21 +1,20 @@ [general] -version = 4 -name = Extra Coarse definition = weedo_x40 +name = Extra Coarse +version = 4 [metadata] +material = generic_pva_175 +quality_type = extra coarse setting_version = 20 type = quality -quality_type = extra coarse -weight = 0 -material = generic_pva_175 variant = 0.8mm Nozzle +weight = 0 [values] - speed_print = 30 -support_z_distance = 0 -support_xy_distance = 0.2 support_brim_enable = True support_interface_enable = True +support_xy_distance = 0.2 +support_z_distance = 0 diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_PVA_Normal.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_PVA_Normal.inst.cfg index 08fa405924..3761aeba1d 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_PVA_Normal.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_PVA_Normal.inst.cfg @@ -1,21 +1,20 @@ [general] -version = 4 -name = Normal definition = weedo_x40 +name = Normal +version = 4 [metadata] +material = generic_pva_175 +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_pva_175 variant = 0.8mm Nozzle +weight = 0 [values] - speed_print = 30 -support_z_distance = 0 -support_xy_distance = 0.2 support_brim_enable = True support_interface_enable = True +support_xy_distance = 0.2 +support_z_distance = 0 diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_TPU_Coarse.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_TPU_Coarse.inst.cfg index 9cd3967194..ee710eedf0 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_TPU_Coarse.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_TPU_Coarse.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Coarse definition = weedo_x40 +name = Coarse +version = 4 [metadata] +material = generic_tpu_175 +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = 0 -material = generic_tpu_175 variant = 0.8mm Nozzle +weight = 0 [values] layer_height_0 = =round(layer_height * 1.25, 2) speed_print = 60 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_TPU_Draft.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_TPU_Draft.inst.cfg index f003186054..ba667510e3 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_TPU_Draft.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_TPU_Draft.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Draft definition = weedo_x40 +name = Draft +version = 4 [metadata] +material = generic_tpu_175 +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = 0 -material = generic_tpu_175 variant = 0.8mm Nozzle +weight = 0 [values] layer_height_0 = =round(layer_height * 1.25, 2) speed_print = 60 + diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_TPU_Extra_Coarse.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_TPU_Extra_Coarse.inst.cfg index efcfec3eac..2845ff7129 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_TPU_Extra_Coarse.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_TPU_Extra_Coarse.inst.cfg @@ -1,16 +1,15 @@ [general] -version = 4 -name = Extra Coarse definition = weedo_x40 +name = Extra Coarse +version = 4 [metadata] +material = generic_tpu_175 +quality_type = extra coarse setting_version = 20 type = quality -quality_type = extra coarse -weight = 0 -material = generic_tpu_175 variant = 0.8mm Nozzle - +weight = 0 [values] speed_print = 30 diff --git a/resources/quality/weedo_x40/weedo_x40_0.8_generic_TPU_Normal.inst.cfg b/resources/quality/weedo_x40/weedo_x40_0.8_generic_TPU_Normal.inst.cfg index 58629dd78a..162e51dd24 100644 --- a/resources/quality/weedo_x40/weedo_x40_0.8_generic_TPU_Normal.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_0.8_generic_TPU_Normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = weedo_x40 +name = Normal +version = 4 [metadata] +material = generic_tpu_175 +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = 0 -material = generic_tpu_175 variant = 0.8mm Nozzle +weight = 0 [values] speed_print = 40 diff --git a/resources/quality/weedo_x40/weedo_x40_global_Coarse.inst.cfg b/resources/quality/weedo_x40/weedo_x40_global_Coarse.inst.cfg index c8bd8fcd25..c22cc277ff 100644 --- a/resources/quality/weedo_x40/weedo_x40_global_Coarse.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_global_Coarse.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Coarse definition = weedo_x40 +name = Coarse +version = 4 [metadata] +global_quality = True +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = -4 -global_quality = True [values] layer_height = 0.28 diff --git a/resources/quality/weedo_x40/weedo_x40_global_Draft.inst.cfg b/resources/quality/weedo_x40/weedo_x40_global_Draft.inst.cfg index c23882599f..5c0d0910cc 100644 --- a/resources/quality/weedo_x40/weedo_x40_global_Draft.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_global_Draft.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Draft definition = weedo_x40 +name = Draft +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -4 -global_quality = True [values] layer_height = 0.24 diff --git a/resources/quality/weedo_x40/weedo_x40_global_Extra_Coarse.inst.cfg b/resources/quality/weedo_x40/weedo_x40_global_Extra_Coarse.inst.cfg index 5263e1c26f..5d3c00dd4a 100644 --- a/resources/quality/weedo_x40/weedo_x40_global_Extra_Coarse.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_global_Extra_Coarse.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Extra Coarse definition = weedo_x40 +name = Extra Coarse +version = 4 [metadata] +global_quality = True +quality_type = extra coarse setting_version = 20 type = quality -quality_type = extra coarse weight = -4 -global_quality = True [values] layer_height = 0.32 diff --git a/resources/quality/weedo_x40/weedo_x40_global_Extra_Fine.inst.cfg b/resources/quality/weedo_x40/weedo_x40_global_Extra_Fine.inst.cfg index 407dffa661..d353e3e51b 100644 --- a/resources/quality/weedo_x40/weedo_x40_global_Extra_Fine.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_global_Extra_Fine.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Extra Fine definition = weedo_x40 +name = Extra Fine +version = 4 [metadata] +global_quality = True +quality_type = extra fine setting_version = 20 type = quality -quality_type = extra fine weight = -1 -global_quality = True [values] layer_height = 0.12 + diff --git a/resources/quality/weedo_x40/weedo_x40_global_Fine.inst.cfg b/resources/quality/weedo_x40/weedo_x40_global_Fine.inst.cfg index 478f7792c3..c96836daba 100644 --- a/resources/quality/weedo_x40/weedo_x40_global_Fine.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_global_Fine.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Fine definition = weedo_x40 +name = Fine +version = 4 [metadata] +global_quality = True +quality_type = fine setting_version = 20 type = quality -quality_type = fine weight = -2 -global_quality = True [values] layer_height = 0.16 diff --git a/resources/quality/weedo_x40/weedo_x40_global_Normal.inst.cfg b/resources/quality/weedo_x40/weedo_x40_global_Normal.inst.cfg index dd8757b7a2..7fb333dd95 100644 --- a/resources/quality/weedo_x40/weedo_x40_global_Normal.inst.cfg +++ b/resources/quality/weedo_x40/weedo_x40_global_Normal.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Normal definition = weedo_x40 +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = -3 -global_quality = True [values] layer_height = 0.2 diff --git a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_1p0_pro_copper_0.40_abs_coarse.inst.cfg b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_1p0_pro_copper_0.40_abs_coarse.inst.cfg index 92822db83a..6697eeb175 100644 --- a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_1p0_pro_copper_0.40_abs_coarse.inst.cfg +++ b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_1p0_pro_copper_0.40_abs_coarse.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_1p0_pro +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_abs +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_abs variant = Copper 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 20 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 45 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 6.0 retraction_speed = 40 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 20 +speed_travel = 45 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_1p0_pro_copper_0.40_abs_draft.inst.cfg b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_1p0_pro_copper_0.40_abs_draft.inst.cfg index 9570fd6049..64835b63e2 100644 --- a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_1p0_pro_copper_0.40_abs_draft.inst.cfg +++ b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_1p0_pro_copper_0.40_abs_draft.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_1p0_pro +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_abs +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_abs variant = Copper 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 20 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 45 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 6.0 retraction_speed = 40 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 20 +speed_travel = 45 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_1p0_pro_copper_0.40_abs_fine.inst.cfg b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_1p0_pro_copper_0.40_abs_fine.inst.cfg index 41133ab5e9..1a7f225227 100644 --- a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_1p0_pro_copper_0.40_abs_fine.inst.cfg +++ b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_1p0_pro_copper_0.40_abs_fine.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_1p0_pro +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_abs +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_abs variant = Copper 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 20 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 45 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 6.0 retraction_speed = 40 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 20 +speed_travel = 45 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_1p0_pro_copper_0.40_abs_normal.inst.cfg b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_1p0_pro_copper_0.40_abs_normal.inst.cfg index c2d41a12f3..091824ee0f 100644 --- a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_1p0_pro_copper_0.40_abs_normal.inst.cfg +++ b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_1p0_pro_copper_0.40_abs_normal.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_1p0_pro +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_abs variant = Copper 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.35 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 20 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 45 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 6.0 retraction_speed = 40 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 20 +speed_travel = 45 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_abs_coarse.inst.cfg b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_abs_coarse.inst.cfg index 5ba4ef57d6..388ffade83 100644 --- a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_abs_coarse.inst.cfg +++ b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_abs_coarse.inst.cfg @@ -1,31 +1,32 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_jr_pro_xplus +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_abs +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_abs variant = Copper 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_wall = 20 -speed_print = 60 -speed_topbottom = 10 -speed_infill = =speed_print -speed_support = 30 -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 3.0 -retraction_speed = 20 retraction_prime_speed = 15 +retraction_speed = 20 skirt_brim_speed = 30 -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 60 +speed_support = 30 +speed_topbottom = 10 +speed_travel = 120 +speed_wall = 20 + diff --git a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_abs_draft.inst.cfg b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_abs_draft.inst.cfg index b3a4619adf..1b4d07892c 100644 --- a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_abs_draft.inst.cfg +++ b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_abs_draft.inst.cfg @@ -1,31 +1,32 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_jr_pro_xplus +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_abs +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_abs variant = Copper 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_wall = 20 -speed_print = 60 -speed_topbottom = 10 -speed_infill = =speed_print -speed_support = 30 -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 3.0 -retraction_speed = 20 retraction_prime_speed = 15 +retraction_speed = 20 skirt_brim_speed = 30 -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 60 +speed_support = 30 +speed_topbottom = 10 +speed_travel = 120 +speed_wall = 20 + diff --git a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_abs_fine.inst.cfg b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_abs_fine.inst.cfg index 425b43ab97..d4fa5d5565 100644 --- a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_abs_fine.inst.cfg +++ b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_abs_fine.inst.cfg @@ -1,31 +1,32 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_jr_pro_xplus +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_abs +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_abs variant = Copper 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_wall = 20 -speed_print = 60 -speed_topbottom = 10 -speed_infill = =speed_print -speed_support = 30 -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 3.0 -retraction_speed = 20 retraction_prime_speed = 15 +retraction_speed = 20 skirt_brim_speed = 30 -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 60 +speed_support = 30 +speed_topbottom = 10 +speed_travel = 120 +speed_wall = 20 + diff --git a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_abs_normal.inst.cfg b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_abs_normal.inst.cfg index e5c61d2c4b..9c52d382bb 100644 --- a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_abs_normal.inst.cfg +++ b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_abs_normal.inst.cfg @@ -1,31 +1,32 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_jr_pro_xplus +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_abs variant = Copper 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.3 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_wall = 20 -speed_print = 60 -speed_topbottom = 10 -speed_infill = =speed_print -speed_support = 30 -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 3.0 -retraction_speed = 20 retraction_prime_speed = 15 +retraction_speed = 20 skirt_brim_speed = 30 -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 60 +speed_support = 30 +speed_topbottom = 10 +speed_travel = 120 +speed_wall = 20 + diff --git a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_pro_evo_hs_0.40_abs_coarse.inst.cfg b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_pro_evo_hs_0.40_abs_coarse.inst.cfg index aad9aaa72e..c2ab7ef6ca 100644 --- a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_pro_evo_hs_0.40_abs_coarse.inst.cfg +++ b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_pro_evo_hs_0.40_abs_coarse.inst.cfg @@ -1,35 +1,36 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_pro_evo +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_abs +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_abs variant = Hardened Steel 0.4mm Nozzle +weight = -3 [values] +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 +adhesion_type = skirt +bridge_skin_speed = 20 +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -material_diameter = 1.75 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 30 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 3 +retraction_prime_speed = =retraction_speed +retraction_speed = 20 speed_infill = 60 -speed_wall = =speed_print +speed_print = 30 speed_support = =speed_print speed_travel = 80 -retraction_amount = 3 -retraction_speed = 20 -retraction_prime_speed = =retraction_speed -infill_sparse_density = 10 -bridge_skin_speed = 20 +speed_wall = =speed_print support_infill_rate = 20 -adhesion_type = skirt -acceleration_infill = 1000.0 -acceleration_wall = 1000.0 \ No newline at end of file + diff --git a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_pro_evo_hs_0.40_abs_draft.inst.cfg b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_pro_evo_hs_0.40_abs_draft.inst.cfg index 0390da964f..788810fd35 100644 --- a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_pro_evo_hs_0.40_abs_draft.inst.cfg +++ b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_pro_evo_hs_0.40_abs_draft.inst.cfg @@ -1,35 +1,36 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_pro_evo +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_abs +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_abs variant = Hardened Steel 0.4mm Nozzle +weight = -2 [values] +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 +adhesion_type = skirt +bridge_skin_speed = 20 +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 -material_diameter = 1.75 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 30 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 3 +retraction_prime_speed = =retraction_speed +retraction_speed = 20 speed_infill = 60 -speed_wall = =speed_print +speed_print = 30 speed_support = =speed_print speed_travel = 80 -retraction_amount = 3 -retraction_speed = 20 -retraction_prime_speed = =retraction_speed -infill_sparse_density = 10 -bridge_skin_speed = 20 +speed_wall = =speed_print support_infill_rate = 20 -adhesion_type = skirt -acceleration_infill = 1000.0 -acceleration_wall = 1000.0 \ No newline at end of file + diff --git a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_pro_evo_hs_0.40_abs_fine.inst.cfg b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_pro_evo_hs_0.40_abs_fine.inst.cfg index 3507a73253..b3fa3b268f 100644 --- a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_pro_evo_hs_0.40_abs_fine.inst.cfg +++ b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_pro_evo_hs_0.40_abs_fine.inst.cfg @@ -1,35 +1,36 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_pro_evo +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_abs +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_abs variant = Hardened Steel 0.4mm Nozzle +weight = 0 [values] +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 +adhesion_type = skirt +bridge_skin_speed = 20 +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -material_diameter = 1.75 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 30 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 3 +retraction_prime_speed = =retraction_speed +retraction_speed = 20 speed_infill = 60 -speed_wall = =speed_print +speed_print = 30 speed_support = =speed_print speed_travel = 80 -retraction_amount = 3 -retraction_speed = 20 -retraction_prime_speed = =retraction_speed -infill_sparse_density = 10 -bridge_skin_speed = 20 +speed_wall = =speed_print support_infill_rate = 20 -adhesion_type = skirt -acceleration_infill = 1000.0 -acceleration_wall = 1000.0 \ No newline at end of file + diff --git a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_pro_evo_hs_0.40_abs_normal.inst.cfg b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_pro_evo_hs_0.40_abs_normal.inst.cfg index 5c6b976c32..5e2c38db50 100644 --- a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_pro_evo_hs_0.40_abs_normal.inst.cfg +++ b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_pro_evo_hs_0.40_abs_normal.inst.cfg @@ -1,35 +1,36 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_pro_evo +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_abs variant = Hardened Steel 0.4mm Nozzle +weight = -1 [values] +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 +adhesion_type = skirt +bridge_skin_speed = 20 +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.30 -material_diameter = 1.75 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 30 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 3 +retraction_prime_speed = =retraction_speed +retraction_speed = 20 speed_infill = 60 -speed_wall = =speed_print +speed_print = 30 speed_support = =speed_print speed_travel = 80 -retraction_amount = 3 -retraction_speed = 20 -retraction_prime_speed = =retraction_speed -infill_sparse_density = 10 -bridge_skin_speed = 20 +speed_wall = =speed_print support_infill_rate = 20 -adhesion_type = skirt -acceleration_infill = 1000.0 -acceleration_wall = 1000.0 \ No newline at end of file + diff --git a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_super_copper_0.40_abs_coarse.inst.cfg b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_super_copper_0.40_abs_coarse.inst.cfg index fc2887c891..27d3dab85b 100644 --- a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_super_copper_0.40_abs_coarse.inst.cfg +++ b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_super_copper_0.40_abs_coarse.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_super +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_abs +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_abs variant = Copper 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = 40 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_super_copper_0.40_abs_draft.inst.cfg b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_super_copper_0.40_abs_draft.inst.cfg index c2d9310692..78bc677d58 100644 --- a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_super_copper_0.40_abs_draft.inst.cfg +++ b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_super_copper_0.40_abs_draft.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_super +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_abs +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_abs variant = Copper 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = 40 skirt_brim_speed = =speed_print -infill_sparse_density = 10 +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_super_copper_0.40_abs_fine.inst.cfg b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_super_copper_0.40_abs_fine.inst.cfg index 8f81b60e09..cf845e81e2 100644 --- a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_super_copper_0.40_abs_fine.inst.cfg +++ b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_super_copper_0.40_abs_fine.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_super +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_abs +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_abs variant = Copper 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = 40 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_super_copper_0.40_abs_normal.inst.cfg b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_super_copper_0.40_abs_normal.inst.cfg index ac6aae3a2e..a0117a5633 100644 --- a/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_super_copper_0.40_abs_normal.inst.cfg +++ b/resources/quality/xyzprinting/abs/xyzprinting_da_vinci_super_copper_0.40_abs_normal.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_super +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_abs +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_abs variant = Copper 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.35 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_topbottom = 10 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = 40 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_1p0_pro_copper_0.40_antibact_coarse.inst.cfg b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_1p0_pro_copper_0.40_antibact_coarse.inst.cfg index 85cb4ddee2..b7c8743d19 100644 --- a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_1p0_pro_copper_0.40_antibact_coarse.inst.cfg +++ b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_1p0_pro_copper_0.40_antibact_coarse.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_1p0_pro +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_antibact_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_antibact_pla variant = Copper 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 20 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 20 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_1p0_pro_copper_0.40_antibact_draft.inst.cfg b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_1p0_pro_copper_0.40_antibact_draft.inst.cfg index 8d12ab17d9..b195794038 100644 --- a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_1p0_pro_copper_0.40_antibact_draft.inst.cfg +++ b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_1p0_pro_copper_0.40_antibact_draft.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_1p0_pro +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_antibact_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_antibact_pla variant = Copper 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 20 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 20 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_1p0_pro_copper_0.40_antibact_fine.inst.cfg b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_1p0_pro_copper_0.40_antibact_fine.inst.cfg index 660b58d5fa..0a9a05c19b 100644 --- a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_1p0_pro_copper_0.40_antibact_fine.inst.cfg +++ b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_1p0_pro_copper_0.40_antibact_fine.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_1p0_pro +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_antibact_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_antibact_pla variant = Copper 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 20 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 20 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_1p0_pro_copper_0.40_antibact_normal.inst.cfg b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_1p0_pro_copper_0.40_antibact_normal.inst.cfg index 1e3aee314a..8f524b1420 100644 --- a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_1p0_pro_copper_0.40_antibact_normal.inst.cfg +++ b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_1p0_pro_copper_0.40_antibact_normal.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_1p0_pro +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_antibact_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_antibact_pla variant = Copper 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.35 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 20 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 20 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_antibact_coarse.inst.cfg b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_antibact_coarse.inst.cfg index 731e9f47ea..9806f1bd02 100644 --- a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_antibact_coarse.inst.cfg +++ b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_antibact_coarse.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_jr_1p0a_pro +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_antibact_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_antibact_pla variant = Copper 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 65 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.5 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 65 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_antibact_draft.inst.cfg b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_antibact_draft.inst.cfg index 55d9f12704..34c424a1c8 100644 --- a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_antibact_draft.inst.cfg +++ b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_antibact_draft.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_jr_1p0a_pro +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_antibact_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_antibact_pla variant = Copper 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 65 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.5 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 65 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_antibact_fine.inst.cfg b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_antibact_fine.inst.cfg index 2159986358..8cee20b361 100644 --- a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_antibact_fine.inst.cfg +++ b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_antibact_fine.inst.cfg @@ -1,28 +1,29 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_jr_1p0a_pro +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_antibact_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = xyzprinting_antibact_pla variant = Copper 0.4mm Nozzle [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 65 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.5 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 65 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_antibact_normal.inst.cfg b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_antibact_normal.inst.cfg index 8ab5f3e46f..58c373e166 100644 --- a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_antibact_normal.inst.cfg +++ b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_antibact_normal.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_jr_1p0a_pro +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_antibact_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_antibact_pla variant = Copper 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.35 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 65 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.5 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 65 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_antibact_coarse.inst.cfg b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_antibact_coarse.inst.cfg index 0be08f3100..e71ed89bab 100644 --- a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_antibact_coarse.inst.cfg +++ b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_antibact_coarse.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_jr_pro_xeplus +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_antibact_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_antibact_pla variant = Copper 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = 15 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_antibact_draft.inst.cfg b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_antibact_draft.inst.cfg index c460fde89e..559dde1ed7 100644 --- a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_antibact_draft.inst.cfg +++ b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_antibact_draft.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_jr_pro_xeplus +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_antibact_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_antibact_pla variant = Copper 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = 15 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_antibact_fine.inst.cfg b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_antibact_fine.inst.cfg index 330a02ede0..f482ed1a9a 100644 --- a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_antibact_fine.inst.cfg +++ b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_antibact_fine.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_jr_pro_xeplus +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_antibact_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_antibact_pla variant = Copper 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = 15 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_antibact_normal.inst.cfg b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_antibact_normal.inst.cfg index 84eb883dc6..d913872250 100644 --- a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_antibact_normal.inst.cfg +++ b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_antibact_normal.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_jr_pro_xeplus +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_antibact_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_antibact_pla variant = Copper 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.3 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = 15 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_antibact_coarse.inst.cfg b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_antibact_coarse.inst.cfg index fd269b8d52..ce468a81a8 100644 --- a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_antibact_coarse.inst.cfg +++ b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_antibact_coarse.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_jr_pro_xplus +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_antibact_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_antibact_pla variant = Copper 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 7.0 retraction_speed = 15 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_antibact_draft.inst.cfg b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_antibact_draft.inst.cfg index 5b54794866..a4ed13034a 100644 --- a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_antibact_draft.inst.cfg +++ b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_antibact_draft.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_jr_pro_xplus +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_antibact_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_antibact_pla variant = Copper 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 7.0 retraction_speed = 15 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_antibact_fine.inst.cfg b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_antibact_fine.inst.cfg index 207b2100d8..df65f5239a 100644 --- a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_antibact_fine.inst.cfg +++ b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_antibact_fine.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_jr_pro_xplus +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_antibact_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_antibact_pla variant = Copper 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = 15 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_antibact_normal.inst.cfg b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_antibact_normal.inst.cfg index 802e984ff7..02ba190d0c 100644 --- a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_antibact_normal.inst.cfg +++ b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_antibact_normal.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_jr_pro_xplus +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_antibact_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_antibact_pla variant = Copper 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.3 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = 15 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_w_pro_ss_0.40_antibact_coarse.inst.cfg b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_w_pro_ss_0.40_antibact_coarse.inst.cfg index a315491578..63e97e43a7 100644 --- a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_w_pro_ss_0.40_antibact_coarse.inst.cfg +++ b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_w_pro_ss_0.40_antibact_coarse.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_jr_w_pro +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_antibact_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_antibact_pla variant = Stainless Steel 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_w_pro_ss_0.40_antibact_draft.inst.cfg b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_w_pro_ss_0.40_antibact_draft.inst.cfg index 9dc187273c..50dd5380ff 100644 --- a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_w_pro_ss_0.40_antibact_draft.inst.cfg +++ b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_w_pro_ss_0.40_antibact_draft.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_jr_w_pro +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_antibact_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_antibact_pla variant = Stainless Steel 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_w_pro_ss_0.40_antibact_fine.inst.cfg b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_w_pro_ss_0.40_antibact_fine.inst.cfg index fd21a7ee91..8d62e0d46b 100644 --- a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_w_pro_ss_0.40_antibact_fine.inst.cfg +++ b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_w_pro_ss_0.40_antibact_fine.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_jr_w_pro +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_antibact_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_antibact_pla variant = Stainless Steel 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_w_pro_ss_0.40_antibact_normal.inst.cfg b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_w_pro_ss_0.40_antibact_normal.inst.cfg index d87621a531..e4448229c1 100644 --- a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_w_pro_ss_0.40_antibact_normal.inst.cfg +++ b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_jr_w_pro_ss_0.40_antibact_normal.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_jr_w_pro +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_antibact_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_antibact_pla variant = Stainless Steel 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.35 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_pro_evo_hs_0.40_antibact_coarse.inst.cfg b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_pro_evo_hs_0.40_antibact_coarse.inst.cfg index 65cc44d6d1..aa418d1d0a 100644 --- a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_pro_evo_hs_0.40_antibact_coarse.inst.cfg +++ b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_pro_evo_hs_0.40_antibact_coarse.inst.cfg @@ -1,33 +1,34 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_pro_evo +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_antibact_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_antibact_pla variant = Hardened Steel 0.4mm Nozzle +weight = -3 [values] -material_bed_temperature = 60 +adhesion_type = skirt +bridge_skin_speed = 20 +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -material_diameter = 1.75 +material_bed_temperature = 60 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 30 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 4.5 +retraction_prime_speed = 15 +retraction_speed = 20 speed_infill = 60 -speed_wall = =speed_print +speed_print = 30 speed_support = =speed_print speed_travel = 80 -retraction_amount = 4.5 -retraction_speed = 20 -retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 20 -adhesion_type = skirt \ No newline at end of file +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_pro_evo_hs_0.40_antibact_draft.inst.cfg b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_pro_evo_hs_0.40_antibact_draft.inst.cfg index 8dda63f0f8..0a6c8912d2 100644 --- a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_pro_evo_hs_0.40_antibact_draft.inst.cfg +++ b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_pro_evo_hs_0.40_antibact_draft.inst.cfg @@ -1,33 +1,34 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_pro_evo +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_antibact_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_antibact_pla variant = Hardened Steel 0.4mm Nozzle +weight = -2 [values] -material_bed_temperature = 60 +adhesion_type = skirt +bridge_skin_speed = 20 +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 -material_diameter = 1.75 +material_bed_temperature = 60 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 30 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 4.5 +retraction_prime_speed = 15 +retraction_speed = 20 speed_infill = 60 -speed_wall = =speed_print +speed_print = 30 speed_support = =speed_print speed_travel = 80 -retraction_amount = 4.5 -retraction_speed = 20 -retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 20 -adhesion_type = skirt \ No newline at end of file +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_pro_evo_hs_0.40_antibact_fine.inst.cfg b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_pro_evo_hs_0.40_antibact_fine.inst.cfg index f302bfd624..5c8bdb52c8 100644 --- a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_pro_evo_hs_0.40_antibact_fine.inst.cfg +++ b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_pro_evo_hs_0.40_antibact_fine.inst.cfg @@ -1,33 +1,34 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_pro_evo +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_antibact_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_antibact_pla variant = Hardened Steel 0.4mm Nozzle +weight = 0 [values] -material_bed_temperature = 60 +adhesion_type = skirt +bridge_skin_speed = 20 +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -material_diameter = 1.75 +material_bed_temperature = 60 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 30 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 4.5 +retraction_prime_speed = 15 +retraction_speed = 20 speed_infill = 60 -speed_wall = =speed_print +speed_print = 30 speed_support = =speed_print speed_travel = 80 -retraction_amount = 4.5 -retraction_speed = 20 -retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 20 -adhesion_type = skirt \ No newline at end of file +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_pro_evo_hs_0.40_antibact_normal.inst.cfg b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_pro_evo_hs_0.40_antibact_normal.inst.cfg index ea027c21b3..51e58695a1 100644 --- a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_pro_evo_hs_0.40_antibact_normal.inst.cfg +++ b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_pro_evo_hs_0.40_antibact_normal.inst.cfg @@ -1,33 +1,34 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_pro_evo +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_antibact_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_antibact_pla variant = Hardened Steel 0.4mm Nozzle +weight = -1 [values] -material_bed_temperature = 60 +adhesion_type = skirt +bridge_skin_speed = 20 +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.30 -material_diameter = 1.75 +material_bed_temperature = 60 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 30 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 4.5 +retraction_prime_speed = 15 +retraction_speed = 20 speed_infill = 60 -speed_wall = =speed_print +speed_print = 30 speed_support = =speed_print speed_travel = 80 -retraction_amount = 4.5 -retraction_speed = 20 -retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 20 -adhesion_type = skirt \ No newline at end of file +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_super_copper_0.40_antibact_coarse.inst.cfg b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_super_copper_0.40_antibact_coarse.inst.cfg index 9c84281c7a..8a30ff4b2a 100644 --- a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_super_copper_0.40_antibact_coarse.inst.cfg +++ b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_super_copper_0.40_antibact_coarse.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_super +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_antibact_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_antibact_pla variant = Copper 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = =speed_print -speed_topbottom = 10 -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.5 retraction_speed = 50 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_super_copper_0.40_antibact_draft.inst.cfg b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_super_copper_0.40_antibact_draft.inst.cfg index afd27ae722..ba2f33b394 100644 --- a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_super_copper_0.40_antibact_draft.inst.cfg +++ b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_super_copper_0.40_antibact_draft.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_super +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_antibact_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_antibact_pla variant = Copper 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = =speed_print -speed_topbottom = 10 -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.5 retraction_speed = 50 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_super_copper_0.40_antibact_fine.inst.cfg b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_super_copper_0.40_antibact_fine.inst.cfg index 510d48426a..d84464db7e 100644 --- a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_super_copper_0.40_antibact_fine.inst.cfg +++ b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_super_copper_0.40_antibact_fine.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_super +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_antibact_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_antibact_pla variant = Copper 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = =speed_print -speed_topbottom = 10 -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.5 retraction_speed = 50 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_super_copper_0.40_antibact_normal.inst.cfg b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_super_copper_0.40_antibact_normal.inst.cfg index 1ecafc72bb..1bb55e018a 100644 --- a/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_super_copper_0.40_antibact_normal.inst.cfg +++ b/resources/quality/xyzprinting/anti_bact/xyzprinting_da_vinci_super_copper_0.40_antibact_normal.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_super +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_antibact_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_antibact_pla variant = Copper 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.35 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = =speed_print -speed_topbottom = 10 -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.5 retraction_speed = 50 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40_carbon_fiber_coarse.inst.cfg b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40_carbon_fiber_coarse.inst.cfg index cc345dbba7..5fa8e3487f 100644 --- a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40_carbon_fiber_coarse.inst.cfg +++ b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40_carbon_fiber_coarse.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_jr_1p0a_pro +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_carbon_fiber +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_carbon_fiber variant = Hardened Steel 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 6.0 retraction_speed = 20 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40_carbon_fiber_draft.inst.cfg b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40_carbon_fiber_draft.inst.cfg index 90780031d5..f294f36806 100644 --- a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40_carbon_fiber_draft.inst.cfg +++ b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40_carbon_fiber_draft.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_jr_1p0a_pro +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_carbon_fiber +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_carbon_fiber variant = Hardened Steel 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 6.0 retraction_speed = 20 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40_carbon_fiber_fine.inst.cfg b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40_carbon_fiber_fine.inst.cfg index 5682d4b35a..fe9edff515 100644 --- a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40_carbon_fiber_fine.inst.cfg +++ b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40_carbon_fiber_fine.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_jr_1p0a_pro +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_carbon_fiber +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_carbon_fiber variant = Hardened Steel 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 6.0 retraction_speed = 20 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40_carbon_fiber_normal.inst.cfg b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40_carbon_fiber_normal.inst.cfg index 0850c8b68e..1e2043bb5d 100644 --- a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40_carbon_fiber_normal.inst.cfg +++ b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40_carbon_fiber_normal.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_jr_1p0a_pro +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_carbon_fiber +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_carbon_fiber variant = Hardened Steel 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.35 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 6.0 retraction_speed = 20 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40_carbon_fiber_coarse.inst.cfg b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40_carbon_fiber_coarse.inst.cfg index 5b7de60137..08287572d8 100644 --- a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40_carbon_fiber_coarse.inst.cfg +++ b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40_carbon_fiber_coarse.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_jr_pro_xeplus +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_carbon_fiber +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_carbon_fiber variant = Hardened Steel 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = =40 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 8.0 retraction_speed = 20 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =40 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40_carbon_fiber_draft.inst.cfg b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40_carbon_fiber_draft.inst.cfg index 4bcdc66683..d86773bea2 100644 --- a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40_carbon_fiber_draft.inst.cfg +++ b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40_carbon_fiber_draft.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_jr_pro_xeplus +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_carbon_fiber +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_carbon_fiber variant = Hardened Steel 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = =40 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 8.0 retraction_speed = 20 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =40 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40_carbon_fiber_fine.inst.cfg b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40_carbon_fiber_fine.inst.cfg index 4419d9316c..13d58eb1dd 100644 --- a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40_carbon_fiber_fine.inst.cfg +++ b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40_carbon_fiber_fine.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_jr_pro_xeplus +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_carbon_fiber +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_carbon_fiber variant = Hardened Steel 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = =40 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 8.0 retraction_speed = 20 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =40 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40_carbon_fiber_normal.inst.cfg b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40_carbon_fiber_normal.inst.cfg index 7dd8374aa7..ff1b797a91 100644 --- a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40_carbon_fiber_normal.inst.cfg +++ b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40_carbon_fiber_normal.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_jr_pro_xeplus +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_carbon_fiber +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_carbon_fiber variant = Hardened Steel 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.3 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = =40 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 8.0 retraction_speed = 20 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =40 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40_carbon_fiber_coarse.inst.cfg b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40_carbon_fiber_coarse.inst.cfg index 18e946037b..eb161b4f7a 100644 --- a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40_carbon_fiber_coarse.inst.cfg +++ b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40_carbon_fiber_coarse.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_jr_pro_xplus +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_carbon_fiber +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_carbon_fiber variant = Hardened Steel 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 40 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 8.0 retraction_speed = 20 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 40 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40_carbon_fiber_draft.inst.cfg b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40_carbon_fiber_draft.inst.cfg index 23eee28cd7..fc657129e8 100644 --- a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40_carbon_fiber_draft.inst.cfg +++ b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40_carbon_fiber_draft.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_jr_pro_xplus +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_carbon_fiber +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_carbon_fiber variant = Hardened Steel 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 40 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 8.0 retraction_speed = 20 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 40 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40_carbon_fiber_fine.inst.cfg b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40_carbon_fiber_fine.inst.cfg index c09a9740bc..0b124e4562 100644 --- a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40_carbon_fiber_fine.inst.cfg +++ b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40_carbon_fiber_fine.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_jr_pro_xplus +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_carbon_fiber +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_carbon_fiber variant = Hardened Steel 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 40 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 8.0 retraction_speed = 20 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 40 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40_carbon_fiber_normal.inst.cfg b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40_carbon_fiber_normal.inst.cfg index 0e81830472..ee57c8545b 100644 --- a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40_carbon_fiber_normal.inst.cfg +++ b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40_carbon_fiber_normal.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_jr_pro_xplus +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_carbon_fiber +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_carbon_fiber variant = Hardened Steel 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.3 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 40 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 8.0 retraction_speed = 20 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 40 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_w_pro_hs_0.40_carbon_fiber_coarse.inst.cfg b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_w_pro_hs_0.40_carbon_fiber_coarse.inst.cfg index fb16ffc822..6cd06c000e 100644 --- a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_w_pro_hs_0.40_carbon_fiber_coarse.inst.cfg +++ b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_w_pro_hs_0.40_carbon_fiber_coarse.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_jr_w_pro +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_carbon_fiber +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_carbon_fiber variant = Hardened Steel 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 8.0 retraction_speed = 50 skirt_brim_speed = =speed_print -infill_sparse_density = 10 +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_w_pro_hs_0.40_carbon_fiber_draft.inst.cfg b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_w_pro_hs_0.40_carbon_fiber_draft.inst.cfg index 124e5b2f29..e497958e4c 100644 --- a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_w_pro_hs_0.40_carbon_fiber_draft.inst.cfg +++ b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_w_pro_hs_0.40_carbon_fiber_draft.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_jr_w_pro +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_carbon_fiber +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_carbon_fiber variant = Hardened Steel 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 8.0 retraction_speed = 50 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_w_pro_hs_0.40_carbon_fiber_fine.inst.cfg b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_w_pro_hs_0.40_carbon_fiber_fine.inst.cfg index a86cfa17d2..14c3456f3d 100644 --- a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_w_pro_hs_0.40_carbon_fiber_fine.inst.cfg +++ b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_w_pro_hs_0.40_carbon_fiber_fine.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_jr_w_pro +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_carbon_fiber +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_carbon_fiber variant = Hardened Steel 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 8.0 retraction_speed = 50 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_w_pro_hs_0.40_carbon_fiber_normal.inst.cfg b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_w_pro_hs_0.40_carbon_fiber_normal.inst.cfg index 374742ca6f..d8adcebd34 100644 --- a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_w_pro_hs_0.40_carbon_fiber_normal.inst.cfg +++ b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_jr_w_pro_hs_0.40_carbon_fiber_normal.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_jr_w_pro +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_carbon_fiber +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_carbon_fiber variant = Hardened Steel 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.35 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 8.0 retraction_speed = 50 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_pro_evo_hs_0.40_carbon_fiber_coarse.inst.cfg b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_pro_evo_hs_0.40_carbon_fiber_coarse.inst.cfg index fe6a2d359a..2ce4016c8d 100644 --- a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_pro_evo_hs_0.40_carbon_fiber_coarse.inst.cfg +++ b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_pro_evo_hs_0.40_carbon_fiber_coarse.inst.cfg @@ -1,35 +1,36 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_pro_evo +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_carbon_fiber +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_carbon_fiber variant = Hardened Steel 0.4mm Nozzle +weight = -3 [values] -material_bed_temperature = 60 +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 +adhesion_type = skirt +bridge_skin_speed = 20 +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -material_diameter = 1.75 +material_bed_temperature = 60 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 30 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 6.5 +retraction_prime_speed = 15 +retraction_speed = 20 speed_infill = 60 -speed_wall = =speed_print +speed_print = 30 speed_support = =speed_print speed_travel = 80 -retraction_amount = 6.5 -retraction_speed = 20 -retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 20 -adhesion_type = skirt -acceleration_infill = 1000.0 -acceleration_wall = 1000.0 \ No newline at end of file +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_pro_evo_hs_0.40_carbon_fiber_draft.inst.cfg b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_pro_evo_hs_0.40_carbon_fiber_draft.inst.cfg index c3ed048f94..cca35dd7cf 100644 --- a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_pro_evo_hs_0.40_carbon_fiber_draft.inst.cfg +++ b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_pro_evo_hs_0.40_carbon_fiber_draft.inst.cfg @@ -1,35 +1,36 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_pro_evo +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_carbon_fiber +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_carbon_fiber variant = Hardened Steel 0.4mm Nozzle +weight = -2 [values] -material_bed_temperature = 60 +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 +adhesion_type = skirt +bridge_skin_speed = 20 +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 -material_diameter = 1.75 +material_bed_temperature = 60 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 30 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 6.5 +retraction_prime_speed = 15 +retraction_speed = 20 speed_infill = 60 -speed_wall = =speed_print +speed_print = 30 speed_support = =speed_print speed_travel = 80 -retraction_amount = 6.5 -retraction_speed = 20 -retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 20 -adhesion_type = skirt -acceleration_infill = 1000.0 -acceleration_wall = 1000.0 \ No newline at end of file +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_pro_evo_hs_0.40_carbon_fiber_fine.inst.cfg b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_pro_evo_hs_0.40_carbon_fiber_fine.inst.cfg index aeb90c8ed1..276fb2a470 100644 --- a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_pro_evo_hs_0.40_carbon_fiber_fine.inst.cfg +++ b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_pro_evo_hs_0.40_carbon_fiber_fine.inst.cfg @@ -1,35 +1,36 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_pro_evo +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_carbon_fiber +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_carbon_fiber variant = Hardened Steel 0.4mm Nozzle +weight = 0 [values] -material_bed_temperature = 60 +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 +adhesion_type = skirt +bridge_skin_speed = 20 +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -material_diameter = 1.75 +material_bed_temperature = 60 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 30 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 6.5 +retraction_prime_speed = 15 +retraction_speed = 20 speed_infill = 60 -speed_wall = =speed_print +speed_print = 30 speed_support = =speed_print speed_travel = 80 -retraction_amount = 6.5 -retraction_speed = 20 -retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 20 -adhesion_type = skirt -acceleration_infill = 1000.0 -acceleration_wall = 1000.0 \ No newline at end of file +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_pro_evo_hs_0.40_carbon_fiber_normal.inst.cfg b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_pro_evo_hs_0.40_carbon_fiber_normal.inst.cfg index 8a2a29504e..09ddcee98a 100644 --- a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_pro_evo_hs_0.40_carbon_fiber_normal.inst.cfg +++ b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_pro_evo_hs_0.40_carbon_fiber_normal.inst.cfg @@ -1,35 +1,36 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_pro_evo +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_carbon_fiber +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_carbon_fiber variant = Hardened Steel 0.4mm Nozzle +weight = -1 [values] -material_bed_temperature = 60 +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 +adhesion_type = skirt +bridge_skin_speed = 20 +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.30 -material_diameter = 1.75 +material_bed_temperature = 60 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 30 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 6.5 +retraction_prime_speed = 15 +retraction_speed = 20 speed_infill = 60 -speed_wall = =speed_print +speed_print = 30 speed_support = =speed_print speed_travel = 80 -retraction_amount = 6.5 -retraction_speed = 20 -retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 20 -adhesion_type = skirt -acceleration_infill = 1000.0 -acceleration_wall = 1000.0 \ No newline at end of file +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_super_hs_0.40_carbon_fiber_coarse.inst.cfg b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_super_hs_0.40_carbon_fiber_coarse.inst.cfg index ebaa6754eb..ed7ba48c18 100644 --- a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_super_hs_0.40_carbon_fiber_coarse.inst.cfg +++ b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_super_hs_0.40_carbon_fiber_coarse.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_super +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_carbon_fiber +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_carbon_fiber variant = Hardened Steel 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_infill = 45 -speed_wall = =speed_print -speed_topbottom = 10 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 6.0 retraction_speed = 20 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 45 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_super_hs_0.40_carbon_fiber_draft.inst.cfg b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_super_hs_0.40_carbon_fiber_draft.inst.cfg index 66566a6618..ec969d6f86 100644 --- a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_super_hs_0.40_carbon_fiber_draft.inst.cfg +++ b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_super_hs_0.40_carbon_fiber_draft.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_super +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_carbon_fiber +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_carbon_fiber variant = Hardened Steel 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_infill = 45 -speed_wall = =speed_print -speed_topbottom = 10 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 6.0 retraction_speed = 20 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 45 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_super_hs_0.40_carbon_fiber_fine.inst.cfg b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_super_hs_0.40_carbon_fiber_fine.inst.cfg index 56419af216..47ae3cab0b 100644 --- a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_super_hs_0.40_carbon_fiber_fine.inst.cfg +++ b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_super_hs_0.40_carbon_fiber_fine.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_super +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_carbon_fiber +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_carbon_fiber variant = Hardened Steel 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_infill = 45 -speed_wall = =speed_print -speed_topbottom = 10 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 6.0 retraction_speed = 20 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 45 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_super_hs_0.40_carbon_fiber_normal.inst.cfg b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_super_hs_0.40_carbon_fiber_normal.inst.cfg index 024707b534..4032f9b15a 100644 --- a/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_super_hs_0.40_carbon_fiber_normal.inst.cfg +++ b/resources/quality/xyzprinting/carbon_fiber/xyzprinting_da_vinci_super_hs_0.40_carbon_fiber_normal.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_super +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_carbon_fiber +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_carbon_fiber variant = Hardened Steel 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.35 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_infill = 45 -speed_wall = =speed_print -speed_topbottom = 10 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 6.0 retraction_speed = 20 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 45 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_colorinkjet_pla_coarse.inst.cfg b/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_colorinkjet_pla_coarse.inst.cfg index 218be0c25a..bf8546e8d9 100644 --- a/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_colorinkjet_pla_coarse.inst.cfg +++ b/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_colorinkjet_pla_coarse.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_jr_1p0a_pro +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_colorinkjet_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_colorinkjet_pla variant = Copper 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 65 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.5 retraction_speed = 30 skirt_brim_speed = 30 -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 65 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_colorinkjet_pla_draft.inst.cfg b/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_colorinkjet_pla_draft.inst.cfg index 394416097d..df7c3d31fe 100644 --- a/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_colorinkjet_pla_draft.inst.cfg +++ b/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_colorinkjet_pla_draft.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_jr_1p0a_pro +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_colorinkjet_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_colorinkjet_pla variant = Copper 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 65 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.5 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 65 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_colorinkjet_pla_fine.inst.cfg b/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_colorinkjet_pla_fine.inst.cfg index 18ea9f1f57..703b3abde0 100644 --- a/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_colorinkjet_pla_fine.inst.cfg +++ b/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_colorinkjet_pla_fine.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_jr_1p0a_pro +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_colorinkjet_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_colorinkjet_pla variant = Copper 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 65 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.5 retraction_speed = 30 skirt_brim_speed = 30 -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 65 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_colorinkjet_pla_normal.inst.cfg b/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_colorinkjet_pla_normal.inst.cfg index e2121793db..d5041be229 100644 --- a/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_colorinkjet_pla_normal.inst.cfg +++ b/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_colorinkjet_pla_normal.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_jr_1p0a_pro +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_colorinkjet_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_colorinkjet_pla variant = Copper 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.35 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 65 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.5 retraction_speed = 30 skirt_brim_speed = 30 -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 65 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_colorinkjet_pla_coarse.inst.cfg b/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_colorinkjet_pla_coarse.inst.cfg index 202a074bfd..4693fc8b7c 100644 --- a/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_colorinkjet_pla_coarse.inst.cfg +++ b/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_colorinkjet_pla_coarse.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_jr_w_pro +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_colorinkjet_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_colorinkjet_pla variant = Stainless Steel 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_colorinkjet_pla_draft.inst.cfg b/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_colorinkjet_pla_draft.inst.cfg index 46ac95c7ec..486350be31 100644 --- a/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_colorinkjet_pla_draft.inst.cfg +++ b/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_colorinkjet_pla_draft.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_jr_w_pro +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_colorinkjet_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_colorinkjet_pla variant = Stainless Steel 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_colorinkjet_pla_fine.inst.cfg b/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_colorinkjet_pla_fine.inst.cfg index e624873954..4557703c06 100644 --- a/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_colorinkjet_pla_fine.inst.cfg +++ b/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_colorinkjet_pla_fine.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_jr_w_pro +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_colorinkjet_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_colorinkjet_pla variant = Stainless Steel 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_colorinkjet_pla_normal.inst.cfg b/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_colorinkjet_pla_normal.inst.cfg index 9a9f637c42..20e8f77825 100644 --- a/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_colorinkjet_pla_normal.inst.cfg +++ b/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_colorinkjet_pla_normal.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_jr_w_pro +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_colorinkjet_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_colorinkjet_pla variant = Stainless Steel 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.35 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_super_copper_0.40_colorinkjet_pla_coarse.inst.cfg b/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_super_copper_0.40_colorinkjet_pla_coarse.inst.cfg index f4f581b823..3140dd41a2 100644 --- a/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_super_copper_0.40_colorinkjet_pla_coarse.inst.cfg +++ b/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_super_copper_0.40_colorinkjet_pla_coarse.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_super +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_colorinkjet_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_colorinkjet_pla variant = Copper 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_topbottom = 10 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.5 retraction_speed = 50 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_super_copper_0.40_colorinkjet_pla_draft.inst.cfg b/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_super_copper_0.40_colorinkjet_pla_draft.inst.cfg index ec627a7d92..c94e7da826 100644 --- a/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_super_copper_0.40_colorinkjet_pla_draft.inst.cfg +++ b/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_super_copper_0.40_colorinkjet_pla_draft.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_super +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_colorinkjet_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_colorinkjet_pla variant = Copper 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = =speed_print -speed_topbottom = 10 -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.5 retraction_speed = 50 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_super_copper_0.40_colorinkjet_pla_fine.inst.cfg b/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_super_copper_0.40_colorinkjet_pla_fine.inst.cfg index 3bb4123431..3a5c6b194f 100644 --- a/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_super_copper_0.40_colorinkjet_pla_fine.inst.cfg +++ b/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_super_copper_0.40_colorinkjet_pla_fine.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_super +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_colorinkjet_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_colorinkjet_pla variant = Copper 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_topbottom = 10 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.5 retraction_speed = 50 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_super_copper_0.40_colorinkjet_pla_normal.inst.cfg b/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_super_copper_0.40_colorinkjet_pla_normal.inst.cfg index a9ac7c2706..e35c7387b9 100644 --- a/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_super_copper_0.40_colorinkjet_pla_normal.inst.cfg +++ b/resources/quality/xyzprinting/color_pla/xyzprinting_da_vinci_super_copper_0.40_colorinkjet_pla_normal.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_super +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_colorinkjet_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_colorinkjet_pla variant = Copper 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.35 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_topbottom = 10 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.5 retraction_speed = 50 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/flexible/xyzprinting_da_vinci_super_copper_0.40_flexible_coarse.inst.cfg b/resources/quality/xyzprinting/flexible/xyzprinting_da_vinci_super_copper_0.40_flexible_coarse.inst.cfg index 50bdbebdfe..b2cbf4623e 100644 --- a/resources/quality/xyzprinting/flexible/xyzprinting_da_vinci_super_copper_0.40_flexible_coarse.inst.cfg +++ b/resources/quality/xyzprinting/flexible/xyzprinting_da_vinci_super_copper_0.40_flexible_coarse.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_super +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_flexible +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_flexible variant = Copper 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 20 layer_height = 0.4 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = =speed_print -speed_topbottom = 10 -speed_travel = 100 -infill_sparse_density = 20 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 6.0 retraction_speed = 40 -skirt_brim_speed = =speed_print \ No newline at end of file +skirt_brim_speed = =speed_print +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/flexible/xyzprinting_da_vinci_super_copper_0.40_flexible_draft.inst.cfg b/resources/quality/xyzprinting/flexible/xyzprinting_da_vinci_super_copper_0.40_flexible_draft.inst.cfg index 3e9dd619f9..7cdaafb43e 100644 --- a/resources/quality/xyzprinting/flexible/xyzprinting_da_vinci_super_copper_0.40_flexible_draft.inst.cfg +++ b/resources/quality/xyzprinting/flexible/xyzprinting_da_vinci_super_copper_0.40_flexible_draft.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_super +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_flexible +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_flexible variant = Copper 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 20 layer_height = 0.3 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = =speed_print -speed_topbottom = 10 -speed_travel = 100 -infill_sparse_density = 20 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 6.0 retraction_speed = 40 -skirt_brim_speed = =speed_print \ No newline at end of file +skirt_brim_speed = =speed_print +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/flexible/xyzprinting_da_vinci_super_copper_0.40_flexible_fine.inst.cfg b/resources/quality/xyzprinting/flexible/xyzprinting_da_vinci_super_copper_0.40_flexible_fine.inst.cfg index b82b3326dc..ca520499d8 100644 --- a/resources/quality/xyzprinting/flexible/xyzprinting_da_vinci_super_copper_0.40_flexible_fine.inst.cfg +++ b/resources/quality/xyzprinting/flexible/xyzprinting_da_vinci_super_copper_0.40_flexible_fine.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_super +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_flexible +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_flexible variant = Copper 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 20 layer_height = 0.1 layer_height_0 = 0.2 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = =speed_print -speed_topbottom = 10 -speed_travel = 100 -infill_sparse_density = 20 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 6.0 retraction_speed = 40 -skirt_brim_speed = =speed_print \ No newline at end of file +skirt_brim_speed = =speed_print +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/flexible/xyzprinting_da_vinci_super_copper_0.40_flexible_normal.inst.cfg b/resources/quality/xyzprinting/flexible/xyzprinting_da_vinci_super_copper_0.40_flexible_normal.inst.cfg index cb536269ff..401cdfd27c 100644 --- a/resources/quality/xyzprinting/flexible/xyzprinting_da_vinci_super_copper_0.40_flexible_normal.inst.cfg +++ b/resources/quality/xyzprinting/flexible/xyzprinting_da_vinci_super_copper_0.40_flexible_normal.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_super +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_flexible +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_flexible variant = Copper 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 20 layer_height = 0.2 layer_height_0 = 0.35 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = =speed_print -speed_topbottom = 10 -speed_travel = 100 -infill_sparse_density = 20 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 6.0 retraction_speed = 40 -skirt_brim_speed = =speed_print \ No newline at end of file +skirt_brim_speed = =speed_print +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40_metallic_coarse.inst.cfg b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40_metallic_coarse.inst.cfg index c0502165a2..c673754530 100644 --- a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40_metallic_coarse.inst.cfg +++ b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40_metallic_coarse.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_jr_1p0a_pro +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_metallic_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_metallic_pla variant = Hardened Steel 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40_metallic_draft.inst.cfg b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40_metallic_draft.inst.cfg index 560e212d7c..c84f8a94e5 100644 --- a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40_metallic_draft.inst.cfg +++ b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40_metallic_draft.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_jr_1p0a_pro +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_metallic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = 0 -material = xyzprinting_metallic_pla variant = Hardened Steel 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40_metallic_fine.inst.cfg b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40_metallic_fine.inst.cfg index f04189e175..8022c440c0 100644 --- a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40_metallic_fine.inst.cfg +++ b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40_metallic_fine.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_jr_1p0a_pro +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_metallic_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_metallic_pla variant = Hardened Steel 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40_metallic_normal.inst.cfg b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40_metallic_normal.inst.cfg index b53d5352a7..5ca7d0cb4c 100644 --- a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40_metallic_normal.inst.cfg +++ b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40_metallic_normal.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_jr_1p0a_pro +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_metallic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_metallic_pla variant = Hardened Steel 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.35 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40_metallic_coarse.inst.cfg b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40_metallic_coarse.inst.cfg index 7604763b1c..be76b6ec0d 100644 --- a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40_metallic_coarse.inst.cfg +++ b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40_metallic_coarse.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_jr_pro_xeplus +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_metallic_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_metallic_pla variant = Hardened Steel 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 7.0 retraction_speed = 15 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40_metallic_draft.inst.cfg b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40_metallic_draft.inst.cfg index f3f7c0258a..2b3af8bb45 100644 --- a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40_metallic_draft.inst.cfg +++ b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40_metallic_draft.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_jr_pro_xeplus +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_metallic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_metallic_pla variant = Hardened Steel 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 7.0 retraction_speed = 15 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40_metallic_fine.inst.cfg b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40_metallic_fine.inst.cfg index acd72ab2de..03ddbcc6a5 100644 --- a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40_metallic_fine.inst.cfg +++ b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40_metallic_fine.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_jr_pro_xeplus +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_metallic_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_metallic_pla variant = Hardened Steel 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 7.0 retraction_speed = 15 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40_metallic_normal.inst.cfg b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40_metallic_normal.inst.cfg index 013068f63e..549af3dc99 100644 --- a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40_metallic_normal.inst.cfg +++ b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40_metallic_normal.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_jr_pro_xeplus +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_metallic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_metallic_pla variant = Hardened Steel 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.3 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 7.0 retraction_speed = 15 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40_metallic_coarse.inst.cfg b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40_metallic_coarse.inst.cfg index f3bf32a869..83751d988d 100644 --- a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40_metallic_coarse.inst.cfg +++ b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40_metallic_coarse.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_jr_pro_xplus +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_metallic_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_metallic_pla variant = Hardened Steel 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 7.0 retraction_speed = 15 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40_metallic_draft.inst.cfg b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40_metallic_draft.inst.cfg index 225bfaa348..e2106a7c22 100644 --- a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40_metallic_draft.inst.cfg +++ b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40_metallic_draft.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_jr_pro_xplus +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_metallic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_metallic_pla variant = Hardened Steel 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 7.0 retraction_speed = 15 skirt_brim_speed = =speed_print -infill_sparse_density = 10 +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40_metallic_fine.inst.cfg b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40_metallic_fine.inst.cfg index 64f1044a53..fec10971bf 100644 --- a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40_metallic_fine.inst.cfg +++ b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40_metallic_fine.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_jr_pro_xplus +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_metallic_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_metallic_pla variant = Hardened Steel 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 7.0 retraction_speed = 15 skirt_brim_speed = =speed_print -infill_sparse_density = 10 +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40_metallic_normal.inst.cfg b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40_metallic_normal.inst.cfg index 0f0027f877..e25ef7dfd4 100644 --- a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40_metallic_normal.inst.cfg +++ b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40_metallic_normal.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_jr_pro_xplus +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_metallic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_metallic_pla variant = Hardened Steel 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.3 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 7.0 retraction_speed = 15 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_w_pro_hs_0.40_metallic_coarse.inst.cfg b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_w_pro_hs_0.40_metallic_coarse.inst.cfg index 35bbde5751..1eaf90aea0 100644 --- a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_w_pro_hs_0.40_metallic_coarse.inst.cfg +++ b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_w_pro_hs_0.40_metallic_coarse.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_jr_w_pro +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_metallic_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_metallic_pla variant = Hardened Steel 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.0 retraction_speed = 40 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_w_pro_hs_0.40_metallic_draft.inst.cfg b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_w_pro_hs_0.40_metallic_draft.inst.cfg index bc74ec20f1..00888d0d64 100644 --- a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_w_pro_hs_0.40_metallic_draft.inst.cfg +++ b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_w_pro_hs_0.40_metallic_draft.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_jr_w_pro +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_metallic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_metallic_pla variant = Hardened Steel 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.0 retraction_speed = 40 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_w_pro_hs_0.40_metallic_fine.inst.cfg b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_w_pro_hs_0.40_metallic_fine.inst.cfg index e3bcdbcd6a..8d8ce23bce 100644 --- a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_w_pro_hs_0.40_metallic_fine.inst.cfg +++ b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_w_pro_hs_0.40_metallic_fine.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_jr_w_pro +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_metallic_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_metallic_pla variant = Hardened Steel 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.0 retraction_speed = 40 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_w_pro_hs_0.40_metallic_normal.inst.cfg b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_w_pro_hs_0.40_metallic_normal.inst.cfg index 8fab1447fc..33f3254539 100644 --- a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_w_pro_hs_0.40_metallic_normal.inst.cfg +++ b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_jr_w_pro_hs_0.40_metallic_normal.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_jr_w_pro +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_metallic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_metallic_pla variant = Hardened Steel 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.35 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.0 retraction_speed = 40 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_metallic_coarse.inst.cfg b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_metallic_coarse.inst.cfg index b32467b7b6..de71464ecf 100644 --- a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_metallic_coarse.inst.cfg +++ b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_metallic_coarse.inst.cfg @@ -1,35 +1,36 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_pro_evo +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_metallic_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_metallic_pla variant = Hardened Steel 0.4mm Nozzle +weight = -3 [values] -material_bed_temperature = 60 +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 +adhesion_type = skirt +bridge_skin_speed = 20 +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -material_diameter = 1.75 +material_bed_temperature = 60 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 30 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 3 +retraction_prime_speed = =retraction_speed +retraction_speed = 20 speed_infill = 60 -speed_wall = =speed_print +speed_print = 30 speed_support = =speed_print speed_travel = 80 -retraction_amount = 3 -retraction_speed = 20 -retraction_prime_speed = =retraction_speed -infill_sparse_density = 10 -bridge_skin_speed = 20 -adhesion_type = skirt -acceleration_infill = 1000.0 -acceleration_wall = 1000.0 \ No newline at end of file +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_metallic_draft.inst.cfg b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_metallic_draft.inst.cfg index d852237394..693dd810e5 100644 --- a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_metallic_draft.inst.cfg +++ b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_metallic_draft.inst.cfg @@ -1,35 +1,36 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_pro_evo +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_metallic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_metallic_pla variant = Hardened Steel 0.4mm Nozzle +weight = -2 [values] -material_bed_temperature = 60 +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 +adhesion_type = skirt +bridge_skin_speed = 20 +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 -material_diameter = 1.75 +material_bed_temperature = 60 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 30 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 3 +retraction_prime_speed = =retraction_speed +retraction_speed = 20 speed_infill = 60 -speed_wall = =speed_print +speed_print = 30 speed_support = =speed_print speed_travel = 80 -retraction_amount = 3 -retraction_speed = 20 -retraction_prime_speed = =retraction_speed -infill_sparse_density = 10 -bridge_skin_speed = 20 -adhesion_type = skirt -acceleration_infill = 1000.0 -acceleration_wall = 1000.0 \ No newline at end of file +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_metallic_fine.inst.cfg b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_metallic_fine.inst.cfg index 24d8f006c1..5b06fe2bb5 100644 --- a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_metallic_fine.inst.cfg +++ b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_metallic_fine.inst.cfg @@ -1,35 +1,36 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_pro_evo +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_metallic_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_metallic_pla variant = Hardened Steel 0.4mm Nozzle +weight = 0 [values] -material_bed_temperature = 60 +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 +adhesion_type = skirt +bridge_skin_speed = 20 +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -material_diameter = 1.75 +material_bed_temperature = 60 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 30 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 3 +retraction_prime_speed = =retraction_speed +retraction_speed = 20 speed_infill = 60 -speed_wall = =speed_print +speed_print = 30 speed_support = =speed_print speed_travel = 80 -retraction_amount = 3 -retraction_speed = 20 -retraction_prime_speed = =retraction_speed -infill_sparse_density = 10 -bridge_skin_speed = 20 -adhesion_type = skirt -acceleration_infill = 1000.0 -acceleration_wall = 1000.0 \ No newline at end of file +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_metallic_normal.inst.cfg b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_metallic_normal.inst.cfg index 65813f660f..ec6f524272 100644 --- a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_metallic_normal.inst.cfg +++ b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_metallic_normal.inst.cfg @@ -1,35 +1,36 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_pro_evo +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_metallic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_metallic_pla variant = Hardened Steel 0.4mm Nozzle +weight = -1 [values] -material_bed_temperature = 60 +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 +adhesion_type = skirt +bridge_skin_speed = 20 +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.30 -material_diameter = 1.75 +material_bed_temperature = 60 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 30 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 3 +retraction_prime_speed = =retraction_speed +retraction_speed = 20 speed_infill = 60 -speed_wall = =speed_print +speed_print = 30 speed_support = =speed_print speed_travel = 80 -retraction_amount = 3 -retraction_speed = 20 -retraction_prime_speed = =retraction_speed -infill_sparse_density = 10 -bridge_skin_speed = 20 -adhesion_type = skirt -acceleration_infill = 1000.0 -acceleration_wall = 1000.0 \ No newline at end of file +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_super_hs_0.40_metallic_coarse.inst.cfg b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_super_hs_0.40_metallic_coarse.inst.cfg index 355ec0a4ab..f4343202ad 100644 --- a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_super_hs_0.40_metallic_coarse.inst.cfg +++ b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_super_hs_0.40_metallic_coarse.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_super +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_metallic_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_metallic_pla variant = Hardened Steel 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 6.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_super_hs_0.40_metallic_draft.inst.cfg b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_super_hs_0.40_metallic_draft.inst.cfg index 7035535497..40b8629f7d 100644 --- a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_super_hs_0.40_metallic_draft.inst.cfg +++ b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_super_hs_0.40_metallic_draft.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_super +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_metallic_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_metallic_pla variant = Hardened Steel 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 6.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_super_hs_0.40_metallic_fine.inst.cfg b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_super_hs_0.40_metallic_fine.inst.cfg index 18e60deb69..bc3ef4a5a6 100644 --- a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_super_hs_0.40_metallic_fine.inst.cfg +++ b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_super_hs_0.40_metallic_fine.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_super +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_metallic_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_metallic_pla variant = Hardened Steel 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 6.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_super_hs_0.40_metallic_normal.inst.cfg b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_super_hs_0.40_metallic_normal.inst.cfg index 19b2becfbf..4ebdfd25ce 100644 --- a/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_super_hs_0.40_metallic_normal.inst.cfg +++ b/resources/quality/xyzprinting/metallic_pla/xyzprinting_da_vinci_super_hs_0.40_metallic_normal.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_super +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_metallic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_metallic_pla variant = Hardened Steel 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.35 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 6.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_pro_evo_hs_0.40_nylon_coarse.inst.cfg b/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_pro_evo_hs_0.40_nylon_coarse.inst.cfg index 0e63f87aa8..bcf32163db 100644 --- a/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_pro_evo_hs_0.40_nylon_coarse.inst.cfg +++ b/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_pro_evo_hs_0.40_nylon_coarse.inst.cfg @@ -1,35 +1,36 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_pro_evo +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_nylon +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_nylon variant = Hardened Steel 0.4mm Nozzle +weight = -3 [values] +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 +bridge_skin_speed = 50 +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -material_diameter = 1.75 material_bed_temperature = 100 material_bed_temperature_layer_0 = =material_bed_temperature +material_diameter = 1.75 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature material_print_temperature = 260 material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_final_print_temperature = =material_print_temperature -speed_print = 40 -speed_wall = =speed_print +retraction_amount = 6.0 +retraction_prime_speed = 15 +retraction_speed = 50 speed_infill = =speed_print +speed_print = 40 speed_support = =speed_print speed_travel = 150 -retraction_amount = 6.0 -retraction_speed = 50 -retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 50 -acceleration_infill = 1000.0 -acceleration_wall = 1000.0 \ No newline at end of file +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_pro_evo_hs_0.40_nylon_draft.inst.cfg b/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_pro_evo_hs_0.40_nylon_draft.inst.cfg index 079860a5b6..2ebe01e2d8 100644 --- a/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_pro_evo_hs_0.40_nylon_draft.inst.cfg +++ b/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_pro_evo_hs_0.40_nylon_draft.inst.cfg @@ -1,35 +1,36 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_pro_evo +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_nylon +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_nylon variant = Hardened Steel 0.4mm Nozzle +weight = -2 [values] +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 +bridge_skin_speed = 50 +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 -material_diameter = 1.75 material_bed_temperature = 100 material_bed_temperature_layer_0 = =material_bed_temperature +material_diameter = 1.75 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature material_print_temperature = 260 material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_final_print_temperature = =material_print_temperature -speed_print = 40 -speed_wall = =speed_print +retraction_amount = 6.0 +retraction_prime_speed = 15 +retraction_speed = 50 speed_infill = =speed_print +speed_print = 40 speed_support = =speed_print speed_travel = 150 -retraction_amount = 6.0 -retraction_speed = 50 -retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 50 -acceleration_infill = 1000.0 -acceleration_wall = 1000.0 \ No newline at end of file +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_pro_evo_hs_0.40_nylon_fine.inst.cfg b/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_pro_evo_hs_0.40_nylon_fine.inst.cfg index 310b83853e..bf291a5f84 100644 --- a/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_pro_evo_hs_0.40_nylon_fine.inst.cfg +++ b/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_pro_evo_hs_0.40_nylon_fine.inst.cfg @@ -1,35 +1,36 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_pro_evo +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_nylon +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_nylon variant = Hardened Steel 0.4mm Nozzle +weight = 0 [values] +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 +bridge_skin_speed = 50 +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -material_diameter = 1.75 material_bed_temperature = 100 material_bed_temperature_layer_0 = =material_bed_temperature +material_diameter = 1.75 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature material_print_temperature = 260 material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_final_print_temperature = =material_print_temperature -speed_print = 40 -speed_wall = =speed_print +retraction_amount = 6.0 +retraction_prime_speed = 15 +retraction_speed = 50 speed_infill = =speed_print +speed_print = 40 speed_support = =speed_print speed_travel = 150 -retraction_amount = 6.0 -retraction_speed = 50 -retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 50 -acceleration_infill = 1000.0 -acceleration_wall = 1000.0 \ No newline at end of file +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_pro_evo_hs_0.40_nylon_normal.inst.cfg b/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_pro_evo_hs_0.40_nylon_normal.inst.cfg index f64c7b90c5..0edeaf97b1 100644 --- a/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_pro_evo_hs_0.40_nylon_normal.inst.cfg +++ b/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_pro_evo_hs_0.40_nylon_normal.inst.cfg @@ -1,35 +1,36 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_pro_evo +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_nylon +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_nylon variant = Hardened Steel 0.4mm Nozzle +weight = -1 [values] +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 +bridge_skin_speed = 50 +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.30 -material_diameter = 1.75 material_bed_temperature = 100 material_bed_temperature_layer_0 = =material_bed_temperature +material_diameter = 1.75 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature material_print_temperature = 260 material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_final_print_temperature = =material_print_temperature -speed_print = 40 -speed_wall = =speed_print +retraction_amount = 6.0 +retraction_prime_speed = 15 +retraction_speed = 50 speed_infill = =speed_print +speed_print = 40 speed_support = =speed_print speed_travel = 150 -retraction_amount = 6.0 -retraction_speed = 50 -retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 50 -acceleration_infill = 1000.0 -acceleration_wall = 1000.0 \ No newline at end of file +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_super_copper_0.40_nylon_coarse.inst.cfg b/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_super_copper_0.40_nylon_coarse.inst.cfg index a73a8e12e7..7b1ede4bcf 100644 --- a/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_super_copper_0.40_nylon_coarse.inst.cfg +++ b/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_super_copper_0.40_nylon_coarse.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_super +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_nylon +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_nylon variant = Copper 0.4mm Nozzle +weight = -3 [values] +brim_width = 5.0 +infill_sparse_density = 0 layer_height = 0.4 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 8.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 0 -brim_width = 5.0 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_super_copper_0.40_nylon_draft.inst.cfg b/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_super_copper_0.40_nylon_draft.inst.cfg index 1b9767b614..0a6df26285 100644 --- a/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_super_copper_0.40_nylon_draft.inst.cfg +++ b/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_super_copper_0.40_nylon_draft.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_super +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_nylon +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_nylon variant = Copper 0.4mm Nozzle +weight = -2 [values] +brim_width = 5.0 +infill_sparse_density = 0 layer_height = 0.3 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 8.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 0 -brim_width = 5.0 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_super_copper_0.40_nylon_fine.inst.cfg b/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_super_copper_0.40_nylon_fine.inst.cfg index 06c28e0dc1..9bf3aeb658 100644 --- a/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_super_copper_0.40_nylon_fine.inst.cfg +++ b/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_super_copper_0.40_nylon_fine.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_super +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_nylon +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_nylon variant = Copper 0.4mm Nozzle +weight = 0 [values] +brim_width = 5.0 +infill_sparse_density = 0 layer_height = 0.1 layer_height_0 = 0.2 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 8.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 0 -brim_width = 5.0 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_super_copper_0.40_nylon_normal.inst.cfg b/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_super_copper_0.40_nylon_normal.inst.cfg index d17cfa0ebb..5b01b4a49d 100644 --- a/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_super_copper_0.40_nylon_normal.inst.cfg +++ b/resources/quality/xyzprinting/nylon/xyzprinting_da_vinci_super_copper_0.40_nylon_normal.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_super +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_nylon +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_nylon variant = Copper 0.4mm Nozzle +weight = -1 [values] +brim_width = 5.0 +infill_sparse_density = 0 layer_height = 0.2 layer_height_0 = 0.35 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 8.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 0 -brim_width = 5.0 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/pahtcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_pahtcf15_coarse.inst.cfg b/resources/quality/xyzprinting/pahtcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_pahtcf15_coarse.inst.cfg index 2f291a310c..5aa9a392b4 100644 --- a/resources/quality/xyzprinting/pahtcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_pahtcf15_coarse.inst.cfg +++ b/resources/quality/xyzprinting/pahtcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_pahtcf15_coarse.inst.cfg @@ -1,39 +1,40 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_pro_evo +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_pahtcf15 +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_pahtcf15 variant = Hardened Steel High Temp. 0.6mm Nozzle +weight = -3 [values] -line_width = 0.4 -wall_line_width_x = 0.4 -layer_height = 0.4 -layer_height_0 = 0.4 -material_diameter = 1.75 -material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_final_print_temperature = =material_print_temperature -speed_print = 20 -speed_infill = 40 -speed_wall = =speed_print -speed_support = =speed_print -speed_travel = 150 -speed_layer_0 = 15 -retraction_amount = 7 -retraction_speed = 50 -retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 50 acceleration_infill = 500.0 acceleration_wall = 500.0 acceleration_wall_0 = 500.0 +bridge_skin_speed = 50 infill_material_flow = 85 -wall_material_flow = 85 \ No newline at end of file +infill_sparse_density = 10 +layer_height = 0.4 +layer_height_0 = 0.4 +line_width = 0.4 +material_bed_temperature_layer_0 = =material_bed_temperature +material_diameter = 1.75 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 7 +retraction_prime_speed = 15 +retraction_speed = 50 +speed_infill = 40 +speed_layer_0 = 15 +speed_print = 20 +speed_support = =speed_print +speed_travel = 150 +speed_wall = =speed_print +wall_line_width_x = 0.4 +wall_material_flow = 85 + diff --git a/resources/quality/xyzprinting/pahtcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_pahtcf15_draft.inst.cfg b/resources/quality/xyzprinting/pahtcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_pahtcf15_draft.inst.cfg index e3f8082b3c..bf8f6b27e2 100644 --- a/resources/quality/xyzprinting/pahtcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_pahtcf15_draft.inst.cfg +++ b/resources/quality/xyzprinting/pahtcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_pahtcf15_draft.inst.cfg @@ -1,39 +1,40 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_pro_evo +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_pahtcf15 +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_pahtcf15 variant = Hardened Steel High Temp. 0.6mm Nozzle +weight = -2 [values] -line_width = 0.4 -wall_line_width_x = 0.4 -layer_height = 0.3 -layer_height_0 = 0.4 -material_diameter = 1.75 -material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_final_print_temperature = =material_print_temperature -speed_print = 20 -speed_infill = 40 -speed_wall = =speed_print -speed_support = =speed_print -speed_travel = 150 -speed_layer_0 = 15 -retraction_amount = 7 -retraction_speed = 50 -retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 50 acceleration_infill = 500.0 acceleration_wall = 500.0 acceleration_wall_0 = 500.0 +bridge_skin_speed = 50 infill_material_flow = 85 -wall_material_flow = 85 \ No newline at end of file +infill_sparse_density = 10 +layer_height = 0.3 +layer_height_0 = 0.4 +line_width = 0.4 +material_bed_temperature_layer_0 = =material_bed_temperature +material_diameter = 1.75 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 7 +retraction_prime_speed = 15 +retraction_speed = 50 +speed_infill = 40 +speed_layer_0 = 15 +speed_print = 20 +speed_support = =speed_print +speed_travel = 150 +speed_wall = =speed_print +wall_line_width_x = 0.4 +wall_material_flow = 85 + diff --git a/resources/quality/xyzprinting/pahtcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_pahtcf15_fine.inst.cfg b/resources/quality/xyzprinting/pahtcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_pahtcf15_fine.inst.cfg index 735b3a9e8e..02be47c22b 100644 --- a/resources/quality/xyzprinting/pahtcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_pahtcf15_fine.inst.cfg +++ b/resources/quality/xyzprinting/pahtcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_pahtcf15_fine.inst.cfg @@ -1,39 +1,40 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_pro_evo +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_pahtcf15 +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_pahtcf15 variant = Hardened Steel High Temp. 0.6mm Nozzle +weight = 0 [values] -line_width = 0.4 -wall_line_width_x = 0.4 -layer_height = 0.1 -layer_height_0 = 0.2 -material_diameter = 1.75 -material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_final_print_temperature = =material_print_temperature -speed_print = 20 -speed_infill = 40 -speed_wall = =speed_print -speed_support = =speed_print -speed_travel = 150 -speed_layer_0 = 15 -retraction_amount = 7 -retraction_speed = 50 -retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 50 acceleration_infill = 500.0 acceleration_wall = 500.0 acceleration_wall_0 = 500.0 +bridge_skin_speed = 50 infill_material_flow = 85 -wall_material_flow = 85 \ No newline at end of file +infill_sparse_density = 10 +layer_height = 0.1 +layer_height_0 = 0.2 +line_width = 0.4 +material_bed_temperature_layer_0 = =material_bed_temperature +material_diameter = 1.75 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 7 +retraction_prime_speed = 15 +retraction_speed = 50 +speed_infill = 40 +speed_layer_0 = 15 +speed_print = 20 +speed_support = =speed_print +speed_travel = 150 +speed_wall = =speed_print +wall_line_width_x = 0.4 +wall_material_flow = 85 + diff --git a/resources/quality/xyzprinting/pahtcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_pahtcf15_normal.inst.cfg b/resources/quality/xyzprinting/pahtcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_pahtcf15_normal.inst.cfg index a722f3d5ac..9b7a8892c3 100644 --- a/resources/quality/xyzprinting/pahtcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_pahtcf15_normal.inst.cfg +++ b/resources/quality/xyzprinting/pahtcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_pahtcf15_normal.inst.cfg @@ -1,39 +1,40 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_pro_evo +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_pahtcf15 +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_pahtcf15 variant = Hardened Steel High Temp. 0.6mm Nozzle +weight = -1 [values] -line_width = 0.4 -wall_line_width_x = 0.4 -layer_height = 0.2 -layer_height_0 = 0.3 -material_diameter = 1.75 -material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_final_print_temperature = =material_print_temperature -speed_print = 20 -speed_infill = 40 -speed_wall = =speed_print -speed_support = =speed_print -speed_travel = 150 -speed_layer_0 = 15 -retraction_amount = 7 -retraction_speed = 50 -retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 50 acceleration_infill = 500.0 acceleration_wall = 500.0 acceleration_wall_0 = 500.0 +bridge_skin_speed = 50 infill_material_flow = 85 -wall_material_flow = 85 \ No newline at end of file +infill_sparse_density = 10 +layer_height = 0.2 +layer_height_0 = 0.3 +line_width = 0.4 +material_bed_temperature_layer_0 = =material_bed_temperature +material_diameter = 1.75 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 7 +retraction_prime_speed = 15 +retraction_speed = 50 +speed_infill = 40 +speed_layer_0 = 15 +speed_print = 20 +speed_support = =speed_print +speed_travel = 150 +speed_wall = =speed_print +wall_line_width_x = 0.4 +wall_material_flow = 85 + diff --git a/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hs_0.40_pc_coarse.inst.cfg b/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hs_0.40_pc_coarse.inst.cfg index 87200663cd..ed29543ca3 100644 --- a/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hs_0.40_pc_coarse.inst.cfg +++ b/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hs_0.40_pc_coarse.inst.cfg @@ -1,32 +1,33 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_pro_evo +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_pc +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_pc variant = Hardened Steel 0.4mm Nozzle +weight = -3 [values] +acceleration_infill = 1500.0 +bridge_skin_speed = 100 +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -material_diameter = 1.75 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 40 -speed_wall = =speed_print +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 3.0 +retraction_prime_speed = 15 +retraction_speed = 50 speed_infill = =speed_print +speed_print = 40 speed_support = =speed_print speed_travel = 150 -retraction_amount = 3.0 -retraction_speed = 50 -retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 100 -acceleration_infill = 1500.0 \ No newline at end of file +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hs_0.40_pc_draft.inst.cfg b/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hs_0.40_pc_draft.inst.cfg index 9ce244c865..74be9e1608 100644 --- a/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hs_0.40_pc_draft.inst.cfg +++ b/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hs_0.40_pc_draft.inst.cfg @@ -1,32 +1,33 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_pro_evo +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_pc +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_pc variant = Hardened Steel 0.4mm Nozzle +weight = -2 [values] +acceleration_infill = 1500.0 +bridge_skin_speed = 100 +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 -material_diameter = 1.75 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 40 -speed_wall = =speed_print +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 3.0 +retraction_prime_speed = 15 +retraction_speed = 50 speed_infill = =speed_print +speed_print = 40 speed_support = =speed_print speed_travel = 150 -retraction_amount = 3.0 -retraction_speed = 50 -retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 100 -acceleration_infill = 1500.0 \ No newline at end of file +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hs_0.40_pc_fine.inst.cfg b/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hs_0.40_pc_fine.inst.cfg index 27662123a3..d5509b3e69 100644 --- a/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hs_0.40_pc_fine.inst.cfg +++ b/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hs_0.40_pc_fine.inst.cfg @@ -1,32 +1,33 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_pro_evo +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_pc +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_pc variant = Hardened Steel 0.4mm Nozzle +weight = 0 [values] +acceleration_infill = 1500.0 +bridge_skin_speed = 100 +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -material_diameter = 1.75 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 40 -speed_wall = =speed_print +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 3.0 +retraction_prime_speed = 15 +retraction_speed = 50 speed_infill = =speed_print +speed_print = 40 speed_support = =speed_print speed_travel = 150 -retraction_amount = 3.0 -retraction_speed = 50 -retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 100 -acceleration_infill = 1500.0 \ No newline at end of file +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hs_0.40_pc_normal.inst.cfg b/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hs_0.40_pc_normal.inst.cfg index fdef6243c7..19c2a874b7 100644 --- a/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hs_0.40_pc_normal.inst.cfg +++ b/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hs_0.40_pc_normal.inst.cfg @@ -1,32 +1,33 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_pro_evo +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_pc +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_pc variant = Hardened Steel 0.4mm Nozzle +weight = -1 [values] +acceleration_infill = 1500.0 +bridge_skin_speed = 100 +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.30 -material_diameter = 1.75 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 40 -speed_wall = =speed_print +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 3.0 +retraction_prime_speed = 15 +retraction_speed = 50 speed_infill = =speed_print +speed_print = 40 speed_support = =speed_print speed_travel = 150 -retraction_amount = 3.0 -retraction_speed = 50 -retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 100 -acceleration_infill = 1500.0 \ No newline at end of file +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hsht_0.60_pc_coarse.inst.cfg b/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hsht_0.60_pc_coarse.inst.cfg index e4a7568fb3..0ba19ec331 100644 --- a/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hsht_0.60_pc_coarse.inst.cfg +++ b/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hsht_0.60_pc_coarse.inst.cfg @@ -1,39 +1,40 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_pro_evo +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_pc +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_pc variant = Hardened Steel High Temp. 0.6mm Nozzle +weight = -3 [values] -infill_line_width = 0.6 -line_width = 0.6 -wall_line_width_x = 0.6 -layer_height = 0.4 -layer_height_0 = 0.4 -material_diameter = 1.75 -material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_final_print_temperature = =material_print_temperature -speed_print = 40 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 150 -speed_layer_0 = 15 -retraction_amount = 5.5 -retraction_speed = 50 -retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 100 acceleration_infill = 500.0 acceleration_wall = 500.0 acceleration_wall_0 = 500.0 -adhesion_type = brim \ No newline at end of file +adhesion_type = brim +bridge_skin_speed = 100 +infill_line_width = 0.6 +infill_sparse_density = 10 +layer_height = 0.4 +layer_height_0 = 0.4 +line_width = 0.6 +material_bed_temperature_layer_0 = =material_bed_temperature +material_diameter = 1.75 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 5.5 +retraction_prime_speed = 15 +retraction_speed = 50 +speed_infill = =speed_print +speed_layer_0 = 15 +speed_print = 40 +speed_support = =speed_print +speed_travel = 150 +speed_wall = =speed_print +wall_line_width_x = 0.6 + diff --git a/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hsht_0.60_pc_draft.inst.cfg b/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hsht_0.60_pc_draft.inst.cfg index 135bff0276..1181aa5c0d 100644 --- a/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hsht_0.60_pc_draft.inst.cfg +++ b/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hsht_0.60_pc_draft.inst.cfg @@ -1,39 +1,40 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_pro_evo +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_pc +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_pc variant = Hardened Steel High Temp. 0.6mm Nozzle +weight = -2 [values] -infill_line_width = 0.6 -line_width = 0.6 -wall_line_width_x = 0.6 -layer_height = 0.3 -layer_height_0 = 0.4 -material_diameter = 1.75 -material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_final_print_temperature = =material_print_temperature -speed_print = 40 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 150 -speed_layer_0 = 15 -retraction_amount = 5.5 -retraction_speed = 50 -retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 100 acceleration_infill = 500.0 acceleration_wall = 500.0 acceleration_wall_0 = 500.0 -adhesion_type = brim \ No newline at end of file +adhesion_type = brim +bridge_skin_speed = 100 +infill_line_width = 0.6 +infill_sparse_density = 10 +layer_height = 0.3 +layer_height_0 = 0.4 +line_width = 0.6 +material_bed_temperature_layer_0 = =material_bed_temperature +material_diameter = 1.75 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 5.5 +retraction_prime_speed = 15 +retraction_speed = 50 +speed_infill = =speed_print +speed_layer_0 = 15 +speed_print = 40 +speed_support = =speed_print +speed_travel = 150 +speed_wall = =speed_print +wall_line_width_x = 0.6 + diff --git a/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hsht_0.60_pc_fine.inst.cfg b/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hsht_0.60_pc_fine.inst.cfg index e454e4e55b..ecbc89d7fc 100644 --- a/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hsht_0.60_pc_fine.inst.cfg +++ b/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hsht_0.60_pc_fine.inst.cfg @@ -1,39 +1,40 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_pro_evo +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_pc +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_pc variant = Hardened Steel High Temp. 0.6mm Nozzle +weight = 0 [values] -infill_line_width = 0.6 -line_width = 0.6 -wall_line_width_x = 0.6 -layer_height = 0.1 -layer_height_0 = 0.2 -material_diameter = 1.75 -material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_final_print_temperature = =material_print_temperature -speed_print = 40 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 150 -speed_layer_0 = 15 -retraction_amount = 5.5 -retraction_speed = 50 -retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 100 acceleration_infill = 500.0 acceleration_wall = 500.0 acceleration_wall_0 = 500.0 -adhesion_type = brim \ No newline at end of file +adhesion_type = brim +bridge_skin_speed = 100 +infill_line_width = 0.6 +infill_sparse_density = 10 +layer_height = 0.1 +layer_height_0 = 0.2 +line_width = 0.6 +material_bed_temperature_layer_0 = =material_bed_temperature +material_diameter = 1.75 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 5.5 +retraction_prime_speed = 15 +retraction_speed = 50 +speed_infill = =speed_print +speed_layer_0 = 15 +speed_print = 40 +speed_support = =speed_print +speed_travel = 150 +speed_wall = =speed_print +wall_line_width_x = 0.6 + diff --git a/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hsht_0.60_pc_normal.inst.cfg b/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hsht_0.60_pc_normal.inst.cfg index f54c4828fa..f2d01c603b 100644 --- a/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hsht_0.60_pc_normal.inst.cfg +++ b/resources/quality/xyzprinting/pc/xyzprinting_da_vinci_pro_evo_hsht_0.60_pc_normal.inst.cfg @@ -1,39 +1,40 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_pro_evo +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_pc +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_pc variant = Hardened Steel High Temp. 0.6mm Nozzle +weight = -1 [values] -infill_line_width = 0.6 -line_width = 0.6 -wall_line_width_x = 0.6 -layer_height = 0.2 -layer_height_0 = 0.30 -material_diameter = 1.75 -material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_final_print_temperature = =material_print_temperature -speed_print = 40 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 150 -speed_layer_0 = 15 -retraction_amount = 5.5 -retraction_speed = 50 -retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 100 acceleration_infill = 500.0 acceleration_wall = 500.0 acceleration_wall_0 = 500.0 -adhesion_type = brim \ No newline at end of file +adhesion_type = brim +bridge_skin_speed = 100 +infill_line_width = 0.6 +infill_sparse_density = 10 +layer_height = 0.2 +layer_height_0 = 0.30 +line_width = 0.6 +material_bed_temperature_layer_0 = =material_bed_temperature +material_diameter = 1.75 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 5.5 +retraction_prime_speed = 15 +retraction_speed = 50 +speed_infill = =speed_print +speed_layer_0 = 15 +speed_print = 40 +speed_support = =speed_print +speed_travel = 150 +speed_wall = =speed_print +wall_line_width_x = 0.6 + diff --git a/resources/quality/xyzprinting/petcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_petcf15_coarse.inst.cfg b/resources/quality/xyzprinting/petcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_petcf15_coarse.inst.cfg index 7233fb108b..ebd2cf881f 100644 --- a/resources/quality/xyzprinting/petcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_petcf15_coarse.inst.cfg +++ b/resources/quality/xyzprinting/petcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_petcf15_coarse.inst.cfg @@ -1,36 +1,37 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_pro_evo +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_petcf15 +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_petcf15 variant = Hardened Steel High Temp. 0.6mm Nozzle +weight = -3 [values] -material_bed_temperature = 70 -layer_height = 0.4 -layer_height_0 = 0.4 -material_diameter = 1.75 -material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_infill = 30 -speed_wall = =speed_print -speed_support = =speed_print -speed_travel = 150 -retraction_amount = 7 -retraction_speed = 50 -retraction_prime_speed = =retraction_speed -infill_sparse_density = 10 -bridge_skin_speed = 50 -speed_layer_0 = 15 acceleration_infill = 500.0 acceleration_wall = 500.0 -acceleration_wall_0 = 500.0 \ No newline at end of file +acceleration_wall_0 = 500.0 +bridge_skin_speed = 50 +infill_sparse_density = 10 +layer_height = 0.4 +layer_height_0 = 0.4 +material_bed_temperature = 70 +material_bed_temperature_layer_0 = =material_bed_temperature +material_diameter = 1.75 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 7 +retraction_prime_speed = =retraction_speed +retraction_speed = 50 +speed_infill = 30 +speed_layer_0 = 15 +speed_print = 30 +speed_support = =speed_print +speed_travel = 150 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/petcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_petcf15_draft.inst.cfg b/resources/quality/xyzprinting/petcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_petcf15_draft.inst.cfg index 018a0fafb3..92309a75b8 100644 --- a/resources/quality/xyzprinting/petcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_petcf15_draft.inst.cfg +++ b/resources/quality/xyzprinting/petcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_petcf15_draft.inst.cfg @@ -1,36 +1,37 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_pro_evo +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_petcf15 +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_petcf15 variant = Hardened Steel High Temp. 0.6mm Nozzle +weight = -2 [values] -material_bed_temperature = 70 -layer_height = 0.3 -layer_height_0 = 0.4 -material_diameter = 1.75 -material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_infill = 30 -speed_wall = =speed_print -speed_support = =speed_print -speed_travel = 150 -retraction_amount = 7 -retraction_speed = 50 -retraction_prime_speed = =retraction_speed -infill_sparse_density = 10 -bridge_skin_speed = 50 -speed_layer_0 = 15 acceleration_infill = 500.0 acceleration_wall = 500.0 -acceleration_wall_0 = 500.0 \ No newline at end of file +acceleration_wall_0 = 500.0 +bridge_skin_speed = 50 +infill_sparse_density = 10 +layer_height = 0.3 +layer_height_0 = 0.4 +material_bed_temperature = 70 +material_bed_temperature_layer_0 = =material_bed_temperature +material_diameter = 1.75 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 7 +retraction_prime_speed = =retraction_speed +retraction_speed = 50 +speed_infill = 30 +speed_layer_0 = 15 +speed_print = 30 +speed_support = =speed_print +speed_travel = 150 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/petcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_petcf15_fine.inst.cfg b/resources/quality/xyzprinting/petcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_petcf15_fine.inst.cfg index 9dee9a2a5b..e52649d456 100644 --- a/resources/quality/xyzprinting/petcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_petcf15_fine.inst.cfg +++ b/resources/quality/xyzprinting/petcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_petcf15_fine.inst.cfg @@ -1,36 +1,37 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_pro_evo +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_petcf15 +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_petcf15 variant = Hardened Steel High Temp. 0.6mm Nozzle +weight = 0 [values] -material_bed_temperature = 70 -layer_height = 0.1 -layer_height_0 = 0.2 -material_diameter = 1.75 -material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_infill = 30 -speed_wall = =speed_print -speed_support = =speed_print -speed_travel = 150 -retraction_amount = 7 -retraction_speed = 50 -retraction_prime_speed = =retraction_speed -infill_sparse_density = 10 -bridge_skin_speed = 50 -speed_layer_0 = 15 acceleration_infill = 500.0 acceleration_wall = 500.0 -acceleration_wall_0 = 500.0 \ No newline at end of file +acceleration_wall_0 = 500.0 +bridge_skin_speed = 50 +infill_sparse_density = 10 +layer_height = 0.1 +layer_height_0 = 0.2 +material_bed_temperature = 70 +material_bed_temperature_layer_0 = =material_bed_temperature +material_diameter = 1.75 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 7 +retraction_prime_speed = =retraction_speed +retraction_speed = 50 +speed_infill = 30 +speed_layer_0 = 15 +speed_print = 30 +speed_support = =speed_print +speed_travel = 150 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/petcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_petcf15_normal.inst.cfg b/resources/quality/xyzprinting/petcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_petcf15_normal.inst.cfg index 8795cdd067..038421ea74 100644 --- a/resources/quality/xyzprinting/petcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_petcf15_normal.inst.cfg +++ b/resources/quality/xyzprinting/petcf15/xyzprinting_da_vinci_pro_evo_hsht_0.60_petcf15_normal.inst.cfg @@ -1,36 +1,37 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_pro_evo +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_petcf15 +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_petcf15 variant = Hardened Steel High Temp. 0.6mm Nozzle +weight = -1 [values] -material_bed_temperature = 70 -layer_height = 0.2 -layer_height_0 = 0.3 -material_diameter = 1.75 -material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_infill = 30 -speed_wall = =speed_print -speed_support = =speed_print -speed_travel = 150 -retraction_amount = 7 -retraction_speed = 50 -retraction_prime_speed = =retraction_speed -infill_sparse_density = 10 -bridge_skin_speed = 50 -speed_layer_0 = 15 acceleration_infill = 500.0 acceleration_wall = 500.0 -acceleration_wall_0 = 500.0 \ No newline at end of file +acceleration_wall_0 = 500.0 +bridge_skin_speed = 50 +infill_sparse_density = 10 +layer_height = 0.2 +layer_height_0 = 0.3 +material_bed_temperature = 70 +material_bed_temperature_layer_0 = =material_bed_temperature +material_diameter = 1.75 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 7 +retraction_prime_speed = =retraction_speed +retraction_speed = 50 +speed_infill = 30 +speed_layer_0 = 15 +speed_print = 30 +speed_support = =speed_print +speed_travel = 150 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_1p0_pro_copper_0.40_petg_coarse.inst.cfg b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_1p0_pro_copper_0.40_petg_coarse.inst.cfg index 5e531e1c24..3ea8c12979 100644 --- a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_1p0_pro_copper_0.40_petg_coarse.inst.cfg +++ b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_1p0_pro_copper_0.40_petg_coarse.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_1p0_pro +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_petg +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_petg variant = Copper 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 20 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.5 retraction_speed = 25 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 20 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_1p0_pro_copper_0.40_petg_draft.inst.cfg b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_1p0_pro_copper_0.40_petg_draft.inst.cfg index 402469864b..400e822d26 100644 --- a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_1p0_pro_copper_0.40_petg_draft.inst.cfg +++ b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_1p0_pro_copper_0.40_petg_draft.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_1p0_pro +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_petg +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_petg variant = Copper 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 20 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.5 retraction_speed = 25 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 20 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_1p0_pro_copper_0.40_petg_fine.inst.cfg b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_1p0_pro_copper_0.40_petg_fine.inst.cfg index de7ffe8913..5984d54538 100644 --- a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_1p0_pro_copper_0.40_petg_fine.inst.cfg +++ b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_1p0_pro_copper_0.40_petg_fine.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_1p0_pro +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_petg +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_petg variant = Copper 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 20 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.5 retraction_speed = 25 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 20 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_1p0_pro_copper_0.40_petg_normal.inst.cfg b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_1p0_pro_copper_0.40_petg_normal.inst.cfg index 67fdb2717e..1d16e502dc 100644 --- a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_1p0_pro_copper_0.40_petg_normal.inst.cfg +++ b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_1p0_pro_copper_0.40_petg_normal.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_1p0_pro +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_petg variant = Copper 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.35 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 20 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.5 retraction_speed = 25 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 20 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_petg_coarse.inst.cfg b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_petg_coarse.inst.cfg index 2e2fa7cc04..352b9886f0 100644 --- a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_petg_coarse.inst.cfg +++ b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_petg_coarse.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_jr_1p0a_pro +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_petg +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_petg variant = Copper 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_wall = 35 -speed_print = 30 -speed_topbottom = 10 -speed_infill = 50 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.5 retraction_speed = 25 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 50 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = 35 + diff --git a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_petg_draft.inst.cfg b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_petg_draft.inst.cfg index cfe072e728..5008152cdb 100644 --- a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_petg_draft.inst.cfg +++ b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_petg_draft.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_jr_1p0a_pro +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_petg +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_petg variant = Copper 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_wall = 35 -speed_print = 30 -speed_topbottom = 10 -speed_infill = 50 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.5 retraction_speed = 25 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 50 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = 35 + diff --git a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_petg_fine.inst.cfg b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_petg_fine.inst.cfg index d90ff6c758..7a18de5839 100644 --- a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_petg_fine.inst.cfg +++ b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_petg_fine.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_jr_1p0a_pro +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_petg +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_petg variant = Copper 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_wall = 35 -speed_print = 30 -speed_topbottom = 10 -speed_infill = 50 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.5 retraction_speed = 25 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 50 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = 35 + diff --git a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_petg_normal.inst.cfg b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_petg_normal.inst.cfg index cae759d562..cb2c696fb1 100644 --- a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_petg_normal.inst.cfg +++ b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_petg_normal.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_jr_1p0a_pro +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_petg variant = Copper 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.35 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_wall = 35 -speed_print = 30 -speed_topbottom = 10 -speed_infill = 50 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.5 retraction_speed = 25 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 50 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = 35 + diff --git a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_petg_coarse.inst.cfg b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_petg_coarse.inst.cfg index 345ca1a827..d99c13fd7f 100644 --- a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_petg_coarse.inst.cfg +++ b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_petg_coarse.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_jr_pro_xeplus +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_petg +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_petg variant = Copper 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 3.5 retraction_speed = 20 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_petg_draft.inst.cfg b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_petg_draft.inst.cfg index 99fcaa34ac..c37deadf9f 100644 --- a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_petg_draft.inst.cfg +++ b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_petg_draft.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_jr_pro_xeplus +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_petg +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_petg variant = Copper 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 3.5 retraction_speed = 20 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_petg_fine.inst.cfg b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_petg_fine.inst.cfg index 0159dbfa9a..cac45d9c82 100644 --- a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_petg_fine.inst.cfg +++ b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_petg_fine.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_jr_pro_xeplus +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_petg +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_petg variant = Copper 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 3.5 retraction_speed = 20 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_petg_normal.inst.cfg b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_petg_normal.inst.cfg index d30f928e17..74bf1843fe 100644 --- a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_petg_normal.inst.cfg +++ b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_petg_normal.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_jr_pro_xeplus +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_petg variant = Copper 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.3 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 3.5 retraction_speed = 20 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_petg_coarse.inst.cfg b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_petg_coarse.inst.cfg index 2366baac31..4c426d4a76 100644 --- a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_petg_coarse.inst.cfg +++ b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_petg_coarse.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_jr_pro_xplus +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_petg +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_petg variant = Copper 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 3.5 retraction_speed = 20 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_petg_draft.inst.cfg b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_petg_draft.inst.cfg index 56ee92cfb1..862cc32864 100644 --- a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_petg_draft.inst.cfg +++ b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_petg_draft.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_jr_pro_xplus +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_petg +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_petg variant = Copper 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 3.5 retraction_speed = 20 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_petg_fine.inst.cfg b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_petg_fine.inst.cfg index 4e02e76e9e..a5fc8c0063 100644 --- a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_petg_fine.inst.cfg +++ b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_petg_fine.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_jr_pro_xplus +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_petg +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_petg variant = Copper 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 3.5 retraction_speed = 20 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_petg_normal.inst.cfg b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_petg_normal.inst.cfg index 435145303a..68519ad37c 100644 --- a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_petg_normal.inst.cfg +++ b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_petg_normal.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_jr_pro_xplus +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_petg variant = Copper 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.3 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 3.5 retraction_speed = 20 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_w_pro_ss_0.40_petg_coarse.inst.cfg b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_w_pro_ss_0.40_petg_coarse.inst.cfg index 27a204ce55..212a29df42 100644 --- a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_w_pro_ss_0.40_petg_coarse.inst.cfg +++ b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_w_pro_ss_0.40_petg_coarse.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_jr_w_pro +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_petg +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_petg variant = Stainless Steel 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = 50 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_w_pro_ss_0.40_petg_draft.inst.cfg b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_w_pro_ss_0.40_petg_draft.inst.cfg index 0a01a5ff1a..c344f17efd 100644 --- a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_w_pro_ss_0.40_petg_draft.inst.cfg +++ b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_w_pro_ss_0.40_petg_draft.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_jr_w_pro +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_petg +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_petg variant = Stainless Steel 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = 50 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_w_pro_ss_0.40_petg_fine.inst.cfg b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_w_pro_ss_0.40_petg_fine.inst.cfg index 07447aa336..087f6ba776 100644 --- a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_w_pro_ss_0.40_petg_fine.inst.cfg +++ b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_w_pro_ss_0.40_petg_fine.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_jr_w_pro +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_petg +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_petg variant = Stainless Steel 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = 50 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_w_pro_ss_0.40_petg_normal.inst.cfg b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_w_pro_ss_0.40_petg_normal.inst.cfg index 78de24173e..a083b184f3 100644 --- a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_w_pro_ss_0.40_petg_normal.inst.cfg +++ b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_jr_w_pro_ss_0.40_petg_normal.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_jr_w_pro +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_petg variant = Stainless Steel 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.35 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = 50 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_pro_evo_hs_0.40_petg_coarse.inst.cfg b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_pro_evo_hs_0.40_petg_coarse.inst.cfg index 784a6891d4..7dd95cb8eb 100644 --- a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_pro_evo_hs_0.40_petg_coarse.inst.cfg +++ b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_pro_evo_hs_0.40_petg_coarse.inst.cfg @@ -1,35 +1,36 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_pro_evo +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_petg +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_petg variant = Hardened Steel 0.4mm Nozzle +weight = -3 [values] -material_bed_temperature = 70 +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 +adhesion_type = skirt +bridge_skin_speed = 20 +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -material_diameter = 1.75 +material_bed_temperature = 70 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 30 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 3 +retraction_prime_speed = =retraction_speed +retraction_speed = 20 speed_infill = 60 -speed_wall = =speed_print +speed_print = 30 speed_support = =speed_print speed_travel = 80 -retraction_amount = 3 -retraction_speed = 20 -retraction_prime_speed = =retraction_speed -infill_sparse_density = 10 -bridge_skin_speed = 20 -adhesion_type = skirt -acceleration_infill = 1000.0 -acceleration_wall = 1000.0 \ No newline at end of file +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_pro_evo_hs_0.40_petg_draft.inst.cfg b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_pro_evo_hs_0.40_petg_draft.inst.cfg index 6de215e455..ec072f6d01 100644 --- a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_pro_evo_hs_0.40_petg_draft.inst.cfg +++ b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_pro_evo_hs_0.40_petg_draft.inst.cfg @@ -1,35 +1,36 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_pro_evo +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_petg +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_petg variant = Hardened Steel 0.4mm Nozzle +weight = -2 [values] -material_bed_temperature = 70 +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 +adhesion_type = skirt +bridge_skin_speed = 20 +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 -material_diameter = 1.75 +material_bed_temperature = 70 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 30 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 3 +retraction_prime_speed = =retraction_speed +retraction_speed = 20 speed_infill = 60 -speed_wall = =speed_print +speed_print = 30 speed_support = =speed_print speed_travel = 80 -retraction_amount = 3 -retraction_speed = 20 -retraction_prime_speed = =retraction_speed -infill_sparse_density = 10 -bridge_skin_speed = 20 -adhesion_type = skirt -acceleration_infill = 1000.0 -acceleration_wall = 1000.0 \ No newline at end of file +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_pro_evo_hs_0.40_petg_fine.inst.cfg b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_pro_evo_hs_0.40_petg_fine.inst.cfg index e29278dd9e..50058e0133 100644 --- a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_pro_evo_hs_0.40_petg_fine.inst.cfg +++ b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_pro_evo_hs_0.40_petg_fine.inst.cfg @@ -1,35 +1,36 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_pro_evo +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_petg +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_petg variant = Hardened Steel 0.4mm Nozzle +weight = 0 [values] -material_bed_temperature = 70 +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 +adhesion_type = skirt +bridge_skin_speed = 20 +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -material_diameter = 1.75 +material_bed_temperature = 70 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 30 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 3 +retraction_prime_speed = =retraction_speed +retraction_speed = 20 speed_infill = 60 -speed_wall = =speed_print +speed_print = 30 speed_support = =speed_print speed_travel = 80 -retraction_amount = 3 -retraction_speed = 20 -retraction_prime_speed = =retraction_speed -infill_sparse_density = 10 -bridge_skin_speed = 20 -adhesion_type = skirt -acceleration_infill = 1000.0 -acceleration_wall = 1000.0 \ No newline at end of file +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_pro_evo_hs_0.40_petg_normal.inst.cfg b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_pro_evo_hs_0.40_petg_normal.inst.cfg index 0c18ba02d9..7213b1f7ae 100644 --- a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_pro_evo_hs_0.40_petg_normal.inst.cfg +++ b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_pro_evo_hs_0.40_petg_normal.inst.cfg @@ -1,35 +1,36 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_pro_evo +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_petg variant = Hardened Steel 0.4mm Nozzle +weight = -1 [values] -material_bed_temperature = 70 +acceleration_infill = 1000.0 +acceleration_wall = 1000.0 +adhesion_type = skirt +bridge_skin_speed = 20 +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.30 -material_diameter = 1.75 +material_bed_temperature = 70 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 30 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 3 +retraction_prime_speed = =retraction_speed +retraction_speed = 20 speed_infill = 60 -speed_wall = =speed_print +speed_print = 30 speed_support = =speed_print speed_travel = 80 -retraction_amount = 3 -retraction_speed = 20 -retraction_prime_speed = =retraction_speed -infill_sparse_density = 10 -bridge_skin_speed = 20 -adhesion_type = skirt -acceleration_infill = 1000.0 -acceleration_wall = 1000.0 \ No newline at end of file +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_super_copper_0.40_petg_coarse.inst.cfg b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_super_copper_0.40_petg_coarse.inst.cfg index e922a2da6f..2ed59dcbc0 100644 --- a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_super_copper_0.40_petg_coarse.inst.cfg +++ b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_super_copper_0.40_petg_coarse.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_super +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_petg +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_petg variant = Copper 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 60 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = 30 -speed_topbottom = 10 -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.0 retraction_speed = 25 skirt_brim_speed = =speed_support -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 60 +speed_support = 30 +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_super_copper_0.40_petg_draft.inst.cfg b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_super_copper_0.40_petg_draft.inst.cfg index 303090d266..1fcd9e6d48 100644 --- a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_super_copper_0.40_petg_draft.inst.cfg +++ b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_super_copper_0.40_petg_draft.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_super +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_petg +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_petg variant = Copper 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 60 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = 30 -speed_topbottom = 10 -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.0 retraction_speed = 25 skirt_brim_speed = =speed_support -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 60 +speed_support = 30 +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_super_copper_0.40_petg_fine.inst.cfg b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_super_copper_0.40_petg_fine.inst.cfg index 87b7ac3c68..c646c962c9 100644 --- a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_super_copper_0.40_petg_fine.inst.cfg +++ b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_super_copper_0.40_petg_fine.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_super +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_petg +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_petg variant = Copper 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 60 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = 30 -speed_topbottom = 10 -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.0 retraction_speed = 25 skirt_brim_speed = =speed_support -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 60 +speed_support = 30 +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_super_copper_0.40_petg_normal.inst.cfg b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_super_copper_0.40_petg_normal.inst.cfg index 0bd9dd5625..b2b037966a 100644 --- a/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_super_copper_0.40_petg_normal.inst.cfg +++ b/resources/quality/xyzprinting/petg/xyzprinting_da_vinci_super_copper_0.40_petg_normal.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_super +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_petg +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_petg variant = Copper 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.35 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 60 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = 30 -speed_topbottom = 10 -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.0 retraction_speed = 25 skirt_brim_speed = =speed_support -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 60 +speed_support = 30 +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_1p0_pro_copper_0.40_pla_coarse.inst.cfg b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_1p0_pro_copper_0.40_pla_coarse.inst.cfg index 75972101e6..520640fc20 100644 --- a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_1p0_pro_copper_0.40_pla_coarse.inst.cfg +++ b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_1p0_pro_copper_0.40_pla_coarse.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_1p0_pro +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_pla variant = Copper 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 20 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 20 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_1p0_pro_copper_0.40_pla_draft.inst.cfg b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_1p0_pro_copper_0.40_pla_draft.inst.cfg index 2b9a568f4c..1f8767de6b 100644 --- a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_1p0_pro_copper_0.40_pla_draft.inst.cfg +++ b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_1p0_pro_copper_0.40_pla_draft.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_1p0_pro +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_pla variant = Copper 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 20 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 20 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_1p0_pro_copper_0.40_pla_fine.inst.cfg b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_1p0_pro_copper_0.40_pla_fine.inst.cfg index d72d5a0929..339b68c4c5 100644 --- a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_1p0_pro_copper_0.40_pla_fine.inst.cfg +++ b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_1p0_pro_copper_0.40_pla_fine.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_1p0_pro +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_pla variant = Copper 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 20 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 20 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_1p0_pro_copper_0.40_pla_normal.inst.cfg b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_1p0_pro_copper_0.40_pla_normal.inst.cfg index f73e0c35b7..bd10e9ed5c 100644 --- a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_1p0_pro_copper_0.40_pla_normal.inst.cfg +++ b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_1p0_pro_copper_0.40_pla_normal.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_1p0_pro +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_pla variant = Copper 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.35 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 20 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 20 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_pla_coarse.inst.cfg b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_pla_coarse.inst.cfg index 21ecc91bda..844b029939 100644 --- a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_pla_coarse.inst.cfg +++ b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_pla_coarse.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_jr_1p0a_pro +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_pla variant = Copper 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 65 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.5 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 65 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_pla_draft.inst.cfg b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_pla_draft.inst.cfg index 62b59ceed7..ef68b24710 100644 --- a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_pla_draft.inst.cfg +++ b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_pla_draft.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_jr_1p0a_pro +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_pla variant = Copper 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 65 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.5 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 65 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_pla_fine.inst.cfg b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_pla_fine.inst.cfg index b42627879c..ae102d26ef 100644 --- a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_pla_fine.inst.cfg +++ b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_pla_fine.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_jr_1p0a_pro +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_pla variant = Copper 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 65 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.5 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 65 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_pla_normal.inst.cfg b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_pla_normal.inst.cfg index 1f28e50af5..959cfafea4 100644 --- a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_pla_normal.inst.cfg +++ b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_pla_normal.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_jr_1p0a_pro +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_pla variant = Copper 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.35 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 65 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.5 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 65 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_pla_coarse.inst.cfg b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_pla_coarse.inst.cfg index df7b6136e0..2817105c60 100644 --- a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_pla_coarse.inst.cfg +++ b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_pla_coarse.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_jr_pro_xeplus +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_pla variant = Copper 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = 15 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_pla_draft.inst.cfg b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_pla_draft.inst.cfg index 82279c9794..39160f1bc6 100644 --- a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_pla_draft.inst.cfg +++ b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_pla_draft.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_jr_pro_xeplus +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_pla variant = Copper 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = 15 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_pla_fine.inst.cfg b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_pla_fine.inst.cfg index 7f34eabc71..89d04a2108 100644 --- a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_pla_fine.inst.cfg +++ b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_pla_fine.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_jr_pro_xeplus +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_pla variant = Copper 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = 15 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_pla_normal.inst.cfg b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_pla_normal.inst.cfg index ae26a479d0..94cb0723c3 100644 --- a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_pla_normal.inst.cfg +++ b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_pla_normal.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_jr_pro_xeplus +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_pla variant = Copper 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.3 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = 15 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_pla_coarse.inst.cfg b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_pla_coarse.inst.cfg index 6cb64326ba..5cd9aca8f9 100644 --- a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_pla_coarse.inst.cfg +++ b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_pla_coarse.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_jr_pro_xplus +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_pla variant = Copper 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = 15 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_pla_draft.inst.cfg b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_pla_draft.inst.cfg index 67b3394834..11c7196c75 100644 --- a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_pla_draft.inst.cfg +++ b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_pla_draft.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_jr_pro_xplus +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_pla variant = Copper 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = 15 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_pla_fine.inst.cfg b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_pla_fine.inst.cfg index b6128f2108..5b80d3de06 100644 --- a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_pla_fine.inst.cfg +++ b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_pla_fine.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_jr_pro_xplus +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_pla variant = Copper 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = 15 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_pla_normal.inst.cfg b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_pla_normal.inst.cfg index 9e72b54974..3c79ecefeb 100644 --- a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_pla_normal.inst.cfg +++ b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_pla_normal.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_jr_pro_xplus +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_pla variant = Copper 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.3 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = 15 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_pla_coarse.inst.cfg b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_pla_coarse.inst.cfg index 86e350d9c8..00af25e866 100644 --- a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_pla_coarse.inst.cfg +++ b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_pla_coarse.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_jr_w_pro +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_pla variant = Stainless Steel 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_pla_draft.inst.cfg b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_pla_draft.inst.cfg index 9778f2bea8..0f12194ce3 100644 --- a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_pla_draft.inst.cfg +++ b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_pla_draft.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_jr_w_pro +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_pla variant = Stainless Steel 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 -retraction_speed = =speed_print retraction_prime_speed = =retraction_speed +retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_pla_fine.inst.cfg b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_pla_fine.inst.cfg index b3867cc83d..35c7c3abe0 100644 --- a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_pla_fine.inst.cfg +++ b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_pla_fine.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_jr_w_pro +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_pla variant = Stainless Steel 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_pla_normal.inst.cfg b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_pla_normal.inst.cfg index 63ee41e19c..5594607964 100644 --- a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_pla_normal.inst.cfg +++ b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_pla_normal.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_jr_w_pro +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_pla variant = Stainless Steel 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.35 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_pro_evo_hs_0.40_pla_coarse.inst.cfg b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_pro_evo_hs_0.40_pla_coarse.inst.cfg index 40298dcb60..f39aa1d0b2 100644 --- a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_pro_evo_hs_0.40_pla_coarse.inst.cfg +++ b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_pro_evo_hs_0.40_pla_coarse.inst.cfg @@ -1,33 +1,34 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_pro_evo +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_pla variant = Hardened Steel 0.4mm Nozzle +weight = -3 [values] -material_bed_temperature = 60 +adhesion_type = skirt +bridge_skin_speed = 20 +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -material_diameter = 1.75 +material_bed_temperature = 60 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 30 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 4.5 +retraction_prime_speed = 15 +retraction_speed = 20 speed_infill = 60 -speed_wall = =speed_print +speed_print = 30 speed_support = =speed_print speed_travel = 80 -retraction_amount = 4.5 -retraction_speed = 20 -retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 20 -adhesion_type = skirt \ No newline at end of file +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_pro_evo_hs_0.40_pla_draft.inst.cfg b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_pro_evo_hs_0.40_pla_draft.inst.cfg index 09a55b6c3d..9db32848ee 100644 --- a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_pro_evo_hs_0.40_pla_draft.inst.cfg +++ b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_pro_evo_hs_0.40_pla_draft.inst.cfg @@ -1,33 +1,34 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_pro_evo +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_pla variant = Hardened Steel 0.4mm Nozzle +weight = -2 [values] -material_bed_temperature = 60 +adhesion_type = skirt +bridge_skin_speed = 20 +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 -material_diameter = 1.75 +material_bed_temperature = 60 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 30 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 4.5 +retraction_prime_speed = 15 +retraction_speed = 20 speed_infill = 60 -speed_wall = =speed_print +speed_print = 30 speed_support = =speed_print speed_travel = 80 -retraction_amount = 4.5 -retraction_speed = 20 -retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 20 -adhesion_type = skirt \ No newline at end of file +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_pro_evo_hs_0.40_pla_fine.inst.cfg b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_pro_evo_hs_0.40_pla_fine.inst.cfg index 6efaedd517..49a544e34a 100644 --- a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_pro_evo_hs_0.40_pla_fine.inst.cfg +++ b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_pro_evo_hs_0.40_pla_fine.inst.cfg @@ -1,33 +1,34 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_pro_evo +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_pla variant = Hardened Steel 0.4mm Nozzle +weight = 0 [values] -material_bed_temperature = 60 +adhesion_type = skirt +bridge_skin_speed = 20 +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -material_diameter = 1.75 +material_bed_temperature = 60 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 30 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 4.5 +retraction_prime_speed = 15 +retraction_speed = 20 speed_infill = 60 -speed_wall = =speed_print +speed_print = 30 speed_support = =speed_print speed_travel = 80 -retraction_amount = 4.5 -retraction_speed = 20 -retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 20 -adhesion_type = skirt \ No newline at end of file +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_pro_evo_hs_0.40_pla_normal.inst.cfg b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_pro_evo_hs_0.40_pla_normal.inst.cfg index 8be9793a9e..06481bd3aa 100644 --- a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_pro_evo_hs_0.40_pla_normal.inst.cfg +++ b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_pro_evo_hs_0.40_pla_normal.inst.cfg @@ -1,33 +1,34 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_pro_evo +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_pla variant = Hardened Steel 0.4mm Nozzle +weight = -1 [values] -material_bed_temperature = 60 +adhesion_type = skirt +bridge_skin_speed = 20 +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.30 -material_diameter = 1.75 +material_bed_temperature = 60 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 30 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 4.5 +retraction_prime_speed = 15 +retraction_speed = 20 speed_infill = 60 -speed_wall = =speed_print +speed_print = 30 speed_support = =speed_print speed_travel = 80 -retraction_amount = 4.5 -retraction_speed = 20 -retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 20 -adhesion_type = skirt \ No newline at end of file +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_super_copper_0.40_pla_coarse.inst.cfg b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_super_copper_0.40_pla_coarse.inst.cfg index cd0721aaed..3dca2b7ddd 100644 --- a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_super_copper_0.40_pla_coarse.inst.cfg +++ b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_super_copper_0.40_pla_coarse.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_super +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_pla variant = Copper 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_topbottom = 10 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.5 retraction_speed = 50 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_super_copper_0.40_pla_draft.inst.cfg b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_super_copper_0.40_pla_draft.inst.cfg index e67a978a97..0cb89b0a14 100644 --- a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_super_copper_0.40_pla_draft.inst.cfg +++ b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_super_copper_0.40_pla_draft.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_super +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_pla variant = Copper 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_topbottom = 10 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.5 retraction_speed = 50 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_super_copper_0.40_pla_fine.inst.cfg b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_super_copper_0.40_pla_fine.inst.cfg index 3807cb4303..fb69df99de 100644 --- a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_super_copper_0.40_pla_fine.inst.cfg +++ b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_super_copper_0.40_pla_fine.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_super +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_pla variant = Copper 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_topbottom = 10 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.5 retraction_speed = 50 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_super_copper_0.40_pla_normal.inst.cfg b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_super_copper_0.40_pla_normal.inst.cfg index 2df983040b..97f1135880 100644 --- a/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_super_copper_0.40_pla_normal.inst.cfg +++ b/resources/quality/xyzprinting/pla/xyzprinting_da_vinci_super_copper_0.40_pla_normal.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_super +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_pla variant = Copper 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.35 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_topbottom = 10 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.5 retraction_speed = 50 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/ppgf30/xyzprinting_da_vinci_pro_evo_hs_0.40_ppgf30_coarse.inst.cfg b/resources/quality/xyzprinting/ppgf30/xyzprinting_da_vinci_pro_evo_hs_0.40_ppgf30_coarse.inst.cfg index 43ae099126..267c2e46c3 100644 --- a/resources/quality/xyzprinting/ppgf30/xyzprinting_da_vinci_pro_evo_hs_0.40_ppgf30_coarse.inst.cfg +++ b/resources/quality/xyzprinting/ppgf30/xyzprinting_da_vinci_pro_evo_hs_0.40_ppgf30_coarse.inst.cfg @@ -1,37 +1,38 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_pro_evo +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_ppgf30 +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_ppgf30 variant = Hardened Steel 0.4mm Nozzle +weight = -3 [values] -material_bed_temperature = 100 -layer_height = 0.4 -layer_height_0 = 0.4 -material_diameter = 1.75 -material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_final_print_temperature = =material_print_temperature -speed_print = 20 -speed_infill = 30 -speed_wall = =speed_print -speed_support = =speed_print -speed_travel = 200 -retraction_amount = 6 -retraction_speed = 50 -retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 50 -brim_width = 20.0 acceleration_infill = 1000.0 acceleration_wall = 1000.0 +bridge_skin_speed = 50 +brim_width = 20.0 infill_material_flow = 85 +infill_sparse_density = 10 +layer_height = 0.4 +layer_height_0 = 0.4 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = =material_bed_temperature +material_diameter = 1.75 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 6 +retraction_prime_speed = 15 +retraction_speed = 50 +speed_infill = 30 +speed_print = 20 +speed_support = =speed_print +speed_travel = 200 +speed_wall = =speed_print wall_material_flow = 85 + diff --git a/resources/quality/xyzprinting/ppgf30/xyzprinting_da_vinci_pro_evo_hs_0.40_ppgf30_draft.inst.cfg b/resources/quality/xyzprinting/ppgf30/xyzprinting_da_vinci_pro_evo_hs_0.40_ppgf30_draft.inst.cfg index 793a08f433..2bb1f10200 100644 --- a/resources/quality/xyzprinting/ppgf30/xyzprinting_da_vinci_pro_evo_hs_0.40_ppgf30_draft.inst.cfg +++ b/resources/quality/xyzprinting/ppgf30/xyzprinting_da_vinci_pro_evo_hs_0.40_ppgf30_draft.inst.cfg @@ -1,37 +1,38 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_pro_evo +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_ppgf30 +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_ppgf30 variant = Hardened Steel 0.4mm Nozzle +weight = -2 [values] -material_bed_temperature = 100 -layer_height = 0.3 -layer_height_0 = 0.4 -material_diameter = 1.75 -material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_final_print_temperature = =material_print_temperature -speed_print = 20 -speed_infill = 30 -speed_wall = =speed_print -speed_support = =speed_print -speed_travel = 200 -retraction_amount = 6 -retraction_speed = 50 -retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 50 -brim_width = 20.0 acceleration_infill = 1000.0 acceleration_wall = 1000.0 +bridge_skin_speed = 50 +brim_width = 20.0 infill_material_flow = 85 +infill_sparse_density = 10 +layer_height = 0.3 +layer_height_0 = 0.4 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = =material_bed_temperature +material_diameter = 1.75 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 6 +retraction_prime_speed = 15 +retraction_speed = 50 +speed_infill = 30 +speed_print = 20 +speed_support = =speed_print +speed_travel = 200 +speed_wall = =speed_print wall_material_flow = 85 + diff --git a/resources/quality/xyzprinting/ppgf30/xyzprinting_da_vinci_pro_evo_hs_0.40_ppgf30_fine.inst.cfg b/resources/quality/xyzprinting/ppgf30/xyzprinting_da_vinci_pro_evo_hs_0.40_ppgf30_fine.inst.cfg index 1e719a284c..80fc84e9bd 100644 --- a/resources/quality/xyzprinting/ppgf30/xyzprinting_da_vinci_pro_evo_hs_0.40_ppgf30_fine.inst.cfg +++ b/resources/quality/xyzprinting/ppgf30/xyzprinting_da_vinci_pro_evo_hs_0.40_ppgf30_fine.inst.cfg @@ -1,32 +1,33 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_pro_evo +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_ppgf30 +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_ppgf30 variant = Hardened Steel 0.4mm Nozzle +weight = 0 [values] -material_bed_temperature = 90 +bridge_skin_speed = 50 +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -material_diameter = 1.75 +material_bed_temperature = 90 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 20 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 6 +retraction_prime_speed = 15 +retraction_speed = 50 speed_infill = 30 -speed_wall = =speed_print +speed_print = 20 speed_support = =speed_print speed_travel = 200 -retraction_amount = 6 -retraction_speed = 50 -retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 50 \ No newline at end of file +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/ppgf30/xyzprinting_da_vinci_pro_evo_hs_0.40_ppgf30_normal.inst.cfg b/resources/quality/xyzprinting/ppgf30/xyzprinting_da_vinci_pro_evo_hs_0.40_ppgf30_normal.inst.cfg index 156f42ef22..ad6f16aa7d 100644 --- a/resources/quality/xyzprinting/ppgf30/xyzprinting_da_vinci_pro_evo_hs_0.40_ppgf30_normal.inst.cfg +++ b/resources/quality/xyzprinting/ppgf30/xyzprinting_da_vinci_pro_evo_hs_0.40_ppgf30_normal.inst.cfg @@ -1,37 +1,38 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_pro_evo +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_ppgf30 +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_ppgf30 variant = Hardened Steel 0.4mm Nozzle +weight = -1 [values] -material_bed_temperature = 100 -layer_height = 0.2 -layer_height_0 = 0.3 -material_diameter = 1.75 -material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_final_print_temperature = =material_print_temperature -speed_print = 20 -speed_infill = 30 -speed_wall = =speed_print -speed_support = =speed_print -speed_travel = 200 -retraction_amount = 6 -retraction_speed = 50 -retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 50 -brim_width = 20.0 acceleration_infill = 1000.0 acceleration_wall = 1000.0 +bridge_skin_speed = 50 +brim_width = 20.0 infill_material_flow = 85 -wall_material_flow = 85 \ No newline at end of file +infill_sparse_density = 10 +layer_height = 0.2 +layer_height_0 = 0.3 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = =material_bed_temperature +material_diameter = 1.75 +material_final_print_temperature = =material_print_temperature +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 6 +retraction_prime_speed = 15 +retraction_speed = 50 +speed_infill = 30 +speed_print = 20 +speed_support = =speed_print +speed_travel = 200 +speed_wall = =speed_print +wall_material_flow = 85 + diff --git a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_1p0_pro_copper_0.40_tough_pla_coarse.inst.cfg b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_1p0_pro_copper_0.40_tough_pla_coarse.inst.cfg index ba6d8a397a..40459369b4 100644 --- a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_1p0_pro_copper_0.40_tough_pla_coarse.inst.cfg +++ b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_1p0_pro_copper_0.40_tough_pla_coarse.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_1p0_pro +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_tough_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_tough_pla variant = Copper 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 20 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 20 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_1p0_pro_copper_0.40_tough_pla_draft.inst.cfg b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_1p0_pro_copper_0.40_tough_pla_draft.inst.cfg index 3a18e37e32..0224f51d33 100644 --- a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_1p0_pro_copper_0.40_tough_pla_draft.inst.cfg +++ b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_1p0_pro_copper_0.40_tough_pla_draft.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_1p0_pro +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_tough_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_tough_pla variant = Copper 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 20 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 20 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_1p0_pro_copper_0.40_tough_pla_fine.inst.cfg b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_1p0_pro_copper_0.40_tough_pla_fine.inst.cfg index 5fe402c160..a43d5c7386 100644 --- a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_1p0_pro_copper_0.40_tough_pla_fine.inst.cfg +++ b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_1p0_pro_copper_0.40_tough_pla_fine.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_1p0_pro +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_tough_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_tough_pla variant = Copper 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 20 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 20 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_1p0_pro_copper_0.40_tough_pla_normal.inst.cfg b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_1p0_pro_copper_0.40_tough_pla_normal.inst.cfg index 36640bc57a..54c5c26e4c 100644 --- a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_1p0_pro_copper_0.40_tough_pla_normal.inst.cfg +++ b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_1p0_pro_copper_0.40_tough_pla_normal.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_1p0_pro +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_tough_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_tough_pla variant = Copper 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.35 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 20 -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 20 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_tough_pla_coarse.inst.cfg b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_tough_pla_coarse.inst.cfg index 821f8d28a7..56ccf94498 100644 --- a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_tough_pla_coarse.inst.cfg +++ b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_tough_pla_coarse.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_jr_1p0a_pro +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_tough_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_tough_pla variant = Copper 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 65 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.5 retraction_speed = 30 skirt_brim_speed = 30 -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 65 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_tough_pla_draft.inst.cfg b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_tough_pla_draft.inst.cfg index 3b02b86f2a..081eb57efc 100644 --- a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_tough_pla_draft.inst.cfg +++ b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_tough_pla_draft.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_jr_1p0a_pro +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_tough_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_tough_pla variant = Copper 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 65 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.5 retraction_speed = 30 skirt_brim_speed = 30 -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 65 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_tough_pla_fine.inst.cfg b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_tough_pla_fine.inst.cfg index f30a83c6f8..f18399e731 100644 --- a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_tough_pla_fine.inst.cfg +++ b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_tough_pla_fine.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_jr_1p0a_pro +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_tough_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_tough_pla variant = Copper 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 65 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.5 retraction_speed = 30 skirt_brim_speed = 30 -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 65 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_tough_pla_normal.inst.cfg b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_tough_pla_normal.inst.cfg index 21d8fa9d1a..92278f42e5 100644 --- a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_tough_pla_normal.inst.cfg +++ b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40_tough_pla_normal.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_jr_1p0a_pro +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_tough_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_tough_pla variant = Copper 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.35 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 65 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.5 retraction_speed = 30 skirt_brim_speed = 30 -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 65 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_tough_pla_coarse.inst.cfg b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_tough_pla_coarse.inst.cfg index eeaf2fe528..3a90424556 100644 --- a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_tough_pla_coarse.inst.cfg +++ b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_tough_pla_coarse.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_jr_pro_xeplus +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_tough_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_tough_pla variant = Copper 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = 15 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_tough_pla_draft.inst.cfg b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_tough_pla_draft.inst.cfg index 86a84dbe32..bf5df52f02 100644 --- a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_tough_pla_draft.inst.cfg +++ b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_tough_pla_draft.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_jr_pro_xeplus +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_tough_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_tough_pla variant = Copper 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = 15 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_tough_pla_fine.inst.cfg b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_tough_pla_fine.inst.cfg index 0f399e8098..7b3ea9c3d6 100644 --- a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_tough_pla_fine.inst.cfg +++ b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_tough_pla_fine.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_jr_pro_xeplus +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_tough_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_tough_pla variant = Copper 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = 15 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_tough_pla_normal.inst.cfg b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_tough_pla_normal.inst.cfg index 87d3f8c1d6..32a2c7b92a 100644 --- a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_tough_pla_normal.inst.cfg +++ b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40_tough_pla_normal.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_jr_pro_xeplus +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_tough_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_tough_pla variant = Copper 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.3 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = 15 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_tough_pla_coarse.inst.cfg b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_tough_pla_coarse.inst.cfg index 3a119db307..c196735558 100644 --- a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_tough_pla_coarse.inst.cfg +++ b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_tough_pla_coarse.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_jr_pro_xplus +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_tough_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_tough_pla variant = Copper 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = 15 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_tough_pla_draft.inst.cfg b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_tough_pla_draft.inst.cfg index 478a469ec4..9b14d724ed 100644 --- a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_tough_pla_draft.inst.cfg +++ b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_tough_pla_draft.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_jr_pro_xplus +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_tough_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_tough_pla variant = Copper 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = 15 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_tough_pla_fine.inst.cfg b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_tough_pla_fine.inst.cfg index 0417eda4f1..ad561e3ce7 100644 --- a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_tough_pla_fine.inst.cfg +++ b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_tough_pla_fine.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_jr_pro_xplus +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_tough_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_tough_pla variant = Copper 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = 15 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_tough_pla_normal.inst.cfg b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_tough_pla_normal.inst.cfg index fbc48b1ca5..0935059569 100644 --- a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_tough_pla_normal.inst.cfg +++ b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_tough_pla_normal.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_jr_pro_xplus +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_tough_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_tough_pla variant = Copper 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.3 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = 15 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_tough_pla_coarse.inst.cfg b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_tough_pla_coarse.inst.cfg index 2e33f02edb..8edd0c768b 100644 --- a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_tough_pla_coarse.inst.cfg +++ b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_tough_pla_coarse.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_jr_w_pro +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_tough_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_tough_pla variant = Stainless Steel 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_tough_pla_draft.inst.cfg b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_tough_pla_draft.inst.cfg index 1b54aa0132..5581d33173 100644 --- a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_tough_pla_draft.inst.cfg +++ b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_tough_pla_draft.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_jr_w_pro +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_tough_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_tough_pla variant = Stainless Steel 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_tough_pla_fine.inst.cfg b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_tough_pla_fine.inst.cfg index ee14f606e5..c98c7fce31 100644 --- a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_tough_pla_fine.inst.cfg +++ b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_tough_pla_fine.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_jr_w_pro +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_tough_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_tough_pla variant = Stainless Steel 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_tough_pla_normal.inst.cfg b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_tough_pla_normal.inst.cfg index 9d7669f721..0f892e7d57 100644 --- a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_tough_pla_normal.inst.cfg +++ b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_jr_w_pro_ss_0.40_tough_pla_normal.inst.cfg @@ -1,29 +1,30 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_jr_w_pro +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_tough_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_tough_pla variant = Stainless Steel 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.35 -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_wall = =speed_print -speed_topbottom = 10 -speed_infill = 60 -speed_support = =speed_print -speed_travel = 100 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.0 retraction_speed = =speed_print skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 100 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_tough_pla_coarse.inst.cfg b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_tough_pla_coarse.inst.cfg index 17e733f5c7..5246490546 100644 --- a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_tough_pla_coarse.inst.cfg +++ b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_tough_pla_coarse.inst.cfg @@ -1,34 +1,35 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_pro_evo +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_tough_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_tough_pla variant = Hardened Steel 0.4mm Nozzle +weight = -3 [values] +adhesion_type = skirt +bridge_skin_speed = 20 +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -material_diameter = 1.75 material_bed_temperature = 60 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_infill = 60 -speed_wall = =speed_print -speed_topbottom = 10 -speed_support = =speed_print -speed_travel = 80 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.5 -retraction_speed = 20 retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 20 -adhesion_type = skirt \ No newline at end of file +retraction_speed = 20 +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 80 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_tough_pla_draft.inst.cfg b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_tough_pla_draft.inst.cfg index a4c9e07aad..ccf67dc42b 100644 --- a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_tough_pla_draft.inst.cfg +++ b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_tough_pla_draft.inst.cfg @@ -1,34 +1,35 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_pro_evo +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_tough_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_tough_pla variant = Hardened Steel 0.4mm Nozzle +weight = -2 [values] +adhesion_type = skirt +bridge_skin_speed = 20 +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 -material_diameter = 1.75 material_bed_temperature = 60 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_infill = 60 -speed_wall = =speed_print -speed_topbottom = 10 -speed_support = =speed_print -speed_travel = 80 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.5 -retraction_speed = 20 retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 20 -adhesion_type = skirt \ No newline at end of file +retraction_speed = 20 +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 80 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_tough_pla_fine.inst.cfg b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_tough_pla_fine.inst.cfg index 70b610cb39..628b6acd6e 100644 --- a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_tough_pla_fine.inst.cfg +++ b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_tough_pla_fine.inst.cfg @@ -1,34 +1,35 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_pro_evo +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_tough_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_tough_pla variant = Hardened Steel 0.4mm Nozzle +weight = 0 [values] +adhesion_type = skirt +bridge_skin_speed = 20 +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -material_diameter = 1.75 material_bed_temperature = 60 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_infill = 60 -speed_wall = =speed_print -speed_topbottom = 10 -speed_support = =speed_print -speed_travel = 80 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.5 -retraction_speed = 20 retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 20 -adhesion_type = skirt \ No newline at end of file +retraction_speed = 20 +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 80 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_tough_pla_normal.inst.cfg b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_tough_pla_normal.inst.cfg index 309a8512e1..cc35a81d30 100644 --- a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_tough_pla_normal.inst.cfg +++ b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_pro_evo_hs_0.40_tough_pla_normal.inst.cfg @@ -1,34 +1,35 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_pro_evo +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_tough_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_tough_pla variant = Hardened Steel 0.4mm Nozzle +weight = -1 [values] +adhesion_type = skirt +bridge_skin_speed = 20 +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.30 -material_diameter = 1.75 material_bed_temperature = 60 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_infill = 60 -speed_wall = =speed_print -speed_topbottom = 10 -speed_support = =speed_print -speed_travel = 80 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.5 -retraction_speed = 20 retraction_prime_speed = 15 -infill_sparse_density = 10 -bridge_skin_speed = 20 -adhesion_type = skirt \ No newline at end of file +retraction_speed = 20 +speed_infill = 60 +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 80 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_super_copper_0.40_tough_pla_coarse.inst.cfg b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_super_copper_0.40_tough_pla_coarse.inst.cfg index be7a300af6..11b2d4f97f 100644 --- a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_super_copper_0.40_tough_pla_coarse.inst.cfg +++ b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_super_copper_0.40_tough_pla_coarse.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_super +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_tough_pla +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_tough_pla variant = Copper 0.4mm Nozzle +weight = -3 [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_topbottom = 10 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.5 retraction_speed = 50 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_super_copper_0.40_tough_pla_draft.inst.cfg b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_super_copper_0.40_tough_pla_draft.inst.cfg index 23596bd07e..2ea34250fb 100644 --- a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_super_copper_0.40_tough_pla_draft.inst.cfg +++ b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_super_copper_0.40_tough_pla_draft.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_super +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_tough_pla +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_tough_pla variant = Copper 0.4mm Nozzle +weight = -2 [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_topbottom = 10 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.5 retraction_speed = 50 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_super_copper_0.40_tough_pla_fine.inst.cfg b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_super_copper_0.40_tough_pla_fine.inst.cfg index 1fef58c478..4cb3ff221e 100644 --- a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_super_copper_0.40_tough_pla_fine.inst.cfg +++ b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_super_copper_0.40_tough_pla_fine.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_super +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_tough_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_tough_pla variant = Copper 0.4mm Nozzle +weight = 0 [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_topbottom = 10 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.5 retraction_speed = 50 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_super_copper_0.40_tough_pla_normal.inst.cfg b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_super_copper_0.40_tough_pla_normal.inst.cfg index 4c49317e34..96970c58af 100644 --- a/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_super_copper_0.40_tough_pla_normal.inst.cfg +++ b/resources/quality/xyzprinting/tough_pla/xyzprinting_da_vinci_super_copper_0.40_tough_pla_normal.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_super +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_tough_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_tough_pla variant = Copper 0.4mm Nozzle +weight = -1 [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.35 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 30 -speed_topbottom = 10 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = =speed_print -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 5.5 retraction_speed = 50 skirt_brim_speed = =speed_print -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 30 +speed_support = =speed_print +speed_topbottom = 10 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_pro_evo_hs_0.40_tpu_coarse.inst.cfg b/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_pro_evo_hs_0.40_tpu_coarse.inst.cfg index 9a8f254d1d..5528bf6093 100644 --- a/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_pro_evo_hs_0.40_tpu_coarse.inst.cfg +++ b/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_pro_evo_hs_0.40_tpu_coarse.inst.cfg @@ -1,35 +1,36 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_pro_evo +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_tpu +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_tpu variant = Hardened Steel 0.4mm Nozzle +weight = -3 [values] +acceleration_infill = 1500.0 +acceleration_wall = 1000.0 +bridge_skin_speed = 100 +brim_width = 5.0 +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -material_diameter = 1.75 material_bed_temperature = 60 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 15 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 6 +retraction_prime_speed = =15 +retraction_speed = 50 speed_infill = =speed_print -speed_wall = =speed_print +speed_print = 15 speed_support = =speed_print speed_travel = 200 -retraction_amount = 6 -retraction_speed = 50 -retraction_prime_speed = =15 -infill_sparse_density = 10 -brim_width = 5.0 -bridge_skin_speed = 100 -acceleration_infill = 1500.0 -acceleration_wall = 1000.0 \ No newline at end of file +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_pro_evo_hs_0.40_tpu_draft.inst.cfg b/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_pro_evo_hs_0.40_tpu_draft.inst.cfg index 623381312f..4819e3eaa3 100644 --- a/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_pro_evo_hs_0.40_tpu_draft.inst.cfg +++ b/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_pro_evo_hs_0.40_tpu_draft.inst.cfg @@ -1,35 +1,36 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_pro_evo +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_tpu +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_tpu variant = Hardened Steel 0.4mm Nozzle +weight = -2 [values] +acceleration_infill = 1500.0 +acceleration_wall = 1000.0 +bridge_skin_speed = 100 +brim_width = 5.0 +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 -material_diameter = 1.75 material_bed_temperature = 60 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 15 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 6 +retraction_prime_speed = =15 +retraction_speed = 50 speed_infill = =speed_print -speed_wall = =speed_print +speed_print = 15 speed_support = =speed_print speed_travel = 200 -retraction_amount = 6 -retraction_speed = 50 -retraction_prime_speed = =15 -infill_sparse_density = 10 -brim_width = 5.0 -bridge_skin_speed = 100 -acceleration_infill = 1500.0 -acceleration_wall = 1000.0 \ No newline at end of file +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_pro_evo_hs_0.40_tpu_fine.inst.cfg b/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_pro_evo_hs_0.40_tpu_fine.inst.cfg index cd589ae435..f93271a060 100644 --- a/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_pro_evo_hs_0.40_tpu_fine.inst.cfg +++ b/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_pro_evo_hs_0.40_tpu_fine.inst.cfg @@ -1,35 +1,36 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_pro_evo +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_tpu +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_tpu variant = Hardened Steel 0.4mm Nozzle +weight = 0 [values] +acceleration_infill = 1500.0 +acceleration_wall = 1000.0 +bridge_skin_speed = 100 +brim_width = 5.0 +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -material_diameter = 1.75 material_bed_temperature = 60 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 15 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 6 +retraction_prime_speed = =15 +retraction_speed = 50 speed_infill = =speed_print -speed_wall = =speed_print +speed_print = 15 speed_support = =speed_print speed_travel = 200 -retraction_amount = 6 -retraction_speed = 50 -retraction_prime_speed = =15 -infill_sparse_density = 10 -brim_width = 5.0 -bridge_skin_speed = 100 -acceleration_infill = 1500.0 -acceleration_wall = 1000.0 \ No newline at end of file +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_pro_evo_hs_0.40_tpu_normal.inst.cfg b/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_pro_evo_hs_0.40_tpu_normal.inst.cfg index 34211a6adc..c34c40587b 100644 --- a/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_pro_evo_hs_0.40_tpu_normal.inst.cfg +++ b/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_pro_evo_hs_0.40_tpu_normal.inst.cfg @@ -1,35 +1,36 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_pro_evo +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_tpu +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_tpu variant = Hardened Steel 0.4mm Nozzle +weight = -1 [values] +acceleration_infill = 1500.0 +acceleration_wall = 1000.0 +bridge_skin_speed = 100 +brim_width = 5.0 +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.3 -material_diameter = 1.75 material_bed_temperature = 60 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature +material_diameter = 1.75 material_final_print_temperature = =material_print_temperature -speed_print = 15 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature +retraction_amount = 6 +retraction_prime_speed = =15 +retraction_speed = 50 speed_infill = =speed_print -speed_wall = =speed_print +speed_print = 15 speed_support = =speed_print speed_travel = 200 -retraction_amount = 6 -retraction_speed = 50 -retraction_prime_speed = =15 -infill_sparse_density = 10 -brim_width = 5.0 -bridge_skin_speed = 100 -acceleration_infill = 1500.0 -acceleration_wall = 1000.0 \ No newline at end of file +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_super_copper_0.40_tpu_coarse.inst.cfg b/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_super_copper_0.40_tpu_coarse.inst.cfg index cdd10c037f..0548ba5d95 100644 --- a/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_super_copper_0.40_tpu_coarse.inst.cfg +++ b/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_super_copper_0.40_tpu_coarse.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_super +name = Coarse Quality +version = 4 [metadata] +material = xyzprinting_tpu +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse -weight = -3 -material = xyzprinting_tpu variant = Copper 0.4mm Nozzle +weight = -3 [values] +brim_width = 5.0 +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 15 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = 30 -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.0 retraction_speed = 30 skirt_brim_speed = 30 -brim_width = 5.0 -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 15 +speed_support = 30 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_super_copper_0.40_tpu_draft.inst.cfg b/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_super_copper_0.40_tpu_draft.inst.cfg index c58cb58a90..76b6542390 100644 --- a/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_super_copper_0.40_tpu_draft.inst.cfg +++ b/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_super_copper_0.40_tpu_draft.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_super +name = Draft Quality +version = 4 [metadata] +material = xyzprinting_tpu +quality_type = draft setting_version = 20 type = quality -quality_type = draft -weight = -2 -material = xyzprinting_tpu variant = Copper 0.4mm Nozzle +weight = -2 [values] +brim_width = 5.0 +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 15 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = 30 -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.0 retraction_speed = 30 skirt_brim_speed = 30 -brim_width = 5.0 -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 15 +speed_support = 30 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_super_copper_0.40_tpu_fine.inst.cfg b/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_super_copper_0.40_tpu_fine.inst.cfg index 94d879d9b7..5c301731ae 100644 --- a/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_super_copper_0.40_tpu_fine.inst.cfg +++ b/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_super_copper_0.40_tpu_fine.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_super +name = Fine Quality +version = 4 [metadata] +material = xyzprinting_tpu +quality_type = fine setting_version = 20 type = quality -quality_type = fine -weight = 0 -material = xyzprinting_tpu variant = Copper 0.4mm Nozzle +weight = 0 [values] +brim_width = 5.0 +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 15 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = 30 -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.0 retraction_speed = 30 skirt_brim_speed = 30 -brim_width = 5.0 -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 15 +speed_support = 30 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_super_copper_0.40_tpu_normal.inst.cfg b/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_super_copper_0.40_tpu_normal.inst.cfg index 326d783309..5f3565d17e 100644 --- a/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_super_copper_0.40_tpu_normal.inst.cfg +++ b/resources/quality/xyzprinting/tpu/xyzprinting_da_vinci_super_copper_0.40_tpu_normal.inst.cfg @@ -1,30 +1,31 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_super +name = Normal Quality +version = 4 [metadata] +material = xyzprinting_tpu +quality_type = normal setting_version = 20 type = quality -quality_type = normal -weight = -1 -material = xyzprinting_tpu variant = Copper 0.4mm Nozzle +weight = -1 [values] +brim_width = 5.0 +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.35 material_bed_temperature_layer_0 = =material_bed_temperature -material_print_temperature_layer_0 = =material_print_temperature -material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature -speed_print = 15 -speed_wall = =speed_print -speed_infill = =speed_print -speed_support = 30 -speed_travel = 120 +material_initial_print_temperature = =material_print_temperature +material_print_temperature_layer_0 = =material_print_temperature retraction_amount = 4.0 retraction_speed = 30 skirt_brim_speed = 30 -brim_width = 5.0 -infill_sparse_density = 10 \ No newline at end of file +speed_infill = =speed_print +speed_print = 15 +speed_support = 30 +speed_travel = 120 +speed_wall = =speed_print + diff --git a/resources/quality/xyzprinting/xyzprinting_da_vinci_1p0_pro_global_0.10_fine.inst.cfg b/resources/quality/xyzprinting/xyzprinting_da_vinci_1p0_pro_global_0.10_fine.inst.cfg index c10c9b4cce..b012b629be 100644 --- a/resources/quality/xyzprinting/xyzprinting_da_vinci_1p0_pro_global_0.10_fine.inst.cfg +++ b/resources/quality/xyzprinting/xyzprinting_da_vinci_1p0_pro_global_0.10_fine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_1p0_pro +name = Fine Quality +version = 4 [metadata] +global_quality = True +quality_type = fine setting_version = 20 type = quality -quality_type = fine weight = 0 -global_quality = True [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -infill_sparse_density = 10 \ No newline at end of file + diff --git a/resources/quality/xyzprinting/xyzprinting_da_vinci_1p0_pro_global_0.20_normal.inst.cfg b/resources/quality/xyzprinting/xyzprinting_da_vinci_1p0_pro_global_0.20_normal.inst.cfg index ad37a22dc6..8b7eac4a41 100644 --- a/resources/quality/xyzprinting/xyzprinting_da_vinci_1p0_pro_global_0.20_normal.inst.cfg +++ b/resources/quality/xyzprinting/xyzprinting_da_vinci_1p0_pro_global_0.20_normal.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_1p0_pro +name = Normal Quality +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = -1 -global_quality = True [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.3 -infill_sparse_density = 10 \ No newline at end of file + diff --git a/resources/quality/xyzprinting/xyzprinting_da_vinci_1p0_pro_global_0.30_draft.inst.cfg b/resources/quality/xyzprinting/xyzprinting_da_vinci_1p0_pro_global_0.30_draft.inst.cfg index 4bc48c97e5..4068ef79a7 100644 --- a/resources/quality/xyzprinting/xyzprinting_da_vinci_1p0_pro_global_0.30_draft.inst.cfg +++ b/resources/quality/xyzprinting/xyzprinting_da_vinci_1p0_pro_global_0.30_draft.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_1p0_pro +name = Draft Quality +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 -infill_sparse_density = 10 \ No newline at end of file + diff --git a/resources/quality/xyzprinting/xyzprinting_da_vinci_1p0_pro_global_0.40_coarse.inst.cfg b/resources/quality/xyzprinting/xyzprinting_da_vinci_1p0_pro_global_0.40_coarse.inst.cfg index ca3c4e9688..fd32c70542 100644 --- a/resources/quality/xyzprinting/xyzprinting_da_vinci_1p0_pro_global_0.40_coarse.inst.cfg +++ b/resources/quality/xyzprinting/xyzprinting_da_vinci_1p0_pro_global_0.40_coarse.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_1p0_pro +name = Coarse Quality +version = 4 [metadata] +global_quality = True +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = -3 -global_quality = True [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -infill_sparse_density = 10 \ No newline at end of file + diff --git a/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_1p0a_pro_global_0.10_fine.inst.cfg b/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_1p0a_pro_global_0.10_fine.inst.cfg index 009858d718..e1a9724ff1 100644 --- a/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_1p0a_pro_global_0.10_fine.inst.cfg +++ b/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_1p0a_pro_global_0.10_fine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_jr_1p0a_pro +name = Fine Quality +version = 4 [metadata] +global_quality = True +quality_type = fine setting_version = 20 type = quality -quality_type = fine weight = 0 -global_quality = True [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -infill_sparse_density = 10 \ No newline at end of file + diff --git a/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_1p0a_pro_global_0.20_normal.inst.cfg b/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_1p0a_pro_global_0.20_normal.inst.cfg index 29347c4f16..f079f704dc 100644 --- a/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_1p0a_pro_global_0.20_normal.inst.cfg +++ b/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_1p0a_pro_global_0.20_normal.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_jr_1p0a_pro +name = Normal Quality +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = -1 -global_quality = True [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.3 -infill_sparse_density = 10 \ No newline at end of file + diff --git a/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_1p0a_pro_global_0.30_draft.inst.cfg b/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_1p0a_pro_global_0.30_draft.inst.cfg index 0ebdc130e3..d1154ea394 100644 --- a/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_1p0a_pro_global_0.30_draft.inst.cfg +++ b/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_1p0a_pro_global_0.30_draft.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_jr_1p0a_pro +name = Draft Quality +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 -infill_sparse_density = 10 \ No newline at end of file + diff --git a/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_1p0a_pro_global_0.40_coarse.inst.cfg b/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_1p0a_pro_global_0.40_coarse.inst.cfg index 1894adf7e5..97fc8e0c0e 100644 --- a/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_1p0a_pro_global_0.40_coarse.inst.cfg +++ b/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_1p0a_pro_global_0.40_coarse.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_jr_1p0a_pro +name = Coarse Quality +version = 4 [metadata] +global_quality = True +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = -3 -global_quality = True [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -infill_sparse_density = 10 \ No newline at end of file + diff --git a/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_pro_xep_global_0.10_fine.inst.cfg b/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_pro_xep_global_0.10_fine.inst.cfg index bbee3c2010..51240d8de7 100644 --- a/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_pro_xep_global_0.10_fine.inst.cfg +++ b/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_pro_xep_global_0.10_fine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_jr_pro_xeplus +name = Fine Quality +version = 4 [metadata] +global_quality = True +quality_type = fine setting_version = 20 type = quality -quality_type = fine weight = 0 -global_quality = True [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -infill_sparse_density = 10 \ No newline at end of file + diff --git a/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_pro_xep_global_0.20_normal.inst.cfg b/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_pro_xep_global_0.20_normal.inst.cfg index ed66ae76d3..0863cb34c7 100644 --- a/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_pro_xep_global_0.20_normal.inst.cfg +++ b/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_pro_xep_global_0.20_normal.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_jr_pro_xeplus +name = Normal Quality +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = -1 -global_quality = True [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.3 -infill_sparse_density = 10 \ No newline at end of file + diff --git a/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_pro_xep_global_0.30_draft.inst.cfg b/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_pro_xep_global_0.30_draft.inst.cfg index 1a7270df73..aa58022c3d 100644 --- a/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_pro_xep_global_0.30_draft.inst.cfg +++ b/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_pro_xep_global_0.30_draft.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_jr_pro_xeplus +name = Draft Quality +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 -infill_sparse_density = 10 \ No newline at end of file + diff --git a/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_pro_xep_global_0.40_coarse.inst.cfg b/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_pro_xep_global_0.40_coarse.inst.cfg index 79ba44e0c7..6758b19c99 100644 --- a/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_pro_xep_global_0.40_coarse.inst.cfg +++ b/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_pro_xep_global_0.40_coarse.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_jr_pro_xeplus +name = Coarse Quality +version = 4 [metadata] +global_quality = True +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = -3 -global_quality = True [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -infill_sparse_density = 10 \ No newline at end of file + diff --git a/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_pro_xp_global_0.10_fine.inst.cfg b/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_pro_xp_global_0.10_fine.inst.cfg index c69b6b5319..71d367d880 100644 --- a/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_pro_xp_global_0.10_fine.inst.cfg +++ b/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_pro_xp_global_0.10_fine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_jr_pro_xplus +name = Fine Quality +version = 4 [metadata] +global_quality = True +quality_type = fine setting_version = 20 type = quality -quality_type = fine weight = 0 -global_quality = True [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -infill_sparse_density = 10 \ No newline at end of file + diff --git a/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_pro_xp_global_0.20_normal.inst.cfg b/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_pro_xp_global_0.20_normal.inst.cfg index b7db17a61d..71dd8c63f2 100644 --- a/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_pro_xp_global_0.20_normal.inst.cfg +++ b/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_pro_xp_global_0.20_normal.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_jr_pro_xplus +name = Normal Quality +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = -1 -global_quality = True [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.3 -infill_sparse_density = 10 \ No newline at end of file + diff --git a/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_pro_xp_global_0.30_draft.inst.cfg b/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_pro_xp_global_0.30_draft.inst.cfg index 375c3c024d..17d32d3ac8 100644 --- a/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_pro_xp_global_0.30_draft.inst.cfg +++ b/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_pro_xp_global_0.30_draft.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_jr_pro_xplus +name = Draft Quality +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 -infill_sparse_density = 10 \ No newline at end of file + diff --git a/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_pro_xp_global_0.40_coarse.inst.cfg b/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_pro_xp_global_0.40_coarse.inst.cfg index 859016ff32..e67c46717b 100644 --- a/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_pro_xp_global_0.40_coarse.inst.cfg +++ b/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_pro_xp_global_0.40_coarse.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_jr_pro_xplus +name = Coarse Quality +version = 4 [metadata] +global_quality = True +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = -3 -global_quality = True [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -infill_sparse_density = 10 \ No newline at end of file + diff --git a/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_w_pro_global_0.10_fine.inst.cfg b/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_w_pro_global_0.10_fine.inst.cfg index e3ed234453..3b326ef0d6 100644 --- a/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_w_pro_global_0.10_fine.inst.cfg +++ b/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_w_pro_global_0.10_fine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_jr_w_pro +name = Fine Quality +version = 4 [metadata] +global_quality = True +quality_type = fine setting_version = 20 type = quality -quality_type = fine weight = 0 -global_quality = True [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -infill_sparse_density = 10 \ No newline at end of file + diff --git a/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_w_pro_global_0.20_normal.inst.cfg b/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_w_pro_global_0.20_normal.inst.cfg index 67774fda4d..f8f95a95c9 100644 --- a/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_w_pro_global_0.20_normal.inst.cfg +++ b/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_w_pro_global_0.20_normal.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_jr_w_pro +name = Normal Quality +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = -1 -global_quality = True [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.3 -infill_sparse_density = 10 \ No newline at end of file + diff --git a/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_w_pro_global_0.30_draft.inst.cfg b/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_w_pro_global_0.30_draft.inst.cfg index 43f9c5fb90..5968f9ff99 100644 --- a/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_w_pro_global_0.30_draft.inst.cfg +++ b/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_w_pro_global_0.30_draft.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_jr_w_pro +name = Draft Quality +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 -infill_sparse_density = 10 \ No newline at end of file + diff --git a/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_w_pro_global_0.40_coarse.inst.cfg b/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_w_pro_global_0.40_coarse.inst.cfg index 84f781a6c1..1a1c158f64 100644 --- a/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_w_pro_global_0.40_coarse.inst.cfg +++ b/resources/quality/xyzprinting/xyzprinting_da_vinci_jr_w_pro_global_0.40_coarse.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_jr_w_pro +name = Coarse Quality +version = 4 [metadata] +global_quality = True +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = -3 -global_quality = True [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -infill_sparse_density = 10 \ No newline at end of file + diff --git a/resources/quality/xyzprinting/xyzprinting_da_vinci_pro_evo_global_0.10_fine.inst.cfg b/resources/quality/xyzprinting/xyzprinting_da_vinci_pro_evo_global_0.10_fine.inst.cfg index f0e8dfdc37..ada94295ba 100644 --- a/resources/quality/xyzprinting/xyzprinting_da_vinci_pro_evo_global_0.10_fine.inst.cfg +++ b/resources/quality/xyzprinting/xyzprinting_da_vinci_pro_evo_global_0.10_fine.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_pro_evo +name = Fine Quality +version = 4 [metadata] +global_quality = True +quality_type = fine setting_version = 20 type = quality -quality_type = fine weight = 0 -global_quality = True [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 material_diameter = 1.75 -infill_sparse_density = 10 \ No newline at end of file + diff --git a/resources/quality/xyzprinting/xyzprinting_da_vinci_pro_evo_global_0.20_normal.inst.cfg b/resources/quality/xyzprinting/xyzprinting_da_vinci_pro_evo_global_0.20_normal.inst.cfg index 4631432b4a..034a54e7ae 100644 --- a/resources/quality/xyzprinting/xyzprinting_da_vinci_pro_evo_global_0.20_normal.inst.cfg +++ b/resources/quality/xyzprinting/xyzprinting_da_vinci_pro_evo_global_0.20_normal.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_pro_evo +name = Normal Quality +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = -1 -global_quality = True [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.3 material_diameter = 1.75 -infill_sparse_density = 10 \ No newline at end of file + diff --git a/resources/quality/xyzprinting/xyzprinting_da_vinci_pro_evo_global_0.30_draft.inst.cfg b/resources/quality/xyzprinting/xyzprinting_da_vinci_pro_evo_global_0.30_draft.inst.cfg index 4e25003939..e93e3f4cb2 100644 --- a/resources/quality/xyzprinting/xyzprinting_da_vinci_pro_evo_global_0.30_draft.inst.cfg +++ b/resources/quality/xyzprinting/xyzprinting_da_vinci_pro_evo_global_0.30_draft.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_pro_evo +name = Draft Quality +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 material_diameter = 1.75 -infill_sparse_density = 10 \ No newline at end of file + diff --git a/resources/quality/xyzprinting/xyzprinting_da_vinci_pro_evo_global_0.40_coarse.inst.cfg b/resources/quality/xyzprinting/xyzprinting_da_vinci_pro_evo_global_0.40_coarse.inst.cfg index 606ecfc0fa..c7267f5c63 100644 --- a/resources/quality/xyzprinting/xyzprinting_da_vinci_pro_evo_global_0.40_coarse.inst.cfg +++ b/resources/quality/xyzprinting/xyzprinting_da_vinci_pro_evo_global_0.40_coarse.inst.cfg @@ -1,17 +1,18 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_pro_evo +name = Coarse Quality +version = 4 [metadata] +global_quality = True +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = -3 -global_quality = True [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 material_diameter = 1.75 -infill_sparse_density = 10 \ No newline at end of file + diff --git a/resources/quality/xyzprinting/xyzprinting_da_vinci_super_global_0.10_fine.inst.cfg b/resources/quality/xyzprinting/xyzprinting_da_vinci_super_global_0.10_fine.inst.cfg index 5cc8c167b1..d20bb7cf00 100644 --- a/resources/quality/xyzprinting/xyzprinting_da_vinci_super_global_0.10_fine.inst.cfg +++ b/resources/quality/xyzprinting/xyzprinting_da_vinci_super_global_0.10_fine.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Fine Quality definition = xyzprinting_da_vinci_super +name = Fine Quality +version = 4 [metadata] +global_quality = True +quality_type = fine setting_version = 20 type = quality -quality_type = fine weight = 0 -global_quality = True [values] +infill_sparse_density = 10 layer_height = 0.1 layer_height_0 = 0.2 -infill_sparse_density = 10 \ No newline at end of file + diff --git a/resources/quality/xyzprinting/xyzprinting_da_vinci_super_global_0.20_normal.inst.cfg b/resources/quality/xyzprinting/xyzprinting_da_vinci_super_global_0.20_normal.inst.cfg index c05391efe0..bd356d33c9 100644 --- a/resources/quality/xyzprinting/xyzprinting_da_vinci_super_global_0.20_normal.inst.cfg +++ b/resources/quality/xyzprinting/xyzprinting_da_vinci_super_global_0.20_normal.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Normal Quality definition = xyzprinting_da_vinci_super +name = Normal Quality +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = -1 -global_quality = True [values] +infill_sparse_density = 10 layer_height = 0.2 layer_height_0 = 0.3 -infill_sparse_density = 10 \ No newline at end of file + diff --git a/resources/quality/xyzprinting/xyzprinting_da_vinci_super_global_0.30_draft.inst.cfg b/resources/quality/xyzprinting/xyzprinting_da_vinci_super_global_0.30_draft.inst.cfg index 46f76b4d1d..a7969c253b 100644 --- a/resources/quality/xyzprinting/xyzprinting_da_vinci_super_global_0.30_draft.inst.cfg +++ b/resources/quality/xyzprinting/xyzprinting_da_vinci_super_global_0.30_draft.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Draft Quality definition = xyzprinting_da_vinci_super +name = Draft Quality +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -2 -global_quality = True [values] +infill_sparse_density = 10 layer_height = 0.3 layer_height_0 = 0.4 -infill_sparse_density = 10 \ No newline at end of file + diff --git a/resources/quality/xyzprinting/xyzprinting_da_vinci_super_global_0.40_coarse.inst.cfg b/resources/quality/xyzprinting/xyzprinting_da_vinci_super_global_0.40_coarse.inst.cfg index cfdbce64d3..b0461db03e 100644 --- a/resources/quality/xyzprinting/xyzprinting_da_vinci_super_global_0.40_coarse.inst.cfg +++ b/resources/quality/xyzprinting/xyzprinting_da_vinci_super_global_0.40_coarse.inst.cfg @@ -1,16 +1,17 @@ [general] -version = 4 -name = Coarse Quality definition = xyzprinting_da_vinci_super +name = Coarse Quality +version = 4 [metadata] +global_quality = True +quality_type = coarse setting_version = 20 type = quality -quality_type = coarse weight = -3 -global_quality = True [values] +infill_sparse_density = 10 layer_height = 0.4 layer_height_0 = 0.4 -infill_sparse_density = 10 \ No newline at end of file + diff --git a/resources/quality/zav_base/abs/nozzle_0.20/zav_abs_nozzle_0.20_layer_0.05.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.20/zav_abs_nozzle_0.20_layer_0.05.inst.cfg index c1354c38da..20694f55e7 100644 --- a/resources/quality/zav_base/abs/nozzle_0.20/zav_abs_nozzle_0.20_layer_0.05.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.20/zav_abs_nozzle_0.20_layer_0.05.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.20_lay0.05 definition = zav_base +name = abs_noz0.20_lay0.05 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_005 setting_version = 20 type = quality -quality_type = ZAV_layer_005 -material = generic_abs -variant = 0.20mm_ZAV_Nozzle +variant = 0.20mm_ZAV_Nozzle [values] wall_thickness = =line_width*5 + diff --git a/resources/quality/zav_base/abs/nozzle_0.20/zav_abs_nozzle_0.20_layer_0.10.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.20/zav_abs_nozzle_0.20_layer_0.10.inst.cfg index 8501496af0..14638e29fc 100644 --- a/resources/quality/zav_base/abs/nozzle_0.20/zav_abs_nozzle_0.20_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.20/zav_abs_nozzle_0.20_layer_0.10.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.20_lay0.10 definition = zav_base +name = abs_noz0.20_lay0.10 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_010 setting_version = 20 type = quality -quality_type = ZAV_layer_010 -material = generic_abs -variant = 0.20mm_ZAV_Nozzle +variant = 0.20mm_ZAV_Nozzle [values] wall_thickness = =line_width*5 + diff --git a/resources/quality/zav_base/abs/nozzle_0.20/zav_abs_nozzle_0.20_layer_0.15.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.20/zav_abs_nozzle_0.20_layer_0.15.inst.cfg index 8fd70aaadd..c23cf40cfb 100644 --- a/resources/quality/zav_base/abs/nozzle_0.20/zav_abs_nozzle_0.20_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.20/zav_abs_nozzle_0.20_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.20_lay0.15 definition = zav_base +name = abs_noz0.20_lay0.15 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_015 setting_version = 20 type = quality -quality_type = ZAV_layer_015 -material = generic_abs -variant = 0.20mm_ZAV_Nozzle +variant = 0.20mm_ZAV_Nozzle [values] wall_thickness = =line_width*5 + diff --git a/resources/quality/zav_base/abs/nozzle_0.25/zav_abs_nozzle_0.25_layer_0.05.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.25/zav_abs_nozzle_0.25_layer_0.05.inst.cfg index f12e500eea..23ac2d43a4 100644 --- a/resources/quality/zav_base/abs/nozzle_0.25/zav_abs_nozzle_0.25_layer_0.05.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.25/zav_abs_nozzle_0.25_layer_0.05.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.25_lay0.05 definition = zav_base +name = abs_noz0.25_lay0.05 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_005 setting_version = 20 type = quality -quality_type = ZAV_layer_005 -material = generic_abs -variant = 0.25mm_ZAV_Nozzle +variant = 0.25mm_ZAV_Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/zav_base/abs/nozzle_0.25/zav_abs_nozzle_0.25_layer_0.10.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.25/zav_abs_nozzle_0.25_layer_0.10.inst.cfg index ac7c9eceb2..6acf6cf308 100644 --- a/resources/quality/zav_base/abs/nozzle_0.25/zav_abs_nozzle_0.25_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.25/zav_abs_nozzle_0.25_layer_0.10.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.25_lay0.10 definition = zav_base +name = abs_noz0.25_lay0.10 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_010 setting_version = 20 type = quality -quality_type = ZAV_layer_010 -material = generic_abs -variant = 0.25mm_ZAV_Nozzle +variant = 0.25mm_ZAV_Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/zav_base/abs/nozzle_0.25/zav_abs_nozzle_0.25_layer_0.15.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.25/zav_abs_nozzle_0.25_layer_0.15.inst.cfg index dd96e37f62..1cb9e2dafe 100644 --- a/resources/quality/zav_base/abs/nozzle_0.25/zav_abs_nozzle_0.25_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.25/zav_abs_nozzle_0.25_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.25_lay0.15 definition = zav_base +name = abs_noz0.25_lay0.15 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_015 setting_version = 20 type = quality -quality_type = ZAV_layer_015 -material = generic_abs -variant = 0.25mm_ZAV_Nozzle +variant = 0.25mm_ZAV_Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/zav_base/abs/nozzle_0.25/zav_abs_nozzle_0.25_layer_0.20.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.25/zav_abs_nozzle_0.25_layer_0.20.inst.cfg index 733fc7b01b..dec8dc985e 100644 --- a/resources/quality/zav_base/abs/nozzle_0.25/zav_abs_nozzle_0.25_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.25/zav_abs_nozzle_0.25_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.25_lay0.20 definition = zav_base +name = abs_noz0.25_lay0.20 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_020 setting_version = 20 type = quality -quality_type = ZAV_layer_020 -material = generic_abs -variant = 0.25mm_ZAV_Nozzle +variant = 0.25mm_ZAV_Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/zav_base/abs/nozzle_0.30/zav_abs_nozzle_0.30_layer_0.10.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.30/zav_abs_nozzle_0.30_layer_0.10.inst.cfg index 6a1ba17ba6..a9adba4f7a 100644 --- a/resources/quality/zav_base/abs/nozzle_0.30/zav_abs_nozzle_0.30_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.30/zav_abs_nozzle_0.30_layer_0.10.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.30_lay0.10 definition = zav_base +name = abs_noz0.30_lay0.10 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_010 setting_version = 20 type = quality -quality_type = ZAV_layer_010 -material = generic_abs -variant = 0.30mm_ZAV_Nozzle +variant = 0.30mm_ZAV_Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/zav_base/abs/nozzle_0.30/zav_abs_nozzle_0.30_layer_0.15.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.30/zav_abs_nozzle_0.30_layer_0.15.inst.cfg index d8bffeb0ce..f6cb6ef6a5 100644 --- a/resources/quality/zav_base/abs/nozzle_0.30/zav_abs_nozzle_0.30_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.30/zav_abs_nozzle_0.30_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.30_lay0.15 definition = zav_base +name = abs_noz0.30_lay0.15 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_015 setting_version = 20 type = quality -quality_type = ZAV_layer_015 -material = generic_abs -variant = 0.30mm_ZAV_Nozzle +variant = 0.30mm_ZAV_Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/zav_base/abs/nozzle_0.30/zav_abs_nozzle_0.30_layer_0.20.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.30/zav_abs_nozzle_0.30_layer_0.20.inst.cfg index 982680f585..b8069566ed 100644 --- a/resources/quality/zav_base/abs/nozzle_0.30/zav_abs_nozzle_0.30_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.30/zav_abs_nozzle_0.30_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.30_lay0.20 definition = zav_base +name = abs_noz0.30_lay0.20 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_020 setting_version = 20 type = quality -quality_type = ZAV_layer_020 -material = generic_abs -variant = 0.30mm_ZAV_Nozzle +variant = 0.30mm_ZAV_Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/zav_base/abs/nozzle_0.30/zav_abs_nozzle_0.30_layer_0.25.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.30/zav_abs_nozzle_0.30_layer_0.25.inst.cfg index 7375d6325f..66e784aa1d 100644 --- a/resources/quality/zav_base/abs/nozzle_0.30/zav_abs_nozzle_0.30_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.30/zav_abs_nozzle_0.30_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.30_lay0.25 definition = zav_base +name = abs_noz0.30_lay0.25 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_025 setting_version = 20 type = quality -quality_type = ZAV_layer_025 -material = generic_abs -variant = 0.30mm_ZAV_Nozzle +variant = 0.30mm_ZAV_Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/zav_base/abs/nozzle_0.35/zav_abs_nozzle_0.35_layer_0.10.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.35/zav_abs_nozzle_0.35_layer_0.10.inst.cfg index 113efec9ca..9400be2fee 100644 --- a/resources/quality/zav_base/abs/nozzle_0.35/zav_abs_nozzle_0.35_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.35/zav_abs_nozzle_0.35_layer_0.10.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.35_lay0.10 definition = zav_base +name = abs_noz0.35_lay0.10 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_010 setting_version = 20 type = quality -quality_type = ZAV_layer_010 -material = generic_abs -variant = 0.35mm_ZAV_Nozzle +variant = 0.35mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/abs/nozzle_0.35/zav_abs_nozzle_0.35_layer_0.15.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.35/zav_abs_nozzle_0.35_layer_0.15.inst.cfg index 340e9612a1..14dd47680d 100644 --- a/resources/quality/zav_base/abs/nozzle_0.35/zav_abs_nozzle_0.35_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.35/zav_abs_nozzle_0.35_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.35_lay0.15 definition = zav_base +name = abs_noz0.35_lay0.15 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_015 setting_version = 20 type = quality -quality_type = ZAV_layer_015 -material = generic_abs -variant = 0.35mm_ZAV_Nozzle +variant = 0.35mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/abs/nozzle_0.35/zav_abs_nozzle_0.35_layer_0.20.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.35/zav_abs_nozzle_0.35_layer_0.20.inst.cfg index ad1cd03fc6..bdbc3d64b0 100644 --- a/resources/quality/zav_base/abs/nozzle_0.35/zav_abs_nozzle_0.35_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.35/zav_abs_nozzle_0.35_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.35_lay0.20 definition = zav_base +name = abs_noz0.35_lay0.20 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_020 setting_version = 20 type = quality -quality_type = ZAV_layer_020 -material = generic_abs -variant = 0.35mm_ZAV_Nozzle +variant = 0.35mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/abs/nozzle_0.35/zav_abs_nozzle_0.35_layer_0.25.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.35/zav_abs_nozzle_0.35_layer_0.25.inst.cfg index 0a15e6d09e..43bc24ef07 100644 --- a/resources/quality/zav_base/abs/nozzle_0.35/zav_abs_nozzle_0.35_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.35/zav_abs_nozzle_0.35_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.35_lay0.25 definition = zav_base +name = abs_noz0.35_lay0.25 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_025 setting_version = 20 type = quality -quality_type = ZAV_layer_025 -material = generic_abs -variant = 0.35mm_ZAV_Nozzle +variant = 0.35mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.10.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.10.inst.cfg index c98f823b06..75db9b2d4e 100644 --- a/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.10.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.40_lay0.10 definition = zav_base +name = abs_noz0.40_lay0.10 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_010 setting_version = 20 type = quality -quality_type = ZAV_layer_010 -material = generic_abs -variant = 0.40mm_ZAV_Nozzle +variant = 0.40mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.15.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.15.inst.cfg index 942ea7da8a..ce48587ea6 100644 --- a/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.40_lay0.15 definition = zav_base +name = abs_noz0.40_lay0.15 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_015 setting_version = 20 type = quality -quality_type = ZAV_layer_015 -material = generic_abs -variant = 0.40mm_ZAV_Nozzle +variant = 0.40mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.20.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.20.inst.cfg index 319b7f7a0c..7a50e69367 100644 --- a/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.40_lay0.20 definition = zav_base +name = abs_noz0.40_lay0.20 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_020 setting_version = 20 type = quality -quality_type = ZAV_layer_020 -material = generic_abs -variant = 0.40mm_ZAV_Nozzle +variant = 0.40mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.25.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.25.inst.cfg index 9f31a29ed3..d83504fb69 100644 --- a/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.40_lay0.25 definition = zav_base +name = abs_noz0.40_lay0.25 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_025 setting_version = 20 type = quality -quality_type = ZAV_layer_025 -material = generic_abs -variant = 0.40mm_ZAV_Nozzle +variant = 0.40mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.30.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.30.inst.cfg index bdc83cb58b..172a1ab8e4 100644 --- a/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.40/zav_abs_nozzle_0.40_layer_0.30.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.40_lay0.30 definition = zav_base +name = abs_noz0.40_lay0.30 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_030 setting_version = 20 type = quality -quality_type = ZAV_layer_030 -material = generic_abs -variant = 0.40mm_ZAV_Nozzle +variant = 0.40mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.10.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.10.inst.cfg index 3fd67e1fa4..01360f1280 100644 --- a/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.10.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.45_lay0.10 definition = zav_base +name = abs_noz0.45_lay0.10 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_010 setting_version = 20 type = quality -quality_type = ZAV_layer_010 -material = generic_abs -variant = 0.45mm_ZAV_Nozzle +variant = 0.45mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.15.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.15.inst.cfg index adb517d05c..e3c8bffd07 100644 --- a/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.45_lay0.15 definition = zav_base +name = abs_noz0.45_lay0.15 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_015 setting_version = 20 type = quality -quality_type = ZAV_layer_015 -material = generic_abs -variant = 0.45mm_ZAV_Nozzle +variant = 0.45mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.20.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.20.inst.cfg index 5b1d96c428..ca3299c7fc 100644 --- a/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.45_lay0.20 definition = zav_base +name = abs_noz0.45_lay0.20 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_020 setting_version = 20 type = quality -quality_type = ZAV_layer_020 -material = generic_abs -variant = 0.45mm_ZAV_Nozzle +variant = 0.45mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.25.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.25.inst.cfg index 9bfc0dfffa..e770781edb 100644 --- a/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.45_lay0.25 definition = zav_base +name = abs_noz0.45_lay0.25 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_025 setting_version = 20 type = quality -quality_type = ZAV_layer_025 -material = generic_abs -variant = 0.45mm_ZAV_Nozzle +variant = 0.45mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.30.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.30.inst.cfg index 93663586d3..3d620904a9 100644 --- a/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.30.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.45_lay0.30 definition = zav_base +name = abs_noz0.45_lay0.30 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_030 setting_version = 20 type = quality -quality_type = ZAV_layer_030 -material = generic_abs -variant = 0.45mm_ZAV_Nozzle +variant = 0.45mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.35.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.35.inst.cfg index 05f173192a..6c24b094cd 100644 --- a/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.35.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.45/zav_abs_nozzle_0.45_layer_0.35.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.45_lay0.35 definition = zav_base +name = abs_noz0.45_lay0.35 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_035 setting_version = 20 type = quality -quality_type = ZAV_layer_035 -material = generic_abs -variant = 0.45mm_ZAV_Nozzle +variant = 0.45mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.15.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.15.inst.cfg index d61fa9adab..42a7ef64ef 100644 --- a/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.50_lay0.15 definition = zav_base +name = abs_noz0.50_lay0.15 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_015 setting_version = 20 type = quality -quality_type = ZAV_layer_015 -material = generic_abs -variant = 0.50mm_ZAV_Nozzle +variant = 0.50mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.20.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.20.inst.cfg index 74730d6bfd..6de2e8e21b 100644 --- a/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.50_lay0.20 definition = zav_base +name = abs_noz0.50_lay0.20 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_020 setting_version = 20 type = quality -quality_type = ZAV_layer_020 -material = generic_abs -variant = 0.50mm_ZAV_Nozzle +variant = 0.50mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.25.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.25.inst.cfg index 69bd4d5b39..629fc4b23e 100644 --- a/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.50_lay0.25 definition = zav_base +name = abs_noz0.50_lay0.25 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_025 setting_version = 20 type = quality -quality_type = ZAV_layer_025 -material = generic_abs -variant = 0.50mm_ZAV_Nozzle +variant = 0.50mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.30.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.30.inst.cfg index 97f15f12f9..eae7d33f11 100644 --- a/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.30.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.50_lay0.30 definition = zav_base +name = abs_noz0.50_lay0.30 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_030 setting_version = 20 type = quality -quality_type = ZAV_layer_030 -material = generic_abs -variant = 0.50mm_ZAV_Nozzle +variant = 0.50mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.35.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.35.inst.cfg index d7d2ef00dc..29e19db2dc 100644 --- a/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.35.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.50/zav_abs_nozzle_0.50_layer_0.35.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.50_lay0.35 definition = zav_base +name = abs_noz0.50_lay0.35 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_035 setting_version = 20 type = quality -quality_type = ZAV_layer_035 -material = generic_abs -variant = 0.50mm_ZAV_Nozzle +variant = 0.50mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.15.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.15.inst.cfg index d201ac0a1c..eb1473d96f 100644 --- a/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.60_lay0.15 definition = zav_base +name = abs_noz0.60_lay0.15 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_015 setting_version = 20 type = quality -quality_type = ZAV_layer_015 -material = generic_abs -variant = 0.60mm_ZAV_Nozzle +variant = 0.60mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.20.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.20.inst.cfg index f7e4dbf735..96a835a642 100644 --- a/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.60_lay0.20 definition = zav_base +name = abs_noz0.60_lay0.20 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_020 setting_version = 20 type = quality -quality_type = ZAV_layer_020 -material = generic_abs -variant = 0.60mm_ZAV_Nozzle +variant = 0.60mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.25.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.25.inst.cfg index d5dec44c28..222221aa8a 100644 --- a/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.60_lay0.25 definition = zav_base +name = abs_noz0.60_lay0.25 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_025 setting_version = 20 type = quality -quality_type = ZAV_layer_025 -material = generic_abs -variant = 0.60mm_ZAV_Nozzle +variant = 0.60mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.30.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.30.inst.cfg index 220a01c2ad..a0bad9c3f3 100644 --- a/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.30.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.60_lay0.30 definition = zav_base +name = abs_noz0.60_lay0.30 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_030 setting_version = 20 type = quality -quality_type = ZAV_layer_030 -material = generic_abs -variant = 0.60mm_ZAV_Nozzle +variant = 0.60mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.35.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.35.inst.cfg index de8f6834ab..52c00cdc2d 100644 --- a/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.35.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.35.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.60_lay0.35 definition = zav_base +name = abs_noz0.60_lay0.35 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_035 setting_version = 20 type = quality -quality_type = ZAV_layer_035 -material = generic_abs -variant = 0.60mm_ZAV_Nozzle +variant = 0.60mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.40.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.40.inst.cfg index fa35480c34..66a3a4a292 100644 --- a/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.40.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.60/zav_abs_nozzle_0.60_layer_0.40.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.60_lay0.40 definition = zav_base +name = abs_noz0.60_lay0.40 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_040 setting_version = 20 type = quality -quality_type = ZAV_layer_040 -material = generic_abs -variant = 0.60mm_ZAV_Nozzle +variant = 0.60mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.20.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.20.inst.cfg index 3a152d3d14..7b9080b96a 100644 --- a/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.80_lay0.20 definition = zav_base +name = abs_noz0.80_lay0.20 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_020 setting_version = 20 type = quality -quality_type = ZAV_layer_020 -material = generic_abs -variant = 0.80mm_ZAV_Nozzle +variant = 0.80mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.25.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.25.inst.cfg index 3d43e5b2fb..bc46e05c03 100644 --- a/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.80_lay0.25 definition = zav_base +name = abs_noz0.80_lay0.25 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_025 setting_version = 20 type = quality -quality_type = ZAV_layer_025 -material = generic_abs -variant = 0.80mm_ZAV_Nozzle +variant = 0.80mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.30.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.30.inst.cfg index 390356652c..3d9e3b0ceb 100644 --- a/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.30.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.80_lay0.30 definition = zav_base +name = abs_noz0.80_lay0.30 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_030 setting_version = 20 type = quality -quality_type = ZAV_layer_030 -material = generic_abs -variant = 0.80mm_ZAV_Nozzle +variant = 0.80mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.35.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.35.inst.cfg index 81fe2b5d31..5f5201da89 100644 --- a/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.35.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.35.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.80_lay0.35 definition = zav_base +name = abs_noz0.80_lay0.35 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_035 setting_version = 20 type = quality -quality_type = ZAV_layer_035 -material = generic_abs -variant = 0.80mm_ZAV_Nozzle +variant = 0.80mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.40.inst.cfg b/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.40.inst.cfg index 38b536082d..4875fa7de9 100644 --- a/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.40.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_0.80/zav_abs_nozzle_0.80_layer_0.40.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz0.80_lay0.40 definition = zav_base +name = abs_noz0.80_lay0.40 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_040 setting_version = 20 type = quality -quality_type = ZAV_layer_040 -material = generic_abs -variant = 0.80mm_ZAV_Nozzle +variant = 0.80mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/abs/nozzle_1.00/zav_abs_nozzle_1.00_layer_0.25.inst.cfg b/resources/quality/zav_base/abs/nozzle_1.00/zav_abs_nozzle_1.00_layer_0.25.inst.cfg index 6c5507e9fd..8eaf0c179b 100644 --- a/resources/quality/zav_base/abs/nozzle_1.00/zav_abs_nozzle_1.00_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_1.00/zav_abs_nozzle_1.00_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz1.00_lay0.25 definition = zav_base +name = abs_noz1.00_lay0.25 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_025 setting_version = 20 type = quality -quality_type = ZAV_layer_025 -material = generic_abs -variant = 1.00mm_ZAV_Nozzle +variant = 1.00mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/abs/nozzle_1.00/zav_abs_nozzle_1.00_layer_0.30.inst.cfg b/resources/quality/zav_base/abs/nozzle_1.00/zav_abs_nozzle_1.00_layer_0.30.inst.cfg index 9f56112a51..d66919a910 100644 --- a/resources/quality/zav_base/abs/nozzle_1.00/zav_abs_nozzle_1.00_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_1.00/zav_abs_nozzle_1.00_layer_0.30.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz1.00_lay0.30 definition = zav_base +name = abs_noz1.00_lay0.30 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_030 setting_version = 20 type = quality -quality_type = ZAV_layer_030 -material = generic_abs -variant = 1.00mm_ZAV_Nozzle +variant = 1.00mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/abs/nozzle_1.00/zav_abs_nozzle_1.00_layer_0.35.inst.cfg b/resources/quality/zav_base/abs/nozzle_1.00/zav_abs_nozzle_1.00_layer_0.35.inst.cfg index 26b646a04d..943ba6ef6c 100644 --- a/resources/quality/zav_base/abs/nozzle_1.00/zav_abs_nozzle_1.00_layer_0.35.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_1.00/zav_abs_nozzle_1.00_layer_0.35.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz1.00_lay0.35 definition = zav_base +name = abs_noz1.00_lay0.35 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_035 setting_version = 20 type = quality -quality_type = ZAV_layer_035 -material = generic_abs -variant = 1.00mm_ZAV_Nozzle +variant = 1.00mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/abs/nozzle_1.00/zav_abs_nozzle_1.00_layer_0.40.inst.cfg b/resources/quality/zav_base/abs/nozzle_1.00/zav_abs_nozzle_1.00_layer_0.40.inst.cfg index c6463c7572..31e7be3caf 100644 --- a/resources/quality/zav_base/abs/nozzle_1.00/zav_abs_nozzle_1.00_layer_0.40.inst.cfg +++ b/resources/quality/zav_base/abs/nozzle_1.00/zav_abs_nozzle_1.00_layer_0.40.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = abs_noz1.00_lay0.40 definition = zav_base +name = abs_noz1.00_lay0.40 +version = 4 [metadata] +material = generic_abs +quality_type = ZAV_layer_040 setting_version = 20 type = quality -quality_type = ZAV_layer_040 -material = generic_abs -variant = 1.00mm_ZAV_Nozzle +variant = 1.00mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/petg/nozzle_0.20/zav_petg_nozzle_0.20_layer_0.05.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.20/zav_petg_nozzle_0.20_layer_0.05.inst.cfg index 3cbfedf7c7..0d5e268f9c 100644 --- a/resources/quality/zav_base/petg/nozzle_0.20/zav_petg_nozzle_0.20_layer_0.05.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.20/zav_petg_nozzle_0.20_layer_0.05.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.20_lay0.05 definition = zav_base +name = petg_noz0.20_lay0.05 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_005 setting_version = 20 type = quality -quality_type = ZAV_layer_005 -material = generic_petg -variant = 0.20mm_ZAV_Nozzle +variant = 0.20mm_ZAV_Nozzle [values] wall_thickness = =line_width*5 + diff --git a/resources/quality/zav_base/petg/nozzle_0.20/zav_petg_nozzle_0.20_layer_0.10.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.20/zav_petg_nozzle_0.20_layer_0.10.inst.cfg index 4199e9bb00..44c927d1f9 100644 --- a/resources/quality/zav_base/petg/nozzle_0.20/zav_petg_nozzle_0.20_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.20/zav_petg_nozzle_0.20_layer_0.10.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.20_lay0.10 definition = zav_base +name = petg_noz0.20_lay0.10 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_010 setting_version = 20 type = quality -quality_type = ZAV_layer_010 -material = generic_petg -variant = 0.20mm_ZAV_Nozzle +variant = 0.20mm_ZAV_Nozzle [values] wall_thickness = =line_width*5 + diff --git a/resources/quality/zav_base/petg/nozzle_0.20/zav_petg_nozzle_0.20_layer_0.15.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.20/zav_petg_nozzle_0.20_layer_0.15.inst.cfg index 0b09c31c41..7cb49d9c72 100644 --- a/resources/quality/zav_base/petg/nozzle_0.20/zav_petg_nozzle_0.20_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.20/zav_petg_nozzle_0.20_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.20_lay0.15 definition = zav_base +name = petg_noz0.20_lay0.15 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_015 setting_version = 20 type = quality -quality_type = ZAV_layer_015 -material = generic_petg -variant = 0.20mm_ZAV_Nozzle +variant = 0.20mm_ZAV_Nozzle [values] wall_thickness = =line_width*5 + diff --git a/resources/quality/zav_base/petg/nozzle_0.25/zav_petg_nozzle_0.25_layer_0.05.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.25/zav_petg_nozzle_0.25_layer_0.05.inst.cfg index 25090ac7e7..f9bcc69f19 100644 --- a/resources/quality/zav_base/petg/nozzle_0.25/zav_petg_nozzle_0.25_layer_0.05.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.25/zav_petg_nozzle_0.25_layer_0.05.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.25_lay0.05 definition = zav_base +name = petg_noz0.25_lay0.05 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_005 setting_version = 20 type = quality -quality_type = ZAV_layer_005 -material = generic_petg -variant = 0.25mm_ZAV_Nozzle +variant = 0.25mm_ZAV_Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/zav_base/petg/nozzle_0.25/zav_petg_nozzle_0.25_layer_0.10.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.25/zav_petg_nozzle_0.25_layer_0.10.inst.cfg index 77269c0902..86ceaa35bf 100644 --- a/resources/quality/zav_base/petg/nozzle_0.25/zav_petg_nozzle_0.25_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.25/zav_petg_nozzle_0.25_layer_0.10.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.25_lay0.10 definition = zav_base +name = petg_noz0.25_lay0.10 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_010 setting_version = 20 type = quality -quality_type = ZAV_layer_010 -material = generic_petg -variant = 0.25mm_ZAV_Nozzle +variant = 0.25mm_ZAV_Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/zav_base/petg/nozzle_0.25/zav_petg_nozzle_0.25_layer_0.15.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.25/zav_petg_nozzle_0.25_layer_0.15.inst.cfg index 2dde462faa..8990e51205 100644 --- a/resources/quality/zav_base/petg/nozzle_0.25/zav_petg_nozzle_0.25_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.25/zav_petg_nozzle_0.25_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.25_lay0.15 definition = zav_base +name = petg_noz0.25_lay0.15 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_015 setting_version = 20 type = quality -quality_type = ZAV_layer_015 -material = generic_petg -variant = 0.25mm_ZAV_Nozzle +variant = 0.25mm_ZAV_Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/zav_base/petg/nozzle_0.25/zav_petg_nozzle_0.25_layer_0.20.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.25/zav_petg_nozzle_0.25_layer_0.20.inst.cfg index 01900ca6d0..ade8f402c9 100644 --- a/resources/quality/zav_base/petg/nozzle_0.25/zav_petg_nozzle_0.25_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.25/zav_petg_nozzle_0.25_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.25_lay0.20 definition = zav_base +name = petg_noz0.25_lay0.20 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_020 setting_version = 20 type = quality -quality_type = ZAV_layer_020 -material = generic_petg -variant = 0.25mm_ZAV_Nozzle +variant = 0.25mm_ZAV_Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/zav_base/petg/nozzle_0.30/zav_petg_nozzle_0.30_layer_0.10.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.30/zav_petg_nozzle_0.30_layer_0.10.inst.cfg index 40ad5198de..435b897a7e 100644 --- a/resources/quality/zav_base/petg/nozzle_0.30/zav_petg_nozzle_0.30_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.30/zav_petg_nozzle_0.30_layer_0.10.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.30_lay0.10 definition = zav_base +name = petg_noz0.30_lay0.10 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_010 setting_version = 20 type = quality -quality_type = ZAV_layer_010 -material = generic_petg -variant = 0.30mm_ZAV_Nozzle +variant = 0.30mm_ZAV_Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/zav_base/petg/nozzle_0.30/zav_petg_nozzle_0.30_layer_0.15.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.30/zav_petg_nozzle_0.30_layer_0.15.inst.cfg index 3ad30b3183..4e9a3dac83 100644 --- a/resources/quality/zav_base/petg/nozzle_0.30/zav_petg_nozzle_0.30_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.30/zav_petg_nozzle_0.30_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.30_lay0.15 definition = zav_base +name = petg_noz0.30_lay0.15 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_015 setting_version = 20 type = quality -quality_type = ZAV_layer_015 -material = generic_petg -variant = 0.30mm_ZAV_Nozzle +variant = 0.30mm_ZAV_Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/zav_base/petg/nozzle_0.30/zav_petg_nozzle_0.30_layer_0.20.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.30/zav_petg_nozzle_0.30_layer_0.20.inst.cfg index 237106ca7b..0ad1ecb4c2 100644 --- a/resources/quality/zav_base/petg/nozzle_0.30/zav_petg_nozzle_0.30_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.30/zav_petg_nozzle_0.30_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.30_lay0.20 definition = zav_base +name = petg_noz0.30_lay0.20 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_020 setting_version = 20 type = quality -quality_type = ZAV_layer_020 -material = generic_petg -variant = 0.30mm_ZAV_Nozzle +variant = 0.30mm_ZAV_Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/zav_base/petg/nozzle_0.30/zav_petg_nozzle_0.30_layer_0.25.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.30/zav_petg_nozzle_0.30_layer_0.25.inst.cfg index 08f92ba729..4f9e8cd2bb 100644 --- a/resources/quality/zav_base/petg/nozzle_0.30/zav_petg_nozzle_0.30_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.30/zav_petg_nozzle_0.30_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.30_lay0.25 definition = zav_base +name = petg_noz0.30_lay0.25 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_025 setting_version = 20 type = quality -quality_type = ZAV_layer_025 -material = generic_petg -variant = 0.30mm_ZAV_Nozzle +variant = 0.30mm_ZAV_Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/zav_base/petg/nozzle_0.35/zav_petg_nozzle_0.35_layer_0.10.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.35/zav_petg_nozzle_0.35_layer_0.10.inst.cfg index 0798a8aa93..5b91e275d9 100644 --- a/resources/quality/zav_base/petg/nozzle_0.35/zav_petg_nozzle_0.35_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.35/zav_petg_nozzle_0.35_layer_0.10.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.35_lay0.10 definition = zav_base +name = petg_noz0.35_lay0.10 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_010 setting_version = 20 type = quality -quality_type = ZAV_layer_010 -material = generic_petg -variant = 0.35mm_ZAV_Nozzle +variant = 0.35mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/petg/nozzle_0.35/zav_petg_nozzle_0.35_layer_0.15.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.35/zav_petg_nozzle_0.35_layer_0.15.inst.cfg index a32fa78e74..df3910aae8 100644 --- a/resources/quality/zav_base/petg/nozzle_0.35/zav_petg_nozzle_0.35_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.35/zav_petg_nozzle_0.35_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.35_lay0.15 definition = zav_base +name = petg_noz0.35_lay0.15 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_015 setting_version = 20 type = quality -quality_type = ZAV_layer_015 -material = generic_petg -variant = 0.35mm_ZAV_Nozzle +variant = 0.35mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/petg/nozzle_0.35/zav_petg_nozzle_0.35_layer_0.20.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.35/zav_petg_nozzle_0.35_layer_0.20.inst.cfg index 0014ecb1b1..ebf69544b7 100644 --- a/resources/quality/zav_base/petg/nozzle_0.35/zav_petg_nozzle_0.35_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.35/zav_petg_nozzle_0.35_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.35_lay0.20 definition = zav_base +name = petg_noz0.35_lay0.20 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_020 setting_version = 20 type = quality -quality_type = ZAV_layer_020 -material = generic_petg -variant = 0.35mm_ZAV_Nozzle +variant = 0.35mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/petg/nozzle_0.35/zav_petg_nozzle_0.35_layer_0.25.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.35/zav_petg_nozzle_0.35_layer_0.25.inst.cfg index 8863978183..3ef22676f4 100644 --- a/resources/quality/zav_base/petg/nozzle_0.35/zav_petg_nozzle_0.35_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.35/zav_petg_nozzle_0.35_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.35_lay0.25 definition = zav_base +name = petg_noz0.35_lay0.25 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_025 setting_version = 20 type = quality -quality_type = ZAV_layer_025 -material = generic_petg -variant = 0.35mm_ZAV_Nozzle +variant = 0.35mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.10.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.10.inst.cfg index 7db7da5079..108ca9dcc5 100644 --- a/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.10.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.40_lay0.10 definition = zav_base +name = petg_noz0.40_lay0.10 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_010 setting_version = 20 type = quality -quality_type = ZAV_layer_010 -material = generic_petg -variant = 0.40mm_ZAV_Nozzle +variant = 0.40mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.15.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.15.inst.cfg index de0c8a8124..643ce4ef92 100644 --- a/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.40_lay0.15 definition = zav_base +name = petg_noz0.40_lay0.15 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_015 setting_version = 20 type = quality -quality_type = ZAV_layer_015 -material = generic_petg -variant = 0.40mm_ZAV_Nozzle +variant = 0.40mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.20.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.20.inst.cfg index 6c6bce6f09..3399d1ff12 100644 --- a/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.40_lay0.20 definition = zav_base +name = petg_noz0.40_lay0.20 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_020 setting_version = 20 type = quality -quality_type = ZAV_layer_020 -material = generic_petg -variant = 0.40mm_ZAV_Nozzle +variant = 0.40mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.25.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.25.inst.cfg index f8efbbf7ae..c80697fabb 100644 --- a/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.40_lay0.25 definition = zav_base +name = petg_noz0.40_lay0.25 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_025 setting_version = 20 type = quality -quality_type = ZAV_layer_025 -material = generic_petg -variant = 0.40mm_ZAV_Nozzle +variant = 0.40mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.30.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.30.inst.cfg index 361c12ce78..24002aabeb 100644 --- a/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.40/zav_petg_nozzle_0.40_layer_0.30.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.40_lay0.30 definition = zav_base +name = petg_noz0.40_lay0.30 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_030 setting_version = 20 type = quality -quality_type = ZAV_layer_030 -material = generic_petg -variant = 0.40mm_ZAV_Nozzle +variant = 0.40mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.10.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.10.inst.cfg index 4b39bbda4f..a7835e3fd3 100644 --- a/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.10.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.45_lay0.10 definition = zav_base +name = petg_noz0.45_lay0.10 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_010 setting_version = 20 type = quality -quality_type = ZAV_layer_010 -material = generic_petg -variant = 0.45mm_ZAV_Nozzle +variant = 0.45mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.15.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.15.inst.cfg index e398cba2b9..1a97d60ac0 100644 --- a/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.45_lay0.15 definition = zav_base +name = petg_noz0.45_lay0.15 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_015 setting_version = 20 type = quality -quality_type = ZAV_layer_015 -material = generic_petg -variant = 0.45mm_ZAV_Nozzle +variant = 0.45mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.20.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.20.inst.cfg index 7d03c0b7d9..b6bf34140b 100644 --- a/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.45_lay0.20 definition = zav_base +name = petg_noz0.45_lay0.20 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_020 setting_version = 20 type = quality -quality_type = ZAV_layer_020 -material = generic_petg -variant = 0.45mm_ZAV_Nozzle +variant = 0.45mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.25.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.25.inst.cfg index f92e2e81d7..5a7de90303 100644 --- a/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.45_lay0.25 definition = zav_base +name = petg_noz0.45_lay0.25 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_025 setting_version = 20 type = quality -quality_type = ZAV_layer_025 -material = generic_petg -variant = 0.45mm_ZAV_Nozzle +variant = 0.45mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.30.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.30.inst.cfg index 0050e66440..37d11e8130 100644 --- a/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.30.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.45_lay0.30 definition = zav_base +name = petg_noz0.45_lay0.30 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_030 setting_version = 20 type = quality -quality_type = ZAV_layer_030 -material = generic_petg -variant = 0.45mm_ZAV_Nozzle +variant = 0.45mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.35.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.35.inst.cfg index 41b4cb1842..37dd9fc3f0 100644 --- a/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.35.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.45/zav_petg_nozzle_0.45_layer_0.35.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.45_lay0.35 definition = zav_base +name = petg_noz0.45_lay0.35 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_035 setting_version = 20 type = quality -quality_type = ZAV_layer_035 -material = generic_petg -variant = 0.45mm_ZAV_Nozzle +variant = 0.45mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.15.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.15.inst.cfg index 4e60dfb539..a95afa178c 100644 --- a/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.50_lay0.15 definition = zav_base +name = petg_noz0.50_lay0.15 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_015 setting_version = 20 type = quality -quality_type = ZAV_layer_015 -material = generic_petg -variant = 0.50mm_ZAV_Nozzle +variant = 0.50mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.20.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.20.inst.cfg index b70ab25d82..f663779953 100644 --- a/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.50_lay0.20 definition = zav_base +name = petg_noz0.50_lay0.20 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_020 setting_version = 20 type = quality -quality_type = ZAV_layer_020 -material = generic_petg -variant = 0.50mm_ZAV_Nozzle +variant = 0.50mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.25.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.25.inst.cfg index b33e220af8..250d7286a1 100644 --- a/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.50_lay0.25 definition = zav_base +name = petg_noz0.50_lay0.25 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_025 setting_version = 20 type = quality -quality_type = ZAV_layer_025 -material = generic_petg -variant = 0.50mm_ZAV_Nozzle +variant = 0.50mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.30.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.30.inst.cfg index c627fbbfec..3cbbf9041a 100644 --- a/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.30.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.50_lay0.30 definition = zav_base +name = petg_noz0.50_lay0.30 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_030 setting_version = 20 type = quality -quality_type = ZAV_layer_030 -material = generic_petg -variant = 0.50mm_ZAV_Nozzle +variant = 0.50mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.35.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.35.inst.cfg index a3ae64b90e..0baf18115c 100644 --- a/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.35.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.50/zav_petg_nozzle_0.50_layer_0.35.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.50_lay0.35 definition = zav_base +name = petg_noz0.50_lay0.35 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_035 setting_version = 20 type = quality -quality_type = ZAV_layer_035 -material = generic_petg -variant = 0.50mm_ZAV_Nozzle +variant = 0.50mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.15.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.15.inst.cfg index 01de68ee5a..6f914920dd 100644 --- a/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.60_lay0.15 definition = zav_base +name = petg_noz0.60_lay0.15 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_015 setting_version = 20 type = quality -quality_type = ZAV_layer_015 -material = generic_petg -variant = 0.60mm_ZAV_Nozzle +variant = 0.60mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.20.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.20.inst.cfg index f477a07612..483be38438 100644 --- a/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.60_lay0.20 definition = zav_base +name = petg_noz0.60_lay0.20 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_020 setting_version = 20 type = quality -quality_type = ZAV_layer_020 -material = generic_petg -variant = 0.60mm_ZAV_Nozzle +variant = 0.60mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.25.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.25.inst.cfg index 1f56965bf3..578aabeb5e 100644 --- a/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.60_lay0.25 definition = zav_base +name = petg_noz0.60_lay0.25 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_025 setting_version = 20 type = quality -quality_type = ZAV_layer_025 -material = generic_petg -variant = 0.60mm_ZAV_Nozzle +variant = 0.60mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.30.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.30.inst.cfg index 52500a8484..cdace72b8c 100644 --- a/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.30.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.60_lay0.30 definition = zav_base +name = petg_noz0.60_lay0.30 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_030 setting_version = 20 type = quality -quality_type = ZAV_layer_030 -material = generic_petg -variant = 0.60mm_ZAV_Nozzle +variant = 0.60mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.35.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.35.inst.cfg index 18f2382660..f0f97ce929 100644 --- a/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.35.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.35.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.60_lay0.35 definition = zav_base +name = petg_noz0.60_lay0.35 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_035 setting_version = 20 type = quality -quality_type = ZAV_layer_035 -material = generic_petg -variant = 0.60mm_ZAV_Nozzle +variant = 0.60mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.40.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.40.inst.cfg index aba5d56440..b7d7379d3b 100644 --- a/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.40.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.60/zav_petg_nozzle_0.60_layer_0.40.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.60_lay0.40 definition = zav_base +name = petg_noz0.60_lay0.40 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_040 setting_version = 20 type = quality -quality_type = ZAV_layer_040 -material = generic_petg -variant = 0.60mm_ZAV_Nozzle +variant = 0.60mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.20.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.20.inst.cfg index 57b8a48e31..650b765778 100644 --- a/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.80_lay0.20 definition = zav_base +name = petg_noz0.80_lay0.20 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_020 setting_version = 20 type = quality -quality_type = ZAV_layer_020 -material = generic_petg -variant = 0.80mm_ZAV_Nozzle +variant = 0.80mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.25.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.25.inst.cfg index 346739372d..b8e4e8f457 100644 --- a/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.80_lay0.25 definition = zav_base +name = petg_noz0.80_lay0.25 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_025 setting_version = 20 type = quality -quality_type = ZAV_layer_025 -material = generic_petg -variant = 0.80mm_ZAV_Nozzle +variant = 0.80mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.30.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.30.inst.cfg index d6b8657b6c..83112c9cd5 100644 --- a/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.30.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.80_lay0.30 definition = zav_base +name = petg_noz0.80_lay0.30 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_030 setting_version = 20 type = quality -quality_type = ZAV_layer_030 -material = generic_petg -variant = 0.80mm_ZAV_Nozzle +variant = 0.80mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.35.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.35.inst.cfg index f03cd53044..682c651c7d 100644 --- a/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.35.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.35.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.80_lay0.35 definition = zav_base +name = petg_noz0.80_lay0.35 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_035 setting_version = 20 type = quality -quality_type = ZAV_layer_035 -material = generic_petg -variant = 0.80mm_ZAV_Nozzle +variant = 0.80mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.40.inst.cfg b/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.40.inst.cfg index ec9e251a0e..4ba230f58f 100644 --- a/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.40.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_0.80/zav_petg_nozzle_0.80_layer_0.40.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz0.80_lay0.40 definition = zav_base +name = petg_noz0.80_lay0.40 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_040 setting_version = 20 type = quality -quality_type = ZAV_layer_040 -material = generic_petg -variant = 0.80mm_ZAV_Nozzle +variant = 0.80mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/petg/nozzle_1.00/zav_petg_nozzle_1.00_layer_0.25.inst.cfg b/resources/quality/zav_base/petg/nozzle_1.00/zav_petg_nozzle_1.00_layer_0.25.inst.cfg index b68bff2980..0dada8b9b0 100644 --- a/resources/quality/zav_base/petg/nozzle_1.00/zav_petg_nozzle_1.00_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_1.00/zav_petg_nozzle_1.00_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz1.00_lay0.25 definition = zav_base +name = petg_noz1.00_lay0.25 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_025 setting_version = 20 type = quality -quality_type = ZAV_layer_025 -material = generic_petg -variant = 1.00mm_ZAV_Nozzle +variant = 1.00mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/petg/nozzle_1.00/zav_petg_nozzle_1.00_layer_0.30.inst.cfg b/resources/quality/zav_base/petg/nozzle_1.00/zav_petg_nozzle_1.00_layer_0.30.inst.cfg index d3a33e7550..fdd00dccca 100644 --- a/resources/quality/zav_base/petg/nozzle_1.00/zav_petg_nozzle_1.00_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_1.00/zav_petg_nozzle_1.00_layer_0.30.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz1.00_lay0.30 definition = zav_base +name = petg_noz1.00_lay0.30 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_030 setting_version = 20 type = quality -quality_type = ZAV_layer_030 -material = generic_petg -variant = 1.00mm_ZAV_Nozzle +variant = 1.00mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/petg/nozzle_1.00/zav_petg_nozzle_1.00_layer_0.35.inst.cfg b/resources/quality/zav_base/petg/nozzle_1.00/zav_petg_nozzle_1.00_layer_0.35.inst.cfg index f653dca4e4..cd329d3f00 100644 --- a/resources/quality/zav_base/petg/nozzle_1.00/zav_petg_nozzle_1.00_layer_0.35.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_1.00/zav_petg_nozzle_1.00_layer_0.35.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz1.00_lay0.35 definition = zav_base +name = petg_noz1.00_lay0.35 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_035 setting_version = 20 type = quality -quality_type = ZAV_layer_035 -material = generic_petg -variant = 1.00mm_ZAV_Nozzle +variant = 1.00mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/petg/nozzle_1.00/zav_petg_nozzle_1.00_layer_0.40.inst.cfg b/resources/quality/zav_base/petg/nozzle_1.00/zav_petg_nozzle_1.00_layer_0.40.inst.cfg index 9e1b686777..b170fb79bc 100644 --- a/resources/quality/zav_base/petg/nozzle_1.00/zav_petg_nozzle_1.00_layer_0.40.inst.cfg +++ b/resources/quality/zav_base/petg/nozzle_1.00/zav_petg_nozzle_1.00_layer_0.40.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = petg_noz1.00_lay0.40 definition = zav_base +name = petg_noz1.00_lay0.40 +version = 4 [metadata] +material = generic_petg +quality_type = ZAV_layer_040 setting_version = 20 type = quality -quality_type = ZAV_layer_040 -material = generic_petg -variant = 1.00mm_ZAV_Nozzle +variant = 1.00mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/pla/nozzle_0.20/zav_pla_nozzle_0.20_layer_0.05.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.20/zav_pla_nozzle_0.20_layer_0.05.inst.cfg index 0a338ae7df..faed88d702 100644 --- a/resources/quality/zav_base/pla/nozzle_0.20/zav_pla_nozzle_0.20_layer_0.05.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.20/zav_pla_nozzle_0.20_layer_0.05.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.20_lay0.05 definition = zav_base +name = pla_noz0.20_lay0.05 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_005 setting_version = 20 type = quality -quality_type = ZAV_layer_005 -material = generic_pla -variant = 0.20mm_ZAV_Nozzle +variant = 0.20mm_ZAV_Nozzle [values] wall_thickness = =line_width*5 + diff --git a/resources/quality/zav_base/pla/nozzle_0.20/zav_pla_nozzle_0.20_layer_0.10.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.20/zav_pla_nozzle_0.20_layer_0.10.inst.cfg index cb44823f1a..11410a9113 100644 --- a/resources/quality/zav_base/pla/nozzle_0.20/zav_pla_nozzle_0.20_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.20/zav_pla_nozzle_0.20_layer_0.10.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.20_lay0.10 definition = zav_base +name = pla_noz0.20_lay0.10 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_010 setting_version = 20 type = quality -quality_type = ZAV_layer_010 -material = generic_pla -variant = 0.20mm_ZAV_Nozzle +variant = 0.20mm_ZAV_Nozzle [values] wall_thickness = =line_width*5 + diff --git a/resources/quality/zav_base/pla/nozzle_0.20/zav_pla_nozzle_0.20_layer_0.15.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.20/zav_pla_nozzle_0.20_layer_0.15.inst.cfg index 10d3bedc8d..194255bb08 100644 --- a/resources/quality/zav_base/pla/nozzle_0.20/zav_pla_nozzle_0.20_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.20/zav_pla_nozzle_0.20_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.20_lay0.15 definition = zav_base +name = pla_noz0.20_lay0.15 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_015 setting_version = 20 type = quality -quality_type = ZAV_layer_015 -material = generic_pla -variant = 0.20mm_ZAV_Nozzle +variant = 0.20mm_ZAV_Nozzle [values] wall_thickness = =line_width*5 + diff --git a/resources/quality/zav_base/pla/nozzle_0.25/zav_pla_nozzle_0.25_layer_0.05.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.25/zav_pla_nozzle_0.25_layer_0.05.inst.cfg index 214bd1a0b4..26eb388263 100644 --- a/resources/quality/zav_base/pla/nozzle_0.25/zav_pla_nozzle_0.25_layer_0.05.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.25/zav_pla_nozzle_0.25_layer_0.05.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.25_lay0.05 definition = zav_base +name = pla_noz0.25_lay0.05 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_005 setting_version = 20 type = quality -quality_type = ZAV_layer_005 -material = generic_pla -variant = 0.25mm_ZAV_Nozzle +variant = 0.25mm_ZAV_Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/zav_base/pla/nozzle_0.25/zav_pla_nozzle_0.25_layer_0.10.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.25/zav_pla_nozzle_0.25_layer_0.10.inst.cfg index d9bd3e8ad7..2e578f3ecb 100644 --- a/resources/quality/zav_base/pla/nozzle_0.25/zav_pla_nozzle_0.25_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.25/zav_pla_nozzle_0.25_layer_0.10.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.25_lay0.10 definition = zav_base +name = pla_noz0.25_lay0.10 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_010 setting_version = 20 type = quality -quality_type = ZAV_layer_010 -material = generic_pla -variant = 0.25mm_ZAV_Nozzle +variant = 0.25mm_ZAV_Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/zav_base/pla/nozzle_0.25/zav_pla_nozzle_0.25_layer_0.15.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.25/zav_pla_nozzle_0.25_layer_0.15.inst.cfg index 675dde0b3b..55b74cbe3f 100644 --- a/resources/quality/zav_base/pla/nozzle_0.25/zav_pla_nozzle_0.25_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.25/zav_pla_nozzle_0.25_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.25_lay0.15 definition = zav_base +name = pla_noz0.25_lay0.15 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_015 setting_version = 20 type = quality -quality_type = ZAV_layer_015 -material = generic_pla -variant = 0.25mm_ZAV_Nozzle +variant = 0.25mm_ZAV_Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/zav_base/pla/nozzle_0.25/zav_pla_nozzle_0.25_layer_0.20.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.25/zav_pla_nozzle_0.25_layer_0.20.inst.cfg index a94697a4b3..05de8e46f6 100644 --- a/resources/quality/zav_base/pla/nozzle_0.25/zav_pla_nozzle_0.25_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.25/zav_pla_nozzle_0.25_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.25_lay0.20 definition = zav_base +name = pla_noz0.25_lay0.20 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_020 setting_version = 20 type = quality -quality_type = ZAV_layer_020 -material = generic_pla -variant = 0.25mm_ZAV_Nozzle +variant = 0.25mm_ZAV_Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/zav_base/pla/nozzle_0.30/zav_pla_nozzle_0.30_layer_0.10.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.30/zav_pla_nozzle_0.30_layer_0.10.inst.cfg index 0c2a29bed4..07d6dd7d41 100644 --- a/resources/quality/zav_base/pla/nozzle_0.30/zav_pla_nozzle_0.30_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.30/zav_pla_nozzle_0.30_layer_0.10.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.30_lay0.10 definition = zav_base +name = pla_noz0.30_lay0.10 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_010 setting_version = 20 type = quality -quality_type = ZAV_layer_010 -material = generic_pla -variant = 0.30mm_ZAV_Nozzle +variant = 0.30mm_ZAV_Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/zav_base/pla/nozzle_0.30/zav_pla_nozzle_0.30_layer_0.15.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.30/zav_pla_nozzle_0.30_layer_0.15.inst.cfg index 449f212d8a..b91ce093b0 100644 --- a/resources/quality/zav_base/pla/nozzle_0.30/zav_pla_nozzle_0.30_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.30/zav_pla_nozzle_0.30_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.30_lay0.15 definition = zav_base +name = pla_noz0.30_lay0.15 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_015 setting_version = 20 type = quality -quality_type = ZAV_layer_015 -material = generic_pla -variant = 0.30mm_ZAV_Nozzle +variant = 0.30mm_ZAV_Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/zav_base/pla/nozzle_0.30/zav_pla_nozzle_0.30_layer_0.20.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.30/zav_pla_nozzle_0.30_layer_0.20.inst.cfg index 54e02a6054..8f8781bc34 100644 --- a/resources/quality/zav_base/pla/nozzle_0.30/zav_pla_nozzle_0.30_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.30/zav_pla_nozzle_0.30_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.30_lay0.20 definition = zav_base +name = pla_noz0.30_lay0.20 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_020 setting_version = 20 type = quality -quality_type = ZAV_layer_020 -material = generic_pla -variant = 0.30mm_ZAV_Nozzle +variant = 0.30mm_ZAV_Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/zav_base/pla/nozzle_0.30/zav_pla_nozzle_0.30_layer_0.25.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.30/zav_pla_nozzle_0.30_layer_0.25.inst.cfg index 166bf54768..fa8270b11a 100644 --- a/resources/quality/zav_base/pla/nozzle_0.30/zav_pla_nozzle_0.30_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.30/zav_pla_nozzle_0.30_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.30_lay0.25 definition = zav_base +name = pla_noz0.30_lay0.25 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_025 setting_version = 20 type = quality -quality_type = ZAV_layer_025 -material = generic_pla -variant = 0.30mm_ZAV_Nozzle +variant = 0.30mm_ZAV_Nozzle [values] wall_thickness = =line_width*4 + diff --git a/resources/quality/zav_base/pla/nozzle_0.35/zav_pla_nozzle_0.35_layer_0.10.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.35/zav_pla_nozzle_0.35_layer_0.10.inst.cfg index 2a8cd7368a..461f9c1f06 100644 --- a/resources/quality/zav_base/pla/nozzle_0.35/zav_pla_nozzle_0.35_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.35/zav_pla_nozzle_0.35_layer_0.10.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.35_lay0.10 definition = zav_base +name = pla_noz0.35_lay0.10 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_010 setting_version = 20 type = quality -quality_type = ZAV_layer_010 -material = generic_pla -variant = 0.35mm_ZAV_Nozzle +variant = 0.35mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/pla/nozzle_0.35/zav_pla_nozzle_0.35_layer_0.15.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.35/zav_pla_nozzle_0.35_layer_0.15.inst.cfg index 76f0038dcf..5711518966 100644 --- a/resources/quality/zav_base/pla/nozzle_0.35/zav_pla_nozzle_0.35_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.35/zav_pla_nozzle_0.35_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.35_lay0.15 definition = zav_base +name = pla_noz0.35_lay0.15 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_015 setting_version = 20 type = quality -quality_type = ZAV_layer_015 -material = generic_pla -variant = 0.35mm_ZAV_Nozzle +variant = 0.35mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/pla/nozzle_0.35/zav_pla_nozzle_0.35_layer_0.20.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.35/zav_pla_nozzle_0.35_layer_0.20.inst.cfg index 244ce21eb2..69744b7040 100644 --- a/resources/quality/zav_base/pla/nozzle_0.35/zav_pla_nozzle_0.35_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.35/zav_pla_nozzle_0.35_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.35_lay0.20 definition = zav_base +name = pla_noz0.35_lay0.20 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_020 setting_version = 20 type = quality -quality_type = ZAV_layer_020 -material = generic_pla -variant = 0.35mm_ZAV_Nozzle +variant = 0.35mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/pla/nozzle_0.35/zav_pla_nozzle_0.35_layer_0.25.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.35/zav_pla_nozzle_0.35_layer_0.25.inst.cfg index 2fa883e4c0..caee4466ee 100644 --- a/resources/quality/zav_base/pla/nozzle_0.35/zav_pla_nozzle_0.35_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.35/zav_pla_nozzle_0.35_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.35_lay0.25 definition = zav_base +name = pla_noz0.35_lay0.25 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_025 setting_version = 20 type = quality -quality_type = ZAV_layer_025 -material = generic_pla -variant = 0.35mm_ZAV_Nozzle +variant = 0.35mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.10.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.10.inst.cfg index a347266881..ca1ce3844f 100644 --- a/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.10.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.40_lay0.10 definition = zav_base +name = pla_noz0.40_lay0.10 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_010 setting_version = 20 type = quality -quality_type = ZAV_layer_010 -material = generic_pla -variant = 0.40mm_ZAV_Nozzle +variant = 0.40mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.15.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.15.inst.cfg index 4fad842b5d..953e11dacd 100644 --- a/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.40_lay0.15 definition = zav_base +name = pla_noz0.40_lay0.15 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_015 setting_version = 20 type = quality -quality_type = ZAV_layer_015 -material = generic_pla -variant = 0.40mm_ZAV_Nozzle +variant = 0.40mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.20.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.20.inst.cfg index 51f7c1b8fb..4988b78325 100644 --- a/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.40_lay0.20 definition = zav_base +name = pla_noz0.40_lay0.20 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_020 setting_version = 20 type = quality -quality_type = ZAV_layer_020 -material = generic_pla -variant = 0.40mm_ZAV_Nozzle +variant = 0.40mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.25.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.25.inst.cfg index 67851938e7..cbc7bfb2ff 100644 --- a/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.40_lay0.25 definition = zav_base +name = pla_noz0.40_lay0.25 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_025 setting_version = 20 type = quality -quality_type = ZAV_layer_025 -material = generic_pla -variant = 0.40mm_ZAV_Nozzle +variant = 0.40mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.30.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.30.inst.cfg index 64ab4c143e..24790fb0b1 100644 --- a/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.40/zav_pla_nozzle_0.40_layer_0.30.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.40_lay0.30 definition = zav_base +name = pla_noz0.40_lay0.30 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_030 setting_version = 20 type = quality -quality_type = ZAV_layer_030 -material = generic_pla -variant = 0.40mm_ZAV_Nozzle +variant = 0.40mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.10.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.10.inst.cfg index 038c4970bc..3fa07df4c9 100644 --- a/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.10.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.45_lay0.10 definition = zav_base +name = pla_noz0.45_lay0.10 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_010 setting_version = 20 type = quality -quality_type = ZAV_layer_010 -material = generic_pla -variant = 0.45mm_ZAV_Nozzle +variant = 0.45mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.15.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.15.inst.cfg index 1726d4fe62..63310b97cf 100644 --- a/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.45_lay0.15 definition = zav_base +name = pla_noz0.45_lay0.15 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_015 setting_version = 20 type = quality -quality_type = ZAV_layer_015 -material = generic_pla -variant = 0.45mm_ZAV_Nozzle +variant = 0.45mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.20.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.20.inst.cfg index c53a6aae57..903986fc5f 100644 --- a/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.45_lay0.20 definition = zav_base +name = pla_noz0.45_lay0.20 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_020 setting_version = 20 type = quality -quality_type = ZAV_layer_020 -material = generic_pla -variant = 0.45mm_ZAV_Nozzle +variant = 0.45mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.25.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.25.inst.cfg index d84f6f5a09..09c52b1a10 100644 --- a/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.45_lay0.25 definition = zav_base +name = pla_noz0.45_lay0.25 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_025 setting_version = 20 type = quality -quality_type = ZAV_layer_025 -material = generic_pla -variant = 0.45mm_ZAV_Nozzle +variant = 0.45mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.30.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.30.inst.cfg index 3560af533f..b12d83d279 100644 --- a/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.30.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.45_lay0.30 definition = zav_base +name = pla_noz0.45_lay0.30 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_030 setting_version = 20 type = quality -quality_type = ZAV_layer_030 -material = generic_pla -variant = 0.45mm_ZAV_Nozzle +variant = 0.45mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.35.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.35.inst.cfg index 1dc62ef454..2e875c6438 100644 --- a/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.35.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.45/zav_pla_nozzle_0.45_layer_0.35.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.45_lay0.35 definition = zav_base +name = pla_noz0.45_lay0.35 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_035 setting_version = 20 type = quality -quality_type = ZAV_layer_035 -material = generic_pla -variant = 0.45mm_ZAV_Nozzle +variant = 0.45mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.15.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.15.inst.cfg index 514406f1a1..59765e1fe0 100644 --- a/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.50_lay0.15 definition = zav_base +name = pla_noz0.50_lay0.15 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_015 setting_version = 20 type = quality -quality_type = ZAV_layer_015 -material = generic_pla -variant = 0.50mm_ZAV_Nozzle +variant = 0.50mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.20.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.20.inst.cfg index fd78bd9887..35b0114d4f 100644 --- a/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.50_lay0.20 definition = zav_base +name = pla_noz0.50_lay0.20 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_020 setting_version = 20 type = quality -quality_type = ZAV_layer_020 -material = generic_pla -variant = 0.50mm_ZAV_Nozzle +variant = 0.50mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.25.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.25.inst.cfg index 573e15acdb..19b7957b89 100644 --- a/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.50_lay0.25 definition = zav_base +name = pla_noz0.50_lay0.25 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_025 setting_version = 20 type = quality -quality_type = ZAV_layer_025 -material = generic_pla -variant = 0.50mm_ZAV_Nozzle +variant = 0.50mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.30.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.30.inst.cfg index 744642337b..a8179f4454 100644 --- a/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.30.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.50_lay0.30 definition = zav_base +name = pla_noz0.50_lay0.30 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_030 setting_version = 20 type = quality -quality_type = ZAV_layer_030 -material = generic_pla -variant = 0.50mm_ZAV_Nozzle +variant = 0.50mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.35.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.35.inst.cfg index 58be5f2987..9e36fe39b0 100644 --- a/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.35.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.50/zav_pla_nozzle_0.50_layer_0.35.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.50_lay0.35 definition = zav_base +name = pla_noz0.50_lay0.35 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_035 setting_version = 20 type = quality -quality_type = ZAV_layer_035 -material = generic_pla -variant = 0.50mm_ZAV_Nozzle +variant = 0.50mm_ZAV_Nozzle [values] wall_thickness = =line_width*3 + diff --git a/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.15.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.15.inst.cfg index d770a28d55..7f8317c053 100644 --- a/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.15.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.60_lay0.15 definition = zav_base +name = pla_noz0.60_lay0.15 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_015 setting_version = 20 type = quality -quality_type = ZAV_layer_015 -material = generic_pla -variant = 0.60mm_ZAV_Nozzle +variant = 0.60mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.20.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.20.inst.cfg index cf9b2722f1..895ebe4d1e 100644 --- a/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.60_lay0.20 definition = zav_base +name = pla_noz0.60_lay0.20 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_020 setting_version = 20 type = quality -quality_type = ZAV_layer_020 -material = generic_pla -variant = 0.60mm_ZAV_Nozzle +variant = 0.60mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.25.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.25.inst.cfg index e522192323..6ed2429d13 100644 --- a/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.60_lay0.25 definition = zav_base +name = pla_noz0.60_lay0.25 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_025 setting_version = 20 type = quality -quality_type = ZAV_layer_025 -material = generic_pla -variant = 0.60mm_ZAV_Nozzle +variant = 0.60mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.30.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.30.inst.cfg index c46c0ba73e..9ea3407cb9 100644 --- a/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.30.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.60_lay0.30 definition = zav_base +name = pla_noz0.60_lay0.30 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_030 setting_version = 20 type = quality -quality_type = ZAV_layer_030 -material = generic_pla -variant = 0.60mm_ZAV_Nozzle +variant = 0.60mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.35.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.35.inst.cfg index 59cd6e9108..29158a6175 100644 --- a/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.35.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.35.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.60_lay0.35 definition = zav_base +name = pla_noz0.60_lay0.35 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_035 setting_version = 20 type = quality -quality_type = ZAV_layer_035 -material = generic_pla -variant = 0.60mm_ZAV_Nozzle +variant = 0.60mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.40.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.40.inst.cfg index e1139a3c98..c218724f7f 100644 --- a/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.40.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.60/zav_pla_nozzle_0.60_layer_0.40.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.60_lay0.40 definition = zav_base +name = pla_noz0.60_lay0.40 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_040 setting_version = 20 type = quality -quality_type = ZAV_layer_040 -material = generic_pla -variant = 0.60mm_ZAV_Nozzle +variant = 0.60mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.20.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.20.inst.cfg index 2427997e89..b77711a160 100644 --- a/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.80_lay0.20 definition = zav_base +name = pla_noz0.80_lay0.20 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_020 setting_version = 20 type = quality -quality_type = ZAV_layer_020 -material = generic_pla -variant = 0.80mm_ZAV_Nozzle +variant = 0.80mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.25.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.25.inst.cfg index 527cbd225a..bc2d7bcb9b 100644 --- a/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.80_lay0.25 definition = zav_base +name = pla_noz0.80_lay0.25 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_025 setting_version = 20 type = quality -quality_type = ZAV_layer_025 -material = generic_pla -variant = 0.80mm_ZAV_Nozzle +variant = 0.80mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.30.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.30.inst.cfg index bcda55b0aa..ce79758681 100644 --- a/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.30.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.80_lay0.30 definition = zav_base +name = pla_noz0.80_lay0.30 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_030 setting_version = 20 type = quality -quality_type = ZAV_layer_030 -material = generic_pla -variant = 0.80mm_ZAV_Nozzle +variant = 0.80mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.35.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.35.inst.cfg index 3fea79f4e5..cdf9bb0090 100644 --- a/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.35.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.35.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.80_lay0.35 definition = zav_base +name = pla_noz0.80_lay0.35 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_035 setting_version = 20 type = quality -quality_type = ZAV_layer_035 -material = generic_pla -variant = 0.80mm_ZAV_Nozzle +variant = 0.80mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.40.inst.cfg b/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.40.inst.cfg index bfb1cfca56..84343df06f 100644 --- a/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.40.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_0.80/zav_pla_nozzle_0.80_layer_0.40.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz0.80_lay0.40 definition = zav_base +name = pla_noz0.80_lay0.40 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_040 setting_version = 20 type = quality -quality_type = ZAV_layer_040 -material = generic_pla -variant = 0.80mm_ZAV_Nozzle +variant = 0.80mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/pla/nozzle_1.00/zav_pla_nozzle_1.00_layer_0.25.inst.cfg b/resources/quality/zav_base/pla/nozzle_1.00/zav_pla_nozzle_1.00_layer_0.25.inst.cfg index 6556bb361f..5c6e7da7a9 100644 --- a/resources/quality/zav_base/pla/nozzle_1.00/zav_pla_nozzle_1.00_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_1.00/zav_pla_nozzle_1.00_layer_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz1.00_lay0.25 definition = zav_base +name = pla_noz1.00_lay0.25 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_025 setting_version = 20 type = quality -quality_type = ZAV_layer_025 -material = generic_pla -variant = 1.00mm_ZAV_Nozzle +variant = 1.00mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/pla/nozzle_1.00/zav_pla_nozzle_1.00_layer_0.30.inst.cfg b/resources/quality/zav_base/pla/nozzle_1.00/zav_pla_nozzle_1.00_layer_0.30.inst.cfg index bd8c9528b8..9a0cdb40b1 100644 --- a/resources/quality/zav_base/pla/nozzle_1.00/zav_pla_nozzle_1.00_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_1.00/zav_pla_nozzle_1.00_layer_0.30.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz1.00_lay0.30 definition = zav_base +name = pla_noz1.00_lay0.30 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_030 setting_version = 20 type = quality -quality_type = ZAV_layer_030 -material = generic_pla -variant = 1.00mm_ZAV_Nozzle +variant = 1.00mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/pla/nozzle_1.00/zav_pla_nozzle_1.00_layer_0.35.inst.cfg b/resources/quality/zav_base/pla/nozzle_1.00/zav_pla_nozzle_1.00_layer_0.35.inst.cfg index d22c818c3b..59a4b6cbb4 100644 --- a/resources/quality/zav_base/pla/nozzle_1.00/zav_pla_nozzle_1.00_layer_0.35.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_1.00/zav_pla_nozzle_1.00_layer_0.35.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz1.00_lay0.35 definition = zav_base +name = pla_noz1.00_lay0.35 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_035 setting_version = 20 type = quality -quality_type = ZAV_layer_035 -material = generic_pla -variant = 1.00mm_ZAV_Nozzle +variant = 1.00mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/pla/nozzle_1.00/zav_pla_nozzle_1.00_layer_0.40.inst.cfg b/resources/quality/zav_base/pla/nozzle_1.00/zav_pla_nozzle_1.00_layer_0.40.inst.cfg index db71ff15e2..f2012faac1 100644 --- a/resources/quality/zav_base/pla/nozzle_1.00/zav_pla_nozzle_1.00_layer_0.40.inst.cfg +++ b/resources/quality/zav_base/pla/nozzle_1.00/zav_pla_nozzle_1.00_layer_0.40.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = pla_noz1.00_lay0.40 definition = zav_base +name = pla_noz1.00_lay0.40 +version = 4 [metadata] +material = generic_pla +quality_type = ZAV_layer_040 setting_version = 20 type = quality -quality_type = ZAV_layer_040 -material = generic_pla -variant = 1.00mm_ZAV_Nozzle +variant = 1.00mm_ZAV_Nozzle [values] wall_thickness = =line_width*2 + diff --git a/resources/quality/zav_base/zav_layer_0.05.inst.cfg b/resources/quality/zav_base/zav_layer_0.05.inst.cfg index 6f0f24ab64..54c0d4e3de 100644 --- a/resources/quality/zav_base/zav_layer_0.05.inst.cfg +++ b/resources/quality/zav_base/zav_layer_0.05.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Ultra Quality definition = zav_base +name = Ultra Quality +version = 4 [metadata] +global_quality = True +quality_type = ZAV_layer_005 setting_version = 20 type = quality -quality_type = ZAV_layer_005 weight = -1 -global_quality = True [values] layer_height = 0.05 layer_height_0 = 0.12 + diff --git a/resources/quality/zav_base/zav_layer_0.10.inst.cfg b/resources/quality/zav_base/zav_layer_0.10.inst.cfg index 71acd1d30f..141a2de286 100644 --- a/resources/quality/zav_base/zav_layer_0.10.inst.cfg +++ b/resources/quality/zav_base/zav_layer_0.10.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Super Quality definition = zav_base +name = Super Quality +version = 4 [metadata] +global_quality = True +quality_type = ZAV_layer_010 setting_version = 20 type = quality -quality_type = ZAV_layer_010 weight = -2 -global_quality = True [values] layer_height = 0.10 layer_height_0 = 0.12 + diff --git a/resources/quality/zav_base/zav_layer_0.15.inst.cfg b/resources/quality/zav_base/zav_layer_0.15.inst.cfg index aa2ee6485a..ad034f79f4 100644 --- a/resources/quality/zav_base/zav_layer_0.15.inst.cfg +++ b/resources/quality/zav_base/zav_layer_0.15.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Fast Super Quality definition = zav_base +name = Fast Super Quality +version = 4 [metadata] +global_quality = True +quality_type = ZAV_layer_015 setting_version = 20 type = quality -quality_type = ZAV_layer_015 weight = -3 -global_quality = True [values] layer_height = 0.15 layer_height_0 = 0.15 + diff --git a/resources/quality/zav_base/zav_layer_0.20.inst.cfg b/resources/quality/zav_base/zav_layer_0.20.inst.cfg index 77b0f18440..3128a11461 100644 --- a/resources/quality/zav_base/zav_layer_0.20.inst.cfg +++ b/resources/quality/zav_base/zav_layer_0.20.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Standard Quality definition = zav_base +name = Standard Quality +version = 4 [metadata] +global_quality = True +quality_type = ZAV_layer_020 setting_version = 20 type = quality -quality_type = ZAV_layer_020 weight = -4 -global_quality = True [values] layer_height = 0.20 layer_height_0 = 0.20 + diff --git a/resources/quality/zav_base/zav_layer_0.25.inst.cfg b/resources/quality/zav_base/zav_layer_0.25.inst.cfg index 32254105f2..9a84e3f15e 100644 --- a/resources/quality/zav_base/zav_layer_0.25.inst.cfg +++ b/resources/quality/zav_base/zav_layer_0.25.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Fast Standard Quality definition = zav_base +name = Fast Standard Quality +version = 4 [metadata] +global_quality = True +quality_type = ZAV_layer_025 setting_version = 20 type = quality -quality_type = ZAV_layer_025 weight = -5 -global_quality = True [values] layer_height = 0.25 -layer_height_0 = 0.25 \ No newline at end of file +layer_height_0 = 0.25 + diff --git a/resources/quality/zav_base/zav_layer_0.30.inst.cfg b/resources/quality/zav_base/zav_layer_0.30.inst.cfg index 07039720b2..1a0645e957 100644 --- a/resources/quality/zav_base/zav_layer_0.30.inst.cfg +++ b/resources/quality/zav_base/zav_layer_0.30.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Fast Print Quality definition = zav_base +name = Fast Print Quality +version = 4 [metadata] +global_quality = True +quality_type = ZAV_layer_030 setting_version = 20 type = quality -quality_type = ZAV_layer_030 weight = -6 -global_quality = True [values] layer_height = 0.30 -layer_height_0 = 0.30 \ No newline at end of file +layer_height_0 = 0.30 + diff --git a/resources/quality/zav_base/zav_layer_0.35.inst.cfg b/resources/quality/zav_base/zav_layer_0.35.inst.cfg index 3fc8fc09e1..3045cc6dae 100644 --- a/resources/quality/zav_base/zav_layer_0.35.inst.cfg +++ b/resources/quality/zav_base/zav_layer_0.35.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Draft Quality definition = zav_base +name = Draft Quality +version = 4 [metadata] +global_quality = True +quality_type = ZAV_layer_035 setting_version = 20 type = quality -quality_type = ZAV_layer_035 weight = -7 -global_quality = True [values] layer_height = 0.35 -layer_height_0 = 0.35 \ No newline at end of file +layer_height_0 = 0.35 + diff --git a/resources/quality/zav_base/zav_layer_0.40.inst.cfg b/resources/quality/zav_base/zav_layer_0.40.inst.cfg index 0689c60852..f0241cc1e2 100644 --- a/resources/quality/zav_base/zav_layer_0.40.inst.cfg +++ b/resources/quality/zav_base/zav_layer_0.40.inst.cfg @@ -1,15 +1,16 @@ [general] -version = 4 -name = Poor Draft Quality definition = zav_base +name = Poor Draft Quality +version = 4 [metadata] +global_quality = True +quality_type = ZAV_layer_040 setting_version = 20 type = quality -quality_type = ZAV_layer_040 weight = -8 -global_quality = True [values] layer_height = 0.40 -layer_height_0 = 0.40 \ No newline at end of file +layer_height_0 = 0.40 + diff --git a/resources/quality/zyyx/zyyx_agile_global_fast.inst.cfg b/resources/quality/zyyx/zyyx_agile_global_fast.inst.cfg index 4d20a6d1e8..e782ada055 100644 --- a/resources/quality/zyyx/zyyx_agile_global_fast.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_global_fast.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Fast definition = zyyx_agile +name = Fast +version = 4 [metadata] +global_quality = True +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = 1 -global_quality = True [values] layer_height = 0.3 + diff --git a/resources/quality/zyyx/zyyx_agile_global_fine.inst.cfg b/resources/quality/zyyx/zyyx_agile_global_fine.inst.cfg index b92004f550..bc2b1afad9 100644 --- a/resources/quality/zyyx/zyyx_agile_global_fine.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_global_fine.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Fine definition = zyyx_agile +name = Fine +version = 4 [metadata] +global_quality = True +quality_type = fine setting_version = 20 type = quality -quality_type = fine weight = 1 -global_quality = True [values] layer_height = 0.1 + diff --git a/resources/quality/zyyx/zyyx_agile_global_normal.inst.cfg b/resources/quality/zyyx/zyyx_agile_global_normal.inst.cfg index ded7ca8ca3..2f7beee201 100644 --- a/resources/quality/zyyx/zyyx_agile_global_normal.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_global_normal.inst.cfg @@ -1,14 +1,15 @@ [general] -version = 4 -name = Normal definition = zyyx_agile +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -global_quality = True [values] layer_height = 0.2 + diff --git a/resources/quality/zyyx/zyyx_agile_pro_flex_fast.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_flex_fast.inst.cfg index 5c849f0cce..4c4472068f 100644 --- a/resources/quality/zyyx/zyyx_agile_pro_flex_fast.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_pro_flex_fast.inst.cfg @@ -1,27 +1,28 @@ [general] -version = 4 -name = Fast definition = zyyx_agile +name = Fast +version = 4 [metadata] +material = generic_tpu +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = 1 -material = generic_tpu [values] -layer_height = 0.3 -wall_thickness = 0.8 -top_bottom_thickness = 1.0 -infill_sparse_density = 10 +adhesion_type = brim default_material_print_temperature = 220 +infill_sparse_density = 10 +layer_height = 0.3 +material_flow = 105 material_print_temperature_layer_0 = 235 +raft_airgap = 0.2 retraction_amount = 1.0 retraction_speed = 15 speed_print = 20 speed_wall = =speed_print speed_wall_x = =speed_print -adhesion_type = brim -material_flow = 105 -raft_airgap = 0.2 +top_bottom_thickness = 1.0 +wall_thickness = 0.8 + diff --git a/resources/quality/zyyx/zyyx_agile_pro_flex_fine.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_flex_fine.inst.cfg index e12c681930..631ff77d38 100644 --- a/resources/quality/zyyx/zyyx_agile_pro_flex_fine.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_pro_flex_fine.inst.cfg @@ -1,27 +1,28 @@ [general] -version = 4 -name = Fine definition = zyyx_agile +name = Fine +version = 4 [metadata] +material = generic_tpu +quality_type = fine setting_version = 20 type = quality -quality_type = fine weight = 1 -material = generic_tpu [values] -layer_height = 0.12 -wall_thickness = 1.2 -top_bottom_thickness = 1.0 -infill_sparse_density = 15 +adhesion_type = brim default_material_print_temperature = 205 +infill_sparse_density = 15 +layer_height = 0.12 +material_flow = 105 material_print_temperature_layer_0 = 235 +raft_airgap = 0.1 retraction_amount = 0.2 retraction_speed = 15 speed_print = 15 speed_wall = =speed_print speed_wall_x = =speed_print -adhesion_type = brim -material_flow = 105 -raft_airgap = 0.1 +top_bottom_thickness = 1.0 +wall_thickness = 1.2 + diff --git a/resources/quality/zyyx/zyyx_agile_pro_flex_normal.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_flex_normal.inst.cfg index 3b15e29932..6d3d2a030e 100644 --- a/resources/quality/zyyx/zyyx_agile_pro_flex_normal.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_pro_flex_normal.inst.cfg @@ -1,27 +1,28 @@ [general] -version = 4 -name = Normal definition = zyyx_agile +name = Normal +version = 4 [metadata] +material = generic_tpu +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = generic_tpu [values] -layer_height = 0.2 -wall_thickness = 1.2 -top_bottom_thickness = 1.0 -infill_sparse_density = 15 +adhesion_type = brim default_material_print_temperature = 210 +infill_sparse_density = 15 +layer_height = 0.2 +material_flow = 105 material_print_temperature_layer_0 = 235 +raft_airgap = 0.2 retraction_amount = 1.0 retraction_speed = 15 speed_print = 20 speed_wall = =math.ceil(speed_print * 15 / 20) speed_wall_x = =speed_print -adhesion_type = brim -material_flow = 105 -raft_airgap = 0.2 +top_bottom_thickness = 1.0 +wall_thickness = 1.2 + diff --git a/resources/quality/zyyx/zyyx_agile_pro_pla_fast.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_pla_fast.inst.cfg index 90606ab3f7..9ae3391f10 100644 --- a/resources/quality/zyyx/zyyx_agile_pro_pla_fast.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_pro_pla_fast.inst.cfg @@ -1,27 +1,28 @@ [general] -version = 4 -name = Fast definition = zyyx_agile +name = Fast +version = 4 [metadata] +material = generic_pla +quality_type = fast setting_version = 20 type = quality -quality_type = fast weight = 1 -material = generic_pla [values] -layer_height = 0.3 -wall_thickness = 0.8 -top_bottom_thickness = 1.0 -infill_sparse_density = 10 +adhesion_type = brim default_material_print_temperature = 220 +infill_sparse_density = 10 +layer_height = 0.3 +material_flow = 95 material_print_temperature_layer_0 = 225 +raft_airgap = 0.15 retraction_amount = 1.5 retraction_speed = 20 speed_print = 40 speed_wall = =speed_print speed_wall_x = =speed_print -adhesion_type = brim -material_flow = 95 -raft_airgap = 0.15 +top_bottom_thickness = 1.0 +wall_thickness = 0.8 + diff --git a/resources/quality/zyyx/zyyx_agile_pro_pla_fine.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_pla_fine.inst.cfg index 41564a81e0..6b13a91612 100644 --- a/resources/quality/zyyx/zyyx_agile_pro_pla_fine.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_pro_pla_fine.inst.cfg @@ -1,27 +1,28 @@ [general] -version = 4 -name = Fine definition = zyyx_agile +name = Fine +version = 4 [metadata] +material = generic_pla +quality_type = fine setting_version = 20 type = quality -quality_type = fine weight = 1 -material = generic_pla [values] -layer_height = 0.1 -wall_thickness = 1.2 -top_bottom_thickness = 1.0 -infill_sparse_density = 15 +adhesion_type = brim default_material_print_temperature = 205 +infill_sparse_density = 15 +layer_height = 0.1 +material_flow = 95 material_print_temperature_layer_0 = 225 +raft_airgap = 0.08 retraction_amount = 0.4 retraction_speed = 20 speed_print = 35 speed_wall = =math.ceil(speed_print * 18 / 35) speed_wall_x = =math.ceil(speed_print * 25 / 35) -adhesion_type = brim -material_flow = 95 -raft_airgap = 0.08 +top_bottom_thickness = 1.0 +wall_thickness = 1.2 + diff --git a/resources/quality/zyyx/zyyx_agile_pro_pla_normal.inst.cfg b/resources/quality/zyyx/zyyx_agile_pro_pla_normal.inst.cfg index e550eefa2b..c00e0a943b 100644 --- a/resources/quality/zyyx/zyyx_agile_pro_pla_normal.inst.cfg +++ b/resources/quality/zyyx/zyyx_agile_pro_pla_normal.inst.cfg @@ -1,27 +1,28 @@ [general] -version = 4 -name = Normal definition = zyyx_agile +name = Normal +version = 4 [metadata] +material = generic_pla +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = generic_pla [values] -layer_height = 0.2 -wall_thickness = 1.2 -top_bottom_thickness = 1.0 -infill_sparse_density = 15 +adhesion_type = brim default_material_print_temperature = 210 +infill_sparse_density = 15 +layer_height = 0.2 +material_flow = 95 material_print_temperature_layer_0 = 225 +raft_airgap = 0.15 retraction_amount = 1.2 retraction_speed = 20 speed_print = 50 speed_wall = =math.ceil(speed_print * 22 / 50) speed_wall_x = =math.ceil(speed_print * 33 / 50) -adhesion_type = brim -material_flow = 95 -raft_airgap = 0.15 +top_bottom_thickness = 1.0 +wall_thickness = 1.2 + diff --git a/resources/variants/arjun300_0.2.inst.cfg b/resources/variants/arjun/arjun300_0.2.inst.cfg similarity index 100% rename from resources/variants/arjun300_0.2.inst.cfg rename to resources/variants/arjun/arjun300_0.2.inst.cfg index 435337a17e..5e4d999b71 100644 --- a/resources/variants/arjun300_0.2.inst.cfg +++ b/resources/variants/arjun/arjun300_0.2.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjun300 name = 0.2 mm Nozzle version = 4 -definition = arjun300 [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/arjun300_0.3.inst.cfg b/resources/variants/arjun/arjun300_0.3.inst.cfg similarity index 100% rename from resources/variants/arjun300_0.3.inst.cfg rename to resources/variants/arjun/arjun300_0.3.inst.cfg index e2d7a36888..db9e83933e 100644 --- a/resources/variants/arjun300_0.3.inst.cfg +++ b/resources/variants/arjun/arjun300_0.3.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjun300 name = 0.3 mm Nozzle version = 4 -definition = arjun300 [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/arjun300_0.4.inst.cfg b/resources/variants/arjun/arjun300_0.4.inst.cfg similarity index 100% rename from resources/variants/arjun300_0.4.inst.cfg rename to resources/variants/arjun/arjun300_0.4.inst.cfg index 0f6ea768ae..7adc57fc9f 100644 --- a/resources/variants/arjun300_0.4.inst.cfg +++ b/resources/variants/arjun/arjun300_0.4.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjun300 name = 0.4 mm Nozzle version = 4 -definition = arjun300 [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/arjun300_0.5.inst.cfg b/resources/variants/arjun/arjun300_0.5.inst.cfg similarity index 100% rename from resources/variants/arjun300_0.5.inst.cfg rename to resources/variants/arjun/arjun300_0.5.inst.cfg index b8740d3b0c..fb57089520 100644 --- a/resources/variants/arjun300_0.5.inst.cfg +++ b/resources/variants/arjun/arjun300_0.5.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjun300 name = 0.5 mm Nozzle version = 4 -definition = arjun300 [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/arjun300_0.6.inst.cfg b/resources/variants/arjun/arjun300_0.6.inst.cfg similarity index 100% rename from resources/variants/arjun300_0.6.inst.cfg rename to resources/variants/arjun/arjun300_0.6.inst.cfg index 8c81636936..b4e33687c1 100644 --- a/resources/variants/arjun300_0.6.inst.cfg +++ b/resources/variants/arjun/arjun300_0.6.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjun300 name = 0.6 mm Nozzle version = 4 -definition = arjun300 [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/arjun300_0.8.inst.cfg b/resources/variants/arjun/arjun300_0.8.inst.cfg similarity index 100% rename from resources/variants/arjun300_0.8.inst.cfg rename to resources/variants/arjun/arjun300_0.8.inst.cfg index 609ef6588c..414b774ac4 100644 --- a/resources/variants/arjun300_0.8.inst.cfg +++ b/resources/variants/arjun/arjun300_0.8.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjun300 name = 0.8 mm Nozzle version = 4 -definition = arjun300 [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/arjun300_dm_0.2.inst.cfg b/resources/variants/arjun/arjun300_dm_0.2.inst.cfg similarity index 100% rename from resources/variants/arjun300_dm_0.2.inst.cfg rename to resources/variants/arjun/arjun300_dm_0.2.inst.cfg index 53de3e380b..482a90e9ea 100644 --- a/resources/variants/arjun300_dm_0.2.inst.cfg +++ b/resources/variants/arjun/arjun300_dm_0.2.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjun_duplication name = 0.2 mm Nozzle version = 4 -definition = arjun_duplication [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/arjun300_dm_0.3.inst.cfg b/resources/variants/arjun/arjun300_dm_0.3.inst.cfg similarity index 100% rename from resources/variants/arjun300_dm_0.3.inst.cfg rename to resources/variants/arjun/arjun300_dm_0.3.inst.cfg index 2f1c19e407..23722ee960 100644 --- a/resources/variants/arjun300_dm_0.3.inst.cfg +++ b/resources/variants/arjun/arjun300_dm_0.3.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjun_duplication name = 0.3 mm Nozzle version = 4 -definition = arjun_duplication [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/arjun300_dm_0.4.inst.cfg b/resources/variants/arjun/arjun300_dm_0.4.inst.cfg similarity index 100% rename from resources/variants/arjun300_dm_0.4.inst.cfg rename to resources/variants/arjun/arjun300_dm_0.4.inst.cfg index 1576f94cae..529dfebed2 100644 --- a/resources/variants/arjun300_dm_0.4.inst.cfg +++ b/resources/variants/arjun/arjun300_dm_0.4.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjun_duplication name = 0.4 mm Nozzle version = 4 -definition = arjun_duplication [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/arjun300_dm_0.5.inst.cfg b/resources/variants/arjun/arjun300_dm_0.5.inst.cfg similarity index 100% rename from resources/variants/arjun300_dm_0.5.inst.cfg rename to resources/variants/arjun/arjun300_dm_0.5.inst.cfg index ec3e2c4213..866c58fae3 100644 --- a/resources/variants/arjun300_dm_0.5.inst.cfg +++ b/resources/variants/arjun/arjun300_dm_0.5.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjun_duplication name = 0.5 mm Nozzle version = 4 -definition = arjun_duplication [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/arjun300_dm_0.6.inst.cfg b/resources/variants/arjun/arjun300_dm_0.6.inst.cfg similarity index 100% rename from resources/variants/arjun300_dm_0.6.inst.cfg rename to resources/variants/arjun/arjun300_dm_0.6.inst.cfg index d76076a667..7c3e5b6f05 100644 --- a/resources/variants/arjun300_dm_0.6.inst.cfg +++ b/resources/variants/arjun/arjun300_dm_0.6.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjun_duplication name = 0.6 mm Nozzle version = 4 -definition = arjun_duplication [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/arjun300_dm_0.8.inst.cfg b/resources/variants/arjun/arjun300_dm_0.8.inst.cfg similarity index 100% rename from resources/variants/arjun300_dm_0.8.inst.cfg rename to resources/variants/arjun/arjun300_dm_0.8.inst.cfg index 608dcc07ef..c957a533e2 100644 --- a/resources/variants/arjun300_dm_0.8.inst.cfg +++ b/resources/variants/arjun/arjun300_dm_0.8.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjun_duplication name = 0.8 mm Nozzle version = 4 -definition = arjun_duplication [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/arjun300_mm_0.2.inst.cfg b/resources/variants/arjun/arjun300_mm_0.2.inst.cfg similarity index 100% rename from resources/variants/arjun300_mm_0.2.inst.cfg rename to resources/variants/arjun/arjun300_mm_0.2.inst.cfg index e48a1ce169..b2bae2e616 100644 --- a/resources/variants/arjun300_mm_0.2.inst.cfg +++ b/resources/variants/arjun/arjun300_mm_0.2.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjun_mirrored name = 0.2 mm Nozzle version = 4 -definition = arjun_mirrored [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/arjun300_mm_0.3.inst.cfg b/resources/variants/arjun/arjun300_mm_0.3.inst.cfg similarity index 100% rename from resources/variants/arjun300_mm_0.3.inst.cfg rename to resources/variants/arjun/arjun300_mm_0.3.inst.cfg index 5548cd7f06..4a5bcbd0a9 100644 --- a/resources/variants/arjun300_mm_0.3.inst.cfg +++ b/resources/variants/arjun/arjun300_mm_0.3.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjun_mirrored name = 0.3 mm Nozzle version = 4 -definition = arjun_mirrored [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/arjun300_mm_0.4.inst.cfg b/resources/variants/arjun/arjun300_mm_0.4.inst.cfg similarity index 100% rename from resources/variants/arjun300_mm_0.4.inst.cfg rename to resources/variants/arjun/arjun300_mm_0.4.inst.cfg index 14efb38042..43f72231b2 100644 --- a/resources/variants/arjun300_mm_0.4.inst.cfg +++ b/resources/variants/arjun/arjun300_mm_0.4.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjun_mirrored name = 0.4 mm Nozzle version = 4 -definition = arjun_mirrored [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/arjun300_mm_0.5.inst.cfg b/resources/variants/arjun/arjun300_mm_0.5.inst.cfg similarity index 100% rename from resources/variants/arjun300_mm_0.5.inst.cfg rename to resources/variants/arjun/arjun300_mm_0.5.inst.cfg index e05b81134d..3a4cfbff31 100644 --- a/resources/variants/arjun300_mm_0.5.inst.cfg +++ b/resources/variants/arjun/arjun300_mm_0.5.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjun_mirrored name = 0.5 mm Nozzle version = 4 -definition = arjun_mirrored [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/arjun300_mm_0.6.inst.cfg b/resources/variants/arjun/arjun300_mm_0.6.inst.cfg similarity index 100% rename from resources/variants/arjun300_mm_0.6.inst.cfg rename to resources/variants/arjun/arjun300_mm_0.6.inst.cfg index d6fabf8bce..83ace93ffb 100644 --- a/resources/variants/arjun300_mm_0.6.inst.cfg +++ b/resources/variants/arjun/arjun300_mm_0.6.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjun_mirrored name = 0.6 mm Nozzle version = 4 -definition = arjun_mirrored [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/arjun300_mm_0.8.inst.cfg b/resources/variants/arjun/arjun300_mm_0.8.inst.cfg similarity index 100% rename from resources/variants/arjun300_mm_0.8.inst.cfg rename to resources/variants/arjun/arjun300_mm_0.8.inst.cfg index e42c93177b..d1a6e42211 100644 --- a/resources/variants/arjun300_mm_0.8.inst.cfg +++ b/resources/variants/arjun/arjun300_mm_0.8.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjun_mirrored name = 0.8 mm Nozzle version = 4 -definition = arjun_mirrored [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/arjun300_pva_0.2.inst.cfg b/resources/variants/arjun/arjun300_pva_0.2.inst.cfg similarity index 95% rename from resources/variants/arjun300_pva_0.2.inst.cfg rename to resources/variants/arjun/arjun300_pva_0.2.inst.cfg index 6570382f4b..05fb115477 100644 --- a/resources/variants/arjun300_pva_0.2.inst.cfg +++ b/resources/variants/arjun/arjun300_pva_0.2.inst.cfg @@ -1,32 +1,32 @@ [general] +definition = arjun300 name = PVA 0.2 mm Nozzle version = 4 -definition = arjun300 [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +gradual_support_infill_steps = 2 machine_nozzle_size = 0.2 -support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height -support_offset = 3 +support_angle = 45 support_bottom_height = =layer_height * 2 support_bottom_pattern = zigzag support_bottom_stair_step_height = =layer_height support_infill_rate = 50 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_interface_density = 100 support_interface_enable = True support_interface_height = =layer_height * 5 +support_interface_pattern = concentric support_interface_skip_height = =layer_height support_join_distance = 3 -support_xy_distance = =machine_nozzle_size / 2 -support_xy_distance_overhang = =machine_nozzle_size / 2 -support_angle = 45 +support_offset = 3 support_pattern = triangles support_use_towers = False +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0 -gradual_support_infill_steps = 2 -support_interface_density = 100 -support_interface_pattern = concentric \ No newline at end of file + diff --git a/resources/variants/arjun300_pva_0.3.inst.cfg b/resources/variants/arjun/arjun300_pva_0.3.inst.cfg similarity index 95% rename from resources/variants/arjun300_pva_0.3.inst.cfg rename to resources/variants/arjun/arjun300_pva_0.3.inst.cfg index 4495be6e6a..58be651a26 100644 --- a/resources/variants/arjun300_pva_0.3.inst.cfg +++ b/resources/variants/arjun/arjun300_pva_0.3.inst.cfg @@ -1,32 +1,32 @@ [general] +definition = arjun300 name = PVA 0.3 mm Nozzle version = 4 -definition = arjun300 [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +gradual_support_infill_steps = 2 machine_nozzle_size = 0.3 -support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height -support_offset = 3 +support_angle = 45 support_bottom_height = =layer_height * 2 support_bottom_pattern = zigzag support_bottom_stair_step_height = =layer_height support_infill_rate = 50 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_interface_density = 100 support_interface_enable = True support_interface_height = =layer_height * 5 +support_interface_pattern = concentric support_interface_skip_height = =layer_height support_join_distance = 3 -support_xy_distance = =machine_nozzle_size / 2 -support_xy_distance_overhang = =machine_nozzle_size / 2 -support_angle = 45 +support_offset = 3 support_pattern = triangles support_use_towers = False +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0 -gradual_support_infill_steps = 2 -support_interface_density = 100 -support_interface_pattern = concentric \ No newline at end of file + diff --git a/resources/variants/arjun300_pva_0.4.inst.cfg b/resources/variants/arjun/arjun300_pva_0.4.inst.cfg similarity index 95% rename from resources/variants/arjun300_pva_0.4.inst.cfg rename to resources/variants/arjun/arjun300_pva_0.4.inst.cfg index 3e049c7c9f..39351f207f 100644 --- a/resources/variants/arjun300_pva_0.4.inst.cfg +++ b/resources/variants/arjun/arjun300_pva_0.4.inst.cfg @@ -1,32 +1,32 @@ [general] +definition = arjun300 name = PVA 0.4 mm Nozzle version = 4 -definition = arjun300 [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +gradual_support_infill_steps = 2 machine_nozzle_size = 0.4 -support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height -support_offset = 3 +support_angle = 45 support_bottom_height = =layer_height * 2 support_bottom_pattern = zigzag support_bottom_stair_step_height = =layer_height support_infill_rate = 50 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_interface_density = 100 support_interface_enable = True support_interface_height = =layer_height * 5 +support_interface_pattern = concentric support_interface_skip_height = =layer_height support_join_distance = 3 -support_xy_distance = =machine_nozzle_size / 2 -support_xy_distance_overhang = =machine_nozzle_size / 2 -support_angle = 45 +support_offset = 3 support_pattern = triangles support_use_towers = False +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0 -gradual_support_infill_steps = 2 -support_interface_density = 100 -support_interface_pattern = concentric \ No newline at end of file + diff --git a/resources/variants/arjun300_pva_0.5.inst.cfg b/resources/variants/arjun/arjun300_pva_0.5.inst.cfg similarity index 95% rename from resources/variants/arjun300_pva_0.5.inst.cfg rename to resources/variants/arjun/arjun300_pva_0.5.inst.cfg index 8365f9d3b4..f83635085a 100644 --- a/resources/variants/arjun300_pva_0.5.inst.cfg +++ b/resources/variants/arjun/arjun300_pva_0.5.inst.cfg @@ -1,32 +1,32 @@ [general] +definition = arjun300 name = PVA 0.5 mm Nozzle version = 4 -definition = arjun300 [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +gradual_support_infill_steps = 2 machine_nozzle_size = 0.5 -support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height -support_offset = 3 +support_angle = 45 support_bottom_height = =layer_height * 2 support_bottom_pattern = zigzag support_bottom_stair_step_height = =layer_height support_infill_rate = 50 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_interface_density = 100 support_interface_enable = True support_interface_height = =layer_height * 5 +support_interface_pattern = concentric support_interface_skip_height = =layer_height support_join_distance = 3 -support_xy_distance = =machine_nozzle_size / 2 -support_xy_distance_overhang = =machine_nozzle_size / 2 -support_angle = 45 +support_offset = 3 support_pattern = triangles support_use_towers = False +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0 -gradual_support_infill_steps = 2 -support_interface_density = 100 -support_interface_pattern = concentric \ No newline at end of file + diff --git a/resources/variants/arjun300_pva_0.6.inst.cfg b/resources/variants/arjun/arjun300_pva_0.6.inst.cfg similarity index 95% rename from resources/variants/arjun300_pva_0.6.inst.cfg rename to resources/variants/arjun/arjun300_pva_0.6.inst.cfg index f8e81cd144..9090904fb7 100644 --- a/resources/variants/arjun300_pva_0.6.inst.cfg +++ b/resources/variants/arjun/arjun300_pva_0.6.inst.cfg @@ -1,32 +1,32 @@ [general] +definition = arjun300 name = PVA 0.6 mm Nozzle version = 4 -definition = arjun300 [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +gradual_support_infill_steps = 2 machine_nozzle_size = 0.6 -support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height -support_offset = 3 +support_angle = 45 support_bottom_height = =layer_height * 2 support_bottom_pattern = zigzag support_bottom_stair_step_height = =layer_height support_infill_rate = 50 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_interface_density = 100 support_interface_enable = True support_interface_height = =layer_height * 5 +support_interface_pattern = concentric support_interface_skip_height = =layer_height support_join_distance = 3 -support_xy_distance = =machine_nozzle_size / 2 -support_xy_distance_overhang = =machine_nozzle_size / 2 -support_angle = 45 +support_offset = 3 support_pattern = triangles support_use_towers = False +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0 -gradual_support_infill_steps = 2 -support_interface_density = 100 -support_interface_pattern = concentric \ No newline at end of file + diff --git a/resources/variants/arjun300_pva_0.8.inst.cfg b/resources/variants/arjun/arjun300_pva_0.8.inst.cfg similarity index 95% rename from resources/variants/arjun300_pva_0.8.inst.cfg rename to resources/variants/arjun/arjun300_pva_0.8.inst.cfg index 8fe8929efa..02c92ea30e 100644 --- a/resources/variants/arjun300_pva_0.8.inst.cfg +++ b/resources/variants/arjun/arjun300_pva_0.8.inst.cfg @@ -1,32 +1,32 @@ [general] +definition = arjun300 name = PVA 0.8 mm Nozzle version = 4 -definition = arjun300 [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +gradual_support_infill_steps = 2 machine_nozzle_size = 0.8 -support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height -support_offset = 3 +support_angle = 45 support_bottom_height = =layer_height * 2 support_bottom_pattern = zigzag support_bottom_stair_step_height = =layer_height support_infill_rate = 50 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_interface_density = 100 support_interface_enable = True support_interface_height = =layer_height * 5 +support_interface_pattern = concentric support_interface_skip_height = =layer_height support_join_distance = 3 -support_xy_distance = =machine_nozzle_size / 2 -support_xy_distance_overhang = =machine_nozzle_size / 2 -support_angle = 45 +support_offset = 3 support_pattern = triangles support_use_towers = False +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0 -gradual_support_infill_steps = 2 -support_interface_density = 100 -support_interface_pattern = concentric \ No newline at end of file + diff --git a/resources/variants/arjunpro300_0.2.inst.cfg b/resources/variants/arjun/arjunpro300_0.2.inst.cfg similarity index 100% rename from resources/variants/arjunpro300_0.2.inst.cfg rename to resources/variants/arjun/arjunpro300_0.2.inst.cfg index d2f541b762..ddb4b5eb75 100644 --- a/resources/variants/arjunpro300_0.2.inst.cfg +++ b/resources/variants/arjun/arjunpro300_0.2.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjunpro300 name = 0.2 mm Nozzle version = 4 -definition = arjunpro300 [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/arjunpro300_0.3.inst.cfg b/resources/variants/arjun/arjunpro300_0.3.inst.cfg similarity index 100% rename from resources/variants/arjunpro300_0.3.inst.cfg rename to resources/variants/arjun/arjunpro300_0.3.inst.cfg index 94bd84d8de..290d8d0c3b 100644 --- a/resources/variants/arjunpro300_0.3.inst.cfg +++ b/resources/variants/arjun/arjunpro300_0.3.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjunpro300 name = 0.3 mm Nozzle version = 4 -definition = arjunpro300 [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/arjunpro300_0.4.inst.cfg b/resources/variants/arjun/arjunpro300_0.4.inst.cfg similarity index 100% rename from resources/variants/arjunpro300_0.4.inst.cfg rename to resources/variants/arjun/arjunpro300_0.4.inst.cfg index aa225cd72e..9c86d9cb2e 100644 --- a/resources/variants/arjunpro300_0.4.inst.cfg +++ b/resources/variants/arjun/arjunpro300_0.4.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjunpro300 name = 0.4 mm Nozzle version = 4 -definition = arjunpro300 [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/arjunpro300_0.5.inst.cfg b/resources/variants/arjun/arjunpro300_0.5.inst.cfg similarity index 100% rename from resources/variants/arjunpro300_0.5.inst.cfg rename to resources/variants/arjun/arjunpro300_0.5.inst.cfg index 718361f5e0..57387eba9b 100644 --- a/resources/variants/arjunpro300_0.5.inst.cfg +++ b/resources/variants/arjun/arjunpro300_0.5.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjunpro300 name = 0.5 mm Nozzle version = 4 -definition = arjunpro300 [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/arjunpro300_0.6.inst.cfg b/resources/variants/arjun/arjunpro300_0.6.inst.cfg similarity index 100% rename from resources/variants/arjunpro300_0.6.inst.cfg rename to resources/variants/arjun/arjunpro300_0.6.inst.cfg index 267c3d5797..0b1237366a 100644 --- a/resources/variants/arjunpro300_0.6.inst.cfg +++ b/resources/variants/arjun/arjunpro300_0.6.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjunpro300 name = 0.6 mm Nozzle version = 4 -definition = arjunpro300 [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/arjunpro300_0.8.inst.cfg b/resources/variants/arjun/arjunpro300_0.8.inst.cfg similarity index 100% rename from resources/variants/arjunpro300_0.8.inst.cfg rename to resources/variants/arjun/arjunpro300_0.8.inst.cfg index 997488e923..7916e4b8f4 100644 --- a/resources/variants/arjunpro300_0.8.inst.cfg +++ b/resources/variants/arjun/arjunpro300_0.8.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjunpro300 name = 0.8 mm Nozzle version = 4 -definition = arjunpro300 [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/arjunpro300_dm_0.2.inst.cfg b/resources/variants/arjun/arjunpro300_dm_0.2.inst.cfg similarity index 100% rename from resources/variants/arjunpro300_dm_0.2.inst.cfg rename to resources/variants/arjun/arjunpro300_dm_0.2.inst.cfg index 08fd4b6981..9b615e79d5 100644 --- a/resources/variants/arjunpro300_dm_0.2.inst.cfg +++ b/resources/variants/arjun/arjunpro300_dm_0.2.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjunpro_duplication name = 0.2 mm Nozzle version = 4 -definition = arjunpro_duplication [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/arjunpro300_dm_0.3.inst.cfg b/resources/variants/arjun/arjunpro300_dm_0.3.inst.cfg similarity index 100% rename from resources/variants/arjunpro300_dm_0.3.inst.cfg rename to resources/variants/arjun/arjunpro300_dm_0.3.inst.cfg index 1ccc1bffa2..a6b25e0d34 100644 --- a/resources/variants/arjunpro300_dm_0.3.inst.cfg +++ b/resources/variants/arjun/arjunpro300_dm_0.3.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjunpro_duplication name = 0.3 mm Nozzle version = 4 -definition = arjunpro_duplication [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/arjunpro300_dm_0.4.inst.cfg b/resources/variants/arjun/arjunpro300_dm_0.4.inst.cfg similarity index 100% rename from resources/variants/arjunpro300_dm_0.4.inst.cfg rename to resources/variants/arjun/arjunpro300_dm_0.4.inst.cfg index 1b56700576..5104a4e78b 100644 --- a/resources/variants/arjunpro300_dm_0.4.inst.cfg +++ b/resources/variants/arjun/arjunpro300_dm_0.4.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjunpro_duplication name = 0.4 mm Nozzle version = 4 -definition = arjunpro_duplication [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/arjunpro300_dm_0.5.inst.cfg b/resources/variants/arjun/arjunpro300_dm_0.5.inst.cfg similarity index 100% rename from resources/variants/arjunpro300_dm_0.5.inst.cfg rename to resources/variants/arjun/arjunpro300_dm_0.5.inst.cfg index 6051dd54f0..626dcb81d1 100644 --- a/resources/variants/arjunpro300_dm_0.5.inst.cfg +++ b/resources/variants/arjun/arjunpro300_dm_0.5.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjunpro_duplication name = 0.5 mm Nozzle version = 4 -definition = arjunpro_duplication [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/arjunpro300_dm_0.6.inst.cfg b/resources/variants/arjun/arjunpro300_dm_0.6.inst.cfg similarity index 100% rename from resources/variants/arjunpro300_dm_0.6.inst.cfg rename to resources/variants/arjun/arjunpro300_dm_0.6.inst.cfg index 6f1aecaf8e..885c7b047f 100644 --- a/resources/variants/arjunpro300_dm_0.6.inst.cfg +++ b/resources/variants/arjun/arjunpro300_dm_0.6.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjunpro_duplication name = 0.6 mm Nozzle version = 4 -definition = arjunpro_duplication [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/arjunpro300_dm_0.8.inst.cfg b/resources/variants/arjun/arjunpro300_dm_0.8.inst.cfg similarity index 100% rename from resources/variants/arjunpro300_dm_0.8.inst.cfg rename to resources/variants/arjun/arjunpro300_dm_0.8.inst.cfg index d0ffe4377d..e6cc4e4edd 100644 --- a/resources/variants/arjunpro300_dm_0.8.inst.cfg +++ b/resources/variants/arjun/arjunpro300_dm_0.8.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjunpro_duplication name = 0.8 mm Nozzle version = 4 -definition = arjunpro_duplication [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/arjunpro300_mm_0.2.inst.cfg b/resources/variants/arjun/arjunpro300_mm_0.2.inst.cfg similarity index 100% rename from resources/variants/arjunpro300_mm_0.2.inst.cfg rename to resources/variants/arjun/arjunpro300_mm_0.2.inst.cfg index 790ba5541a..99bf312239 100644 --- a/resources/variants/arjunpro300_mm_0.2.inst.cfg +++ b/resources/variants/arjun/arjunpro300_mm_0.2.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjunpro_mirrored name = 0.2 mm Nozzle version = 4 -definition = arjunpro_mirrored [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/arjunpro300_mm_0.3.inst.cfg b/resources/variants/arjun/arjunpro300_mm_0.3.inst.cfg similarity index 100% rename from resources/variants/arjunpro300_mm_0.3.inst.cfg rename to resources/variants/arjun/arjunpro300_mm_0.3.inst.cfg index cf47c39b5d..e25d6004ca 100644 --- a/resources/variants/arjunpro300_mm_0.3.inst.cfg +++ b/resources/variants/arjun/arjunpro300_mm_0.3.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjunpro_mirrored name = 0.3 mm Nozzle version = 4 -definition = arjunpro_mirrored [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/arjunpro300_mm_0.4.inst.cfg b/resources/variants/arjun/arjunpro300_mm_0.4.inst.cfg similarity index 100% rename from resources/variants/arjunpro300_mm_0.4.inst.cfg rename to resources/variants/arjun/arjunpro300_mm_0.4.inst.cfg index a70bf54ace..4ec5c3a256 100644 --- a/resources/variants/arjunpro300_mm_0.4.inst.cfg +++ b/resources/variants/arjun/arjunpro300_mm_0.4.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjunpro_mirrored name = 0.4 mm Nozzle version = 4 -definition = arjunpro_mirrored [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/arjunpro300_mm_0.5.inst.cfg b/resources/variants/arjun/arjunpro300_mm_0.5.inst.cfg similarity index 100% rename from resources/variants/arjunpro300_mm_0.5.inst.cfg rename to resources/variants/arjun/arjunpro300_mm_0.5.inst.cfg index 1dff7b55d9..0b915c2153 100644 --- a/resources/variants/arjunpro300_mm_0.5.inst.cfg +++ b/resources/variants/arjun/arjunpro300_mm_0.5.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjunpro_mirrored name = 0.5 mm Nozzle version = 4 -definition = arjunpro_mirrored [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/arjunpro300_mm_0.6.inst.cfg b/resources/variants/arjun/arjunpro300_mm_0.6.inst.cfg similarity index 100% rename from resources/variants/arjunpro300_mm_0.6.inst.cfg rename to resources/variants/arjun/arjunpro300_mm_0.6.inst.cfg index 6aacf3de12..b10ce628eb 100644 --- a/resources/variants/arjunpro300_mm_0.6.inst.cfg +++ b/resources/variants/arjun/arjunpro300_mm_0.6.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjunpro_mirrored name = 0.6 mm Nozzle version = 4 -definition = arjunpro_mirrored [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/arjunpro300_mm_0.8.inst.cfg b/resources/variants/arjun/arjunpro300_mm_0.8.inst.cfg similarity index 100% rename from resources/variants/arjunpro300_mm_0.8.inst.cfg rename to resources/variants/arjun/arjunpro300_mm_0.8.inst.cfg index 44880a66c8..c22f6933f7 100644 --- a/resources/variants/arjunpro300_mm_0.8.inst.cfg +++ b/resources/variants/arjun/arjunpro300_mm_0.8.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = arjunpro_mirrored name = 0.8 mm Nozzle version = 4 -definition = arjunpro_mirrored [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/arjunpro300_pva_0.2.inst.cfg b/resources/variants/arjun/arjunpro300_pva_0.2.inst.cfg similarity index 95% rename from resources/variants/arjunpro300_pva_0.2.inst.cfg rename to resources/variants/arjun/arjunpro300_pva_0.2.inst.cfg index d31fd852e5..364d28d84a 100644 --- a/resources/variants/arjunpro300_pva_0.2.inst.cfg +++ b/resources/variants/arjun/arjunpro300_pva_0.2.inst.cfg @@ -1,32 +1,32 @@ [general] +definition = arjunpro300 name = PVA 0.2 mm Nozzle version = 4 -definition = arjunpro300 [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +gradual_support_infill_steps = 2 machine_nozzle_size = 0.2 -support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height -support_offset = 3 +support_angle = 45 support_bottom_height = =layer_height * 2 support_bottom_pattern = zigzag support_bottom_stair_step_height = =layer_height support_infill_rate = 50 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_interface_density = 100 support_interface_enable = True support_interface_height = =layer_height * 5 +support_interface_pattern = concentric support_interface_skip_height = =layer_height support_join_distance = 3 -support_xy_distance = =machine_nozzle_size / 2 -support_xy_distance_overhang = =machine_nozzle_size / 2 -support_angle = 45 +support_offset = 3 support_pattern = triangles support_use_towers = False +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0 -gradual_support_infill_steps = 2 -support_interface_density = 100 -support_interface_pattern = concentric \ No newline at end of file + diff --git a/resources/variants/arjunpro300_pva_0.3.inst.cfg b/resources/variants/arjun/arjunpro300_pva_0.3.inst.cfg similarity index 95% rename from resources/variants/arjunpro300_pva_0.3.inst.cfg rename to resources/variants/arjun/arjunpro300_pva_0.3.inst.cfg index b6f489c20b..fc1732539c 100644 --- a/resources/variants/arjunpro300_pva_0.3.inst.cfg +++ b/resources/variants/arjun/arjunpro300_pva_0.3.inst.cfg @@ -1,32 +1,32 @@ [general] +definition = arjunpro300 name = PVA 0.3 mm Nozzle version = 4 -definition = arjunpro300 [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +gradual_support_infill_steps = 2 machine_nozzle_size = 0.3 -support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height -support_offset = 3 +support_angle = 45 support_bottom_height = =layer_height * 2 support_bottom_pattern = zigzag support_bottom_stair_step_height = =layer_height support_infill_rate = 50 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_interface_density = 100 support_interface_enable = True support_interface_height = =layer_height * 5 +support_interface_pattern = concentric support_interface_skip_height = =layer_height support_join_distance = 3 -support_xy_distance = =machine_nozzle_size / 2 -support_xy_distance_overhang = =machine_nozzle_size / 2 -support_angle = 45 +support_offset = 3 support_pattern = triangles support_use_towers = False +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0 -gradual_support_infill_steps = 2 -support_interface_density = 100 -support_interface_pattern = concentric \ No newline at end of file + diff --git a/resources/variants/arjunpro300_pva_0.4.inst.cfg b/resources/variants/arjun/arjunpro300_pva_0.4.inst.cfg similarity index 95% rename from resources/variants/arjunpro300_pva_0.4.inst.cfg rename to resources/variants/arjun/arjunpro300_pva_0.4.inst.cfg index 2f0478a89f..edc08bf772 100644 --- a/resources/variants/arjunpro300_pva_0.4.inst.cfg +++ b/resources/variants/arjun/arjunpro300_pva_0.4.inst.cfg @@ -1,32 +1,32 @@ [general] +definition = arjunpro300 name = PVA 0.4 mm Nozzle version = 4 -definition = arjunpro300 [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +gradual_support_infill_steps = 2 machine_nozzle_size = 0.4 -support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height -support_offset = 3 +support_angle = 45 support_bottom_height = =layer_height * 2 support_bottom_pattern = zigzag support_bottom_stair_step_height = =layer_height support_infill_rate = 50 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_interface_density = 100 support_interface_enable = True support_interface_height = =layer_height * 5 +support_interface_pattern = concentric support_interface_skip_height = =layer_height support_join_distance = 3 -support_xy_distance = =machine_nozzle_size / 2 -support_xy_distance_overhang = =machine_nozzle_size / 2 -support_angle = 45 +support_offset = 3 support_pattern = triangles support_use_towers = False +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0 -gradual_support_infill_steps = 2 -support_interface_density = 100 -support_interface_pattern = concentric \ No newline at end of file + diff --git a/resources/variants/arjunpro300_pva_0.5.inst.cfg b/resources/variants/arjun/arjunpro300_pva_0.5.inst.cfg similarity index 95% rename from resources/variants/arjunpro300_pva_0.5.inst.cfg rename to resources/variants/arjun/arjunpro300_pva_0.5.inst.cfg index a6e9316468..d2c288fb8c 100644 --- a/resources/variants/arjunpro300_pva_0.5.inst.cfg +++ b/resources/variants/arjun/arjunpro300_pva_0.5.inst.cfg @@ -1,32 +1,32 @@ [general] +definition = arjunpro300 name = PVA 0.5 mm Nozzle version = 4 -definition = arjunpro300 [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +gradual_support_infill_steps = 2 machine_nozzle_size = 0.5 -support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height -support_offset = 3 +support_angle = 45 support_bottom_height = =layer_height * 2 support_bottom_pattern = zigzag support_bottom_stair_step_height = =layer_height support_infill_rate = 50 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_interface_density = 100 support_interface_enable = True support_interface_height = =layer_height * 5 +support_interface_pattern = concentric support_interface_skip_height = =layer_height support_join_distance = 3 -support_xy_distance = =machine_nozzle_size / 2 -support_xy_distance_overhang = =machine_nozzle_size / 2 -support_angle = 45 +support_offset = 3 support_pattern = triangles support_use_towers = False +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0 -gradual_support_infill_steps = 2 -support_interface_density = 100 -support_interface_pattern = concentric \ No newline at end of file + diff --git a/resources/variants/arjunpro300_pva_0.6.inst.cfg b/resources/variants/arjun/arjunpro300_pva_0.6.inst.cfg similarity index 95% rename from resources/variants/arjunpro300_pva_0.6.inst.cfg rename to resources/variants/arjun/arjunpro300_pva_0.6.inst.cfg index 6036eb82a4..b61ddabd9a 100644 --- a/resources/variants/arjunpro300_pva_0.6.inst.cfg +++ b/resources/variants/arjun/arjunpro300_pva_0.6.inst.cfg @@ -1,32 +1,32 @@ [general] +definition = arjunpro300 name = PVA 0.6 mm Nozzle version = 4 -definition = arjunpro300 [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +gradual_support_infill_steps = 2 machine_nozzle_size = 0.6 -support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height -support_offset = 3 +support_angle = 45 support_bottom_height = =layer_height * 2 support_bottom_pattern = zigzag support_bottom_stair_step_height = =layer_height support_infill_rate = 50 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_interface_density = 100 support_interface_enable = True support_interface_height = =layer_height * 5 +support_interface_pattern = concentric support_interface_skip_height = =layer_height support_join_distance = 3 -support_xy_distance = =machine_nozzle_size / 2 -support_xy_distance_overhang = =machine_nozzle_size / 2 -support_angle = 45 +support_offset = 3 support_pattern = triangles support_use_towers = False +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0 -gradual_support_infill_steps = 2 -support_interface_density = 100 -support_interface_pattern = concentric \ No newline at end of file + diff --git a/resources/variants/arjunpro300_pva_0.8.inst.cfg b/resources/variants/arjun/arjunpro300_pva_0.8.inst.cfg similarity index 95% rename from resources/variants/arjunpro300_pva_0.8.inst.cfg rename to resources/variants/arjun/arjunpro300_pva_0.8.inst.cfg index 67ab3ddce5..6edc71e611 100644 --- a/resources/variants/arjunpro300_pva_0.8.inst.cfg +++ b/resources/variants/arjun/arjunpro300_pva_0.8.inst.cfg @@ -1,32 +1,32 @@ [general] +definition = arjunpro300 name = PVA 0.8 mm Nozzle version = 4 -definition = arjunpro300 [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +gradual_support_infill_steps = 2 machine_nozzle_size = 0.8 -support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height -support_offset = 3 +support_angle = 45 support_bottom_height = =layer_height * 2 support_bottom_pattern = zigzag support_bottom_stair_step_height = =layer_height support_infill_rate = 50 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_interface_density = 100 support_interface_enable = True support_interface_height = =layer_height * 5 +support_interface_pattern = concentric support_interface_skip_height = =layer_height support_join_distance = 3 -support_xy_distance = =machine_nozzle_size / 2 -support_xy_distance_overhang = =machine_nozzle_size / 2 -support_angle = 45 +support_offset = 3 support_pattern = triangles support_use_towers = False +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0 -gradual_support_infill_steps = 2 -support_interface_density = 100 -support_interface_pattern = concentric \ No newline at end of file + diff --git a/resources/variants/artillery_base_0.2.inst.cfg b/resources/variants/artillery/artillery_base_0.2.inst.cfg similarity index 99% rename from resources/variants/artillery_base_0.2.inst.cfg rename to resources/variants/artillery/artillery_base_0.2.inst.cfg index 7a97d16925..0dc2a46a91 100644 --- a/resources/variants/artillery_base_0.2.inst.cfg +++ b/resources/variants/artillery/artillery_base_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = artillery_base name = 0.2mm Nozzle version = 4 -definition = artillery_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/artillery_base_0.3.inst.cfg b/resources/variants/artillery/artillery_base_0.3.inst.cfg similarity index 99% rename from resources/variants/artillery_base_0.3.inst.cfg rename to resources/variants/artillery/artillery_base_0.3.inst.cfg index 968c5a2895..6559134329 100644 --- a/resources/variants/artillery_base_0.3.inst.cfg +++ b/resources/variants/artillery/artillery_base_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = artillery_base name = 0.3mm Nozzle version = 4 -definition = artillery_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/artillery_base_0.4.inst.cfg b/resources/variants/artillery/artillery_base_0.4.inst.cfg similarity index 99% rename from resources/variants/artillery_base_0.4.inst.cfg rename to resources/variants/artillery/artillery_base_0.4.inst.cfg index 0684147900..5dfecceb6c 100644 --- a/resources/variants/artillery_base_0.4.inst.cfg +++ b/resources/variants/artillery/artillery_base_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = artillery_base name = 0.4mm Nozzle version = 4 -definition = artillery_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/artillery_base_0.6.inst.cfg b/resources/variants/artillery/artillery_base_0.6.inst.cfg similarity index 99% rename from resources/variants/artillery_base_0.6.inst.cfg rename to resources/variants/artillery/artillery_base_0.6.inst.cfg index c657a509d6..88506d1498 100644 --- a/resources/variants/artillery_base_0.6.inst.cfg +++ b/resources/variants/artillery/artillery_base_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = artillery_base name = 0.6mm Nozzle version = 4 -definition = artillery_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/artillery_base_0.8.inst.cfg b/resources/variants/artillery/artillery_base_0.8.inst.cfg similarity index 99% rename from resources/variants/artillery_base_0.8.inst.cfg rename to resources/variants/artillery/artillery_base_0.8.inst.cfg index 70c1edcbe8..51dbfde159 100644 --- a/resources/variants/artillery_base_0.8.inst.cfg +++ b/resources/variants/artillery/artillery_base_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = artillery_base name = 0.8mm Nozzle version = 4 -definition = artillery_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/artillery_base_1.0.inst.cfg b/resources/variants/artillery/artillery_base_1.0.inst.cfg similarity index 99% rename from resources/variants/artillery_base_1.0.inst.cfg rename to resources/variants/artillery/artillery_base_1.0.inst.cfg index f114ce98fe..8e77de3b9b 100644 --- a/resources/variants/artillery_base_1.0.inst.cfg +++ b/resources/variants/artillery/artillery_base_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = artillery_base name = 1.0mm Nozzle version = 4 -definition = artillery_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/artillery_genius_0.2.inst.cfg b/resources/variants/artillery/artillery_genius_0.2.inst.cfg similarity index 99% rename from resources/variants/artillery_genius_0.2.inst.cfg rename to resources/variants/artillery/artillery_genius_0.2.inst.cfg index 22e284cf5e..bb14390df9 100644 --- a/resources/variants/artillery_genius_0.2.inst.cfg +++ b/resources/variants/artillery/artillery_genius_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = artillery_genius name = 0.2mm Nozzle version = 4 -definition = artillery_genius [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/artillery_genius_0.3.inst.cfg b/resources/variants/artillery/artillery_genius_0.3.inst.cfg similarity index 99% rename from resources/variants/artillery_genius_0.3.inst.cfg rename to resources/variants/artillery/artillery_genius_0.3.inst.cfg index f2e44ab84d..ed4e0d44f3 100644 --- a/resources/variants/artillery_genius_0.3.inst.cfg +++ b/resources/variants/artillery/artillery_genius_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = artillery_genius name = 0.3mm Nozzle version = 4 -definition = artillery_genius [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/artillery_genius_0.4.inst.cfg b/resources/variants/artillery/artillery_genius_0.4.inst.cfg similarity index 99% rename from resources/variants/artillery_genius_0.4.inst.cfg rename to resources/variants/artillery/artillery_genius_0.4.inst.cfg index d3f3d72290..2a5b9883d9 100644 --- a/resources/variants/artillery_genius_0.4.inst.cfg +++ b/resources/variants/artillery/artillery_genius_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = artillery_genius name = 0.4mm Nozzle version = 4 -definition = artillery_genius [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/artillery_genius_0.5.inst.cfg b/resources/variants/artillery/artillery_genius_0.5.inst.cfg similarity index 99% rename from resources/variants/artillery_genius_0.5.inst.cfg rename to resources/variants/artillery/artillery_genius_0.5.inst.cfg index edecd90265..cfe223642f 100644 --- a/resources/variants/artillery_genius_0.5.inst.cfg +++ b/resources/variants/artillery/artillery_genius_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = artillery_genius name = 0.5mm Nozzle version = 4 -definition = artillery_genius [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/artillery_genius_0.6.inst.cfg b/resources/variants/artillery/artillery_genius_0.6.inst.cfg similarity index 99% rename from resources/variants/artillery_genius_0.6.inst.cfg rename to resources/variants/artillery/artillery_genius_0.6.inst.cfg index 2a108c2f12..f1f7e79824 100644 --- a/resources/variants/artillery_genius_0.6.inst.cfg +++ b/resources/variants/artillery/artillery_genius_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = artillery_genius name = 0.6mm Nozzle version = 4 -definition = artillery_genius [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/artillery_genius_0.8.inst.cfg b/resources/variants/artillery/artillery_genius_0.8.inst.cfg similarity index 99% rename from resources/variants/artillery_genius_0.8.inst.cfg rename to resources/variants/artillery/artillery_genius_0.8.inst.cfg index f769a05498..516d006810 100644 --- a/resources/variants/artillery_genius_0.8.inst.cfg +++ b/resources/variants/artillery/artillery_genius_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = artillery_genius name = 0.8mm Nozzle version = 4 -definition = artillery_genius [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/artillery_genius_1.0.inst.cfg b/resources/variants/artillery/artillery_genius_1.0.inst.cfg similarity index 99% rename from resources/variants/artillery_genius_1.0.inst.cfg rename to resources/variants/artillery/artillery_genius_1.0.inst.cfg index 9eefdde2eb..069bf17e0f 100644 --- a/resources/variants/artillery_genius_1.0.inst.cfg +++ b/resources/variants/artillery/artillery_genius_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = artillery_genius name = 1.0mm Nozzle version = 4 -definition = artillery_genius [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/artillery_hornet_0.2.inst.cfg b/resources/variants/artillery/artillery_hornet_0.2.inst.cfg similarity index 100% rename from resources/variants/artillery_hornet_0.2.inst.cfg rename to resources/variants/artillery/artillery_hornet_0.2.inst.cfg diff --git a/resources/variants/artillery_hornet_0.3.inst.cfg b/resources/variants/artillery/artillery_hornet_0.3.inst.cfg similarity index 100% rename from resources/variants/artillery_hornet_0.3.inst.cfg rename to resources/variants/artillery/artillery_hornet_0.3.inst.cfg diff --git a/resources/variants/artillery_hornet_0.4.inst.cfg b/resources/variants/artillery/artillery_hornet_0.4.inst.cfg similarity index 100% rename from resources/variants/artillery_hornet_0.4.inst.cfg rename to resources/variants/artillery/artillery_hornet_0.4.inst.cfg diff --git a/resources/variants/artillery_hornet_0.5.inst.cfg b/resources/variants/artillery/artillery_hornet_0.5.inst.cfg similarity index 100% rename from resources/variants/artillery_hornet_0.5.inst.cfg rename to resources/variants/artillery/artillery_hornet_0.5.inst.cfg diff --git a/resources/variants/artillery_hornet_0.6.inst.cfg b/resources/variants/artillery/artillery_hornet_0.6.inst.cfg similarity index 100% rename from resources/variants/artillery_hornet_0.6.inst.cfg rename to resources/variants/artillery/artillery_hornet_0.6.inst.cfg diff --git a/resources/variants/artillery_hornet_0.8.inst.cfg b/resources/variants/artillery/artillery_hornet_0.8.inst.cfg similarity index 100% rename from resources/variants/artillery_hornet_0.8.inst.cfg rename to resources/variants/artillery/artillery_hornet_0.8.inst.cfg diff --git a/resources/variants/artillery_hornet_1.0.inst.cfg b/resources/variants/artillery/artillery_hornet_1.0.inst.cfg similarity index 100% rename from resources/variants/artillery_hornet_1.0.inst.cfg rename to resources/variants/artillery/artillery_hornet_1.0.inst.cfg diff --git a/resources/variants/artillery_sidewinder_x1_0.2.inst.cfg b/resources/variants/artillery/artillery_sidewinder_x1_0.2.inst.cfg similarity index 99% rename from resources/variants/artillery_sidewinder_x1_0.2.inst.cfg rename to resources/variants/artillery/artillery_sidewinder_x1_0.2.inst.cfg index 0349ad6d1b..1ea0a7d45e 100644 --- a/resources/variants/artillery_sidewinder_x1_0.2.inst.cfg +++ b/resources/variants/artillery/artillery_sidewinder_x1_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = artillery_sidewinder_x1 name = 0.2mm Nozzle version = 4 -definition = artillery_sidewinder_x1 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/artillery_sidewinder_x1_0.3.inst.cfg b/resources/variants/artillery/artillery_sidewinder_x1_0.3.inst.cfg similarity index 99% rename from resources/variants/artillery_sidewinder_x1_0.3.inst.cfg rename to resources/variants/artillery/artillery_sidewinder_x1_0.3.inst.cfg index 04882e77d4..4bd0f9316e 100644 --- a/resources/variants/artillery_sidewinder_x1_0.3.inst.cfg +++ b/resources/variants/artillery/artillery_sidewinder_x1_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = artillery_sidewinder_x1 name = 0.3mm Nozzle version = 4 -definition = artillery_sidewinder_x1 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/artillery_sidewinder_x1_0.4.inst.cfg b/resources/variants/artillery/artillery_sidewinder_x1_0.4.inst.cfg similarity index 99% rename from resources/variants/artillery_sidewinder_x1_0.4.inst.cfg rename to resources/variants/artillery/artillery_sidewinder_x1_0.4.inst.cfg index c281233316..cc14a115df 100644 --- a/resources/variants/artillery_sidewinder_x1_0.4.inst.cfg +++ b/resources/variants/artillery/artillery_sidewinder_x1_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = artillery_sidewinder_x1 name = 0.4mm Nozzle version = 4 -definition = artillery_sidewinder_x1 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/artillery_sidewinder_x1_0.6.inst.cfg b/resources/variants/artillery/artillery_sidewinder_x1_0.6.inst.cfg similarity index 99% rename from resources/variants/artillery_sidewinder_x1_0.6.inst.cfg rename to resources/variants/artillery/artillery_sidewinder_x1_0.6.inst.cfg index 98ea76d8ae..cc0ac26861 100644 --- a/resources/variants/artillery_sidewinder_x1_0.6.inst.cfg +++ b/resources/variants/artillery/artillery_sidewinder_x1_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = artillery_sidewinder_x1 name = 0.6mm Nozzle version = 4 -definition = artillery_sidewinder_x1 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/artillery_sidewinder_x1_0.8.inst.cfg b/resources/variants/artillery/artillery_sidewinder_x1_0.8.inst.cfg similarity index 99% rename from resources/variants/artillery_sidewinder_x1_0.8.inst.cfg rename to resources/variants/artillery/artillery_sidewinder_x1_0.8.inst.cfg index 077cdec063..9bef1f9eea 100644 --- a/resources/variants/artillery_sidewinder_x1_0.8.inst.cfg +++ b/resources/variants/artillery/artillery_sidewinder_x1_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = artillery_sidewinder_x1 name = 0.8mm Nozzle version = 4 -definition = artillery_sidewinder_x1 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/artillery_sidewinder_x1_1.0.inst.cfg b/resources/variants/artillery/artillery_sidewinder_x1_1.0.inst.cfg similarity index 99% rename from resources/variants/artillery_sidewinder_x1_1.0.inst.cfg rename to resources/variants/artillery/artillery_sidewinder_x1_1.0.inst.cfg index 1e720fbfb4..02b75e79ae 100644 --- a/resources/variants/artillery_sidewinder_x1_1.0.inst.cfg +++ b/resources/variants/artillery/artillery_sidewinder_x1_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = artillery_sidewinder_x1 name = 1.0mm Nozzle version = 4 -definition = artillery_sidewinder_x1 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/atmat_asterion_ht_v6_0.40.inst.cfg b/resources/variants/atmat/atmat_asterion_ht_v6_0.40.inst.cfg similarity index 99% rename from resources/variants/atmat_asterion_ht_v6_0.40.inst.cfg rename to resources/variants/atmat/atmat_asterion_ht_v6_0.40.inst.cfg index 55124d2651..976decce50 100644 --- a/resources/variants/atmat_asterion_ht_v6_0.40.inst.cfg +++ b/resources/variants/atmat/atmat_asterion_ht_v6_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = atmat_asterion_ht name = V6 0.40mm version = 4 -definition = atmat_asterion_ht [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/atmat_asterion_ht_v6_0.80.inst.cfg b/resources/variants/atmat/atmat_asterion_ht_v6_0.80.inst.cfg similarity index 99% rename from resources/variants/atmat_asterion_ht_v6_0.80.inst.cfg rename to resources/variants/atmat/atmat_asterion_ht_v6_0.80.inst.cfg index 2decbd9e7b..442708fad2 100644 --- a/resources/variants/atmat_asterion_ht_v6_0.80.inst.cfg +++ b/resources/variants/atmat/atmat_asterion_ht_v6_0.80.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = atmat_asterion_ht name = V6 0.80mm version = 4 -definition = atmat_asterion_ht [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 support_angle = 55 + diff --git a/resources/variants/atmat_asterion_v6_0.40.inst.cfg b/resources/variants/atmat/atmat_asterion_v6_0.40.inst.cfg similarity index 99% rename from resources/variants/atmat_asterion_v6_0.40.inst.cfg rename to resources/variants/atmat/atmat_asterion_v6_0.40.inst.cfg index 8ae2e8bae2..012ff0785e 100644 --- a/resources/variants/atmat_asterion_v6_0.40.inst.cfg +++ b/resources/variants/atmat/atmat_asterion_v6_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = atmat_asterion name = V6 0.40mm version = 4 -definition = atmat_asterion [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/atmat_asterion_v6_0.80.inst.cfg b/resources/variants/atmat/atmat_asterion_v6_0.80.inst.cfg similarity index 99% rename from resources/variants/atmat_asterion_v6_0.80.inst.cfg rename to resources/variants/atmat/atmat_asterion_v6_0.80.inst.cfg index 076527c9e5..6c6be10ed1 100644 --- a/resources/variants/atmat_asterion_v6_0.80.inst.cfg +++ b/resources/variants/atmat/atmat_asterion_v6_0.80.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = atmat_asterion name = V6 0.80mm version = 4 -definition = atmat_asterion [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 support_angle = 55 + diff --git a/resources/variants/atmat_galaxy_500_v6_0.40.inst.cfg b/resources/variants/atmat/atmat_galaxy_500_v6_0.40.inst.cfg similarity index 99% rename from resources/variants/atmat_galaxy_500_v6_0.40.inst.cfg rename to resources/variants/atmat/atmat_galaxy_500_v6_0.40.inst.cfg index b5a5c90122..c11eba0f64 100644 --- a/resources/variants/atmat_galaxy_500_v6_0.40.inst.cfg +++ b/resources/variants/atmat/atmat_galaxy_500_v6_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = atmat_galaxy_500 name = V6 0.40mm version = 4 -definition = atmat_galaxy_500 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/atmat_galaxy_500_v6_0.80.inst.cfg b/resources/variants/atmat/atmat_galaxy_500_v6_0.80.inst.cfg similarity index 99% rename from resources/variants/atmat_galaxy_500_v6_0.80.inst.cfg rename to resources/variants/atmat/atmat_galaxy_500_v6_0.80.inst.cfg index 3571e8de62..42695ed9c6 100644 --- a/resources/variants/atmat_galaxy_500_v6_0.80.inst.cfg +++ b/resources/variants/atmat/atmat_galaxy_500_v6_0.80.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = atmat_galaxy_500 name = V6 0.80mm version = 4 -definition = atmat_galaxy_500 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 support_angle = 55 + diff --git a/resources/variants/atmat_galaxy_600_v6_0.40.inst.cfg b/resources/variants/atmat/atmat_galaxy_600_v6_0.40.inst.cfg similarity index 99% rename from resources/variants/atmat_galaxy_600_v6_0.40.inst.cfg rename to resources/variants/atmat/atmat_galaxy_600_v6_0.40.inst.cfg index 1d8a530f86..ab136b8a3c 100644 --- a/resources/variants/atmat_galaxy_600_v6_0.40.inst.cfg +++ b/resources/variants/atmat/atmat_galaxy_600_v6_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = atmat_galaxy_600 name = V6 0.40mm version = 4 -definition = atmat_galaxy_600 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/atmat_galaxy_600_v6_0.80.inst.cfg b/resources/variants/atmat/atmat_galaxy_600_v6_0.80.inst.cfg similarity index 99% rename from resources/variants/atmat_galaxy_600_v6_0.80.inst.cfg rename to resources/variants/atmat/atmat_galaxy_600_v6_0.80.inst.cfg index 5031a6f48a..c6d58f56d4 100644 --- a/resources/variants/atmat_galaxy_600_v6_0.80.inst.cfg +++ b/resources/variants/atmat/atmat_galaxy_600_v6_0.80.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = atmat_galaxy_600 name = V6 0.80mm version = 4 -definition = atmat_galaxy_600 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 support_angle = 55 + diff --git a/resources/variants/atmat_signal_pro_300_v1_v6_0.40.inst.cfg b/resources/variants/atmat/atmat_signal_pro_300_v1_v6_0.40.inst.cfg similarity index 99% rename from resources/variants/atmat_signal_pro_300_v1_v6_0.40.inst.cfg rename to resources/variants/atmat/atmat_signal_pro_300_v1_v6_0.40.inst.cfg index ece7b152a8..e55bb6046f 100644 --- a/resources/variants/atmat_signal_pro_300_v1_v6_0.40.inst.cfg +++ b/resources/variants/atmat/atmat_signal_pro_300_v1_v6_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = atmat_signal_pro_300_v1 name = V6 0.40mm version = 4 -definition = atmat_signal_pro_300_v1 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/atmat_signal_pro_300_v1_v6_0.80.inst.cfg b/resources/variants/atmat/atmat_signal_pro_300_v1_v6_0.80.inst.cfg similarity index 99% rename from resources/variants/atmat_signal_pro_300_v1_v6_0.80.inst.cfg rename to resources/variants/atmat/atmat_signal_pro_300_v1_v6_0.80.inst.cfg index bad02c79bc..4ce6b88ce9 100644 --- a/resources/variants/atmat_signal_pro_300_v1_v6_0.80.inst.cfg +++ b/resources/variants/atmat/atmat_signal_pro_300_v1_v6_0.80.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = atmat_signal_pro_300_v1 name = V6 0.80mm version = 4 -definition = atmat_signal_pro_300_v1 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 support_angle = 55 + diff --git a/resources/variants/atmat_signal_pro_300_v2_v6_0.40.inst.cfg b/resources/variants/atmat/atmat_signal_pro_300_v2_v6_0.40.inst.cfg similarity index 99% rename from resources/variants/atmat_signal_pro_300_v2_v6_0.40.inst.cfg rename to resources/variants/atmat/atmat_signal_pro_300_v2_v6_0.40.inst.cfg index 46b519f8f4..1f521b6ddb 100644 --- a/resources/variants/atmat_signal_pro_300_v2_v6_0.40.inst.cfg +++ b/resources/variants/atmat/atmat_signal_pro_300_v2_v6_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = atmat_signal_pro_300_v2 name = V6 0.40mm version = 4 -definition = atmat_signal_pro_300_v2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/atmat_signal_pro_300_v2_v6_0.80.inst.cfg b/resources/variants/atmat/atmat_signal_pro_300_v2_v6_0.80.inst.cfg similarity index 99% rename from resources/variants/atmat_signal_pro_300_v2_v6_0.80.inst.cfg rename to resources/variants/atmat/atmat_signal_pro_300_v2_v6_0.80.inst.cfg index 0da4e80fe1..9c8ca6d190 100644 --- a/resources/variants/atmat_signal_pro_300_v2_v6_0.80.inst.cfg +++ b/resources/variants/atmat/atmat_signal_pro_300_v2_v6_0.80.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = atmat_signal_pro_300_v2 name = V6 0.80mm version = 4 -definition = atmat_signal_pro_300_v2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 support_angle = 55 + diff --git a/resources/variants/atmat_signal_pro_400_v1_v6_0.40.inst.cfg b/resources/variants/atmat/atmat_signal_pro_400_v1_v6_0.40.inst.cfg similarity index 99% rename from resources/variants/atmat_signal_pro_400_v1_v6_0.40.inst.cfg rename to resources/variants/atmat/atmat_signal_pro_400_v1_v6_0.40.inst.cfg index 50454cce38..1dfad3c862 100644 --- a/resources/variants/atmat_signal_pro_400_v1_v6_0.40.inst.cfg +++ b/resources/variants/atmat/atmat_signal_pro_400_v1_v6_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = atmat_signal_pro_400_v1 name = V6 0.40mm version = 4 -definition = atmat_signal_pro_400_v1 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/atmat_signal_pro_400_v1_v6_0.80.inst.cfg b/resources/variants/atmat/atmat_signal_pro_400_v1_v6_0.80.inst.cfg similarity index 99% rename from resources/variants/atmat_signal_pro_400_v1_v6_0.80.inst.cfg rename to resources/variants/atmat/atmat_signal_pro_400_v1_v6_0.80.inst.cfg index 9776b2c884..d1e31973bb 100644 --- a/resources/variants/atmat_signal_pro_400_v1_v6_0.80.inst.cfg +++ b/resources/variants/atmat/atmat_signal_pro_400_v1_v6_0.80.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = atmat_signal_pro_400_v1 name = V6 0.80mm version = 4 -definition = atmat_signal_pro_400_v1 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 support_angle = 55 + diff --git a/resources/variants/atmat_signal_pro_400_v2_v6_0.40.inst.cfg b/resources/variants/atmat/atmat_signal_pro_400_v2_v6_0.40.inst.cfg similarity index 99% rename from resources/variants/atmat_signal_pro_400_v2_v6_0.40.inst.cfg rename to resources/variants/atmat/atmat_signal_pro_400_v2_v6_0.40.inst.cfg index cd5434f4e9..f963c3ecca 100644 --- a/resources/variants/atmat_signal_pro_400_v2_v6_0.40.inst.cfg +++ b/resources/variants/atmat/atmat_signal_pro_400_v2_v6_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = atmat_signal_pro_400_v2 name = V6 0.40mm version = 4 -definition = atmat_signal_pro_400_v2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/atmat_signal_pro_400_v2_v6_0.80.inst.cfg b/resources/variants/atmat/atmat_signal_pro_400_v2_v6_0.80.inst.cfg similarity index 99% rename from resources/variants/atmat_signal_pro_400_v2_v6_0.80.inst.cfg rename to resources/variants/atmat/atmat_signal_pro_400_v2_v6_0.80.inst.cfg index 93f360b5eb..7109320b86 100644 --- a/resources/variants/atmat_signal_pro_400_v2_v6_0.80.inst.cfg +++ b/resources/variants/atmat/atmat_signal_pro_400_v2_v6_0.80.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = atmat_signal_pro_400_v2 name = V6 0.80mm version = 4 -definition = atmat_signal_pro_400_v2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 support_angle = 55 + diff --git a/resources/variants/atmat_signal_pro_500_v1_v6_0.40.inst.cfg b/resources/variants/atmat/atmat_signal_pro_500_v1_v6_0.40.inst.cfg similarity index 99% rename from resources/variants/atmat_signal_pro_500_v1_v6_0.40.inst.cfg rename to resources/variants/atmat/atmat_signal_pro_500_v1_v6_0.40.inst.cfg index 3f78a20346..1e9c83f2e1 100644 --- a/resources/variants/atmat_signal_pro_500_v1_v6_0.40.inst.cfg +++ b/resources/variants/atmat/atmat_signal_pro_500_v1_v6_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = atmat_signal_pro_500_v1 name = V6 0.40mm version = 4 -definition = atmat_signal_pro_500_v1 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/atmat_signal_pro_500_v1_v6_0.80.inst.cfg b/resources/variants/atmat/atmat_signal_pro_500_v1_v6_0.80.inst.cfg similarity index 99% rename from resources/variants/atmat_signal_pro_500_v1_v6_0.80.inst.cfg rename to resources/variants/atmat/atmat_signal_pro_500_v1_v6_0.80.inst.cfg index 83827d3890..d04b74b609 100644 --- a/resources/variants/atmat_signal_pro_500_v1_v6_0.80.inst.cfg +++ b/resources/variants/atmat/atmat_signal_pro_500_v1_v6_0.80.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = atmat_signal_pro_500_v1 name = V6 0.80mm version = 4 -definition = atmat_signal_pro_500_v1 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 support_angle = 55 + diff --git a/resources/variants/atmat_signal_pro_500_v2_v6_0.40.inst.cfg b/resources/variants/atmat/atmat_signal_pro_500_v2_v6_0.40.inst.cfg similarity index 99% rename from resources/variants/atmat_signal_pro_500_v2_v6_0.40.inst.cfg rename to resources/variants/atmat/atmat_signal_pro_500_v2_v6_0.40.inst.cfg index 1b63970dc3..166a4877af 100644 --- a/resources/variants/atmat_signal_pro_500_v2_v6_0.40.inst.cfg +++ b/resources/variants/atmat/atmat_signal_pro_500_v2_v6_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = atmat_signal_pro_500_v2 name = V6 0.40mm version = 4 -definition = atmat_signal_pro_500_v2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/atmat_signal_pro_500_v2_v6_0.80.inst.cfg b/resources/variants/atmat/atmat_signal_pro_500_v2_v6_0.80.inst.cfg similarity index 99% rename from resources/variants/atmat_signal_pro_500_v2_v6_0.80.inst.cfg rename to resources/variants/atmat/atmat_signal_pro_500_v2_v6_0.80.inst.cfg index 504040a51b..7ee0f91883 100644 --- a/resources/variants/atmat_signal_pro_500_v2_v6_0.80.inst.cfg +++ b/resources/variants/atmat/atmat_signal_pro_500_v2_v6_0.80.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = atmat_signal_pro_500_v2 name = V6 0.80mm version = 4 -definition = atmat_signal_pro_500_v2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 support_angle = 55 + diff --git a/resources/variants/atmat_signal_xl_v6_0.40.inst.cfg b/resources/variants/atmat/atmat_signal_xl_v6_0.40.inst.cfg similarity index 99% rename from resources/variants/atmat_signal_xl_v6_0.40.inst.cfg rename to resources/variants/atmat/atmat_signal_xl_v6_0.40.inst.cfg index c1cb655230..c49171e8fa 100644 --- a/resources/variants/atmat_signal_xl_v6_0.40.inst.cfg +++ b/resources/variants/atmat/atmat_signal_xl_v6_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = atmat_signal_xl name = V6 0.40mm version = 4 -definition = atmat_signal_xl [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/atmat_signal_xl_v6_0.80.inst.cfg b/resources/variants/atmat/atmat_signal_xl_v6_0.80.inst.cfg similarity index 99% rename from resources/variants/atmat_signal_xl_v6_0.80.inst.cfg rename to resources/variants/atmat/atmat_signal_xl_v6_0.80.inst.cfg index 0875333c37..fb40c906e3 100644 --- a/resources/variants/atmat_signal_xl_v6_0.80.inst.cfg +++ b/resources/variants/atmat/atmat_signal_xl_v6_0.80.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = atmat_signal_xl name = V6 0.80mm version = 4 -definition = atmat_signal_xl [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 support_angle = 55 + diff --git a/resources/variants/atmat_signal_xxl_v6_0.40.inst.cfg b/resources/variants/atmat/atmat_signal_xxl_v6_0.40.inst.cfg similarity index 99% rename from resources/variants/atmat_signal_xxl_v6_0.40.inst.cfg rename to resources/variants/atmat/atmat_signal_xxl_v6_0.40.inst.cfg index 59e3c4a867..b30deeeebc 100644 --- a/resources/variants/atmat_signal_xxl_v6_0.40.inst.cfg +++ b/resources/variants/atmat/atmat_signal_xxl_v6_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = atmat_signal_xxl name = V6 0.40mm version = 4 -definition = atmat_signal_xxl [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/atmat_signal_xxl_v6_0.80.inst.cfg b/resources/variants/atmat/atmat_signal_xxl_v6_0.80.inst.cfg similarity index 99% rename from resources/variants/atmat_signal_xxl_v6_0.80.inst.cfg rename to resources/variants/atmat/atmat_signal_xxl_v6_0.80.inst.cfg index 48d3121fd0..813c802244 100644 --- a/resources/variants/atmat_signal_xxl_v6_0.80.inst.cfg +++ b/resources/variants/atmat/atmat_signal_xxl_v6_0.80.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = atmat_signal_xxl name = V6 0.80mm version = 4 -definition = atmat_signal_xxl [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 support_angle = 55 + diff --git a/resources/variants/atmat_signal_xxxl_v6_0.40.inst.cfg b/resources/variants/atmat/atmat_signal_xxxl_v6_0.40.inst.cfg similarity index 99% rename from resources/variants/atmat_signal_xxxl_v6_0.40.inst.cfg rename to resources/variants/atmat/atmat_signal_xxxl_v6_0.40.inst.cfg index 7577fd89ad..0f34f813eb 100644 --- a/resources/variants/atmat_signal_xxxl_v6_0.40.inst.cfg +++ b/resources/variants/atmat/atmat_signal_xxxl_v6_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = atmat_signal_xxxl name = V6 0.40mm version = 4 -definition = atmat_signal_xxxl [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/atmat_signal_xxxl_v6_0.80.inst.cfg b/resources/variants/atmat/atmat_signal_xxxl_v6_0.80.inst.cfg similarity index 99% rename from resources/variants/atmat_signal_xxxl_v6_0.80.inst.cfg rename to resources/variants/atmat/atmat_signal_xxxl_v6_0.80.inst.cfg index 705a399c9d..dc9b055344 100644 --- a/resources/variants/atmat_signal_xxxl_v6_0.80.inst.cfg +++ b/resources/variants/atmat/atmat_signal_xxxl_v6_0.80.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = atmat_signal_xxxl name = V6 0.80mm version = 4 -definition = atmat_signal_xxxl [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 support_angle = 55 + diff --git a/resources/variants/atom3_all_metal_brass_0.2.inst.cfg b/resources/variants/atmat/atom3_all_metal_brass_0.2.inst.cfg similarity index 90% rename from resources/variants/atom3_all_metal_brass_0.2.inst.cfg rename to resources/variants/atmat/atom3_all_metal_brass_0.2.inst.cfg index 8bf3ec21ee..b5a9f0406c 100644 --- a/resources/variants/atom3_all_metal_brass_0.2.inst.cfg +++ b/resources/variants/atmat/atom3_all_metal_brass_0.2.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = atom3 name = All metal hotend + 0.2mm brass nozzle version = 4 -definition = atom3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 retraction_amount = 3 -retraction_speed = 50 \ No newline at end of file +retraction_speed = 50 + diff --git a/resources/variants/atom3_all_metal_brass_0.4.inst.cfg b/resources/variants/atmat/atom3_all_metal_brass_0.4.inst.cfg similarity index 90% rename from resources/variants/atom3_all_metal_brass_0.4.inst.cfg rename to resources/variants/atmat/atom3_all_metal_brass_0.4.inst.cfg index 1b0dcc4ca4..28d9601ba7 100644 --- a/resources/variants/atom3_all_metal_brass_0.4.inst.cfg +++ b/resources/variants/atmat/atom3_all_metal_brass_0.4.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = atom3 name = All metal hotend + 0.4mm brass nozzle version = 4 -definition = atom3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 retraction_amount = 3 -retraction_speed = 50 \ No newline at end of file +retraction_speed = 50 + diff --git a/resources/variants/atom3_all_metal_brass_0.6.inst.cfg b/resources/variants/atmat/atom3_all_metal_brass_0.6.inst.cfg similarity index 90% rename from resources/variants/atom3_all_metal_brass_0.6.inst.cfg rename to resources/variants/atmat/atom3_all_metal_brass_0.6.inst.cfg index 3e0b5460dc..dca6f59b6b 100644 --- a/resources/variants/atom3_all_metal_brass_0.6.inst.cfg +++ b/resources/variants/atmat/atom3_all_metal_brass_0.6.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = atom3 name = All metal hotend + 0.6mm brass nozzle version = 4 -definition = atom3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 retraction_amount = 3 -retraction_speed = 50 \ No newline at end of file +retraction_speed = 50 + diff --git a/resources/variants/atom3_lite_all_metal_brass_0.2.inst.cfg b/resources/variants/atmat/atom3_lite_all_metal_brass_0.2.inst.cfg similarity index 90% rename from resources/variants/atom3_lite_all_metal_brass_0.2.inst.cfg rename to resources/variants/atmat/atom3_lite_all_metal_brass_0.2.inst.cfg index 91b7f74874..14d9594c5c 100644 --- a/resources/variants/atom3_lite_all_metal_brass_0.2.inst.cfg +++ b/resources/variants/atmat/atom3_lite_all_metal_brass_0.2.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = atom3_lite name = All metal hotend + 0.2mm brass nozzle version = 4 -definition = atom3_lite [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 retraction_amount = 3 -retraction_speed = 50 \ No newline at end of file +retraction_speed = 50 + diff --git a/resources/variants/atom3_lite_all_metal_brass_0.4.inst.cfg b/resources/variants/atmat/atom3_lite_all_metal_brass_0.4.inst.cfg similarity index 90% rename from resources/variants/atom3_lite_all_metal_brass_0.4.inst.cfg rename to resources/variants/atmat/atom3_lite_all_metal_brass_0.4.inst.cfg index 29fe1e75bc..947ba02b52 100644 --- a/resources/variants/atom3_lite_all_metal_brass_0.4.inst.cfg +++ b/resources/variants/atmat/atom3_lite_all_metal_brass_0.4.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = atom3_lite name = All metal hotend + 0.4mm brass nozzle version = 4 -definition = atom3_lite [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 retraction_amount = 3 -retraction_speed = 50 \ No newline at end of file +retraction_speed = 50 + diff --git a/resources/variants/atom3_lite_all_metal_brass_0.6.inst.cfg b/resources/variants/atmat/atom3_lite_all_metal_brass_0.6.inst.cfg similarity index 86% rename from resources/variants/atom3_lite_all_metal_brass_0.6.inst.cfg rename to resources/variants/atmat/atom3_lite_all_metal_brass_0.6.inst.cfg index f3ae7682c5..c6cad84c2d 100644 --- a/resources/variants/atom3_lite_all_metal_brass_0.6.inst.cfg +++ b/resources/variants/atmat/atom3_lite_all_metal_brass_0.6.inst.cfg @@ -1,14 +1,15 @@ - [general] +[general] +definition = atom3_lite name = All metal hotend + 0.6mm brass nozzle version = 4 -definition = atom3_lite [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 retraction_amount = 3 -retraction_speed = 50 \ No newline at end of file +retraction_speed = 50 + diff --git a/resources/variants/atom3_lite_ptfe_brass_0.2.inst.cfg b/resources/variants/atmat/atom3_lite_ptfe_brass_0.2.inst.cfg similarity index 90% rename from resources/variants/atom3_lite_ptfe_brass_0.2.inst.cfg rename to resources/variants/atmat/atom3_lite_ptfe_brass_0.2.inst.cfg index 791cdd2f0a..5bd80298c4 100644 --- a/resources/variants/atom3_lite_ptfe_brass_0.2.inst.cfg +++ b/resources/variants/atmat/atom3_lite_ptfe_brass_0.2.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = atom3_lite name = PTFE hotend + 0.2mm brass nozzle version = 4 -definition = atom3_lite [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 retraction_amount = 7 -retraction_speed = 70 \ No newline at end of file +retraction_speed = 70 + diff --git a/resources/variants/atom3_lite_ptfe_brass_0.4.inst.cfg b/resources/variants/atmat/atom3_lite_ptfe_brass_0.4.inst.cfg similarity index 90% rename from resources/variants/atom3_lite_ptfe_brass_0.4.inst.cfg rename to resources/variants/atmat/atom3_lite_ptfe_brass_0.4.inst.cfg index 3705293a79..c5621efb9d 100644 --- a/resources/variants/atom3_lite_ptfe_brass_0.4.inst.cfg +++ b/resources/variants/atmat/atom3_lite_ptfe_brass_0.4.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = atom3_lite name = PTFE hotend + 0.4mm brass nozzle version = 4 -definition = atom3_lite [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 retraction_amount = 7 -retraction_speed = 70 \ No newline at end of file +retraction_speed = 70 + diff --git a/resources/variants/atom3_lite_ptfe_brass_0.6.inst.cfg b/resources/variants/atmat/atom3_lite_ptfe_brass_0.6.inst.cfg similarity index 90% rename from resources/variants/atom3_lite_ptfe_brass_0.6.inst.cfg rename to resources/variants/atmat/atom3_lite_ptfe_brass_0.6.inst.cfg index efb277ab5d..4fecf02f29 100644 --- a/resources/variants/atom3_lite_ptfe_brass_0.6.inst.cfg +++ b/resources/variants/atmat/atom3_lite_ptfe_brass_0.6.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = atom3_lite name = PTFE hotend + 0.6mm brass nozzle version = 4 -definition = atom3_lite [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 retraction_amount = 7 -retraction_speed = 70 \ No newline at end of file +retraction_speed = 70 + diff --git a/resources/variants/atom3_ptfe_brass_0.2.inst.cfg b/resources/variants/atmat/atom3_ptfe_brass_0.2.inst.cfg similarity index 90% rename from resources/variants/atom3_ptfe_brass_0.2.inst.cfg rename to resources/variants/atmat/atom3_ptfe_brass_0.2.inst.cfg index 2caeb88275..97b4d236e7 100644 --- a/resources/variants/atom3_ptfe_brass_0.2.inst.cfg +++ b/resources/variants/atmat/atom3_ptfe_brass_0.2.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = atom3 name = PTFE hotend + 0.2mm brass nozzle version = 4 -definition = atom3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 retraction_amount = 7 -retraction_speed = 70 \ No newline at end of file +retraction_speed = 70 + diff --git a/resources/variants/atom3_ptfe_brass_0.4.inst.cfg b/resources/variants/atmat/atom3_ptfe_brass_0.4.inst.cfg similarity index 90% rename from resources/variants/atom3_ptfe_brass_0.4.inst.cfg rename to resources/variants/atmat/atom3_ptfe_brass_0.4.inst.cfg index aa75b8d7ea..b0432a52c3 100644 --- a/resources/variants/atom3_ptfe_brass_0.4.inst.cfg +++ b/resources/variants/atmat/atom3_ptfe_brass_0.4.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = atom3 name = PTFE hotend + 0.4mm brass nozzle version = 4 -definition = atom3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 retraction_amount = 7 -retraction_speed = 70 \ No newline at end of file +retraction_speed = 70 + diff --git a/resources/variants/atom3_ptfe_brass_0.6.inst.cfg b/resources/variants/atmat/atom3_ptfe_brass_0.6.inst.cfg similarity index 90% rename from resources/variants/atom3_ptfe_brass_0.6.inst.cfg rename to resources/variants/atmat/atom3_ptfe_brass_0.6.inst.cfg index 7995a37a59..0184900da0 100644 --- a/resources/variants/atom3_ptfe_brass_0.6.inst.cfg +++ b/resources/variants/atmat/atom3_ptfe_brass_0.6.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = atom3 name = PTFE hotend + 0.6mm brass nozzle version = 4 -definition = atom3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 retraction_amount = 7 -retraction_speed = 70 \ No newline at end of file +retraction_speed = 70 + diff --git a/resources/variants/biqu_b1_0.2.inst.cfg b/resources/variants/biqu/biqu_b1_0.2.inst.cfg similarity index 99% rename from resources/variants/biqu_b1_0.2.inst.cfg rename to resources/variants/biqu/biqu_b1_0.2.inst.cfg index 884b2da01a..1073f17617 100755 --- a/resources/variants/biqu_b1_0.2.inst.cfg +++ b/resources/variants/biqu/biqu_b1_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = biqu_b1 name = 0.2mm Nozzle version = 4 -definition = biqu_b1 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/biqu_b1_0.3.inst.cfg b/resources/variants/biqu/biqu_b1_0.3.inst.cfg similarity index 99% rename from resources/variants/biqu_b1_0.3.inst.cfg rename to resources/variants/biqu/biqu_b1_0.3.inst.cfg index 266c1f08da..4e6a700b4a 100755 --- a/resources/variants/biqu_b1_0.3.inst.cfg +++ b/resources/variants/biqu/biqu_b1_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = biqu_b1 name = 0.3mm Nozzle version = 4 -definition = biqu_b1 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/biqu_b1_0.4.inst.cfg b/resources/variants/biqu/biqu_b1_0.4.inst.cfg similarity index 99% rename from resources/variants/biqu_b1_0.4.inst.cfg rename to resources/variants/biqu/biqu_b1_0.4.inst.cfg index 08d3f94235..af06642709 100755 --- a/resources/variants/biqu_b1_0.4.inst.cfg +++ b/resources/variants/biqu/biqu_b1_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = biqu_b1 name = 0.4mm Nozzle version = 4 -definition = biqu_b1 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/biqu_b1_0.5.inst.cfg b/resources/variants/biqu/biqu_b1_0.5.inst.cfg similarity index 99% rename from resources/variants/biqu_b1_0.5.inst.cfg rename to resources/variants/biqu/biqu_b1_0.5.inst.cfg index ee207a7387..1f245836a1 100755 --- a/resources/variants/biqu_b1_0.5.inst.cfg +++ b/resources/variants/biqu/biqu_b1_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = biqu_b1 name = 0.5mm Nozzle version = 4 -definition = biqu_b1 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/biqu_b1_0.6.inst.cfg b/resources/variants/biqu/biqu_b1_0.6.inst.cfg similarity index 99% rename from resources/variants/biqu_b1_0.6.inst.cfg rename to resources/variants/biqu/biqu_b1_0.6.inst.cfg index 53714e9f29..72427d068b 100755 --- a/resources/variants/biqu_b1_0.6.inst.cfg +++ b/resources/variants/biqu/biqu_b1_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = biqu_b1 name = 0.6mm Nozzle version = 4 -definition = biqu_b1 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/biqu_b1_0.8.inst.cfg b/resources/variants/biqu/biqu_b1_0.8.inst.cfg similarity index 99% rename from resources/variants/biqu_b1_0.8.inst.cfg rename to resources/variants/biqu/biqu_b1_0.8.inst.cfg index b61610fa19..7177d7d0f9 100755 --- a/resources/variants/biqu_b1_0.8.inst.cfg +++ b/resources/variants/biqu/biqu_b1_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = biqu_b1 name = 0.8mm Nozzle version = 4 -definition = biqu_b1 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/biqu_b1_abl_0.2.inst.cfg b/resources/variants/biqu/biqu_b1_abl_0.2.inst.cfg similarity index 99% rename from resources/variants/biqu_b1_abl_0.2.inst.cfg rename to resources/variants/biqu/biqu_b1_abl_0.2.inst.cfg index 35f0b470b4..ef463b95ca 100755 --- a/resources/variants/biqu_b1_abl_0.2.inst.cfg +++ b/resources/variants/biqu/biqu_b1_abl_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = biqu_b1_abl name = 0.2mm Nozzle version = 4 -definition = biqu_b1_abl [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/biqu_b1_abl_0.3.inst.cfg b/resources/variants/biqu/biqu_b1_abl_0.3.inst.cfg similarity index 99% rename from resources/variants/biqu_b1_abl_0.3.inst.cfg rename to resources/variants/biqu/biqu_b1_abl_0.3.inst.cfg index 77623ba278..a9a9de4a6b 100755 --- a/resources/variants/biqu_b1_abl_0.3.inst.cfg +++ b/resources/variants/biqu/biqu_b1_abl_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = biqu_b1_abl name = 0.3mm Nozzle version = 4 -definition = biqu_b1_abl [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/biqu_b1_abl_0.4.inst.cfg b/resources/variants/biqu/biqu_b1_abl_0.4.inst.cfg similarity index 99% rename from resources/variants/biqu_b1_abl_0.4.inst.cfg rename to resources/variants/biqu/biqu_b1_abl_0.4.inst.cfg index 81a52825f7..e46560c059 100755 --- a/resources/variants/biqu_b1_abl_0.4.inst.cfg +++ b/resources/variants/biqu/biqu_b1_abl_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = biqu_b1_abl name = 0.4mm Nozzle version = 4 -definition = biqu_b1_abl [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/biqu_b1_abl_0.5.inst.cfg b/resources/variants/biqu/biqu_b1_abl_0.5.inst.cfg similarity index 99% rename from resources/variants/biqu_b1_abl_0.5.inst.cfg rename to resources/variants/biqu/biqu_b1_abl_0.5.inst.cfg index 72ae2f5878..d114275a1e 100755 --- a/resources/variants/biqu_b1_abl_0.5.inst.cfg +++ b/resources/variants/biqu/biqu_b1_abl_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = biqu_b1_abl name = 0.5mm Nozzle version = 4 -definition = biqu_b1_abl [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/biqu_b1_abl_0.6.inst.cfg b/resources/variants/biqu/biqu_b1_abl_0.6.inst.cfg similarity index 99% rename from resources/variants/biqu_b1_abl_0.6.inst.cfg rename to resources/variants/biqu/biqu_b1_abl_0.6.inst.cfg index 3dc40ecd02..67f960aba8 100755 --- a/resources/variants/biqu_b1_abl_0.6.inst.cfg +++ b/resources/variants/biqu/biqu_b1_abl_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = biqu_b1_abl name = 0.6mm Nozzle version = 4 -definition = biqu_b1_abl [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/biqu_b1_abl_0.8.inst.cfg b/resources/variants/biqu/biqu_b1_abl_0.8.inst.cfg similarity index 99% rename from resources/variants/biqu_b1_abl_0.8.inst.cfg rename to resources/variants/biqu/biqu_b1_abl_0.8.inst.cfg index 4573e77c26..666b479145 100755 --- a/resources/variants/biqu_b1_abl_0.8.inst.cfg +++ b/resources/variants/biqu/biqu_b1_abl_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = biqu_b1_abl name = 0.8mm Nozzle version = 4 -definition = biqu_b1_abl [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/biqu_base_0.2.inst.cfg b/resources/variants/biqu/biqu_base_0.2.inst.cfg similarity index 99% rename from resources/variants/biqu_base_0.2.inst.cfg rename to resources/variants/biqu/biqu_base_0.2.inst.cfg index f35c2fbb55..ddf7a154e8 100755 --- a/resources/variants/biqu_base_0.2.inst.cfg +++ b/resources/variants/biqu/biqu_base_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = biqu_base name = 0.2mm Nozzle version = 4 -definition = biqu_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/biqu_base_0.3.inst.cfg b/resources/variants/biqu/biqu_base_0.3.inst.cfg similarity index 99% rename from resources/variants/biqu_base_0.3.inst.cfg rename to resources/variants/biqu/biqu_base_0.3.inst.cfg index 333b17cd6b..3151994259 100755 --- a/resources/variants/biqu_base_0.3.inst.cfg +++ b/resources/variants/biqu/biqu_base_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = biqu_base name = 0.3mm Nozzle version = 4 -definition = biqu_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/biqu_base_0.4.inst.cfg b/resources/variants/biqu/biqu_base_0.4.inst.cfg similarity index 99% rename from resources/variants/biqu_base_0.4.inst.cfg rename to resources/variants/biqu/biqu_base_0.4.inst.cfg index f7cacc954f..f76fd3cce2 100755 --- a/resources/variants/biqu_base_0.4.inst.cfg +++ b/resources/variants/biqu/biqu_base_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = biqu_base name = 0.4mm Nozzle version = 4 -definition = biqu_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/biqu_base_0.5.inst.cfg b/resources/variants/biqu/biqu_base_0.5.inst.cfg similarity index 99% rename from resources/variants/biqu_base_0.5.inst.cfg rename to resources/variants/biqu/biqu_base_0.5.inst.cfg index eddf72b931..1f13bc159a 100755 --- a/resources/variants/biqu_base_0.5.inst.cfg +++ b/resources/variants/biqu/biqu_base_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = biqu_base name = 0.5mm Nozzle version = 4 -definition = biqu_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/biqu_base_0.6.inst.cfg b/resources/variants/biqu/biqu_base_0.6.inst.cfg similarity index 99% rename from resources/variants/biqu_base_0.6.inst.cfg rename to resources/variants/biqu/biqu_base_0.6.inst.cfg index 56036e50bc..e393477cb8 100755 --- a/resources/variants/biqu_base_0.6.inst.cfg +++ b/resources/variants/biqu/biqu_base_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = biqu_base name = 0.6mm Nozzle version = 4 -definition = biqu_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/biqu_base_0.8.inst.cfg b/resources/variants/biqu/biqu_base_0.8.inst.cfg similarity index 99% rename from resources/variants/biqu_base_0.8.inst.cfg rename to resources/variants/biqu/biqu_base_0.8.inst.cfg index 6c450e423f..19c1b74704 100755 --- a/resources/variants/biqu_base_0.8.inst.cfg +++ b/resources/variants/biqu/biqu_base_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = biqu_base name = 0.8mm Nozzle version = 4 -definition = biqu_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/biqu_bx_abl_0.2.inst.cfg b/resources/variants/biqu/biqu_bx_abl_0.2.inst.cfg similarity index 99% rename from resources/variants/biqu_bx_abl_0.2.inst.cfg rename to resources/variants/biqu/biqu_bx_abl_0.2.inst.cfg index 24b12175ab..89cda90c34 100755 --- a/resources/variants/biqu_bx_abl_0.2.inst.cfg +++ b/resources/variants/biqu/biqu_bx_abl_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = biqu_bx_abl name = 0.2mm Nozzle version = 4 -definition = biqu_bx_abl [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/biqu_bx_abl_0.3.inst.cfg b/resources/variants/biqu/biqu_bx_abl_0.3.inst.cfg similarity index 99% rename from resources/variants/biqu_bx_abl_0.3.inst.cfg rename to resources/variants/biqu/biqu_bx_abl_0.3.inst.cfg index 257d32662c..19c5c12e06 100755 --- a/resources/variants/biqu_bx_abl_0.3.inst.cfg +++ b/resources/variants/biqu/biqu_bx_abl_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = biqu_bx_abl name = 0.3mm Nozzle version = 4 -definition = biqu_bx_abl [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/biqu_bx_abl_0.4.inst.cfg b/resources/variants/biqu/biqu_bx_abl_0.4.inst.cfg similarity index 99% rename from resources/variants/biqu_bx_abl_0.4.inst.cfg rename to resources/variants/biqu/biqu_bx_abl_0.4.inst.cfg index 32008f33f3..52e9fe7904 100755 --- a/resources/variants/biqu_bx_abl_0.4.inst.cfg +++ b/resources/variants/biqu/biqu_bx_abl_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = biqu_bx_abl name = 0.4mm Nozzle version = 4 -definition = biqu_bx_abl [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/biqu_bx_abl_0.5.inst.cfg b/resources/variants/biqu/biqu_bx_abl_0.5.inst.cfg similarity index 99% rename from resources/variants/biqu_bx_abl_0.5.inst.cfg rename to resources/variants/biqu/biqu_bx_abl_0.5.inst.cfg index e90c6bd8ea..0bb1260dc2 100755 --- a/resources/variants/biqu_bx_abl_0.5.inst.cfg +++ b/resources/variants/biqu/biqu_bx_abl_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = biqu_bx_abl name = 0.5mm Nozzle version = 4 -definition = biqu_bx_abl [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/biqu_bx_abl_0.6.inst.cfg b/resources/variants/biqu/biqu_bx_abl_0.6.inst.cfg similarity index 99% rename from resources/variants/biqu_bx_abl_0.6.inst.cfg rename to resources/variants/biqu/biqu_bx_abl_0.6.inst.cfg index 44169e7f05..af8d9bbadb 100755 --- a/resources/variants/biqu_bx_abl_0.6.inst.cfg +++ b/resources/variants/biqu/biqu_bx_abl_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = biqu_bx_abl name = 0.6mm Nozzle version = 4 -definition = biqu_bx_abl [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/biqu_bx_abl_0.8.inst.cfg b/resources/variants/biqu/biqu_bx_abl_0.8.inst.cfg similarity index 99% rename from resources/variants/biqu_bx_abl_0.8.inst.cfg rename to resources/variants/biqu/biqu_bx_abl_0.8.inst.cfg index 13c491a1ba..6fb37f698a 100755 --- a/resources/variants/biqu_bx_abl_0.8.inst.cfg +++ b/resources/variants/biqu/biqu_bx_abl_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = biqu_bx_abl name = 0.8mm Nozzle version = 4 -definition = biqu_bx_abl [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/biqu_hurakan_0.2.inst.cfg b/resources/variants/biqu/biqu_hurakan_0.2.inst.cfg similarity index 100% rename from resources/variants/biqu_hurakan_0.2.inst.cfg rename to resources/variants/biqu/biqu_hurakan_0.2.inst.cfg diff --git a/resources/variants/biqu_hurakan_0.3.inst.cfg b/resources/variants/biqu/biqu_hurakan_0.3.inst.cfg similarity index 100% rename from resources/variants/biqu_hurakan_0.3.inst.cfg rename to resources/variants/biqu/biqu_hurakan_0.3.inst.cfg diff --git a/resources/variants/biqu_hurakan_0.4.inst.cfg b/resources/variants/biqu/biqu_hurakan_0.4.inst.cfg similarity index 100% rename from resources/variants/biqu_hurakan_0.4.inst.cfg rename to resources/variants/biqu/biqu_hurakan_0.4.inst.cfg diff --git a/resources/variants/biqu_hurakan_0.5.inst.cfg b/resources/variants/biqu/biqu_hurakan_0.5.inst.cfg similarity index 100% rename from resources/variants/biqu_hurakan_0.5.inst.cfg rename to resources/variants/biqu/biqu_hurakan_0.5.inst.cfg diff --git a/resources/variants/biqu_hurakan_0.6.inst.cfg b/resources/variants/biqu/biqu_hurakan_0.6.inst.cfg similarity index 100% rename from resources/variants/biqu_hurakan_0.6.inst.cfg rename to resources/variants/biqu/biqu_hurakan_0.6.inst.cfg diff --git a/resources/variants/biqu_hurakan_0.8.inst.cfg b/resources/variants/biqu/biqu_hurakan_0.8.inst.cfg similarity index 100% rename from resources/variants/biqu_hurakan_0.8.inst.cfg rename to resources/variants/biqu/biqu_hurakan_0.8.inst.cfg diff --git a/resources/variants/blocks/blocks_mkii_0.20.inst.cfg b/resources/variants/blocks/blocks_mkii_0.20.inst.cfg new file mode 100644 index 0000000000..ca0eb52c03 --- /dev/null +++ b/resources/variants/blocks/blocks_mkii_0.20.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_mkii +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/blocks/blocks_mkii_0.30.inst.cfg b/resources/variants/blocks/blocks_mkii_0.30.inst.cfg new file mode 100644 index 0000000000..362ffc27b8 --- /dev/null +++ b/resources/variants/blocks/blocks_mkii_0.30.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_mkii +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/blocks/blocks_mkii_0.40.inst.cfg b/resources/variants/blocks/blocks_mkii_0.40.inst.cfg new file mode 100644 index 0000000000..92ba3f7507 --- /dev/null +++ b/resources/variants/blocks/blocks_mkii_0.40.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_mkii +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/blocks/blocks_mkii_0.50.inst.cfg b/resources/variants/blocks/blocks_mkii_0.50.inst.cfg new file mode 100644 index 0000000000..a1f11c2032 --- /dev/null +++ b/resources/variants/blocks/blocks_mkii_0.50.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_mkii +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/blocks/blocks_mkii_0.60.inst.cfg b/resources/variants/blocks/blocks_mkii_0.60.inst.cfg new file mode 100644 index 0000000000..722f3aa144 --- /dev/null +++ b/resources/variants/blocks/blocks_mkii_0.60.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_mkii +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/blocks/blocks_mkii_0.80.inst.cfg b/resources/variants/blocks/blocks_mkii_0.80.inst.cfg new file mode 100644 index 0000000000..91c5551104 --- /dev/null +++ b/resources/variants/blocks/blocks_mkii_0.80.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_mkii +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/blocks/blocks_one_0.20.inst.cfg b/resources/variants/blocks/blocks_one_0.20.inst.cfg new file mode 100644 index 0000000000..ec07082b68 --- /dev/null +++ b/resources/variants/blocks/blocks_one_0.20.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_one +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/blocks/blocks_one_0.30.inst.cfg b/resources/variants/blocks/blocks_one_0.30.inst.cfg new file mode 100644 index 0000000000..af95a7029a --- /dev/null +++ b/resources/variants/blocks/blocks_one_0.30.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_one +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/blocks/blocks_one_0.40.inst.cfg b/resources/variants/blocks/blocks_one_0.40.inst.cfg new file mode 100644 index 0000000000..520e784411 --- /dev/null +++ b/resources/variants/blocks/blocks_one_0.40.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_one +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/blocks/blocks_one_0.50.inst.cfg b/resources/variants/blocks/blocks_one_0.50.inst.cfg new file mode 100644 index 0000000000..10b33b8a24 --- /dev/null +++ b/resources/variants/blocks/blocks_one_0.50.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_one +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/blocks/blocks_one_0.60.inst.cfg b/resources/variants/blocks/blocks_one_0.60.inst.cfg new file mode 100644 index 0000000000..42c7263146 --- /dev/null +++ b/resources/variants/blocks/blocks_one_0.60.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_one +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/blocks/blocks_one_0.80.inst.cfg b/resources/variants/blocks/blocks_one_0.80.inst.cfg new file mode 100644 index 0000000000..b360bfd31e --- /dev/null +++ b/resources/variants/blocks/blocks_one_0.80.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_one +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/blocks/blocks_pros100_0.40.inst.cfg b/resources/variants/blocks/blocks_pros100_0.40.inst.cfg new file mode 100644 index 0000000000..065dc44f09 --- /dev/null +++ b/resources/variants/blocks/blocks_pros100_0.40.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_pros100 +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/blocks/blocks_pros100_0.50.inst.cfg b/resources/variants/blocks/blocks_pros100_0.50.inst.cfg new file mode 100644 index 0000000000..9df6397bb9 --- /dev/null +++ b/resources/variants/blocks/blocks_pros100_0.50.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_pros100 +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/blocks/blocks_pros100_0.60.inst.cfg b/resources/variants/blocks/blocks_pros100_0.60.inst.cfg new file mode 100644 index 0000000000..db9a0966f9 --- /dev/null +++ b/resources/variants/blocks/blocks_pros100_0.60.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_pros100 +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/blocks/blocks_pros100_0.80.inst.cfg b/resources/variants/blocks/blocks_pros100_0.80.inst.cfg new file mode 100644 index 0000000000..74d502189a --- /dev/null +++ b/resources/variants/blocks/blocks_pros100_0.80.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_pros100 +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/blocks/blocks_pros100_1.0.inst.cfg b/resources/variants/blocks/blocks_pros100_1.0.inst.cfg new file mode 100644 index 0000000000..6185766f93 --- /dev/null +++ b/resources/variants/blocks/blocks_pros100_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_pros100 +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/blocks/blocks_pros100_1.2.inst.cfg b/resources/variants/blocks/blocks_pros100_1.2.inst.cfg new file mode 100644 index 0000000000..1b37365d67 --- /dev/null +++ b/resources/variants/blocks/blocks_pros100_1.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_pros100 +name = 1.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.2 + diff --git a/resources/variants/blocks/blocks_pros30_0.40.inst.cfg b/resources/variants/blocks/blocks_pros30_0.40.inst.cfg new file mode 100644 index 0000000000..3d9606465c --- /dev/null +++ b/resources/variants/blocks/blocks_pros30_0.40.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_pros30 +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/blocks/blocks_pros30_0.50.inst.cfg b/resources/variants/blocks/blocks_pros30_0.50.inst.cfg new file mode 100644 index 0000000000..b124864195 --- /dev/null +++ b/resources/variants/blocks/blocks_pros30_0.50.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_pros30 +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/blocks/blocks_pros30_0.60.inst.cfg b/resources/variants/blocks/blocks_pros30_0.60.inst.cfg new file mode 100644 index 0000000000..f705dad66c --- /dev/null +++ b/resources/variants/blocks/blocks_pros30_0.60.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_pros30 +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/blocks/blocks_pros30_0.80.inst.cfg b/resources/variants/blocks/blocks_pros30_0.80.inst.cfg new file mode 100644 index 0000000000..f3e408b614 --- /dev/null +++ b/resources/variants/blocks/blocks_pros30_0.80.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_pros30 +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/blocks/blocks_pros30_1.0.inst.cfg b/resources/variants/blocks/blocks_pros30_1.0.inst.cfg new file mode 100644 index 0000000000..9718a2693a --- /dev/null +++ b/resources/variants/blocks/blocks_pros30_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_pros30 +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/blocks/blocks_pros30_1.2.inst.cfg b/resources/variants/blocks/blocks_pros30_1.2.inst.cfg new file mode 100644 index 0000000000..1b2673301d --- /dev/null +++ b/resources/variants/blocks/blocks_pros30_1.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_pros30 +name = 1.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.2 + diff --git a/resources/variants/blocks/blocks_r21_ht_0.3.inst.cfg b/resources/variants/blocks/blocks_r21_ht_0.3.inst.cfg new file mode 100644 index 0000000000..4756792236 --- /dev/null +++ b/resources/variants/blocks/blocks_r21_ht_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_r21 +name = HT - 0.3mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/blocks/blocks_r21_ht_0.4.inst.cfg b/resources/variants/blocks/blocks_r21_ht_0.4.inst.cfg new file mode 100644 index 0000000000..3cd60bf11e --- /dev/null +++ b/resources/variants/blocks/blocks_r21_ht_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_r21 +name = HT - 0.4mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/blocks/blocks_r21_ht_0.5.inst.cfg b/resources/variants/blocks/blocks_r21_ht_0.5.inst.cfg new file mode 100644 index 0000000000..1b00bb2a96 --- /dev/null +++ b/resources/variants/blocks/blocks_r21_ht_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_r21 +name = HT - 0.5mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/blocks/blocks_r21_ht_0.6.inst.cfg b/resources/variants/blocks/blocks_r21_ht_0.6.inst.cfg new file mode 100644 index 0000000000..aef77f06e0 --- /dev/null +++ b/resources/variants/blocks/blocks_r21_ht_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_r21 +name = HT - 0.6mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/blocks/blocks_r21_ht_0.8.inst.cfg b/resources/variants/blocks/blocks_r21_ht_0.8.inst.cfg new file mode 100644 index 0000000000..f795d72be9 --- /dev/null +++ b/resources/variants/blocks/blocks_r21_ht_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_r21 +name = HT - 0.8mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/blocks/blocks_r21_st_0.20.inst.cfg b/resources/variants/blocks/blocks_r21_st_0.20.inst.cfg new file mode 100644 index 0000000000..1614ca9d28 --- /dev/null +++ b/resources/variants/blocks/blocks_r21_st_0.20.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_r21 +name = ST - 0.2mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/blocks/blocks_r21_st_0.30.inst.cfg b/resources/variants/blocks/blocks_r21_st_0.30.inst.cfg new file mode 100644 index 0000000000..e3e70bf0d1 --- /dev/null +++ b/resources/variants/blocks/blocks_r21_st_0.30.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_r21 +name = ST - 0.3mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/blocks/blocks_r21_st_0.40.inst.cfg b/resources/variants/blocks/blocks_r21_st_0.40.inst.cfg new file mode 100644 index 0000000000..66fa5ba0cb --- /dev/null +++ b/resources/variants/blocks/blocks_r21_st_0.40.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_r21 +name = ST - 0.4mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/blocks/blocks_r21_st_0.50.inst.cfg b/resources/variants/blocks/blocks_r21_st_0.50.inst.cfg new file mode 100644 index 0000000000..209c684982 --- /dev/null +++ b/resources/variants/blocks/blocks_r21_st_0.50.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_r21 +name = ST - 0.5mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/blocks/blocks_r21_st_0.60.inst.cfg b/resources/variants/blocks/blocks_r21_st_0.60.inst.cfg new file mode 100644 index 0000000000..711af5aa4a --- /dev/null +++ b/resources/variants/blocks/blocks_r21_st_0.60.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_r21 +name = ST - 0.6mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/blocks/blocks_r21_st_0.80.inst.cfg b/resources/variants/blocks/blocks_r21_st_0.80.inst.cfg new file mode 100644 index 0000000000..f6eceec441 --- /dev/null +++ b/resources/variants/blocks/blocks_r21_st_0.80.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_r21 +name = ST - 0.8mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/blocks/blocks_r21_st_1.0.inst.cfg b/resources/variants/blocks/blocks_r21_st_1.0.inst.cfg new file mode 100644 index 0000000000..95460890f6 --- /dev/null +++ b/resources/variants/blocks/blocks_r21_st_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_r21 +name = ST - 1.0mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/blocks/blocks_r21_st_1.2.inst.cfg b/resources/variants/blocks/blocks_r21_st_1.2.inst.cfg new file mode 100644 index 0000000000..f3488b0b98 --- /dev/null +++ b/resources/variants/blocks/blocks_r21_st_1.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_r21 +name = ST - 1.2mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.20 + diff --git a/resources/variants/blocks/blocks_rd50_ht_0.3.inst.cfg b/resources/variants/blocks/blocks_rd50_ht_0.3.inst.cfg new file mode 100644 index 0000000000..939d0d2444 --- /dev/null +++ b/resources/variants/blocks/blocks_rd50_ht_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50 +name = HT - 0.3mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/blocks/blocks_rd50_ht_0.4.inst.cfg b/resources/variants/blocks/blocks_rd50_ht_0.4.inst.cfg new file mode 100644 index 0000000000..85687531eb --- /dev/null +++ b/resources/variants/blocks/blocks_rd50_ht_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50 +name = HT - 0.4mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/blocks/blocks_rd50_ht_0.5.inst.cfg b/resources/variants/blocks/blocks_rd50_ht_0.5.inst.cfg new file mode 100644 index 0000000000..f0690f613a --- /dev/null +++ b/resources/variants/blocks/blocks_rd50_ht_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50 +name = HT - 0.5mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/blocks/blocks_rd50_ht_0.6.inst.cfg b/resources/variants/blocks/blocks_rd50_ht_0.6.inst.cfg new file mode 100644 index 0000000000..485086680b --- /dev/null +++ b/resources/variants/blocks/blocks_rd50_ht_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50 +name = HT - 0.6mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/blocks/blocks_rd50_ht_0.8.inst.cfg b/resources/variants/blocks/blocks_rd50_ht_0.8.inst.cfg new file mode 100644 index 0000000000..5242cd5563 --- /dev/null +++ b/resources/variants/blocks/blocks_rd50_ht_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50 +name = HT - 0.8mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/blocks/blocks_rd50_st_0.20.inst.cfg b/resources/variants/blocks/blocks_rd50_st_0.20.inst.cfg new file mode 100644 index 0000000000..1e372e964e --- /dev/null +++ b/resources/variants/blocks/blocks_rd50_st_0.20.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50 +name = ST - 0.2mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/blocks/blocks_rd50_st_0.30.inst.cfg b/resources/variants/blocks/blocks_rd50_st_0.30.inst.cfg new file mode 100644 index 0000000000..c4ec0a3147 --- /dev/null +++ b/resources/variants/blocks/blocks_rd50_st_0.30.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50 +name = ST - 0.3mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/blocks/blocks_rd50_st_0.40.inst.cfg b/resources/variants/blocks/blocks_rd50_st_0.40.inst.cfg new file mode 100644 index 0000000000..e3f983411d --- /dev/null +++ b/resources/variants/blocks/blocks_rd50_st_0.40.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50 +name = ST - 0.4mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/blocks/blocks_rd50_st_0.50.inst.cfg b/resources/variants/blocks/blocks_rd50_st_0.50.inst.cfg new file mode 100644 index 0000000000..8aea07b060 --- /dev/null +++ b/resources/variants/blocks/blocks_rd50_st_0.50.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50 +name = ST - 0.5mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/blocks/blocks_rd50_st_0.60.inst.cfg b/resources/variants/blocks/blocks_rd50_st_0.60.inst.cfg new file mode 100644 index 0000000000..34b0231f54 --- /dev/null +++ b/resources/variants/blocks/blocks_rd50_st_0.60.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50 +name = ST - 0.6mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/blocks/blocks_rd50_st_0.80.inst.cfg b/resources/variants/blocks/blocks_rd50_st_0.80.inst.cfg new file mode 100644 index 0000000000..dac9b072ca --- /dev/null +++ b/resources/variants/blocks/blocks_rd50_st_0.80.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50 +name = ST - 0.8mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/blocks/blocks_rd50_st_1.0.inst.cfg b/resources/variants/blocks/blocks_rd50_st_1.0.inst.cfg new file mode 100644 index 0000000000..32d49cc6df --- /dev/null +++ b/resources/variants/blocks/blocks_rd50_st_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50 +name = ST - 1.0mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/blocks/blocks_rd50_st_1.2.inst.cfg b/resources/variants/blocks/blocks_rd50_st_1.2.inst.cfg new file mode 100644 index 0000000000..e1c4290f27 --- /dev/null +++ b/resources/variants/blocks/blocks_rd50_st_1.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50 +name = ST - 1.2mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.20 + diff --git a/resources/variants/blocks/blocks_rd50duplicate_ht_0.3.inst.cfg b/resources/variants/blocks/blocks_rd50duplicate_ht_0.3.inst.cfg new file mode 100644 index 0000000000..fa4c424345 --- /dev/null +++ b/resources/variants/blocks/blocks_rd50duplicate_ht_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50duplicate +name = HT - 0.3mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/blocks/blocks_rd50duplicate_ht_0.4.inst.cfg b/resources/variants/blocks/blocks_rd50duplicate_ht_0.4.inst.cfg new file mode 100644 index 0000000000..476d53c555 --- /dev/null +++ b/resources/variants/blocks/blocks_rd50duplicate_ht_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50duplicate +name = HT - 0.4mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/blocks/blocks_rd50duplicate_ht_0.5.inst.cfg b/resources/variants/blocks/blocks_rd50duplicate_ht_0.5.inst.cfg new file mode 100644 index 0000000000..86324e1f67 --- /dev/null +++ b/resources/variants/blocks/blocks_rd50duplicate_ht_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50duplicate +name = HT - 0.5mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/blocks/blocks_rd50duplicate_ht_0.6.inst.cfg b/resources/variants/blocks/blocks_rd50duplicate_ht_0.6.inst.cfg new file mode 100644 index 0000000000..7fc289f445 --- /dev/null +++ b/resources/variants/blocks/blocks_rd50duplicate_ht_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50duplicate +name = HT - 0.6mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/blocks/blocks_rd50duplicate_ht_0.8.inst.cfg b/resources/variants/blocks/blocks_rd50duplicate_ht_0.8.inst.cfg new file mode 100644 index 0000000000..6311c06b4d --- /dev/null +++ b/resources/variants/blocks/blocks_rd50duplicate_ht_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50duplicate +name = HT - 0.8mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/blocks/blocks_rd50duplicate_st_0.20.inst.cfg b/resources/variants/blocks/blocks_rd50duplicate_st_0.20.inst.cfg new file mode 100644 index 0000000000..522891b82f --- /dev/null +++ b/resources/variants/blocks/blocks_rd50duplicate_st_0.20.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50duplicate +name = ST - 0.2mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/blocks/blocks_rd50duplicate_st_0.30.inst.cfg b/resources/variants/blocks/blocks_rd50duplicate_st_0.30.inst.cfg new file mode 100644 index 0000000000..b52353084f --- /dev/null +++ b/resources/variants/blocks/blocks_rd50duplicate_st_0.30.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50duplicate +name = ST - 0.3mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/blocks/blocks_rd50duplicate_st_0.40.inst.cfg b/resources/variants/blocks/blocks_rd50duplicate_st_0.40.inst.cfg new file mode 100644 index 0000000000..149e9d2528 --- /dev/null +++ b/resources/variants/blocks/blocks_rd50duplicate_st_0.40.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50duplicate +name = ST - 0.4mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/blocks/blocks_rd50duplicate_st_0.50.inst.cfg b/resources/variants/blocks/blocks_rd50duplicate_st_0.50.inst.cfg new file mode 100644 index 0000000000..a98e14bf1e --- /dev/null +++ b/resources/variants/blocks/blocks_rd50duplicate_st_0.50.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50duplicate +name = ST - 0.5mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/blocks/blocks_rd50duplicate_st_0.60.inst.cfg b/resources/variants/blocks/blocks_rd50duplicate_st_0.60.inst.cfg new file mode 100644 index 0000000000..a5ad088795 --- /dev/null +++ b/resources/variants/blocks/blocks_rd50duplicate_st_0.60.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50duplicate +name = ST - 0.6mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/blocks/blocks_rd50duplicate_st_0.80.inst.cfg b/resources/variants/blocks/blocks_rd50duplicate_st_0.80.inst.cfg new file mode 100644 index 0000000000..dc72bfa5bc --- /dev/null +++ b/resources/variants/blocks/blocks_rd50duplicate_st_0.80.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50duplicate +name = ST - 0.8mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/blocks/blocks_rd50duplicate_st_1.0.inst.cfg b/resources/variants/blocks/blocks_rd50duplicate_st_1.0.inst.cfg new file mode 100644 index 0000000000..49b2eb8219 --- /dev/null +++ b/resources/variants/blocks/blocks_rd50duplicate_st_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50duplicate +name = ST - 1.0mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/blocks/blocks_rd50duplicate_st_1.2.inst.cfg b/resources/variants/blocks/blocks_rd50duplicate_st_1.2.inst.cfg new file mode 100644 index 0000000000..3f0af5268d --- /dev/null +++ b/resources/variants/blocks/blocks_rd50duplicate_st_1.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50duplicate +name = ST - 1.2mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.20 + diff --git a/resources/variants/blocks/blocks_rd50mirror_ht_0.3.inst.cfg b/resources/variants/blocks/blocks_rd50mirror_ht_0.3.inst.cfg new file mode 100644 index 0000000000..815f7f81d1 --- /dev/null +++ b/resources/variants/blocks/blocks_rd50mirror_ht_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50mirror +name = HT - 0.3mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/blocks/blocks_rd50mirror_ht_0.4.inst.cfg b/resources/variants/blocks/blocks_rd50mirror_ht_0.4.inst.cfg new file mode 100644 index 0000000000..1f651a94dd --- /dev/null +++ b/resources/variants/blocks/blocks_rd50mirror_ht_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50mirror +name = HT - 0.4mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/blocks/blocks_rd50mirror_ht_0.5.inst.cfg b/resources/variants/blocks/blocks_rd50mirror_ht_0.5.inst.cfg new file mode 100644 index 0000000000..e3ab7f107d --- /dev/null +++ b/resources/variants/blocks/blocks_rd50mirror_ht_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50mirror +name = HT - 0.5mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/blocks/blocks_rd50mirror_ht_0.6.inst.cfg b/resources/variants/blocks/blocks_rd50mirror_ht_0.6.inst.cfg new file mode 100644 index 0000000000..46733866a7 --- /dev/null +++ b/resources/variants/blocks/blocks_rd50mirror_ht_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50mirror +name = HT - 0.6mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/blocks/blocks_rd50mirror_ht_0.8.inst.cfg b/resources/variants/blocks/blocks_rd50mirror_ht_0.8.inst.cfg new file mode 100644 index 0000000000..820a854351 --- /dev/null +++ b/resources/variants/blocks/blocks_rd50mirror_ht_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50mirror +name = HT - 0.8mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/blocks/blocks_rd50mirror_st_0.20.inst.cfg b/resources/variants/blocks/blocks_rd50mirror_st_0.20.inst.cfg new file mode 100644 index 0000000000..ee0c348236 --- /dev/null +++ b/resources/variants/blocks/blocks_rd50mirror_st_0.20.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50mirror +name = ST - 0.2mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/blocks/blocks_rd50mirror_st_0.30.inst.cfg b/resources/variants/blocks/blocks_rd50mirror_st_0.30.inst.cfg new file mode 100644 index 0000000000..640dff17a6 --- /dev/null +++ b/resources/variants/blocks/blocks_rd50mirror_st_0.30.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50mirror +name = ST - 0.3mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/blocks/blocks_rd50mirror_st_0.40.inst.cfg b/resources/variants/blocks/blocks_rd50mirror_st_0.40.inst.cfg new file mode 100644 index 0000000000..80fa3a282e --- /dev/null +++ b/resources/variants/blocks/blocks_rd50mirror_st_0.40.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50mirror +name = ST - 0.4mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/blocks/blocks_rd50mirror_st_0.50.inst.cfg b/resources/variants/blocks/blocks_rd50mirror_st_0.50.inst.cfg new file mode 100644 index 0000000000..012d378bed --- /dev/null +++ b/resources/variants/blocks/blocks_rd50mirror_st_0.50.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50mirror +name = ST - 0.5mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/blocks/blocks_rd50mirror_st_0.60.inst.cfg b/resources/variants/blocks/blocks_rd50mirror_st_0.60.inst.cfg new file mode 100644 index 0000000000..d4df1f1659 --- /dev/null +++ b/resources/variants/blocks/blocks_rd50mirror_st_0.60.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50mirror +name = ST - 0.6mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/blocks/blocks_rd50mirror_st_0.80.inst.cfg b/resources/variants/blocks/blocks_rd50mirror_st_0.80.inst.cfg new file mode 100644 index 0000000000..f1b525d16e --- /dev/null +++ b/resources/variants/blocks/blocks_rd50mirror_st_0.80.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50mirror +name = ST - 0.8mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/blocks/blocks_rd50mirror_st_1.0.inst.cfg b/resources/variants/blocks/blocks_rd50mirror_st_1.0.inst.cfg new file mode 100644 index 0000000000..3f06995fcb --- /dev/null +++ b/resources/variants/blocks/blocks_rd50mirror_st_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50mirror +name = ST - 1.0mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/blocks/blocks_rd50mirror_st_1.2.inst.cfg b/resources/variants/blocks/blocks_rd50mirror_st_1.2.inst.cfg new file mode 100644 index 0000000000..e1c4290f27 --- /dev/null +++ b/resources/variants/blocks/blocks_rd50mirror_st_1.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_rd50 +name = ST - 1.2mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.20 + diff --git a/resources/variants/blocks/blocks_zero_0.20.inst.cfg b/resources/variants/blocks/blocks_zero_0.20.inst.cfg new file mode 100644 index 0000000000..2c0d41b2a5 --- /dev/null +++ b/resources/variants/blocks/blocks_zero_0.20.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_zero +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/blocks/blocks_zero_0.30.inst.cfg b/resources/variants/blocks/blocks_zero_0.30.inst.cfg new file mode 100644 index 0000000000..b7466a324e --- /dev/null +++ b/resources/variants/blocks/blocks_zero_0.30.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_zero +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/blocks/blocks_zero_0.40.inst.cfg b/resources/variants/blocks/blocks_zero_0.40.inst.cfg new file mode 100644 index 0000000000..a2931960c8 --- /dev/null +++ b/resources/variants/blocks/blocks_zero_0.40.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_zero +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/blocks/blocks_zero_0.50.inst.cfg b/resources/variants/blocks/blocks_zero_0.50.inst.cfg new file mode 100644 index 0000000000..213c54fa29 --- /dev/null +++ b/resources/variants/blocks/blocks_zero_0.50.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_zero +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/blocks/blocks_zero_0.60.inst.cfg b/resources/variants/blocks/blocks_zero_0.60.inst.cfg new file mode 100644 index 0000000000..b2d5b98648 --- /dev/null +++ b/resources/variants/blocks/blocks_zero_0.60.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_zero +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/blocks/blocks_zero_0.80.inst.cfg b/resources/variants/blocks/blocks_zero_0.80.inst.cfg new file mode 100644 index 0000000000..70a8b13a30 --- /dev/null +++ b/resources/variants/blocks/blocks_zero_0.80.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = blocks_zero +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/cartesio_0.25.inst.cfg b/resources/variants/cartesio/cartesio_0.25.inst.cfg similarity index 99% rename from resources/variants/cartesio_0.25.inst.cfg rename to resources/variants/cartesio/cartesio_0.25.inst.cfg index f2dc12b706..686b716b45 100644 --- a/resources/variants/cartesio_0.25.inst.cfg +++ b/resources/variants/cartesio/cartesio_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = cartesio name = 0.25mm thermoplastic extruder version = 4 -definition = cartesio [metadata] author = Cartesio +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.25 machine_nozzle_tip_outer_diameter = 1.05 + diff --git a/resources/variants/cartesio_0.4.inst.cfg b/resources/variants/cartesio/cartesio_0.4.inst.cfg similarity index 99% rename from resources/variants/cartesio_0.4.inst.cfg rename to resources/variants/cartesio/cartesio_0.4.inst.cfg index c4a4099b99..2e450e49c5 100644 --- a/resources/variants/cartesio_0.4.inst.cfg +++ b/resources/variants/cartesio/cartesio_0.4.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = cartesio name = 0.4mm thermoplastic extruder version = 4 -definition = cartesio [metadata] author = Cartesio +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 machine_nozzle_tip_outer_diameter = 0.8 + diff --git a/resources/variants/cartesio_0.8.inst.cfg b/resources/variants/cartesio/cartesio_0.8.inst.cfg similarity index 100% rename from resources/variants/cartesio_0.8.inst.cfg rename to resources/variants/cartesio/cartesio_0.8.inst.cfg index 0b1db6a711..b1b74b9fdc 100644 --- a/resources/variants/cartesio_0.8.inst.cfg +++ b/resources/variants/cartesio/cartesio_0.8.inst.cfg @@ -1,16 +1,16 @@ [general] +definition = cartesio name = 0.8mm thermoplastic extruder version = 4 -definition = cartesio [metadata] author = Cartesio +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 machine_nozzle_tip_outer_diameter = 1.05 - prime_tower_line_width = 0.69 + diff --git a/resources/variants/crazy3dprint_base_0.40.inst.cfg b/resources/variants/crazy3dprint/crazy3dprint_base_0.40.inst.cfg similarity index 99% rename from resources/variants/crazy3dprint_base_0.40.inst.cfg rename to resources/variants/crazy3dprint/crazy3dprint_base_0.40.inst.cfg index a0e1b0fd3a..3a3493d803 100644 --- a/resources/variants/crazy3dprint_base_0.40.inst.cfg +++ b/resources/variants/crazy3dprint/crazy3dprint_base_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = crazy3dprint_base name = 0.4mm Nozzle version = 4 -definition = crazy3dprint_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/crazy3dprint_cz_300_0.40.inst.cfg b/resources/variants/crazy3dprint/crazy3dprint_cz_300_0.40.inst.cfg similarity index 99% rename from resources/variants/crazy3dprint_cz_300_0.40.inst.cfg rename to resources/variants/crazy3dprint/crazy3dprint_cz_300_0.40.inst.cfg index e37a9458b4..6ccb53a010 100644 --- a/resources/variants/crazy3dprint_cz_300_0.40.inst.cfg +++ b/resources/variants/crazy3dprint/crazy3dprint_cz_300_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = crazy3dprint_cz_300 name = 0.4mm Nozzle version = 4 -definition = crazy3dprint_cz_300 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/creality_base_0.2.inst.cfg b/resources/variants/creality/creality_base_0.2.inst.cfg similarity index 99% rename from resources/variants/creality_base_0.2.inst.cfg rename to resources/variants/creality/creality_base_0.2.inst.cfg index edfe490862..5df0d42214 100644 --- a/resources/variants/creality_base_0.2.inst.cfg +++ b/resources/variants/creality/creality_base_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_base name = 0.2mm Nozzle version = 4 -definition = creality_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/creality_base_0.3.inst.cfg b/resources/variants/creality/creality_base_0.3.inst.cfg similarity index 99% rename from resources/variants/creality_base_0.3.inst.cfg rename to resources/variants/creality/creality_base_0.3.inst.cfg index a6f2aff32e..fdab5a9e53 100644 --- a/resources/variants/creality_base_0.3.inst.cfg +++ b/resources/variants/creality/creality_base_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_base name = 0.3mm Nozzle version = 4 -definition = creality_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/creality_base_0.4.inst.cfg b/resources/variants/creality/creality_base_0.4.inst.cfg similarity index 99% rename from resources/variants/creality_base_0.4.inst.cfg rename to resources/variants/creality/creality_base_0.4.inst.cfg index 94d613eec0..b8d5c85cb2 100644 --- a/resources/variants/creality_base_0.4.inst.cfg +++ b/resources/variants/creality/creality_base_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_base name = 0.4mm Nozzle version = 4 -definition = creality_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/creality_base_0.5.inst.cfg b/resources/variants/creality/creality_base_0.5.inst.cfg similarity index 99% rename from resources/variants/creality_base_0.5.inst.cfg rename to resources/variants/creality/creality_base_0.5.inst.cfg index a50e3ebb60..ba1997bc18 100644 --- a/resources/variants/creality_base_0.5.inst.cfg +++ b/resources/variants/creality/creality_base_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_base name = 0.5mm Nozzle version = 4 -definition = creality_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/creality_base_0.6.inst.cfg b/resources/variants/creality/creality_base_0.6.inst.cfg similarity index 99% rename from resources/variants/creality_base_0.6.inst.cfg rename to resources/variants/creality/creality_base_0.6.inst.cfg index 405b0eab99..a05c953e97 100644 --- a/resources/variants/creality_base_0.6.inst.cfg +++ b/resources/variants/creality/creality_base_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_base name = 0.6mm Nozzle version = 4 -definition = creality_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/creality_base_0.8.inst.cfg b/resources/variants/creality/creality_base_0.8.inst.cfg similarity index 99% rename from resources/variants/creality_base_0.8.inst.cfg rename to resources/variants/creality/creality_base_0.8.inst.cfg index 6c4a6f3664..3280ac6ed8 100644 --- a/resources/variants/creality_base_0.8.inst.cfg +++ b/resources/variants/creality/creality_base_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_base name = 0.8mm Nozzle version = 4 -definition = creality_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/creality_base_1.0.inst.cfg b/resources/variants/creality/creality_base_1.0.inst.cfg similarity index 99% rename from resources/variants/creality_base_1.0.inst.cfg rename to resources/variants/creality/creality_base_1.0.inst.cfg index ca3731e3b6..0c45c63d4f 100644 --- a/resources/variants/creality_base_1.0.inst.cfg +++ b/resources/variants/creality/creality_base_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_base name = 1.0mm Nozzle version = 4 -definition = creality_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/creality_cr100_0.4.inst.cfg b/resources/variants/creality/creality_cr100_0.4.inst.cfg similarity index 99% rename from resources/variants/creality_cr100_0.4.inst.cfg rename to resources/variants/creality/creality_cr100_0.4.inst.cfg index b6e05618cb..f399702730 100644 --- a/resources/variants/creality_cr100_0.4.inst.cfg +++ b/resources/variants/creality/creality_cr100_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr100 name = 0.4mm Nozzle version = 4 -definition = creality_cr100 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/creality_cr10_0.2.inst.cfg b/resources/variants/creality/creality_cr10_0.2.inst.cfg similarity index 99% rename from resources/variants/creality_cr10_0.2.inst.cfg rename to resources/variants/creality/creality_cr10_0.2.inst.cfg index cce2d773b5..004f5d832c 100644 --- a/resources/variants/creality_cr10_0.2.inst.cfg +++ b/resources/variants/creality/creality_cr10_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10 name = 0.2mm Nozzle version = 4 -definition = creality_cr10 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/creality_cr10_0.3.inst.cfg b/resources/variants/creality/creality_cr10_0.3.inst.cfg similarity index 99% rename from resources/variants/creality_cr10_0.3.inst.cfg rename to resources/variants/creality/creality_cr10_0.3.inst.cfg index 56dece7a38..4a5e7922d8 100644 --- a/resources/variants/creality_cr10_0.3.inst.cfg +++ b/resources/variants/creality/creality_cr10_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10 name = 0.3mm Nozzle version = 4 -definition = creality_cr10 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/creality_cr10_0.4.inst.cfg b/resources/variants/creality/creality_cr10_0.4.inst.cfg similarity index 99% rename from resources/variants/creality_cr10_0.4.inst.cfg rename to resources/variants/creality/creality_cr10_0.4.inst.cfg index a5154ab029..4bd555c0ee 100644 --- a/resources/variants/creality_cr10_0.4.inst.cfg +++ b/resources/variants/creality/creality_cr10_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10 name = 0.4mm Nozzle version = 4 -definition = creality_cr10 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/creality_cr10_0.5.inst.cfg b/resources/variants/creality/creality_cr10_0.5.inst.cfg similarity index 99% rename from resources/variants/creality_cr10_0.5.inst.cfg rename to resources/variants/creality/creality_cr10_0.5.inst.cfg index e04b23a42f..cefe1efc20 100644 --- a/resources/variants/creality_cr10_0.5.inst.cfg +++ b/resources/variants/creality/creality_cr10_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10 name = 0.5mm Nozzle version = 4 -definition = creality_cr10 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/creality_cr10_0.6.inst.cfg b/resources/variants/creality/creality_cr10_0.6.inst.cfg similarity index 99% rename from resources/variants/creality_cr10_0.6.inst.cfg rename to resources/variants/creality/creality_cr10_0.6.inst.cfg index 20795b4751..89b0a058f1 100644 --- a/resources/variants/creality_cr10_0.6.inst.cfg +++ b/resources/variants/creality/creality_cr10_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10 name = 0.6mm Nozzle version = 4 -definition = creality_cr10 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/creality_cr10_0.8.inst.cfg b/resources/variants/creality/creality_cr10_0.8.inst.cfg similarity index 99% rename from resources/variants/creality_cr10_0.8.inst.cfg rename to resources/variants/creality/creality_cr10_0.8.inst.cfg index 751956d1f5..2d55cb9497 100644 --- a/resources/variants/creality_cr10_0.8.inst.cfg +++ b/resources/variants/creality/creality_cr10_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10 name = 0.8mm Nozzle version = 4 -definition = creality_cr10 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/creality_cr10_1.0.inst.cfg b/resources/variants/creality/creality_cr10_1.0.inst.cfg similarity index 99% rename from resources/variants/creality_cr10_1.0.inst.cfg rename to resources/variants/creality/creality_cr10_1.0.inst.cfg index 40bc7edc96..e571c1fa4b 100644 --- a/resources/variants/creality_cr10_1.0.inst.cfg +++ b/resources/variants/creality/creality_cr10_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10 name = 1.0mm Nozzle version = 4 -definition = creality_cr10 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/creality_cr10max_0.2.inst.cfg b/resources/variants/creality/creality_cr10max_0.2.inst.cfg similarity index 99% rename from resources/variants/creality_cr10max_0.2.inst.cfg rename to resources/variants/creality/creality_cr10max_0.2.inst.cfg index 723227c21d..388de0323a 100644 --- a/resources/variants/creality_cr10max_0.2.inst.cfg +++ b/resources/variants/creality/creality_cr10max_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10max name = 0.2mm Nozzle version = 4 -definition = creality_cr10max [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/creality_cr10max_0.3.inst.cfg b/resources/variants/creality/creality_cr10max_0.3.inst.cfg similarity index 99% rename from resources/variants/creality_cr10max_0.3.inst.cfg rename to resources/variants/creality/creality_cr10max_0.3.inst.cfg index 43982ae85c..9227b19b22 100644 --- a/resources/variants/creality_cr10max_0.3.inst.cfg +++ b/resources/variants/creality/creality_cr10max_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10max name = 0.3mm Nozzle version = 4 -definition = creality_cr10max [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/creality_cr10max_0.4.inst.cfg b/resources/variants/creality/creality_cr10max_0.4.inst.cfg similarity index 99% rename from resources/variants/creality_cr10max_0.4.inst.cfg rename to resources/variants/creality/creality_cr10max_0.4.inst.cfg index 4ab8b1c1aa..4717052eef 100644 --- a/resources/variants/creality_cr10max_0.4.inst.cfg +++ b/resources/variants/creality/creality_cr10max_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10max name = 0.4mm Nozzle version = 4 -definition = creality_cr10max [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/creality_cr10max_0.5.inst.cfg b/resources/variants/creality/creality_cr10max_0.5.inst.cfg similarity index 99% rename from resources/variants/creality_cr10max_0.5.inst.cfg rename to resources/variants/creality/creality_cr10max_0.5.inst.cfg index a6568358f7..8f18b75f26 100644 --- a/resources/variants/creality_cr10max_0.5.inst.cfg +++ b/resources/variants/creality/creality_cr10max_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10max name = 0.5mm Nozzle version = 4 -definition = creality_cr10max [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/creality_cr10max_0.6.inst.cfg b/resources/variants/creality/creality_cr10max_0.6.inst.cfg similarity index 99% rename from resources/variants/creality_cr10max_0.6.inst.cfg rename to resources/variants/creality/creality_cr10max_0.6.inst.cfg index f9280b94ac..b93772c06e 100644 --- a/resources/variants/creality_cr10max_0.6.inst.cfg +++ b/resources/variants/creality/creality_cr10max_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10max name = 0.6mm Nozzle version = 4 -definition = creality_cr10max [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/creality_cr10max_0.8.inst.cfg b/resources/variants/creality/creality_cr10max_0.8.inst.cfg similarity index 99% rename from resources/variants/creality_cr10max_0.8.inst.cfg rename to resources/variants/creality/creality_cr10max_0.8.inst.cfg index 05ae4d4b52..8a75c7653f 100644 --- a/resources/variants/creality_cr10max_0.8.inst.cfg +++ b/resources/variants/creality/creality_cr10max_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10max name = 0.8mm Nozzle version = 4 -definition = creality_cr10max [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/creality_cr10max_1.0.inst.cfg b/resources/variants/creality/creality_cr10max_1.0.inst.cfg similarity index 99% rename from resources/variants/creality_cr10max_1.0.inst.cfg rename to resources/variants/creality/creality_cr10max_1.0.inst.cfg index 2aba2ddbf6..c70ef65159 100644 --- a/resources/variants/creality_cr10max_1.0.inst.cfg +++ b/resources/variants/creality/creality_cr10max_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10max name = 1.0mm Nozzle version = 4 -definition = creality_cr10max [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/creality_cr10mini_0.2.inst.cfg b/resources/variants/creality/creality_cr10mini_0.2.inst.cfg similarity index 99% rename from resources/variants/creality_cr10mini_0.2.inst.cfg rename to resources/variants/creality/creality_cr10mini_0.2.inst.cfg index 5bfd8ab56c..be303639f7 100644 --- a/resources/variants/creality_cr10mini_0.2.inst.cfg +++ b/resources/variants/creality/creality_cr10mini_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10mini name = 0.2mm Nozzle version = 4 -definition = creality_cr10mini [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/creality_cr10mini_0.3.inst.cfg b/resources/variants/creality/creality_cr10mini_0.3.inst.cfg similarity index 99% rename from resources/variants/creality_cr10mini_0.3.inst.cfg rename to resources/variants/creality/creality_cr10mini_0.3.inst.cfg index 0181eefbfb..8185064c28 100644 --- a/resources/variants/creality_cr10mini_0.3.inst.cfg +++ b/resources/variants/creality/creality_cr10mini_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10mini name = 0.3mm Nozzle version = 4 -definition = creality_cr10mini [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/creality_cr10mini_0.4.inst.cfg b/resources/variants/creality/creality_cr10mini_0.4.inst.cfg similarity index 99% rename from resources/variants/creality_cr10mini_0.4.inst.cfg rename to resources/variants/creality/creality_cr10mini_0.4.inst.cfg index 1db129d67a..1c70ce91f9 100644 --- a/resources/variants/creality_cr10mini_0.4.inst.cfg +++ b/resources/variants/creality/creality_cr10mini_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10mini name = 0.4mm Nozzle version = 4 -definition = creality_cr10mini [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/creality_cr10mini_0.5.inst.cfg b/resources/variants/creality/creality_cr10mini_0.5.inst.cfg similarity index 99% rename from resources/variants/creality_cr10mini_0.5.inst.cfg rename to resources/variants/creality/creality_cr10mini_0.5.inst.cfg index a5cbf67776..40c60f0f26 100644 --- a/resources/variants/creality_cr10mini_0.5.inst.cfg +++ b/resources/variants/creality/creality_cr10mini_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10mini name = 0.5mm Nozzle version = 4 -definition = creality_cr10mini [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/creality_cr10mini_0.6.inst.cfg b/resources/variants/creality/creality_cr10mini_0.6.inst.cfg similarity index 99% rename from resources/variants/creality_cr10mini_0.6.inst.cfg rename to resources/variants/creality/creality_cr10mini_0.6.inst.cfg index 0558e128e2..ffb5cae8fa 100644 --- a/resources/variants/creality_cr10mini_0.6.inst.cfg +++ b/resources/variants/creality/creality_cr10mini_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10mini name = 0.6mm Nozzle version = 4 -definition = creality_cr10mini [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/creality_cr10mini_0.8.inst.cfg b/resources/variants/creality/creality_cr10mini_0.8.inst.cfg similarity index 99% rename from resources/variants/creality_cr10mini_0.8.inst.cfg rename to resources/variants/creality/creality_cr10mini_0.8.inst.cfg index 8923889c98..b6dc02ba02 100644 --- a/resources/variants/creality_cr10mini_0.8.inst.cfg +++ b/resources/variants/creality/creality_cr10mini_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10mini name = 0.8mm Nozzle version = 4 -definition = creality_cr10mini [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/creality_cr10mini_1.0.inst.cfg b/resources/variants/creality/creality_cr10mini_1.0.inst.cfg similarity index 99% rename from resources/variants/creality_cr10mini_1.0.inst.cfg rename to resources/variants/creality/creality_cr10mini_1.0.inst.cfg index 1dbe2e0789..79577459b0 100644 --- a/resources/variants/creality_cr10mini_1.0.inst.cfg +++ b/resources/variants/creality/creality_cr10mini_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10mini name = 1.0mm Nozzle version = 4 -definition = creality_cr10mini [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/creality_cr10s4_0.2.inst.cfg b/resources/variants/creality/creality_cr10s4_0.2.inst.cfg similarity index 99% rename from resources/variants/creality_cr10s4_0.2.inst.cfg rename to resources/variants/creality/creality_cr10s4_0.2.inst.cfg index 0a4433cb59..edf97d14d7 100644 --- a/resources/variants/creality_cr10s4_0.2.inst.cfg +++ b/resources/variants/creality/creality_cr10s4_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10s4 name = 0.2mm Nozzle version = 4 -definition = creality_cr10s4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/creality_cr10s4_0.3.inst.cfg b/resources/variants/creality/creality_cr10s4_0.3.inst.cfg similarity index 99% rename from resources/variants/creality_cr10s4_0.3.inst.cfg rename to resources/variants/creality/creality_cr10s4_0.3.inst.cfg index a673180752..abd099547a 100644 --- a/resources/variants/creality_cr10s4_0.3.inst.cfg +++ b/resources/variants/creality/creality_cr10s4_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10s4 name = 0.3mm Nozzle version = 4 -definition = creality_cr10s4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/creality_cr10s4_0.4.inst.cfg b/resources/variants/creality/creality_cr10s4_0.4.inst.cfg similarity index 99% rename from resources/variants/creality_cr10s4_0.4.inst.cfg rename to resources/variants/creality/creality_cr10s4_0.4.inst.cfg index f34202a2b5..13f3a20121 100644 --- a/resources/variants/creality_cr10s4_0.4.inst.cfg +++ b/resources/variants/creality/creality_cr10s4_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10s4 name = 0.4mm Nozzle version = 4 -definition = creality_cr10s4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/creality_cr10s4_0.5.inst.cfg b/resources/variants/creality/creality_cr10s4_0.5.inst.cfg similarity index 99% rename from resources/variants/creality_cr10s4_0.5.inst.cfg rename to resources/variants/creality/creality_cr10s4_0.5.inst.cfg index e7bc7f1799..0d14d0c5a4 100644 --- a/resources/variants/creality_cr10s4_0.5.inst.cfg +++ b/resources/variants/creality/creality_cr10s4_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10s4 name = 0.5mm Nozzle version = 4 -definition = creality_cr10s4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/creality_cr10s4_0.6.inst.cfg b/resources/variants/creality/creality_cr10s4_0.6.inst.cfg similarity index 99% rename from resources/variants/creality_cr10s4_0.6.inst.cfg rename to resources/variants/creality/creality_cr10s4_0.6.inst.cfg index e7f7f30283..1b13f73086 100644 --- a/resources/variants/creality_cr10s4_0.6.inst.cfg +++ b/resources/variants/creality/creality_cr10s4_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10s4 name = 0.6mm Nozzle version = 4 -definition = creality_cr10s4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/creality_cr10s4_0.8.inst.cfg b/resources/variants/creality/creality_cr10s4_0.8.inst.cfg similarity index 99% rename from resources/variants/creality_cr10s4_0.8.inst.cfg rename to resources/variants/creality/creality_cr10s4_0.8.inst.cfg index 8b4cef0a7f..fa07d14603 100644 --- a/resources/variants/creality_cr10s4_0.8.inst.cfg +++ b/resources/variants/creality/creality_cr10s4_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10s4 name = 0.8mm Nozzle version = 4 -definition = creality_cr10s4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/creality_cr10s4_1.0.inst.cfg b/resources/variants/creality/creality_cr10s4_1.0.inst.cfg similarity index 99% rename from resources/variants/creality_cr10s4_1.0.inst.cfg rename to resources/variants/creality/creality_cr10s4_1.0.inst.cfg index 17db567c62..00b4585d1e 100644 --- a/resources/variants/creality_cr10s4_1.0.inst.cfg +++ b/resources/variants/creality/creality_cr10s4_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10s4 name = 1.0mm Nozzle version = 4 -definition = creality_cr10s4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/creality_cr10s5_0.2.inst.cfg b/resources/variants/creality/creality_cr10s5_0.2.inst.cfg similarity index 99% rename from resources/variants/creality_cr10s5_0.2.inst.cfg rename to resources/variants/creality/creality_cr10s5_0.2.inst.cfg index 67d3c1f260..ea063dede1 100644 --- a/resources/variants/creality_cr10s5_0.2.inst.cfg +++ b/resources/variants/creality/creality_cr10s5_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10s5 name = 0.2mm Nozzle version = 4 -definition = creality_cr10s5 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/creality_cr10s5_0.3.inst.cfg b/resources/variants/creality/creality_cr10s5_0.3.inst.cfg similarity index 99% rename from resources/variants/creality_cr10s5_0.3.inst.cfg rename to resources/variants/creality/creality_cr10s5_0.3.inst.cfg index 301b885de1..859595d099 100644 --- a/resources/variants/creality_cr10s5_0.3.inst.cfg +++ b/resources/variants/creality/creality_cr10s5_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10s5 name = 0.3mm Nozzle version = 4 -definition = creality_cr10s5 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/creality_cr10s5_0.4.inst.cfg b/resources/variants/creality/creality_cr10s5_0.4.inst.cfg similarity index 99% rename from resources/variants/creality_cr10s5_0.4.inst.cfg rename to resources/variants/creality/creality_cr10s5_0.4.inst.cfg index bc62ba237a..2ef873a461 100644 --- a/resources/variants/creality_cr10s5_0.4.inst.cfg +++ b/resources/variants/creality/creality_cr10s5_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10s5 name = 0.4mm Nozzle version = 4 -definition = creality_cr10s5 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/creality_cr10s5_0.5.inst.cfg b/resources/variants/creality/creality_cr10s5_0.5.inst.cfg similarity index 99% rename from resources/variants/creality_cr10s5_0.5.inst.cfg rename to resources/variants/creality/creality_cr10s5_0.5.inst.cfg index 6079c70efa..5569dc7171 100644 --- a/resources/variants/creality_cr10s5_0.5.inst.cfg +++ b/resources/variants/creality/creality_cr10s5_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10s5 name = 0.5mm Nozzle version = 4 -definition = creality_cr10s5 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/creality_cr10s5_0.6.inst.cfg b/resources/variants/creality/creality_cr10s5_0.6.inst.cfg similarity index 99% rename from resources/variants/creality_cr10s5_0.6.inst.cfg rename to resources/variants/creality/creality_cr10s5_0.6.inst.cfg index 09309112a9..a3ecf54959 100644 --- a/resources/variants/creality_cr10s5_0.6.inst.cfg +++ b/resources/variants/creality/creality_cr10s5_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10s5 name = 0.6mm Nozzle version = 4 -definition = creality_cr10s5 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/creality_cr10s5_0.8.inst.cfg b/resources/variants/creality/creality_cr10s5_0.8.inst.cfg similarity index 99% rename from resources/variants/creality_cr10s5_0.8.inst.cfg rename to resources/variants/creality/creality_cr10s5_0.8.inst.cfg index 4875a0ebad..3e0d1ba1d9 100644 --- a/resources/variants/creality_cr10s5_0.8.inst.cfg +++ b/resources/variants/creality/creality_cr10s5_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10s5 name = 0.8mm Nozzle version = 4 -definition = creality_cr10s5 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/creality_cr10s5_1.0.inst.cfg b/resources/variants/creality/creality_cr10s5_1.0.inst.cfg similarity index 99% rename from resources/variants/creality_cr10s5_1.0.inst.cfg rename to resources/variants/creality/creality_cr10s5_1.0.inst.cfg index 440642e968..c439c9a689 100644 --- a/resources/variants/creality_cr10s5_1.0.inst.cfg +++ b/resources/variants/creality/creality_cr10s5_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10s5 name = 1.0mm Nozzle version = 4 -definition = creality_cr10s5 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/creality_cr10s_0.2.inst.cfg b/resources/variants/creality/creality_cr10s_0.2.inst.cfg similarity index 99% rename from resources/variants/creality_cr10s_0.2.inst.cfg rename to resources/variants/creality/creality_cr10s_0.2.inst.cfg index d8a7a6076b..24de48d4b0 100644 --- a/resources/variants/creality_cr10s_0.2.inst.cfg +++ b/resources/variants/creality/creality_cr10s_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10s name = 0.2mm Nozzle version = 4 -definition = creality_cr10s [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/creality_cr10s_0.3.inst.cfg b/resources/variants/creality/creality_cr10s_0.3.inst.cfg similarity index 99% rename from resources/variants/creality_cr10s_0.3.inst.cfg rename to resources/variants/creality/creality_cr10s_0.3.inst.cfg index e7a3989905..282a248ad1 100644 --- a/resources/variants/creality_cr10s_0.3.inst.cfg +++ b/resources/variants/creality/creality_cr10s_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10s name = 0.3mm Nozzle version = 4 -definition = creality_cr10s [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/creality_cr10s_0.4.inst.cfg b/resources/variants/creality/creality_cr10s_0.4.inst.cfg similarity index 99% rename from resources/variants/creality_cr10s_0.4.inst.cfg rename to resources/variants/creality/creality_cr10s_0.4.inst.cfg index f1a5f5c36b..03ac5c5015 100644 --- a/resources/variants/creality_cr10s_0.4.inst.cfg +++ b/resources/variants/creality/creality_cr10s_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10s name = 0.4mm Nozzle version = 4 -definition = creality_cr10s [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/creality_cr10s_0.5.inst.cfg b/resources/variants/creality/creality_cr10s_0.5.inst.cfg similarity index 99% rename from resources/variants/creality_cr10s_0.5.inst.cfg rename to resources/variants/creality/creality_cr10s_0.5.inst.cfg index a920286579..8b14b8ed2c 100644 --- a/resources/variants/creality_cr10s_0.5.inst.cfg +++ b/resources/variants/creality/creality_cr10s_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10s name = 0.5mm Nozzle version = 4 -definition = creality_cr10s [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/creality_cr10s_0.6.inst.cfg b/resources/variants/creality/creality_cr10s_0.6.inst.cfg similarity index 99% rename from resources/variants/creality_cr10s_0.6.inst.cfg rename to resources/variants/creality/creality_cr10s_0.6.inst.cfg index b29151160a..53773af57a 100644 --- a/resources/variants/creality_cr10s_0.6.inst.cfg +++ b/resources/variants/creality/creality_cr10s_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10s name = 0.6mm Nozzle version = 4 -definition = creality_cr10s [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/creality_cr10s_0.8.inst.cfg b/resources/variants/creality/creality_cr10s_0.8.inst.cfg similarity index 99% rename from resources/variants/creality_cr10s_0.8.inst.cfg rename to resources/variants/creality/creality_cr10s_0.8.inst.cfg index 454aea7977..2e78160f35 100644 --- a/resources/variants/creality_cr10s_0.8.inst.cfg +++ b/resources/variants/creality/creality_cr10s_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10s name = 0.8mm Nozzle version = 4 -definition = creality_cr10s [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/creality_cr10s_1.0.inst.cfg b/resources/variants/creality/creality_cr10s_1.0.inst.cfg similarity index 99% rename from resources/variants/creality_cr10s_1.0.inst.cfg rename to resources/variants/creality/creality_cr10s_1.0.inst.cfg index 0cd1fede49..584e44eb40 100644 --- a/resources/variants/creality_cr10s_1.0.inst.cfg +++ b/resources/variants/creality/creality_cr10s_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10s name = 1.0mm Nozzle version = 4 -definition = creality_cr10s [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/creality_cr10smart_0.2.inst.cfg b/resources/variants/creality/creality_cr10smart_0.2.inst.cfg similarity index 100% rename from resources/variants/creality_cr10smart_0.2.inst.cfg rename to resources/variants/creality/creality_cr10smart_0.2.inst.cfg diff --git a/resources/variants/creality_cr10smart_0.3.inst.cfg b/resources/variants/creality/creality_cr10smart_0.3.inst.cfg similarity index 100% rename from resources/variants/creality_cr10smart_0.3.inst.cfg rename to resources/variants/creality/creality_cr10smart_0.3.inst.cfg diff --git a/resources/variants/creality_cr10smart_0.4.inst.cfg b/resources/variants/creality/creality_cr10smart_0.4.inst.cfg similarity index 100% rename from resources/variants/creality_cr10smart_0.4.inst.cfg rename to resources/variants/creality/creality_cr10smart_0.4.inst.cfg diff --git a/resources/variants/creality_cr10smart_0.5.inst.cfg b/resources/variants/creality/creality_cr10smart_0.5.inst.cfg similarity index 100% rename from resources/variants/creality_cr10smart_0.5.inst.cfg rename to resources/variants/creality/creality_cr10smart_0.5.inst.cfg diff --git a/resources/variants/creality_cr10smart_0.6.inst.cfg b/resources/variants/creality/creality_cr10smart_0.6.inst.cfg similarity index 100% rename from resources/variants/creality_cr10smart_0.6.inst.cfg rename to resources/variants/creality/creality_cr10smart_0.6.inst.cfg diff --git a/resources/variants/creality_cr10smart_0.8.inst.cfg b/resources/variants/creality/creality_cr10smart_0.8.inst.cfg similarity index 100% rename from resources/variants/creality_cr10smart_0.8.inst.cfg rename to resources/variants/creality/creality_cr10smart_0.8.inst.cfg diff --git a/resources/variants/creality_cr10smart_1.0.inst.cfg b/resources/variants/creality/creality_cr10smart_1.0.inst.cfg similarity index 100% rename from resources/variants/creality_cr10smart_1.0.inst.cfg rename to resources/variants/creality/creality_cr10smart_1.0.inst.cfg diff --git a/resources/variants/creality_cr10spro_0.2.inst.cfg b/resources/variants/creality/creality_cr10spro_0.2.inst.cfg similarity index 99% rename from resources/variants/creality_cr10spro_0.2.inst.cfg rename to resources/variants/creality/creality_cr10spro_0.2.inst.cfg index c25e541f3a..bd940586b7 100644 --- a/resources/variants/creality_cr10spro_0.2.inst.cfg +++ b/resources/variants/creality/creality_cr10spro_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10spro name = 0.2mm Nozzle version = 4 -definition = creality_cr10spro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/creality_cr10spro_0.3.inst.cfg b/resources/variants/creality/creality_cr10spro_0.3.inst.cfg similarity index 99% rename from resources/variants/creality_cr10spro_0.3.inst.cfg rename to resources/variants/creality/creality_cr10spro_0.3.inst.cfg index 8e55f7f7d8..81fae9d526 100644 --- a/resources/variants/creality_cr10spro_0.3.inst.cfg +++ b/resources/variants/creality/creality_cr10spro_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10spro name = 0.3mm Nozzle version = 4 -definition = creality_cr10spro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/creality_cr10spro_0.4.inst.cfg b/resources/variants/creality/creality_cr10spro_0.4.inst.cfg similarity index 99% rename from resources/variants/creality_cr10spro_0.4.inst.cfg rename to resources/variants/creality/creality_cr10spro_0.4.inst.cfg index 953655b269..7846785ae1 100644 --- a/resources/variants/creality_cr10spro_0.4.inst.cfg +++ b/resources/variants/creality/creality_cr10spro_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10spro name = 0.4mm Nozzle version = 4 -definition = creality_cr10spro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/creality_cr10spro_0.5.inst.cfg b/resources/variants/creality/creality_cr10spro_0.5.inst.cfg similarity index 99% rename from resources/variants/creality_cr10spro_0.5.inst.cfg rename to resources/variants/creality/creality_cr10spro_0.5.inst.cfg index b095acd512..cb375c479c 100644 --- a/resources/variants/creality_cr10spro_0.5.inst.cfg +++ b/resources/variants/creality/creality_cr10spro_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10spro name = 0.5mm Nozzle version = 4 -definition = creality_cr10spro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/creality_cr10spro_0.6.inst.cfg b/resources/variants/creality/creality_cr10spro_0.6.inst.cfg similarity index 99% rename from resources/variants/creality_cr10spro_0.6.inst.cfg rename to resources/variants/creality/creality_cr10spro_0.6.inst.cfg index 6b17ab91d5..f295e6e80d 100644 --- a/resources/variants/creality_cr10spro_0.6.inst.cfg +++ b/resources/variants/creality/creality_cr10spro_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10spro name = 0.6mm Nozzle version = 4 -definition = creality_cr10spro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/creality_cr10spro_0.8.inst.cfg b/resources/variants/creality/creality_cr10spro_0.8.inst.cfg similarity index 99% rename from resources/variants/creality_cr10spro_0.8.inst.cfg rename to resources/variants/creality/creality_cr10spro_0.8.inst.cfg index 05cf9741ee..e52d655fd1 100644 --- a/resources/variants/creality_cr10spro_0.8.inst.cfg +++ b/resources/variants/creality/creality_cr10spro_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10spro name = 0.8mm Nozzle version = 4 -definition = creality_cr10spro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/creality_cr10spro_1.0.inst.cfg b/resources/variants/creality/creality_cr10spro_1.0.inst.cfg similarity index 99% rename from resources/variants/creality_cr10spro_1.0.inst.cfg rename to resources/variants/creality/creality_cr10spro_1.0.inst.cfg index b6e18ddf9b..9c3c7f70a5 100644 --- a/resources/variants/creality_cr10spro_1.0.inst.cfg +++ b/resources/variants/creality/creality_cr10spro_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr10spro name = 1.0mm Nozzle version = 4 -definition = creality_cr10spro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/creality_cr20_0.2.inst.cfg b/resources/variants/creality/creality_cr20_0.2.inst.cfg similarity index 99% rename from resources/variants/creality_cr20_0.2.inst.cfg rename to resources/variants/creality/creality_cr20_0.2.inst.cfg index d3382f8658..a3b653be50 100644 --- a/resources/variants/creality_cr20_0.2.inst.cfg +++ b/resources/variants/creality/creality_cr20_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr20 name = 0.2mm Nozzle version = 4 -definition = creality_cr20 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/creality_cr20_0.3.inst.cfg b/resources/variants/creality/creality_cr20_0.3.inst.cfg similarity index 99% rename from resources/variants/creality_cr20_0.3.inst.cfg rename to resources/variants/creality/creality_cr20_0.3.inst.cfg index 4312a40f5d..de68d3f764 100644 --- a/resources/variants/creality_cr20_0.3.inst.cfg +++ b/resources/variants/creality/creality_cr20_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr20 name = 0.3mm Nozzle version = 4 -definition = creality_cr20 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/creality_cr20_0.4.inst.cfg b/resources/variants/creality/creality_cr20_0.4.inst.cfg similarity index 99% rename from resources/variants/creality_cr20_0.4.inst.cfg rename to resources/variants/creality/creality_cr20_0.4.inst.cfg index 7b48d03f5d..a42bbbf63b 100644 --- a/resources/variants/creality_cr20_0.4.inst.cfg +++ b/resources/variants/creality/creality_cr20_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr20 name = 0.4mm Nozzle version = 4 -definition = creality_cr20 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/creality_cr20_0.5.inst.cfg b/resources/variants/creality/creality_cr20_0.5.inst.cfg similarity index 99% rename from resources/variants/creality_cr20_0.5.inst.cfg rename to resources/variants/creality/creality_cr20_0.5.inst.cfg index 81c5fc9f2d..b7f6ccb273 100644 --- a/resources/variants/creality_cr20_0.5.inst.cfg +++ b/resources/variants/creality/creality_cr20_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr20 name = 0.5mm Nozzle version = 4 -definition = creality_cr20 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/creality_cr20_0.6.inst.cfg b/resources/variants/creality/creality_cr20_0.6.inst.cfg similarity index 99% rename from resources/variants/creality_cr20_0.6.inst.cfg rename to resources/variants/creality/creality_cr20_0.6.inst.cfg index de1a0ba1d8..8cd5e6690f 100644 --- a/resources/variants/creality_cr20_0.6.inst.cfg +++ b/resources/variants/creality/creality_cr20_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr20 name = 0.6mm Nozzle version = 4 -definition = creality_cr20 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/creality_cr20_0.8.inst.cfg b/resources/variants/creality/creality_cr20_0.8.inst.cfg similarity index 99% rename from resources/variants/creality_cr20_0.8.inst.cfg rename to resources/variants/creality/creality_cr20_0.8.inst.cfg index e584195626..da57e4689f 100644 --- a/resources/variants/creality_cr20_0.8.inst.cfg +++ b/resources/variants/creality/creality_cr20_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr20 name = 0.8mm Nozzle version = 4 -definition = creality_cr20 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/creality_cr20_1.0.inst.cfg b/resources/variants/creality/creality_cr20_1.0.inst.cfg similarity index 99% rename from resources/variants/creality_cr20_1.0.inst.cfg rename to resources/variants/creality/creality_cr20_1.0.inst.cfg index a4f3dab157..892ee8135c 100644 --- a/resources/variants/creality_cr20_1.0.inst.cfg +++ b/resources/variants/creality/creality_cr20_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr20 name = 1.0mm Nozzle version = 4 -definition = creality_cr20 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/creality_cr20pro_0.2.inst.cfg b/resources/variants/creality/creality_cr20pro_0.2.inst.cfg similarity index 99% rename from resources/variants/creality_cr20pro_0.2.inst.cfg rename to resources/variants/creality/creality_cr20pro_0.2.inst.cfg index 13c516276b..eabd59c44d 100644 --- a/resources/variants/creality_cr20pro_0.2.inst.cfg +++ b/resources/variants/creality/creality_cr20pro_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr20pro name = 0.2mm Nozzle version = 4 -definition = creality_cr20pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/creality_cr20pro_0.3.inst.cfg b/resources/variants/creality/creality_cr20pro_0.3.inst.cfg similarity index 99% rename from resources/variants/creality_cr20pro_0.3.inst.cfg rename to resources/variants/creality/creality_cr20pro_0.3.inst.cfg index 6ddf35beec..0da4f238da 100644 --- a/resources/variants/creality_cr20pro_0.3.inst.cfg +++ b/resources/variants/creality/creality_cr20pro_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr20pro name = 0.3mm Nozzle version = 4 -definition = creality_cr20pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/creality_cr20pro_0.4.inst.cfg b/resources/variants/creality/creality_cr20pro_0.4.inst.cfg similarity index 99% rename from resources/variants/creality_cr20pro_0.4.inst.cfg rename to resources/variants/creality/creality_cr20pro_0.4.inst.cfg index 97ab307c44..71fb49a0bb 100644 --- a/resources/variants/creality_cr20pro_0.4.inst.cfg +++ b/resources/variants/creality/creality_cr20pro_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr20pro name = 0.4mm Nozzle version = 4 -definition = creality_cr20pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/creality_cr20pro_0.5.inst.cfg b/resources/variants/creality/creality_cr20pro_0.5.inst.cfg similarity index 99% rename from resources/variants/creality_cr20pro_0.5.inst.cfg rename to resources/variants/creality/creality_cr20pro_0.5.inst.cfg index 3741a8cc34..15521756e7 100644 --- a/resources/variants/creality_cr20pro_0.5.inst.cfg +++ b/resources/variants/creality/creality_cr20pro_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr20pro name = 0.5mm Nozzle version = 4 -definition = creality_cr20pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/creality_cr20pro_0.6.inst.cfg b/resources/variants/creality/creality_cr20pro_0.6.inst.cfg similarity index 99% rename from resources/variants/creality_cr20pro_0.6.inst.cfg rename to resources/variants/creality/creality_cr20pro_0.6.inst.cfg index e8e6924334..ebd7a1e8a0 100644 --- a/resources/variants/creality_cr20pro_0.6.inst.cfg +++ b/resources/variants/creality/creality_cr20pro_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr20pro name = 0.6mm Nozzle version = 4 -definition = creality_cr20pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/creality_cr20pro_0.8.inst.cfg b/resources/variants/creality/creality_cr20pro_0.8.inst.cfg similarity index 99% rename from resources/variants/creality_cr20pro_0.8.inst.cfg rename to resources/variants/creality/creality_cr20pro_0.8.inst.cfg index 8f98bfbf36..f94ca1ef11 100644 --- a/resources/variants/creality_cr20pro_0.8.inst.cfg +++ b/resources/variants/creality/creality_cr20pro_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr20pro name = 0.8mm Nozzle version = 4 -definition = creality_cr20pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/creality_cr20pro_1.0.inst.cfg b/resources/variants/creality/creality_cr20pro_1.0.inst.cfg similarity index 99% rename from resources/variants/creality_cr20pro_1.0.inst.cfg rename to resources/variants/creality/creality_cr20pro_1.0.inst.cfg index 7454e0156f..f540ed522e 100644 --- a/resources/variants/creality_cr20pro_1.0.inst.cfg +++ b/resources/variants/creality/creality_cr20pro_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr20pro name = 1.0mm Nozzle version = 4 -definition = creality_cr20pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/creality_cr6se_0.2.inst.cfg b/resources/variants/creality/creality_cr6se_0.2.inst.cfg similarity index 99% rename from resources/variants/creality_cr6se_0.2.inst.cfg rename to resources/variants/creality/creality_cr6se_0.2.inst.cfg index ee919e89b1..50125a361e 100644 --- a/resources/variants/creality_cr6se_0.2.inst.cfg +++ b/resources/variants/creality/creality_cr6se_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr6se name = 0.2mm Nozzle version = 4 -definition = creality_cr6se [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/creality_cr6se_0.3.inst.cfg b/resources/variants/creality/creality_cr6se_0.3.inst.cfg similarity index 99% rename from resources/variants/creality_cr6se_0.3.inst.cfg rename to resources/variants/creality/creality_cr6se_0.3.inst.cfg index d85627822f..704bd4a232 100644 --- a/resources/variants/creality_cr6se_0.3.inst.cfg +++ b/resources/variants/creality/creality_cr6se_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr6se name = 0.3mm Nozzle version = 4 -definition = creality_cr6se [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/creality_cr6se_0.4.inst.cfg b/resources/variants/creality/creality_cr6se_0.4.inst.cfg similarity index 99% rename from resources/variants/creality_cr6se_0.4.inst.cfg rename to resources/variants/creality/creality_cr6se_0.4.inst.cfg index af00bdaa83..cde010d8e8 100644 --- a/resources/variants/creality_cr6se_0.4.inst.cfg +++ b/resources/variants/creality/creality_cr6se_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr6se name = 0.4mm Nozzle version = 4 -definition = creality_cr6se [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/creality_cr6se_0.5.inst.cfg b/resources/variants/creality/creality_cr6se_0.5.inst.cfg similarity index 99% rename from resources/variants/creality_cr6se_0.5.inst.cfg rename to resources/variants/creality/creality_cr6se_0.5.inst.cfg index a976ee18a2..20f46c68ab 100644 --- a/resources/variants/creality_cr6se_0.5.inst.cfg +++ b/resources/variants/creality/creality_cr6se_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr6se name = 0.5mm Nozzle version = 4 -definition = creality_cr6se [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/creality_cr6se_0.6.inst.cfg b/resources/variants/creality/creality_cr6se_0.6.inst.cfg similarity index 99% rename from resources/variants/creality_cr6se_0.6.inst.cfg rename to resources/variants/creality/creality_cr6se_0.6.inst.cfg index 0dbb211a33..e85bafce61 100644 --- a/resources/variants/creality_cr6se_0.6.inst.cfg +++ b/resources/variants/creality/creality_cr6se_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr6se name = 0.6mm Nozzle version = 4 -definition = creality_cr6se [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/creality_cr6se_0.8.inst.cfg b/resources/variants/creality/creality_cr6se_0.8.inst.cfg similarity index 99% rename from resources/variants/creality_cr6se_0.8.inst.cfg rename to resources/variants/creality/creality_cr6se_0.8.inst.cfg index 73b452f277..53b6d31d40 100644 --- a/resources/variants/creality_cr6se_0.8.inst.cfg +++ b/resources/variants/creality/creality_cr6se_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr6se name = 0.8mm Nozzle version = 4 -definition = creality_cr6se [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/creality_cr6se_1.0.inst.cfg b/resources/variants/creality/creality_cr6se_1.0.inst.cfg similarity index 99% rename from resources/variants/creality_cr6se_1.0.inst.cfg rename to resources/variants/creality/creality_cr6se_1.0.inst.cfg index 3dd0a9d6e7..f1f3b1ad94 100644 --- a/resources/variants/creality_cr6se_1.0.inst.cfg +++ b/resources/variants/creality/creality_cr6se_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_cr6se name = 1.0mm Nozzle version = 4 -definition = creality_cr6se [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/creality_ender2_0.2.inst.cfg b/resources/variants/creality/creality_ender2_0.2.inst.cfg similarity index 99% rename from resources/variants/creality_ender2_0.2.inst.cfg rename to resources/variants/creality/creality_ender2_0.2.inst.cfg index 70317f751c..1ae2b82081 100644 --- a/resources/variants/creality_ender2_0.2.inst.cfg +++ b/resources/variants/creality/creality_ender2_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender2 name = 0.2mm Nozzle version = 4 -definition = creality_ender2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/creality_ender2_0.3.inst.cfg b/resources/variants/creality/creality_ender2_0.3.inst.cfg similarity index 99% rename from resources/variants/creality_ender2_0.3.inst.cfg rename to resources/variants/creality/creality_ender2_0.3.inst.cfg index 8c93d69210..507bf2391d 100644 --- a/resources/variants/creality_ender2_0.3.inst.cfg +++ b/resources/variants/creality/creality_ender2_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender2 name = 0.3mm Nozzle version = 4 -definition = creality_ender2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/creality_ender2_0.4.inst.cfg b/resources/variants/creality/creality_ender2_0.4.inst.cfg similarity index 99% rename from resources/variants/creality_ender2_0.4.inst.cfg rename to resources/variants/creality/creality_ender2_0.4.inst.cfg index b76d0ea9fe..bdf98dc0ba 100644 --- a/resources/variants/creality_ender2_0.4.inst.cfg +++ b/resources/variants/creality/creality_ender2_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender2 name = 0.4mm Nozzle version = 4 -definition = creality_ender2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/creality_ender2_0.5.inst.cfg b/resources/variants/creality/creality_ender2_0.5.inst.cfg similarity index 99% rename from resources/variants/creality_ender2_0.5.inst.cfg rename to resources/variants/creality/creality_ender2_0.5.inst.cfg index e8192409e0..fe75451fa7 100644 --- a/resources/variants/creality_ender2_0.5.inst.cfg +++ b/resources/variants/creality/creality_ender2_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender2 name = 0.5mm Nozzle version = 4 -definition = creality_ender2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/creality_ender2_0.6.inst.cfg b/resources/variants/creality/creality_ender2_0.6.inst.cfg similarity index 99% rename from resources/variants/creality_ender2_0.6.inst.cfg rename to resources/variants/creality/creality_ender2_0.6.inst.cfg index 7850be03d7..ac2d537033 100644 --- a/resources/variants/creality_ender2_0.6.inst.cfg +++ b/resources/variants/creality/creality_ender2_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender2 name = 0.6mm Nozzle version = 4 -definition = creality_ender2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/creality_ender2_0.8.inst.cfg b/resources/variants/creality/creality_ender2_0.8.inst.cfg similarity index 99% rename from resources/variants/creality_ender2_0.8.inst.cfg rename to resources/variants/creality/creality_ender2_0.8.inst.cfg index 7832a63cd3..51cf58883d 100644 --- a/resources/variants/creality_ender2_0.8.inst.cfg +++ b/resources/variants/creality/creality_ender2_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender2 name = 0.8mm Nozzle version = 4 -definition = creality_ender2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/creality_ender2_1.0.inst.cfg b/resources/variants/creality/creality_ender2_1.0.inst.cfg similarity index 99% rename from resources/variants/creality_ender2_1.0.inst.cfg rename to resources/variants/creality/creality_ender2_1.0.inst.cfg index da966f6e5b..aef1890b30 100644 --- a/resources/variants/creality_ender2_1.0.inst.cfg +++ b/resources/variants/creality/creality_ender2_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender2 name = 1.0mm Nozzle version = 4 -definition = creality_ender2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/creality_ender3_0.2.inst.cfg b/resources/variants/creality/creality_ender3_0.2.inst.cfg similarity index 99% rename from resources/variants/creality_ender3_0.2.inst.cfg rename to resources/variants/creality/creality_ender3_0.2.inst.cfg index c843a72e2f..9c7a8685cb 100644 --- a/resources/variants/creality_ender3_0.2.inst.cfg +++ b/resources/variants/creality/creality_ender3_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender3 name = 0.2mm Nozzle version = 4 -definition = creality_ender3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/creality_ender3_0.3.inst.cfg b/resources/variants/creality/creality_ender3_0.3.inst.cfg similarity index 99% rename from resources/variants/creality_ender3_0.3.inst.cfg rename to resources/variants/creality/creality_ender3_0.3.inst.cfg index 010aa73c4d..6dbe8ebfdb 100644 --- a/resources/variants/creality_ender3_0.3.inst.cfg +++ b/resources/variants/creality/creality_ender3_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender3 name = 0.3mm Nozzle version = 4 -definition = creality_ender3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/creality_ender3_0.4.inst.cfg b/resources/variants/creality/creality_ender3_0.4.inst.cfg similarity index 99% rename from resources/variants/creality_ender3_0.4.inst.cfg rename to resources/variants/creality/creality_ender3_0.4.inst.cfg index 8b5a14d48f..4f99f48bf7 100644 --- a/resources/variants/creality_ender3_0.4.inst.cfg +++ b/resources/variants/creality/creality_ender3_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender3 name = 0.4mm Nozzle version = 4 -definition = creality_ender3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/creality_ender3_0.5.inst.cfg b/resources/variants/creality/creality_ender3_0.5.inst.cfg similarity index 99% rename from resources/variants/creality_ender3_0.5.inst.cfg rename to resources/variants/creality/creality_ender3_0.5.inst.cfg index 6ffcfa183c..4c1748ac5c 100644 --- a/resources/variants/creality_ender3_0.5.inst.cfg +++ b/resources/variants/creality/creality_ender3_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender3 name = 0.5mm Nozzle version = 4 -definition = creality_ender3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/creality_ender3_0.6.inst.cfg b/resources/variants/creality/creality_ender3_0.6.inst.cfg similarity index 99% rename from resources/variants/creality_ender3_0.6.inst.cfg rename to resources/variants/creality/creality_ender3_0.6.inst.cfg index f06974ded0..23b1c26b56 100644 --- a/resources/variants/creality_ender3_0.6.inst.cfg +++ b/resources/variants/creality/creality_ender3_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender3 name = 0.6mm Nozzle version = 4 -definition = creality_ender3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/creality_ender3_0.8.inst.cfg b/resources/variants/creality/creality_ender3_0.8.inst.cfg similarity index 99% rename from resources/variants/creality_ender3_0.8.inst.cfg rename to resources/variants/creality/creality_ender3_0.8.inst.cfg index 0a6c4e37ea..aecd17b0db 100644 --- a/resources/variants/creality_ender3_0.8.inst.cfg +++ b/resources/variants/creality/creality_ender3_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender3 name = 0.8mm Nozzle version = 4 -definition = creality_ender3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/creality_ender3_1.0.inst.cfg b/resources/variants/creality/creality_ender3_1.0.inst.cfg similarity index 99% rename from resources/variants/creality_ender3_1.0.inst.cfg rename to resources/variants/creality/creality_ender3_1.0.inst.cfg index 9eff65190c..9edc7416aa 100644 --- a/resources/variants/creality_ender3_1.0.inst.cfg +++ b/resources/variants/creality/creality_ender3_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender3 name = 1.0mm Nozzle version = 4 -definition = creality_ender3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/creality_ender3max_0.2.inst.cfg b/resources/variants/creality/creality_ender3max_0.2.inst.cfg similarity index 85% rename from resources/variants/creality_ender3max_0.2.inst.cfg rename to resources/variants/creality/creality_ender3max_0.2.inst.cfg index 71db90ab2c..66866a28e2 100644 --- a/resources/variants/creality_ender3max_0.2.inst.cfg +++ b/resources/variants/creality/creality_ender3max_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender3max name = 0.2mm Nozzle version = 4 -definition = creality_ender3max [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.2 \ No newline at end of file +machine_nozzle_size = 0.2 + diff --git a/resources/variants/creality_ender3max_0.3.inst.cfg b/resources/variants/creality/creality_ender3max_0.3.inst.cfg similarity index 85% rename from resources/variants/creality_ender3max_0.3.inst.cfg rename to resources/variants/creality/creality_ender3max_0.3.inst.cfg index e79f846c4c..07ac876ba9 100644 --- a/resources/variants/creality_ender3max_0.3.inst.cfg +++ b/resources/variants/creality/creality_ender3max_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender3max name = 0.3mm Nozzle version = 4 -definition = creality_ender3max [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.3 \ No newline at end of file +machine_nozzle_size = 0.3 + diff --git a/resources/variants/creality_ender3max_0.4.inst.cfg b/resources/variants/creality/creality_ender3max_0.4.inst.cfg similarity index 85% rename from resources/variants/creality_ender3max_0.4.inst.cfg rename to resources/variants/creality/creality_ender3max_0.4.inst.cfg index 2b52df9746..be4bd2ea6e 100644 --- a/resources/variants/creality_ender3max_0.4.inst.cfg +++ b/resources/variants/creality/creality_ender3max_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender3max name = 0.4mm Nozzle version = 4 -definition = creality_ender3max [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.4 \ No newline at end of file +machine_nozzle_size = 0.4 + diff --git a/resources/variants/creality_ender3max_0.5.inst.cfg b/resources/variants/creality/creality_ender3max_0.5.inst.cfg similarity index 85% rename from resources/variants/creality_ender3max_0.5.inst.cfg rename to resources/variants/creality/creality_ender3max_0.5.inst.cfg index 94f5d5a650..bc989b6efc 100644 --- a/resources/variants/creality_ender3max_0.5.inst.cfg +++ b/resources/variants/creality/creality_ender3max_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender3max name = 0.5mm Nozzle version = 4 -definition = creality_ender3max [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.5 \ No newline at end of file +machine_nozzle_size = 0.5 + diff --git a/resources/variants/creality_ender3max_0.6.inst.cfg b/resources/variants/creality/creality_ender3max_0.6.inst.cfg similarity index 85% rename from resources/variants/creality_ender3max_0.6.inst.cfg rename to resources/variants/creality/creality_ender3max_0.6.inst.cfg index 892a1b68d9..3e733f9a70 100644 --- a/resources/variants/creality_ender3max_0.6.inst.cfg +++ b/resources/variants/creality/creality_ender3max_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender3max name = 0.6mm Nozzle version = 4 -definition = creality_ender3max [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.6 \ No newline at end of file +machine_nozzle_size = 0.6 + diff --git a/resources/variants/creality_ender3max_0.8.inst.cfg b/resources/variants/creality/creality_ender3max_0.8.inst.cfg similarity index 85% rename from resources/variants/creality_ender3max_0.8.inst.cfg rename to resources/variants/creality/creality_ender3max_0.8.inst.cfg index 49a7aa577c..4cb1a4f2af 100644 --- a/resources/variants/creality_ender3max_0.8.inst.cfg +++ b/resources/variants/creality/creality_ender3max_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender3max name = 0.8mm Nozzle version = 4 -definition = creality_ender3max [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.8 \ No newline at end of file +machine_nozzle_size = 0.8 + diff --git a/resources/variants/creality_ender3max_1.0.inst.cfg b/resources/variants/creality/creality_ender3max_1.0.inst.cfg similarity index 85% rename from resources/variants/creality_ender3max_1.0.inst.cfg rename to resources/variants/creality/creality_ender3max_1.0.inst.cfg index 46f6ed8f8d..1bdb7d504e 100644 --- a/resources/variants/creality_ender3max_1.0.inst.cfg +++ b/resources/variants/creality/creality_ender3max_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender3max name = 1.0mm Nozzle version = 4 -definition = creality_ender3max [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 1.0 \ No newline at end of file +machine_nozzle_size = 1.0 + diff --git a/resources/variants/creality_ender3pro_0.2.inst.cfg b/resources/variants/creality/creality_ender3pro_0.2.inst.cfg similarity index 99% rename from resources/variants/creality_ender3pro_0.2.inst.cfg rename to resources/variants/creality/creality_ender3pro_0.2.inst.cfg index 50b1a4903f..51ff645730 100644 --- a/resources/variants/creality_ender3pro_0.2.inst.cfg +++ b/resources/variants/creality/creality_ender3pro_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender3pro name = 0.2mm Nozzle version = 4 -definition = creality_ender3pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/creality_ender3pro_0.3.inst.cfg b/resources/variants/creality/creality_ender3pro_0.3.inst.cfg similarity index 99% rename from resources/variants/creality_ender3pro_0.3.inst.cfg rename to resources/variants/creality/creality_ender3pro_0.3.inst.cfg index 8fddfdb396..44d7da14c1 100644 --- a/resources/variants/creality_ender3pro_0.3.inst.cfg +++ b/resources/variants/creality/creality_ender3pro_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender3pro name = 0.3mm Nozzle version = 4 -definition = creality_ender3pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/creality_ender3pro_0.4.inst.cfg b/resources/variants/creality/creality_ender3pro_0.4.inst.cfg similarity index 99% rename from resources/variants/creality_ender3pro_0.4.inst.cfg rename to resources/variants/creality/creality_ender3pro_0.4.inst.cfg index 1a7e236164..23444b21d8 100644 --- a/resources/variants/creality_ender3pro_0.4.inst.cfg +++ b/resources/variants/creality/creality_ender3pro_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender3pro name = 0.4mm Nozzle version = 4 -definition = creality_ender3pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/creality_ender3pro_0.5.inst.cfg b/resources/variants/creality/creality_ender3pro_0.5.inst.cfg similarity index 99% rename from resources/variants/creality_ender3pro_0.5.inst.cfg rename to resources/variants/creality/creality_ender3pro_0.5.inst.cfg index 290e942e6f..fcb3778a10 100644 --- a/resources/variants/creality_ender3pro_0.5.inst.cfg +++ b/resources/variants/creality/creality_ender3pro_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender3pro name = 0.5mm Nozzle version = 4 -definition = creality_ender3pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/creality_ender3pro_0.6.inst.cfg b/resources/variants/creality/creality_ender3pro_0.6.inst.cfg similarity index 99% rename from resources/variants/creality_ender3pro_0.6.inst.cfg rename to resources/variants/creality/creality_ender3pro_0.6.inst.cfg index 13668f89ff..8b2f38c8cd 100644 --- a/resources/variants/creality_ender3pro_0.6.inst.cfg +++ b/resources/variants/creality/creality_ender3pro_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender3pro name = 0.6mm Nozzle version = 4 -definition = creality_ender3pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/creality_ender3pro_0.8.inst.cfg b/resources/variants/creality/creality_ender3pro_0.8.inst.cfg similarity index 99% rename from resources/variants/creality_ender3pro_0.8.inst.cfg rename to resources/variants/creality/creality_ender3pro_0.8.inst.cfg index a3ccfcf6b5..a08ed56730 100644 --- a/resources/variants/creality_ender3pro_0.8.inst.cfg +++ b/resources/variants/creality/creality_ender3pro_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender3pro name = 0.8mm Nozzle version = 4 -definition = creality_ender3pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/creality_ender3pro_1.0.inst.cfg b/resources/variants/creality/creality_ender3pro_1.0.inst.cfg similarity index 99% rename from resources/variants/creality_ender3pro_1.0.inst.cfg rename to resources/variants/creality/creality_ender3pro_1.0.inst.cfg index 7329791bfd..7b7dedfa1b 100644 --- a/resources/variants/creality_ender3pro_1.0.inst.cfg +++ b/resources/variants/creality/creality_ender3pro_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender3pro name = 1.0mm Nozzle version = 4 -definition = creality_ender3pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/creality_ender3s1_0.2.inst.cfg b/resources/variants/creality/creality_ender3s1_0.2.inst.cfg similarity index 99% rename from resources/variants/creality_ender3s1_0.2.inst.cfg rename to resources/variants/creality/creality_ender3s1_0.2.inst.cfg index 5aed89119c..83890a0e9f 100644 --- a/resources/variants/creality_ender3s1_0.2.inst.cfg +++ b/resources/variants/creality/creality_ender3s1_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender3s1 name = 0.2mm Nozzle version = 4 -definition = creality_ender3s1 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/creality_ender3s1_0.3.inst.cfg b/resources/variants/creality/creality_ender3s1_0.3.inst.cfg similarity index 99% rename from resources/variants/creality_ender3s1_0.3.inst.cfg rename to resources/variants/creality/creality_ender3s1_0.3.inst.cfg index cd59787dee..69cb2021c4 100644 --- a/resources/variants/creality_ender3s1_0.3.inst.cfg +++ b/resources/variants/creality/creality_ender3s1_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender3s1 name = 0.3mm Nozzle version = 4 -definition = creality_ender3s1 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/creality_ender3s1_0.4.inst.cfg b/resources/variants/creality/creality_ender3s1_0.4.inst.cfg similarity index 99% rename from resources/variants/creality_ender3s1_0.4.inst.cfg rename to resources/variants/creality/creality_ender3s1_0.4.inst.cfg index b621656ca8..1577570858 100644 --- a/resources/variants/creality_ender3s1_0.4.inst.cfg +++ b/resources/variants/creality/creality_ender3s1_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender3s1 name = 0.4mm Nozzle version = 4 -definition = creality_ender3s1 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/creality_ender3s1_0.5.inst.cfg b/resources/variants/creality/creality_ender3s1_0.5.inst.cfg similarity index 99% rename from resources/variants/creality_ender3s1_0.5.inst.cfg rename to resources/variants/creality/creality_ender3s1_0.5.inst.cfg index 0ca9ce3a50..78ea874925 100644 --- a/resources/variants/creality_ender3s1_0.5.inst.cfg +++ b/resources/variants/creality/creality_ender3s1_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender3s1 name = 0.5mm Nozzle version = 4 -definition = creality_ender3s1 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/creality_ender3s1_0.6.inst.cfg b/resources/variants/creality/creality_ender3s1_0.6.inst.cfg similarity index 99% rename from resources/variants/creality_ender3s1_0.6.inst.cfg rename to resources/variants/creality/creality_ender3s1_0.6.inst.cfg index 30ea5da3ea..d6003a7287 100644 --- a/resources/variants/creality_ender3s1_0.6.inst.cfg +++ b/resources/variants/creality/creality_ender3s1_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender3s1 name = 0.6mm Nozzle version = 4 -definition = creality_ender3s1 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/creality_ender3s1_0.8.inst.cfg b/resources/variants/creality/creality_ender3s1_0.8.inst.cfg similarity index 99% rename from resources/variants/creality_ender3s1_0.8.inst.cfg rename to resources/variants/creality/creality_ender3s1_0.8.inst.cfg index 5f2a9125ca..c1db2cd499 100644 --- a/resources/variants/creality_ender3s1_0.8.inst.cfg +++ b/resources/variants/creality/creality_ender3s1_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender3s1 name = 0.8mm Nozzle version = 4 -definition = creality_ender3s1 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/creality_ender3s1_1.0.inst.cfg b/resources/variants/creality/creality_ender3s1_1.0.inst.cfg similarity index 99% rename from resources/variants/creality_ender3s1_1.0.inst.cfg rename to resources/variants/creality/creality_ender3s1_1.0.inst.cfg index fb61517749..93bc3b034d 100644 --- a/resources/variants/creality_ender3s1_1.0.inst.cfg +++ b/resources/variants/creality/creality_ender3s1_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender3s1 name = 1.0mm Nozzle version = 4 -definition = creality_ender3s1 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/creality/creality_ender3s1plus_0.2.inst.cfg b/resources/variants/creality/creality_ender3s1plus_0.2.inst.cfg new file mode 100644 index 0000000000..06d8221c8b --- /dev/null +++ b/resources/variants/creality/creality_ender3s1plus_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = creality_ender3s1plus +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/creality/creality_ender3s1plus_0.3.inst.cfg b/resources/variants/creality/creality_ender3s1plus_0.3.inst.cfg new file mode 100644 index 0000000000..90c4cd8008 --- /dev/null +++ b/resources/variants/creality/creality_ender3s1plus_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = creality_ender3s1plus +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/creality/creality_ender3s1plus_0.4.inst.cfg b/resources/variants/creality/creality_ender3s1plus_0.4.inst.cfg new file mode 100644 index 0000000000..d163c7f9ab --- /dev/null +++ b/resources/variants/creality/creality_ender3s1plus_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = creality_ender3s1plus +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/creality/creality_ender3s1plus_0.5.inst.cfg b/resources/variants/creality/creality_ender3s1plus_0.5.inst.cfg new file mode 100644 index 0000000000..eb58aca648 --- /dev/null +++ b/resources/variants/creality/creality_ender3s1plus_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = creality_ender3s1plus +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/creality/creality_ender3s1plus_0.6.inst.cfg b/resources/variants/creality/creality_ender3s1plus_0.6.inst.cfg new file mode 100644 index 0000000000..76dfbb3512 --- /dev/null +++ b/resources/variants/creality/creality_ender3s1plus_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = creality_ender3s1plus +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/creality/creality_ender3s1plus_0.8.inst.cfg b/resources/variants/creality/creality_ender3s1plus_0.8.inst.cfg new file mode 100644 index 0000000000..233d4c6230 --- /dev/null +++ b/resources/variants/creality/creality_ender3s1plus_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = creality_ender3s1plus +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/creality/creality_ender3s1plus_1.0.inst.cfg b/resources/variants/creality/creality_ender3s1plus_1.0.inst.cfg new file mode 100644 index 0000000000..446bb0b458 --- /dev/null +++ b/resources/variants/creality/creality_ender3s1plus_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = creality_ender3s1plus +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/creality/creality_ender3s1pro_0.4.inst.cfg b/resources/variants/creality/creality_ender3s1pro_0.4.inst.cfg new file mode 100644 index 0000000000..a6b3ebcb7d --- /dev/null +++ b/resources/variants/creality/creality_ender3s1pro_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = creality_ender3s1pro +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/creality_ender4_0.2.inst.cfg b/resources/variants/creality/creality_ender4_0.2.inst.cfg similarity index 99% rename from resources/variants/creality_ender4_0.2.inst.cfg rename to resources/variants/creality/creality_ender4_0.2.inst.cfg index cee5b66196..640037f5df 100644 --- a/resources/variants/creality_ender4_0.2.inst.cfg +++ b/resources/variants/creality/creality_ender4_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender4 name = 0.2mm Nozzle version = 4 -definition = creality_ender4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/creality_ender4_0.3.inst.cfg b/resources/variants/creality/creality_ender4_0.3.inst.cfg similarity index 99% rename from resources/variants/creality_ender4_0.3.inst.cfg rename to resources/variants/creality/creality_ender4_0.3.inst.cfg index 6bf34eb12e..a2813ebb4f 100644 --- a/resources/variants/creality_ender4_0.3.inst.cfg +++ b/resources/variants/creality/creality_ender4_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender4 name = 0.3mm Nozzle version = 4 -definition = creality_ender4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/creality_ender4_0.4.inst.cfg b/resources/variants/creality/creality_ender4_0.4.inst.cfg similarity index 99% rename from resources/variants/creality_ender4_0.4.inst.cfg rename to resources/variants/creality/creality_ender4_0.4.inst.cfg index b9e7181a64..4cd4e69e0c 100644 --- a/resources/variants/creality_ender4_0.4.inst.cfg +++ b/resources/variants/creality/creality_ender4_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender4 name = 0.4mm Nozzle version = 4 -definition = creality_ender4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/creality_ender4_0.5.inst.cfg b/resources/variants/creality/creality_ender4_0.5.inst.cfg similarity index 99% rename from resources/variants/creality_ender4_0.5.inst.cfg rename to resources/variants/creality/creality_ender4_0.5.inst.cfg index ed66f18a6d..81326f9118 100644 --- a/resources/variants/creality_ender4_0.5.inst.cfg +++ b/resources/variants/creality/creality_ender4_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender4 name = 0.5mm Nozzle version = 4 -definition = creality_ender4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/creality_ender4_0.6.inst.cfg b/resources/variants/creality/creality_ender4_0.6.inst.cfg similarity index 99% rename from resources/variants/creality_ender4_0.6.inst.cfg rename to resources/variants/creality/creality_ender4_0.6.inst.cfg index de468dbc60..b9f0cc2fd3 100644 --- a/resources/variants/creality_ender4_0.6.inst.cfg +++ b/resources/variants/creality/creality_ender4_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender4 name = 0.6mm Nozzle version = 4 -definition = creality_ender4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/creality_ender4_0.8.inst.cfg b/resources/variants/creality/creality_ender4_0.8.inst.cfg similarity index 99% rename from resources/variants/creality_ender4_0.8.inst.cfg rename to resources/variants/creality/creality_ender4_0.8.inst.cfg index 8d8f7e14db..169e3d0beb 100644 --- a/resources/variants/creality_ender4_0.8.inst.cfg +++ b/resources/variants/creality/creality_ender4_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender4 name = 0.8mm Nozzle version = 4 -definition = creality_ender4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/creality_ender4_1.0.inst.cfg b/resources/variants/creality/creality_ender4_1.0.inst.cfg similarity index 99% rename from resources/variants/creality_ender4_1.0.inst.cfg rename to resources/variants/creality/creality_ender4_1.0.inst.cfg index f48648aa4b..ff5e026196 100644 --- a/resources/variants/creality_ender4_1.0.inst.cfg +++ b/resources/variants/creality/creality_ender4_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender4 name = 1.0mm Nozzle version = 4 -definition = creality_ender4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/creality_ender5_0.2.inst.cfg b/resources/variants/creality/creality_ender5_0.2.inst.cfg similarity index 99% rename from resources/variants/creality_ender5_0.2.inst.cfg rename to resources/variants/creality/creality_ender5_0.2.inst.cfg index 86532f65ec..cf36c1aa5b 100644 --- a/resources/variants/creality_ender5_0.2.inst.cfg +++ b/resources/variants/creality/creality_ender5_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender5 name = 0.2mm Nozzle version = 4 -definition = creality_ender5 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/creality_ender5_0.3.inst.cfg b/resources/variants/creality/creality_ender5_0.3.inst.cfg similarity index 99% rename from resources/variants/creality_ender5_0.3.inst.cfg rename to resources/variants/creality/creality_ender5_0.3.inst.cfg index cf9dc6ab83..3df5173c8b 100644 --- a/resources/variants/creality_ender5_0.3.inst.cfg +++ b/resources/variants/creality/creality_ender5_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender5 name = 0.3mm Nozzle version = 4 -definition = creality_ender5 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/creality_ender5_0.4.inst.cfg b/resources/variants/creality/creality_ender5_0.4.inst.cfg similarity index 99% rename from resources/variants/creality_ender5_0.4.inst.cfg rename to resources/variants/creality/creality_ender5_0.4.inst.cfg index 8fa3ac4e06..1d779b46d0 100644 --- a/resources/variants/creality_ender5_0.4.inst.cfg +++ b/resources/variants/creality/creality_ender5_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender5 name = 0.4mm Nozzle version = 4 -definition = creality_ender5 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/creality_ender5_0.5.inst.cfg b/resources/variants/creality/creality_ender5_0.5.inst.cfg similarity index 99% rename from resources/variants/creality_ender5_0.5.inst.cfg rename to resources/variants/creality/creality_ender5_0.5.inst.cfg index 0a3a679e6e..4d032e8884 100644 --- a/resources/variants/creality_ender5_0.5.inst.cfg +++ b/resources/variants/creality/creality_ender5_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender5 name = 0.5mm Nozzle version = 4 -definition = creality_ender5 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/creality_ender5_0.6.inst.cfg b/resources/variants/creality/creality_ender5_0.6.inst.cfg similarity index 99% rename from resources/variants/creality_ender5_0.6.inst.cfg rename to resources/variants/creality/creality_ender5_0.6.inst.cfg index 432dfd2c1b..a06956028c 100644 --- a/resources/variants/creality_ender5_0.6.inst.cfg +++ b/resources/variants/creality/creality_ender5_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender5 name = 0.6mm Nozzle version = 4 -definition = creality_ender5 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/creality_ender5_0.8.inst.cfg b/resources/variants/creality/creality_ender5_0.8.inst.cfg similarity index 99% rename from resources/variants/creality_ender5_0.8.inst.cfg rename to resources/variants/creality/creality_ender5_0.8.inst.cfg index a45fba42a6..86f0e7810c 100644 --- a/resources/variants/creality_ender5_0.8.inst.cfg +++ b/resources/variants/creality/creality_ender5_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender5 name = 0.8mm Nozzle version = 4 -definition = creality_ender5 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/creality_ender5_1.0.inst.cfg b/resources/variants/creality/creality_ender5_1.0.inst.cfg similarity index 99% rename from resources/variants/creality_ender5_1.0.inst.cfg rename to resources/variants/creality/creality_ender5_1.0.inst.cfg index 7af803e101..189fc9795d 100644 --- a/resources/variants/creality_ender5_1.0.inst.cfg +++ b/resources/variants/creality/creality_ender5_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender5 name = 1.0mm Nozzle version = 4 -definition = creality_ender5 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/creality_ender5plus_0.2.inst.cfg b/resources/variants/creality/creality_ender5plus_0.2.inst.cfg similarity index 99% rename from resources/variants/creality_ender5plus_0.2.inst.cfg rename to resources/variants/creality/creality_ender5plus_0.2.inst.cfg index b1d42f5d70..9c8900ac80 100644 --- a/resources/variants/creality_ender5plus_0.2.inst.cfg +++ b/resources/variants/creality/creality_ender5plus_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender5plus name = 0.2mm Nozzle version = 4 -definition = creality_ender5plus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/creality_ender5plus_0.3.inst.cfg b/resources/variants/creality/creality_ender5plus_0.3.inst.cfg similarity index 99% rename from resources/variants/creality_ender5plus_0.3.inst.cfg rename to resources/variants/creality/creality_ender5plus_0.3.inst.cfg index c7feda68fc..1e67f039e7 100644 --- a/resources/variants/creality_ender5plus_0.3.inst.cfg +++ b/resources/variants/creality/creality_ender5plus_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender5plus name = 0.3mm Nozzle version = 4 -definition = creality_ender5plus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/creality_ender5plus_0.4.inst.cfg b/resources/variants/creality/creality_ender5plus_0.4.inst.cfg similarity index 99% rename from resources/variants/creality_ender5plus_0.4.inst.cfg rename to resources/variants/creality/creality_ender5plus_0.4.inst.cfg index 56d7667924..ed3dc779e3 100644 --- a/resources/variants/creality_ender5plus_0.4.inst.cfg +++ b/resources/variants/creality/creality_ender5plus_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender5plus name = 0.4mm Nozzle version = 4 -definition = creality_ender5plus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/creality_ender5plus_0.5.inst.cfg b/resources/variants/creality/creality_ender5plus_0.5.inst.cfg similarity index 99% rename from resources/variants/creality_ender5plus_0.5.inst.cfg rename to resources/variants/creality/creality_ender5plus_0.5.inst.cfg index ef0bf4ac68..b4aed3cab1 100644 --- a/resources/variants/creality_ender5plus_0.5.inst.cfg +++ b/resources/variants/creality/creality_ender5plus_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender5plus name = 0.5mm Nozzle version = 4 -definition = creality_ender5plus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/creality_ender5plus_0.6.inst.cfg b/resources/variants/creality/creality_ender5plus_0.6.inst.cfg similarity index 99% rename from resources/variants/creality_ender5plus_0.6.inst.cfg rename to resources/variants/creality/creality_ender5plus_0.6.inst.cfg index 94e572eda6..9a4a1c6a7e 100644 --- a/resources/variants/creality_ender5plus_0.6.inst.cfg +++ b/resources/variants/creality/creality_ender5plus_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender5plus name = 0.6mm Nozzle version = 4 -definition = creality_ender5plus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/creality_ender5plus_0.8.inst.cfg b/resources/variants/creality/creality_ender5plus_0.8.inst.cfg similarity index 99% rename from resources/variants/creality_ender5plus_0.8.inst.cfg rename to resources/variants/creality/creality_ender5plus_0.8.inst.cfg index fb37eae6dc..3b094fa9d1 100644 --- a/resources/variants/creality_ender5plus_0.8.inst.cfg +++ b/resources/variants/creality/creality_ender5plus_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender5plus name = 0.8mm Nozzle version = 4 -definition = creality_ender5plus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/creality_ender5plus_1.0.inst.cfg b/resources/variants/creality/creality_ender5plus_1.0.inst.cfg similarity index 99% rename from resources/variants/creality_ender5plus_1.0.inst.cfg rename to resources/variants/creality/creality_ender5plus_1.0.inst.cfg index 23cd521529..23a07ea78c 100644 --- a/resources/variants/creality_ender5plus_1.0.inst.cfg +++ b/resources/variants/creality/creality_ender5plus_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender5plus name = 1.0mm Nozzle version = 4 -definition = creality_ender5plus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/creality_ender6_0.2.inst.cfg b/resources/variants/creality/creality_ender6_0.2.inst.cfg similarity index 93% rename from resources/variants/creality_ender6_0.2.inst.cfg rename to resources/variants/creality/creality_ender6_0.2.inst.cfg index cbaaa9a8bf..88c562eac7 100644 --- a/resources/variants/creality_ender6_0.2.inst.cfg +++ b/resources/variants/creality/creality_ender6_0.2.inst.cfg @@ -1,12 +1,13 @@ -[general] -name = 0.2mm Nozzle -version = 4 -definition = creality_ender6 - -[metadata] -setting_version = 20 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.2 +[general] +definition = creality_ender6 +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/creality_ender6_0.3.inst.cfg b/resources/variants/creality/creality_ender6_0.3.inst.cfg similarity index 93% rename from resources/variants/creality_ender6_0.3.inst.cfg rename to resources/variants/creality/creality_ender6_0.3.inst.cfg index f16f34285e..db8657acd9 100644 --- a/resources/variants/creality_ender6_0.3.inst.cfg +++ b/resources/variants/creality/creality_ender6_0.3.inst.cfg @@ -1,12 +1,13 @@ -[general] -name = 0.3mm Nozzle -version = 4 -definition = creality_ender6 - -[metadata] -setting_version = 20 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.3 +[general] +definition = creality_ender6 +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/creality_ender6_0.4.inst.cfg b/resources/variants/creality/creality_ender6_0.4.inst.cfg similarity index 93% rename from resources/variants/creality_ender6_0.4.inst.cfg rename to resources/variants/creality/creality_ender6_0.4.inst.cfg index cb3071dc69..feff1e1d7b 100644 --- a/resources/variants/creality_ender6_0.4.inst.cfg +++ b/resources/variants/creality/creality_ender6_0.4.inst.cfg @@ -1,12 +1,13 @@ -[general] -name = 0.4mm Nozzle -version = 4 -definition = creality_ender6 - -[metadata] -setting_version = 20 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.4 +[general] +definition = creality_ender6 +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/creality_ender6_0.5.inst.cfg b/resources/variants/creality/creality_ender6_0.5.inst.cfg similarity index 93% rename from resources/variants/creality_ender6_0.5.inst.cfg rename to resources/variants/creality/creality_ender6_0.5.inst.cfg index cd26258433..d8118d4ddd 100644 --- a/resources/variants/creality_ender6_0.5.inst.cfg +++ b/resources/variants/creality/creality_ender6_0.5.inst.cfg @@ -1,12 +1,13 @@ -[general] -name = 0.5mm Nozzle -version = 4 -definition = creality_ender6 - -[metadata] -setting_version = 20 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.5 +[general] +definition = creality_ender6 +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/creality_ender6_0.6.inst.cfg b/resources/variants/creality/creality_ender6_0.6.inst.cfg similarity index 93% rename from resources/variants/creality_ender6_0.6.inst.cfg rename to resources/variants/creality/creality_ender6_0.6.inst.cfg index 278a31f118..b8c9effffd 100644 --- a/resources/variants/creality_ender6_0.6.inst.cfg +++ b/resources/variants/creality/creality_ender6_0.6.inst.cfg @@ -1,12 +1,13 @@ -[general] -name = 0.6mm Nozzle -version = 4 -definition = creality_ender6 - -[metadata] -setting_version = 20 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.6 +[general] +definition = creality_ender6 +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/creality_ender6_0.8.inst.cfg b/resources/variants/creality/creality_ender6_0.8.inst.cfg similarity index 93% rename from resources/variants/creality_ender6_0.8.inst.cfg rename to resources/variants/creality/creality_ender6_0.8.inst.cfg index 94241194e6..5c8bb0bc2e 100644 --- a/resources/variants/creality_ender6_0.8.inst.cfg +++ b/resources/variants/creality/creality_ender6_0.8.inst.cfg @@ -1,12 +1,13 @@ -[general] -name = 0.8mm Nozzle -version = 4 -definition = creality_ender6 - -[metadata] -setting_version = 20 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.8 +[general] +definition = creality_ender6 +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/creality_ender6_1.0.inst.cfg b/resources/variants/creality/creality_ender6_1.0.inst.cfg similarity index 93% rename from resources/variants/creality_ender6_1.0.inst.cfg rename to resources/variants/creality/creality_ender6_1.0.inst.cfg index c2ee38f8b2..5f3b3d430a 100644 --- a/resources/variants/creality_ender6_1.0.inst.cfg +++ b/resources/variants/creality/creality_ender6_1.0.inst.cfg @@ -1,12 +1,13 @@ -[general] -name = 1.0mm Nozzle -version = 4 -definition = creality_ender6 - -[metadata] -setting_version = 20 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 1.0 +[general] +definition = creality_ender6 +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/creality_sermoond1_0.2.inst.cfg b/resources/variants/creality/creality_sermoond1_0.2.inst.cfg similarity index 93% rename from resources/variants/creality_sermoond1_0.2.inst.cfg rename to resources/variants/creality/creality_sermoond1_0.2.inst.cfg index cfb9559a01..7536db8b51 100644 --- a/resources/variants/creality_sermoond1_0.2.inst.cfg +++ b/resources/variants/creality/creality_sermoond1_0.2.inst.cfg @@ -1,12 +1,13 @@ -[general] -name = 0.2mm Nozzle -version = 4 -definition = creality_sermoond1 - -[metadata] -setting_version = 20 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.2 +[general] +definition = creality_sermoond1 +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/creality_sermoond1_0.3.inst.cfg b/resources/variants/creality/creality_sermoond1_0.3.inst.cfg similarity index 93% rename from resources/variants/creality_sermoond1_0.3.inst.cfg rename to resources/variants/creality/creality_sermoond1_0.3.inst.cfg index d3aa81b887..36aa2d367f 100644 --- a/resources/variants/creality_sermoond1_0.3.inst.cfg +++ b/resources/variants/creality/creality_sermoond1_0.3.inst.cfg @@ -1,12 +1,13 @@ -[general] -name = 0.3mm Nozzle -version = 4 -definition = creality_sermoond1 - -[metadata] -setting_version = 20 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.3 +[general] +definition = creality_sermoond1 +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/creality_sermoond1_0.4.inst.cfg b/resources/variants/creality/creality_sermoond1_0.4.inst.cfg similarity index 93% rename from resources/variants/creality_sermoond1_0.4.inst.cfg rename to resources/variants/creality/creality_sermoond1_0.4.inst.cfg index 4bd0af2851..5f07870d67 100644 --- a/resources/variants/creality_sermoond1_0.4.inst.cfg +++ b/resources/variants/creality/creality_sermoond1_0.4.inst.cfg @@ -1,12 +1,13 @@ -[general] -name = 0.4mm Nozzle -version = 4 -definition = creality_sermoond1 - -[metadata] -setting_version = 20 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.4 +[general] +definition = creality_sermoond1 +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/creality_sermoond1_0.5.inst.cfg b/resources/variants/creality/creality_sermoond1_0.5.inst.cfg similarity index 93% rename from resources/variants/creality_sermoond1_0.5.inst.cfg rename to resources/variants/creality/creality_sermoond1_0.5.inst.cfg index 30cdbdfa56..4b4d1f4840 100644 --- a/resources/variants/creality_sermoond1_0.5.inst.cfg +++ b/resources/variants/creality/creality_sermoond1_0.5.inst.cfg @@ -1,12 +1,13 @@ -[general] -name = 0.5mm Nozzle -version = 4 -definition = creality_sermoond1 - -[metadata] -setting_version = 20 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.5 +[general] +definition = creality_sermoond1 +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/creality_sermoond1_0.6.inst.cfg b/resources/variants/creality/creality_sermoond1_0.6.inst.cfg similarity index 93% rename from resources/variants/creality_sermoond1_0.6.inst.cfg rename to resources/variants/creality/creality_sermoond1_0.6.inst.cfg index 49ee1ac207..53dc38a87c 100644 --- a/resources/variants/creality_sermoond1_0.6.inst.cfg +++ b/resources/variants/creality/creality_sermoond1_0.6.inst.cfg @@ -1,12 +1,13 @@ -[general] -name = 0.6mm Nozzle -version = 4 -definition = creality_sermoond1 - -[metadata] -setting_version = 20 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.6 +[general] +definition = creality_sermoond1 +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/creality_sermoond1_0.8.inst.cfg b/resources/variants/creality/creality_sermoond1_0.8.inst.cfg similarity index 93% rename from resources/variants/creality_sermoond1_0.8.inst.cfg rename to resources/variants/creality/creality_sermoond1_0.8.inst.cfg index 2283b9d39b..dae39cbac2 100644 --- a/resources/variants/creality_sermoond1_0.8.inst.cfg +++ b/resources/variants/creality/creality_sermoond1_0.8.inst.cfg @@ -1,12 +1,13 @@ -[general] -name = 0.8mm Nozzle -version = 4 -definition = creality_sermoond1 - -[metadata] -setting_version = 20 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.8 +[general] +definition = creality_sermoond1 +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/creality_sermoond1_1.0.inst.cfg b/resources/variants/creality/creality_sermoond1_1.0.inst.cfg similarity index 93% rename from resources/variants/creality_sermoond1_1.0.inst.cfg rename to resources/variants/creality/creality_sermoond1_1.0.inst.cfg index 30a2d6ee78..07b550d90c 100644 --- a/resources/variants/creality_sermoond1_1.0.inst.cfg +++ b/resources/variants/creality/creality_sermoond1_1.0.inst.cfg @@ -1,12 +1,13 @@ -[general] -name = 1.0mm Nozzle -version = 4 -definition = creality_sermoond1 - -[metadata] -setting_version = 20 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 1.0 +[general] +definition = creality_sermoond1 +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/creality_sermoonv1_0.4.inst.cfg b/resources/variants/creality/creality_sermoonv1_0.4.inst.cfg similarity index 100% rename from resources/variants/creality_sermoonv1_0.4.inst.cfg rename to resources/variants/creality/creality_sermoonv1_0.4.inst.cfg diff --git a/resources/variants/dagoma_pro_430_bowden_brass_0.4.inst.cfg b/resources/variants/dagoma/dagoma_pro_430_bowden_brass_0.4.inst.cfg similarity index 100% rename from resources/variants/dagoma_pro_430_bowden_brass_0.4.inst.cfg rename to resources/variants/dagoma/dagoma_pro_430_bowden_brass_0.4.inst.cfg diff --git a/resources/variants/dagoma_pro_430_bowden_brass_0.8.inst.cfg b/resources/variants/dagoma/dagoma_pro_430_bowden_brass_0.8.inst.cfg similarity index 100% rename from resources/variants/dagoma_pro_430_bowden_brass_0.8.inst.cfg rename to resources/variants/dagoma/dagoma_pro_430_bowden_brass_0.8.inst.cfg diff --git a/resources/variants/dagoma_pro_430_bowden_brass_1.0.inst.cfg b/resources/variants/dagoma/dagoma_pro_430_bowden_brass_1.0.inst.cfg similarity index 100% rename from resources/variants/dagoma_pro_430_bowden_brass_1.0.inst.cfg rename to resources/variants/dagoma/dagoma_pro_430_bowden_brass_1.0.inst.cfg diff --git a/resources/variants/dagoma_pro_430_bowden_steel_0.4.inst.cfg b/resources/variants/dagoma/dagoma_pro_430_bowden_steel_0.4.inst.cfg similarity index 100% rename from resources/variants/dagoma_pro_430_bowden_steel_0.4.inst.cfg rename to resources/variants/dagoma/dagoma_pro_430_bowden_steel_0.4.inst.cfg diff --git a/resources/variants/dagoma_pro_430_bowden_steel_0.8.inst.cfg b/resources/variants/dagoma/dagoma_pro_430_bowden_steel_0.8.inst.cfg similarity index 100% rename from resources/variants/dagoma_pro_430_bowden_steel_0.8.inst.cfg rename to resources/variants/dagoma/dagoma_pro_430_bowden_steel_0.8.inst.cfg diff --git a/resources/variants/dagoma_pro_430_directdrive_brass_0.4.inst.cfg b/resources/variants/dagoma/dagoma_pro_430_directdrive_brass_0.4.inst.cfg similarity index 100% rename from resources/variants/dagoma_pro_430_directdrive_brass_0.4.inst.cfg rename to resources/variants/dagoma/dagoma_pro_430_directdrive_brass_0.4.inst.cfg diff --git a/resources/variants/dagoma_pro_430_directdrive_brass_0.8.inst.cfg b/resources/variants/dagoma/dagoma_pro_430_directdrive_brass_0.8.inst.cfg similarity index 100% rename from resources/variants/dagoma_pro_430_directdrive_brass_0.8.inst.cfg rename to resources/variants/dagoma/dagoma_pro_430_directdrive_brass_0.8.inst.cfg diff --git a/resources/variants/dagoma_pro_430_directdrive_brass_1.0.inst.cfg b/resources/variants/dagoma/dagoma_pro_430_directdrive_brass_1.0.inst.cfg similarity index 100% rename from resources/variants/dagoma_pro_430_directdrive_brass_1.0.inst.cfg rename to resources/variants/dagoma/dagoma_pro_430_directdrive_brass_1.0.inst.cfg diff --git a/resources/variants/dagoma_pro_430_directdrive_steel_0.4.inst.cfg b/resources/variants/dagoma/dagoma_pro_430_directdrive_steel_0.4.inst.cfg similarity index 100% rename from resources/variants/dagoma_pro_430_directdrive_steel_0.4.inst.cfg rename to resources/variants/dagoma/dagoma_pro_430_directdrive_steel_0.4.inst.cfg diff --git a/resources/variants/dagoma_pro_430_directdrive_steel_0.8.inst.cfg b/resources/variants/dagoma/dagoma_pro_430_directdrive_steel_0.8.inst.cfg similarity index 100% rename from resources/variants/dagoma_pro_430_directdrive_steel_0.8.inst.cfg rename to resources/variants/dagoma/dagoma_pro_430_directdrive_steel_0.8.inst.cfg diff --git a/resources/variants/dagoma_pro_430_dual_brass_0.4.inst.cfg b/resources/variants/dagoma/dagoma_pro_430_dual_brass_0.4.inst.cfg similarity index 100% rename from resources/variants/dagoma_pro_430_dual_brass_0.4.inst.cfg rename to resources/variants/dagoma/dagoma_pro_430_dual_brass_0.4.inst.cfg diff --git a/resources/variants/dagoma_pro_430_dual_brass_0.8.inst.cfg b/resources/variants/dagoma/dagoma_pro_430_dual_brass_0.8.inst.cfg similarity index 100% rename from resources/variants/dagoma_pro_430_dual_brass_0.8.inst.cfg rename to resources/variants/dagoma/dagoma_pro_430_dual_brass_0.8.inst.cfg diff --git a/resources/variants/dagoma_pro_430_dual_brass_1.0.inst.cfg b/resources/variants/dagoma/dagoma_pro_430_dual_brass_1.0.inst.cfg similarity index 100% rename from resources/variants/dagoma_pro_430_dual_brass_1.0.inst.cfg rename to resources/variants/dagoma/dagoma_pro_430_dual_brass_1.0.inst.cfg diff --git a/resources/variants/dagoma_pro_430_dual_steel_0.4.inst.cfg b/resources/variants/dagoma/dagoma_pro_430_dual_steel_0.4.inst.cfg similarity index 100% rename from resources/variants/dagoma_pro_430_dual_steel_0.4.inst.cfg rename to resources/variants/dagoma/dagoma_pro_430_dual_steel_0.4.inst.cfg diff --git a/resources/variants/dagoma_pro_430_dual_steel_0.8.inst.cfg b/resources/variants/dagoma/dagoma_pro_430_dual_steel_0.8.inst.cfg similarity index 100% rename from resources/variants/dagoma_pro_430_dual_steel_0.8.inst.cfg rename to resources/variants/dagoma/dagoma_pro_430_dual_steel_0.8.inst.cfg diff --git a/resources/variants/dagoma_sigma_0.4.inst.cfg b/resources/variants/dagoma/dagoma_sigma_0.4.inst.cfg similarity index 100% rename from resources/variants/dagoma_sigma_0.4.inst.cfg rename to resources/variants/dagoma/dagoma_sigma_0.4.inst.cfg diff --git a/resources/variants/dagoma_sigma_0.8.inst.cfg b/resources/variants/dagoma/dagoma_sigma_0.8.inst.cfg similarity index 100% rename from resources/variants/dagoma_sigma_0.8.inst.cfg rename to resources/variants/dagoma/dagoma_sigma_0.8.inst.cfg diff --git a/resources/variants/deltacomb/deltacomb_dc20_fbe025.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20_fbe025.inst.cfg index b75ad52b10..46b2973e0c 100644 --- a/resources/variants/deltacomb/deltacomb_dc20_fbe025.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc20_fbe025.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = deltacomb_dc20 name = FBE 0.25mm version = 4 -definition = deltacomb_dc20 [metadata] author = Deltacomb 3D +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.25 \ No newline at end of file +machine_nozzle_size = 0.25 + diff --git a/resources/variants/deltacomb/deltacomb_dc20_fbe040.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20_fbe040.inst.cfg index d88743c080..53e2d58e89 100644 --- a/resources/variants/deltacomb/deltacomb_dc20_fbe040.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc20_fbe040.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = deltacomb_dc20 name = FBE 0.40mm version = 4 -definition = deltacomb_dc20 [metadata] author = Deltacomb 3D +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.40 + diff --git a/resources/variants/deltacomb/deltacomb_dc20_fbe060.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20_fbe060.inst.cfg index 40ece32f1e..256b093e7f 100644 --- a/resources/variants/deltacomb/deltacomb_dc20_fbe060.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc20_fbe060.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = deltacomb_dc20 name = FBE 0.60mm version = 4 -definition = deltacomb_dc20 [metadata] author = Deltacomb 3D +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.60 + diff --git a/resources/variants/deltacomb/deltacomb_dc20_vfbe080.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20_vfbe080.inst.cfg index 1cfb3494b9..154148dcfd 100755 --- a/resources/variants/deltacomb/deltacomb_dc20_vfbe080.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc20_vfbe080.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = deltacomb_dc20 name = V-FBE 0.80mm version = 4 -definition = deltacomb_dc20 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.80 + diff --git a/resources/variants/deltacomb/deltacomb_dc20dual_dbe025.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20dual_dbe025.inst.cfg index 6c2870b1bb..9a4d3bdee8 100755 --- a/resources/variants/deltacomb/deltacomb_dc20dual_dbe025.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc20dual_dbe025.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = deltacomb_dc20dual name = DBE 0.25mm version = 4 -definition = deltacomb_dc20dual [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.25 \ No newline at end of file +machine_nozzle_size = 0.25 + diff --git a/resources/variants/deltacomb/deltacomb_dc20dual_dbe040.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20dual_dbe040.inst.cfg index 1cdfd55660..b0f97b506b 100755 --- a/resources/variants/deltacomb/deltacomb_dc20dual_dbe040.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc20dual_dbe040.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = deltacomb_dc20dual name = DBE 0.40mm version = 4 -definition = deltacomb_dc20dual [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.40 + diff --git a/resources/variants/deltacomb/deltacomb_dc20dual_dbe060.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20dual_dbe060.inst.cfg index 8b87aedc4e..ff488eeca8 100755 --- a/resources/variants/deltacomb/deltacomb_dc20dual_dbe060.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc20dual_dbe060.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = deltacomb_dc20dual name = DBE 0.60mm version = 4 -definition = deltacomb_dc20dual [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.60 + diff --git a/resources/variants/deltacomb/deltacomb_dc20dual_vdbe080.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20dual_vdbe080.inst.cfg index 555a9aedfc..2a46f63ebb 100755 --- a/resources/variants/deltacomb/deltacomb_dc20dual_vdbe080.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc20dual_vdbe080.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = deltacomb_dc20dual name = V-DBE 0.80mm version = 4 -definition = deltacomb_dc20dual [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.80 + diff --git a/resources/variants/deltacomb/deltacomb_dc20flux_fbe025.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20flux_fbe025.inst.cfg index f47b3f17eb..7187a91b6f 100755 --- a/resources/variants/deltacomb/deltacomb_dc20flux_fbe025.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc20flux_fbe025.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = deltacomb_dc20flux name = FBE 0.25mm version = 4 -definition = deltacomb_dc20flux [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.25 \ No newline at end of file +machine_nozzle_size = 0.25 + diff --git a/resources/variants/deltacomb/deltacomb_dc20flux_fbe040.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20flux_fbe040.inst.cfg index 2e11b932df..9311045b76 100755 --- a/resources/variants/deltacomb/deltacomb_dc20flux_fbe040.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc20flux_fbe040.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = deltacomb_dc20flux name = FBE 0.40mm version = 4 -definition = deltacomb_dc20flux [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.40 + diff --git a/resources/variants/deltacomb/deltacomb_dc20flux_fbe060.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20flux_fbe060.inst.cfg index 5c0d503c8a..f656a9983f 100755 --- a/resources/variants/deltacomb/deltacomb_dc20flux_fbe060.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc20flux_fbe060.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = deltacomb_dc20flux name = FBE 0.60mm version = 4 -definition = deltacomb_dc20flux [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.60 + diff --git a/resources/variants/deltacomb/deltacomb_dc21_fbe025.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21_fbe025.inst.cfg index 581aafcbb3..9b2fc7f209 100755 --- a/resources/variants/deltacomb/deltacomb_dc21_fbe025.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc21_fbe025.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = deltacomb_dc21 name = FBE 0.25mm version = 4 -definition = deltacomb_dc21 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.25 \ No newline at end of file +machine_nozzle_size = 0.25 + diff --git a/resources/variants/deltacomb/deltacomb_dc21_fbe040.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21_fbe040.inst.cfg index f333040c7b..685b6c1ce2 100755 --- a/resources/variants/deltacomb/deltacomb_dc21_fbe040.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc21_fbe040.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = deltacomb_dc21 name = FBE 0.40mm version = 4 -definition = deltacomb_dc21 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.40 + diff --git a/resources/variants/deltacomb/deltacomb_dc21_fbe060.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21_fbe060.inst.cfg index 38c952e849..f883190fc9 100755 --- a/resources/variants/deltacomb/deltacomb_dc21_fbe060.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc21_fbe060.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = deltacomb_dc21 name = FBE 0.60mm version = 4 -definition = deltacomb_dc21 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.60 + diff --git a/resources/variants/deltacomb/deltacomb_dc21_vfbe080.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21_vfbe080.inst.cfg index 81d767255a..1568829713 100755 --- a/resources/variants/deltacomb/deltacomb_dc21_vfbe080.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc21_vfbe080.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = deltacomb_dc21 name = V-FBE 0.80mm version = 4 -definition = deltacomb_dc21 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.80 + diff --git a/resources/variants/deltacomb/deltacomb_dc21dual_dbe025.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21dual_dbe025.inst.cfg index 37b6ff31f5..5a40000c9d 100755 --- a/resources/variants/deltacomb/deltacomb_dc21dual_dbe025.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc21dual_dbe025.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = deltacomb_dc21dual name = DBE 0.25mm version = 4 -definition = deltacomb_dc21dual [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.25 \ No newline at end of file +machine_nozzle_size = 0.25 + diff --git a/resources/variants/deltacomb/deltacomb_dc21dual_dbe040.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21dual_dbe040.inst.cfg index 1d756493e5..d574db3681 100755 --- a/resources/variants/deltacomb/deltacomb_dc21dual_dbe040.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc21dual_dbe040.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = deltacomb_dc21dual name = DBE 0.40mm version = 4 -definition = deltacomb_dc21dual [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.40 + diff --git a/resources/variants/deltacomb/deltacomb_dc21dual_dbe060.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21dual_dbe060.inst.cfg index 6d00051e27..0f24b4e41c 100755 --- a/resources/variants/deltacomb/deltacomb_dc21dual_dbe060.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc21dual_dbe060.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = deltacomb_dc21dual name = DBE 0.60mm version = 4 -definition = deltacomb_dc21dual [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.60 + diff --git a/resources/variants/deltacomb/deltacomb_dc21dual_vdbe080.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21dual_vdbe080.inst.cfg index cc504aa483..ea5ad942ea 100755 --- a/resources/variants/deltacomb/deltacomb_dc21dual_vdbe080.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc21dual_vdbe080.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = deltacomb_dc21dual name = V-DBE 0.80mm version = 4 -definition = deltacomb_dc21dual [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.80 + diff --git a/resources/variants/deltacomb/deltacomb_dc21flux_fbe025.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21flux_fbe025.inst.cfg index 5144bbf58d..b40cbfa800 100755 --- a/resources/variants/deltacomb/deltacomb_dc21flux_fbe025.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc21flux_fbe025.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = deltacomb_dc21flux name = FBE 0.25mm version = 4 -definition = deltacomb_dc21flux [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.25 \ No newline at end of file +machine_nozzle_size = 0.25 + diff --git a/resources/variants/deltacomb/deltacomb_dc21flux_fbe040.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21flux_fbe040.inst.cfg index 5a7503e644..2df7aea365 100755 --- a/resources/variants/deltacomb/deltacomb_dc21flux_fbe040.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc21flux_fbe040.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = deltacomb_dc21flux name = FBE 0.40mm version = 4 -definition = deltacomb_dc21flux [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.40 + diff --git a/resources/variants/deltacomb/deltacomb_dc21flux_fbe060.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21flux_fbe060.inst.cfg index f2ca2354cf..2d734b7db7 100755 --- a/resources/variants/deltacomb/deltacomb_dc21flux_fbe060.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc21flux_fbe060.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = deltacomb_dc21flux name = FBE 0.60mm version = 4 -definition = deltacomb_dc21flux [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.60 + diff --git a/resources/variants/deltacomb/deltacomb_dc30_fbe025.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30_fbe025.inst.cfg index 7f219c369c..d90ed52e7a 100755 --- a/resources/variants/deltacomb/deltacomb_dc30_fbe025.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc30_fbe025.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = deltacomb_dc30 name = FBE 0.25mm version = 4 -definition = deltacomb_dc30 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.25 \ No newline at end of file +machine_nozzle_size = 0.25 + diff --git a/resources/variants/deltacomb/deltacomb_dc30_fbe040.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30_fbe040.inst.cfg index 22983b8683..13d9902a8c 100755 --- a/resources/variants/deltacomb/deltacomb_dc30_fbe040.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc30_fbe040.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = deltacomb_dc30 name = FBE 0.40mm version = 4 -definition = deltacomb_dc30 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.40 + diff --git a/resources/variants/deltacomb/deltacomb_dc30_fbe060.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30_fbe060.inst.cfg index 35d01906ca..ac6651d621 100755 --- a/resources/variants/deltacomb/deltacomb_dc30_fbe060.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc30_fbe060.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = deltacomb_dc30 name = FBE 0.60mm version = 4 -definition = deltacomb_dc30 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.60 + diff --git a/resources/variants/deltacomb/deltacomb_dc30_vfbe080.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30_vfbe080.inst.cfg index ade1758215..284356e63f 100755 --- a/resources/variants/deltacomb/deltacomb_dc30_vfbe080.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc30_vfbe080.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = deltacomb_dc30 name = V-FBE 0.80mm version = 4 -definition = deltacomb_dc30 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.80 + diff --git a/resources/variants/deltacomb/deltacomb_dc30dual_dbe025.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30dual_dbe025.inst.cfg index a02da6204f..05e216884b 100755 --- a/resources/variants/deltacomb/deltacomb_dc30dual_dbe025.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc30dual_dbe025.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = deltacomb_dc30dual name = DBE 0.25mm version = 4 -definition = deltacomb_dc30dual [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.25 \ No newline at end of file +machine_nozzle_size = 0.25 + diff --git a/resources/variants/deltacomb/deltacomb_dc30dual_dbe040.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30dual_dbe040.inst.cfg index 8200cc9dc7..9de3dd2cef 100755 --- a/resources/variants/deltacomb/deltacomb_dc30dual_dbe040.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc30dual_dbe040.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = deltacomb_dc30dual name = DBE 0.40mm version = 4 -definition = deltacomb_dc30dual [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.40 + diff --git a/resources/variants/deltacomb/deltacomb_dc30dual_dbe060.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30dual_dbe060.inst.cfg index c316e97457..bea0079e69 100755 --- a/resources/variants/deltacomb/deltacomb_dc30dual_dbe060.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc30dual_dbe060.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = deltacomb_dc30dual name = DBE 0.60mm version = 4 -definition = deltacomb_dc30dual [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.60 + diff --git a/resources/variants/deltacomb/deltacomb_dc30dual_vdbe080.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30dual_vdbe080.inst.cfg index b505a16540..218e03618d 100755 --- a/resources/variants/deltacomb/deltacomb_dc30dual_vdbe080.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc30dual_vdbe080.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = deltacomb_dc30dual name = V-DBE 0.80mm version = 4 -definition = deltacomb_dc30dual [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.80 + diff --git a/resources/variants/deltacomb/deltacomb_dc30flux_fbe025.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30flux_fbe025.inst.cfg index bbdac73540..a989165478 100755 --- a/resources/variants/deltacomb/deltacomb_dc30flux_fbe025.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc30flux_fbe025.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = deltacomb_dc30flux name = FBE 0.25mm version = 4 -definition = deltacomb_dc30flux [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.25 \ No newline at end of file +machine_nozzle_size = 0.25 + diff --git a/resources/variants/deltacomb/deltacomb_dc30flux_fbe040.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30flux_fbe040.inst.cfg index 40c1d6def7..9a126f18ca 100755 --- a/resources/variants/deltacomb/deltacomb_dc30flux_fbe040.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc30flux_fbe040.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = deltacomb_dc30flux name = FBE 0.40mm version = 4 -definition = deltacomb_dc30flux [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.40 + diff --git a/resources/variants/deltacomb/deltacomb_dc30flux_fbe060.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30flux_fbe060.inst.cfg index 6f946e8ff3..c9f8a04fb7 100755 --- a/resources/variants/deltacomb/deltacomb_dc30flux_fbe060.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc30flux_fbe060.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = deltacomb_dc30flux name = FBE 0.60mm version = 4 -definition = deltacomb_dc30flux [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.60 + diff --git a/resources/variants/diy220_0.2.inst.cfg b/resources/variants/diy/diy220_0.2.inst.cfg similarity index 100% rename from resources/variants/diy220_0.2.inst.cfg rename to resources/variants/diy/diy220_0.2.inst.cfg index 69db2f722d..f6c6513e32 100644 --- a/resources/variants/diy220_0.2.inst.cfg +++ b/resources/variants/diy/diy220_0.2.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = diy220 name = 0.2 mm Nozzle version = 4 -definition = diy220 [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/diy220_0.3.inst.cfg b/resources/variants/diy/diy220_0.3.inst.cfg similarity index 100% rename from resources/variants/diy220_0.3.inst.cfg rename to resources/variants/diy/diy220_0.3.inst.cfg index 5184a4417b..6d97c31a50 100644 --- a/resources/variants/diy220_0.3.inst.cfg +++ b/resources/variants/diy/diy220_0.3.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = diy220 name = 0.3 mm Nozzle version = 4 -definition = diy220 [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/diy220_0.4.inst.cfg b/resources/variants/diy/diy220_0.4.inst.cfg similarity index 100% rename from resources/variants/diy220_0.4.inst.cfg rename to resources/variants/diy/diy220_0.4.inst.cfg index fe504fca23..e14620cde5 100644 --- a/resources/variants/diy220_0.4.inst.cfg +++ b/resources/variants/diy/diy220_0.4.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = diy220 name = 0.4 mm Nozzle version = 4 -definition = diy220 [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/diy220_0.5.inst.cfg b/resources/variants/diy/diy220_0.5.inst.cfg similarity index 100% rename from resources/variants/diy220_0.5.inst.cfg rename to resources/variants/diy/diy220_0.5.inst.cfg index 9f8b73c599..e2e06e1d39 100644 --- a/resources/variants/diy220_0.5.inst.cfg +++ b/resources/variants/diy/diy220_0.5.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = diy220 name = 0.5 mm Nozzle version = 4 -definition = diy220 [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/diy220_0.6.inst.cfg b/resources/variants/diy/diy220_0.6.inst.cfg similarity index 100% rename from resources/variants/diy220_0.6.inst.cfg rename to resources/variants/diy/diy220_0.6.inst.cfg index 821f193b6f..8aeaaa8272 100644 --- a/resources/variants/diy220_0.6.inst.cfg +++ b/resources/variants/diy/diy220_0.6.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = diy220 name = 0.6 mm Nozzle version = 4 -definition = diy220 [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/diy220_0.8.inst.cfg b/resources/variants/diy/diy220_0.8.inst.cfg similarity index 100% rename from resources/variants/diy220_0.8.inst.cfg rename to resources/variants/diy/diy220_0.8.inst.cfg index 938ae71723..b5790651f0 100644 --- a/resources/variants/diy220_0.8.inst.cfg +++ b/resources/variants/diy/diy220_0.8.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = diy220 name = 0.8 mm Nozzle version = 4 -definition = diy220 [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/fabtotum_hyb35.inst.cfg b/resources/variants/fabtotum/fabtotum_hyb35.inst.cfg similarity index 99% rename from resources/variants/fabtotum_hyb35.inst.cfg rename to resources/variants/fabtotum/fabtotum_hyb35.inst.cfg index 015169872b..1f480bfbfe 100644 --- a/resources/variants/fabtotum_hyb35.inst.cfg +++ b/resources/variants/fabtotum/fabtotum_hyb35.inst.cfg @@ -1,17 +1,18 @@ [general] +definition = fabtotum name = Hybrid 0.35 mm version = 4 -definition = fabtotum [metadata] author = FABtotum +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.35 -retraction_speed = 23 retraction_amount = 2.5 retraction_count_max = 25 retraction_min_travel = 0.1 +retraction_speed = 23 + diff --git a/resources/variants/fabtotum_lite04.inst.cfg b/resources/variants/fabtotum/fabtotum_lite04.inst.cfg similarity index 99% rename from resources/variants/fabtotum_lite04.inst.cfg rename to resources/variants/fabtotum/fabtotum_lite04.inst.cfg index f3ee555941..961823087e 100644 --- a/resources/variants/fabtotum_lite04.inst.cfg +++ b/resources/variants/fabtotum/fabtotum_lite04.inst.cfg @@ -1,17 +1,18 @@ [general] +definition = fabtotum name = Lite 0.4 mm version = 4 -definition = fabtotum [metadata] author = FABtotum +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 -retraction_speed = 23 retraction_amount = 2.5 retraction_count_max = 25 retraction_min_travel = 0.1 +retraction_speed = 23 + diff --git a/resources/variants/fabtotum_lite06.inst.cfg b/resources/variants/fabtotum/fabtotum_lite06.inst.cfg similarity index 99% rename from resources/variants/fabtotum_lite06.inst.cfg rename to resources/variants/fabtotum/fabtotum_lite06.inst.cfg index 02d2e8b254..9c44f7b688 100644 --- a/resources/variants/fabtotum_lite06.inst.cfg +++ b/resources/variants/fabtotum/fabtotum_lite06.inst.cfg @@ -1,17 +1,18 @@ [general] +definition = fabtotum name = Lite 0.6 mm version = 4 -definition = fabtotum [metadata] author = FABtotum +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 -retraction_speed = 23 retraction_amount = 2.5 retraction_count_max = 25 retraction_min_travel = 0.1 +retraction_speed = 23 + diff --git a/resources/variants/fabtotum_pro02.inst.cfg b/resources/variants/fabtotum/fabtotum_pro02.inst.cfg similarity index 99% rename from resources/variants/fabtotum_pro02.inst.cfg rename to resources/variants/fabtotum/fabtotum_pro02.inst.cfg index 7f5eaeca48..04943783a4 100644 --- a/resources/variants/fabtotum_pro02.inst.cfg +++ b/resources/variants/fabtotum/fabtotum_pro02.inst.cfg @@ -1,17 +1,18 @@ [general] +definition = fabtotum name = Pro 0.2 mm version = 4 -definition = fabtotum [metadata] author = FABtotum +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 -retraction_speed = 48 retraction_amount = 1.0 retraction_count_max = 50 retraction_min_travel = 0.1 +retraction_speed = 48 + diff --git a/resources/variants/fabtotum_pro04.inst.cfg b/resources/variants/fabtotum/fabtotum_pro04.inst.cfg similarity index 99% rename from resources/variants/fabtotum_pro04.inst.cfg rename to resources/variants/fabtotum/fabtotum_pro04.inst.cfg index ddce52a4c4..950a389582 100644 --- a/resources/variants/fabtotum_pro04.inst.cfg +++ b/resources/variants/fabtotum/fabtotum_pro04.inst.cfg @@ -1,17 +1,18 @@ [general] +definition = fabtotum name = Pro 0.4 mm version = 4 -definition = fabtotum [metadata] author = FABtotum +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 -retraction_speed = 48 retraction_amount = 1.0 retraction_count_max = 50 retraction_min_travel = 0.1 +retraction_speed = 48 + diff --git a/resources/variants/fabtotum_pro06.inst.cfg b/resources/variants/fabtotum/fabtotum_pro06.inst.cfg similarity index 99% rename from resources/variants/fabtotum_pro06.inst.cfg rename to resources/variants/fabtotum/fabtotum_pro06.inst.cfg index b24a1c2850..7c1236ff7f 100644 --- a/resources/variants/fabtotum_pro06.inst.cfg +++ b/resources/variants/fabtotum/fabtotum_pro06.inst.cfg @@ -1,17 +1,18 @@ [general] +definition = fabtotum name = Pro 0.6 mm version = 4 -definition = fabtotum [metadata] author = FABtotum +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 -retraction_speed = 48 retraction_amount = 1.0 retraction_count_max = 50 retraction_min_travel = 0.1 +retraction_speed = 48 + diff --git a/resources/variants/fabtotum_pro08.inst.cfg b/resources/variants/fabtotum/fabtotum_pro08.inst.cfg similarity index 99% rename from resources/variants/fabtotum_pro08.inst.cfg rename to resources/variants/fabtotum/fabtotum_pro08.inst.cfg index 3374124c01..554b72620e 100644 --- a/resources/variants/fabtotum_pro08.inst.cfg +++ b/resources/variants/fabtotum/fabtotum_pro08.inst.cfg @@ -1,17 +1,18 @@ [general] +definition = fabtotum name = Pro 0.8 mm version = 4 -definition = fabtotum [metadata] author = FABtotum +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 -retraction_speed = 48 retraction_amount = 1.0 retraction_count_max = 50 retraction_min_travel = 0.1 +retraction_speed = 48 + diff --git a/resources/variants/farm2_ce_printhead_0.2.inst.cfg b/resources/variants/farm2/farm2_ce_printhead_0.2.inst.cfg similarity index 99% rename from resources/variants/farm2_ce_printhead_0.2.inst.cfg rename to resources/variants/farm2/farm2_ce_printhead_0.2.inst.cfg index e645e873a4..aa88f2b6fd 100644 --- a/resources/variants/farm2_ce_printhead_0.2.inst.cfg +++ b/resources/variants/farm2/farm2_ce_printhead_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = farm2_ce name = PrintHead 0.2 mm version = 4 -definition = farm2_ce [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/farm2_ce_printhead_0.3.inst.cfg b/resources/variants/farm2/farm2_ce_printhead_0.3.inst.cfg similarity index 99% rename from resources/variants/farm2_ce_printhead_0.3.inst.cfg rename to resources/variants/farm2/farm2_ce_printhead_0.3.inst.cfg index a725cea11e..b655fd4011 100644 --- a/resources/variants/farm2_ce_printhead_0.3.inst.cfg +++ b/resources/variants/farm2/farm2_ce_printhead_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = farm2_ce name = PrintHead 0.3 mm version = 4 -definition = farm2_ce [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/farm2_ce_printhead_0.4.inst.cfg b/resources/variants/farm2/farm2_ce_printhead_0.4.inst.cfg similarity index 99% rename from resources/variants/farm2_ce_printhead_0.4.inst.cfg rename to resources/variants/farm2/farm2_ce_printhead_0.4.inst.cfg index f230140459..3376899daa 100644 --- a/resources/variants/farm2_ce_printhead_0.4.inst.cfg +++ b/resources/variants/farm2/farm2_ce_printhead_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = farm2_ce name = PrintHead 0.4 mm version = 4 -definition = farm2_ce [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/farm2_ce_printhead_0.5.inst.cfg b/resources/variants/farm2/farm2_ce_printhead_0.5.inst.cfg similarity index 99% rename from resources/variants/farm2_ce_printhead_0.5.inst.cfg rename to resources/variants/farm2/farm2_ce_printhead_0.5.inst.cfg index 0a31e2229c..3e768ac98d 100644 --- a/resources/variants/farm2_ce_printhead_0.5.inst.cfg +++ b/resources/variants/farm2/farm2_ce_printhead_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = farm2_ce name = PrintHead 0.5 mm version = 4 -definition = farm2_ce [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/farm2_printhead_0.2.inst.cfg b/resources/variants/farm2/farm2_printhead_0.2.inst.cfg similarity index 99% rename from resources/variants/farm2_printhead_0.2.inst.cfg rename to resources/variants/farm2/farm2_printhead_0.2.inst.cfg index e54d01d296..2dc2c6f463 100644 --- a/resources/variants/farm2_printhead_0.2.inst.cfg +++ b/resources/variants/farm2/farm2_printhead_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = farm2 name = PrintHead 0.2 mm version = 4 -definition = farm2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/farm2_printhead_0.3.inst.cfg b/resources/variants/farm2/farm2_printhead_0.3.inst.cfg similarity index 99% rename from resources/variants/farm2_printhead_0.3.inst.cfg rename to resources/variants/farm2/farm2_printhead_0.3.inst.cfg index e2fdf4104f..0ba4e78d47 100644 --- a/resources/variants/farm2_printhead_0.3.inst.cfg +++ b/resources/variants/farm2/farm2_printhead_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = farm2 name = PrintHead 0.3 mm version = 4 -definition = farm2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/farm2_printhead_0.4.inst.cfg b/resources/variants/farm2/farm2_printhead_0.4.inst.cfg similarity index 99% rename from resources/variants/farm2_printhead_0.4.inst.cfg rename to resources/variants/farm2/farm2_printhead_0.4.inst.cfg index 426d2f36b4..7553281a83 100644 --- a/resources/variants/farm2_printhead_0.4.inst.cfg +++ b/resources/variants/farm2/farm2_printhead_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = farm2 name = PrintHead 0.4 mm version = 4 -definition = farm2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/farm2_printhead_0.5.inst.cfg b/resources/variants/farm2/farm2_printhead_0.5.inst.cfg similarity index 99% rename from resources/variants/farm2_printhead_0.5.inst.cfg rename to resources/variants/farm2/farm2_printhead_0.5.inst.cfg index 2536f956da..91a5e03174 100644 --- a/resources/variants/farm2_printhead_0.5.inst.cfg +++ b/resources/variants/farm2/farm2_printhead_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = farm2 name = PrintHead 0.5 mm version = 4 -definition = farm2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/felixpro2_0.25.inst.cfg b/resources/variants/felix/felixpro2_0.25.inst.cfg similarity index 99% rename from resources/variants/felixpro2_0.25.inst.cfg rename to resources/variants/felix/felixpro2_0.25.inst.cfg index 796038cfa3..fb2010b977 100644 --- a/resources/variants/felixpro2_0.25.inst.cfg +++ b/resources/variants/felix/felixpro2_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = felixpro2dual name = 0.25 mm version = 4 -definition = felixpro2dual [metadata] author = pnks -type = variant -setting_version = 20 hardware_type = nozzle +setting_version = 20 +type = variant [values] -machine_nozzle_size = 0.25 layer_height_0 = 0.15 +machine_nozzle_size = 0.25 + diff --git a/resources/variants/felixpro2_0.35.inst.cfg b/resources/variants/felix/felixpro2_0.35.inst.cfg similarity index 99% rename from resources/variants/felixpro2_0.35.inst.cfg rename to resources/variants/felix/felixpro2_0.35.inst.cfg index cbf8ea0347..218a7a1a42 100644 --- a/resources/variants/felixpro2_0.35.inst.cfg +++ b/resources/variants/felix/felixpro2_0.35.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = felixpro2dual name = 0.35 mm version = 4 -definition = felixpro2dual [metadata] author = pnks -type = variant -setting_version = 20 hardware_type = nozzle +setting_version = 20 +type = variant [values] -machine_nozzle_size = 0.35 layer_height_0 = 0.2 +machine_nozzle_size = 0.35 + diff --git a/resources/variants/felixpro2_0.50.inst.cfg b/resources/variants/felix/felixpro2_0.50.inst.cfg similarity index 99% rename from resources/variants/felixpro2_0.50.inst.cfg rename to resources/variants/felix/felixpro2_0.50.inst.cfg index 1bdbcd00cf..a3ba0e2d5f 100644 --- a/resources/variants/felixpro2_0.50.inst.cfg +++ b/resources/variants/felix/felixpro2_0.50.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = felixpro2dual name = 0.50 mm version = 4 -definition = felixpro2dual [metadata] author = pnks -type = variant -setting_version = 20 hardware_type = nozzle +setting_version = 20 +type = variant [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/felixpro2_0.70.inst.cfg b/resources/variants/felix/felixpro2_0.70.inst.cfg similarity index 99% rename from resources/variants/felixpro2_0.70.inst.cfg rename to resources/variants/felix/felixpro2_0.70.inst.cfg index 8194f791e5..412cb1af35 100644 --- a/resources/variants/felixpro2_0.70.inst.cfg +++ b/resources/variants/felix/felixpro2_0.70.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = felixpro2dual name = 0.70 mm version = 4 -definition = felixpro2dual [metadata] author = pnks -type = variant -setting_version = 20 hardware_type = nozzle +setting_version = 20 +type = variant [values] -machine_nozzle_size = 0.70 layer_height_0 = 0.4 +machine_nozzle_size = 0.70 + diff --git a/resources/variants/felixtec4_0.25.inst.cfg b/resources/variants/felix/felixtec4_0.25.inst.cfg similarity index 99% rename from resources/variants/felixtec4_0.25.inst.cfg rename to resources/variants/felix/felixtec4_0.25.inst.cfg index ae1997c612..275f81ba10 100644 --- a/resources/variants/felixtec4_0.25.inst.cfg +++ b/resources/variants/felix/felixtec4_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = felixtec4dual name = 0.25 mm version = 4 -definition = felixtec4dual [metadata] author = kerog777 -type = variant -setting_version = 20 hardware_type = nozzle +setting_version = 20 +type = variant [values] -machine_nozzle_size = 0.25 layer_height_0 = 0.15 +machine_nozzle_size = 0.25 + diff --git a/resources/variants/felixtec4_0.35.inst.cfg b/resources/variants/felix/felixtec4_0.35.inst.cfg similarity index 99% rename from resources/variants/felixtec4_0.35.inst.cfg rename to resources/variants/felix/felixtec4_0.35.inst.cfg index 1810156ad5..867d8d0b6e 100644 --- a/resources/variants/felixtec4_0.35.inst.cfg +++ b/resources/variants/felix/felixtec4_0.35.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = felixtec4dual name = 0.35 mm version = 4 -definition = felixtec4dual [metadata] author = kerog777 -type = variant -setting_version = 20 hardware_type = nozzle +setting_version = 20 +type = variant [values] -machine_nozzle_size = 0.35 layer_height_0 = 0.2 +machine_nozzle_size = 0.35 + diff --git a/resources/variants/felixtec4_0.50.inst.cfg b/resources/variants/felix/felixtec4_0.50.inst.cfg similarity index 99% rename from resources/variants/felixtec4_0.50.inst.cfg rename to resources/variants/felix/felixtec4_0.50.inst.cfg index b483a33f6a..176bf165a1 100644 --- a/resources/variants/felixtec4_0.50.inst.cfg +++ b/resources/variants/felix/felixtec4_0.50.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = felixtec4dual name = 0.50 mm version = 4 -definition = felixtec4dual [metadata] author = kerog777 -type = variant hardware_type = nozzle setting_version = 20 +type = variant [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/felixtec4_0.70.inst.cfg b/resources/variants/felix/felixtec4_0.70.inst.cfg similarity index 99% rename from resources/variants/felixtec4_0.70.inst.cfg rename to resources/variants/felix/felixtec4_0.70.inst.cfg index fd10bcce6b..82de46723e 100644 --- a/resources/variants/felixtec4_0.70.inst.cfg +++ b/resources/variants/felix/felixtec4_0.70.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = felixtec4dual name = 0.70 mm version = 4 -definition = felixtec4dual [metadata] author = kerog777 -type = variant hardware_type = nozzle setting_version = 20 +type = variant [values] -machine_nozzle_size = 0.70 layer_height_0 = 0.4 +machine_nozzle_size = 0.70 + diff --git a/resources/variants/flashforge_base_0.20.inst.cfg b/resources/variants/flashforge/flashforge_base_0.20.inst.cfg similarity index 99% rename from resources/variants/flashforge_base_0.20.inst.cfg rename to resources/variants/flashforge/flashforge_base_0.20.inst.cfg index 7c1c59eb50..b4be49b655 100644 --- a/resources/variants/flashforge_base_0.20.inst.cfg +++ b/resources/variants/flashforge/flashforge_base_0.20.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = flashforge_base name = 0.2mm Nozzle version = 4 -definition = flashforge_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/flashforge_base_0.30.inst.cfg b/resources/variants/flashforge/flashforge_base_0.30.inst.cfg similarity index 99% rename from resources/variants/flashforge_base_0.30.inst.cfg rename to resources/variants/flashforge/flashforge_base_0.30.inst.cfg index 1335b98fa8..0425366bb1 100644 --- a/resources/variants/flashforge_base_0.30.inst.cfg +++ b/resources/variants/flashforge/flashforge_base_0.30.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = flashforge_base name = 0.3mm Nozzle version = 4 -definition = flashforge_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/flashforge_base_0.40.inst.cfg b/resources/variants/flashforge/flashforge_base_0.40.inst.cfg similarity index 99% rename from resources/variants/flashforge_base_0.40.inst.cfg rename to resources/variants/flashforge/flashforge_base_0.40.inst.cfg index bce90fdda7..f1b767c045 100644 --- a/resources/variants/flashforge_base_0.40.inst.cfg +++ b/resources/variants/flashforge/flashforge_base_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = flashforge_base name = 0.4mm Nozzle version = 4 -definition = flashforge_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/flashforge_base_0.50.inst.cfg b/resources/variants/flashforge/flashforge_base_0.50.inst.cfg similarity index 99% rename from resources/variants/flashforge_base_0.50.inst.cfg rename to resources/variants/flashforge/flashforge_base_0.50.inst.cfg index de3c523eba..8d382b5af7 100644 --- a/resources/variants/flashforge_base_0.50.inst.cfg +++ b/resources/variants/flashforge/flashforge_base_0.50.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = flashforge_base name = 0.5mm Nozzle version = 4 -definition = flashforge_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/flashforge_base_0.60.inst.cfg b/resources/variants/flashforge/flashforge_base_0.60.inst.cfg similarity index 99% rename from resources/variants/flashforge_base_0.60.inst.cfg rename to resources/variants/flashforge/flashforge_base_0.60.inst.cfg index dfe978ce26..693dcb4f06 100644 --- a/resources/variants/flashforge_base_0.60.inst.cfg +++ b/resources/variants/flashforge/flashforge_base_0.60.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = flashforge_base name = 0.6mm Nozzle version = 4 -definition = flashforge_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/flashforge_dreamer_nx_0.20.inst.cfg b/resources/variants/flashforge/flashforge_dreamer_nx_0.20.inst.cfg similarity index 99% rename from resources/variants/flashforge_dreamer_nx_0.20.inst.cfg rename to resources/variants/flashforge/flashforge_dreamer_nx_0.20.inst.cfg index 343580315b..14b173caff 100644 --- a/resources/variants/flashforge_dreamer_nx_0.20.inst.cfg +++ b/resources/variants/flashforge/flashforge_dreamer_nx_0.20.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = flashforge_dreamer_nx name = 0.2mm Nozzle version = 4 -definition = flashforge_dreamer_nx [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/flashforge_dreamer_nx_0.30.inst.cfg b/resources/variants/flashforge/flashforge_dreamer_nx_0.30.inst.cfg similarity index 99% rename from resources/variants/flashforge_dreamer_nx_0.30.inst.cfg rename to resources/variants/flashforge/flashforge_dreamer_nx_0.30.inst.cfg index 2103e02521..7142553387 100644 --- a/resources/variants/flashforge_dreamer_nx_0.30.inst.cfg +++ b/resources/variants/flashforge/flashforge_dreamer_nx_0.30.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = flashforge_dreamer_nx name = 0.3mm Nozzle version = 4 -definition = flashforge_dreamer_nx [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/flashforge_dreamer_nx_0.40.inst.cfg b/resources/variants/flashforge/flashforge_dreamer_nx_0.40.inst.cfg similarity index 99% rename from resources/variants/flashforge_dreamer_nx_0.40.inst.cfg rename to resources/variants/flashforge/flashforge_dreamer_nx_0.40.inst.cfg index c2704a6677..6e479b10a5 100644 --- a/resources/variants/flashforge_dreamer_nx_0.40.inst.cfg +++ b/resources/variants/flashforge/flashforge_dreamer_nx_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = flashforge_dreamer_nx name = 0.4mm Nozzle version = 4 -definition = flashforge_dreamer_nx [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/flashforge_dreamer_nx_0.50.inst.cfg b/resources/variants/flashforge/flashforge_dreamer_nx_0.50.inst.cfg similarity index 99% rename from resources/variants/flashforge_dreamer_nx_0.50.inst.cfg rename to resources/variants/flashforge/flashforge_dreamer_nx_0.50.inst.cfg index 06c9ed8b52..9e2eb8f304 100644 --- a/resources/variants/flashforge_dreamer_nx_0.50.inst.cfg +++ b/resources/variants/flashforge/flashforge_dreamer_nx_0.50.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = flashforge_dreamer_nx name = 0.5mm Nozzle version = 4 -definition = flashforge_dreamer_nx [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/flashforge_dreamer_nx_0.60.inst.cfg b/resources/variants/flashforge/flashforge_dreamer_nx_0.60.inst.cfg similarity index 99% rename from resources/variants/flashforge_dreamer_nx_0.60.inst.cfg rename to resources/variants/flashforge/flashforge_dreamer_nx_0.60.inst.cfg index fc204e0999..800d570656 100644 --- a/resources/variants/flashforge_dreamer_nx_0.60.inst.cfg +++ b/resources/variants/flashforge/flashforge_dreamer_nx_0.60.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = flashforge_dreamer_nx name = 0.6mm Nozzle version = 4 -definition = flashforge_dreamer_nx [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/flyingbear_base_0.25.inst.cfg b/resources/variants/flyingbear/flyingbear_base_0.25.inst.cfg similarity index 99% rename from resources/variants/flyingbear_base_0.25.inst.cfg rename to resources/variants/flyingbear/flyingbear_base_0.25.inst.cfg index 146a959185..fbb8215ffc 100644 --- a/resources/variants/flyingbear_base_0.25.inst.cfg +++ b/resources/variants/flyingbear/flyingbear_base_0.25.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = flyingbear_base name = 0.25mm Nozzle version = 4 -definition = flyingbear_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.25 + diff --git a/resources/variants/flyingbear_base_0.30.inst.cfg b/resources/variants/flyingbear/flyingbear_base_0.30.inst.cfg similarity index 99% rename from resources/variants/flyingbear_base_0.30.inst.cfg rename to resources/variants/flyingbear/flyingbear_base_0.30.inst.cfg index ef514da329..6cc7198767 100644 --- a/resources/variants/flyingbear_base_0.30.inst.cfg +++ b/resources/variants/flyingbear/flyingbear_base_0.30.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = flyingbear_base name = 0.3mm Nozzle version = 4 -definition = flyingbear_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/flyingbear_base_0.40.inst.cfg b/resources/variants/flyingbear/flyingbear_base_0.40.inst.cfg similarity index 99% rename from resources/variants/flyingbear_base_0.40.inst.cfg rename to resources/variants/flyingbear/flyingbear_base_0.40.inst.cfg index 47b5ee244d..76ffcd93ec 100644 --- a/resources/variants/flyingbear_base_0.40.inst.cfg +++ b/resources/variants/flyingbear/flyingbear_base_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = flyingbear_base name = 0.4mm Nozzle version = 4 -definition = flyingbear_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/flyingbear_base_0.50.inst.cfg b/resources/variants/flyingbear/flyingbear_base_0.50.inst.cfg similarity index 99% rename from resources/variants/flyingbear_base_0.50.inst.cfg rename to resources/variants/flyingbear/flyingbear_base_0.50.inst.cfg index 631bb0a814..3b35af0f50 100644 --- a/resources/variants/flyingbear_base_0.50.inst.cfg +++ b/resources/variants/flyingbear/flyingbear_base_0.50.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = flyingbear_base name = 0.5mm Nozzle version = 4 -definition = flyingbear_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/flyingbear_base_0.60.inst.cfg b/resources/variants/flyingbear/flyingbear_base_0.60.inst.cfg similarity index 99% rename from resources/variants/flyingbear_base_0.60.inst.cfg rename to resources/variants/flyingbear/flyingbear_base_0.60.inst.cfg index 767324604e..3a11d69ee9 100644 --- a/resources/variants/flyingbear_base_0.60.inst.cfg +++ b/resources/variants/flyingbear/flyingbear_base_0.60.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = flyingbear_base name = 0.6mm Nozzle version = 4 -definition = flyingbear_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/flyingbear_base_0.80.inst.cfg b/resources/variants/flyingbear/flyingbear_base_0.80.inst.cfg similarity index 99% rename from resources/variants/flyingbear_base_0.80.inst.cfg rename to resources/variants/flyingbear/flyingbear_base_0.80.inst.cfg index 988158e6cb..688f9ad639 100644 --- a/resources/variants/flyingbear_base_0.80.inst.cfg +++ b/resources/variants/flyingbear/flyingbear_base_0.80.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = flyingbear_base name = 0.8mm Nozzle version = 4 -definition = flyingbear_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/flyingbear_ghost_4s_0.25.inst.cfg b/resources/variants/flyingbear/flyingbear_ghost_4s_0.25.inst.cfg similarity index 99% rename from resources/variants/flyingbear_ghost_4s_0.25.inst.cfg rename to resources/variants/flyingbear/flyingbear_ghost_4s_0.25.inst.cfg index d54a97ea47..f5b5aa07a9 100644 --- a/resources/variants/flyingbear_ghost_4s_0.25.inst.cfg +++ b/resources/variants/flyingbear/flyingbear_ghost_4s_0.25.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = flyingbear_ghost_4s name = 0.25mm Nozzle version = 4 -definition = flyingbear_ghost_4s [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.25 + diff --git a/resources/variants/flyingbear_ghost_4s_0.30.inst.cfg b/resources/variants/flyingbear/flyingbear_ghost_4s_0.30.inst.cfg similarity index 99% rename from resources/variants/flyingbear_ghost_4s_0.30.inst.cfg rename to resources/variants/flyingbear/flyingbear_ghost_4s_0.30.inst.cfg index 21485d8ddd..a8cba144f5 100644 --- a/resources/variants/flyingbear_ghost_4s_0.30.inst.cfg +++ b/resources/variants/flyingbear/flyingbear_ghost_4s_0.30.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = flyingbear_ghost_4s name = 0.3mm Nozzle version = 4 -definition = flyingbear_ghost_4s [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/flyingbear_ghost_4s_0.40.inst.cfg b/resources/variants/flyingbear/flyingbear_ghost_4s_0.40.inst.cfg similarity index 99% rename from resources/variants/flyingbear_ghost_4s_0.40.inst.cfg rename to resources/variants/flyingbear/flyingbear_ghost_4s_0.40.inst.cfg index 1d0e609dff..6a413884bb 100644 --- a/resources/variants/flyingbear_ghost_4s_0.40.inst.cfg +++ b/resources/variants/flyingbear/flyingbear_ghost_4s_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = flyingbear_ghost_4s name = 0.4mm Nozzle version = 4 -definition = flyingbear_ghost_4s [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/flyingbear_ghost_4s_0.50.inst.cfg b/resources/variants/flyingbear/flyingbear_ghost_4s_0.50.inst.cfg similarity index 99% rename from resources/variants/flyingbear_ghost_4s_0.50.inst.cfg rename to resources/variants/flyingbear/flyingbear_ghost_4s_0.50.inst.cfg index dd2ddf2d0f..49a5a61f4a 100644 --- a/resources/variants/flyingbear_ghost_4s_0.50.inst.cfg +++ b/resources/variants/flyingbear/flyingbear_ghost_4s_0.50.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = flyingbear_ghost_4s name = 0.5mm Nozzle version = 4 -definition = flyingbear_ghost_4s [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/flyingbear_ghost_4s_0.60.inst.cfg b/resources/variants/flyingbear/flyingbear_ghost_4s_0.60.inst.cfg similarity index 99% rename from resources/variants/flyingbear_ghost_4s_0.60.inst.cfg rename to resources/variants/flyingbear/flyingbear_ghost_4s_0.60.inst.cfg index 5500dca618..26099c9b96 100644 --- a/resources/variants/flyingbear_ghost_4s_0.60.inst.cfg +++ b/resources/variants/flyingbear/flyingbear_ghost_4s_0.60.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = flyingbear_ghost_4s name = 0.6mm Nozzle version = 4 -definition = flyingbear_ghost_4s [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/flyingbear_ghost_4s_0.80.inst.cfg b/resources/variants/flyingbear/flyingbear_ghost_4s_0.80.inst.cfg similarity index 99% rename from resources/variants/flyingbear_ghost_4s_0.80.inst.cfg rename to resources/variants/flyingbear/flyingbear_ghost_4s_0.80.inst.cfg index 67bc8cb477..2f30e016bb 100644 --- a/resources/variants/flyingbear_ghost_4s_0.80.inst.cfg +++ b/resources/variants/flyingbear/flyingbear_ghost_4s_0.80.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = flyingbear_ghost_4s name = 0.8mm Nozzle version = 4 -definition = flyingbear_ghost_4s [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/flyingbear_ghost_5_0.25.inst.cfg b/resources/variants/flyingbear/flyingbear_ghost_5_0.25.inst.cfg similarity index 99% rename from resources/variants/flyingbear_ghost_5_0.25.inst.cfg rename to resources/variants/flyingbear/flyingbear_ghost_5_0.25.inst.cfg index e5372966ef..79a1c2135d 100644 --- a/resources/variants/flyingbear_ghost_5_0.25.inst.cfg +++ b/resources/variants/flyingbear/flyingbear_ghost_5_0.25.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = flyingbear_ghost_5 name = 0.25mm Nozzle version = 4 -definition = flyingbear_ghost_5 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.25 + diff --git a/resources/variants/flyingbear_ghost_5_0.30.inst.cfg b/resources/variants/flyingbear/flyingbear_ghost_5_0.30.inst.cfg similarity index 99% rename from resources/variants/flyingbear_ghost_5_0.30.inst.cfg rename to resources/variants/flyingbear/flyingbear_ghost_5_0.30.inst.cfg index 958f3b4892..4d4c4d35a6 100644 --- a/resources/variants/flyingbear_ghost_5_0.30.inst.cfg +++ b/resources/variants/flyingbear/flyingbear_ghost_5_0.30.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = flyingbear_ghost_5 name = 0.3mm Nozzle version = 4 -definition = flyingbear_ghost_5 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/flyingbear_ghost_5_0.40.inst.cfg b/resources/variants/flyingbear/flyingbear_ghost_5_0.40.inst.cfg similarity index 99% rename from resources/variants/flyingbear_ghost_5_0.40.inst.cfg rename to resources/variants/flyingbear/flyingbear_ghost_5_0.40.inst.cfg index d1f5dfb782..4850a0245a 100644 --- a/resources/variants/flyingbear_ghost_5_0.40.inst.cfg +++ b/resources/variants/flyingbear/flyingbear_ghost_5_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = flyingbear_ghost_5 name = 0.4mm Nozzle version = 4 -definition = flyingbear_ghost_5 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/flyingbear_ghost_5_0.50.inst.cfg b/resources/variants/flyingbear/flyingbear_ghost_5_0.50.inst.cfg similarity index 99% rename from resources/variants/flyingbear_ghost_5_0.50.inst.cfg rename to resources/variants/flyingbear/flyingbear_ghost_5_0.50.inst.cfg index abce68ca69..3a3bf8e643 100644 --- a/resources/variants/flyingbear_ghost_5_0.50.inst.cfg +++ b/resources/variants/flyingbear/flyingbear_ghost_5_0.50.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = flyingbear_ghost_5 name = 0.5mm Nozzle version = 4 -definition = flyingbear_ghost_5 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/flyingbear_ghost_5_0.60.inst.cfg b/resources/variants/flyingbear/flyingbear_ghost_5_0.60.inst.cfg similarity index 99% rename from resources/variants/flyingbear_ghost_5_0.60.inst.cfg rename to resources/variants/flyingbear/flyingbear_ghost_5_0.60.inst.cfg index a53b91aa2d..97f7c091b2 100644 --- a/resources/variants/flyingbear_ghost_5_0.60.inst.cfg +++ b/resources/variants/flyingbear/flyingbear_ghost_5_0.60.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = flyingbear_ghost_5 name = 0.6mm Nozzle version = 4 -definition = flyingbear_ghost_5 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/flyingbear_ghost_5_0.80.inst.cfg b/resources/variants/flyingbear/flyingbear_ghost_5_0.80.inst.cfg similarity index 99% rename from resources/variants/flyingbear_ghost_5_0.80.inst.cfg rename to resources/variants/flyingbear/flyingbear_ghost_5_0.80.inst.cfg index 1d9cb29608..e6fc9ba57a 100644 --- a/resources/variants/flyingbear_ghost_5_0.80.inst.cfg +++ b/resources/variants/flyingbear/flyingbear_ghost_5_0.80.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = flyingbear_ghost_5 name = 0.8mm Nozzle version = 4 -definition = flyingbear_ghost_5 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/geeetech_variants/geeetech_A10Pro_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_A10Pro_0.2.inst.cfg new file mode 100644 index 0000000000..c7802cd518 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_A10Pro_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_A10Pro +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/geeetech_variants/geeetech_A10Pro_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_A10Pro_0.3.inst.cfg new file mode 100644 index 0000000000..e747eca5c1 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_A10Pro_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_A10Pro +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/geeetech_variants/geeetech_A10Pro_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_A10Pro_0.4.inst.cfg new file mode 100644 index 0000000000..51f2841417 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_A10Pro_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_A10Pro +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/geeetech_variants/geeetech_A10Pro_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_A10Pro_0.5.inst.cfg new file mode 100644 index 0000000000..f0d78f4d4d --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_A10Pro_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_A10Pro +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/geeetech_variants/geeetech_A10Pro_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_A10Pro_0.6.inst.cfg new file mode 100644 index 0000000000..8194aaf87a --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_A10Pro_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_A10Pro +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/geeetech_variants/geeetech_A10Pro_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_A10Pro_0.8.inst.cfg new file mode 100644 index 0000000000..2ccc1efa62 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_A10Pro_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_A10Pro +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/geeetech_variants/geeetech_A10Pro_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_A10Pro_1.0.inst.cfg new file mode 100644 index 0000000000..0f35c3f2a4 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_A10Pro_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_A10Pro +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/geeetech_variants/geeetech_A20_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_A20_0.2.inst.cfg new file mode 100644 index 0000000000..076e44cd77 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_A20_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_A20 +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/geeetech_variants/geeetech_A20_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_A20_0.3.inst.cfg new file mode 100644 index 0000000000..1056713d8f --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_A20_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_A20 +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/geeetech_variants/geeetech_A20_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_A20_0.4.inst.cfg new file mode 100644 index 0000000000..e86e766648 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_A20_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_A20 +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/geeetech_variants/geeetech_A20_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_A20_0.5.inst.cfg new file mode 100644 index 0000000000..02a5affbbb --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_A20_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_A20 +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/geeetech_variants/geeetech_A20_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_A20_0.6.inst.cfg new file mode 100644 index 0000000000..2b857bb33f --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_A20_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_A20 +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/geeetech_variants/geeetech_A20_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_A20_0.8.inst.cfg new file mode 100644 index 0000000000..d0fce8e2e4 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_A20_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_A20 +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/geeetech_variants/geeetech_A20_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_A20_1.0.inst.cfg new file mode 100644 index 0000000000..7dc1ae7151 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_A20_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_A20 +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/geeetech_variants/geeetech_A30Pro_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_A30Pro_0.2.inst.cfg new file mode 100644 index 0000000000..19e741a6d0 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_A30Pro_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_A30Pro +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/geeetech_variants/geeetech_A30Pro_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_A30Pro_0.3.inst.cfg new file mode 100644 index 0000000000..cb0e6454b8 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_A30Pro_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_A30Pro +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/geeetech_variants/geeetech_A30Pro_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_A30Pro_0.4.inst.cfg new file mode 100644 index 0000000000..e0b5ec3a98 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_A30Pro_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_A30Pro +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/geeetech_variants/geeetech_A30Pro_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_A30Pro_0.5.inst.cfg new file mode 100644 index 0000000000..9cb1ab9fed --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_A30Pro_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_A30Pro +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/geeetech_variants/geeetech_A30Pro_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_A30Pro_0.6.inst.cfg new file mode 100644 index 0000000000..d86b384cf9 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_A30Pro_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_A30Pro +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/geeetech_variants/geeetech_A30Pro_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_A30Pro_0.8.inst.cfg new file mode 100644 index 0000000000..fe5259b438 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_A30Pro_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_A30Pro +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/geeetech_variants/geeetech_A30Pro_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_A30Pro_1.0.inst.cfg new file mode 100644 index 0000000000..8f38339613 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_A30Pro_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_A30Pro +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/geeetech_variants/geeetech_E180_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_E180_0.2.inst.cfg new file mode 100644 index 0000000000..c90d24537d --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_E180_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_E180 +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/geeetech_variants/geeetech_E180_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_E180_0.3.inst.cfg new file mode 100644 index 0000000000..278e10c895 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_E180_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_E180 +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/geeetech_variants/geeetech_E180_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_E180_0.4.inst.cfg new file mode 100644 index 0000000000..50e08b8dd4 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_E180_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_E180 +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/geeetech_variants/geeetech_E180_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_E180_0.5.inst.cfg new file mode 100644 index 0000000000..06335141b7 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_E180_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_E180 +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/geeetech_variants/geeetech_E180_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_E180_0.6.inst.cfg new file mode 100644 index 0000000000..7b2a103a9e --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_E180_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_E180 +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/geeetech_variants/geeetech_E180_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_E180_0.8.inst.cfg new file mode 100644 index 0000000000..b299d1642c --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_E180_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_E180 +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/geeetech_variants/geeetech_E180_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_E180_1.0.inst.cfg new file mode 100644 index 0000000000..3e9a1df2fa --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_E180_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_E180 +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.2.inst.cfg new file mode 100644 index 0000000000..c20936e103 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_GiantArmD200 +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.3.inst.cfg new file mode 100644 index 0000000000..46e196c944 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_GiantArmD200 +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.4.inst.cfg new file mode 100644 index 0000000000..1b646a11b1 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_GiantArmD200 +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.5.inst.cfg new file mode 100644 index 0000000000..105455ac4f --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_GiantArmD200 +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.6.inst.cfg new file mode 100644 index 0000000000..17f9e1814f --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_GiantArmD200 +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.8.inst.cfg new file mode 100644 index 0000000000..b9335595b5 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_GiantArmD200_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_GiantArmD200 +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/geeetech_variants/geeetech_GiantArmD200_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_GiantArmD200_1.0.inst.cfg new file mode 100644 index 0000000000..e3dfbf2039 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_GiantArmD200_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_GiantArmD200 +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/geeetech_variants/geeetech_I3ProB_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProB_0.2.inst.cfg new file mode 100644 index 0000000000..8ba4e2a3a1 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_I3ProB_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_I3ProB +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/geeetech_variants/geeetech_I3ProB_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProB_0.3.inst.cfg new file mode 100644 index 0000000000..b9cc4ef081 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_I3ProB_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_I3ProB +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/geeetech_variants/geeetech_I3ProB_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProB_0.4.inst.cfg new file mode 100644 index 0000000000..d0d2ed8c78 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_I3ProB_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_I3ProB +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/geeetech_variants/geeetech_I3ProB_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProB_0.5.inst.cfg new file mode 100644 index 0000000000..210a37d790 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_I3ProB_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_I3ProB +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/geeetech_variants/geeetech_I3ProB_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProB_0.6.inst.cfg new file mode 100644 index 0000000000..00922b7c82 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_I3ProB_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_I3ProB +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/geeetech_variants/geeetech_I3ProB_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProB_0.8.inst.cfg new file mode 100644 index 0000000000..4ba44d737f --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_I3ProB_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_I3ProB +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/geeetech_variants/geeetech_I3ProB_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProB_1.0.inst.cfg new file mode 100644 index 0000000000..789e8e3434 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_I3ProB_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_I3ProB +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/geeetech_variants/geeetech_I3ProW_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProW_0.2.inst.cfg new file mode 100644 index 0000000000..715e1dcb7c --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_I3ProW_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_I3ProW +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/geeetech_variants/geeetech_I3ProW_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProW_0.3.inst.cfg new file mode 100644 index 0000000000..58db0e7d88 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_I3ProW_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_I3ProW +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/geeetech_variants/geeetech_I3ProW_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProW_0.4.inst.cfg new file mode 100644 index 0000000000..d92a26d4a5 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_I3ProW_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_I3ProW +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/geeetech_variants/geeetech_I3ProW_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProW_0.5.inst.cfg new file mode 100644 index 0000000000..d3bb55f066 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_I3ProW_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_I3ProW +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/geeetech_variants/geeetech_I3ProW_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProW_0.6.inst.cfg new file mode 100644 index 0000000000..641fe2f834 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_I3ProW_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_I3ProW +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/geeetech_variants/geeetech_I3ProW_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProW_0.8.inst.cfg new file mode 100644 index 0000000000..dd7a87dae9 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_I3ProW_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_I3ProW +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/geeetech_variants/geeetech_I3ProW_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_I3ProW_1.0.inst.cfg new file mode 100644 index 0000000000..7c70a2cb91 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_I3ProW_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_I3ProW +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/geeetech_variants/geeetech_MeCreator2_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.2.inst.cfg new file mode 100644 index 0000000000..8efe819e25 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MeCreator2 +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/geeetech_variants/geeetech_MeCreator2_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.3.inst.cfg new file mode 100644 index 0000000000..464db71752 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MeCreator2 +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/geeetech_variants/geeetech_MeCreator2_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.4.inst.cfg new file mode 100644 index 0000000000..fdac731888 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MeCreator2 +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/geeetech_variants/geeetech_MeCreator2_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.5.inst.cfg new file mode 100644 index 0000000000..0b3764f263 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MeCreator2 +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/geeetech_variants/geeetech_MeCreator2_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.6.inst.cfg new file mode 100644 index 0000000000..47f690bc35 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MeCreator2 +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/geeetech_variants/geeetech_MeCreator2_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.8.inst.cfg new file mode 100644 index 0000000000..3d5508ad45 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MeCreator2_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MeCreator2 +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/geeetech_variants/geeetech_MeCreator2_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator2_1.0.inst.cfg new file mode 100644 index 0000000000..b9d738adac --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MeCreator2_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MeCreator2 +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/geeetech_variants/geeetech_MeCreator_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator_0.2.inst.cfg new file mode 100644 index 0000000000..65c79a8ce1 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MeCreator_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MeCreator +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/geeetech_variants/geeetech_MeCreator_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator_0.3.inst.cfg new file mode 100644 index 0000000000..1d21372f1d --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MeCreator_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MeCreator +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/geeetech_variants/geeetech_MeCreator_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator_0.4.inst.cfg new file mode 100644 index 0000000000..704c1515d0 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MeCreator_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MeCreator +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/geeetech_variants/geeetech_MeCreator_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator_0.5.inst.cfg new file mode 100644 index 0000000000..a81370aee0 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MeCreator_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MeCreator +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/geeetech_variants/geeetech_MeCreator_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator_0.6.inst.cfg new file mode 100644 index 0000000000..f074921b75 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MeCreator_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MeCreator +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/geeetech_variants/geeetech_MeCreator_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator_0.8.inst.cfg new file mode 100644 index 0000000000..dad45302db --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MeCreator_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MeCreator +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/geeetech_variants/geeetech_MeCreator_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeCreator_1.0.inst.cfg new file mode 100644 index 0000000000..d57c22fee6 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MeCreator_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MeCreator +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/geeetech_variants/geeetech_MeDucer_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeDucer_0.2.inst.cfg new file mode 100644 index 0000000000..9f5b1bfe50 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MeDucer_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MeDucer +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/geeetech_variants/geeetech_MeDucer_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeDucer_0.3.inst.cfg new file mode 100644 index 0000000000..b6b5984b9c --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MeDucer_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MeDucer +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/geeetech_variants/geeetech_MeDucer_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeDucer_0.4.inst.cfg new file mode 100644 index 0000000000..76f1a300b2 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MeDucer_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MeDucer +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/geeetech_variants/geeetech_MeDucer_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeDucer_0.5.inst.cfg new file mode 100644 index 0000000000..4f300d6b4f --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MeDucer_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MeDucer +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/geeetech_variants/geeetech_MeDucer_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeDucer_0.6.inst.cfg new file mode 100644 index 0000000000..b689dcb89b --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MeDucer_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MeDucer +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/geeetech_variants/geeetech_MeDucer_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeDucer_0.8.inst.cfg new file mode 100644 index 0000000000..271c26dfc4 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MeDucer_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MeDucer +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/geeetech_variants/geeetech_MeDucer_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_MeDucer_1.0.inst.cfg new file mode 100644 index 0000000000..1f28b152f8 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MeDucer_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MeDucer +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarMax_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarMax_0.2.inst.cfg new file mode 100644 index 0000000000..d21a33f196 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MizarMax_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MizarMax +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarMax_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarMax_0.3.inst.cfg new file mode 100644 index 0000000000..dcd3cb36a5 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MizarMax_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MizarMax +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarMax_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarMax_0.4.inst.cfg new file mode 100644 index 0000000000..777416c7a7 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MizarMax_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MizarMax +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarMax_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarMax_0.5.inst.cfg new file mode 100644 index 0000000000..028aa61c60 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MizarMax_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MizarMax +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarMax_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarMax_0.6.inst.cfg new file mode 100644 index 0000000000..584ab2729d --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MizarMax_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MizarMax +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarMax_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarMax_0.8.inst.cfg new file mode 100644 index 0000000000..d44b4cb333 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MizarMax_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MizarMax +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarMax_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarMax_1.0.inst.cfg new file mode 100644 index 0000000000..25570aae27 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MizarMax_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MizarMax +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarPro_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarPro_0.2.inst.cfg new file mode 100644 index 0000000000..ce3bcdfe3e --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MizarPro_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MizarPro +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarPro_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarPro_0.3.inst.cfg new file mode 100644 index 0000000000..5607a70f96 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MizarPro_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MizarPro +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarPro_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarPro_0.4.inst.cfg new file mode 100644 index 0000000000..14d4c40a22 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MizarPro_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MizarPro +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarPro_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarPro_0.5.inst.cfg new file mode 100644 index 0000000000..ac28de5b0c --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MizarPro_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MizarPro +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarPro_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarPro_0.6.inst.cfg new file mode 100644 index 0000000000..bb61ce74f5 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MizarPro_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MizarPro +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarPro_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarPro_0.8.inst.cfg new file mode 100644 index 0000000000..a41cfc34f8 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MizarPro_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MizarPro +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarPro_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarPro_1.0.inst.cfg new file mode 100644 index 0000000000..8f7f9e7a50 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MizarPro_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MizarPro +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarS_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarS_0.2.inst.cfg new file mode 100644 index 0000000000..76b1786f7b --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MizarS_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MizarS +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarS_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarS_0.3.inst.cfg new file mode 100644 index 0000000000..e5c739886a --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MizarS_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MizarS +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarS_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarS_0.4.inst.cfg new file mode 100644 index 0000000000..36ed7a163b --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MizarS_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MizarS +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarS_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarS_0.5.inst.cfg new file mode 100644 index 0000000000..aa613c7969 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MizarS_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MizarS +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarS_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarS_0.6.inst.cfg new file mode 100644 index 0000000000..e773157dac --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MizarS_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MizarS +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarS_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarS_0.8.inst.cfg new file mode 100644 index 0000000000..333eb2446e --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MizarS_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MizarS +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/geeetech_variants/geeetech_MizarS_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_MizarS_1.0.inst.cfg new file mode 100644 index 0000000000..71582e9473 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_MizarS_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_MizarS +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/geeetech_variants/geeetech_Mizar_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_Mizar_0.2.inst.cfg new file mode 100644 index 0000000000..c137a471c8 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_Mizar_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_Mizar +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/geeetech_variants/geeetech_Mizar_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_Mizar_0.3.inst.cfg new file mode 100644 index 0000000000..b5dfa3afa0 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_Mizar_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_Mizar +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/geeetech_variants/geeetech_Mizar_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_Mizar_0.4.inst.cfg new file mode 100644 index 0000000000..70419eece2 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_Mizar_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_Mizar +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/geeetech_variants/geeetech_Mizar_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_Mizar_0.5.inst.cfg new file mode 100644 index 0000000000..bc728d2fd9 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_Mizar_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_Mizar +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/geeetech_variants/geeetech_Mizar_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_Mizar_0.6.inst.cfg new file mode 100644 index 0000000000..2a6962a962 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_Mizar_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_Mizar +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/geeetech_variants/geeetech_Mizar_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_Mizar_0.8.inst.cfg new file mode 100644 index 0000000000..52a88d5984 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_Mizar_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_Mizar +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/geeetech_variants/geeetech_Mizar_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_Mizar_1.0.inst.cfg new file mode 100644 index 0000000000..920262d551 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_Mizar_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_Mizar +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/geeetech_variants/geeetech_Thunder_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_Thunder_0.2.inst.cfg new file mode 100644 index 0000000000..6c6f5ca2a6 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_Thunder_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_Thunder +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/geeetech_variants/geeetech_Thunder_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_Thunder_0.3.inst.cfg new file mode 100644 index 0000000000..4a13f8db49 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_Thunder_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_Thunder +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/geeetech_variants/geeetech_Thunder_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_Thunder_0.4.inst.cfg new file mode 100644 index 0000000000..a106d17329 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_Thunder_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_Thunder +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/geeetech_variants/geeetech_Thunder_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_Thunder_0.5.inst.cfg new file mode 100644 index 0000000000..54cdc1a17b --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_Thunder_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_Thunder +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/geeetech_variants/geeetech_Thunder_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_Thunder_0.6.inst.cfg new file mode 100644 index 0000000000..99295e5f17 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_Thunder_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_Thunder +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/geeetech_variants/geeetech_Thunder_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_Thunder_0.8.inst.cfg new file mode 100644 index 0000000000..4d0e5b7ab6 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_Thunder_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_Thunder +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/geeetech_variants/geeetech_Thunder_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_Thunder_1.0.inst.cfg new file mode 100644 index 0000000000..547976d730 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_Thunder_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_Thunder +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/gmax15plus_025_e3d.inst.cfg b/resources/variants/gmax/gmax15plus_025_e3d.inst.cfg similarity index 99% rename from resources/variants/gmax15plus_025_e3d.inst.cfg rename to resources/variants/gmax/gmax15plus_025_e3d.inst.cfg index 3972875887..137c729ed8 100644 --- a/resources/variants/gmax15plus_025_e3d.inst.cfg +++ b/resources/variants/gmax/gmax15plus_025_e3d.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = gmax15plus name = 0.25mm E3D (Difficult) version = 4 -definition = gmax15plus [metadata] author = gcreate +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.25 + diff --git a/resources/variants/gmax15plus_04_e3d.inst.cfg b/resources/variants/gmax/gmax15plus_04_e3d.inst.cfg similarity index 85% rename from resources/variants/gmax15plus_04_e3d.inst.cfg rename to resources/variants/gmax/gmax15plus_04_e3d.inst.cfg index a3a7c8c0b7..496db4eead 100644 --- a/resources/variants/gmax15plus_04_e3d.inst.cfg +++ b/resources/variants/gmax/gmax15plus_04_e3d.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = gmax15plus name = 0.4mm E3D version = 4 -definition = gmax15plus [metadata] author = gcreate +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.4 \ No newline at end of file +machine_nozzle_size = 0.4 + diff --git a/resources/variants/gmax15plus_05_e3d.inst.cfg b/resources/variants/gmax/gmax15plus_05_e3d.inst.cfg similarity index 86% rename from resources/variants/gmax15plus_05_e3d.inst.cfg rename to resources/variants/gmax/gmax15plus_05_e3d.inst.cfg index 60ab506a4d..137a5b6c75 100644 --- a/resources/variants/gmax15plus_05_e3d.inst.cfg +++ b/resources/variants/gmax/gmax15plus_05_e3d.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = gmax15plus name = 0.5mm E3D (Default) version = 4 -definition = gmax15plus [metadata] author = gcreate +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.5 \ No newline at end of file +machine_nozzle_size = 0.5 + diff --git a/resources/variants/gmax15plus_05_jhead.inst.cfg b/resources/variants/gmax/gmax15plus_05_jhead.inst.cfg similarity index 99% rename from resources/variants/gmax15plus_05_jhead.inst.cfg rename to resources/variants/gmax/gmax15plus_05_jhead.inst.cfg index b14d2fcb25..74fdeae4b0 100644 --- a/resources/variants/gmax15plus_05_jhead.inst.cfg +++ b/resources/variants/gmax/gmax15plus_05_jhead.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = gmax15plus name = 0.5mm J-Head version = 4 -definition = gmax15plus [metadata] author = gcreate +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/gmax15plus_06_e3d.inst.cfg b/resources/variants/gmax/gmax15plus_06_e3d.inst.cfg similarity index 85% rename from resources/variants/gmax15plus_06_e3d.inst.cfg rename to resources/variants/gmax/gmax15plus_06_e3d.inst.cfg index b90263bec8..fcca8d81a2 100644 --- a/resources/variants/gmax15plus_06_e3d.inst.cfg +++ b/resources/variants/gmax/gmax15plus_06_e3d.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = gmax15plus name = 0.6mm E3D version = 4 -definition = gmax15plus [metadata] author = gcreate +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.6 \ No newline at end of file +machine_nozzle_size = 0.6 + diff --git a/resources/variants/gmax15plus_08_e3d.inst.cfg b/resources/variants/gmax/gmax15plus_08_e3d.inst.cfg similarity index 85% rename from resources/variants/gmax15plus_08_e3d.inst.cfg rename to resources/variants/gmax/gmax15plus_08_e3d.inst.cfg index 9bdff47bef..c97efbeaf8 100644 --- a/resources/variants/gmax15plus_08_e3d.inst.cfg +++ b/resources/variants/gmax/gmax15plus_08_e3d.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = gmax15plus name = 0.8mm E3D version = 4 -definition = gmax15plus [metadata] author = gcreate +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.8 \ No newline at end of file +machine_nozzle_size = 0.8 + diff --git a/resources/variants/gmax15plus_10_jhead.inst.cfg b/resources/variants/gmax/gmax15plus_10_jhead.inst.cfg similarity index 85% rename from resources/variants/gmax15plus_10_jhead.inst.cfg rename to resources/variants/gmax/gmax15plus_10_jhead.inst.cfg index 3d63e9eb2b..f8461668aa 100644 --- a/resources/variants/gmax15plus_10_jhead.inst.cfg +++ b/resources/variants/gmax/gmax15plus_10_jhead.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = gmax15plus name = 1.0mm J-Head version = 4 -definition = gmax15plus [metadata] author = gcreate +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.5 \ No newline at end of file +machine_nozzle_size = 0.5 + diff --git a/resources/variants/gmax15plus_12_e3d.inst.cfg b/resources/variants/gmax/gmax15plus_12_e3d.inst.cfg similarity index 86% rename from resources/variants/gmax15plus_12_e3d.inst.cfg rename to resources/variants/gmax/gmax15plus_12_e3d.inst.cfg index fe0d86bcfe..4fd01f21b9 100644 --- a/resources/variants/gmax15plus_12_e3d.inst.cfg +++ b/resources/variants/gmax/gmax15plus_12_e3d.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = gmax15plus name = 1.2mm E3D Volcano version = 4 -definition = gmax15plus [metadata] author = gcreate +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 1.2 \ No newline at end of file +machine_nozzle_size = 1.2 + diff --git a/resources/variants/gmax15plus_dual_025_e3d.inst.cfg b/resources/variants/gmax/gmax15plus_dual_025_e3d.inst.cfg similarity index 99% rename from resources/variants/gmax15plus_dual_025_e3d.inst.cfg rename to resources/variants/gmax/gmax15plus_dual_025_e3d.inst.cfg index 35a9f54a53..7615bc1c67 100644 --- a/resources/variants/gmax15plus_dual_025_e3d.inst.cfg +++ b/resources/variants/gmax/gmax15plus_dual_025_e3d.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = gmax15plus_dual name = 0.25mm E3D (Difficult) version = 4 -definition = gmax15plus_dual [metadata] author = gcreate +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.25 + diff --git a/resources/variants/gmax15plus_dual_04_e3d.inst.cfg b/resources/variants/gmax/gmax15plus_dual_04_e3d.inst.cfg similarity index 86% rename from resources/variants/gmax15plus_dual_04_e3d.inst.cfg rename to resources/variants/gmax/gmax15plus_dual_04_e3d.inst.cfg index 679f9d0204..a8096ead5a 100644 --- a/resources/variants/gmax15plus_dual_04_e3d.inst.cfg +++ b/resources/variants/gmax/gmax15plus_dual_04_e3d.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = gmax15plus_dual name = 0.4mm E3D version = 4 -definition = gmax15plus_dual [metadata] author = gcreate +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.4 \ No newline at end of file +machine_nozzle_size = 0.4 + diff --git a/resources/variants/gmax15plus_dual_05_e3d.inst.cfg b/resources/variants/gmax/gmax15plus_dual_05_e3d.inst.cfg similarity index 99% rename from resources/variants/gmax15plus_dual_05_e3d.inst.cfg rename to resources/variants/gmax/gmax15plus_dual_05_e3d.inst.cfg index 8816f29f17..93c3ca3eab 100644 --- a/resources/variants/gmax15plus_dual_05_e3d.inst.cfg +++ b/resources/variants/gmax/gmax15plus_dual_05_e3d.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = gmax15plus_dual name = 0.5mm E3D (Default) version = 4 -definition = gmax15plus_dual [metadata] author = gcreate +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/gmax15plus_dual_05_jhead.inst.cfg b/resources/variants/gmax/gmax15plus_dual_05_jhead.inst.cfg similarity index 99% rename from resources/variants/gmax15plus_dual_05_jhead.inst.cfg rename to resources/variants/gmax/gmax15plus_dual_05_jhead.inst.cfg index 93de0cd4b2..884e90c642 100644 --- a/resources/variants/gmax15plus_dual_05_jhead.inst.cfg +++ b/resources/variants/gmax/gmax15plus_dual_05_jhead.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = gmax15plus_dual name = 0.5mm J-Head version = 4 -definition = gmax15plus_dual [metadata] author = gcreate +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/gmax15plus_dual_06_e3d.inst.cfg b/resources/variants/gmax/gmax15plus_dual_06_e3d.inst.cfg similarity index 99% rename from resources/variants/gmax15plus_dual_06_e3d.inst.cfg rename to resources/variants/gmax/gmax15plus_dual_06_e3d.inst.cfg index fa5a9a6dfe..2b25891bab 100644 --- a/resources/variants/gmax15plus_dual_06_e3d.inst.cfg +++ b/resources/variants/gmax/gmax15plus_dual_06_e3d.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = gmax15plus_dual name = 0.6mm E3D version = 4 -definition = gmax15plus_dual [metadata] author = gcreate +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/gmax15plus_dual_08_e3d.inst.cfg b/resources/variants/gmax/gmax15plus_dual_08_e3d.inst.cfg similarity index 99% rename from resources/variants/gmax15plus_dual_08_e3d.inst.cfg rename to resources/variants/gmax/gmax15plus_dual_08_e3d.inst.cfg index ac97243dbd..5b0085846f 100644 --- a/resources/variants/gmax15plus_dual_08_e3d.inst.cfg +++ b/resources/variants/gmax/gmax15plus_dual_08_e3d.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = gmax15plus_dual name = 0.8mm E3D version = 4 -definition = gmax15plus_dual [metadata] author = gcreate +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/gmax15plus_dual_10_jhead.inst.cfg b/resources/variants/gmax/gmax15plus_dual_10_jhead.inst.cfg similarity index 99% rename from resources/variants/gmax15plus_dual_10_jhead.inst.cfg rename to resources/variants/gmax/gmax15plus_dual_10_jhead.inst.cfg index bb6bf32b20..b772b25cd6 100644 --- a/resources/variants/gmax15plus_dual_10_jhead.inst.cfg +++ b/resources/variants/gmax/gmax15plus_dual_10_jhead.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = gmax15plus_dual name = 1.0mm J-Head version = 4 -definition = gmax15plus_dual [metadata] author = gcreate +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/goofoo_base_0.4.inst.cfg b/resources/variants/goofoo/goofoo_base_0.4.inst.cfg similarity index 99% rename from resources/variants/goofoo_base_0.4.inst.cfg rename to resources/variants/goofoo/goofoo_base_0.4.inst.cfg index 4c59dc3d1e..345613f9d5 100644 --- a/resources/variants/goofoo_base_0.4.inst.cfg +++ b/resources/variants/goofoo/goofoo_base_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_base name = 0.4mm Nozzle version = 4 -definition = goofoo_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/goofoo_cube_0.7.inst.cfg b/resources/variants/goofoo/goofoo_cube_0.7.inst.cfg similarity index 80% rename from resources/variants/goofoo_cube_0.7.inst.cfg rename to resources/variants/goofoo/goofoo_cube_0.7.inst.cfg index 93c819d702..cb02a5e54a 100644 --- a/resources/variants/goofoo_cube_0.7.inst.cfg +++ b/resources/variants/goofoo/goofoo_cube_0.7.inst.cfg @@ -1,12 +1,13 @@ -[general] -name = 0.7mm Nozzle -version = 4 -definition = goofoo_cube - -[metadata] -setting_version = 20 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.7 \ No newline at end of file +[general] +definition = goofoo_cube +name = 0.7mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.7 + diff --git a/resources/variants/goofoo_e-one_0.2.inst.cfg b/resources/variants/goofoo/goofoo_e-one_0.2.inst.cfg similarity index 99% rename from resources/variants/goofoo_e-one_0.2.inst.cfg rename to resources/variants/goofoo/goofoo_e-one_0.2.inst.cfg index ef65c52a8f..40607aee8e 100644 --- a/resources/variants/goofoo_e-one_0.2.inst.cfg +++ b/resources/variants/goofoo/goofoo_e-one_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_e-one name = 0.2mm Nozzle version = 4 -definition = goofoo_e-one [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/goofoo_e-one_0.4.inst.cfg b/resources/variants/goofoo/goofoo_e-one_0.4.inst.cfg similarity index 99% rename from resources/variants/goofoo_e-one_0.4.inst.cfg rename to resources/variants/goofoo/goofoo_e-one_0.4.inst.cfg index 0ffd73a95f..10a118c3df 100644 --- a/resources/variants/goofoo_e-one_0.4.inst.cfg +++ b/resources/variants/goofoo/goofoo_e-one_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_e-one name = 0.4mm Nozzle version = 4 -definition = goofoo_e-one [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/goofoo_e-one_0.6.inst.cfg b/resources/variants/goofoo/goofoo_e-one_0.6.inst.cfg similarity index 99% rename from resources/variants/goofoo_e-one_0.6.inst.cfg rename to resources/variants/goofoo/goofoo_e-one_0.6.inst.cfg index d9bbc74928..34e21f015f 100644 --- a/resources/variants/goofoo_e-one_0.6.inst.cfg +++ b/resources/variants/goofoo/goofoo_e-one_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_e-one name = 0.6mm Nozzle version = 4 -definition = goofoo_e-one [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/goofoo_e-one_0.8.inst.cfg b/resources/variants/goofoo/goofoo_e-one_0.8.inst.cfg similarity index 99% rename from resources/variants/goofoo_e-one_0.8.inst.cfg rename to resources/variants/goofoo/goofoo_e-one_0.8.inst.cfg index eafcb9ff2f..22e0539681 100644 --- a/resources/variants/goofoo_e-one_0.8.inst.cfg +++ b/resources/variants/goofoo/goofoo_e-one_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_e-one name = 0.8mm Nozzle version = 4 -definition = goofoo_e-one [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/goofoo_e-one_1.0.inst.cfg b/resources/variants/goofoo/goofoo_e-one_1.0.inst.cfg similarity index 99% rename from resources/variants/goofoo_e-one_1.0.inst.cfg rename to resources/variants/goofoo/goofoo_e-one_1.0.inst.cfg index 73ecf3e79f..73ce978f8c 100644 --- a/resources/variants/goofoo_e-one_1.0.inst.cfg +++ b/resources/variants/goofoo/goofoo_e-one_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_e-one name = 1.0mm Nozzle version = 4 -definition = goofoo_e-one [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/goofoo_gemini_0.2.inst.cfg b/resources/variants/goofoo/goofoo_gemini_0.2.inst.cfg similarity index 99% rename from resources/variants/goofoo_gemini_0.2.inst.cfg rename to resources/variants/goofoo/goofoo_gemini_0.2.inst.cfg index 317e6a0bdb..728c98726e 100644 --- a/resources/variants/goofoo_gemini_0.2.inst.cfg +++ b/resources/variants/goofoo/goofoo_gemini_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_gemini name = 0.2mm Nozzle version = 4 -definition = goofoo_gemini [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/goofoo_gemini_0.4.inst.cfg b/resources/variants/goofoo/goofoo_gemini_0.4.inst.cfg similarity index 99% rename from resources/variants/goofoo_gemini_0.4.inst.cfg rename to resources/variants/goofoo/goofoo_gemini_0.4.inst.cfg index b3f19a0d71..cd9da93d4b 100644 --- a/resources/variants/goofoo_gemini_0.4.inst.cfg +++ b/resources/variants/goofoo/goofoo_gemini_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_gemini name = 0.4mm Nozzle version = 4 -definition = goofoo_gemini [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/goofoo_gemini_0.6.inst.cfg b/resources/variants/goofoo/goofoo_gemini_0.6.inst.cfg similarity index 99% rename from resources/variants/goofoo_gemini_0.6.inst.cfg rename to resources/variants/goofoo/goofoo_gemini_0.6.inst.cfg index 2b5295058e..3d052ef90e 100644 --- a/resources/variants/goofoo_gemini_0.6.inst.cfg +++ b/resources/variants/goofoo/goofoo_gemini_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_gemini name = 0.6mm Nozzle version = 4 -definition = goofoo_gemini [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/goofoo_gemini_0.8.inst.cfg b/resources/variants/goofoo/goofoo_gemini_0.8.inst.cfg similarity index 99% rename from resources/variants/goofoo_gemini_0.8.inst.cfg rename to resources/variants/goofoo/goofoo_gemini_0.8.inst.cfg index cb2c0ec001..bf3f6806fd 100644 --- a/resources/variants/goofoo_gemini_0.8.inst.cfg +++ b/resources/variants/goofoo/goofoo_gemini_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_gemini name = 0.8mm Nozzle version = 4 -definition = goofoo_gemini [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/goofoo_gemini_1.0.inst.cfg b/resources/variants/goofoo/goofoo_gemini_1.0.inst.cfg similarity index 99% rename from resources/variants/goofoo_gemini_1.0.inst.cfg rename to resources/variants/goofoo/goofoo_gemini_1.0.inst.cfg index 70216a3d67..bf9534e0ee 100644 --- a/resources/variants/goofoo_gemini_1.0.inst.cfg +++ b/resources/variants/goofoo/goofoo_gemini_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_gemini name = 1.0mm Nozzle version = 4 -definition = goofoo_gemini [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/goofoo_giant_0.2.inst.cfg b/resources/variants/goofoo/goofoo_giant_0.2.inst.cfg similarity index 99% rename from resources/variants/goofoo_giant_0.2.inst.cfg rename to resources/variants/goofoo/goofoo_giant_0.2.inst.cfg index 22586f07c3..209c298045 100644 --- a/resources/variants/goofoo_giant_0.2.inst.cfg +++ b/resources/variants/goofoo/goofoo_giant_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_giant name = 0.2mm Nozzle version = 4 -definition = goofoo_giant [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/goofoo_giant_0.4.inst.cfg b/resources/variants/goofoo/goofoo_giant_0.4.inst.cfg similarity index 99% rename from resources/variants/goofoo_giant_0.4.inst.cfg rename to resources/variants/goofoo/goofoo_giant_0.4.inst.cfg index 5ca8990776..a1c550c00f 100644 --- a/resources/variants/goofoo_giant_0.4.inst.cfg +++ b/resources/variants/goofoo/goofoo_giant_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_giant name = 0.4mm Nozzle version = 4 -definition = goofoo_giant [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/goofoo_giant_0.6.inst.cfg b/resources/variants/goofoo/goofoo_giant_0.6.inst.cfg similarity index 99% rename from resources/variants/goofoo_giant_0.6.inst.cfg rename to resources/variants/goofoo/goofoo_giant_0.6.inst.cfg index b2af4c060d..9bcc9191fc 100644 --- a/resources/variants/goofoo_giant_0.6.inst.cfg +++ b/resources/variants/goofoo/goofoo_giant_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_giant name = 0.6mm Nozzle version = 4 -definition = goofoo_giant [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/goofoo_giant_0.8.inst.cfg b/resources/variants/goofoo/goofoo_giant_0.8.inst.cfg similarity index 99% rename from resources/variants/goofoo_giant_0.8.inst.cfg rename to resources/variants/goofoo/goofoo_giant_0.8.inst.cfg index 71dcf0e561..c18ee07aa0 100644 --- a/resources/variants/goofoo_giant_0.8.inst.cfg +++ b/resources/variants/goofoo/goofoo_giant_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_giant name = 0.8mm Nozzle version = 4 -definition = goofoo_giant [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/goofoo_giant_1.0.inst.cfg b/resources/variants/goofoo/goofoo_giant_1.0.inst.cfg similarity index 99% rename from resources/variants/goofoo_giant_1.0.inst.cfg rename to resources/variants/goofoo/goofoo_giant_1.0.inst.cfg index 9d1f01b212..67969df2ba 100644 --- a/resources/variants/goofoo_giant_1.0.inst.cfg +++ b/resources/variants/goofoo/goofoo_giant_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_giant name = 1.0mm Nozzle version = 4 -definition = goofoo_giant [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/goofoo_max_0.2.inst.cfg b/resources/variants/goofoo/goofoo_max_0.2.inst.cfg similarity index 99% rename from resources/variants/goofoo_max_0.2.inst.cfg rename to resources/variants/goofoo/goofoo_max_0.2.inst.cfg index 58e69b3895..d5c09dadd7 100644 --- a/resources/variants/goofoo_max_0.2.inst.cfg +++ b/resources/variants/goofoo/goofoo_max_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_max name = 0.2mm Nozzle version = 4 -definition = goofoo_max [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/goofoo_max_0.4.inst.cfg b/resources/variants/goofoo/goofoo_max_0.4.inst.cfg similarity index 99% rename from resources/variants/goofoo_max_0.4.inst.cfg rename to resources/variants/goofoo/goofoo_max_0.4.inst.cfg index a68ab5826b..3aca5754b2 100644 --- a/resources/variants/goofoo_max_0.4.inst.cfg +++ b/resources/variants/goofoo/goofoo_max_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_max name = 0.4mm Nozzle version = 4 -definition = goofoo_max [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/goofoo_max_0.6.inst.cfg b/resources/variants/goofoo/goofoo_max_0.6.inst.cfg similarity index 99% rename from resources/variants/goofoo_max_0.6.inst.cfg rename to resources/variants/goofoo/goofoo_max_0.6.inst.cfg index 3881d09fa9..b645d10970 100644 --- a/resources/variants/goofoo_max_0.6.inst.cfg +++ b/resources/variants/goofoo/goofoo_max_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_max name = 0.6mm Nozzle version = 4 -definition = goofoo_max [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/goofoo_max_0.8.inst.cfg b/resources/variants/goofoo/goofoo_max_0.8.inst.cfg similarity index 99% rename from resources/variants/goofoo_max_0.8.inst.cfg rename to resources/variants/goofoo/goofoo_max_0.8.inst.cfg index 79ae54e0e0..4da4468f82 100644 --- a/resources/variants/goofoo_max_0.8.inst.cfg +++ b/resources/variants/goofoo/goofoo_max_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_max name = 0.8mm Nozzle version = 4 -definition = goofoo_max [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/goofoo_max_1.0.inst.cfg b/resources/variants/goofoo/goofoo_max_1.0.inst.cfg similarity index 99% rename from resources/variants/goofoo_max_1.0.inst.cfg rename to resources/variants/goofoo/goofoo_max_1.0.inst.cfg index ef4d9a6858..d86ff50ef5 100644 --- a/resources/variants/goofoo_max_1.0.inst.cfg +++ b/resources/variants/goofoo/goofoo_max_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_max name = 1.0mm Nozzle version = 4 -definition = goofoo_max [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/goofoo_mido_0.2.inst.cfg b/resources/variants/goofoo/goofoo_mido_0.2.inst.cfg similarity index 99% rename from resources/variants/goofoo_mido_0.2.inst.cfg rename to resources/variants/goofoo/goofoo_mido_0.2.inst.cfg index d21eb223e9..2ee036dde4 100644 --- a/resources/variants/goofoo_mido_0.2.inst.cfg +++ b/resources/variants/goofoo/goofoo_mido_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_mido name = 0.2mm Nozzle version = 4 -definition = goofoo_mido [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/goofoo_mido_0.4.inst.cfg b/resources/variants/goofoo/goofoo_mido_0.4.inst.cfg similarity index 99% rename from resources/variants/goofoo_mido_0.4.inst.cfg rename to resources/variants/goofoo/goofoo_mido_0.4.inst.cfg index 5c35653c9c..0d3b5a3ce6 100644 --- a/resources/variants/goofoo_mido_0.4.inst.cfg +++ b/resources/variants/goofoo/goofoo_mido_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_mido name = 0.4mm Nozzle version = 4 -definition = goofoo_mido [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/goofoo_mido_0.6.inst.cfg b/resources/variants/goofoo/goofoo_mido_0.6.inst.cfg similarity index 99% rename from resources/variants/goofoo_mido_0.6.inst.cfg rename to resources/variants/goofoo/goofoo_mido_0.6.inst.cfg index edfb3cf5eb..2580151256 100644 --- a/resources/variants/goofoo_mido_0.6.inst.cfg +++ b/resources/variants/goofoo/goofoo_mido_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_mido name = 0.6mm Nozzle version = 4 -definition = goofoo_mido [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/goofoo_mido_0.8.inst.cfg b/resources/variants/goofoo/goofoo_mido_0.8.inst.cfg similarity index 99% rename from resources/variants/goofoo_mido_0.8.inst.cfg rename to resources/variants/goofoo/goofoo_mido_0.8.inst.cfg index c455e3cfcc..ef301aa482 100644 --- a/resources/variants/goofoo_mido_0.8.inst.cfg +++ b/resources/variants/goofoo/goofoo_mido_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_mido name = 0.8mm Nozzle version = 4 -definition = goofoo_mido [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/goofoo_mido_1.0.inst.cfg b/resources/variants/goofoo/goofoo_mido_1.0.inst.cfg similarity index 99% rename from resources/variants/goofoo_mido_1.0.inst.cfg rename to resources/variants/goofoo/goofoo_mido_1.0.inst.cfg index 4bf8f4b457..8d47c58d9d 100644 --- a/resources/variants/goofoo_mido_1.0.inst.cfg +++ b/resources/variants/goofoo/goofoo_mido_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_mido name = 1.0mm Nozzle version = 4 -definition = goofoo_mido [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/goofoo_miniplus_0.2.inst.cfg b/resources/variants/goofoo/goofoo_miniplus_0.2.inst.cfg similarity index 99% rename from resources/variants/goofoo_miniplus_0.2.inst.cfg rename to resources/variants/goofoo/goofoo_miniplus_0.2.inst.cfg index eac5e0869e..5057a94d2d 100644 --- a/resources/variants/goofoo_miniplus_0.2.inst.cfg +++ b/resources/variants/goofoo/goofoo_miniplus_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_miniplus name = 0.2mm Nozzle version = 4 -definition = goofoo_miniplus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/goofoo_miniplus_0.4.inst.cfg b/resources/variants/goofoo/goofoo_miniplus_0.4.inst.cfg similarity index 99% rename from resources/variants/goofoo_miniplus_0.4.inst.cfg rename to resources/variants/goofoo/goofoo_miniplus_0.4.inst.cfg index 18f724fd4c..6ea4348938 100644 --- a/resources/variants/goofoo_miniplus_0.4.inst.cfg +++ b/resources/variants/goofoo/goofoo_miniplus_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_miniplus name = 0.4mm Nozzle version = 4 -definition = goofoo_miniplus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/goofoo_miniplus_0.6.inst.cfg b/resources/variants/goofoo/goofoo_miniplus_0.6.inst.cfg similarity index 99% rename from resources/variants/goofoo_miniplus_0.6.inst.cfg rename to resources/variants/goofoo/goofoo_miniplus_0.6.inst.cfg index 91a4eabd83..bc63148fad 100644 --- a/resources/variants/goofoo_miniplus_0.6.inst.cfg +++ b/resources/variants/goofoo/goofoo_miniplus_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_miniplus name = 0.6mm Nozzle version = 4 -definition = goofoo_miniplus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/goofoo_miniplus_0.8.inst.cfg b/resources/variants/goofoo/goofoo_miniplus_0.8.inst.cfg similarity index 99% rename from resources/variants/goofoo_miniplus_0.8.inst.cfg rename to resources/variants/goofoo/goofoo_miniplus_0.8.inst.cfg index dcca7505a7..5b3dc36020 100644 --- a/resources/variants/goofoo_miniplus_0.8.inst.cfg +++ b/resources/variants/goofoo/goofoo_miniplus_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_miniplus name = 0.8mm Nozzle version = 4 -definition = goofoo_miniplus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/goofoo_miniplus_1.0.inst.cfg b/resources/variants/goofoo/goofoo_miniplus_1.0.inst.cfg similarity index 99% rename from resources/variants/goofoo_miniplus_1.0.inst.cfg rename to resources/variants/goofoo/goofoo_miniplus_1.0.inst.cfg index 7e7dd2388f..3afe5c9bdc 100644 --- a/resources/variants/goofoo_miniplus_1.0.inst.cfg +++ b/resources/variants/goofoo/goofoo_miniplus_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_miniplus name = 1.0mm Nozzle version = 4 -definition = goofoo_miniplus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/goofoo_nova_0.2.inst.cfg b/resources/variants/goofoo/goofoo_nova_0.2.inst.cfg similarity index 99% rename from resources/variants/goofoo_nova_0.2.inst.cfg rename to resources/variants/goofoo/goofoo_nova_0.2.inst.cfg index 367de03805..c5cf992586 100644 --- a/resources/variants/goofoo_nova_0.2.inst.cfg +++ b/resources/variants/goofoo/goofoo_nova_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_nova name = 0.2mm Nozzle version = 4 -definition = goofoo_nova [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/goofoo_nova_0.4.inst.cfg b/resources/variants/goofoo/goofoo_nova_0.4.inst.cfg similarity index 99% rename from resources/variants/goofoo_nova_0.4.inst.cfg rename to resources/variants/goofoo/goofoo_nova_0.4.inst.cfg index e447646cba..eb358adad0 100644 --- a/resources/variants/goofoo_nova_0.4.inst.cfg +++ b/resources/variants/goofoo/goofoo_nova_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_nova name = 0.4mm Nozzle version = 4 -definition = goofoo_nova [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/goofoo_nova_0.6.inst.cfg b/resources/variants/goofoo/goofoo_nova_0.6.inst.cfg similarity index 99% rename from resources/variants/goofoo_nova_0.6.inst.cfg rename to resources/variants/goofoo/goofoo_nova_0.6.inst.cfg index f86ab60234..3bbe85744a 100644 --- a/resources/variants/goofoo_nova_0.6.inst.cfg +++ b/resources/variants/goofoo/goofoo_nova_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_nova name = 0.6mm Nozzle version = 4 -definition = goofoo_nova [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/goofoo_nova_0.8.inst.cfg b/resources/variants/goofoo/goofoo_nova_0.8.inst.cfg similarity index 99% rename from resources/variants/goofoo_nova_0.8.inst.cfg rename to resources/variants/goofoo/goofoo_nova_0.8.inst.cfg index 80c399104d..7e1aba3061 100644 --- a/resources/variants/goofoo_nova_0.8.inst.cfg +++ b/resources/variants/goofoo/goofoo_nova_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_nova name = 0.8mm Nozzle version = 4 -definition = goofoo_nova [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/goofoo_nova_1.0.inst.cfg b/resources/variants/goofoo/goofoo_nova_1.0.inst.cfg similarity index 99% rename from resources/variants/goofoo_nova_1.0.inst.cfg rename to resources/variants/goofoo/goofoo_nova_1.0.inst.cfg index 10ba00c1f6..5cee900546 100644 --- a/resources/variants/goofoo_nova_1.0.inst.cfg +++ b/resources/variants/goofoo/goofoo_nova_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_nova name = 1.0mm Nozzle version = 4 -definition = goofoo_nova [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/goofoo_plus_0.2.inst.cfg b/resources/variants/goofoo/goofoo_plus_0.2.inst.cfg similarity index 99% rename from resources/variants/goofoo_plus_0.2.inst.cfg rename to resources/variants/goofoo/goofoo_plus_0.2.inst.cfg index d497da75be..8d8bced8a7 100644 --- a/resources/variants/goofoo_plus_0.2.inst.cfg +++ b/resources/variants/goofoo/goofoo_plus_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_plus name = 0.2mm Nozzle version = 4 -definition = goofoo_plus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/goofoo_plus_0.4.inst.cfg b/resources/variants/goofoo/goofoo_plus_0.4.inst.cfg similarity index 99% rename from resources/variants/goofoo_plus_0.4.inst.cfg rename to resources/variants/goofoo/goofoo_plus_0.4.inst.cfg index e32c5ce175..cce0aaf13d 100644 --- a/resources/variants/goofoo_plus_0.4.inst.cfg +++ b/resources/variants/goofoo/goofoo_plus_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_plus name = 0.4mm Nozzle version = 4 -definition = goofoo_plus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/goofoo_plus_0.6.inst.cfg b/resources/variants/goofoo/goofoo_plus_0.6.inst.cfg similarity index 99% rename from resources/variants/goofoo_plus_0.6.inst.cfg rename to resources/variants/goofoo/goofoo_plus_0.6.inst.cfg index 118cf95c64..4d31ff0aeb 100644 --- a/resources/variants/goofoo_plus_0.6.inst.cfg +++ b/resources/variants/goofoo/goofoo_plus_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_plus name = 0.6mm Nozzle version = 4 -definition = goofoo_plus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/goofoo_plus_0.8.inst.cfg b/resources/variants/goofoo/goofoo_plus_0.8.inst.cfg similarity index 99% rename from resources/variants/goofoo_plus_0.8.inst.cfg rename to resources/variants/goofoo/goofoo_plus_0.8.inst.cfg index d9072ca529..f8d158cf63 100644 --- a/resources/variants/goofoo_plus_0.8.inst.cfg +++ b/resources/variants/goofoo/goofoo_plus_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_plus name = 0.8mm Nozzle version = 4 -definition = goofoo_plus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/goofoo_plus_1.0.inst.cfg b/resources/variants/goofoo/goofoo_plus_1.0.inst.cfg similarity index 99% rename from resources/variants/goofoo_plus_1.0.inst.cfg rename to resources/variants/goofoo/goofoo_plus_1.0.inst.cfg index 3bd7a81bf8..cba702a461 100644 --- a/resources/variants/goofoo_plus_1.0.inst.cfg +++ b/resources/variants/goofoo/goofoo_plus_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_plus name = 1.0mm Nozzle version = 4 -definition = goofoo_plus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/goofoo_t-one_0.2.inst.cfg b/resources/variants/goofoo/goofoo_t-one_0.2.inst.cfg similarity index 99% rename from resources/variants/goofoo_t-one_0.2.inst.cfg rename to resources/variants/goofoo/goofoo_t-one_0.2.inst.cfg index 07396655ce..734df8e9fe 100644 --- a/resources/variants/goofoo_t-one_0.2.inst.cfg +++ b/resources/variants/goofoo/goofoo_t-one_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_t-one name = 0.2mm Nozzle version = 4 -definition = goofoo_t-one [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/goofoo_t-one_0.4.inst.cfg b/resources/variants/goofoo/goofoo_t-one_0.4.inst.cfg similarity index 99% rename from resources/variants/goofoo_t-one_0.4.inst.cfg rename to resources/variants/goofoo/goofoo_t-one_0.4.inst.cfg index 388ef28b56..51b24e4c0d 100644 --- a/resources/variants/goofoo_t-one_0.4.inst.cfg +++ b/resources/variants/goofoo/goofoo_t-one_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_t-one name = 0.4mm Nozzle version = 4 -definition = goofoo_t-one [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/goofoo_t-one_0.6.inst.cfg b/resources/variants/goofoo/goofoo_t-one_0.6.inst.cfg similarity index 99% rename from resources/variants/goofoo_t-one_0.6.inst.cfg rename to resources/variants/goofoo/goofoo_t-one_0.6.inst.cfg index a36393a162..1497f85609 100644 --- a/resources/variants/goofoo_t-one_0.6.inst.cfg +++ b/resources/variants/goofoo/goofoo_t-one_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_t-one name = 0.6mm Nozzle version = 4 -definition = goofoo_t-one [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/goofoo_t-one_0.8.inst.cfg b/resources/variants/goofoo/goofoo_t-one_0.8.inst.cfg similarity index 99% rename from resources/variants/goofoo_t-one_0.8.inst.cfg rename to resources/variants/goofoo/goofoo_t-one_0.8.inst.cfg index ff65276da8..f09c222d7c 100644 --- a/resources/variants/goofoo_t-one_0.8.inst.cfg +++ b/resources/variants/goofoo/goofoo_t-one_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_t-one name = 0.8mm Nozzle version = 4 -definition = goofoo_t-one [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/goofoo_t-one_1.0.inst.cfg b/resources/variants/goofoo/goofoo_t-one_1.0.inst.cfg similarity index 99% rename from resources/variants/goofoo_t-one_1.0.inst.cfg rename to resources/variants/goofoo/goofoo_t-one_1.0.inst.cfg index c175c90049..ace2dcba35 100644 --- a/resources/variants/goofoo_t-one_1.0.inst.cfg +++ b/resources/variants/goofoo/goofoo_t-one_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_t-one name = 1.0mm Nozzle version = 4 -definition = goofoo_t-one [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/goofoo_tiny_0.2.inst.cfg b/resources/variants/goofoo/goofoo_tiny_0.2.inst.cfg similarity index 99% rename from resources/variants/goofoo_tiny_0.2.inst.cfg rename to resources/variants/goofoo/goofoo_tiny_0.2.inst.cfg index a5163a5818..123cf5a6d8 100644 --- a/resources/variants/goofoo_tiny_0.2.inst.cfg +++ b/resources/variants/goofoo/goofoo_tiny_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_tiny name = 0.2mm Nozzle version = 4 -definition = goofoo_tiny [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/goofoo_tiny_0.4.inst.cfg b/resources/variants/goofoo/goofoo_tiny_0.4.inst.cfg similarity index 99% rename from resources/variants/goofoo_tiny_0.4.inst.cfg rename to resources/variants/goofoo/goofoo_tiny_0.4.inst.cfg index c167336cfe..6c06100947 100644 --- a/resources/variants/goofoo_tiny_0.4.inst.cfg +++ b/resources/variants/goofoo/goofoo_tiny_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_tiny name = 0.4mm Nozzle version = 4 -definition = goofoo_tiny [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/goofoo_tiny_0.6.inst.cfg b/resources/variants/goofoo/goofoo_tiny_0.6.inst.cfg similarity index 99% rename from resources/variants/goofoo_tiny_0.6.inst.cfg rename to resources/variants/goofoo/goofoo_tiny_0.6.inst.cfg index b822932c42..cb02c67984 100644 --- a/resources/variants/goofoo_tiny_0.6.inst.cfg +++ b/resources/variants/goofoo/goofoo_tiny_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_tiny name = 0.6mm Nozzle version = 4 -definition = goofoo_tiny [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/goofoo_tiny_0.8.inst.cfg b/resources/variants/goofoo/goofoo_tiny_0.8.inst.cfg similarity index 99% rename from resources/variants/goofoo_tiny_0.8.inst.cfg rename to resources/variants/goofoo/goofoo_tiny_0.8.inst.cfg index 0e7d31f8cf..2175ea086a 100644 --- a/resources/variants/goofoo_tiny_0.8.inst.cfg +++ b/resources/variants/goofoo/goofoo_tiny_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_tiny name = 0.8mm Nozzle version = 4 -definition = goofoo_tiny [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/goofoo_tiny_1.0.inst.cfg b/resources/variants/goofoo/goofoo_tiny_1.0.inst.cfg similarity index 99% rename from resources/variants/goofoo_tiny_1.0.inst.cfg rename to resources/variants/goofoo/goofoo_tiny_1.0.inst.cfg index fe7ef15be2..6021959b41 100644 --- a/resources/variants/goofoo_tiny_1.0.inst.cfg +++ b/resources/variants/goofoo/goofoo_tiny_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_tiny name = 1.0mm Nozzle version = 4 -definition = goofoo_tiny [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/goofoo_tinyplus_0.2.inst.cfg b/resources/variants/goofoo/goofoo_tinyplus_0.2.inst.cfg similarity index 99% rename from resources/variants/goofoo_tinyplus_0.2.inst.cfg rename to resources/variants/goofoo/goofoo_tinyplus_0.2.inst.cfg index aba59e5c36..273db08359 100644 --- a/resources/variants/goofoo_tinyplus_0.2.inst.cfg +++ b/resources/variants/goofoo/goofoo_tinyplus_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_tinyplus name = 0.2mm Nozzle version = 4 -definition = goofoo_tinyplus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/goofoo_tinyplus_0.4.inst.cfg b/resources/variants/goofoo/goofoo_tinyplus_0.4.inst.cfg similarity index 99% rename from resources/variants/goofoo_tinyplus_0.4.inst.cfg rename to resources/variants/goofoo/goofoo_tinyplus_0.4.inst.cfg index 6d9e7b4bce..60df898a0c 100644 --- a/resources/variants/goofoo_tinyplus_0.4.inst.cfg +++ b/resources/variants/goofoo/goofoo_tinyplus_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_tinyplus name = 0.4mm Nozzle version = 4 -definition = goofoo_tinyplus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/goofoo_tinyplus_0.6.inst.cfg b/resources/variants/goofoo/goofoo_tinyplus_0.6.inst.cfg similarity index 99% rename from resources/variants/goofoo_tinyplus_0.6.inst.cfg rename to resources/variants/goofoo/goofoo_tinyplus_0.6.inst.cfg index be658ebde4..1246d00ab9 100644 --- a/resources/variants/goofoo_tinyplus_0.6.inst.cfg +++ b/resources/variants/goofoo/goofoo_tinyplus_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_tinyplus name = 0.6mm Nozzle version = 4 -definition = goofoo_tinyplus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/goofoo_tinyplus_0.8.inst.cfg b/resources/variants/goofoo/goofoo_tinyplus_0.8.inst.cfg similarity index 99% rename from resources/variants/goofoo_tinyplus_0.8.inst.cfg rename to resources/variants/goofoo/goofoo_tinyplus_0.8.inst.cfg index f635ed1bc9..7a20307366 100644 --- a/resources/variants/goofoo_tinyplus_0.8.inst.cfg +++ b/resources/variants/goofoo/goofoo_tinyplus_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_tinyplus name = 0.8mm Nozzle version = 4 -definition = goofoo_tinyplus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/goofoo_tinyplus_1.0.inst.cfg b/resources/variants/goofoo/goofoo_tinyplus_1.0.inst.cfg similarity index 99% rename from resources/variants/goofoo_tinyplus_1.0.inst.cfg rename to resources/variants/goofoo/goofoo_tinyplus_1.0.inst.cfg index ae22524621..6c19034e2d 100644 --- a/resources/variants/goofoo_tinyplus_1.0.inst.cfg +++ b/resources/variants/goofoo/goofoo_tinyplus_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = goofoo_tinyplus name = 1.0mm Nozzle version = 4 -definition = goofoo_tinyplus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/hms434_0.4tpnozzle.inst.cfg b/resources/variants/hms434/hms434_0.4tpnozzle.inst.cfg similarity index 99% rename from resources/variants/hms434_0.4tpnozzle.inst.cfg rename to resources/variants/hms434/hms434_0.4tpnozzle.inst.cfg index c02345a478..47d88d929a 100644 --- a/resources/variants/hms434_0.4tpnozzle.inst.cfg +++ b/resources/variants/hms434/hms434_0.4tpnozzle.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = hms434 name = 0.4mm TP extruder version = 4 -definition = hms434 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 machine_nozzle_tip_outer_diameter = 1.05 + diff --git a/resources/variants/hms434_0.8tpnozzle.inst.cfg b/resources/variants/hms434/hms434_0.8tpnozzle.inst.cfg similarity index 99% rename from resources/variants/hms434_0.8tpnozzle.inst.cfg rename to resources/variants/hms434/hms434_0.8tpnozzle.inst.cfg index 48d632b3d0..f27ea16941 100644 --- a/resources/variants/hms434_0.8tpnozzle.inst.cfg +++ b/resources/variants/hms434/hms434_0.8tpnozzle.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = hms434 name = 0.8mm TP extruder version = 4 -definition = hms434 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 machine_nozzle_tip_outer_diameter = 1.05 + diff --git a/resources/variants/imade3d_jellybox_0.4.inst.cfg b/resources/variants/imade3d/imade3d_jellybox_0.4.inst.cfg similarity index 99% rename from resources/variants/imade3d_jellybox_0.4.inst.cfg rename to resources/variants/imade3d/imade3d_jellybox_0.4.inst.cfg index 9e34ad0571..ebca5f3364 100644 --- a/resources/variants/imade3d_jellybox_0.4.inst.cfg +++ b/resources/variants/imade3d/imade3d_jellybox_0.4.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = imade3d_jellybox name = 0.4 mm version = 4 -definition = imade3d_jellybox [metadata] author = IMADE3D +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/imade3d_jellybox_2_0.4.inst.cfg b/resources/variants/imade3d/imade3d_jellybox_2_0.4.inst.cfg similarity index 99% rename from resources/variants/imade3d_jellybox_2_0.4.inst.cfg rename to resources/variants/imade3d/imade3d_jellybox_2_0.4.inst.cfg index b6b793d166..d3b69967da 100644 --- a/resources/variants/imade3d_jellybox_2_0.4.inst.cfg +++ b/resources/variants/imade3d/imade3d_jellybox_2_0.4.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = imade3d_jellybox_2 name = 0.4 mm version = 4 -definition = imade3d_jellybox_2 [metadata] author = IMADE3D +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/kingroon_kp3_0.2.inst.cfg b/resources/variants/kingroon/kingroon_kp3_0.2.inst.cfg similarity index 99% rename from resources/variants/kingroon_kp3_0.2.inst.cfg rename to resources/variants/kingroon/kingroon_kp3_0.2.inst.cfg index fc85835e19..19de9d3f88 100644 --- a/resources/variants/kingroon_kp3_0.2.inst.cfg +++ b/resources/variants/kingroon/kingroon_kp3_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = kingroon_kp3 name = 0.2mm Nozzle version = 4 -definition = kingroon_kp3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/kingroon_kp3_0.3.inst.cfg b/resources/variants/kingroon/kingroon_kp3_0.3.inst.cfg similarity index 99% rename from resources/variants/kingroon_kp3_0.3.inst.cfg rename to resources/variants/kingroon/kingroon_kp3_0.3.inst.cfg index 41781f2877..9cbee49501 100644 --- a/resources/variants/kingroon_kp3_0.3.inst.cfg +++ b/resources/variants/kingroon/kingroon_kp3_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = kingroon_kp3 name = 0.3mm Nozzle version = 4 -definition = kingroon_kp3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/kingroon_kp3_0.4.inst.cfg b/resources/variants/kingroon/kingroon_kp3_0.4.inst.cfg similarity index 99% rename from resources/variants/kingroon_kp3_0.4.inst.cfg rename to resources/variants/kingroon/kingroon_kp3_0.4.inst.cfg index 06213d0879..75681e9ef5 100644 --- a/resources/variants/kingroon_kp3_0.4.inst.cfg +++ b/resources/variants/kingroon/kingroon_kp3_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = kingroon_kp3 name = 0.4mm Nozzle version = 4 -definition = kingroon_kp3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/kingroon_kp3_0.5.inst.cfg b/resources/variants/kingroon/kingroon_kp3_0.5.inst.cfg similarity index 99% rename from resources/variants/kingroon_kp3_0.5.inst.cfg rename to resources/variants/kingroon/kingroon_kp3_0.5.inst.cfg index 1c72672e93..070c73f6d4 100644 --- a/resources/variants/kingroon_kp3_0.5.inst.cfg +++ b/resources/variants/kingroon/kingroon_kp3_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = kingroon_kp3 name = 0.5mm Nozzle version = 4 -definition = kingroon_kp3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/kingroon_kp3_0.6.inst.cfg b/resources/variants/kingroon/kingroon_kp3_0.6.inst.cfg similarity index 99% rename from resources/variants/kingroon_kp3_0.6.inst.cfg rename to resources/variants/kingroon/kingroon_kp3_0.6.inst.cfg index efca763110..80380b1c33 100644 --- a/resources/variants/kingroon_kp3_0.6.inst.cfg +++ b/resources/variants/kingroon/kingroon_kp3_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = kingroon_kp3 name = 0.6mm Nozzle version = 4 -definition = kingroon_kp3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/kingroon_kp3_0.8.inst.cfg b/resources/variants/kingroon/kingroon_kp3_0.8.inst.cfg similarity index 99% rename from resources/variants/kingroon_kp3_0.8.inst.cfg rename to resources/variants/kingroon/kingroon_kp3_0.8.inst.cfg index be4e284404..3a6f531ee2 100644 --- a/resources/variants/kingroon_kp3_0.8.inst.cfg +++ b/resources/variants/kingroon/kingroon_kp3_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = kingroon_kp3 name = 0.8mm Nozzle version = 4 -definition = kingroon_kp3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/kingroon_kp3_1.0.inst.cfg b/resources/variants/kingroon/kingroon_kp3_1.0.inst.cfg similarity index 99% rename from resources/variants/kingroon_kp3_1.0.inst.cfg rename to resources/variants/kingroon/kingroon_kp3_1.0.inst.cfg index e092679ce4..bee461cecf 100644 --- a/resources/variants/kingroon_kp3_1.0.inst.cfg +++ b/resources/variants/kingroon/kingroon_kp3_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = kingroon_kp3 name = 1.0mm Nozzle version = 4 -definition = kingroon_kp3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/kingroon_kp3s_0.2.inst.cfg b/resources/variants/kingroon/kingroon_kp3s_0.2.inst.cfg similarity index 99% rename from resources/variants/kingroon_kp3s_0.2.inst.cfg rename to resources/variants/kingroon/kingroon_kp3s_0.2.inst.cfg index e3617bfbbb..0cbe5c72ef 100644 --- a/resources/variants/kingroon_kp3s_0.2.inst.cfg +++ b/resources/variants/kingroon/kingroon_kp3s_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = kingroon_kp3s name = 0.2mm Nozzle version = 4 -definition = kingroon_kp3s [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/kingroon_kp3s_0.3.inst.cfg b/resources/variants/kingroon/kingroon_kp3s_0.3.inst.cfg similarity index 99% rename from resources/variants/kingroon_kp3s_0.3.inst.cfg rename to resources/variants/kingroon/kingroon_kp3s_0.3.inst.cfg index 9f05429d5d..e64095fa16 100644 --- a/resources/variants/kingroon_kp3s_0.3.inst.cfg +++ b/resources/variants/kingroon/kingroon_kp3s_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = kingroon_kp3s name = 0.3mm Nozzle version = 4 -definition = kingroon_kp3s [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/kingroon_kp3s_0.4.inst.cfg b/resources/variants/kingroon/kingroon_kp3s_0.4.inst.cfg similarity index 99% rename from resources/variants/kingroon_kp3s_0.4.inst.cfg rename to resources/variants/kingroon/kingroon_kp3s_0.4.inst.cfg index d24e661ff0..607f65858c 100644 --- a/resources/variants/kingroon_kp3s_0.4.inst.cfg +++ b/resources/variants/kingroon/kingroon_kp3s_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = kingroon_kp3s name = 0.4mm Nozzle version = 4 -definition = kingroon_kp3s [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/kingroon_kp3s_0.5.inst.cfg b/resources/variants/kingroon/kingroon_kp3s_0.5.inst.cfg similarity index 99% rename from resources/variants/kingroon_kp3s_0.5.inst.cfg rename to resources/variants/kingroon/kingroon_kp3s_0.5.inst.cfg index 43d4152897..2f6de4a188 100644 --- a/resources/variants/kingroon_kp3s_0.5.inst.cfg +++ b/resources/variants/kingroon/kingroon_kp3s_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = kingroon_kp3s name = 0.5mm Nozzle version = 4 -definition = kingroon_kp3s [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/kingroon_kp3s_0.6.inst.cfg b/resources/variants/kingroon/kingroon_kp3s_0.6.inst.cfg similarity index 99% rename from resources/variants/kingroon_kp3s_0.6.inst.cfg rename to resources/variants/kingroon/kingroon_kp3s_0.6.inst.cfg index d643f571c4..328be19f3a 100644 --- a/resources/variants/kingroon_kp3s_0.6.inst.cfg +++ b/resources/variants/kingroon/kingroon_kp3s_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = kingroon_kp3s name = 0.6mm Nozzle version = 4 -definition = kingroon_kp3s [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/kingroon_kp3s_0.8.inst.cfg b/resources/variants/kingroon/kingroon_kp3s_0.8.inst.cfg similarity index 99% rename from resources/variants/kingroon_kp3s_0.8.inst.cfg rename to resources/variants/kingroon/kingroon_kp3s_0.8.inst.cfg index ec0630dc11..aa1aadf805 100644 --- a/resources/variants/kingroon_kp3s_0.8.inst.cfg +++ b/resources/variants/kingroon/kingroon_kp3s_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = kingroon_kp3s name = 0.8mm Nozzle version = 4 -definition = kingroon_kp3s [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/kingroon_kp3s_1.0.inst.cfg b/resources/variants/kingroon/kingroon_kp3s_1.0.inst.cfg similarity index 99% rename from resources/variants/kingroon_kp3s_1.0.inst.cfg rename to resources/variants/kingroon/kingroon_kp3s_1.0.inst.cfg index 9107daeb26..9d623a7b79 100644 --- a/resources/variants/kingroon_kp3s_1.0.inst.cfg +++ b/resources/variants/kingroon/kingroon_kp3s_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = kingroon_kp3s name = 1.0mm Nozzle version = 4 -definition = kingroon_kp3s [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/kosher220_0.2.inst.cfg b/resources/variants/kosher/kosher220_0.2.inst.cfg similarity index 100% rename from resources/variants/kosher220_0.2.inst.cfg rename to resources/variants/kosher/kosher220_0.2.inst.cfg index 04a14fa8cf..06802db0e6 100644 --- a/resources/variants/kosher220_0.2.inst.cfg +++ b/resources/variants/kosher/kosher220_0.2.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = kosher name = 0.2 mm Nozzle version = 4 -definition = kosher [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/kosher220_0.3.inst.cfg b/resources/variants/kosher/kosher220_0.3.inst.cfg similarity index 100% rename from resources/variants/kosher220_0.3.inst.cfg rename to resources/variants/kosher/kosher220_0.3.inst.cfg index 5204a4bf82..a1f009049e 100644 --- a/resources/variants/kosher220_0.3.inst.cfg +++ b/resources/variants/kosher/kosher220_0.3.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = kosher name = 0.3 mm Nozzle version = 4 -definition = kosher [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/kosher220_0.4.inst.cfg b/resources/variants/kosher/kosher220_0.4.inst.cfg similarity index 100% rename from resources/variants/kosher220_0.4.inst.cfg rename to resources/variants/kosher/kosher220_0.4.inst.cfg index 6ff5777b17..fb373adec0 100644 --- a/resources/variants/kosher220_0.4.inst.cfg +++ b/resources/variants/kosher/kosher220_0.4.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = kosher name = 0.4 mm Nozzle version = 4 -definition = kosher [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/kosher220_0.5.inst.cfg b/resources/variants/kosher/kosher220_0.5.inst.cfg similarity index 100% rename from resources/variants/kosher220_0.5.inst.cfg rename to resources/variants/kosher/kosher220_0.5.inst.cfg index 44d8987b8c..7f09bd2e44 100644 --- a/resources/variants/kosher220_0.5.inst.cfg +++ b/resources/variants/kosher/kosher220_0.5.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = kosher name = 0.5 mm Nozzle version = 4 -definition = kosher [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/kosher220_0.6.inst.cfg b/resources/variants/kosher/kosher220_0.6.inst.cfg similarity index 100% rename from resources/variants/kosher220_0.6.inst.cfg rename to resources/variants/kosher/kosher220_0.6.inst.cfg index 48c173755d..a16e10833c 100644 --- a/resources/variants/kosher220_0.6.inst.cfg +++ b/resources/variants/kosher/kosher220_0.6.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = kosher name = 0.6 mm Nozzle version = 4 -definition = kosher [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/kosher220_0.8.inst.cfg b/resources/variants/kosher/kosher220_0.8.inst.cfg similarity index 100% rename from resources/variants/kosher220_0.8.inst.cfg rename to resources/variants/kosher/kosher220_0.8.inst.cfg index a749100c06..7282c746fd 100644 --- a/resources/variants/kosher220_0.8.inst.cfg +++ b/resources/variants/kosher/kosher220_0.8.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = kosher name = 0.8 mm Nozzle version = 4 -definition = kosher [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/kosher220_dm_0.2.inst.cfg b/resources/variants/kosher/kosher220_dm_0.2.inst.cfg similarity index 100% rename from resources/variants/kosher220_dm_0.2.inst.cfg rename to resources/variants/kosher/kosher220_dm_0.2.inst.cfg index 6f4001efcc..1e23576322 100644 --- a/resources/variants/kosher220_dm_0.2.inst.cfg +++ b/resources/variants/kosher/kosher220_dm_0.2.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = kosher_duplication name = 0.2 mm Nozzle version = 4 -definition = kosher_duplication [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/kosher220_dm_0.3.inst.cfg b/resources/variants/kosher/kosher220_dm_0.3.inst.cfg similarity index 100% rename from resources/variants/kosher220_dm_0.3.inst.cfg rename to resources/variants/kosher/kosher220_dm_0.3.inst.cfg index eb1533f78d..ede3dbb276 100644 --- a/resources/variants/kosher220_dm_0.3.inst.cfg +++ b/resources/variants/kosher/kosher220_dm_0.3.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = kosher_duplication name = 0.3 mm Nozzle version = 4 -definition = kosher_duplication [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/kosher220_dm_0.4.inst.cfg b/resources/variants/kosher/kosher220_dm_0.4.inst.cfg similarity index 100% rename from resources/variants/kosher220_dm_0.4.inst.cfg rename to resources/variants/kosher/kosher220_dm_0.4.inst.cfg index dd3e4d9df9..8ef5b68c7c 100644 --- a/resources/variants/kosher220_dm_0.4.inst.cfg +++ b/resources/variants/kosher/kosher220_dm_0.4.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = kosher_duplication name = 0.4 mm Nozzle version = 4 -definition = kosher_duplication [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/kosher220_dm_0.5.inst.cfg b/resources/variants/kosher/kosher220_dm_0.5.inst.cfg similarity index 100% rename from resources/variants/kosher220_dm_0.5.inst.cfg rename to resources/variants/kosher/kosher220_dm_0.5.inst.cfg index bd32c5ca24..0beb219b1d 100644 --- a/resources/variants/kosher220_dm_0.5.inst.cfg +++ b/resources/variants/kosher/kosher220_dm_0.5.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = kosher_duplication name = 0.5 mm Nozzle version = 4 -definition = kosher_duplication [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/kosher220_dm_0.6.inst.cfg b/resources/variants/kosher/kosher220_dm_0.6.inst.cfg similarity index 100% rename from resources/variants/kosher220_dm_0.6.inst.cfg rename to resources/variants/kosher/kosher220_dm_0.6.inst.cfg index 9ce1f7e7a8..98693f91f9 100644 --- a/resources/variants/kosher220_dm_0.6.inst.cfg +++ b/resources/variants/kosher/kosher220_dm_0.6.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = kosher_duplication name = 0.6 mm Nozzle version = 4 -definition = kosher_duplication [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/kosher220_dm_0.8.inst.cfg b/resources/variants/kosher/kosher220_dm_0.8.inst.cfg similarity index 100% rename from resources/variants/kosher220_dm_0.8.inst.cfg rename to resources/variants/kosher/kosher220_dm_0.8.inst.cfg index 1731c5f910..728c2cedc2 100644 --- a/resources/variants/kosher220_dm_0.8.inst.cfg +++ b/resources/variants/kosher/kosher220_dm_0.8.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = kosher_duplication name = 0.8 mm Nozzle version = 4 -definition = kosher_duplication [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/kosher220_mm_0.2.inst.cfg b/resources/variants/kosher/kosher220_mm_0.2.inst.cfg similarity index 100% rename from resources/variants/kosher220_mm_0.2.inst.cfg rename to resources/variants/kosher/kosher220_mm_0.2.inst.cfg index 48121ed983..f1720205ed 100644 --- a/resources/variants/kosher220_mm_0.2.inst.cfg +++ b/resources/variants/kosher/kosher220_mm_0.2.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = kosher_mirror name = 0.2 mm Nozzle version = 4 -definition = kosher_mirror [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/kosher220_mm_0.3.inst.cfg b/resources/variants/kosher/kosher220_mm_0.3.inst.cfg similarity index 100% rename from resources/variants/kosher220_mm_0.3.inst.cfg rename to resources/variants/kosher/kosher220_mm_0.3.inst.cfg index 1d2ae834a6..f7a55765ea 100644 --- a/resources/variants/kosher220_mm_0.3.inst.cfg +++ b/resources/variants/kosher/kosher220_mm_0.3.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = kosher_mirror name = 0.3 mm Nozzle version = 4 -definition = kosher_mirror [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/kosher220_mm_0.4.inst.cfg b/resources/variants/kosher/kosher220_mm_0.4.inst.cfg similarity index 100% rename from resources/variants/kosher220_mm_0.4.inst.cfg rename to resources/variants/kosher/kosher220_mm_0.4.inst.cfg index 32512bcc00..8e73e210af 100644 --- a/resources/variants/kosher220_mm_0.4.inst.cfg +++ b/resources/variants/kosher/kosher220_mm_0.4.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = kosher_mirror name = 0.4 mm Nozzle version = 4 -definition = kosher_mirror [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/kosher220_mm_0.5.inst.cfg b/resources/variants/kosher/kosher220_mm_0.5.inst.cfg similarity index 100% rename from resources/variants/kosher220_mm_0.5.inst.cfg rename to resources/variants/kosher/kosher220_mm_0.5.inst.cfg index 1e27953aad..a6b821c013 100644 --- a/resources/variants/kosher220_mm_0.5.inst.cfg +++ b/resources/variants/kosher/kosher220_mm_0.5.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = kosher_mirror name = 0.5 mm Nozzle version = 4 -definition = kosher_mirror [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/kosher220_mm_0.6.inst.cfg b/resources/variants/kosher/kosher220_mm_0.6.inst.cfg similarity index 100% rename from resources/variants/kosher220_mm_0.6.inst.cfg rename to resources/variants/kosher/kosher220_mm_0.6.inst.cfg index 145e45cb7a..dff208f17b 100644 --- a/resources/variants/kosher220_mm_0.6.inst.cfg +++ b/resources/variants/kosher/kosher220_mm_0.6.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = kosher_mirror name = 0.6 mm Nozzle version = 4 -definition = kosher_mirror [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/kosher220_mm_0.8.inst.cfg b/resources/variants/kosher/kosher220_mm_0.8.inst.cfg similarity index 100% rename from resources/variants/kosher220_mm_0.8.inst.cfg rename to resources/variants/kosher/kosher220_mm_0.8.inst.cfg index 739473260a..8aeb4ca4ff 100644 --- a/resources/variants/kosher220_mm_0.8.inst.cfg +++ b/resources/variants/kosher/kosher220_mm_0.8.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = kosher_mirror name = 0.8 mm Nozzle version = 4 -definition = kosher_mirror [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/kosher220_pva_0.2.inst.cfg b/resources/variants/kosher/kosher220_pva_0.2.inst.cfg similarity index 95% rename from resources/variants/kosher220_pva_0.2.inst.cfg rename to resources/variants/kosher/kosher220_pva_0.2.inst.cfg index 60c1e5e85a..d2309a6c43 100644 --- a/resources/variants/kosher220_pva_0.2.inst.cfg +++ b/resources/variants/kosher/kosher220_pva_0.2.inst.cfg @@ -1,32 +1,32 @@ [general] +definition = kosher name = PVA 0.2 mm Nozzle version = 4 -definition = kosher [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +gradual_support_infill_steps = 2 machine_nozzle_size = 0.2 -support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height -support_offset = 3 +support_angle = 45 support_bottom_height = =layer_height * 2 support_bottom_pattern = zigzag support_bottom_stair_step_height = =layer_height support_infill_rate = 50 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_interface_density = 100 support_interface_enable = True support_interface_height = =layer_height * 5 +support_interface_pattern = concentric support_interface_skip_height = =layer_height support_join_distance = 3 -support_xy_distance = =machine_nozzle_size / 2 -support_xy_distance_overhang = =machine_nozzle_size / 2 -support_angle = 45 +support_offset = 3 support_pattern = triangles support_use_towers = False +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0 -gradual_support_infill_steps = 2 -support_interface_density = 100 -support_interface_pattern = concentric \ No newline at end of file + diff --git a/resources/variants/kosher220_pva_0.3.inst.cfg b/resources/variants/kosher/kosher220_pva_0.3.inst.cfg similarity index 95% rename from resources/variants/kosher220_pva_0.3.inst.cfg rename to resources/variants/kosher/kosher220_pva_0.3.inst.cfg index 5e5af9f02e..d58a343992 100644 --- a/resources/variants/kosher220_pva_0.3.inst.cfg +++ b/resources/variants/kosher/kosher220_pva_0.3.inst.cfg @@ -1,32 +1,32 @@ [general] +definition = kosher_duplication name = PVA 0.3 mm Nozzle version = 4 -definition = kosher_duplication [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +gradual_support_infill_steps = 2 machine_nozzle_size = 0.3 -support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height -support_offset = 3 +support_angle = 45 support_bottom_height = =layer_height * 2 support_bottom_pattern = zigzag support_bottom_stair_step_height = =layer_height support_infill_rate = 50 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_interface_density = 100 support_interface_enable = True support_interface_height = =layer_height * 5 +support_interface_pattern = concentric support_interface_skip_height = =layer_height support_join_distance = 3 -support_xy_distance = =machine_nozzle_size / 2 -support_xy_distance_overhang = =machine_nozzle_size / 2 -support_angle = 45 +support_offset = 3 support_pattern = triangles support_use_towers = False +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0 -gradual_support_infill_steps = 2 -support_interface_density = 100 -support_interface_pattern = concentric \ No newline at end of file + diff --git a/resources/variants/kosher220_pva_0.4.inst.cfg b/resources/variants/kosher/kosher220_pva_0.4.inst.cfg similarity index 95% rename from resources/variants/kosher220_pva_0.4.inst.cfg rename to resources/variants/kosher/kosher220_pva_0.4.inst.cfg index dd9144df68..d4c2f881df 100644 --- a/resources/variants/kosher220_pva_0.4.inst.cfg +++ b/resources/variants/kosher/kosher220_pva_0.4.inst.cfg @@ -1,32 +1,32 @@ [general] +definition = kosher name = PVA 0.4 mm Nozzle version = 4 -definition = kosher [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +gradual_support_infill_steps = 2 machine_nozzle_size = 0.4 -support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height -support_offset = 3 +support_angle = 45 support_bottom_height = =layer_height * 2 support_bottom_pattern = zigzag support_bottom_stair_step_height = =layer_height support_infill_rate = 50 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_interface_density = 100 support_interface_enable = True support_interface_height = =layer_height * 5 +support_interface_pattern = concentric support_interface_skip_height = =layer_height support_join_distance = 3 -support_xy_distance = =machine_nozzle_size / 2 -support_xy_distance_overhang = =machine_nozzle_size / 2 -support_angle = 45 +support_offset = 3 support_pattern = triangles support_use_towers = False +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0 -gradual_support_infill_steps = 2 -support_interface_density = 100 -support_interface_pattern = concentric \ No newline at end of file + diff --git a/resources/variants/kosher220_pva_0.5.inst.cfg b/resources/variants/kosher/kosher220_pva_0.5.inst.cfg similarity index 95% rename from resources/variants/kosher220_pva_0.5.inst.cfg rename to resources/variants/kosher/kosher220_pva_0.5.inst.cfg index 110742f082..fd1a5b357e 100644 --- a/resources/variants/kosher220_pva_0.5.inst.cfg +++ b/resources/variants/kosher/kosher220_pva_0.5.inst.cfg @@ -1,32 +1,32 @@ [general] +definition = kosher name = PVA 0.5 mm Nozzle version = 4 -definition = kosher [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +gradual_support_infill_steps = 2 machine_nozzle_size = 0.5 -support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height -support_offset = 3 +support_angle = 45 support_bottom_height = =layer_height * 2 support_bottom_pattern = zigzag support_bottom_stair_step_height = =layer_height support_infill_rate = 50 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_interface_density = 100 support_interface_enable = True support_interface_height = =layer_height * 5 +support_interface_pattern = concentric support_interface_skip_height = =layer_height support_join_distance = 3 -support_xy_distance = =machine_nozzle_size / 2 -support_xy_distance_overhang = =machine_nozzle_size / 2 -support_angle = 45 +support_offset = 3 support_pattern = triangles support_use_towers = False +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0 -gradual_support_infill_steps = 2 -support_interface_density = 100 -support_interface_pattern = concentric \ No newline at end of file + diff --git a/resources/variants/kosher220_pva_0.6.inst.cfg b/resources/variants/kosher/kosher220_pva_0.6.inst.cfg similarity index 95% rename from resources/variants/kosher220_pva_0.6.inst.cfg rename to resources/variants/kosher/kosher220_pva_0.6.inst.cfg index 6909527101..8e98f014ba 100644 --- a/resources/variants/kosher220_pva_0.6.inst.cfg +++ b/resources/variants/kosher/kosher220_pva_0.6.inst.cfg @@ -1,32 +1,32 @@ [general] +definition = kosher name = PVA 0.6 mm Nozzle version = 4 -definition = kosher [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +gradual_support_infill_steps = 2 machine_nozzle_size = 0.6 -support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height -support_offset = 3 +support_angle = 45 support_bottom_height = =layer_height * 2 support_bottom_pattern = zigzag support_bottom_stair_step_height = =layer_height support_infill_rate = 50 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_interface_density = 100 support_interface_enable = True support_interface_height = =layer_height * 5 +support_interface_pattern = concentric support_interface_skip_height = =layer_height support_join_distance = 3 -support_xy_distance = =machine_nozzle_size / 2 -support_xy_distance_overhang = =machine_nozzle_size / 2 -support_angle = 45 +support_offset = 3 support_pattern = triangles support_use_towers = False +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0 -gradual_support_infill_steps = 2 -support_interface_density = 100 -support_interface_pattern = concentric \ No newline at end of file + diff --git a/resources/variants/kosher220_pva_0.8.inst.cfg b/resources/variants/kosher/kosher220_pva_0.8.inst.cfg similarity index 95% rename from resources/variants/kosher220_pva_0.8.inst.cfg rename to resources/variants/kosher/kosher220_pva_0.8.inst.cfg index 17482d9b26..1573653153 100644 --- a/resources/variants/kosher220_pva_0.8.inst.cfg +++ b/resources/variants/kosher/kosher220_pva_0.8.inst.cfg @@ -1,32 +1,32 @@ [general] +definition = kosher name = PVA 0.8 mm Nozzle version = 4 -definition = kosher [metadata] - +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +gradual_support_infill_steps = 2 machine_nozzle_size = 0.8 -support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height -support_offset = 3 +support_angle = 45 support_bottom_height = =layer_height * 2 support_bottom_pattern = zigzag support_bottom_stair_step_height = =layer_height support_infill_rate = 50 +support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height +support_interface_density = 100 support_interface_enable = True support_interface_height = =layer_height * 5 +support_interface_pattern = concentric support_interface_skip_height = =layer_height support_join_distance = 3 -support_xy_distance = =machine_nozzle_size / 2 -support_xy_distance_overhang = =machine_nozzle_size / 2 -support_angle = 45 +support_offset = 3 support_pattern = triangles support_use_towers = False +support_xy_distance = =machine_nozzle_size / 2 +support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0 -gradual_support_infill_steps = 2 -support_interface_density = 100 -support_interface_pattern = concentric \ No newline at end of file + diff --git a/resources/variants/Leapfrog_Bolt_Pro_Brass_0.4.inst.cfg b/resources/variants/leapfrog/Leapfrog_Bolt_Pro_Brass_0.4.inst.cfg similarity index 99% rename from resources/variants/Leapfrog_Bolt_Pro_Brass_0.4.inst.cfg rename to resources/variants/leapfrog/Leapfrog_Bolt_Pro_Brass_0.4.inst.cfg index 3cfcb36511..4340cd9251 100644 --- a/resources/variants/Leapfrog_Bolt_Pro_Brass_0.4.inst.cfg +++ b/resources/variants/leapfrog/Leapfrog_Bolt_Pro_Brass_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = leapfrog_bolt_pro name = Brass 0.4 version = 4 -definition = leapfrog_bolt_pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/Leapfrog_Bolt_Pro_NozzleX_0.4.inst.cfg b/resources/variants/leapfrog/Leapfrog_Bolt_Pro_NozzleX_0.4.inst.cfg similarity index 99% rename from resources/variants/Leapfrog_Bolt_Pro_NozzleX_0.4.inst.cfg rename to resources/variants/leapfrog/Leapfrog_Bolt_Pro_NozzleX_0.4.inst.cfg index cd310e625d..6e08af96df 100644 --- a/resources/variants/Leapfrog_Bolt_Pro_NozzleX_0.4.inst.cfg +++ b/resources/variants/leapfrog/Leapfrog_Bolt_Pro_NozzleX_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = leapfrog_bolt_pro name = NozzleX 0.4 version = 4 -definition = leapfrog_bolt_pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/liquid_vo04.inst.cfg b/resources/variants/liquid/liquid_vo04.inst.cfg similarity index 99% rename from resources/variants/liquid_vo04.inst.cfg rename to resources/variants/liquid/liquid_vo04.inst.cfg index 3d91f31c71..f12de05370 100644 --- a/resources/variants/liquid_vo04.inst.cfg +++ b/resources/variants/liquid/liquid_vo04.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = liquid name = VO 0.4 version = 4 -definition = liquid [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] brim_width = 7 @@ -41,3 +41,4 @@ switch_extruder_prime_speed = =switch_extruder_retraction_speeds switch_extruder_retraction_amount = =machine_heat_zone_length top_bottom_thickness = 1.2 wall_thickness = 1.3 + diff --git a/resources/variants/liquid_vo06.inst.cfg b/resources/variants/liquid/liquid_vo06.inst.cfg similarity index 99% rename from resources/variants/liquid_vo06.inst.cfg rename to resources/variants/liquid/liquid_vo06.inst.cfg index 7c903f78a0..01a6c3efde 100644 --- a/resources/variants/liquid_vo06.inst.cfg +++ b/resources/variants/liquid/liquid_vo06.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = liquid name = VO 0.6 version = 4 -definition = liquid [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] brim_width = 7 @@ -44,3 +44,4 @@ switch_extruder_prime_speed = =switch_extruder_retraction_speeds switch_extruder_retraction_amount = =machine_heat_zone_length top_bottom_thickness = =layer_height * 6 wall_thickness = =line_width * 3 + diff --git a/resources/variants/liquid_vo08.inst.cfg b/resources/variants/liquid/liquid_vo08.inst.cfg similarity index 99% rename from resources/variants/liquid_vo08.inst.cfg rename to resources/variants/liquid/liquid_vo08.inst.cfg index a738c633a9..e1cd4f37e4 100644 --- a/resources/variants/liquid_vo08.inst.cfg +++ b/resources/variants/liquid/liquid_vo08.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = liquid name = VO 0.8 version = 4 -definition = liquid [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] acceleration_enabled = True @@ -63,3 +63,4 @@ wall_0_inset = 0 wall_line_width_0 = =wall_line_width wall_line_width_x = =wall_line_width wall_thickness = 2 + diff --git a/resources/variants/longer/longer_base_0.4.inst.cfg b/resources/variants/longer/longer_base_0.4.inst.cfg index c111be740c..44486b4c1b 100644 --- a/resources/variants/longer/longer_base_0.4.inst.cfg +++ b/resources/variants/longer/longer_base_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = longer_base name = 0.4mm Nozzle version = 4 -definition = longer_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/longer/longer_cube2_0.4.inst.cfg b/resources/variants/longer/longer_cube2_0.4.inst.cfg index fd0a4f2c1e..99e9351767 100644 --- a/resources/variants/longer/longer_cube2_0.4.inst.cfg +++ b/resources/variants/longer/longer_cube2_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = longer_cube2 name = 0.4mm Nozzle version = 4 -definition = longer_cube2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/longer/longer_lk1_0.4.inst.cfg b/resources/variants/longer/longer_lk1_0.4.inst.cfg index 13894ba737..045a0549ac 100644 --- a/resources/variants/longer/longer_lk1_0.4.inst.cfg +++ b/resources/variants/longer/longer_lk1_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = longer_lk1 name = 0.4mm Nozzle version = 4 -definition = longer_lk1 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/longer/longer_lk1plus_0.4.inst.cfg b/resources/variants/longer/longer_lk1plus_0.4.inst.cfg index e53c7afd86..57f9284d2f 100644 --- a/resources/variants/longer/longer_lk1plus_0.4.inst.cfg +++ b/resources/variants/longer/longer_lk1plus_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = longer_lk1plus name = 0.4mm Nozzle version = 4 -definition = longer_lk1plus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/longer/longer_lk1pro_0.4.inst.cfg b/resources/variants/longer/longer_lk1pro_0.4.inst.cfg index 7d958ee0be..0815b3c652 100644 --- a/resources/variants/longer/longer_lk1pro_0.4.inst.cfg +++ b/resources/variants/longer/longer_lk1pro_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = longer_lk1pro name = 0.4mm Nozzle version = 4 -definition = longer_lk1pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/longer/longer_lk4_0.4.inst.cfg b/resources/variants/longer/longer_lk4_0.4.inst.cfg index 3d836509b9..8185d64a72 100644 --- a/resources/variants/longer/longer_lk4_0.4.inst.cfg +++ b/resources/variants/longer/longer_lk4_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = longer_lk4 name = 0.4mm Nozzle version = 4 -definition = longer_lk4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/longer/longer_lk4pro_0.4.inst.cfg b/resources/variants/longer/longer_lk4pro_0.4.inst.cfg index c42799f7af..78372e42b7 100644 --- a/resources/variants/longer/longer_lk4pro_0.4.inst.cfg +++ b/resources/variants/longer/longer_lk4pro_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = longer_lk4pro name = 0.4mm Nozzle version = 4 -definition = longer_lk4pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/longer/longer_lk5_0.4.inst.cfg b/resources/variants/longer/longer_lk5_0.4.inst.cfg index 746ce1f327..94e49223a3 100644 --- a/resources/variants/longer/longer_lk5_0.4.inst.cfg +++ b/resources/variants/longer/longer_lk5_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = longer_lk5 name = 0.4mm Nozzle version = 4 -definition = longer_lk5 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/longer/longer_lk5pro_0.4.inst.cfg b/resources/variants/longer/longer_lk5pro_0.4.inst.cfg index 68680cc66d..ae5e47bd45 100644 --- a/resources/variants/longer/longer_lk5pro_0.4.inst.cfg +++ b/resources/variants/longer/longer_lk5pro_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = longer_lk5pro name = 0.4mm Nozzle version = 4 -definition = longer_lk5pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/Mark2_for_Ultimaker2_0.25.inst.cfg b/resources/variants/mark2/Mark2_for_Ultimaker2_0.25.inst.cfg similarity index 99% rename from resources/variants/Mark2_for_Ultimaker2_0.25.inst.cfg rename to resources/variants/mark2/Mark2_for_Ultimaker2_0.25.inst.cfg index 0f0bf82d43..3fdcea0285 100644 --- a/resources/variants/Mark2_for_Ultimaker2_0.25.inst.cfg +++ b/resources/variants/mark2/Mark2_for_Ultimaker2_0.25.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = Mark2_for_Ultimaker2 name = 0.25 mm version = 4 -definition = Mark2_for_Ultimaker2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] coasting_min_volume = 0.17 @@ -17,3 +17,4 @@ raft_airgap = 0.25 speed_topbottom = =round(speed_print / 1.5, 1) speed_wall = =round(speed_print / 1.2, 1) speed_wall_0 = =1 if speed_wall < 5 else (speed_wall - 5) + diff --git a/resources/variants/Mark2_for_Ultimaker2_0.4.inst.cfg b/resources/variants/mark2/Mark2_for_Ultimaker2_0.4.inst.cfg similarity index 100% rename from resources/variants/Mark2_for_Ultimaker2_0.4.inst.cfg rename to resources/variants/mark2/Mark2_for_Ultimaker2_0.4.inst.cfg index d98e82cdeb..ea7ec4d677 100644 --- a/resources/variants/Mark2_for_Ultimaker2_0.4.inst.cfg +++ b/resources/variants/mark2/Mark2_for_Ultimaker2_0.4.inst.cfg @@ -1,17 +1,17 @@ [general] +definition = Mark2_for_Ultimaker2 name = 0.4 mm version = 4 -definition = Mark2_for_Ultimaker2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 machine_nozzle_tip_outer_diameter = 1.05 +speed_topbottom = =round(speed_print / 2.25, 1) speed_wall = =round(speed_print / 1.25, 1) speed_wall_0 = =max(speed_wall - 10, 1) -speed_topbottom = =round(speed_print / 2.25, 1) diff --git a/resources/variants/Mark2_for_Ultimaker2_0.6.inst.cfg b/resources/variants/mark2/Mark2_for_Ultimaker2_0.6.inst.cfg similarity index 100% rename from resources/variants/Mark2_for_Ultimaker2_0.6.inst.cfg rename to resources/variants/mark2/Mark2_for_Ultimaker2_0.6.inst.cfg index fb34361080..a7290c4ab1 100644 --- a/resources/variants/Mark2_for_Ultimaker2_0.6.inst.cfg +++ b/resources/variants/mark2/Mark2_for_Ultimaker2_0.6.inst.cfg @@ -1,18 +1,18 @@ [general] +definition = Mark2_for_Ultimaker2 name = 0.6 mm version = 4 -definition = Mark2_for_Ultimaker2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +coasting_volume = 1.36 machine_nozzle_size = 0.6 machine_nozzle_tip_outer_diameter = 1.25 -coasting_volume = 1.36 +speed_topbottom = =round(speed_print / 2, 1) speed_wall = =round(speed_print * 4 / 3, 1) speed_wall_0 = =1 if speed_wall < 10 else (speed_wall - 10) -speed_topbottom = =round(speed_print / 2, 1) diff --git a/resources/variants/Mark2_for_Ultimaker2_0.8.inst.cfg b/resources/variants/mark2/Mark2_for_Ultimaker2_0.8.inst.cfg similarity index 100% rename from resources/variants/Mark2_for_Ultimaker2_0.8.inst.cfg rename to resources/variants/mark2/Mark2_for_Ultimaker2_0.8.inst.cfg index 6fd001b050..50c98f436e 100644 --- a/resources/variants/Mark2_for_Ultimaker2_0.8.inst.cfg +++ b/resources/variants/mark2/Mark2_for_Ultimaker2_0.8.inst.cfg @@ -1,18 +1,18 @@ [general] +definition = Mark2_for_Ultimaker2 name = 0.8 mm version = 4 -definition = Mark2_for_Ultimaker2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +coasting_volume = 3.22 machine_nozzle_size = 0.8 machine_nozzle_tip_outer_diameter = 1.35 -coasting_volume = 3.22 +speed_topbottom = =round(speed_print / 2, 1) speed_wall = =round(speed_print * 4 / 3, 1) speed_wall_0 = =1 if speed_wall < 10 else (speed_wall - 10) -speed_topbottom = =round(speed_print / 2, 1) diff --git a/resources/variants/mingda_1000pro_0.2.inst.cfg b/resources/variants/mingda/mingda_1000pro_0.2.inst.cfg similarity index 99% rename from resources/variants/mingda_1000pro_0.2.inst.cfg rename to resources/variants/mingda/mingda_1000pro_0.2.inst.cfg index a3b44c9cd3..75289e32dd 100644 --- a/resources/variants/mingda_1000pro_0.2.inst.cfg +++ b/resources/variants/mingda/mingda_1000pro_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_1000pro name = 0.2mm Nozzle version = 4 -definition = mingda_1000pro [metadata] +hardware_type = nozzle 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/mingda_1000pro_0.3.inst.cfg similarity index 99% rename from resources/variants/mingda_1000pro_0.3.inst.cfg rename to resources/variants/mingda/mingda_1000pro_0.3.inst.cfg index 67b65d8e88..761d7496af 100644 --- a/resources/variants/mingda_1000pro_0.3.inst.cfg +++ b/resources/variants/mingda/mingda_1000pro_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_1000pro name = 0.3mm Nozzle version = 4 -definition = mingda_1000pro [metadata] +hardware_type = nozzle 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/mingda_1000pro_0.4.inst.cfg similarity index 99% rename from resources/variants/mingda_1000pro_0.4.inst.cfg rename to resources/variants/mingda/mingda_1000pro_0.4.inst.cfg index aa147e1904..2cfd0f4076 100644 --- a/resources/variants/mingda_1000pro_0.4.inst.cfg +++ b/resources/variants/mingda/mingda_1000pro_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_1000pro name = 0.4mm Nozzle version = 4 -definition = mingda_1000pro [metadata] +hardware_type = nozzle 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/mingda_1000pro_0.5.inst.cfg similarity index 99% rename from resources/variants/mingda_1000pro_0.5.inst.cfg rename to resources/variants/mingda/mingda_1000pro_0.5.inst.cfg index 8bce8b1212..377a7a43c3 100644 --- a/resources/variants/mingda_1000pro_0.5.inst.cfg +++ b/resources/variants/mingda/mingda_1000pro_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_1000pro name = 0.5mm Nozzle version = 4 -definition = mingda_1000pro [metadata] +hardware_type = nozzle 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/mingda_1000pro_0.6.inst.cfg similarity index 99% rename from resources/variants/mingda_1000pro_0.6.inst.cfg rename to resources/variants/mingda/mingda_1000pro_0.6.inst.cfg index e7e8282c61..32c9b4d9a9 100644 --- a/resources/variants/mingda_1000pro_0.6.inst.cfg +++ b/resources/variants/mingda/mingda_1000pro_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_1000pro name = 0.6mm Nozzle version = 4 -definition = mingda_1000pro [metadata] +hardware_type = nozzle 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/mingda_1000pro_0.8.inst.cfg similarity index 99% rename from resources/variants/mingda_1000pro_0.8.inst.cfg rename to resources/variants/mingda/mingda_1000pro_0.8.inst.cfg index d48fbd6f78..3525d9c11f 100644 --- a/resources/variants/mingda_1000pro_0.8.inst.cfg +++ b/resources/variants/mingda/mingda_1000pro_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_1000pro name = 0.8mm Nozzle version = 4 -definition = mingda_1000pro [metadata] +hardware_type = nozzle 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/mingda_1000pro_1.0.inst.cfg similarity index 99% rename from resources/variants/mingda_1000pro_1.0.inst.cfg rename to resources/variants/mingda/mingda_1000pro_1.0.inst.cfg index 64169a9235..bb6b4dc65f 100644 --- a/resources/variants/mingda_1000pro_1.0.inst.cfg +++ b/resources/variants/mingda/mingda_1000pro_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_1000pro name = 1.0mm Nozzle version = 4 -definition = mingda_1000pro [metadata] +hardware_type = nozzle 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/mingda_4h_0.2.inst.cfg similarity index 99% rename from resources/variants/mingda_4h_0.2.inst.cfg rename to resources/variants/mingda/mingda_4h_0.2.inst.cfg index 82979eaa2f..721d962675 100644 --- a/resources/variants/mingda_4h_0.2.inst.cfg +++ b/resources/variants/mingda/mingda_4h_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_4h name = 0.2mm Nozzle version = 4 -definition = mingda_4h [metadata] +hardware_type = nozzle 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/mingda_4h_0.3.inst.cfg similarity index 99% rename from resources/variants/mingda_4h_0.3.inst.cfg rename to resources/variants/mingda/mingda_4h_0.3.inst.cfg index f5fc189870..451cf91612 100644 --- a/resources/variants/mingda_4h_0.3.inst.cfg +++ b/resources/variants/mingda/mingda_4h_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_4h name = 0.3mm Nozzle version = 4 -definition = mingda_4h [metadata] +hardware_type = nozzle 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/mingda_4h_0.4.inst.cfg similarity index 99% rename from resources/variants/mingda_4h_0.4.inst.cfg rename to resources/variants/mingda/mingda_4h_0.4.inst.cfg index 7b7ff66695..fe600a82a4 100644 --- a/resources/variants/mingda_4h_0.4.inst.cfg +++ b/resources/variants/mingda/mingda_4h_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_4h name = 0.4mm Nozzle version = 4 -definition = mingda_4h [metadata] +hardware_type = nozzle 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/mingda_4h_0.5.inst.cfg similarity index 99% rename from resources/variants/mingda_4h_0.5.inst.cfg rename to resources/variants/mingda/mingda_4h_0.5.inst.cfg index 07b5993ac3..c09d2e3634 100644 --- a/resources/variants/mingda_4h_0.5.inst.cfg +++ b/resources/variants/mingda/mingda_4h_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_4h name = 0.5mm Nozzle version = 4 -definition = mingda_4h [metadata] +hardware_type = nozzle 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/mingda_4h_0.6.inst.cfg similarity index 99% rename from resources/variants/mingda_4h_0.6.inst.cfg rename to resources/variants/mingda/mingda_4h_0.6.inst.cfg index 13ca72144e..ca012e1940 100644 --- a/resources/variants/mingda_4h_0.6.inst.cfg +++ b/resources/variants/mingda/mingda_4h_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_4h name = 0.6mm Nozzle version = 4 -definition = mingda_4h [metadata] +hardware_type = nozzle 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/mingda_4h_0.8.inst.cfg similarity index 99% rename from resources/variants/mingda_4h_0.8.inst.cfg rename to resources/variants/mingda/mingda_4h_0.8.inst.cfg index b9041d5a5f..e454756f28 100644 --- a/resources/variants/mingda_4h_0.8.inst.cfg +++ b/resources/variants/mingda/mingda_4h_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_4h name = 0.8mm Nozzle version = 4 -definition = mingda_4h [metadata] +hardware_type = nozzle 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/mingda_4h_1.0.inst.cfg similarity index 99% rename from resources/variants/mingda_4h_1.0.inst.cfg rename to resources/variants/mingda/mingda_4h_1.0.inst.cfg index c02f646bbe..26e0e0a094 100644 --- a/resources/variants/mingda_4h_1.0.inst.cfg +++ b/resources/variants/mingda/mingda_4h_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_4h name = 1.0mm Nozzle version = 4 -definition = mingda_4h [metadata] +hardware_type = nozzle 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/mingda_600pro_0.2.inst.cfg similarity index 99% rename from resources/variants/mingda_600pro_0.2.inst.cfg rename to resources/variants/mingda/mingda_600pro_0.2.inst.cfg index 5427e0b86d..0bb4a9ea05 100644 --- a/resources/variants/mingda_600pro_0.2.inst.cfg +++ b/resources/variants/mingda/mingda_600pro_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_600pro name = 0.2mm Nozzle version = 4 -definition = mingda_600pro [metadata] +hardware_type = nozzle 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/mingda_600pro_0.3.inst.cfg similarity index 99% rename from resources/variants/mingda_600pro_0.3.inst.cfg rename to resources/variants/mingda/mingda_600pro_0.3.inst.cfg index 31e8f8352b..1d84d67aaf 100644 --- a/resources/variants/mingda_600pro_0.3.inst.cfg +++ b/resources/variants/mingda/mingda_600pro_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_600pro name = 0.3mm Nozzle version = 4 -definition = mingda_600pro [metadata] +hardware_type = nozzle 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/mingda_600pro_0.4.inst.cfg similarity index 99% rename from resources/variants/mingda_600pro_0.4.inst.cfg rename to resources/variants/mingda/mingda_600pro_0.4.inst.cfg index a1a4d9826f..8748a3c891 100644 --- a/resources/variants/mingda_600pro_0.4.inst.cfg +++ b/resources/variants/mingda/mingda_600pro_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_600pro name = 0.4mm Nozzle version = 4 -definition = mingda_600pro [metadata] +hardware_type = nozzle 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/mingda_600pro_0.5.inst.cfg similarity index 99% rename from resources/variants/mingda_600pro_0.5.inst.cfg rename to resources/variants/mingda/mingda_600pro_0.5.inst.cfg index 8d37c0040f..aabaad1153 100644 --- a/resources/variants/mingda_600pro_0.5.inst.cfg +++ b/resources/variants/mingda/mingda_600pro_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_600pro name = 0.5mm Nozzle version = 4 -definition = mingda_600pro [metadata] +hardware_type = nozzle 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/mingda_600pro_0.6.inst.cfg similarity index 99% rename from resources/variants/mingda_600pro_0.6.inst.cfg rename to resources/variants/mingda/mingda_600pro_0.6.inst.cfg index 6ef72845ce..1306a24d04 100644 --- a/resources/variants/mingda_600pro_0.6.inst.cfg +++ b/resources/variants/mingda/mingda_600pro_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_600pro name = 0.6mm Nozzle version = 4 -definition = mingda_600pro [metadata] +hardware_type = nozzle 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/mingda_600pro_0.8.inst.cfg similarity index 99% rename from resources/variants/mingda_600pro_0.8.inst.cfg rename to resources/variants/mingda/mingda_600pro_0.8.inst.cfg index 0282114c25..5f540da41f 100644 --- a/resources/variants/mingda_600pro_0.8.inst.cfg +++ b/resources/variants/mingda/mingda_600pro_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_600pro name = 0.8mm Nozzle version = 4 -definition = mingda_600pro [metadata] +hardware_type = nozzle 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/mingda_600pro_1.0.inst.cfg similarity index 99% rename from resources/variants/mingda_600pro_1.0.inst.cfg rename to resources/variants/mingda/mingda_600pro_1.0.inst.cfg index e9f90e72f6..85cd0aceb7 100644 --- a/resources/variants/mingda_600pro_1.0.inst.cfg +++ b/resources/variants/mingda/mingda_600pro_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_600pro name = 1.0mm Nozzle version = 4 -definition = mingda_600pro [metadata] +hardware_type = nozzle 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/mingda_6h_0.2.inst.cfg similarity index 99% rename from resources/variants/mingda_6h_0.2.inst.cfg rename to resources/variants/mingda/mingda_6h_0.2.inst.cfg index d1a06c52c3..5e621f0159 100644 --- a/resources/variants/mingda_6h_0.2.inst.cfg +++ b/resources/variants/mingda/mingda_6h_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_6h name = 0.2mm Nozzle version = 4 -definition = mingda_6h [metadata] +hardware_type = nozzle 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/mingda_6h_0.3.inst.cfg similarity index 99% rename from resources/variants/mingda_6h_0.3.inst.cfg rename to resources/variants/mingda/mingda_6h_0.3.inst.cfg index a6f08c9008..4be6e9040d 100644 --- a/resources/variants/mingda_6h_0.3.inst.cfg +++ b/resources/variants/mingda/mingda_6h_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_6h name = 0.3mm Nozzle version = 4 -definition = mingda_6h [metadata] +hardware_type = nozzle 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/mingda_6h_0.4.inst.cfg similarity index 99% rename from resources/variants/mingda_6h_0.4.inst.cfg rename to resources/variants/mingda/mingda_6h_0.4.inst.cfg index 49a821f436..a0c0ec2b10 100644 --- a/resources/variants/mingda_6h_0.4.inst.cfg +++ b/resources/variants/mingda/mingda_6h_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_6h name = 0.4mm Nozzle version = 4 -definition = mingda_6h [metadata] +hardware_type = nozzle 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/mingda_6h_0.5.inst.cfg similarity index 99% rename from resources/variants/mingda_6h_0.5.inst.cfg rename to resources/variants/mingda/mingda_6h_0.5.inst.cfg index 2878a0d31b..b87f2be652 100644 --- a/resources/variants/mingda_6h_0.5.inst.cfg +++ b/resources/variants/mingda/mingda_6h_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_6h name = 0.5mm Nozzle version = 4 -definition = mingda_6h [metadata] +hardware_type = nozzle 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/mingda_6h_0.6.inst.cfg similarity index 99% rename from resources/variants/mingda_6h_0.6.inst.cfg rename to resources/variants/mingda/mingda_6h_0.6.inst.cfg index d0964923b2..d2f3feb673 100644 --- a/resources/variants/mingda_6h_0.6.inst.cfg +++ b/resources/variants/mingda/mingda_6h_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_6h name = 0.6mm Nozzle version = 4 -definition = mingda_6h [metadata] +hardware_type = nozzle 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/mingda_6h_0.8.inst.cfg similarity index 99% rename from resources/variants/mingda_6h_0.8.inst.cfg rename to resources/variants/mingda/mingda_6h_0.8.inst.cfg index c028e29567..12d4241260 100644 --- a/resources/variants/mingda_6h_0.8.inst.cfg +++ b/resources/variants/mingda/mingda_6h_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_6h name = 0.8mm Nozzle version = 4 -definition = mingda_6h [metadata] +hardware_type = nozzle 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/mingda_6h_1.0.inst.cfg similarity index 99% rename from resources/variants/mingda_6h_1.0.inst.cfg rename to resources/variants/mingda/mingda_6h_1.0.inst.cfg index 6a3cabaa84..e7a06aa978 100644 --- a/resources/variants/mingda_6h_1.0.inst.cfg +++ b/resources/variants/mingda/mingda_6h_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_6h name = 1.0mm Nozzle version = 4 -definition = mingda_6h [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/mingda_base_0.2.inst.cfg b/resources/variants/mingda/mingda_base_0.2.inst.cfg similarity index 99% rename from resources/variants/mingda_base_0.2.inst.cfg rename to resources/variants/mingda/mingda_base_0.2.inst.cfg index e2f8932413..a598d56667 100644 --- a/resources/variants/mingda_base_0.2.inst.cfg +++ b/resources/variants/mingda/mingda_base_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_base name = 0.2mm Nozzle version = 4 -definition = mingda_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/mingda_base_0.3.inst.cfg b/resources/variants/mingda/mingda_base_0.3.inst.cfg similarity index 99% rename from resources/variants/mingda_base_0.3.inst.cfg rename to resources/variants/mingda/mingda_base_0.3.inst.cfg index d2938f0ae6..318a9d935b 100644 --- a/resources/variants/mingda_base_0.3.inst.cfg +++ b/resources/variants/mingda/mingda_base_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_base name = 0.3mm Nozzle version = 4 -definition = mingda_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/mingda_base_0.4.inst.cfg b/resources/variants/mingda/mingda_base_0.4.inst.cfg similarity index 99% rename from resources/variants/mingda_base_0.4.inst.cfg rename to resources/variants/mingda/mingda_base_0.4.inst.cfg index 6226c5760f..51b1bf12d4 100644 --- a/resources/variants/mingda_base_0.4.inst.cfg +++ b/resources/variants/mingda/mingda_base_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_base name = 0.4mm Nozzle version = 4 -definition = mingda_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/mingda_base_0.6.inst.cfg b/resources/variants/mingda/mingda_base_0.6.inst.cfg similarity index 99% rename from resources/variants/mingda_base_0.6.inst.cfg rename to resources/variants/mingda/mingda_base_0.6.inst.cfg index 8c01b73aeb..3de580de8b 100644 --- a/resources/variants/mingda_base_0.6.inst.cfg +++ b/resources/variants/mingda/mingda_base_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_base name = 0.6mm Nozzle version = 4 -definition = mingda_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/mingda_base_0.8.inst.cfg b/resources/variants/mingda/mingda_base_0.8.inst.cfg similarity index 99% rename from resources/variants/mingda_base_0.8.inst.cfg rename to resources/variants/mingda/mingda_base_0.8.inst.cfg index a52aa60830..db01cfefa9 100644 --- a/resources/variants/mingda_base_0.8.inst.cfg +++ b/resources/variants/mingda/mingda_base_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_base name = 0.8mm Nozzle version = 4 -definition = mingda_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/mingda_base_1.0.inst.cfg b/resources/variants/mingda/mingda_base_1.0.inst.cfg similarity index 99% rename from resources/variants/mingda_base_1.0.inst.cfg rename to resources/variants/mingda/mingda_base_1.0.inst.cfg index d7aad52822..af47f6d58c 100644 --- a/resources/variants/mingda_base_1.0.inst.cfg +++ b/resources/variants/mingda/mingda_base_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_base name = 1.0mm Nozzle version = 4 -definition = mingda_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/mingda_d2_0.2.inst.cfg b/resources/variants/mingda/mingda_d2_0.2.inst.cfg similarity index 99% rename from resources/variants/mingda_d2_0.2.inst.cfg rename to resources/variants/mingda/mingda_d2_0.2.inst.cfg index 6c2c3f7331..c33fb29c4c 100644 --- a/resources/variants/mingda_d2_0.2.inst.cfg +++ b/resources/variants/mingda/mingda_d2_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_d2 name = 0.2mm Nozzle version = 4 -definition = mingda_d2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/mingda_d2_0.3.inst.cfg b/resources/variants/mingda/mingda_d2_0.3.inst.cfg similarity index 99% rename from resources/variants/mingda_d2_0.3.inst.cfg rename to resources/variants/mingda/mingda_d2_0.3.inst.cfg index 60e3ac634c..eb2a96e6c8 100644 --- a/resources/variants/mingda_d2_0.3.inst.cfg +++ b/resources/variants/mingda/mingda_d2_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_d2 name = 0.3mm Nozzle version = 4 -definition = mingda_d2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/mingda_d2_0.4.inst.cfg b/resources/variants/mingda/mingda_d2_0.4.inst.cfg similarity index 99% rename from resources/variants/mingda_d2_0.4.inst.cfg rename to resources/variants/mingda/mingda_d2_0.4.inst.cfg index 09f017e01f..1ae6d1c416 100644 --- a/resources/variants/mingda_d2_0.4.inst.cfg +++ b/resources/variants/mingda/mingda_d2_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_d2 name = 0.4mm Nozzle version = 4 -definition = mingda_d2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/mingda_d2_0.5.inst.cfg b/resources/variants/mingda/mingda_d2_0.5.inst.cfg similarity index 99% rename from resources/variants/mingda_d2_0.5.inst.cfg rename to resources/variants/mingda/mingda_d2_0.5.inst.cfg index ce573d66a0..8dbc83e291 100644 --- a/resources/variants/mingda_d2_0.5.inst.cfg +++ b/resources/variants/mingda/mingda_d2_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_d2 name = 0.5mm Nozzle version = 4 -definition = mingda_d2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/mingda_d2_0.6.inst.cfg b/resources/variants/mingda/mingda_d2_0.6.inst.cfg similarity index 99% rename from resources/variants/mingda_d2_0.6.inst.cfg rename to resources/variants/mingda/mingda_d2_0.6.inst.cfg index 4c8913b2f7..582f9ebd09 100644 --- a/resources/variants/mingda_d2_0.6.inst.cfg +++ b/resources/variants/mingda/mingda_d2_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_d2 name = 0.6mm Nozzle version = 4 -definition = mingda_d2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/mingda_d2_0.8.inst.cfg b/resources/variants/mingda/mingda_d2_0.8.inst.cfg similarity index 99% rename from resources/variants/mingda_d2_0.8.inst.cfg rename to resources/variants/mingda/mingda_d2_0.8.inst.cfg index 26ed37a326..c8fbded51c 100644 --- a/resources/variants/mingda_d2_0.8.inst.cfg +++ b/resources/variants/mingda/mingda_d2_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_d2 name = 0.8mm Nozzle version = 4 -definition = mingda_d2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/mingda_d2_1.0.inst.cfg b/resources/variants/mingda/mingda_d2_1.0.inst.cfg similarity index 99% rename from resources/variants/mingda_d2_1.0.inst.cfg rename to resources/variants/mingda/mingda_d2_1.0.inst.cfg index eed699b2ec..debeb0dda7 100644 --- a/resources/variants/mingda_d2_1.0.inst.cfg +++ b/resources/variants/mingda/mingda_d2_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_d2 name = 1.0mm Nozzle version = 4 -definition = mingda_d2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/mingda_d3pro_0.2.inst.cfg b/resources/variants/mingda/mingda_d3pro_0.2.inst.cfg similarity index 99% rename from resources/variants/mingda_d3pro_0.2.inst.cfg rename to resources/variants/mingda/mingda_d3pro_0.2.inst.cfg index d705b220c4..1decca3748 100644 --- a/resources/variants/mingda_d3pro_0.2.inst.cfg +++ b/resources/variants/mingda/mingda_d3pro_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_d3pro name = 0.2mm Nozzle version = 4 -definition = mingda_d3pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/mingda_d3pro_0.3.inst.cfg b/resources/variants/mingda/mingda_d3pro_0.3.inst.cfg similarity index 99% rename from resources/variants/mingda_d3pro_0.3.inst.cfg rename to resources/variants/mingda/mingda_d3pro_0.3.inst.cfg index 686edde3f0..a577de4c8d 100644 --- a/resources/variants/mingda_d3pro_0.3.inst.cfg +++ b/resources/variants/mingda/mingda_d3pro_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_d3pro name = 0.3mm Nozzle version = 4 -definition = mingda_d3pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/mingda_d3pro_0.4.inst.cfg b/resources/variants/mingda/mingda_d3pro_0.4.inst.cfg similarity index 99% rename from resources/variants/mingda_d3pro_0.4.inst.cfg rename to resources/variants/mingda/mingda_d3pro_0.4.inst.cfg index 6b065af0f9..ff0ab9d5cb 100644 --- a/resources/variants/mingda_d3pro_0.4.inst.cfg +++ b/resources/variants/mingda/mingda_d3pro_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_d3pro name = 0.4mm Nozzle version = 4 -definition = mingda_d3pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/mingda_d3pro_0.5.inst.cfg b/resources/variants/mingda/mingda_d3pro_0.5.inst.cfg similarity index 99% rename from resources/variants/mingda_d3pro_0.5.inst.cfg rename to resources/variants/mingda/mingda_d3pro_0.5.inst.cfg index b76f1449df..c7684d778f 100644 --- a/resources/variants/mingda_d3pro_0.5.inst.cfg +++ b/resources/variants/mingda/mingda_d3pro_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_d3pro name = 0.5mm Nozzle version = 4 -definition = mingda_d3pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/mingda_d3pro_0.6.inst.cfg b/resources/variants/mingda/mingda_d3pro_0.6.inst.cfg similarity index 99% rename from resources/variants/mingda_d3pro_0.6.inst.cfg rename to resources/variants/mingda/mingda_d3pro_0.6.inst.cfg index 5da731d772..02023501d1 100644 --- a/resources/variants/mingda_d3pro_0.6.inst.cfg +++ b/resources/variants/mingda/mingda_d3pro_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_d3pro name = 0.6mm Nozzle version = 4 -definition = mingda_d3pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/mingda_d3pro_0.8.inst.cfg b/resources/variants/mingda/mingda_d3pro_0.8.inst.cfg similarity index 99% rename from resources/variants/mingda_d3pro_0.8.inst.cfg rename to resources/variants/mingda/mingda_d3pro_0.8.inst.cfg index cab940cac2..036093f601 100644 --- a/resources/variants/mingda_d3pro_0.8.inst.cfg +++ b/resources/variants/mingda/mingda_d3pro_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_d3pro name = 0.8mm Nozzle version = 4 -definition = mingda_d3pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/mingda_d3pro_1.0.inst.cfg b/resources/variants/mingda/mingda_d3pro_1.0.inst.cfg similarity index 99% rename from resources/variants/mingda_d3pro_1.0.inst.cfg rename to resources/variants/mingda/mingda_d3pro_1.0.inst.cfg index 5714d3f928..6cf8ad9247 100644 --- a/resources/variants/mingda_d3pro_1.0.inst.cfg +++ b/resources/variants/mingda/mingda_d3pro_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_d3pro name = 1.0mm Nozzle version = 4 -definition = mingda_d3pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/mingda_d4pro_0.2.inst.cfg b/resources/variants/mingda/mingda_d4pro_0.2.inst.cfg similarity index 99% rename from resources/variants/mingda_d4pro_0.2.inst.cfg rename to resources/variants/mingda/mingda_d4pro_0.2.inst.cfg index 7a9775cd00..1016257ad3 100644 --- a/resources/variants/mingda_d4pro_0.2.inst.cfg +++ b/resources/variants/mingda/mingda_d4pro_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_d4pro name = 0.2mm Nozzle version = 4 -definition = mingda_d4pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/mingda_d4pro_0.3.inst.cfg b/resources/variants/mingda/mingda_d4pro_0.3.inst.cfg similarity index 99% rename from resources/variants/mingda_d4pro_0.3.inst.cfg rename to resources/variants/mingda/mingda_d4pro_0.3.inst.cfg index b7da734477..11c27e7fb4 100644 --- a/resources/variants/mingda_d4pro_0.3.inst.cfg +++ b/resources/variants/mingda/mingda_d4pro_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_d4pro name = 0.3mm Nozzle version = 4 -definition = mingda_d4pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/mingda_d4pro_0.4.inst.cfg b/resources/variants/mingda/mingda_d4pro_0.4.inst.cfg similarity index 99% rename from resources/variants/mingda_d4pro_0.4.inst.cfg rename to resources/variants/mingda/mingda_d4pro_0.4.inst.cfg index 83dee1ba69..cbf75a5098 100644 --- a/resources/variants/mingda_d4pro_0.4.inst.cfg +++ b/resources/variants/mingda/mingda_d4pro_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_d4pro name = 0.4mm Nozzle version = 4 -definition = mingda_d4pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/mingda_d4pro_0.5.inst.cfg b/resources/variants/mingda/mingda_d4pro_0.5.inst.cfg similarity index 99% rename from resources/variants/mingda_d4pro_0.5.inst.cfg rename to resources/variants/mingda/mingda_d4pro_0.5.inst.cfg index b5a0665982..e587077b96 100644 --- a/resources/variants/mingda_d4pro_0.5.inst.cfg +++ b/resources/variants/mingda/mingda_d4pro_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_d4pro name = 0.5mm Nozzle version = 4 -definition = mingda_d4pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/mingda_d4pro_0.6.inst.cfg b/resources/variants/mingda/mingda_d4pro_0.6.inst.cfg similarity index 99% rename from resources/variants/mingda_d4pro_0.6.inst.cfg rename to resources/variants/mingda/mingda_d4pro_0.6.inst.cfg index 1c73dd34bf..f8f54254f7 100644 --- a/resources/variants/mingda_d4pro_0.6.inst.cfg +++ b/resources/variants/mingda/mingda_d4pro_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_d4pro name = 0.6mm Nozzle version = 4 -definition = mingda_d4pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/mingda_d4pro_0.8.inst.cfg b/resources/variants/mingda/mingda_d4pro_0.8.inst.cfg similarity index 99% rename from resources/variants/mingda_d4pro_0.8.inst.cfg rename to resources/variants/mingda/mingda_d4pro_0.8.inst.cfg index 2d78a4e22b..85060b48a2 100644 --- a/resources/variants/mingda_d4pro_0.8.inst.cfg +++ b/resources/variants/mingda/mingda_d4pro_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_d4pro name = 0.8mm Nozzle version = 4 -definition = mingda_d4pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/mingda_d4pro_1.0.inst.cfg b/resources/variants/mingda/mingda_d4pro_1.0.inst.cfg similarity index 99% rename from resources/variants/mingda_d4pro_1.0.inst.cfg rename to resources/variants/mingda/mingda_d4pro_1.0.inst.cfg index 7e658b8ebb..273d4b34ce 100644 --- a/resources/variants/mingda_d4pro_1.0.inst.cfg +++ b/resources/variants/mingda/mingda_d4pro_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_d4pro name = 1.0mm Nozzle version = 4 -definition = mingda_d4pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/mingda_magician_max_0.2.inst.cfg b/resources/variants/mingda/mingda_magician_max_0.2.inst.cfg similarity index 99% rename from resources/variants/mingda_magician_max_0.2.inst.cfg rename to resources/variants/mingda/mingda_magician_max_0.2.inst.cfg index cfbf31d78a..cf8aada2f8 100644 --- a/resources/variants/mingda_magician_max_0.2.inst.cfg +++ b/resources/variants/mingda/mingda_magician_max_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_magician_max name = 0.2mm Nozzle version = 4 -definition = mingda_magician_max [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/mingda_magician_max_0.3.inst.cfg b/resources/variants/mingda/mingda_magician_max_0.3.inst.cfg similarity index 99% rename from resources/variants/mingda_magician_max_0.3.inst.cfg rename to resources/variants/mingda/mingda_magician_max_0.3.inst.cfg index d53deb0962..7c27d87aed 100644 --- a/resources/variants/mingda_magician_max_0.3.inst.cfg +++ b/resources/variants/mingda/mingda_magician_max_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_magician_max name = 0.3mm Nozzle version = 4 -definition = mingda_magician_max [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/mingda_magician_max_0.4.inst.cfg b/resources/variants/mingda/mingda_magician_max_0.4.inst.cfg similarity index 99% rename from resources/variants/mingda_magician_max_0.4.inst.cfg rename to resources/variants/mingda/mingda_magician_max_0.4.inst.cfg index e90c783bcd..7db221401e 100644 --- a/resources/variants/mingda_magician_max_0.4.inst.cfg +++ b/resources/variants/mingda/mingda_magician_max_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_magician_max name = 0.4mm Nozzle version = 4 -definition = mingda_magician_max [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/mingda_magician_max_0.5.inst.cfg b/resources/variants/mingda/mingda_magician_max_0.5.inst.cfg similarity index 99% rename from resources/variants/mingda_magician_max_0.5.inst.cfg rename to resources/variants/mingda/mingda_magician_max_0.5.inst.cfg index 68f527e488..6db4e711cf 100644 --- a/resources/variants/mingda_magician_max_0.5.inst.cfg +++ b/resources/variants/mingda/mingda_magician_max_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_magician_max name = 0.5mm Nozzle version = 4 -definition = mingda_magician_max [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/mingda_magician_max_0.6.inst.cfg b/resources/variants/mingda/mingda_magician_max_0.6.inst.cfg similarity index 99% rename from resources/variants/mingda_magician_max_0.6.inst.cfg rename to resources/variants/mingda/mingda_magician_max_0.6.inst.cfg index 4ab7fa4e09..b088353a5e 100644 --- a/resources/variants/mingda_magician_max_0.6.inst.cfg +++ b/resources/variants/mingda/mingda_magician_max_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_magician_max name = 0.6mm Nozzle version = 4 -definition = mingda_magician_max [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/mingda_magician_max_0.8.inst.cfg b/resources/variants/mingda/mingda_magician_max_0.8.inst.cfg similarity index 99% rename from resources/variants/mingda_magician_max_0.8.inst.cfg rename to resources/variants/mingda/mingda_magician_max_0.8.inst.cfg index c79110c981..04fd81155a 100644 --- a/resources/variants/mingda_magician_max_0.8.inst.cfg +++ b/resources/variants/mingda/mingda_magician_max_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_magician_max name = 0.8mm Nozzle version = 4 -definition = mingda_magician_max [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/mingda_magician_max_1.0.inst.cfg b/resources/variants/mingda/mingda_magician_max_1.0.inst.cfg similarity index 99% rename from resources/variants/mingda_magician_max_1.0.inst.cfg rename to resources/variants/mingda/mingda_magician_max_1.0.inst.cfg index b436e814a5..571fd231b2 100644 --- a/resources/variants/mingda_magician_max_1.0.inst.cfg +++ b/resources/variants/mingda/mingda_magician_max_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_magician_max name = 1.0mm Nozzle version = 4 -definition = mingda_magician_max [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/mingda_magician_pro_0.2.inst.cfg b/resources/variants/mingda/mingda_magician_pro_0.2.inst.cfg similarity index 99% rename from resources/variants/mingda_magician_pro_0.2.inst.cfg rename to resources/variants/mingda/mingda_magician_pro_0.2.inst.cfg index b4f2284f05..b1619eb920 100644 --- a/resources/variants/mingda_magician_pro_0.2.inst.cfg +++ b/resources/variants/mingda/mingda_magician_pro_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_magician_pro name = 0.2mm Nozzle version = 4 -definition = mingda_magician_pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/mingda_magician_pro_0.3.inst.cfg b/resources/variants/mingda/mingda_magician_pro_0.3.inst.cfg similarity index 99% rename from resources/variants/mingda_magician_pro_0.3.inst.cfg rename to resources/variants/mingda/mingda_magician_pro_0.3.inst.cfg index 23212e803b..727a82b0a8 100644 --- a/resources/variants/mingda_magician_pro_0.3.inst.cfg +++ b/resources/variants/mingda/mingda_magician_pro_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_magician_pro name = 0.3mm Nozzle version = 4 -definition = mingda_magician_pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/mingda_magician_pro_0.4.inst.cfg b/resources/variants/mingda/mingda_magician_pro_0.4.inst.cfg similarity index 99% rename from resources/variants/mingda_magician_pro_0.4.inst.cfg rename to resources/variants/mingda/mingda_magician_pro_0.4.inst.cfg index a6e571da9b..b6db564b13 100644 --- a/resources/variants/mingda_magician_pro_0.4.inst.cfg +++ b/resources/variants/mingda/mingda_magician_pro_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_magician_pro name = 0.4mm Nozzle version = 4 -definition = mingda_magician_pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/mingda_magician_pro_0.5.inst.cfg b/resources/variants/mingda/mingda_magician_pro_0.5.inst.cfg similarity index 99% rename from resources/variants/mingda_magician_pro_0.5.inst.cfg rename to resources/variants/mingda/mingda_magician_pro_0.5.inst.cfg index 94e2a5892f..23e811a322 100644 --- a/resources/variants/mingda_magician_pro_0.5.inst.cfg +++ b/resources/variants/mingda/mingda_magician_pro_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_magician_pro name = 0.5mm Nozzle version = 4 -definition = mingda_magician_pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/mingda_magician_pro_0.6.inst.cfg b/resources/variants/mingda/mingda_magician_pro_0.6.inst.cfg similarity index 99% rename from resources/variants/mingda_magician_pro_0.6.inst.cfg rename to resources/variants/mingda/mingda_magician_pro_0.6.inst.cfg index 8d6d0f6fd3..6600450483 100644 --- a/resources/variants/mingda_magician_pro_0.6.inst.cfg +++ b/resources/variants/mingda/mingda_magician_pro_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_magician_pro name = 0.6mm Nozzle version = 4 -definition = mingda_magician_pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/mingda_magician_pro_0.8.inst.cfg b/resources/variants/mingda/mingda_magician_pro_0.8.inst.cfg similarity index 99% rename from resources/variants/mingda_magician_pro_0.8.inst.cfg rename to resources/variants/mingda/mingda_magician_pro_0.8.inst.cfg index 50251a6eb6..9b4acc2293 100644 --- a/resources/variants/mingda_magician_pro_0.8.inst.cfg +++ b/resources/variants/mingda/mingda_magician_pro_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_magician_pro name = 0.8mm Nozzle version = 4 -definition = mingda_magician_pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/mingda_magician_pro_1.0.inst.cfg b/resources/variants/mingda/mingda_magician_pro_1.0.inst.cfg similarity index 99% rename from resources/variants/mingda_magician_pro_1.0.inst.cfg rename to resources/variants/mingda/mingda_magician_pro_1.0.inst.cfg index 3e45fb0544..cda371500c 100644 --- a/resources/variants/mingda_magician_pro_1.0.inst.cfg +++ b/resources/variants/mingda/mingda_magician_pro_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_magician_pro name = 1.0mm Nozzle version = 4 -definition = mingda_magician_pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/mingda_magician_x_0.2.inst.cfg b/resources/variants/mingda/mingda_magician_x_0.2.inst.cfg similarity index 99% rename from resources/variants/mingda_magician_x_0.2.inst.cfg rename to resources/variants/mingda/mingda_magician_x_0.2.inst.cfg index ba7ddc95a2..5ed93b5bae 100644 --- a/resources/variants/mingda_magician_x_0.2.inst.cfg +++ b/resources/variants/mingda/mingda_magician_x_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_magician_x name = 0.2mm Nozzle version = 4 -definition = mingda_magician_x [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/mingda_magician_x_0.3.inst.cfg b/resources/variants/mingda/mingda_magician_x_0.3.inst.cfg similarity index 99% rename from resources/variants/mingda_magician_x_0.3.inst.cfg rename to resources/variants/mingda/mingda_magician_x_0.3.inst.cfg index 2aff96e4a6..e75fe54aeb 100644 --- a/resources/variants/mingda_magician_x_0.3.inst.cfg +++ b/resources/variants/mingda/mingda_magician_x_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_magician_x name = 0.3mm Nozzle version = 4 -definition = mingda_magician_x [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/mingda_magician_x_0.4.inst.cfg b/resources/variants/mingda/mingda_magician_x_0.4.inst.cfg similarity index 99% rename from resources/variants/mingda_magician_x_0.4.inst.cfg rename to resources/variants/mingda/mingda_magician_x_0.4.inst.cfg index 2536c56a20..1fd27c4bff 100644 --- a/resources/variants/mingda_magician_x_0.4.inst.cfg +++ b/resources/variants/mingda/mingda_magician_x_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_magician_x name = 0.4mm Nozzle version = 4 -definition = mingda_magician_x [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/mingda_magician_x_0.5.inst.cfg b/resources/variants/mingda/mingda_magician_x_0.5.inst.cfg similarity index 99% rename from resources/variants/mingda_magician_x_0.5.inst.cfg rename to resources/variants/mingda/mingda_magician_x_0.5.inst.cfg index 341f57be97..661b3406f6 100644 --- a/resources/variants/mingda_magician_x_0.5.inst.cfg +++ b/resources/variants/mingda/mingda_magician_x_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_magician_x name = 0.5mm Nozzle version = 4 -definition = mingda_magician_x [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/mingda_magician_x_0.6.inst.cfg b/resources/variants/mingda/mingda_magician_x_0.6.inst.cfg similarity index 99% rename from resources/variants/mingda_magician_x_0.6.inst.cfg rename to resources/variants/mingda/mingda_magician_x_0.6.inst.cfg index 1f303af2e3..9b5ee1422f 100644 --- a/resources/variants/mingda_magician_x_0.6.inst.cfg +++ b/resources/variants/mingda/mingda_magician_x_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_magician_x name = 0.6mm Nozzle version = 4 -definition = mingda_magician_x [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/mingda_magician_x_0.8.inst.cfg b/resources/variants/mingda/mingda_magician_x_0.8.inst.cfg similarity index 99% rename from resources/variants/mingda_magician_x_0.8.inst.cfg rename to resources/variants/mingda/mingda_magician_x_0.8.inst.cfg index 9ffa501b5a..689f6e834e 100644 --- a/resources/variants/mingda_magician_x_0.8.inst.cfg +++ b/resources/variants/mingda/mingda_magician_x_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_magician_x name = 0.8mm Nozzle version = 4 -definition = mingda_magician_x [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/mingda_magician_x_1.0.inst.cfg b/resources/variants/mingda/mingda_magician_x_1.0.inst.cfg similarity index 99% rename from resources/variants/mingda_magician_x_1.0.inst.cfg rename to resources/variants/mingda/mingda_magician_x_1.0.inst.cfg index d947f185e4..360c737344 100644 --- a/resources/variants/mingda_magician_x_1.0.inst.cfg +++ b/resources/variants/mingda/mingda_magician_x_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_magician_x name = 1.0mm Nozzle version = 4 -definition = mingda_magician_x [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/mingda_rock3_0.2.inst.cfg b/resources/variants/mingda/mingda_rock3_0.2.inst.cfg similarity index 99% rename from resources/variants/mingda_rock3_0.2.inst.cfg rename to resources/variants/mingda/mingda_rock3_0.2.inst.cfg index 428e8b8436..81eace1c39 100644 --- a/resources/variants/mingda_rock3_0.2.inst.cfg +++ b/resources/variants/mingda/mingda_rock3_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_rock3 name = 0.2mm Nozzle version = 4 -definition = mingda_rock3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/mingda_rock3_0.3.inst.cfg b/resources/variants/mingda/mingda_rock3_0.3.inst.cfg similarity index 99% rename from resources/variants/mingda_rock3_0.3.inst.cfg rename to resources/variants/mingda/mingda_rock3_0.3.inst.cfg index 717945c276..699a09dba4 100644 --- a/resources/variants/mingda_rock3_0.3.inst.cfg +++ b/resources/variants/mingda/mingda_rock3_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_rock3 name = 0.3mm Nozzle version = 4 -definition = mingda_rock3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/mingda_rock3_0.4.inst.cfg b/resources/variants/mingda/mingda_rock3_0.4.inst.cfg similarity index 99% rename from resources/variants/mingda_rock3_0.4.inst.cfg rename to resources/variants/mingda/mingda_rock3_0.4.inst.cfg index d5eeb13714..4d75474751 100644 --- a/resources/variants/mingda_rock3_0.4.inst.cfg +++ b/resources/variants/mingda/mingda_rock3_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_rock3 name = 0.4mm Nozzle version = 4 -definition = mingda_rock3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/mingda_rock3_0.5.inst.cfg b/resources/variants/mingda/mingda_rock3_0.5.inst.cfg similarity index 99% rename from resources/variants/mingda_rock3_0.5.inst.cfg rename to resources/variants/mingda/mingda_rock3_0.5.inst.cfg index be980c32ce..204897f043 100644 --- a/resources/variants/mingda_rock3_0.5.inst.cfg +++ b/resources/variants/mingda/mingda_rock3_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_rock3 name = 0.5mm Nozzle version = 4 -definition = mingda_rock3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/mingda_rock3_0.6.inst.cfg b/resources/variants/mingda/mingda_rock3_0.6.inst.cfg similarity index 99% rename from resources/variants/mingda_rock3_0.6.inst.cfg rename to resources/variants/mingda/mingda_rock3_0.6.inst.cfg index 07f6dffc17..d631189183 100644 --- a/resources/variants/mingda_rock3_0.6.inst.cfg +++ b/resources/variants/mingda/mingda_rock3_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_rock3 name = 0.6mm Nozzle version = 4 -definition = mingda_rock3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/mingda_rock3_0.8.inst.cfg b/resources/variants/mingda/mingda_rock3_0.8.inst.cfg similarity index 99% rename from resources/variants/mingda_rock3_0.8.inst.cfg rename to resources/variants/mingda/mingda_rock3_0.8.inst.cfg index 76ab342113..0d2725028b 100644 --- a/resources/variants/mingda_rock3_0.8.inst.cfg +++ b/resources/variants/mingda/mingda_rock3_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_rock3 name = 0.8mm Nozzle version = 4 -definition = mingda_rock3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/mingda_rock3_1.0.inst.cfg b/resources/variants/mingda/mingda_rock3_1.0.inst.cfg similarity index 99% rename from resources/variants/mingda_rock3_1.0.inst.cfg rename to resources/variants/mingda/mingda_rock3_1.0.inst.cfg index fb4e92d0f5..d4c0ba8016 100644 --- a/resources/variants/mingda_rock3_1.0.inst.cfg +++ b/resources/variants/mingda/mingda_rock3_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = mingda_rock3 name = 1.0mm Nozzle version = 4 -definition = mingda_rock3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/modix/modix_v3_base_0.4.inst.cfg b/resources/variants/modix/modix_v3_base_0.4.inst.cfg new file mode 100644 index 0000000000..bc870c2918 --- /dev/null +++ b/resources/variants/modix/modix_v3_base_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v3_base +name = 0.4 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/modix/modix_v3_base_0.6.inst.cfg b/resources/variants/modix/modix_v3_base_0.6.inst.cfg new file mode 100644 index 0000000000..2850f0bfe2 --- /dev/null +++ b/resources/variants/modix/modix_v3_base_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v3_base +name = 0.6 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/modix/modix_v3_base_0.8.inst.cfg b/resources/variants/modix/modix_v3_base_0.8.inst.cfg new file mode 100644 index 0000000000..cd26890527 --- /dev/null +++ b/resources/variants/modix/modix_v3_base_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v3_base +name = 0.8 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/modix/modix_v3_base_1.0.inst.cfg b/resources/variants/modix/modix_v3_base_1.0.inst.cfg new file mode 100644 index 0000000000..fc514f3584 --- /dev/null +++ b/resources/variants/modix/modix_v3_base_1.0.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v3_base +name = 1.0 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.0 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v3_base_1.2.inst.cfg b/resources/variants/modix/modix_v3_base_1.2.inst.cfg new file mode 100644 index 0000000000..291ba6bd15 --- /dev/null +++ b/resources/variants/modix/modix_v3_base_1.2.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v3_base +name = 1.2 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.2 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v3_base_1.4.inst.cfg b/resources/variants/modix/modix_v3_base_1.4.inst.cfg new file mode 100644 index 0000000000..4543debbcc --- /dev/null +++ b/resources/variants/modix/modix_v3_base_1.4.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v3_base +name = 1.4 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.4 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v3_big120X_0.4.inst.cfg b/resources/variants/modix/modix_v3_big120X_0.4.inst.cfg new file mode 100644 index 0000000000..14bd0c02ba --- /dev/null +++ b/resources/variants/modix/modix_v3_big120X_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v3_big120X +name = 0.4 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/modix/modix_v3_big120X_0.6.inst.cfg b/resources/variants/modix/modix_v3_big120X_0.6.inst.cfg new file mode 100644 index 0000000000..6dce9d279b --- /dev/null +++ b/resources/variants/modix/modix_v3_big120X_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v3_big120X +name = 0.6 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/modix/modix_v3_big120X_0.8.inst.cfg b/resources/variants/modix/modix_v3_big120X_0.8.inst.cfg new file mode 100644 index 0000000000..a3bf6638ea --- /dev/null +++ b/resources/variants/modix/modix_v3_big120X_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v3_big120X +name = 0.8 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/modix/modix_v3_big120X_1.0.inst.cfg b/resources/variants/modix/modix_v3_big120X_1.0.inst.cfg new file mode 100644 index 0000000000..bca464afc6 --- /dev/null +++ b/resources/variants/modix/modix_v3_big120X_1.0.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v3_big120X +name = 1.0 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.0 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v3_big120X_1.2.inst.cfg b/resources/variants/modix/modix_v3_big120X_1.2.inst.cfg new file mode 100644 index 0000000000..364ebf355b --- /dev/null +++ b/resources/variants/modix/modix_v3_big120X_1.2.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v3_big120X +name = 1.2 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.2 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v3_big120X_1.4.inst.cfg b/resources/variants/modix/modix_v3_big120X_1.4.inst.cfg new file mode 100644 index 0000000000..b78514dd01 --- /dev/null +++ b/resources/variants/modix/modix_v3_big120X_1.4.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v3_big120X +name = 1.4 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.4 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v3_big120Z_0.4.inst.cfg b/resources/variants/modix/modix_v3_big120Z_0.4.inst.cfg new file mode 100644 index 0000000000..9902e50863 --- /dev/null +++ b/resources/variants/modix/modix_v3_big120Z_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v3_big120Z +name = 0.4 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/modix/modix_v3_big120Z_0.6.inst.cfg b/resources/variants/modix/modix_v3_big120Z_0.6.inst.cfg new file mode 100644 index 0000000000..2c3a7155a3 --- /dev/null +++ b/resources/variants/modix/modix_v3_big120Z_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v3_big120Z +name = 0.6 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/modix/modix_v3_big120Z_0.8.inst.cfg b/resources/variants/modix/modix_v3_big120Z_0.8.inst.cfg new file mode 100644 index 0000000000..f503312220 --- /dev/null +++ b/resources/variants/modix/modix_v3_big120Z_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v3_big120Z +name = 0.8 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/modix/modix_v3_big120Z_1.0.inst.cfg b/resources/variants/modix/modix_v3_big120Z_1.0.inst.cfg new file mode 100644 index 0000000000..9595ad2db4 --- /dev/null +++ b/resources/variants/modix/modix_v3_big120Z_1.0.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v3_big120Z +name = 1.0 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.0 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v3_big120Z_1.2.inst.cfg b/resources/variants/modix/modix_v3_big120Z_1.2.inst.cfg new file mode 100644 index 0000000000..766297175d --- /dev/null +++ b/resources/variants/modix/modix_v3_big120Z_1.2.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v3_big120Z +name = 1.2 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.2 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v3_big120Z_1.4.inst.cfg b/resources/variants/modix/modix_v3_big120Z_1.4.inst.cfg new file mode 100644 index 0000000000..e7ebf37eb4 --- /dev/null +++ b/resources/variants/modix/modix_v3_big120Z_1.4.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v3_big120Z +name = 1.4 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.4 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v3_big180X_0.4.inst.cfg b/resources/variants/modix/modix_v3_big180X_0.4.inst.cfg new file mode 100644 index 0000000000..2732dd9656 --- /dev/null +++ b/resources/variants/modix/modix_v3_big180X_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v3_big180X +name = 0.4 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/modix/modix_v3_big180X_0.6.inst.cfg b/resources/variants/modix/modix_v3_big180X_0.6.inst.cfg new file mode 100644 index 0000000000..f32529d537 --- /dev/null +++ b/resources/variants/modix/modix_v3_big180X_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v3_big180X +name = 0.6 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/modix/modix_v3_big180X_0.8.inst.cfg b/resources/variants/modix/modix_v3_big180X_0.8.inst.cfg new file mode 100644 index 0000000000..3c04ef4159 --- /dev/null +++ b/resources/variants/modix/modix_v3_big180X_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v3_big180X +name = 0.8 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/modix/modix_v3_big180X_1.0.inst.cfg b/resources/variants/modix/modix_v3_big180X_1.0.inst.cfg new file mode 100644 index 0000000000..cf300319b9 --- /dev/null +++ b/resources/variants/modix/modix_v3_big180X_1.0.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v3_big180X +name = 1.0 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.0 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v3_big180X_1.2.inst.cfg b/resources/variants/modix/modix_v3_big180X_1.2.inst.cfg new file mode 100644 index 0000000000..73eb792325 --- /dev/null +++ b/resources/variants/modix/modix_v3_big180X_1.2.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v3_big180X +name = 1.2 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.2 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v3_big180X_1.4.inst.cfg b/resources/variants/modix/modix_v3_big180X_1.4.inst.cfg new file mode 100644 index 0000000000..f0a6027b72 --- /dev/null +++ b/resources/variants/modix/modix_v3_big180X_1.4.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v3_big180X +name = 1.4 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.4 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v3_big40_0.4.inst.cfg b/resources/variants/modix/modix_v3_big40_0.4.inst.cfg new file mode 100644 index 0000000000..449d5074a6 --- /dev/null +++ b/resources/variants/modix/modix_v3_big40_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v3_big40 +name = 0.4 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/modix/modix_v3_big40_0.6.inst.cfg b/resources/variants/modix/modix_v3_big40_0.6.inst.cfg new file mode 100644 index 0000000000..e6fa5f8ff7 --- /dev/null +++ b/resources/variants/modix/modix_v3_big40_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v3_big40 +name = 0.6 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/modix/modix_v3_big40_0.8.inst.cfg b/resources/variants/modix/modix_v3_big40_0.8.inst.cfg new file mode 100644 index 0000000000..c407d6ac94 --- /dev/null +++ b/resources/variants/modix/modix_v3_big40_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v3_big40 +name = 0.8 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/modix/modix_v3_big40_1.0.inst.cfg b/resources/variants/modix/modix_v3_big40_1.0.inst.cfg new file mode 100644 index 0000000000..b92dc7f343 --- /dev/null +++ b/resources/variants/modix/modix_v3_big40_1.0.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v3_big40 +name = 1.0 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.0 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v3_big40_1.2.inst.cfg b/resources/variants/modix/modix_v3_big40_1.2.inst.cfg new file mode 100644 index 0000000000..4f06503847 --- /dev/null +++ b/resources/variants/modix/modix_v3_big40_1.2.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v3_big40 +name = 1.2 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.2 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v3_big40_1.4.inst.cfg b/resources/variants/modix/modix_v3_big40_1.4.inst.cfg new file mode 100644 index 0000000000..f6d72fe21b --- /dev/null +++ b/resources/variants/modix/modix_v3_big40_1.4.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v3_big40 +name = 1.4 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.4 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v3_big60_0.4.inst.cfg b/resources/variants/modix/modix_v3_big60_0.4.inst.cfg new file mode 100644 index 0000000000..3abac3850f --- /dev/null +++ b/resources/variants/modix/modix_v3_big60_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v3_big60 +name = 0.4 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/modix/modix_v3_big60_0.6.inst.cfg b/resources/variants/modix/modix_v3_big60_0.6.inst.cfg new file mode 100644 index 0000000000..2b3df20b81 --- /dev/null +++ b/resources/variants/modix/modix_v3_big60_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v3_big60 +name = 0.6 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/modix/modix_v3_big60_0.8.inst.cfg b/resources/variants/modix/modix_v3_big60_0.8.inst.cfg new file mode 100644 index 0000000000..1e86a56d1e --- /dev/null +++ b/resources/variants/modix/modix_v3_big60_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v3_big60 +name = 0.8 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/modix/modix_v3_big60_1.0.inst.cfg b/resources/variants/modix/modix_v3_big60_1.0.inst.cfg new file mode 100644 index 0000000000..42c1433b75 --- /dev/null +++ b/resources/variants/modix/modix_v3_big60_1.0.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v3_big60 +name = 1.0 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.0 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v3_big60_1.2.inst.cfg b/resources/variants/modix/modix_v3_big60_1.2.inst.cfg new file mode 100644 index 0000000000..af4857a838 --- /dev/null +++ b/resources/variants/modix/modix_v3_big60_1.2.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v3_big60 +name = 1.2 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.2 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v3_big60_1.4.inst.cfg b/resources/variants/modix/modix_v3_big60_1.4.inst.cfg new file mode 100644 index 0000000000..5238f0bed4 --- /dev/null +++ b/resources/variants/modix/modix_v3_big60_1.4.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v3_big60 +name = 1.4 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.4 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v3_bigmeter_0.4.inst.cfg b/resources/variants/modix/modix_v3_bigmeter_0.4.inst.cfg new file mode 100644 index 0000000000..9950ffb3e4 --- /dev/null +++ b/resources/variants/modix/modix_v3_bigmeter_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v3_big_meter +name = 0.4 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/modix/modix_v3_bigmeter_0.6.inst.cfg b/resources/variants/modix/modix_v3_bigmeter_0.6.inst.cfg new file mode 100644 index 0000000000..1bc49c07d7 --- /dev/null +++ b/resources/variants/modix/modix_v3_bigmeter_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v3_big_meter +name = 0.6 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/modix/modix_v3_bigmeter_0.8.inst.cfg b/resources/variants/modix/modix_v3_bigmeter_0.8.inst.cfg new file mode 100644 index 0000000000..820dd53aa7 --- /dev/null +++ b/resources/variants/modix/modix_v3_bigmeter_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v3_big_meter +name = 0.8 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/modix/modix_v3_bigmeter_1.0.inst.cfg b/resources/variants/modix/modix_v3_bigmeter_1.0.inst.cfg new file mode 100644 index 0000000000..ded907b8c4 --- /dev/null +++ b/resources/variants/modix/modix_v3_bigmeter_1.0.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v3_big_meter +name = 1.0 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.0 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v3_bigmeter_1.2.inst.cfg b/resources/variants/modix/modix_v3_bigmeter_1.2.inst.cfg new file mode 100644 index 0000000000..9414f775d1 --- /dev/null +++ b/resources/variants/modix/modix_v3_bigmeter_1.2.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v3_big_meter +name = 1.2 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.2 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v3_bigmeter_1.4.inst.cfg b/resources/variants/modix/modix_v3_bigmeter_1.4.inst.cfg new file mode 100644 index 0000000000..2f72ec6d14 --- /dev/null +++ b/resources/variants/modix/modix_v3_bigmeter_1.4.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v3_big_meter +name = 1.4 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.4 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v4_base_0.4.inst.cfg b/resources/variants/modix/modix_v4_base_0.4.inst.cfg new file mode 100644 index 0000000000..ba9a9775cb --- /dev/null +++ b/resources/variants/modix/modix_v4_base_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v4_base +name = 0.4 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/modix/modix_v4_base_0.6.inst.cfg b/resources/variants/modix/modix_v4_base_0.6.inst.cfg new file mode 100644 index 0000000000..05cd1c63a5 --- /dev/null +++ b/resources/variants/modix/modix_v4_base_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v4_base +name = 0.6 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/modix/modix_v4_base_0.8.inst.cfg b/resources/variants/modix/modix_v4_base_0.8.inst.cfg new file mode 100644 index 0000000000..ef1565de9c --- /dev/null +++ b/resources/variants/modix/modix_v4_base_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v4_base +name = 0.8 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/modix/modix_v4_base_1.0.inst.cfg b/resources/variants/modix/modix_v4_base_1.0.inst.cfg new file mode 100644 index 0000000000..ee0d99443d --- /dev/null +++ b/resources/variants/modix/modix_v4_base_1.0.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v4_base +name = 1.0 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.0 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v4_base_1.2.inst.cfg b/resources/variants/modix/modix_v4_base_1.2.inst.cfg new file mode 100644 index 0000000000..fb87b08adf --- /dev/null +++ b/resources/variants/modix/modix_v4_base_1.2.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v4_base +name = 1.2 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.2 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v4_base_1.4.inst.cfg b/resources/variants/modix/modix_v4_base_1.4.inst.cfg new file mode 100644 index 0000000000..3a927adc05 --- /dev/null +++ b/resources/variants/modix/modix_v4_base_1.4.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v4_base +name = 1.4 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.4 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v4_big120X_0.4.inst.cfg b/resources/variants/modix/modix_v4_big120X_0.4.inst.cfg new file mode 100644 index 0000000000..10e8959a99 --- /dev/null +++ b/resources/variants/modix/modix_v4_big120X_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v4_big120X +name = 0.4 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/modix/modix_v4_big120X_0.6.inst.cfg b/resources/variants/modix/modix_v4_big120X_0.6.inst.cfg new file mode 100644 index 0000000000..4692c6939d --- /dev/null +++ b/resources/variants/modix/modix_v4_big120X_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v4_big120X +name = 0.6 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/modix/modix_v4_big120X_0.8.inst.cfg b/resources/variants/modix/modix_v4_big120X_0.8.inst.cfg new file mode 100644 index 0000000000..3f563a5c39 --- /dev/null +++ b/resources/variants/modix/modix_v4_big120X_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v4_big120X +name = 0.8 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/modix/modix_v4_big120X_1.0.inst.cfg b/resources/variants/modix/modix_v4_big120X_1.0.inst.cfg new file mode 100644 index 0000000000..ddec5285a1 --- /dev/null +++ b/resources/variants/modix/modix_v4_big120X_1.0.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v4_big120X +name = 1.0 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.0 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v4_big120X_1.2.inst.cfg b/resources/variants/modix/modix_v4_big120X_1.2.inst.cfg new file mode 100644 index 0000000000..fb3591817c --- /dev/null +++ b/resources/variants/modix/modix_v4_big120X_1.2.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v4_big120X +name = 1.2 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.2 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v4_big120X_1.4.inst.cfg b/resources/variants/modix/modix_v4_big120X_1.4.inst.cfg new file mode 100644 index 0000000000..c6c153a2f4 --- /dev/null +++ b/resources/variants/modix/modix_v4_big120X_1.4.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v4_big120X +name = 1.4 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.4 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v4_big120Z_0.4.inst.cfg b/resources/variants/modix/modix_v4_big120Z_0.4.inst.cfg new file mode 100644 index 0000000000..59fe45df08 --- /dev/null +++ b/resources/variants/modix/modix_v4_big120Z_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v4_big120Z +name = 0.4 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/modix/modix_v4_big120Z_0.6.inst.cfg b/resources/variants/modix/modix_v4_big120Z_0.6.inst.cfg new file mode 100644 index 0000000000..3b655219f5 --- /dev/null +++ b/resources/variants/modix/modix_v4_big120Z_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v4_big120Z +name = 0.6 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/modix/modix_v4_big120Z_0.8.inst.cfg b/resources/variants/modix/modix_v4_big120Z_0.8.inst.cfg new file mode 100644 index 0000000000..1b8f057166 --- /dev/null +++ b/resources/variants/modix/modix_v4_big120Z_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v4_big120Z +name = 0.8 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/modix/modix_v4_big120Z_1.0.inst.cfg b/resources/variants/modix/modix_v4_big120Z_1.0.inst.cfg new file mode 100644 index 0000000000..a7bfa6e0d9 --- /dev/null +++ b/resources/variants/modix/modix_v4_big120Z_1.0.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v4_big120Z +name = 1.0 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.0 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v4_big120Z_1.2.inst.cfg b/resources/variants/modix/modix_v4_big120Z_1.2.inst.cfg new file mode 100644 index 0000000000..96f1d85672 --- /dev/null +++ b/resources/variants/modix/modix_v4_big120Z_1.2.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v4_big120Z +name = 1.2 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.2 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v4_big120Z_1.4.inst.cfg b/resources/variants/modix/modix_v4_big120Z_1.4.inst.cfg new file mode 100644 index 0000000000..659c813798 --- /dev/null +++ b/resources/variants/modix/modix_v4_big120Z_1.4.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v4_big120Z +name = 1.4 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.4 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v4_big180X_0.4.inst.cfg b/resources/variants/modix/modix_v4_big180X_0.4.inst.cfg new file mode 100644 index 0000000000..5b22c09424 --- /dev/null +++ b/resources/variants/modix/modix_v4_big180X_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v4_big180X +name = 0.4 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/modix/modix_v4_big180X_0.6.inst.cfg b/resources/variants/modix/modix_v4_big180X_0.6.inst.cfg new file mode 100644 index 0000000000..9e33ed2461 --- /dev/null +++ b/resources/variants/modix/modix_v4_big180X_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v4_big180X +name = 0.6 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/modix/modix_v4_big180X_0.8.inst.cfg b/resources/variants/modix/modix_v4_big180X_0.8.inst.cfg new file mode 100644 index 0000000000..30d8542b80 --- /dev/null +++ b/resources/variants/modix/modix_v4_big180X_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v4_big180X +name = 0.8 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/modix/modix_v4_big180X_1.0.inst.cfg b/resources/variants/modix/modix_v4_big180X_1.0.inst.cfg new file mode 100644 index 0000000000..84d46ce1b3 --- /dev/null +++ b/resources/variants/modix/modix_v4_big180X_1.0.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v4_big180X +name = 1.0 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.0 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v4_big180X_1.2.inst.cfg b/resources/variants/modix/modix_v4_big180X_1.2.inst.cfg new file mode 100644 index 0000000000..3523891f5b --- /dev/null +++ b/resources/variants/modix/modix_v4_big180X_1.2.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v4_big180X +name = 1.2 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.2 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v4_big180X_1.4.inst.cfg b/resources/variants/modix/modix_v4_big180X_1.4.inst.cfg new file mode 100644 index 0000000000..706c73ae07 --- /dev/null +++ b/resources/variants/modix/modix_v4_big180X_1.4.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v4_big180X +name = 1.4 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.4 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v4_big60_0.4.inst.cfg b/resources/variants/modix/modix_v4_big60_0.4.inst.cfg new file mode 100644 index 0000000000..667c13da75 --- /dev/null +++ b/resources/variants/modix/modix_v4_big60_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v4_big60 +name = 0.4 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/modix/modix_v4_big60_0.6.inst.cfg b/resources/variants/modix/modix_v4_big60_0.6.inst.cfg new file mode 100644 index 0000000000..d601a30652 --- /dev/null +++ b/resources/variants/modix/modix_v4_big60_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v4_big60 +name = 0.6 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/modix/modix_v4_big60_0.8.inst.cfg b/resources/variants/modix/modix_v4_big60_0.8.inst.cfg new file mode 100644 index 0000000000..4d1dfb736b --- /dev/null +++ b/resources/variants/modix/modix_v4_big60_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v4_big60 +name = 0.8 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/modix/modix_v4_big60_1.0.inst.cfg b/resources/variants/modix/modix_v4_big60_1.0.inst.cfg new file mode 100644 index 0000000000..36a3882cbf --- /dev/null +++ b/resources/variants/modix/modix_v4_big60_1.0.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v4_big60 +name = 1.0 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.0 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v4_big60_1.2.inst.cfg b/resources/variants/modix/modix_v4_big60_1.2.inst.cfg new file mode 100644 index 0000000000..072944dde4 --- /dev/null +++ b/resources/variants/modix/modix_v4_big60_1.2.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v4_big60 +name = 1.2 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.2 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v4_big60_1.4.inst.cfg b/resources/variants/modix/modix_v4_big60_1.4.inst.cfg new file mode 100644 index 0000000000..3114930161 --- /dev/null +++ b/resources/variants/modix/modix_v4_big60_1.4.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v4_big60 +name = 1.4 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.4 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v4_bigmeter_0.4.inst.cfg b/resources/variants/modix/modix_v4_bigmeter_0.4.inst.cfg new file mode 100644 index 0000000000..25a1215f2e --- /dev/null +++ b/resources/variants/modix/modix_v4_bigmeter_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v4_big_meter +name = 0.4 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/modix/modix_v4_bigmeter_0.6.inst.cfg b/resources/variants/modix/modix_v4_bigmeter_0.6.inst.cfg new file mode 100644 index 0000000000..b57a7f50e6 --- /dev/null +++ b/resources/variants/modix/modix_v4_bigmeter_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v4_big_meter +name = 0.6 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/modix/modix_v4_bigmeter_0.8.inst.cfg b/resources/variants/modix/modix_v4_bigmeter_0.8.inst.cfg new file mode 100644 index 0000000000..c67a3d3787 --- /dev/null +++ b/resources/variants/modix/modix_v4_bigmeter_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = modix_v4_big_meter +name = 0.8 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/modix/modix_v4_bigmeter_1.0.inst.cfg b/resources/variants/modix/modix_v4_bigmeter_1.0.inst.cfg new file mode 100644 index 0000000000..4292bf2245 --- /dev/null +++ b/resources/variants/modix/modix_v4_bigmeter_1.0.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v4_big_meter +name = 1.0 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.0 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v4_bigmeter_1.2.inst.cfg b/resources/variants/modix/modix_v4_bigmeter_1.2.inst.cfg new file mode 100644 index 0000000000..e4e53cacce --- /dev/null +++ b/resources/variants/modix/modix_v4_bigmeter_1.2.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v4_big_meter +name = 1.2 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.2 +support_angle = 45 + diff --git a/resources/variants/modix/modix_v4_bigmeter_1.4.inst.cfg b/resources/variants/modix/modix_v4_bigmeter_1.4.inst.cfg new file mode 100644 index 0000000000..981b0ec52c --- /dev/null +++ b/resources/variants/modix/modix_v4_bigmeter_1.4.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = modix_v4_big_meter +name = 1.4 mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +infill_pattern = lines +machine_nozzle_size = 1.4 +support_angle = 45 + diff --git a/resources/variants/nwa3d_a31_04.inst.cfg b/resources/variants/nwa3d/nwa3d_a31_04.inst.cfg similarity index 99% rename from resources/variants/nwa3d_a31_04.inst.cfg rename to resources/variants/nwa3d/nwa3d_a31_04.inst.cfg index 6189f76c08..943e924e46 100644 --- a/resources/variants/nwa3d_a31_04.inst.cfg +++ b/resources/variants/nwa3d/nwa3d_a31_04.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = nwa3d_a31 name = Standard 0.4mm version = 4 -definition = nwa3d_a31 [metadata] author = DragonJe +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/nwa3d_a31_06.inst.cfg b/resources/variants/nwa3d/nwa3d_a31_06.inst.cfg similarity index 99% rename from resources/variants/nwa3d_a31_06.inst.cfg rename to resources/variants/nwa3d/nwa3d_a31_06.inst.cfg index 6422f161ee..6c40173316 100644 --- a/resources/variants/nwa3d_a31_06.inst.cfg +++ b/resources/variants/nwa3d/nwa3d_a31_06.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = nwa3d_a31 name = Engineering 0.6mm version = 4 -definition = nwa3d_a31 [metadata] author = DragonJe +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/renkforce_basic3_0.2.inst.cfg b/resources/variants/renkforce/renkforce_basic3_0.2.inst.cfg similarity index 99% rename from resources/variants/renkforce_basic3_0.2.inst.cfg rename to resources/variants/renkforce/renkforce_basic3_0.2.inst.cfg index b62ea7652a..3f57e3b114 100644 --- a/resources/variants/renkforce_basic3_0.2.inst.cfg +++ b/resources/variants/renkforce/renkforce_basic3_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = renkforce_basic3 name = 0.2mm Nozzle version = 4 -definition = renkforce_basic3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/renkforce_basic3_0.4.inst.cfg b/resources/variants/renkforce/renkforce_basic3_0.4.inst.cfg similarity index 99% rename from resources/variants/renkforce_basic3_0.4.inst.cfg rename to resources/variants/renkforce/renkforce_basic3_0.4.inst.cfg index f3ed1530bb..3deb901cdf 100644 --- a/resources/variants/renkforce_basic3_0.4.inst.cfg +++ b/resources/variants/renkforce/renkforce_basic3_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = renkforce_basic3 name = 0.4mm Nozzle version = 4 -definition = renkforce_basic3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/renkforce_basic3_0.6.inst.cfg b/resources/variants/renkforce/renkforce_basic3_0.6.inst.cfg similarity index 99% rename from resources/variants/renkforce_basic3_0.6.inst.cfg rename to resources/variants/renkforce/renkforce_basic3_0.6.inst.cfg index f9af034a92..7fb350fb6e 100644 --- a/resources/variants/renkforce_basic3_0.6.inst.cfg +++ b/resources/variants/renkforce/renkforce_basic3_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = renkforce_basic3 name = 0.6mm Nozzle version = 4 -definition = renkforce_basic3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/renkforce_basic3_0.8.inst.cfg b/resources/variants/renkforce/renkforce_basic3_0.8.inst.cfg similarity index 99% rename from resources/variants/renkforce_basic3_0.8.inst.cfg rename to resources/variants/renkforce/renkforce_basic3_0.8.inst.cfg index 98feb11fbb..0974c57930 100644 --- a/resources/variants/renkforce_basic3_0.8.inst.cfg +++ b/resources/variants/renkforce/renkforce_basic3_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = renkforce_basic3 name = 0.8mm Nozzle version = 4 -definition = renkforce_basic3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/renkforce_basic3_1.0.inst.cfg b/resources/variants/renkforce/renkforce_basic3_1.0.inst.cfg similarity index 99% rename from resources/variants/renkforce_basic3_1.0.inst.cfg rename to resources/variants/renkforce/renkforce_basic3_1.0.inst.cfg index 45b5cf5a2b..8b8c16288c 100644 --- a/resources/variants/renkforce_basic3_1.0.inst.cfg +++ b/resources/variants/renkforce/renkforce_basic3_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = renkforce_basic3 name = 1.0mm Nozzle version = 4 -definition = renkforce_basic3 [metadata] +hardware_type = nozzle 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/renkforce_cubeone_0.7.inst.cfg similarity index 81% rename from resources/variants/renkforce_cubeone_0.7.inst.cfg rename to resources/variants/renkforce/renkforce_cubeone_0.7.inst.cfg index 605bdf75f5..85681823d0 100644 --- a/resources/variants/renkforce_cubeone_0.7.inst.cfg +++ b/resources/variants/renkforce/renkforce_cubeone_0.7.inst.cfg @@ -1,12 +1,13 @@ -[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 +[general] +definition = renkforce_cubeone +name = 0.7mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.7 + diff --git a/resources/variants/renkforce_pro3_0.2.inst.cfg b/resources/variants/renkforce/renkforce_pro3_0.2.inst.cfg similarity index 99% rename from resources/variants/renkforce_pro3_0.2.inst.cfg rename to resources/variants/renkforce/renkforce_pro3_0.2.inst.cfg index a823e94870..d2726c39b0 100644 --- a/resources/variants/renkforce_pro3_0.2.inst.cfg +++ b/resources/variants/renkforce/renkforce_pro3_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = renkforce_pro3 name = 0.2mm Nozzle version = 4 -definition = renkforce_pro3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/renkforce_pro3_0.4.inst.cfg b/resources/variants/renkforce/renkforce_pro3_0.4.inst.cfg similarity index 99% rename from resources/variants/renkforce_pro3_0.4.inst.cfg rename to resources/variants/renkforce/renkforce_pro3_0.4.inst.cfg index 373f8fdd52..c1e0f92f21 100644 --- a/resources/variants/renkforce_pro3_0.4.inst.cfg +++ b/resources/variants/renkforce/renkforce_pro3_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = renkforce_pro3 name = 0.4mm Nozzle version = 4 -definition = renkforce_pro3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/renkforce_pro3_0.6.inst.cfg b/resources/variants/renkforce/renkforce_pro3_0.6.inst.cfg similarity index 99% rename from resources/variants/renkforce_pro3_0.6.inst.cfg rename to resources/variants/renkforce/renkforce_pro3_0.6.inst.cfg index 6102e36f9d..ef2f96eeaf 100644 --- a/resources/variants/renkforce_pro3_0.6.inst.cfg +++ b/resources/variants/renkforce/renkforce_pro3_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = renkforce_pro3 name = 0.6mm Nozzle version = 4 -definition = renkforce_pro3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/renkforce_pro3_0.8.inst.cfg b/resources/variants/renkforce/renkforce_pro3_0.8.inst.cfg similarity index 99% rename from resources/variants/renkforce_pro3_0.8.inst.cfg rename to resources/variants/renkforce/renkforce_pro3_0.8.inst.cfg index a9f845b292..2049cc02cd 100644 --- a/resources/variants/renkforce_pro3_0.8.inst.cfg +++ b/resources/variants/renkforce/renkforce_pro3_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = renkforce_pro3 name = 0.8mm Nozzle version = 4 -definition = renkforce_pro3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/renkforce_pro3_1.0.inst.cfg b/resources/variants/renkforce/renkforce_pro3_1.0.inst.cfg similarity index 99% rename from resources/variants/renkforce_pro3_1.0.inst.cfg rename to resources/variants/renkforce/renkforce_pro3_1.0.inst.cfg index 8eaea99edb..054f1184a3 100644 --- a/resources/variants/renkforce_pro3_1.0.inst.cfg +++ b/resources/variants/renkforce/renkforce_pro3_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = renkforce_pro3 name = 1.0mm Nozzle version = 4 -definition = renkforce_pro3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/renkforce_pro6_0.2.inst.cfg b/resources/variants/renkforce/renkforce_pro6_0.2.inst.cfg similarity index 99% rename from resources/variants/renkforce_pro6_0.2.inst.cfg rename to resources/variants/renkforce/renkforce_pro6_0.2.inst.cfg index 6d9459ed43..b29e2df3f1 100644 --- a/resources/variants/renkforce_pro6_0.2.inst.cfg +++ b/resources/variants/renkforce/renkforce_pro6_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = renkforce_pro6 name = 0.4mm Nozzle version = 4 -definition = renkforce_pro6 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/renkforce_pro6_0.4.inst.cfg b/resources/variants/renkforce/renkforce_pro6_0.4.inst.cfg similarity index 99% rename from resources/variants/renkforce_pro6_0.4.inst.cfg rename to resources/variants/renkforce/renkforce_pro6_0.4.inst.cfg index 11f5594837..d707c24779 100644 --- a/resources/variants/renkforce_pro6_0.4.inst.cfg +++ b/resources/variants/renkforce/renkforce_pro6_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = renkforce_pro6 name = 0.4mm Nozzle version = 4 -definition = renkforce_pro6 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/renkforce_pro6_0.6.inst.cfg b/resources/variants/renkforce/renkforce_pro6_0.6.inst.cfg similarity index 99% rename from resources/variants/renkforce_pro6_0.6.inst.cfg rename to resources/variants/renkforce/renkforce_pro6_0.6.inst.cfg index 99851560e5..20aad77742 100644 --- a/resources/variants/renkforce_pro6_0.6.inst.cfg +++ b/resources/variants/renkforce/renkforce_pro6_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = renkforce_pro6 name = 0.6mm Nozzle version = 4 -definition = renkforce_pro6 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/renkforce_pro6_0.8.inst.cfg b/resources/variants/renkforce/renkforce_pro6_0.8.inst.cfg similarity index 99% rename from resources/variants/renkforce_pro6_0.8.inst.cfg rename to resources/variants/renkforce/renkforce_pro6_0.8.inst.cfg index e10fbc3e26..73083c28a7 100644 --- a/resources/variants/renkforce_pro6_0.8.inst.cfg +++ b/resources/variants/renkforce/renkforce_pro6_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = renkforce_pro6 name = 0.8mm Nozzle version = 4 -definition = renkforce_pro6 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/renkforce_pro6_1.0.inst.cfg b/resources/variants/renkforce/renkforce_pro6_1.0.inst.cfg similarity index 99% rename from resources/variants/renkforce_pro6_1.0.inst.cfg rename to resources/variants/renkforce/renkforce_pro6_1.0.inst.cfg index fe01d4989b..00a7dd51b0 100644 --- a/resources/variants/renkforce_pro6_1.0.inst.cfg +++ b/resources/variants/renkforce/renkforce_pro6_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = renkforce_pro6 name = 1.0mm Nozzle version = 4 -definition = renkforce_pro6 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/renkforce_pro6plus_0.4.inst.cfg b/resources/variants/renkforce/renkforce_pro6plus_0.4.inst.cfg similarity index 99% rename from resources/variants/renkforce_pro6plus_0.4.inst.cfg rename to resources/variants/renkforce/renkforce_pro6plus_0.4.inst.cfg index 26de9bfac7..53011de547 100644 --- a/resources/variants/renkforce_pro6plus_0.4.inst.cfg +++ b/resources/variants/renkforce/renkforce_pro6plus_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = renkforce_pro6plus name = 0.4mm Nozzle version = 4 -definition = renkforce_pro6plus [metadata] +hardware_type = nozzle 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/renkforce_pro6plus_0.6.inst.cfg similarity index 99% rename from resources/variants/renkforce_pro6plus_0.6.inst.cfg rename to resources/variants/renkforce/renkforce_pro6plus_0.6.inst.cfg index 7c337517ef..f8357e5acf 100644 --- a/resources/variants/renkforce_pro6plus_0.6.inst.cfg +++ b/resources/variants/renkforce/renkforce_pro6plus_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = renkforce_pro6plus name = 0.6mm Nozzle version = 4 -definition = renkforce_pro6plus [metadata] +hardware_type = nozzle 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/renkforce_pro6plus_0.8.inst.cfg similarity index 99% rename from resources/variants/renkforce_pro6plus_0.8.inst.cfg rename to resources/variants/renkforce/renkforce_pro6plus_0.8.inst.cfg index b3aba6d4a1..19e8b14108 100644 --- a/resources/variants/renkforce_pro6plus_0.8.inst.cfg +++ b/resources/variants/renkforce/renkforce_pro6plus_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = renkforce_pro6plus name = 0.8mm Nozzle version = 4 -definition = renkforce_pro6plus [metadata] +hardware_type = nozzle 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/renkforce_pro6plus_1.0.inst.cfg similarity index 99% rename from resources/variants/renkforce_pro6plus_1.0.inst.cfg rename to resources/variants/renkforce/renkforce_pro6plus_1.0.inst.cfg index e5e51b82b3..255c4cb9f0 100644 --- a/resources/variants/renkforce_pro6plus_1.0.inst.cfg +++ b/resources/variants/renkforce/renkforce_pro6plus_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = renkforce_pro6plus name = 1.0mm Nozzle version = 4 -definition = renkforce_pro6plus [metadata] +hardware_type = nozzle 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/renkforce_pro7dual_0.2.inst.cfg similarity index 99% rename from resources/variants/renkforce_pro7dual_0.2.inst.cfg rename to resources/variants/renkforce/renkforce_pro7dual_0.2.inst.cfg index e1d2ca7fa9..69d912c9da 100755 --- a/resources/variants/renkforce_pro7dual_0.2.inst.cfg +++ b/resources/variants/renkforce/renkforce_pro7dual_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = renkforce_pro7dual name = 0.2mm Nozzle version = 4 -definition = renkforce_pro7dual [metadata] +hardware_type = nozzle 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/renkforce_pro7dual_0.4.inst.cfg similarity index 99% rename from resources/variants/renkforce_pro7dual_0.4.inst.cfg rename to resources/variants/renkforce/renkforce_pro7dual_0.4.inst.cfg index 62aff750be..e95e747132 100755 --- a/resources/variants/renkforce_pro7dual_0.4.inst.cfg +++ b/resources/variants/renkforce/renkforce_pro7dual_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = renkforce_pro7dual name = 0.4mm Nozzle version = 4 -definition = renkforce_pro7dual [metadata] +hardware_type = nozzle 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/renkforce_pro7dual_0.6.inst.cfg similarity index 99% rename from resources/variants/renkforce_pro7dual_0.6.inst.cfg rename to resources/variants/renkforce/renkforce_pro7dual_0.6.inst.cfg index b903531f1a..5c048ff680 100755 --- a/resources/variants/renkforce_pro7dual_0.6.inst.cfg +++ b/resources/variants/renkforce/renkforce_pro7dual_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = renkforce_pro7dual name = 0.6mm Nozzle version = 4 -definition = renkforce_pro7dual [metadata] +hardware_type = nozzle 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/renkforce_pro7dual_0.8.inst.cfg similarity index 99% rename from resources/variants/renkforce_pro7dual_0.8.inst.cfg rename to resources/variants/renkforce/renkforce_pro7dual_0.8.inst.cfg index 3fd935a04d..604b5aa66b 100755 --- a/resources/variants/renkforce_pro7dual_0.8.inst.cfg +++ b/resources/variants/renkforce/renkforce_pro7dual_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = renkforce_pro7dual name = 0.8mm Nozzle version = 4 -definition = renkforce_pro7dual [metadata] +hardware_type = nozzle 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/renkforce_pro7dual_1.0.inst.cfg similarity index 99% rename from resources/variants/renkforce_pro7dual_1.0.inst.cfg rename to resources/variants/renkforce/renkforce_pro7dual_1.0.inst.cfg index 5c27ee38dd..9e7a1ff8fa 100755 --- a/resources/variants/renkforce_pro7dual_1.0.inst.cfg +++ b/resources/variants/renkforce/renkforce_pro7dual_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = renkforce_pro7dual name = 1.0mm Nozzle version = 4 -definition = renkforce_pro7dual [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/sovol/sovol_base_bowden_0.2.inst.cfg b/resources/variants/sovol/sovol_base_bowden_0.2.inst.cfg new file mode 100644 index 0000000000..9ef9061185 --- /dev/null +++ b/resources/variants/sovol/sovol_base_bowden_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_base +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/sovol/sovol_base_bowden_0.3.inst.cfg b/resources/variants/sovol/sovol_base_bowden_0.3.inst.cfg new file mode 100644 index 0000000000..837c9463c2 --- /dev/null +++ b/resources/variants/sovol/sovol_base_bowden_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_base +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/sovol/sovol_base_bowden_0.4.inst.cfg b/resources/variants/sovol/sovol_base_bowden_0.4.inst.cfg new file mode 100644 index 0000000000..bfaf784982 --- /dev/null +++ b/resources/variants/sovol/sovol_base_bowden_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_base +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/sovol/sovol_base_bowden_0.5.inst.cfg b/resources/variants/sovol/sovol_base_bowden_0.5.inst.cfg new file mode 100644 index 0000000000..d613026fb9 --- /dev/null +++ b/resources/variants/sovol/sovol_base_bowden_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_base +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/sovol/sovol_base_bowden_0.6.inst.cfg b/resources/variants/sovol/sovol_base_bowden_0.6.inst.cfg new file mode 100644 index 0000000000..42c7257b5c --- /dev/null +++ b/resources/variants/sovol/sovol_base_bowden_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_base +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/sovol/sovol_base_bowden_0.8.inst.cfg b/resources/variants/sovol/sovol_base_bowden_0.8.inst.cfg new file mode 100644 index 0000000000..8ba6cc1c57 --- /dev/null +++ b/resources/variants/sovol/sovol_base_bowden_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_base +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/sovol/sovol_base_bowden_1.0.inst.cfg b/resources/variants/sovol/sovol_base_bowden_1.0.inst.cfg new file mode 100644 index 0000000000..0cc58cba51 --- /dev/null +++ b/resources/variants/sovol/sovol_base_bowden_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_base +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/sovol/sovol_base_planetary_0.2.inst.cfg b/resources/variants/sovol/sovol_base_planetary_0.2.inst.cfg new file mode 100644 index 0000000000..9ef9061185 --- /dev/null +++ b/resources/variants/sovol/sovol_base_planetary_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_base +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/sovol/sovol_base_planetary_0.3.inst.cfg b/resources/variants/sovol/sovol_base_planetary_0.3.inst.cfg new file mode 100644 index 0000000000..837c9463c2 --- /dev/null +++ b/resources/variants/sovol/sovol_base_planetary_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_base +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/sovol/sovol_base_planetary_0.4.inst.cfg b/resources/variants/sovol/sovol_base_planetary_0.4.inst.cfg new file mode 100644 index 0000000000..bfaf784982 --- /dev/null +++ b/resources/variants/sovol/sovol_base_planetary_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_base +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/sovol/sovol_base_planetary_0.5.inst.cfg b/resources/variants/sovol/sovol_base_planetary_0.5.inst.cfg new file mode 100644 index 0000000000..d613026fb9 --- /dev/null +++ b/resources/variants/sovol/sovol_base_planetary_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_base +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/sovol/sovol_base_planetary_0.6.inst.cfg b/resources/variants/sovol/sovol_base_planetary_0.6.inst.cfg new file mode 100644 index 0000000000..42c7257b5c --- /dev/null +++ b/resources/variants/sovol/sovol_base_planetary_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_base +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/sovol/sovol_base_planetary_0.8.inst.cfg b/resources/variants/sovol/sovol_base_planetary_0.8.inst.cfg new file mode 100644 index 0000000000..8ba6cc1c57 --- /dev/null +++ b/resources/variants/sovol/sovol_base_planetary_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_base +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/sovol/sovol_base_planetary_1.0.inst.cfg b/resources/variants/sovol/sovol_base_planetary_1.0.inst.cfg new file mode 100644 index 0000000000..0cc58cba51 --- /dev/null +++ b/resources/variants/sovol/sovol_base_planetary_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_base +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/sovol/sovol_base_titan_0.2.inst.cfg b/resources/variants/sovol/sovol_base_titan_0.2.inst.cfg new file mode 100644 index 0000000000..9ef9061185 --- /dev/null +++ b/resources/variants/sovol/sovol_base_titan_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_base +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/sovol/sovol_base_titan_0.3.inst.cfg b/resources/variants/sovol/sovol_base_titan_0.3.inst.cfg new file mode 100644 index 0000000000..837c9463c2 --- /dev/null +++ b/resources/variants/sovol/sovol_base_titan_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_base +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/sovol/sovol_base_titan_0.4.inst.cfg b/resources/variants/sovol/sovol_base_titan_0.4.inst.cfg new file mode 100644 index 0000000000..bfaf784982 --- /dev/null +++ b/resources/variants/sovol/sovol_base_titan_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_base +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/sovol/sovol_base_titan_0.5.inst.cfg b/resources/variants/sovol/sovol_base_titan_0.5.inst.cfg new file mode 100644 index 0000000000..d613026fb9 --- /dev/null +++ b/resources/variants/sovol/sovol_base_titan_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_base +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/sovol/sovol_base_titan_0.6.inst.cfg b/resources/variants/sovol/sovol_base_titan_0.6.inst.cfg new file mode 100644 index 0000000000..42c7257b5c --- /dev/null +++ b/resources/variants/sovol/sovol_base_titan_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_base +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/sovol/sovol_base_titan_0.8.inst.cfg b/resources/variants/sovol/sovol_base_titan_0.8.inst.cfg new file mode 100644 index 0000000000..8ba6cc1c57 --- /dev/null +++ b/resources/variants/sovol/sovol_base_titan_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_base +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/sovol/sovol_base_titan_1.0.inst.cfg b/resources/variants/sovol/sovol_base_titan_1.0.inst.cfg new file mode 100644 index 0000000000..0cc58cba51 --- /dev/null +++ b/resources/variants/sovol/sovol_base_titan_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_base +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/sovol/sovol_sv01_0.2.inst.cfg b/resources/variants/sovol/sovol_sv01_0.2.inst.cfg new file mode 100644 index 0000000000..0a8fcdebe6 --- /dev/null +++ b/resources/variants/sovol/sovol_sv01_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_sv01 +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/sovol/sovol_sv01_0.3.inst.cfg b/resources/variants/sovol/sovol_sv01_0.3.inst.cfg new file mode 100644 index 0000000000..eb7d781a6d --- /dev/null +++ b/resources/variants/sovol/sovol_sv01_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_sv01 +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/sovol/sovol_sv01_0.4.inst.cfg b/resources/variants/sovol/sovol_sv01_0.4.inst.cfg new file mode 100644 index 0000000000..657df97f4c --- /dev/null +++ b/resources/variants/sovol/sovol_sv01_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_sv01 +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/sovol/sovol_sv01_0.5.inst.cfg b/resources/variants/sovol/sovol_sv01_0.5.inst.cfg new file mode 100644 index 0000000000..93ae22458c --- /dev/null +++ b/resources/variants/sovol/sovol_sv01_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_sv01 +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/sovol/sovol_sv01_0.6.inst.cfg b/resources/variants/sovol/sovol_sv01_0.6.inst.cfg new file mode 100644 index 0000000000..e758c196b8 --- /dev/null +++ b/resources/variants/sovol/sovol_sv01_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_sv01 +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/sovol/sovol_sv01_0.8.inst.cfg b/resources/variants/sovol/sovol_sv01_0.8.inst.cfg new file mode 100644 index 0000000000..61aac389e0 --- /dev/null +++ b/resources/variants/sovol/sovol_sv01_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_sv01 +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/sovol/sovol_sv01_1.0.inst.cfg b/resources/variants/sovol/sovol_sv01_1.0.inst.cfg new file mode 100644 index 0000000000..3a2988791e --- /dev/null +++ b/resources/variants/sovol/sovol_sv01_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_sv01 +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/sovol/sovol_sv01pro_0.2.inst.cfg b/resources/variants/sovol/sovol_sv01pro_0.2.inst.cfg new file mode 100644 index 0000000000..9b0b4b2f24 --- /dev/null +++ b/resources/variants/sovol/sovol_sv01pro_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_sv01pro +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/sovol/sovol_sv01pro_0.3.inst.cfg b/resources/variants/sovol/sovol_sv01pro_0.3.inst.cfg new file mode 100644 index 0000000000..f015217453 --- /dev/null +++ b/resources/variants/sovol/sovol_sv01pro_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_sv01pro +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/sovol/sovol_sv01pro_0.4.inst.cfg b/resources/variants/sovol/sovol_sv01pro_0.4.inst.cfg new file mode 100644 index 0000000000..518e7893cf --- /dev/null +++ b/resources/variants/sovol/sovol_sv01pro_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_sv01pro +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/sovol/sovol_sv01pro_0.5.inst.cfg b/resources/variants/sovol/sovol_sv01pro_0.5.inst.cfg new file mode 100644 index 0000000000..8e89f94bf0 --- /dev/null +++ b/resources/variants/sovol/sovol_sv01pro_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_sv01pro +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/sovol/sovol_sv01pro_0.6.inst.cfg b/resources/variants/sovol/sovol_sv01pro_0.6.inst.cfg new file mode 100644 index 0000000000..068b989ce0 --- /dev/null +++ b/resources/variants/sovol/sovol_sv01pro_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_sv01pro +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/sovol/sovol_sv01pro_0.8.inst.cfg b/resources/variants/sovol/sovol_sv01pro_0.8.inst.cfg new file mode 100644 index 0000000000..eb575c0047 --- /dev/null +++ b/resources/variants/sovol/sovol_sv01pro_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_sv01pro +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/sovol/sovol_sv01pro_1.0.inst.cfg b/resources/variants/sovol/sovol_sv01pro_1.0.inst.cfg new file mode 100644 index 0000000000..2bb5e6fb7b --- /dev/null +++ b/resources/variants/sovol/sovol_sv01pro_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_sv01pro +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/sovol/sovol_sv03_0.2.inst.cfg b/resources/variants/sovol/sovol_sv03_0.2.inst.cfg new file mode 100644 index 0000000000..5cdcac3a26 --- /dev/null +++ b/resources/variants/sovol/sovol_sv03_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_sv03 +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/sovol/sovol_sv03_0.3.inst.cfg b/resources/variants/sovol/sovol_sv03_0.3.inst.cfg new file mode 100644 index 0000000000..67b9799127 --- /dev/null +++ b/resources/variants/sovol/sovol_sv03_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_sv03 +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/sovol/sovol_sv03_0.4.inst.cfg b/resources/variants/sovol/sovol_sv03_0.4.inst.cfg new file mode 100644 index 0000000000..9e54f8e94c --- /dev/null +++ b/resources/variants/sovol/sovol_sv03_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_sv03 +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/sovol/sovol_sv03_0.5.inst.cfg b/resources/variants/sovol/sovol_sv03_0.5.inst.cfg new file mode 100644 index 0000000000..ec66a3dae0 --- /dev/null +++ b/resources/variants/sovol/sovol_sv03_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_sv03 +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/sovol/sovol_sv03_0.6.inst.cfg b/resources/variants/sovol/sovol_sv03_0.6.inst.cfg new file mode 100644 index 0000000000..979ee73f03 --- /dev/null +++ b/resources/variants/sovol/sovol_sv03_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_sv03 +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/sovol/sovol_sv03_0.8.inst.cfg b/resources/variants/sovol/sovol_sv03_0.8.inst.cfg new file mode 100644 index 0000000000..a5284986c8 --- /dev/null +++ b/resources/variants/sovol/sovol_sv03_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_sv03 +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/sovol/sovol_sv03_1.0.inst.cfg b/resources/variants/sovol/sovol_sv03_1.0.inst.cfg new file mode 100644 index 0000000000..3832ecce71 --- /dev/null +++ b/resources/variants/sovol/sovol_sv03_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_sv03 +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/sovol/sovol_sv05_0.2.inst.cfg b/resources/variants/sovol/sovol_sv05_0.2.inst.cfg new file mode 100644 index 0000000000..588111316e --- /dev/null +++ b/resources/variants/sovol/sovol_sv05_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_sv05 +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/sovol/sovol_sv05_0.3.inst.cfg b/resources/variants/sovol/sovol_sv05_0.3.inst.cfg new file mode 100644 index 0000000000..805ab52058 --- /dev/null +++ b/resources/variants/sovol/sovol_sv05_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_sv05 +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/sovol/sovol_sv05_0.4.inst.cfg b/resources/variants/sovol/sovol_sv05_0.4.inst.cfg new file mode 100644 index 0000000000..87ace420fb --- /dev/null +++ b/resources/variants/sovol/sovol_sv05_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_sv05 +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/sovol/sovol_sv05_0.5.inst.cfg b/resources/variants/sovol/sovol_sv05_0.5.inst.cfg new file mode 100644 index 0000000000..6b4b6e794b --- /dev/null +++ b/resources/variants/sovol/sovol_sv05_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_sv05 +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/sovol/sovol_sv05_0.6.inst.cfg b/resources/variants/sovol/sovol_sv05_0.6.inst.cfg new file mode 100644 index 0000000000..3ba33c5bcc --- /dev/null +++ b/resources/variants/sovol/sovol_sv05_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_sv05 +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/sovol/sovol_sv05_0.8.inst.cfg b/resources/variants/sovol/sovol_sv05_0.8.inst.cfg new file mode 100644 index 0000000000..85e19a9d58 --- /dev/null +++ b/resources/variants/sovol/sovol_sv05_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_sv05 +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/sovol/sovol_sv05_1.0.inst.cfg b/resources/variants/sovol/sovol_sv05_1.0.inst.cfg new file mode 100644 index 0000000000..aba098b75f --- /dev/null +++ b/resources/variants/sovol/sovol_sv05_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_sv05 +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/sovol/sovol_sv06_0.2.inst.cfg b/resources/variants/sovol/sovol_sv06_0.2.inst.cfg new file mode 100644 index 0000000000..5e8c811282 --- /dev/null +++ b/resources/variants/sovol/sovol_sv06_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_sv06 +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/sovol/sovol_sv06_0.3.inst.cfg b/resources/variants/sovol/sovol_sv06_0.3.inst.cfg new file mode 100644 index 0000000000..920e395cbc --- /dev/null +++ b/resources/variants/sovol/sovol_sv06_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_sv06 +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/sovol/sovol_sv06_0.4.inst.cfg b/resources/variants/sovol/sovol_sv06_0.4.inst.cfg new file mode 100644 index 0000000000..9f4d4bb7af --- /dev/null +++ b/resources/variants/sovol/sovol_sv06_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_sv06 +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/sovol/sovol_sv06_0.5.inst.cfg b/resources/variants/sovol/sovol_sv06_0.5.inst.cfg new file mode 100644 index 0000000000..086005f2b6 --- /dev/null +++ b/resources/variants/sovol/sovol_sv06_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_sv06 +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/sovol/sovol_sv06_0.6.inst.cfg b/resources/variants/sovol/sovol_sv06_0.6.inst.cfg new file mode 100644 index 0000000000..70ebbced38 --- /dev/null +++ b/resources/variants/sovol/sovol_sv06_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_sv06 +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/sovol/sovol_sv06_0.8.inst.cfg b/resources/variants/sovol/sovol_sv06_0.8.inst.cfg new file mode 100644 index 0000000000..b27e562832 --- /dev/null +++ b/resources/variants/sovol/sovol_sv06_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_sv06 +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/sovol/sovol_sv06_1.0.inst.cfg b/resources/variants/sovol/sovol_sv06_1.0.inst.cfg new file mode 100644 index 0000000000..c8f43c0a26 --- /dev/null +++ b/resources/variants/sovol/sovol_sv06_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = sovol_sv06 +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 20 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/strateo3d_high_temp_04.inst.cfg b/resources/variants/strateo3d/strateo3d_high_temp_04.inst.cfg similarity index 99% rename from resources/variants/strateo3d_high_temp_04.inst.cfg rename to resources/variants/strateo3d/strateo3d_high_temp_04.inst.cfg index 1091760b4e..8a50986647 100644 --- a/resources/variants/strateo3d_high_temp_04.inst.cfg +++ b/resources/variants/strateo3d/strateo3d_high_temp_04.inst.cfg @@ -1,20 +1,21 @@ [general] +definition = strateo3d name = High temp 0.4 version = 4 -definition = strateo3d [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +layer_height = 0.2 +layer_height_0 = 0.3 machine_nozzle_id = HT0.4 machine_nozzle_size = 0.4 machine_nozzle_tip_outer_diameter = 1.0 -layer_height = 0.2 -layer_height_0 = 0.3 prime_tower_enable = True retract_at_layer_change = False support_angle = 45 support_use_towers = True + diff --git a/resources/variants/strateo3d_standard_04.inst.cfg b/resources/variants/strateo3d/strateo3d_standard_04.inst.cfg similarity index 93% rename from resources/variants/strateo3d_standard_04.inst.cfg rename to resources/variants/strateo3d/strateo3d_standard_04.inst.cfg index 6806c3ef67..9c9e7dcaff 100644 --- a/resources/variants/strateo3d_standard_04.inst.cfg +++ b/resources/variants/strateo3d/strateo3d_standard_04.inst.cfg @@ -1,20 +1,21 @@ [general] +definition = strateo3d name = Standard 0.4 version = 4 -definition = strateo3d [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +layer_height = 0.2 +layer_height_0 = 0.3 machine_nozzle_id = Standard 0.4 machine_nozzle_size = 0.4 machine_nozzle_tip_outer_diameter = 1.0 -layer_height = 0.2 -layer_height_0 = 0.3 prime_tower_enable = True retract_at_layer_change = False support_angle = 60 -support_use_towers = True \ No newline at end of file +support_use_towers = True + diff --git a/resources/variants/strateo3d_standard_06.inst.cfg b/resources/variants/strateo3d/strateo3d_standard_06.inst.cfg similarity index 93% rename from resources/variants/strateo3d_standard_06.inst.cfg rename to resources/variants/strateo3d/strateo3d_standard_06.inst.cfg index 9ab25f5bc1..3dc60d0530 100644 --- a/resources/variants/strateo3d_standard_06.inst.cfg +++ b/resources/variants/strateo3d/strateo3d_standard_06.inst.cfg @@ -1,20 +1,21 @@ [general] +definition = strateo3d name = Standard 0.6 version = 4 -definition = strateo3d [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +layer_height = 0.3 +layer_height_0 = 0.4 machine_nozzle_id = Standard 0.6 machine_nozzle_size = 0.6 machine_nozzle_tip_outer_diameter = 1.5 -layer_height = 0.3 -layer_height_0 = 0.4 prime_tower_enable = True retract_at_layer_change = False support_angle = 55 -support_use_towers = True \ No newline at end of file +support_use_towers = True + diff --git a/resources/variants/strateo3d_standard_08.inst.cfg b/resources/variants/strateo3d/strateo3d_standard_08.inst.cfg similarity index 93% rename from resources/variants/strateo3d_standard_08.inst.cfg rename to resources/variants/strateo3d/strateo3d_standard_08.inst.cfg index 435f34f270..ad2c514de0 100644 --- a/resources/variants/strateo3d_standard_08.inst.cfg +++ b/resources/variants/strateo3d/strateo3d_standard_08.inst.cfg @@ -1,20 +1,21 @@ [general] +definition = strateo3d name = Standard 0.8 version = 4 -definition = strateo3d [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +layer_height = 0.4 +layer_height_0 = 0.5 machine_nozzle_id = Standard 0.8 machine_nozzle_size = 0.8 machine_nozzle_tip_outer_diameter = 2.0 -layer_height = 0.4 -layer_height_0 = 0.5 prime_tower_enable = True retract_at_layer_change = True support_angle = 50 -support_use_towers = True \ No newline at end of file +support_use_towers = True + diff --git a/resources/variants/strateo3d_standard_10.inst.cfg b/resources/variants/strateo3d/strateo3d_standard_10.inst.cfg similarity index 93% rename from resources/variants/strateo3d_standard_10.inst.cfg rename to resources/variants/strateo3d/strateo3d_standard_10.inst.cfg index 46f85ef2ad..3a8e1d42c5 100644 --- a/resources/variants/strateo3d_standard_10.inst.cfg +++ b/resources/variants/strateo3d/strateo3d_standard_10.inst.cfg @@ -1,20 +1,21 @@ [general] +definition = strateo3d name = Standard 1.0 Experimental version = 4 -definition = strateo3d [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +layer_height = 0.5 +layer_height_0 = 0.6 machine_nozzle_id = Standard 1.0 Experimental machine_nozzle_size = 1.0 machine_nozzle_tip_outer_diameter = 2.5 -layer_height = 0.5 -layer_height_0 = 0.6 prime_tower_enable = True retract_at_layer_change = True support_angle = 50 -support_use_towers = True \ No newline at end of file +support_use_towers = True + diff --git a/resources/variants/strateo3d_standard_12.inst.cfg b/resources/variants/strateo3d/strateo3d_standard_12.inst.cfg similarity index 93% rename from resources/variants/strateo3d_standard_12.inst.cfg rename to resources/variants/strateo3d/strateo3d_standard_12.inst.cfg index 4a8ea196c8..9eb54c71d2 100644 --- a/resources/variants/strateo3d_standard_12.inst.cfg +++ b/resources/variants/strateo3d/strateo3d_standard_12.inst.cfg @@ -1,20 +1,21 @@ [general] +definition = strateo3d name = Standard 1.2 Experimental version = 4 -definition = strateo3d [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +layer_height = 0.6 +layer_height_0 = 0.7 machine_nozzle_id = Standard 1.2 Experimental machine_nozzle_size = 1.2 machine_nozzle_tip_outer_diameter = 3.0 -layer_height = 0.6 -layer_height_0 = 0.7 prime_tower_enable = True retract_at_layer_change = True support_angle = 50 -support_use_towers = True \ No newline at end of file +support_use_towers = True + diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.20.inst.cfg b/resources/variants/structur3d/structur3d_discov3ry1_complete_um2plus_0.20.inst.cfg similarity index 99% rename from resources/variants/structur3d_discov3ry1_complete_um2plus_0.20.inst.cfg rename to resources/variants/structur3d/structur3d_discov3ry1_complete_um2plus_0.20.inst.cfg index c983214ef7..ee7fa722bb 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.20.inst.cfg +++ b/resources/variants/structur3d/structur3d_discov3ry1_complete_um2plus_0.20.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = structur3d_discov3ry1_complete_um2plus name = 0.20mm (Clear) version = 4 -definition = structur3d_discov3ry1_complete_um2plus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_id = 0.20mm (Clear) machine_nozzle_size = 0.20 machine_nozzle_tip_outer_diameter = 0.30 + diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.25.inst.cfg b/resources/variants/structur3d/structur3d_discov3ry1_complete_um2plus_0.25.inst.cfg similarity index 99% rename from resources/variants/structur3d_discov3ry1_complete_um2plus_0.25.inst.cfg rename to resources/variants/structur3d/structur3d_discov3ry1_complete_um2plus_0.25.inst.cfg index bd431f0422..7818ccbb79 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.25.inst.cfg +++ b/resources/variants/structur3d/structur3d_discov3ry1_complete_um2plus_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = structur3d_discov3ry1_complete_um2plus name = 0.25mm (Red) version = 4 -definition = structur3d_discov3ry1_complete_um2plus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_id = 0.25mm (Red) machine_nozzle_size = 0.25 machine_nozzle_tip_outer_diameter = 0.35 + diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.41.inst.cfg b/resources/variants/structur3d/structur3d_discov3ry1_complete_um2plus_0.41.inst.cfg similarity index 99% rename from resources/variants/structur3d_discov3ry1_complete_um2plus_0.41.inst.cfg rename to resources/variants/structur3d/structur3d_discov3ry1_complete_um2plus_0.41.inst.cfg index 8df046a824..c2f61935fb 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.41.inst.cfg +++ b/resources/variants/structur3d/structur3d_discov3ry1_complete_um2plus_0.41.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = structur3d_discov3ry1_complete_um2plus name = 0.41mm (Blue) version = 4 -definition = structur3d_discov3ry1_complete_um2plus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_id = 0.41mm (Blue) machine_nozzle_size = 0.41 machine_nozzle_tip_outer_diameter = 0.51 + diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.58.inst.cfg b/resources/variants/structur3d/structur3d_discov3ry1_complete_um2plus_0.58.inst.cfg similarity index 99% rename from resources/variants/structur3d_discov3ry1_complete_um2plus_0.58.inst.cfg rename to resources/variants/structur3d/structur3d_discov3ry1_complete_um2plus_0.58.inst.cfg index cd4b9ab2f6..11bed6f6a8 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.58.inst.cfg +++ b/resources/variants/structur3d/structur3d_discov3ry1_complete_um2plus_0.58.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = structur3d_discov3ry1_complete_um2plus name = 0.58mm (Pink) version = 4 -definition = structur3d_discov3ry1_complete_um2plus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_id = 0.58mm (Pink) machine_nozzle_size = 0.58 machine_nozzle_tip_outer_diameter = 0.68 + diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.84.inst.cfg b/resources/variants/structur3d/structur3d_discov3ry1_complete_um2plus_0.84.inst.cfg similarity index 99% rename from resources/variants/structur3d_discov3ry1_complete_um2plus_0.84.inst.cfg rename to resources/variants/structur3d/structur3d_discov3ry1_complete_um2plus_0.84.inst.cfg index 9dd15300fc..a70ebdab34 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.84.inst.cfg +++ b/resources/variants/structur3d/structur3d_discov3ry1_complete_um2plus_0.84.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = structur3d_discov3ry1_complete_um2plus name = 0.84mm (Green) version = 4 -definition = structur3d_discov3ry1_complete_um2plus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_id = 0.84mm (Green) machine_nozzle_size = 0.84 machine_nozzle_tip_outer_diameter = 0.94 + diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_1.19.inst.cfg b/resources/variants/structur3d/structur3d_discov3ry1_complete_um2plus_1.19.inst.cfg similarity index 99% rename from resources/variants/structur3d_discov3ry1_complete_um2plus_1.19.inst.cfg rename to resources/variants/structur3d/structur3d_discov3ry1_complete_um2plus_1.19.inst.cfg index 7d13f8a569..6c7e908cf1 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_1.19.inst.cfg +++ b/resources/variants/structur3d/structur3d_discov3ry1_complete_um2plus_1.19.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = structur3d_discov3ry1_complete_um2plus name = 1.19mm (Grey) version = 4 -definition = structur3d_discov3ry1_complete_um2plus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_id = 1.19mm (Grey) machine_nozzle_size = 1.19 machine_nozzle_tip_outer_diameter = 1.29 + diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_1.60.inst.cfg b/resources/variants/structur3d/structur3d_discov3ry1_complete_um2plus_1.60.inst.cfg similarity index 99% rename from resources/variants/structur3d_discov3ry1_complete_um2plus_1.60.inst.cfg rename to resources/variants/structur3d/structur3d_discov3ry1_complete_um2plus_1.60.inst.cfg index 7cecf36184..693d60cd0f 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_1.60.inst.cfg +++ b/resources/variants/structur3d/structur3d_discov3ry1_complete_um2plus_1.60.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = structur3d_discov3ry1_complete_um2plus name = 1.60mm (Olive) version = 4 -definition = structur3d_discov3ry1_complete_um2plus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_id = 1.60mm (Olive) machine_nozzle_size = 1.60 machine_nozzle_tip_outer_diameter = 1.70 + diff --git a/resources/variants/tizyx_evy_0.2.inst.cfg b/resources/variants/tizyx/tizyx_evy_0.2.inst.cfg similarity index 99% rename from resources/variants/tizyx_evy_0.2.inst.cfg rename to resources/variants/tizyx/tizyx_evy_0.2.inst.cfg index 589bc2b45e..df630d9e97 100644 --- a/resources/variants/tizyx_evy_0.2.inst.cfg +++ b/resources/variants/tizyx/tizyx_evy_0.2.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = tizyx_evy name = 0.2mm version = 4 -definition = tizyx_evy [metadata] author = TiZYX +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/tizyx_evy_0.3.inst.cfg b/resources/variants/tizyx/tizyx_evy_0.3.inst.cfg similarity index 99% rename from resources/variants/tizyx_evy_0.3.inst.cfg rename to resources/variants/tizyx/tizyx_evy_0.3.inst.cfg index d2f8e6f714..a21dc363e1 100644 --- a/resources/variants/tizyx_evy_0.3.inst.cfg +++ b/resources/variants/tizyx/tizyx_evy_0.3.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = tizyx_evy name = 0.3mm version = 4 -definition = tizyx_evy [metadata] author = TiZYX +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/tizyx_evy_0.4.inst.cfg b/resources/variants/tizyx/tizyx_evy_0.4.inst.cfg similarity index 99% rename from resources/variants/tizyx_evy_0.4.inst.cfg rename to resources/variants/tizyx/tizyx_evy_0.4.inst.cfg index dec9f40f06..3e6ec06f59 100644 --- a/resources/variants/tizyx_evy_0.4.inst.cfg +++ b/resources/variants/tizyx/tizyx_evy_0.4.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = tizyx_evy name = 0.4mm version = 4 -definition = tizyx_evy [metadata] author = TiZYX +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/tizyx_evy_0.5.inst.cfg b/resources/variants/tizyx/tizyx_evy_0.5.inst.cfg similarity index 100% rename from resources/variants/tizyx_evy_0.5.inst.cfg rename to resources/variants/tizyx/tizyx_evy_0.5.inst.cfg index dc074e1572..60e0cbe9fb 100644 --- a/resources/variants/tizyx_evy_0.5.inst.cfg +++ b/resources/variants/tizyx/tizyx_evy_0.5.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = tizyx_evy name = 0.5mm version = 4 -definition = tizyx_evy [metadata] author = TiZYX +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 diff --git a/resources/variants/tizyx_evy_0.6.inst.cfg b/resources/variants/tizyx/tizyx_evy_0.6.inst.cfg similarity index 99% rename from resources/variants/tizyx_evy_0.6.inst.cfg rename to resources/variants/tizyx/tizyx_evy_0.6.inst.cfg index bb49d1055f..73987e8a91 100644 --- a/resources/variants/tizyx_evy_0.6.inst.cfg +++ b/resources/variants/tizyx/tizyx_evy_0.6.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = tizyx_evy name = 0.6mm version = 4 -definition = tizyx_evy [metadata] author = TiZYX +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/tizyx_evy_0.8.inst.cfg b/resources/variants/tizyx/tizyx_evy_0.8.inst.cfg similarity index 99% rename from resources/variants/tizyx_evy_0.8.inst.cfg rename to resources/variants/tizyx/tizyx_evy_0.8.inst.cfg index 31fef2ab4b..6512f22e5b 100644 --- a/resources/variants/tizyx_evy_0.8.inst.cfg +++ b/resources/variants/tizyx/tizyx_evy_0.8.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = tizyx_evy name = 0.8mm version = 4 -definition = tizyx_evy [metadata] author = TiZYX +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/tizyx_evy_1.0.inst.cfg b/resources/variants/tizyx/tizyx_evy_1.0.inst.cfg similarity index 99% rename from resources/variants/tizyx_evy_1.0.inst.cfg rename to resources/variants/tizyx/tizyx_evy_1.0.inst.cfg index 69ca4a36ae..bb20f8971d 100644 --- a/resources/variants/tizyx_evy_1.0.inst.cfg +++ b/resources/variants/tizyx/tizyx_evy_1.0.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = tizyx_evy name = 1.0mm version = 4 -definition = tizyx_evy [metadata] author = TiZYX +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/tizyx_evy_dual_classic.inst.cfg b/resources/variants/tizyx/tizyx_evy_dual_classic.inst.cfg similarity index 85% rename from resources/variants/tizyx_evy_dual_classic.inst.cfg rename to resources/variants/tizyx/tizyx_evy_dual_classic.inst.cfg index c05b0f2a0a..3dc10c7b3c 100644 --- a/resources/variants/tizyx_evy_dual_classic.inst.cfg +++ b/resources/variants/tizyx/tizyx_evy_dual_classic.inst.cfg @@ -1,15 +1,16 @@ [general] +definition = tizyx_evy_dual name = Classic Extruder version = 4 -definition = tizyx_evy_dual [metadata] author = TiZYX +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 switch_extruder_retraction_amount = 100 -switch_extruder_retraction_speeds = 70 \ No newline at end of file +switch_extruder_retraction_speeds = 70 + diff --git a/resources/variants/tizyx_evy_dual_direct_drive.inst.cfg b/resources/variants/tizyx/tizyx_evy_dual_direct_drive.inst.cfg similarity index 85% rename from resources/variants/tizyx_evy_dual_direct_drive.inst.cfg rename to resources/variants/tizyx/tizyx_evy_dual_direct_drive.inst.cfg index 24f9f3dfd5..b9aa560cd9 100644 --- a/resources/variants/tizyx_evy_dual_direct_drive.inst.cfg +++ b/resources/variants/tizyx/tizyx_evy_dual_direct_drive.inst.cfg @@ -1,15 +1,16 @@ [general] +definition = tizyx_evy_dual name = Direct Drive version = 4 -definition = tizyx_evy_dual [metadata] author = TiZYX +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 switch_extruder_retraction_amount = 72 -switch_extruder_retraction_speeds = 70 \ No newline at end of file +switch_extruder_retraction_speeds = 70 + diff --git a/resources/variants/tizyx_k25_0.2.inst.cfg b/resources/variants/tizyx/tizyx_k25_0.2.inst.cfg similarity index 99% rename from resources/variants/tizyx_k25_0.2.inst.cfg rename to resources/variants/tizyx/tizyx_k25_0.2.inst.cfg index 35be5a2381..c1fc705ead 100644 --- a/resources/variants/tizyx_k25_0.2.inst.cfg +++ b/resources/variants/tizyx/tizyx_k25_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = tizyx_k25 name = 0.2 mm version = 4 -definition = tizyx_k25 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/tizyx_k25_0.3.inst.cfg b/resources/variants/tizyx/tizyx_k25_0.3.inst.cfg similarity index 99% rename from resources/variants/tizyx_k25_0.3.inst.cfg rename to resources/variants/tizyx/tizyx_k25_0.3.inst.cfg index 142fa2167f..86a08cfb58 100644 --- a/resources/variants/tizyx_k25_0.3.inst.cfg +++ b/resources/variants/tizyx/tizyx_k25_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = tizyx_k25 name = 0.3 mm version = 4 -definition = tizyx_k25 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/tizyx_k25_0.4.inst.cfg b/resources/variants/tizyx/tizyx_k25_0.4.inst.cfg similarity index 99% rename from resources/variants/tizyx_k25_0.4.inst.cfg rename to resources/variants/tizyx/tizyx_k25_0.4.inst.cfg index 04e9691b81..3b286d45ad 100644 --- a/resources/variants/tizyx_k25_0.4.inst.cfg +++ b/resources/variants/tizyx/tizyx_k25_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = tizyx_k25 name = 0.4 mm version = 4 -definition = tizyx_k25 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/tizyx_k25_0.5.inst.cfg b/resources/variants/tizyx/tizyx_k25_0.5.inst.cfg similarity index 100% rename from resources/variants/tizyx_k25_0.5.inst.cfg rename to resources/variants/tizyx/tizyx_k25_0.5.inst.cfg index 0745a76f45..5c3e89943e 100644 --- a/resources/variants/tizyx_k25_0.5.inst.cfg +++ b/resources/variants/tizyx/tizyx_k25_0.5.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = tizyx_k25 name = 0.5 mm version = 4 -definition = tizyx_k25 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 diff --git a/resources/variants/tizyx_k25_0.6.inst.cfg b/resources/variants/tizyx/tizyx_k25_0.6.inst.cfg similarity index 99% rename from resources/variants/tizyx_k25_0.6.inst.cfg rename to resources/variants/tizyx/tizyx_k25_0.6.inst.cfg index 348c27c694..1c44812812 100644 --- a/resources/variants/tizyx_k25_0.6.inst.cfg +++ b/resources/variants/tizyx/tizyx_k25_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = tizyx_k25 name = 0.6 mm version = 4 -definition = tizyx_k25 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/tizyx_k25_0.8.inst.cfg b/resources/variants/tizyx/tizyx_k25_0.8.inst.cfg similarity index 99% rename from resources/variants/tizyx_k25_0.8.inst.cfg rename to resources/variants/tizyx/tizyx_k25_0.8.inst.cfg index a245060e34..5b8e434470 100644 --- a/resources/variants/tizyx_k25_0.8.inst.cfg +++ b/resources/variants/tizyx/tizyx_k25_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = tizyx_k25 name = 0.8 mm version = 4 -definition = tizyx_k25 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/tizyx_k25_1.0.inst.cfg b/resources/variants/tizyx/tizyx_k25_1.0.inst.cfg similarity index 99% rename from resources/variants/tizyx_k25_1.0.inst.cfg rename to resources/variants/tizyx/tizyx_k25_1.0.inst.cfg index 9701fb8088..3099940656 100644 --- a/resources/variants/tizyx_k25_1.0.inst.cfg +++ b/resources/variants/tizyx/tizyx_k25_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = tizyx_k25 name = 1.0 mm version = 4 -definition = tizyx_k25 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/tronxy_d01_0.2.inst.cfg b/resources/variants/tronxy/tronxy_d01_0.2.inst.cfg similarity index 87% rename from resources/variants/tronxy_d01_0.2.inst.cfg rename to resources/variants/tronxy/tronxy_d01_0.2.inst.cfg index fee8a43487..4e38792ecb 100644 --- a/resources/variants/tronxy_d01_0.2.inst.cfg +++ b/resources/variants/tronxy/tronxy_d01_0.2.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_d01 name = 0.2mm Nozzle version = 4 -definition = tronxy_d01 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_d01_0.3.inst.cfg b/resources/variants/tronxy/tronxy_d01_0.3.inst.cfg similarity index 87% rename from resources/variants/tronxy_d01_0.3.inst.cfg rename to resources/variants/tronxy/tronxy_d01_0.3.inst.cfg index fd25013953..f73c67558d 100644 --- a/resources/variants/tronxy_d01_0.3.inst.cfg +++ b/resources/variants/tronxy/tronxy_d01_0.3.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_d01 name = 0.3mm Nozzle version = 4 -definition = tronxy_d01 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_d01_0.4.inst.cfg b/resources/variants/tronxy/tronxy_d01_0.4.inst.cfg similarity index 87% rename from resources/variants/tronxy_d01_0.4.inst.cfg rename to resources/variants/tronxy/tronxy_d01_0.4.inst.cfg index 7d173aa327..a694013002 100644 --- a/resources/variants/tronxy_d01_0.4.inst.cfg +++ b/resources/variants/tronxy/tronxy_d01_0.4.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_d01 name = 0.4mm Nozzle version = 4 -definition = tronxy_d01 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_d01_0.5.inst.cfg b/resources/variants/tronxy/tronxy_d01_0.5.inst.cfg similarity index 87% rename from resources/variants/tronxy_d01_0.5.inst.cfg rename to resources/variants/tronxy/tronxy_d01_0.5.inst.cfg index c20d840fdd..d1a64cfe6c 100644 --- a/resources/variants/tronxy_d01_0.5.inst.cfg +++ b/resources/variants/tronxy/tronxy_d01_0.5.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_d01 name = 0.5mm Nozzle version = 4 -definition = tronxy_d01 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_d01_0.6.inst.cfg b/resources/variants/tronxy/tronxy_d01_0.6.inst.cfg similarity index 87% rename from resources/variants/tronxy_d01_0.6.inst.cfg rename to resources/variants/tronxy/tronxy_d01_0.6.inst.cfg index ac114eeb57..4895089986 100644 --- a/resources/variants/tronxy_d01_0.6.inst.cfg +++ b/resources/variants/tronxy/tronxy_d01_0.6.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_d01 name = 0.6mm Nozzle version = 4 -definition = tronxy_d01 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_d01_0.8.inst.cfg b/resources/variants/tronxy/tronxy_d01_0.8.inst.cfg similarity index 87% rename from resources/variants/tronxy_d01_0.8.inst.cfg rename to resources/variants/tronxy/tronxy_d01_0.8.inst.cfg index a94da31c6f..26001c7d01 100644 --- a/resources/variants/tronxy_d01_0.8.inst.cfg +++ b/resources/variants/tronxy/tronxy_d01_0.8.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_d01 name = 0.8mm Nozzle version = 4 -definition = tronxy_d01 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_x5sa_0.2.inst.cfg b/resources/variants/tronxy/tronxy_x5sa_0.2.inst.cfg similarity index 87% rename from resources/variants/tronxy_x5sa_0.2.inst.cfg rename to resources/variants/tronxy/tronxy_x5sa_0.2.inst.cfg index 5e230f29df..16117c811d 100644 --- a/resources/variants/tronxy_x5sa_0.2.inst.cfg +++ b/resources/variants/tronxy/tronxy_x5sa_0.2.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_x5sa name = 0.2mm Nozzle version = 4 -definition = tronxy_x5sa [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_x5sa_0.3.inst.cfg b/resources/variants/tronxy/tronxy_x5sa_0.3.inst.cfg similarity index 87% rename from resources/variants/tronxy_x5sa_0.3.inst.cfg rename to resources/variants/tronxy/tronxy_x5sa_0.3.inst.cfg index 0c51e07fef..cc02d466dc 100644 --- a/resources/variants/tronxy_x5sa_0.3.inst.cfg +++ b/resources/variants/tronxy/tronxy_x5sa_0.3.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_x5sa name = 0.3mm Nozzle version = 4 -definition = tronxy_x5sa [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_x5sa_0.4.inst.cfg b/resources/variants/tronxy/tronxy_x5sa_0.4.inst.cfg similarity index 87% rename from resources/variants/tronxy_x5sa_0.4.inst.cfg rename to resources/variants/tronxy/tronxy_x5sa_0.4.inst.cfg index f8995e4844..23703e310f 100644 --- a/resources/variants/tronxy_x5sa_0.4.inst.cfg +++ b/resources/variants/tronxy/tronxy_x5sa_0.4.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_x5sa name = 0.4mm Nozzle version = 4 -definition = tronxy_x5sa [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_x5sa_0.5.inst.cfg b/resources/variants/tronxy/tronxy_x5sa_0.5.inst.cfg similarity index 87% rename from resources/variants/tronxy_x5sa_0.5.inst.cfg rename to resources/variants/tronxy/tronxy_x5sa_0.5.inst.cfg index cdc7c8f6e7..1fd31b31cb 100644 --- a/resources/variants/tronxy_x5sa_0.5.inst.cfg +++ b/resources/variants/tronxy/tronxy_x5sa_0.5.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_x5sa name = 0.5mm Nozzle version = 4 -definition = tronxy_x5sa [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_x5sa_0.6.inst.cfg b/resources/variants/tronxy/tronxy_x5sa_0.6.inst.cfg similarity index 87% rename from resources/variants/tronxy_x5sa_0.6.inst.cfg rename to resources/variants/tronxy/tronxy_x5sa_0.6.inst.cfg index 86d14ad460..ea4230a4ca 100644 --- a/resources/variants/tronxy_x5sa_0.6.inst.cfg +++ b/resources/variants/tronxy/tronxy_x5sa_0.6.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_x5sa name = 0.6mm Nozzle version = 4 -definition = tronxy_x5sa [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_x5sa_0.8.inst.cfg b/resources/variants/tronxy/tronxy_x5sa_0.8.inst.cfg similarity index 87% rename from resources/variants/tronxy_x5sa_0.8.inst.cfg rename to resources/variants/tronxy/tronxy_x5sa_0.8.inst.cfg index 5f1e69c69d..dda7aa986e 100644 --- a/resources/variants/tronxy_x5sa_0.8.inst.cfg +++ b/resources/variants/tronxy/tronxy_x5sa_0.8.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_x5sa name = 0.8mm Nozzle version = 4 -definition = tronxy_x5sa [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_x5sa_400_0.2.inst.cfg b/resources/variants/tronxy/tronxy_x5sa_400_0.2.inst.cfg similarity index 87% rename from resources/variants/tronxy_x5sa_400_0.2.inst.cfg rename to resources/variants/tronxy/tronxy_x5sa_400_0.2.inst.cfg index d2e987ae34..26f11a30bd 100644 --- a/resources/variants/tronxy_x5sa_400_0.2.inst.cfg +++ b/resources/variants/tronxy/tronxy_x5sa_400_0.2.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_x5sa_400 name = 0.2mm Nozzle version = 4 -definition = tronxy_x5sa_400 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_x5sa_400_0.3.inst.cfg b/resources/variants/tronxy/tronxy_x5sa_400_0.3.inst.cfg similarity index 87% rename from resources/variants/tronxy_x5sa_400_0.3.inst.cfg rename to resources/variants/tronxy/tronxy_x5sa_400_0.3.inst.cfg index 463b07ed5f..0715e9444e 100644 --- a/resources/variants/tronxy_x5sa_400_0.3.inst.cfg +++ b/resources/variants/tronxy/tronxy_x5sa_400_0.3.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_x5sa_400 name = 0.3mm Nozzle version = 4 -definition = tronxy_x5sa_400 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_x5sa_400_0.4.inst.cfg b/resources/variants/tronxy/tronxy_x5sa_400_0.4.inst.cfg similarity index 87% rename from resources/variants/tronxy_x5sa_400_0.4.inst.cfg rename to resources/variants/tronxy/tronxy_x5sa_400_0.4.inst.cfg index 43d4f49c98..5e12e6e698 100644 --- a/resources/variants/tronxy_x5sa_400_0.4.inst.cfg +++ b/resources/variants/tronxy/tronxy_x5sa_400_0.4.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_x5sa_400 name = 0.4mm Nozzle version = 4 -definition = tronxy_x5sa_400 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_x5sa_400_0.5.inst.cfg b/resources/variants/tronxy/tronxy_x5sa_400_0.5.inst.cfg similarity index 87% rename from resources/variants/tronxy_x5sa_400_0.5.inst.cfg rename to resources/variants/tronxy/tronxy_x5sa_400_0.5.inst.cfg index 78f9a40462..37df8d6be5 100644 --- a/resources/variants/tronxy_x5sa_400_0.5.inst.cfg +++ b/resources/variants/tronxy/tronxy_x5sa_400_0.5.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_x5sa_400 name = 0.5mm Nozzle version = 4 -definition = tronxy_x5sa_400 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_x5sa_400_0.6.inst.cfg b/resources/variants/tronxy/tronxy_x5sa_400_0.6.inst.cfg similarity index 87% rename from resources/variants/tronxy_x5sa_400_0.6.inst.cfg rename to resources/variants/tronxy/tronxy_x5sa_400_0.6.inst.cfg index 74cc85c53d..4220de23b4 100644 --- a/resources/variants/tronxy_x5sa_400_0.6.inst.cfg +++ b/resources/variants/tronxy/tronxy_x5sa_400_0.6.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_x5sa_400 name = 0.6mm Nozzle version = 4 -definition = tronxy_x5sa_400 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_x5sa_400_0.8.inst.cfg b/resources/variants/tronxy/tronxy_x5sa_400_0.8.inst.cfg similarity index 87% rename from resources/variants/tronxy_x5sa_400_0.8.inst.cfg rename to resources/variants/tronxy/tronxy_x5sa_400_0.8.inst.cfg index 3a181e9736..b32883a024 100644 --- a/resources/variants/tronxy_x5sa_400_0.8.inst.cfg +++ b/resources/variants/tronxy/tronxy_x5sa_400_0.8.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_x5sa_400 name = 0.8mm Nozzle version = 4 -definition = tronxy_x5sa_400 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_x5sa_500_0.2.inst.cfg b/resources/variants/tronxy/tronxy_x5sa_500_0.2.inst.cfg similarity index 87% rename from resources/variants/tronxy_x5sa_500_0.2.inst.cfg rename to resources/variants/tronxy/tronxy_x5sa_500_0.2.inst.cfg index 8426c56187..20fd73c6f5 100644 --- a/resources/variants/tronxy_x5sa_500_0.2.inst.cfg +++ b/resources/variants/tronxy/tronxy_x5sa_500_0.2.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_x5sa_500 name = 0.2mm Nozzle version = 4 -definition = tronxy_x5sa_500 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_x5sa_500_0.3.inst.cfg b/resources/variants/tronxy/tronxy_x5sa_500_0.3.inst.cfg similarity index 87% rename from resources/variants/tronxy_x5sa_500_0.3.inst.cfg rename to resources/variants/tronxy/tronxy_x5sa_500_0.3.inst.cfg index f7ad7992b6..79cf49fa69 100644 --- a/resources/variants/tronxy_x5sa_500_0.3.inst.cfg +++ b/resources/variants/tronxy/tronxy_x5sa_500_0.3.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_x5sa_500 name = 0.3mm Nozzle version = 4 -definition = tronxy_x5sa_500 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_x5sa_500_0.4.inst.cfg b/resources/variants/tronxy/tronxy_x5sa_500_0.4.inst.cfg similarity index 87% rename from resources/variants/tronxy_x5sa_500_0.4.inst.cfg rename to resources/variants/tronxy/tronxy_x5sa_500_0.4.inst.cfg index c8ae427bfe..e7cb77afcb 100644 --- a/resources/variants/tronxy_x5sa_500_0.4.inst.cfg +++ b/resources/variants/tronxy/tronxy_x5sa_500_0.4.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_x5sa_500 name = 0.4mm Nozzle version = 4 -definition = tronxy_x5sa_500 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_x5sa_500_0.5.inst.cfg b/resources/variants/tronxy/tronxy_x5sa_500_0.5.inst.cfg similarity index 87% rename from resources/variants/tronxy_x5sa_500_0.5.inst.cfg rename to resources/variants/tronxy/tronxy_x5sa_500_0.5.inst.cfg index 69314b36e5..a41f7dfabd 100644 --- a/resources/variants/tronxy_x5sa_500_0.5.inst.cfg +++ b/resources/variants/tronxy/tronxy_x5sa_500_0.5.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_x5sa_500 name = 0.5mm Nozzle version = 4 -definition = tronxy_x5sa_500 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_x5sa_500_0.6.inst.cfg b/resources/variants/tronxy/tronxy_x5sa_500_0.6.inst.cfg similarity index 87% rename from resources/variants/tronxy_x5sa_500_0.6.inst.cfg rename to resources/variants/tronxy/tronxy_x5sa_500_0.6.inst.cfg index fad8126356..faf8166668 100644 --- a/resources/variants/tronxy_x5sa_500_0.6.inst.cfg +++ b/resources/variants/tronxy/tronxy_x5sa_500_0.6.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_x5sa_500 name = 0.6mm Nozzle version = 4 -definition = tronxy_x5sa_500 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_x5sa_500_0.8.inst.cfg b/resources/variants/tronxy/tronxy_x5sa_500_0.8.inst.cfg similarity index 87% rename from resources/variants/tronxy_x5sa_500_0.8.inst.cfg rename to resources/variants/tronxy/tronxy_x5sa_500_0.8.inst.cfg index 83fa24c6b9..450c16d3ca 100644 --- a/resources/variants/tronxy_x5sa_500_0.8.inst.cfg +++ b/resources/variants/tronxy/tronxy_x5sa_500_0.8.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_x5sa_500 name = 0.8mm Nozzle version = 4 -definition = tronxy_x5sa_500 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_x_0.2.inst.cfg b/resources/variants/tronxy/tronxy_x_0.2.inst.cfg similarity index 87% rename from resources/variants/tronxy_x_0.2.inst.cfg rename to resources/variants/tronxy/tronxy_x_0.2.inst.cfg index db117834ee..0a1d1f77a0 100644 --- a/resources/variants/tronxy_x_0.2.inst.cfg +++ b/resources/variants/tronxy/tronxy_x_0.2.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_x name = 0.2mm Nozzle version = 4 -definition = tronxy_x [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_x_0.3.inst.cfg b/resources/variants/tronxy/tronxy_x_0.3.inst.cfg similarity index 87% rename from resources/variants/tronxy_x_0.3.inst.cfg rename to resources/variants/tronxy/tronxy_x_0.3.inst.cfg index f9532f863b..1efa849e47 100644 --- a/resources/variants/tronxy_x_0.3.inst.cfg +++ b/resources/variants/tronxy/tronxy_x_0.3.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_x name = 0.3mm Nozzle version = 4 -definition = tronxy_x [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_x_0.4.inst.cfg b/resources/variants/tronxy/tronxy_x_0.4.inst.cfg similarity index 87% rename from resources/variants/tronxy_x_0.4.inst.cfg rename to resources/variants/tronxy/tronxy_x_0.4.inst.cfg index a15e34b475..6cf03dd8d4 100644 --- a/resources/variants/tronxy_x_0.4.inst.cfg +++ b/resources/variants/tronxy/tronxy_x_0.4.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_x name = 0.4mm Nozzle version = 4 -definition = tronxy_x [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_x_0.5.inst.cfg b/resources/variants/tronxy/tronxy_x_0.5.inst.cfg similarity index 87% rename from resources/variants/tronxy_x_0.5.inst.cfg rename to resources/variants/tronxy/tronxy_x_0.5.inst.cfg index 6f34a8545b..232bc8961a 100644 --- a/resources/variants/tronxy_x_0.5.inst.cfg +++ b/resources/variants/tronxy/tronxy_x_0.5.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_x name = 0.5mm Nozzle version = 4 -definition = tronxy_x [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_x_0.6.inst.cfg b/resources/variants/tronxy/tronxy_x_0.6.inst.cfg similarity index 87% rename from resources/variants/tronxy_x_0.6.inst.cfg rename to resources/variants/tronxy/tronxy_x_0.6.inst.cfg index 9380bc657b..1d2b904033 100644 --- a/resources/variants/tronxy_x_0.6.inst.cfg +++ b/resources/variants/tronxy/tronxy_x_0.6.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_x name = 0.6mm Nozzle version = 4 -definition = tronxy_x [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_x_0.8.inst.cfg b/resources/variants/tronxy/tronxy_x_0.8.inst.cfg similarity index 87% rename from resources/variants/tronxy_x_0.8.inst.cfg rename to resources/variants/tronxy/tronxy_x_0.8.inst.cfg index cb6b71ee54..bf4d3b83e6 100644 --- a/resources/variants/tronxy_x_0.8.inst.cfg +++ b/resources/variants/tronxy/tronxy_x_0.8.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_x name = 0.8mm Nozzle version = 4 -definition = tronxy_x [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_xy2_0.2.inst.cfg b/resources/variants/tronxy/tronxy_xy2_0.2.inst.cfg similarity index 87% rename from resources/variants/tronxy_xy2_0.2.inst.cfg rename to resources/variants/tronxy/tronxy_xy2_0.2.inst.cfg index d550e039a6..be5f9999b5 100644 --- a/resources/variants/tronxy_xy2_0.2.inst.cfg +++ b/resources/variants/tronxy/tronxy_xy2_0.2.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_xy2 name = 0.2mm Nozzle version = 4 -definition = tronxy_xy2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_xy2_0.3.inst.cfg b/resources/variants/tronxy/tronxy_xy2_0.3.inst.cfg similarity index 87% rename from resources/variants/tronxy_xy2_0.3.inst.cfg rename to resources/variants/tronxy/tronxy_xy2_0.3.inst.cfg index c668c44b94..2d3f637243 100644 --- a/resources/variants/tronxy_xy2_0.3.inst.cfg +++ b/resources/variants/tronxy/tronxy_xy2_0.3.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_xy2 name = 0.3mm Nozzle version = 4 -definition = tronxy_xy2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_xy2_0.4.inst.cfg b/resources/variants/tronxy/tronxy_xy2_0.4.inst.cfg similarity index 87% rename from resources/variants/tronxy_xy2_0.4.inst.cfg rename to resources/variants/tronxy/tronxy_xy2_0.4.inst.cfg index b30bc50ba5..65ac72aa2c 100644 --- a/resources/variants/tronxy_xy2_0.4.inst.cfg +++ b/resources/variants/tronxy/tronxy_xy2_0.4.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_xy2 name = 0.4mm Nozzle version = 4 -definition = tronxy_xy2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_xy2_0.5.inst.cfg b/resources/variants/tronxy/tronxy_xy2_0.5.inst.cfg similarity index 87% rename from resources/variants/tronxy_xy2_0.5.inst.cfg rename to resources/variants/tronxy/tronxy_xy2_0.5.inst.cfg index 99c4de482b..403b47b613 100644 --- a/resources/variants/tronxy_xy2_0.5.inst.cfg +++ b/resources/variants/tronxy/tronxy_xy2_0.5.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_xy2 name = 0.5mm Nozzle version = 4 -definition = tronxy_xy2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_xy2_0.6.inst.cfg b/resources/variants/tronxy/tronxy_xy2_0.6.inst.cfg similarity index 87% rename from resources/variants/tronxy_xy2_0.6.inst.cfg rename to resources/variants/tronxy/tronxy_xy2_0.6.inst.cfg index 347cb552ef..9be985f9b6 100644 --- a/resources/variants/tronxy_xy2_0.6.inst.cfg +++ b/resources/variants/tronxy/tronxy_xy2_0.6.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_xy2 name = 0.6mm Nozzle version = 4 -definition = tronxy_xy2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_xy2_0.8.inst.cfg b/resources/variants/tronxy/tronxy_xy2_0.8.inst.cfg similarity index 87% rename from resources/variants/tronxy_xy2_0.8.inst.cfg rename to resources/variants/tronxy/tronxy_xy2_0.8.inst.cfg index fecd30c7b4..67470ae393 100644 --- a/resources/variants/tronxy_xy2_0.8.inst.cfg +++ b/resources/variants/tronxy/tronxy_xy2_0.8.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_xy2 name = 0.8mm Nozzle version = 4 -definition = tronxy_xy2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_xy2pro_0.2.inst.cfg b/resources/variants/tronxy/tronxy_xy2pro_0.2.inst.cfg similarity index 87% rename from resources/variants/tronxy_xy2pro_0.2.inst.cfg rename to resources/variants/tronxy/tronxy_xy2pro_0.2.inst.cfg index 132aaa2563..01f3ac5522 100644 --- a/resources/variants/tronxy_xy2pro_0.2.inst.cfg +++ b/resources/variants/tronxy/tronxy_xy2pro_0.2.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_xy2pro name = 0.2mm Nozzle version = 4 -definition = tronxy_xy2pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_xy2pro_0.3.inst.cfg b/resources/variants/tronxy/tronxy_xy2pro_0.3.inst.cfg similarity index 87% rename from resources/variants/tronxy_xy2pro_0.3.inst.cfg rename to resources/variants/tronxy/tronxy_xy2pro_0.3.inst.cfg index 866844793f..6a9ea087eb 100644 --- a/resources/variants/tronxy_xy2pro_0.3.inst.cfg +++ b/resources/variants/tronxy/tronxy_xy2pro_0.3.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_xy2pro name = 0.3mm Nozzle version = 4 -definition = tronxy_xy2pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_xy2pro_0.4.inst.cfg b/resources/variants/tronxy/tronxy_xy2pro_0.4.inst.cfg similarity index 99% rename from resources/variants/tronxy_xy2pro_0.4.inst.cfg rename to resources/variants/tronxy/tronxy_xy2pro_0.4.inst.cfg index 5e1b808148..d058b1bb4e 100644 --- a/resources/variants/tronxy_xy2pro_0.4.inst.cfg +++ b/resources/variants/tronxy/tronxy_xy2pro_0.4.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_xy2pro name = 0.4mm Nozzle version = 4 -definition = tronxy_xy2pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 -zig_zaggify_infill = True retraction_combing = noskin +zig_zaggify_infill = True + diff --git a/resources/variants/tronxy_xy2pro_0.5.inst.cfg b/resources/variants/tronxy/tronxy_xy2pro_0.5.inst.cfg similarity index 87% rename from resources/variants/tronxy_xy2pro_0.5.inst.cfg rename to resources/variants/tronxy/tronxy_xy2pro_0.5.inst.cfg index 7c99ccb0a0..efce761fa2 100644 --- a/resources/variants/tronxy_xy2pro_0.5.inst.cfg +++ b/resources/variants/tronxy/tronxy_xy2pro_0.5.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_xy2pro name = 0.5mm Nozzle version = 4 -definition = tronxy_xy2pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_xy2pro_0.6.inst.cfg b/resources/variants/tronxy/tronxy_xy2pro_0.6.inst.cfg similarity index 87% rename from resources/variants/tronxy_xy2pro_0.6.inst.cfg rename to resources/variants/tronxy/tronxy_xy2pro_0.6.inst.cfg index 0b092d1f3c..40d0886da3 100644 --- a/resources/variants/tronxy_xy2pro_0.6.inst.cfg +++ b/resources/variants/tronxy/tronxy_xy2pro_0.6.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_xy2pro name = 0.6mm Nozzle version = 4 -definition = tronxy_xy2pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_xy2pro_0.8.inst.cfg b/resources/variants/tronxy/tronxy_xy2pro_0.8.inst.cfg similarity index 87% rename from resources/variants/tronxy_xy2pro_0.8.inst.cfg rename to resources/variants/tronxy/tronxy_xy2pro_0.8.inst.cfg index 545a200b78..23cc815cab 100644 --- a/resources/variants/tronxy_xy2pro_0.8.inst.cfg +++ b/resources/variants/tronxy/tronxy_xy2pro_0.8.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_xy2pro name = 0.8mm Nozzle version = 4 -definition = tronxy_xy2pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_xy3_0.2.inst.cfg b/resources/variants/tronxy/tronxy_xy3_0.2.inst.cfg similarity index 87% rename from resources/variants/tronxy_xy3_0.2.inst.cfg rename to resources/variants/tronxy/tronxy_xy3_0.2.inst.cfg index fdaea0cb8b..574e32ea23 100644 --- a/resources/variants/tronxy_xy3_0.2.inst.cfg +++ b/resources/variants/tronxy/tronxy_xy3_0.2.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_xy3 name = 0.2mm Nozzle version = 4 -definition = tronxy_xy3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_xy3_0.3.inst.cfg b/resources/variants/tronxy/tronxy_xy3_0.3.inst.cfg similarity index 87% rename from resources/variants/tronxy_xy3_0.3.inst.cfg rename to resources/variants/tronxy/tronxy_xy3_0.3.inst.cfg index 8f62502c51..2e8f949149 100644 --- a/resources/variants/tronxy_xy3_0.3.inst.cfg +++ b/resources/variants/tronxy/tronxy_xy3_0.3.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_xy3 name = 0.3mm Nozzle version = 4 -definition = tronxy_xy3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_xy3_0.4.inst.cfg b/resources/variants/tronxy/tronxy_xy3_0.4.inst.cfg similarity index 87% rename from resources/variants/tronxy_xy3_0.4.inst.cfg rename to resources/variants/tronxy/tronxy_xy3_0.4.inst.cfg index efbbf96fb0..d9d5bd009d 100644 --- a/resources/variants/tronxy_xy3_0.4.inst.cfg +++ b/resources/variants/tronxy/tronxy_xy3_0.4.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_xy3 name = 0.4mm Nozzle version = 4 -definition = tronxy_xy3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_xy3_0.5.inst.cfg b/resources/variants/tronxy/tronxy_xy3_0.5.inst.cfg similarity index 87% rename from resources/variants/tronxy_xy3_0.5.inst.cfg rename to resources/variants/tronxy/tronxy_xy3_0.5.inst.cfg index 12cd038287..b40f9e37b8 100644 --- a/resources/variants/tronxy_xy3_0.5.inst.cfg +++ b/resources/variants/tronxy/tronxy_xy3_0.5.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_xy3 name = 0.5mm Nozzle version = 4 -definition = tronxy_xy3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_xy3_0.6.inst.cfg b/resources/variants/tronxy/tronxy_xy3_0.6.inst.cfg similarity index 87% rename from resources/variants/tronxy_xy3_0.6.inst.cfg rename to resources/variants/tronxy/tronxy_xy3_0.6.inst.cfg index 68a744beb6..78c61d60dc 100644 --- a/resources/variants/tronxy_xy3_0.6.inst.cfg +++ b/resources/variants/tronxy/tronxy_xy3_0.6.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_xy3 name = 0.6mm Nozzle version = 4 -definition = tronxy_xy3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_xy3_0.8.inst.cfg b/resources/variants/tronxy/tronxy_xy3_0.8.inst.cfg similarity index 87% rename from resources/variants/tronxy_xy3_0.8.inst.cfg rename to resources/variants/tronxy/tronxy_xy3_0.8.inst.cfg index a78bb13a79..d9fdf436ab 100644 --- a/resources/variants/tronxy_xy3_0.8.inst.cfg +++ b/resources/variants/tronxy/tronxy_xy3_0.8.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_xy3 name = 0.8mm Nozzle version = 4 -definition = tronxy_xy3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_xy3proV2_0.2.inst.cfg b/resources/variants/tronxy/tronxy_xy3proV2_0.2.inst.cfg similarity index 87% rename from resources/variants/tronxy_xy3proV2_0.2.inst.cfg rename to resources/variants/tronxy/tronxy_xy3proV2_0.2.inst.cfg index 73ae380b84..738ced4a2f 100644 --- a/resources/variants/tronxy_xy3proV2_0.2.inst.cfg +++ b/resources/variants/tronxy/tronxy_xy3proV2_0.2.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_xy3proV2 name = 0.2mm Nozzle version = 4 -definition = tronxy_xy3proV2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_xy3proV2_0.3.inst.cfg b/resources/variants/tronxy/tronxy_xy3proV2_0.3.inst.cfg similarity index 87% rename from resources/variants/tronxy_xy3proV2_0.3.inst.cfg rename to resources/variants/tronxy/tronxy_xy3proV2_0.3.inst.cfg index 26e062e33d..a0b9f60ef5 100644 --- a/resources/variants/tronxy_xy3proV2_0.3.inst.cfg +++ b/resources/variants/tronxy/tronxy_xy3proV2_0.3.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_xy3proV2 name = 0.3mm Nozzle version = 4 -definition = tronxy_xy3proV2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_xy3proV2_0.4.inst.cfg b/resources/variants/tronxy/tronxy_xy3proV2_0.4.inst.cfg similarity index 87% rename from resources/variants/tronxy_xy3proV2_0.4.inst.cfg rename to resources/variants/tronxy/tronxy_xy3proV2_0.4.inst.cfg index 97706ddb48..2fcdce50b3 100644 --- a/resources/variants/tronxy_xy3proV2_0.4.inst.cfg +++ b/resources/variants/tronxy/tronxy_xy3proV2_0.4.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_xy3proV2 name = 0.4mm Nozzle version = 4 -definition = tronxy_xy3proV2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_xy3proV2_0.5.inst.cfg b/resources/variants/tronxy/tronxy_xy3proV2_0.5.inst.cfg similarity index 87% rename from resources/variants/tronxy_xy3proV2_0.5.inst.cfg rename to resources/variants/tronxy/tronxy_xy3proV2_0.5.inst.cfg index 6aa7f21c84..7163c1cafa 100644 --- a/resources/variants/tronxy_xy3proV2_0.5.inst.cfg +++ b/resources/variants/tronxy/tronxy_xy3proV2_0.5.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_xy3proV2 name = 0.5mm Nozzle version = 4 -definition = tronxy_xy3proV2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_xy3proV2_0.6.inst.cfg b/resources/variants/tronxy/tronxy_xy3proV2_0.6.inst.cfg similarity index 87% rename from resources/variants/tronxy_xy3proV2_0.6.inst.cfg rename to resources/variants/tronxy/tronxy_xy3proV2_0.6.inst.cfg index 593752d47e..84f41fc728 100644 --- a/resources/variants/tronxy_xy3proV2_0.6.inst.cfg +++ b/resources/variants/tronxy/tronxy_xy3proV2_0.6.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_xy3proV2 name = 0.6mm Nozzle version = 4 -definition = tronxy_xy3proV2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/tronxy_xy3proV2_0.8.inst.cfg b/resources/variants/tronxy/tronxy_xy3proV2_0.8.inst.cfg similarity index 87% rename from resources/variants/tronxy_xy3proV2_0.8.inst.cfg rename to resources/variants/tronxy/tronxy_xy3proV2_0.8.inst.cfg index c4985f67b2..29076e86fb 100644 --- a/resources/variants/tronxy_xy3proV2_0.8.inst.cfg +++ b/resources/variants/tronxy/tronxy_xy3proV2_0.8.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = tronxy_xy3proV2 name = 0.8mm Nozzle version = 4 -definition = tronxy_xy3proV2 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 +retraction_combing = noskin zig_zaggify_infill = True -retraction_combing = noskin \ No newline at end of file + diff --git a/resources/variants/two_trees_base_0.2.inst.cfg b/resources/variants/two_trees/two_trees_base_0.2.inst.cfg similarity index 99% rename from resources/variants/two_trees_base_0.2.inst.cfg rename to resources/variants/two_trees/two_trees_base_0.2.inst.cfg index 5148f824a3..468faca0ae 100644 --- a/resources/variants/two_trees_base_0.2.inst.cfg +++ b/resources/variants/two_trees/two_trees_base_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = two_trees_base name = 0.2mm Nozzle version = 4 -definition = two_trees_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/two_trees_base_0.3.inst.cfg b/resources/variants/two_trees/two_trees_base_0.3.inst.cfg similarity index 99% rename from resources/variants/two_trees_base_0.3.inst.cfg rename to resources/variants/two_trees/two_trees_base_0.3.inst.cfg index b6052e4e24..e3d28974b6 100644 --- a/resources/variants/two_trees_base_0.3.inst.cfg +++ b/resources/variants/two_trees/two_trees_base_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = two_trees_base name = 0.3mm Nozzle version = 4 -definition = two_trees_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/two_trees_base_0.4.inst.cfg b/resources/variants/two_trees/two_trees_base_0.4.inst.cfg similarity index 99% rename from resources/variants/two_trees_base_0.4.inst.cfg rename to resources/variants/two_trees/two_trees_base_0.4.inst.cfg index fbeefc7d30..3d8821dad1 100644 --- a/resources/variants/two_trees_base_0.4.inst.cfg +++ b/resources/variants/two_trees/two_trees_base_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = two_trees_base name = 0.4mm Nozzle version = 4 -definition = two_trees_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/two_trees_base_0.5.inst.cfg b/resources/variants/two_trees/two_trees_base_0.5.inst.cfg similarity index 99% rename from resources/variants/two_trees_base_0.5.inst.cfg rename to resources/variants/two_trees/two_trees_base_0.5.inst.cfg index 5aa7cfa833..ac7bb0b2d9 100644 --- a/resources/variants/two_trees_base_0.5.inst.cfg +++ b/resources/variants/two_trees/two_trees_base_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = two_trees_base name = 0.5mm Nozzle version = 4 -definition = two_trees_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/two_trees_base_0.6.inst.cfg b/resources/variants/two_trees/two_trees_base_0.6.inst.cfg similarity index 99% rename from resources/variants/two_trees_base_0.6.inst.cfg rename to resources/variants/two_trees/two_trees_base_0.6.inst.cfg index 32fee11939..34026ded60 100644 --- a/resources/variants/two_trees_base_0.6.inst.cfg +++ b/resources/variants/two_trees/two_trees_base_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = two_trees_base name = 0.6mm Nozzle version = 4 -definition = two_trees_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/two_trees_base_0.8.inst.cfg b/resources/variants/two_trees/two_trees_base_0.8.inst.cfg similarity index 99% rename from resources/variants/two_trees_base_0.8.inst.cfg rename to resources/variants/two_trees/two_trees_base_0.8.inst.cfg index c1b5ceac5f..7ba79a5e66 100644 --- a/resources/variants/two_trees_base_0.8.inst.cfg +++ b/resources/variants/two_trees/two_trees_base_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = two_trees_base name = 0.8mm Nozzle version = 4 -definition = two_trees_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/two_trees_base_1.0.inst.cfg b/resources/variants/two_trees/two_trees_base_1.0.inst.cfg similarity index 99% rename from resources/variants/two_trees_base_1.0.inst.cfg rename to resources/variants/two_trees/two_trees_base_1.0.inst.cfg index 72b7d37d5c..d3195a111f 100644 --- a/resources/variants/two_trees_base_1.0.inst.cfg +++ b/resources/variants/two_trees/two_trees_base_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = two_trees_base name = 1.0mm Nozzle version = 4 -definition = two_trees_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/two_trees_bluer_0.2.inst.cfg b/resources/variants/two_trees/two_trees_bluer_0.2.inst.cfg similarity index 99% rename from resources/variants/two_trees_bluer_0.2.inst.cfg rename to resources/variants/two_trees/two_trees_bluer_0.2.inst.cfg index 53db8f015c..0bed9bd64c 100644 --- a/resources/variants/two_trees_bluer_0.2.inst.cfg +++ b/resources/variants/two_trees/two_trees_bluer_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = two_trees_bluer name = 0.2mm Nozzle version = 4 -definition = two_trees_bluer [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/two_trees_bluer_0.3.inst.cfg b/resources/variants/two_trees/two_trees_bluer_0.3.inst.cfg similarity index 99% rename from resources/variants/two_trees_bluer_0.3.inst.cfg rename to resources/variants/two_trees/two_trees_bluer_0.3.inst.cfg index 2dca30b545..d47b1e3536 100644 --- a/resources/variants/two_trees_bluer_0.3.inst.cfg +++ b/resources/variants/two_trees/two_trees_bluer_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = two_trees_bluer name = 0.3mm Nozzle version = 4 -definition = two_trees_bluer [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/two_trees_bluer_0.4.inst.cfg b/resources/variants/two_trees/two_trees_bluer_0.4.inst.cfg similarity index 99% rename from resources/variants/two_trees_bluer_0.4.inst.cfg rename to resources/variants/two_trees/two_trees_bluer_0.4.inst.cfg index a39681804f..68e9f3241f 100644 --- a/resources/variants/two_trees_bluer_0.4.inst.cfg +++ b/resources/variants/two_trees/two_trees_bluer_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = two_trees_bluer name = 0.4mm Nozzle version = 4 -definition = two_trees_bluer [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/two_trees_bluer_0.5.inst.cfg b/resources/variants/two_trees/two_trees_bluer_0.5.inst.cfg similarity index 99% rename from resources/variants/two_trees_bluer_0.5.inst.cfg rename to resources/variants/two_trees/two_trees_bluer_0.5.inst.cfg index 41f57358cf..3577fb0725 100644 --- a/resources/variants/two_trees_bluer_0.5.inst.cfg +++ b/resources/variants/two_trees/two_trees_bluer_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = two_trees_bluer name = 0.5mm Nozzle version = 4 -definition = two_trees_bluer [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/two_trees_bluer_0.6.inst.cfg b/resources/variants/two_trees/two_trees_bluer_0.6.inst.cfg similarity index 99% rename from resources/variants/two_trees_bluer_0.6.inst.cfg rename to resources/variants/two_trees/two_trees_bluer_0.6.inst.cfg index 456c5334ac..cef918f8b3 100644 --- a/resources/variants/two_trees_bluer_0.6.inst.cfg +++ b/resources/variants/two_trees/two_trees_bluer_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = two_trees_bluer name = 0.6mm Nozzle version = 4 -definition = two_trees_bluer [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/two_trees_bluer_0.8.inst.cfg b/resources/variants/two_trees/two_trees_bluer_0.8.inst.cfg similarity index 99% rename from resources/variants/two_trees_bluer_0.8.inst.cfg rename to resources/variants/two_trees/two_trees_bluer_0.8.inst.cfg index b71d3889ac..2a99560e8d 100644 --- a/resources/variants/two_trees_bluer_0.8.inst.cfg +++ b/resources/variants/two_trees/two_trees_bluer_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = two_trees_bluer name = 0.8mm Nozzle version = 4 -definition = two_trees_bluer [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/two_trees_bluer_1.0.inst.cfg b/resources/variants/two_trees/two_trees_bluer_1.0.inst.cfg similarity index 99% rename from resources/variants/two_trees_bluer_1.0.inst.cfg rename to resources/variants/two_trees/two_trees_bluer_1.0.inst.cfg index c8b34940f1..b782bd90fe 100644 --- a/resources/variants/two_trees_bluer_1.0.inst.cfg +++ b/resources/variants/two_trees/two_trees_bluer_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = two_trees_bluer name = 1.0mm Nozzle version = 4 -definition = two_trees_bluer [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/two_trees_bluerplus_0.2.inst.cfg b/resources/variants/two_trees/two_trees_bluerplus_0.2.inst.cfg similarity index 99% rename from resources/variants/two_trees_bluerplus_0.2.inst.cfg rename to resources/variants/two_trees/two_trees_bluerplus_0.2.inst.cfg index 2b501cf420..58f7aae428 100644 --- a/resources/variants/two_trees_bluerplus_0.2.inst.cfg +++ b/resources/variants/two_trees/two_trees_bluerplus_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = two_trees_bluerplus name = 0.2mm Nozzle version = 4 -definition = two_trees_bluerplus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/two_trees_bluerplus_0.3.inst.cfg b/resources/variants/two_trees/two_trees_bluerplus_0.3.inst.cfg similarity index 99% rename from resources/variants/two_trees_bluerplus_0.3.inst.cfg rename to resources/variants/two_trees/two_trees_bluerplus_0.3.inst.cfg index 22433ee694..7a12221ec9 100644 --- a/resources/variants/two_trees_bluerplus_0.3.inst.cfg +++ b/resources/variants/two_trees/two_trees_bluerplus_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = two_trees_bluerplus name = 0.3mm Nozzle version = 4 -definition = two_trees_bluerplus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/two_trees_bluerplus_0.4.inst.cfg b/resources/variants/two_trees/two_trees_bluerplus_0.4.inst.cfg similarity index 99% rename from resources/variants/two_trees_bluerplus_0.4.inst.cfg rename to resources/variants/two_trees/two_trees_bluerplus_0.4.inst.cfg index ce0a6c028f..ef8212c4a2 100644 --- a/resources/variants/two_trees_bluerplus_0.4.inst.cfg +++ b/resources/variants/two_trees/two_trees_bluerplus_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = two_trees_bluerplus name = 0.4mm Nozzle version = 4 -definition = two_trees_bluerplus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/two_trees_bluerplus_0.5.inst.cfg b/resources/variants/two_trees/two_trees_bluerplus_0.5.inst.cfg similarity index 99% rename from resources/variants/two_trees_bluerplus_0.5.inst.cfg rename to resources/variants/two_trees/two_trees_bluerplus_0.5.inst.cfg index cb8ed82ccf..cf2d64fb0a 100644 --- a/resources/variants/two_trees_bluerplus_0.5.inst.cfg +++ b/resources/variants/two_trees/two_trees_bluerplus_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = two_trees_bluerplus name = 0.5mm Nozzle version = 4 -definition = two_trees_bluerplus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/two_trees_bluerplus_0.6.inst.cfg b/resources/variants/two_trees/two_trees_bluerplus_0.6.inst.cfg similarity index 99% rename from resources/variants/two_trees_bluerplus_0.6.inst.cfg rename to resources/variants/two_trees/two_trees_bluerplus_0.6.inst.cfg index ebf50205fa..a27cfbd7ad 100644 --- a/resources/variants/two_trees_bluerplus_0.6.inst.cfg +++ b/resources/variants/two_trees/two_trees_bluerplus_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = two_trees_bluerplus name = 0.6mm Nozzle version = 4 -definition = two_trees_bluerplus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/two_trees_bluerplus_0.8.inst.cfg b/resources/variants/two_trees/two_trees_bluerplus_0.8.inst.cfg similarity index 99% rename from resources/variants/two_trees_bluerplus_0.8.inst.cfg rename to resources/variants/two_trees/two_trees_bluerplus_0.8.inst.cfg index a4289dbff8..5c66bfbaaf 100644 --- a/resources/variants/two_trees_bluerplus_0.8.inst.cfg +++ b/resources/variants/two_trees/two_trees_bluerplus_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = two_trees_bluerplus name = 0.8mm Nozzle version = 4 -definition = two_trees_bluerplus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/two_trees_bluerplus_1.0.inst.cfg b/resources/variants/two_trees/two_trees_bluerplus_1.0.inst.cfg similarity index 99% rename from resources/variants/two_trees_bluerplus_1.0.inst.cfg rename to resources/variants/two_trees/two_trees_bluerplus_1.0.inst.cfg index 82e1daeaa2..db297a8d58 100644 --- a/resources/variants/two_trees_bluerplus_1.0.inst.cfg +++ b/resources/variants/two_trees/two_trees_bluerplus_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = two_trees_bluerplus name = 1.0mm Nozzle version = 4 -definition = two_trees_bluerplus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/two_trees_sapphireplus_0.2.inst.cfg b/resources/variants/two_trees/two_trees_sapphireplus_0.2.inst.cfg similarity index 99% rename from resources/variants/two_trees_sapphireplus_0.2.inst.cfg rename to resources/variants/two_trees/two_trees_sapphireplus_0.2.inst.cfg index dc43e2bd2d..7757617b6d 100644 --- a/resources/variants/two_trees_sapphireplus_0.2.inst.cfg +++ b/resources/variants/two_trees/two_trees_sapphireplus_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = two_trees_sapphireplus name = 0.2mm Nozzle version = 4 -definition = two_trees_sapphireplus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/two_trees_sapphireplus_0.3.inst.cfg b/resources/variants/two_trees/two_trees_sapphireplus_0.3.inst.cfg similarity index 99% rename from resources/variants/two_trees_sapphireplus_0.3.inst.cfg rename to resources/variants/two_trees/two_trees_sapphireplus_0.3.inst.cfg index 84a48f4913..e8fb95722d 100644 --- a/resources/variants/two_trees_sapphireplus_0.3.inst.cfg +++ b/resources/variants/two_trees/two_trees_sapphireplus_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = two_trees_sapphireplus name = 0.3mm Nozzle version = 4 -definition = two_trees_sapphireplus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/two_trees_sapphireplus_0.4.inst.cfg b/resources/variants/two_trees/two_trees_sapphireplus_0.4.inst.cfg similarity index 99% rename from resources/variants/two_trees_sapphireplus_0.4.inst.cfg rename to resources/variants/two_trees/two_trees_sapphireplus_0.4.inst.cfg index a6d9015497..30ec9c21ea 100644 --- a/resources/variants/two_trees_sapphireplus_0.4.inst.cfg +++ b/resources/variants/two_trees/two_trees_sapphireplus_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = two_trees_sapphireplus name = 0.4mm Nozzle version = 4 -definition = two_trees_sapphireplus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/two_trees_sapphireplus_0.5.inst.cfg b/resources/variants/two_trees/two_trees_sapphireplus_0.5.inst.cfg similarity index 99% rename from resources/variants/two_trees_sapphireplus_0.5.inst.cfg rename to resources/variants/two_trees/two_trees_sapphireplus_0.5.inst.cfg index 81d1033eaa..92a01175ce 100644 --- a/resources/variants/two_trees_sapphireplus_0.5.inst.cfg +++ b/resources/variants/two_trees/two_trees_sapphireplus_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = two_trees_sapphireplus name = 0.5mm Nozzle version = 4 -definition = two_trees_sapphireplus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/two_trees_sapphireplus_0.6.inst.cfg b/resources/variants/two_trees/two_trees_sapphireplus_0.6.inst.cfg similarity index 99% rename from resources/variants/two_trees_sapphireplus_0.6.inst.cfg rename to resources/variants/two_trees/two_trees_sapphireplus_0.6.inst.cfg index 0f812edf0d..f46e87f024 100644 --- a/resources/variants/two_trees_sapphireplus_0.6.inst.cfg +++ b/resources/variants/two_trees/two_trees_sapphireplus_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = two_trees_sapphireplus name = 0.6mm Nozzle version = 4 -definition = two_trees_sapphireplus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/two_trees_sapphireplus_0.8.inst.cfg b/resources/variants/two_trees/two_trees_sapphireplus_0.8.inst.cfg similarity index 99% rename from resources/variants/two_trees_sapphireplus_0.8.inst.cfg rename to resources/variants/two_trees/two_trees_sapphireplus_0.8.inst.cfg index c01761cff9..7cb2572534 100644 --- a/resources/variants/two_trees_sapphireplus_0.8.inst.cfg +++ b/resources/variants/two_trees/two_trees_sapphireplus_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = two_trees_sapphireplus name = 0.8mm Nozzle version = 4 -definition = two_trees_sapphireplus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/two_trees_sapphireplus_1.0.inst.cfg b/resources/variants/two_trees/two_trees_sapphireplus_1.0.inst.cfg similarity index 99% rename from resources/variants/two_trees_sapphireplus_1.0.inst.cfg rename to resources/variants/two_trees/two_trees_sapphireplus_1.0.inst.cfg index 892893422a..ba8fa48ac7 100644 --- a/resources/variants/two_trees_sapphireplus_1.0.inst.cfg +++ b/resources/variants/two_trees/two_trees_sapphireplus_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = two_trees_sapphireplus name = 1.0mm Nozzle version = 4 -definition = two_trees_sapphireplus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/two_trees_sapphirepro_0.2.inst.cfg b/resources/variants/two_trees/two_trees_sapphirepro_0.2.inst.cfg similarity index 99% rename from resources/variants/two_trees_sapphirepro_0.2.inst.cfg rename to resources/variants/two_trees/two_trees_sapphirepro_0.2.inst.cfg index 56d1bd1f7a..e2d564a572 100644 --- a/resources/variants/two_trees_sapphirepro_0.2.inst.cfg +++ b/resources/variants/two_trees/two_trees_sapphirepro_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = two_trees_sapphirepro name = 0.2mm Nozzle version = 4 -definition = two_trees_sapphirepro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/two_trees_sapphirepro_0.3.inst.cfg b/resources/variants/two_trees/two_trees_sapphirepro_0.3.inst.cfg similarity index 99% rename from resources/variants/two_trees_sapphirepro_0.3.inst.cfg rename to resources/variants/two_trees/two_trees_sapphirepro_0.3.inst.cfg index 42390d30e0..55b9e3721d 100644 --- a/resources/variants/two_trees_sapphirepro_0.3.inst.cfg +++ b/resources/variants/two_trees/two_trees_sapphirepro_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = two_trees_sapphirepro name = 0.3mm Nozzle version = 4 -definition = two_trees_sapphirepro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/two_trees_sapphirepro_0.4.inst.cfg b/resources/variants/two_trees/two_trees_sapphirepro_0.4.inst.cfg similarity index 99% rename from resources/variants/two_trees_sapphirepro_0.4.inst.cfg rename to resources/variants/two_trees/two_trees_sapphirepro_0.4.inst.cfg index fabcae2e43..432d127d48 100644 --- a/resources/variants/two_trees_sapphirepro_0.4.inst.cfg +++ b/resources/variants/two_trees/two_trees_sapphirepro_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = two_trees_sapphirepro name = 0.4mm Nozzle version = 4 -definition = two_trees_sapphirepro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/two_trees_sapphirepro_0.5.inst.cfg b/resources/variants/two_trees/two_trees_sapphirepro_0.5.inst.cfg similarity index 99% rename from resources/variants/two_trees_sapphirepro_0.5.inst.cfg rename to resources/variants/two_trees/two_trees_sapphirepro_0.5.inst.cfg index 7fe73475cc..549dec597c 100644 --- a/resources/variants/two_trees_sapphirepro_0.5.inst.cfg +++ b/resources/variants/two_trees/two_trees_sapphirepro_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = two_trees_sapphirepro name = 0.5mm Nozzle version = 4 -definition = two_trees_sapphirepro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/two_trees_sapphirepro_0.6.inst.cfg b/resources/variants/two_trees/two_trees_sapphirepro_0.6.inst.cfg similarity index 99% rename from resources/variants/two_trees_sapphirepro_0.6.inst.cfg rename to resources/variants/two_trees/two_trees_sapphirepro_0.6.inst.cfg index 4acba1310d..ab776356d5 100644 --- a/resources/variants/two_trees_sapphirepro_0.6.inst.cfg +++ b/resources/variants/two_trees/two_trees_sapphirepro_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = two_trees_sapphirepro name = 0.6mm Nozzle version = 4 -definition = two_trees_sapphirepro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/two_trees_sapphirepro_0.8.inst.cfg b/resources/variants/two_trees/two_trees_sapphirepro_0.8.inst.cfg similarity index 99% rename from resources/variants/two_trees_sapphirepro_0.8.inst.cfg rename to resources/variants/two_trees/two_trees_sapphirepro_0.8.inst.cfg index 540d8b650c..b7618399bc 100644 --- a/resources/variants/two_trees_sapphirepro_0.8.inst.cfg +++ b/resources/variants/two_trees/two_trees_sapphirepro_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = two_trees_sapphirepro name = 0.8mm Nozzle version = 4 -definition = two_trees_sapphirepro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/two_trees_sapphirepro_1.0.inst.cfg b/resources/variants/two_trees/two_trees_sapphirepro_1.0.inst.cfg similarity index 99% rename from resources/variants/two_trees_sapphirepro_1.0.inst.cfg rename to resources/variants/two_trees/two_trees_sapphirepro_1.0.inst.cfg index e0b8c76ef0..bd87ed4d0d 100644 --- a/resources/variants/two_trees_sapphirepro_1.0.inst.cfg +++ b/resources/variants/two_trees/two_trees_sapphirepro_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = two_trees_sapphirepro name = 1.0mm Nozzle version = 4 -definition = two_trees_sapphirepro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/ultimaker2_extended_olsson_0.25.inst.cfg b/resources/variants/ultimaker2_extended_olsson_0.25.inst.cfg index 65096d0998..00577bbce0 100644 --- a/resources/variants/ultimaker2_extended_olsson_0.25.inst.cfg +++ b/resources/variants/ultimaker2_extended_olsson_0.25.inst.cfg @@ -1,14 +1,15 @@ [general] +definition = ultimaker2_extended_olsson name = 0.25 mm version = 4 -definition = ultimaker2_extended_olsson [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.25 machine_nozzle_tip_outer_diameter = 0.8 -wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 \ No newline at end of file +wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 + diff --git a/resources/variants/ultimaker2_extended_olsson_0.4.inst.cfg b/resources/variants/ultimaker2_extended_olsson_0.4.inst.cfg index 9da8810ee2..1855034a9d 100644 --- a/resources/variants/ultimaker2_extended_olsson_0.4.inst.cfg +++ b/resources/variants/ultimaker2_extended_olsson_0.4.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = ultimaker2_extended_olsson name = 0.4 mm version = 4 -definition = ultimaker2_extended_olsson [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 machine_nozzle_tip_outer_diameter = 1.05 + diff --git a/resources/variants/ultimaker2_extended_olsson_0.6.inst.cfg b/resources/variants/ultimaker2_extended_olsson_0.6.inst.cfg index 9b8b5aff45..fc9ec4ca78 100644 --- a/resources/variants/ultimaker2_extended_olsson_0.6.inst.cfg +++ b/resources/variants/ultimaker2_extended_olsson_0.6.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = ultimaker2_extended_olsson name = 0.6 mm version = 4 -definition = ultimaker2_extended_olsson [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 machine_nozzle_tip_outer_diameter = 1.25 + diff --git a/resources/variants/ultimaker2_extended_olsson_0.8.inst.cfg b/resources/variants/ultimaker2_extended_olsson_0.8.inst.cfg index 8026843c77..c0bb98c29a 100644 --- a/resources/variants/ultimaker2_extended_olsson_0.8.inst.cfg +++ b/resources/variants/ultimaker2_extended_olsson_0.8.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = ultimaker2_extended_olsson name = 0.8 mm version = 4 -definition = ultimaker2_extended_olsson [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 machine_nozzle_tip_outer_diameter = 1.35 + diff --git a/resources/variants/ultimaker2_extended_plus_0.25.inst.cfg b/resources/variants/ultimaker2_extended_plus_0.25.inst.cfg index 0a33c25f3f..fbd3c584b5 100644 --- a/resources/variants/ultimaker2_extended_plus_0.25.inst.cfg +++ b/resources/variants/ultimaker2_extended_plus_0.25.inst.cfg @@ -1,19 +1,20 @@ [general] +definition = ultimaker2_extended_plus name = 0.25 mm version = 4 -definition = ultimaker2_extended_plus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +coasting_min_volume = 0.17 +coasting_volume = 0.1 machine_nozzle_size = 0.25 machine_nozzle_tip_outer_diameter = 0.8 -coasting_volume = 0.1 -coasting_min_volume = 0.17 +speed_topbottom = =round(speed_print / 1.5, 1) speed_wall = =round(speed_print / 1.2, 1) speed_wall_0 = =1 if speed_wall < 5 else (speed_wall - 5) -speed_topbottom = =round(speed_print / 1.5, 1) wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 + diff --git a/resources/variants/ultimaker2_extended_plus_0.4.inst.cfg b/resources/variants/ultimaker2_extended_plus_0.4.inst.cfg index dc723040d5..330e070a69 100644 --- a/resources/variants/ultimaker2_extended_plus_0.4.inst.cfg +++ b/resources/variants/ultimaker2_extended_plus_0.4.inst.cfg @@ -1,16 +1,17 @@ [general] +definition = ultimaker2_extended_plus name = 0.4 mm version = 4 -definition = ultimaker2_extended_plus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 machine_nozzle_tip_outer_diameter = 1.05 +speed_topbottom = =round(speed_print / 2.25, 1) speed_wall = =round(speed_print / 1.25, 1) speed_wall_0 = =1 if speed_wall < 10 else (speed_wall - 10) -speed_topbottom = =round(speed_print / 2.25, 1) + diff --git a/resources/variants/ultimaker2_extended_plus_0.6.inst.cfg b/resources/variants/ultimaker2_extended_plus_0.6.inst.cfg index a6b886b39d..d6cb0d445f 100644 --- a/resources/variants/ultimaker2_extended_plus_0.6.inst.cfg +++ b/resources/variants/ultimaker2_extended_plus_0.6.inst.cfg @@ -1,17 +1,18 @@ [general] +definition = ultimaker2_extended_plus name = 0.6 mm version = 4 -definition = ultimaker2_extended_plus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +coasting_volume = 1.36 machine_nozzle_size = 0.6 machine_nozzle_tip_outer_diameter = 1.25 -coasting_volume = 1.36 +speed_topbottom = =round(speed_print / 2, 1) speed_wall = =round(speed_print * 4 / 3, 1) speed_wall_0 = =1 if speed_wall < 10 else (speed_wall - 10) -speed_topbottom = =round(speed_print / 2, 1) + diff --git a/resources/variants/ultimaker2_extended_plus_0.8.inst.cfg b/resources/variants/ultimaker2_extended_plus_0.8.inst.cfg index b017797143..3dd299c588 100644 --- a/resources/variants/ultimaker2_extended_plus_0.8.inst.cfg +++ b/resources/variants/ultimaker2_extended_plus_0.8.inst.cfg @@ -1,17 +1,18 @@ [general] +definition = ultimaker2_extended_plus name = 0.8 mm version = 4 -definition = ultimaker2_extended_plus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +coasting_volume = 3.22 machine_nozzle_size = 0.8 machine_nozzle_tip_outer_diameter = 1.35 -coasting_volume = 3.22 +speed_topbottom = =round(speed_print / 2, 1) speed_wall = =round(speed_print * 4 / 3, 1) speed_wall_0 = =1 if speed_wall < 10 else (speed_wall - 10) -speed_topbottom = =round(speed_print / 2, 1) + diff --git a/resources/variants/ultimaker2_olsson_0.25.inst.cfg b/resources/variants/ultimaker2_olsson_0.25.inst.cfg index 7159b97081..7b6480f3b6 100644 --- a/resources/variants/ultimaker2_olsson_0.25.inst.cfg +++ b/resources/variants/ultimaker2_olsson_0.25.inst.cfg @@ -1,15 +1,16 @@ [general] +definition = ultimaker2_olsson name = 0.25 mm version = 4 -definition = ultimaker2_olsson [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.25 machine_nozzle_tip_outer_diameter = 0.8 raft_airgap = 0.25 -wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 \ No newline at end of file +wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 + diff --git a/resources/variants/ultimaker2_olsson_0.4.inst.cfg b/resources/variants/ultimaker2_olsson_0.4.inst.cfg index 076a12c9f0..04f99672c8 100644 --- a/resources/variants/ultimaker2_olsson_0.4.inst.cfg +++ b/resources/variants/ultimaker2_olsson_0.4.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = ultimaker2_olsson name = 0.4 mm version = 4 -definition = ultimaker2_olsson [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 machine_nozzle_tip_outer_diameter = 1.05 + diff --git a/resources/variants/ultimaker2_olsson_0.6.inst.cfg b/resources/variants/ultimaker2_olsson_0.6.inst.cfg index 58364b1c9a..434ee41ce6 100644 --- a/resources/variants/ultimaker2_olsson_0.6.inst.cfg +++ b/resources/variants/ultimaker2_olsson_0.6.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = ultimaker2_olsson name = 0.6 mm version = 4 -definition = ultimaker2_olsson [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 machine_nozzle_tip_outer_diameter = 1.25 + diff --git a/resources/variants/ultimaker2_olsson_0.8.inst.cfg b/resources/variants/ultimaker2_olsson_0.8.inst.cfg index 335242a51e..d21c13c3d5 100644 --- a/resources/variants/ultimaker2_olsson_0.8.inst.cfg +++ b/resources/variants/ultimaker2_olsson_0.8.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = ultimaker2_olsson name = 0.8 mm version = 4 -definition = ultimaker2_olsson [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 machine_nozzle_tip_outer_diameter = 1.35 + diff --git a/resources/variants/ultimaker2_plus_0.25.inst.cfg b/resources/variants/ultimaker2_plus_0.25.inst.cfg index 15cbe91229..e0309b59ac 100644 --- a/resources/variants/ultimaker2_plus_0.25.inst.cfg +++ b/resources/variants/ultimaker2_plus_0.25.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = ultimaker2_plus name = 0.25 mm version = 4 -definition = ultimaker2_plus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] coasting_min_volume = 0.17 @@ -17,4 +17,5 @@ raft_airgap = 0.25 speed_topbottom = =round(speed_print / 1.5, 1) speed_wall = =round(speed_print / 1.2, 1) speed_wall_0 = =1 if speed_wall < 5 else (speed_wall - 5) -wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 \ No newline at end of file +wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 + diff --git a/resources/variants/ultimaker2_plus_0.4.inst.cfg b/resources/variants/ultimaker2_plus_0.4.inst.cfg index 8eb717bc7b..d6d1ee1ab4 100644 --- a/resources/variants/ultimaker2_plus_0.4.inst.cfg +++ b/resources/variants/ultimaker2_plus_0.4.inst.cfg @@ -1,16 +1,17 @@ [general] +definition = ultimaker2_plus name = 0.4 mm version = 4 -definition = ultimaker2_plus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 machine_nozzle_tip_outer_diameter = 1.05 +speed_topbottom = =round(speed_print / 2.25, 1) speed_wall = =round(speed_print / 1.25, 1) speed_wall_0 = =max(speed_wall - 10, 1) -speed_topbottom = =round(speed_print / 2.25, 1) + diff --git a/resources/variants/ultimaker2_plus_0.6.inst.cfg b/resources/variants/ultimaker2_plus_0.6.inst.cfg index 550f823619..0d4dc10b73 100644 --- a/resources/variants/ultimaker2_plus_0.6.inst.cfg +++ b/resources/variants/ultimaker2_plus_0.6.inst.cfg @@ -1,17 +1,18 @@ [general] +definition = ultimaker2_plus name = 0.6 mm version = 4 -definition = ultimaker2_plus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +coasting_volume = 1.36 machine_nozzle_size = 0.6 machine_nozzle_tip_outer_diameter = 1.25 -coasting_volume = 1.36 +speed_topbottom = =round(speed_print / 2, 1) speed_wall = =round(speed_print * 4 / 3, 1) speed_wall_0 = =1 if speed_wall < 10 else (speed_wall - 10) -speed_topbottom = =round(speed_print / 2, 1) + diff --git a/resources/variants/ultimaker2_plus_0.8.inst.cfg b/resources/variants/ultimaker2_plus_0.8.inst.cfg index 38b34c4c13..914e513fcd 100644 --- a/resources/variants/ultimaker2_plus_0.8.inst.cfg +++ b/resources/variants/ultimaker2_plus_0.8.inst.cfg @@ -1,17 +1,18 @@ [general] +definition = ultimaker2_plus name = 0.8 mm version = 4 -definition = ultimaker2_plus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +coasting_volume = 3.22 machine_nozzle_size = 0.8 machine_nozzle_tip_outer_diameter = 1.35 -coasting_volume = 3.22 +speed_topbottom = =round(speed_print / 2, 1) speed_wall = =round(speed_print * 4 / 3, 1) speed_wall_0 = =1 if speed_wall < 10 else (speed_wall - 10) -speed_topbottom = =round(speed_print / 2, 1) + diff --git a/resources/variants/ultimaker2_plus_connect_0.25.inst.cfg b/resources/variants/ultimaker2_plus_connect_0.25.inst.cfg index 06bc0da879..8b1489449f 100644 --- a/resources/variants/ultimaker2_plus_connect_0.25.inst.cfg +++ b/resources/variants/ultimaker2_plus_connect_0.25.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = ultimaker2_plus_connect name = 0.25 mm version = 4 -definition = ultimaker2_plus_connect [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] coasting_min_volume = 0.17 @@ -18,4 +18,5 @@ retraction_prime_speed = =retraction_speed speed_topbottom = =round(speed_print / 1.5, 1) speed_wall = =round(speed_print / 1.2, 1) speed_wall_0 = =1 if speed_wall < 5 else (speed_wall - 5) -wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 \ No newline at end of file +wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 + diff --git a/resources/variants/ultimaker2_plus_connect_0.4.inst.cfg b/resources/variants/ultimaker2_plus_connect_0.4.inst.cfg index c02b4421e7..4da46e90c2 100644 --- a/resources/variants/ultimaker2_plus_connect_0.4.inst.cfg +++ b/resources/variants/ultimaker2_plus_connect_0.4.inst.cfg @@ -1,16 +1,17 @@ [general] +definition = ultimaker2_plus_connect name = 0.4 mm version = 4 -definition = ultimaker2_plus_connect [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 machine_nozzle_tip_outer_diameter = 1.05 +speed_topbottom = =round(speed_print / 2.25, 1) speed_wall = =round(speed_print / 1.25, 1) speed_wall_0 = =max(speed_wall - 10, 1) -speed_topbottom = =round(speed_print / 2.25, 1) + diff --git a/resources/variants/ultimaker2_plus_connect_0.6.inst.cfg b/resources/variants/ultimaker2_plus_connect_0.6.inst.cfg index 51217bc7b4..e7395a8cb8 100644 --- a/resources/variants/ultimaker2_plus_connect_0.6.inst.cfg +++ b/resources/variants/ultimaker2_plus_connect_0.6.inst.cfg @@ -1,17 +1,18 @@ [general] +definition = ultimaker2_plus_connect name = 0.6 mm version = 4 -definition = ultimaker2_plus_connect [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +coasting_volume = 1.36 machine_nozzle_size = 0.6 machine_nozzle_tip_outer_diameter = 1.25 -coasting_volume = 1.36 +speed_topbottom = =round(speed_print / 2, 1) speed_wall = =round(speed_print * 3 / 4, 1) speed_wall_0 = =1 if speed_wall < 10 else (speed_wall - 10) -speed_topbottom = =round(speed_print / 2, 1) + diff --git a/resources/variants/ultimaker2_plus_connect_0.8.inst.cfg b/resources/variants/ultimaker2_plus_connect_0.8.inst.cfg index addfc28901..ca81a50a79 100644 --- a/resources/variants/ultimaker2_plus_connect_0.8.inst.cfg +++ b/resources/variants/ultimaker2_plus_connect_0.8.inst.cfg @@ -1,19 +1,20 @@ [general] +definition = ultimaker2_plus_connect name = 0.8 mm version = 4 -definition = ultimaker2_plus_connect [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +coasting_volume = 3.22 machine_nozzle_size = 0.8 machine_nozzle_tip_outer_diameter = 1.35 -coasting_volume = 3.22 -retraction_speed = 25 retraction_prime_speed = =retraction_speed +retraction_speed = 25 +speed_topbottom = =round(speed_print / 2, 1) speed_wall = =round(speed_print * 3 / 4, 1) speed_wall_0 = =1 if speed_wall < 10 else (speed_wall - 10) -speed_topbottom = =round(speed_print / 2, 1) + diff --git a/resources/variants/ultimaker3_aa0.25.inst.cfg b/resources/variants/ultimaker3_aa0.25.inst.cfg index afb0a0fb57..c170c387f9 100644 --- a/resources/variants/ultimaker3_aa0.25.inst.cfg +++ b/resources/variants/ultimaker3_aa0.25.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = ultimaker3 name = AA 0.25 version = 4 -definition = ultimaker3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] brim_width = 7 @@ -32,3 +32,4 @@ switch_extruder_retraction_amount = =machine_heat_zone_length top_bottom_thickness = 1.2 wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 xy_offset_layer_0 = =(-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset + diff --git a/resources/variants/ultimaker3_aa0.8.inst.cfg b/resources/variants/ultimaker3_aa0.8.inst.cfg index 9bb21dd803..e4a194d0f0 100644 --- a/resources/variants/ultimaker3_aa0.8.inst.cfg +++ b/resources/variants/ultimaker3_aa0.8.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = ultimaker3 name = AA 0.8 version = 4 -definition = ultimaker3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] brim_width = 7 @@ -47,3 +47,4 @@ switch_extruder_prime_speed = 20 switch_extruder_retraction_amount = 16.5 top_bottom_thickness = 1.4 wall_0_inset = 0 + diff --git a/resources/variants/ultimaker3_aa04.inst.cfg b/resources/variants/ultimaker3_aa04.inst.cfg index c81caf4164..40f46b1bcd 100644 --- a/resources/variants/ultimaker3_aa04.inst.cfg +++ b/resources/variants/ultimaker3_aa04.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = ultimaker3 name = AA 0.4 version = 4 -definition = ultimaker3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] brim_width = 7 @@ -28,3 +28,4 @@ switch_extruder_prime_speed = =switch_extruder_retraction_speeds switch_extruder_retraction_amount = =machine_heat_zone_length top_bottom_thickness = 1.2 xy_offset_layer_0 = =(-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset + diff --git a/resources/variants/ultimaker3_bb0.8.inst.cfg b/resources/variants/ultimaker3_bb0.8.inst.cfg index 1a9007b64f..673d9c42f2 100644 --- a/resources/variants/ultimaker3_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_bb0.8.inst.cfg @@ -1,19 +1,19 @@ [general] +definition = ultimaker3 name = BB 0.8 version = 4 -definition = ultimaker3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] acceleration_enabled = True acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 3500) acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) -acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500) +acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) brim_width = 3 cool_fan_speed = 50 cool_min_speed = 5 @@ -40,8 +40,8 @@ skin_overlap = 5 speed_prime_tower = =math.ceil(speed_print * 7 / 35) speed_print = 35 speed_support = =math.ceil(speed_print * 25 / 35) -speed_support_interface = =math.ceil(speed_support * 20 / 25) speed_support_bottom = =math.ceil(speed_support_interface * 10 / 20) +speed_support_interface = =math.ceil(speed_support * 20 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 30) support_angle = 60 support_bottom_height = =layer_height * 2 @@ -51,3 +51,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 12 top_bottom_thickness = 1 wall_0_inset = 0 + diff --git a/resources/variants/ultimaker3_bb04.inst.cfg b/resources/variants/ultimaker3_bb04.inst.cfg index 49bdf2d26e..be80f702de 100644 --- a/resources/variants/ultimaker3_bb04.inst.cfg +++ b/resources/variants/ultimaker3_bb04.inst.cfg @@ -1,18 +1,18 @@ [general] +definition = ultimaker3 name = BB 0.4 version = 4 -definition = ultimaker3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 3500) acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) -acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500) +acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) cool_fan_speed_max = =cool_fan_speed machine_nozzle_heat_up_speed = 1.5 machine_nozzle_id = BB 0.4 @@ -20,9 +20,10 @@ machine_nozzle_tip_outer_diameter = 1.0 retraction_min_travel = =3 * line_width speed_prime_tower = =math.ceil(speed_print * 10 / 35) speed_support = =math.ceil(speed_print * 25 / 35) -speed_support_interface = =math.ceil(speed_support * 20 / 25) speed_support_bottom = =math.ceil(speed_support_interface * 10 / 20) +speed_support_interface = =math.ceil(speed_support * 20 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 30) support_bottom_height = =layer_height * 2 support_interface_enable = True switch_extruder_retraction_amount = 12 + diff --git a/resources/variants/ultimaker3_extended_aa0.25.inst.cfg b/resources/variants/ultimaker3_extended_aa0.25.inst.cfg index 9f649b0052..e5a28632b1 100644 --- a/resources/variants/ultimaker3_extended_aa0.25.inst.cfg +++ b/resources/variants/ultimaker3_extended_aa0.25.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = ultimaker3_extended name = AA 0.25 version = 4 -definition = ultimaker3_extended [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] brim_width = 7 @@ -31,4 +31,5 @@ switch_extruder_prime_speed = =switch_extruder_retraction_speeds switch_extruder_retraction_amount = =machine_heat_zone_length top_bottom_thickness = 1.2 wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 -xy_offset_layer_0 = =(-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file +xy_offset_layer_0 = =(-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset + diff --git a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg index 122df77e82..279bf3107b 100644 --- a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg +++ b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = ultimaker3_extended name = AA 0.8 version = 4 -definition = ultimaker3_extended [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] brim_width = 7 @@ -47,3 +47,4 @@ switch_extruder_prime_speed = 20 switch_extruder_retraction_amount = 16.5 top_bottom_thickness = 1.4 wall_0_inset = 0 + diff --git a/resources/variants/ultimaker3_extended_aa04.inst.cfg b/resources/variants/ultimaker3_extended_aa04.inst.cfg index be07b56cdc..3061f54f9f 100644 --- a/resources/variants/ultimaker3_extended_aa04.inst.cfg +++ b/resources/variants/ultimaker3_extended_aa04.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = ultimaker3_extended name = AA 0.4 version = 4 -definition = ultimaker3_extended [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] brim_width = 7 @@ -27,4 +27,5 @@ support_z_distance = =layer_height * 2 switch_extruder_prime_speed = =switch_extruder_retraction_speeds switch_extruder_retraction_amount = =machine_heat_zone_length top_bottom_thickness = 1.2 -xy_offset_layer_0 = =(-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file +xy_offset_layer_0 = =(-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset + diff --git a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg index 877ee0772b..02eec4222a 100644 --- a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg @@ -1,19 +1,19 @@ [general] +definition = ultimaker3_extended name = BB 0.8 version = 4 -definition = ultimaker3_extended [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] acceleration_enabled = True acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 3500) acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) -acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500) +acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) brim_width = 3 cool_fan_speed = 50 cool_min_speed = 5 @@ -40,8 +40,8 @@ skin_overlap = 5 speed_prime_tower = =math.ceil(speed_print * 7 / 35) speed_print = 35 speed_support = =math.ceil(speed_print * 25 / 35) -speed_support_interface = =math.ceil(speed_support * 20 / 25) speed_support_bottom = =math.ceil(speed_support_interface * 10 / 20) +speed_support_interface = =math.ceil(speed_support * 20 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 30) support_angle = 60 support_bottom_height = =layer_height * 2 @@ -51,3 +51,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 12 top_bottom_thickness = 1 wall_0_inset = 0 + diff --git a/resources/variants/ultimaker3_extended_bb04.inst.cfg b/resources/variants/ultimaker3_extended_bb04.inst.cfg index d97b3c9f32..cb046143f8 100644 --- a/resources/variants/ultimaker3_extended_bb04.inst.cfg +++ b/resources/variants/ultimaker3_extended_bb04.inst.cfg @@ -1,18 +1,18 @@ [general] +definition = ultimaker3_extended name = BB 0.4 version = 4 -definition = ultimaker3_extended [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 3500) acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) -acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500) +acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) cool_fan_speed_max = =cool_fan_speed machine_nozzle_heat_up_speed = 1.5 machine_nozzle_id = BB 0.4 @@ -20,9 +20,10 @@ machine_nozzle_tip_outer_diameter = 1.0 retraction_min_travel = =3 * line_width speed_prime_tower = =math.ceil(speed_print * 10 / 35) speed_support = =math.ceil(speed_print * 25 / 35) -speed_support_interface = =math.ceil(speed_support * 20 / 25) speed_support_bottom = =math.ceil(speed_support_interface * 10 / 20) +speed_support_interface = =math.ceil(speed_support * 20 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 30) support_bottom_height = =layer_height * 2 support_interface_enable = True switch_extruder_retraction_amount = 12 + diff --git a/resources/variants/ultimaker_s3_aa0.25.inst.cfg b/resources/variants/ultimaker_s3_aa0.25.inst.cfg index 454638f302..93e0244d8a 100644 --- a/resources/variants/ultimaker_s3_aa0.25.inst.cfg +++ b/resources/variants/ultimaker_s3_aa0.25.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = ultimaker_s3 name = AA 0.25 version = 4 -definition = ultimaker_s3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] brim_width = 7 @@ -31,3 +31,4 @@ switch_extruder_prime_speed = =switch_extruder_retraction_speeds switch_extruder_retraction_amount = =machine_heat_zone_length top_bottom_thickness = 1.2 wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 + diff --git a/resources/variants/ultimaker_s3_aa0.8.inst.cfg b/resources/variants/ultimaker_s3_aa0.8.inst.cfg index 322ddc2601..2ab1044605 100644 --- a/resources/variants/ultimaker_s3_aa0.8.inst.cfg +++ b/resources/variants/ultimaker_s3_aa0.8.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = ultimaker_s3 name = AA 0.8 version = 4 -definition = ultimaker_s3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] brim_width = 7 @@ -48,3 +48,4 @@ switch_extruder_prime_speed = 20 switch_extruder_retraction_amount = 16.5 top_bottom_thickness = 1.4 wall_0_inset = 0 + diff --git a/resources/variants/ultimaker_s3_aa04.inst.cfg b/resources/variants/ultimaker_s3_aa04.inst.cfg index fb995635ff..4856f92d19 100644 --- a/resources/variants/ultimaker_s3_aa04.inst.cfg +++ b/resources/variants/ultimaker_s3_aa04.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = ultimaker_s3 name = AA 0.4 version = 4 -definition = ultimaker_s3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] brim_width = 7 @@ -26,3 +26,4 @@ support_z_distance = =layer_height * 2 switch_extruder_prime_speed = =switch_extruder_retraction_speeds switch_extruder_retraction_amount = =machine_heat_zone_length top_bottom_thickness = 1.2 + diff --git a/resources/variants/ultimaker_s3_bb0.8.inst.cfg b/resources/variants/ultimaker_s3_bb0.8.inst.cfg index c2e84c5764..7b6f9eeddc 100644 --- a/resources/variants/ultimaker_s3_bb0.8.inst.cfg +++ b/resources/variants/ultimaker_s3_bb0.8.inst.cfg @@ -1,18 +1,18 @@ [general] +definition = ultimaker_s3 name = BB 0.8 version = 4 -definition = ultimaker_s3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) -acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) -acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500) acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 3500) +acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) +acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500) +acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) brim_width = 3 cool_fan_speed = 50 cool_min_speed = 5 @@ -35,12 +35,12 @@ retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = =line_width * 3 skin_overlap = 5 +speed_prime_tower = =math.ceil(speed_print * 7 / 35) speed_print = 35 speed_support = =math.ceil(speed_print * 25 / 35) -speed_support_interface = =math.ceil(speed_support * 20 / 25) speed_support_bottom = =math.ceil(speed_support_interface * 10 / 20) +speed_support_interface = =math.ceil(speed_support * 20 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 30) -speed_prime_tower = =math.ceil(speed_print * 7 / 35) support_angle = 60 support_bottom_height = =layer_height * 2 support_interface_enable = True @@ -49,3 +49,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 12 top_bottom_thickness = 1 wall_0_inset = 0 + diff --git a/resources/variants/ultimaker_s3_bb04.inst.cfg b/resources/variants/ultimaker_s3_bb04.inst.cfg index 19e7778e17..e28ac96b55 100644 --- a/resources/variants/ultimaker_s3_bb04.inst.cfg +++ b/resources/variants/ultimaker_s3_bb04.inst.cfg @@ -1,18 +1,18 @@ [general] +definition = ultimaker_s3 name = BB 0.4 version = 4 -definition = ultimaker_s3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) -acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) -acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500) acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 3500) +acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) +acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500) +acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) cool_fan_speed_max = =cool_fan_speed machine_nozzle_heat_up_speed = 1.5 machine_nozzle_id = BB 0.4 @@ -20,9 +20,10 @@ machine_nozzle_tip_outer_diameter = 1.0 retraction_min_travel = =3 * line_width speed_prime_tower = =math.ceil(speed_print * 10 / 35) speed_support = =math.ceil(speed_print * 25 / 35) -speed_support_interface = =math.ceil(speed_support * 20 / 25) speed_support_bottom = =math.ceil(speed_support_interface * 10 / 20) +speed_support_interface = =math.ceil(speed_support * 20 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 30) support_bottom_height = =layer_height * 2 support_interface_enable = True switch_extruder_retraction_amount = 12 + diff --git a/resources/variants/ultimaker_s3_cc04.inst.cfg b/resources/variants/ultimaker_s3_cc04.inst.cfg index f2294cac7b..3254347135 100644 --- a/resources/variants/ultimaker_s3_cc04.inst.cfg +++ b/resources/variants/ultimaker_s3_cc04.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = ultimaker_s3 name = CC 0.4 version = 4 -definition = ultimaker_s3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] brim_width = 7 @@ -29,3 +29,4 @@ support_z_distance = =layer_height * 2 switch_extruder_prime_speed = =switch_extruder_retraction_speeds switch_extruder_retraction_amount = =machine_heat_zone_length top_bottom_thickness = =layer_height * 6 + diff --git a/resources/variants/ultimaker_s3_cc06.inst.cfg b/resources/variants/ultimaker_s3_cc06.inst.cfg index 1819758dbb..39ee11b8ed 100644 --- a/resources/variants/ultimaker_s3_cc06.inst.cfg +++ b/resources/variants/ultimaker_s3_cc06.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = ultimaker_s3 name = CC 0.6 version = 4 -definition = ultimaker_s3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] brim_width = 7 @@ -29,3 +29,4 @@ support_z_distance = =layer_height * 2 switch_extruder_prime_speed = =switch_extruder_retraction_speeds switch_extruder_retraction_amount = =machine_heat_zone_length top_bottom_thickness = =layer_height * 6 + diff --git a/resources/variants/ultimaker_s3_dd04.inst.cfg b/resources/variants/ultimaker_s3_dd04.inst.cfg index 7a31d85f1d..d7f17fb80d 100644 --- a/resources/variants/ultimaker_s3_dd04.inst.cfg +++ b/resources/variants/ultimaker_s3_dd04.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = ultimaker_s3 name = DD 0.4 version = 4 -definition = ultimaker_s3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_cool_down_speed = 0.9 @@ -14,3 +14,4 @@ machine_nozzle_id = DD 0.4 machine_nozzle_size = 0.4 machine_nozzle_tip_outer_diameter = 1.2 retraction_prime_speed = =retraction_speed + diff --git a/resources/variants/ultimaker_s5_aa0.25.inst.cfg b/resources/variants/ultimaker_s5_aa0.25.inst.cfg index 4a7851e05f..d6572b29d0 100644 --- a/resources/variants/ultimaker_s5_aa0.25.inst.cfg +++ b/resources/variants/ultimaker_s5_aa0.25.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = ultimaker_s5 name = AA 0.25 version = 4 -definition = ultimaker_s5 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] brim_width = 7 @@ -32,3 +32,4 @@ switch_extruder_retraction_amount = =machine_heat_zone_length top_bottom_thickness = 1.2 wall_thickness = =wall_line_width_0 + wall_line_width_x * 2 xy_offset_layer_0 = =(-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset + diff --git a/resources/variants/ultimaker_s5_aa0.8.inst.cfg b/resources/variants/ultimaker_s5_aa0.8.inst.cfg index 9907fcbbca..73dcd962e5 100644 --- a/resources/variants/ultimaker_s5_aa0.8.inst.cfg +++ b/resources/variants/ultimaker_s5_aa0.8.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = ultimaker_s5 name = AA 0.8 version = 4 -definition = ultimaker_s5 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] brim_width = 7 @@ -48,3 +48,4 @@ switch_extruder_prime_speed = 20 switch_extruder_retraction_amount = 16.5 top_bottom_thickness = 1.4 wall_0_inset = 0 + diff --git a/resources/variants/ultimaker_s5_aa04.inst.cfg b/resources/variants/ultimaker_s5_aa04.inst.cfg index 4d361e51c8..08f0500a94 100644 --- a/resources/variants/ultimaker_s5_aa04.inst.cfg +++ b/resources/variants/ultimaker_s5_aa04.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = ultimaker_s5 name = AA 0.4 version = 4 -definition = ultimaker_s5 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] brim_width = 7 @@ -26,3 +26,4 @@ support_z_distance = =layer_height * 2 switch_extruder_prime_speed = =switch_extruder_retraction_speeds switch_extruder_retraction_amount = =machine_heat_zone_length top_bottom_thickness = 1.2 + diff --git a/resources/variants/ultimaker_s5_aluminum.inst.cfg b/resources/variants/ultimaker_s5_aluminum.inst.cfg index 20d9aeb95e..b6f52e0a7a 100644 --- a/resources/variants/ultimaker_s5_aluminum.inst.cfg +++ b/resources/variants/ultimaker_s5_aluminum.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = ultimaker_s5 name = Aluminum version = 4 -definition = ultimaker_s5 [metadata] +hardware_type = buildplate setting_version = 20 type = variant -hardware_type = buildplate [values] -material_bed_temperature = =default_material_bed_temperature + 10 machine_buildplate_type = aluminum +material_bed_temperature = =default_material_bed_temperature + 10 + diff --git a/resources/variants/ultimaker_s5_bb0.8.inst.cfg b/resources/variants/ultimaker_s5_bb0.8.inst.cfg index 4d9a75bdf4..0f33102946 100644 --- a/resources/variants/ultimaker_s5_bb0.8.inst.cfg +++ b/resources/variants/ultimaker_s5_bb0.8.inst.cfg @@ -1,18 +1,18 @@ [general] +definition = ultimaker_s5 name = BB 0.8 version = 4 -definition = ultimaker_s5 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) -acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) -acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500) acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 3500) +acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) +acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500) +acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) brim_width = 3 cool_fan_speed = 50 cool_min_speed = 5 @@ -35,15 +35,16 @@ retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = =line_width * 3 skin_overlap = 5 +speed_prime_tower = =math.ceil(speed_print * 7 / 35) speed_print = 35 speed_support = =math.ceil(speed_print * 25 / 35) -speed_support_interface = =math.ceil(speed_support * 20 / 25) speed_support_bottom = =math.ceil(speed_support_interface * 10 / 20) +speed_support_interface = =math.ceil(speed_support * 20 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 30) -speed_prime_tower = =math.ceil(speed_print * 7 / 35) support_angle = 60 support_z_distance = 0 switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 12 top_bottom_thickness = 1 wall_0_inset = 0 + diff --git a/resources/variants/ultimaker_s5_bb04.inst.cfg b/resources/variants/ultimaker_s5_bb04.inst.cfg index 7234041751..beef6d83b6 100644 --- a/resources/variants/ultimaker_s5_bb04.inst.cfg +++ b/resources/variants/ultimaker_s5_bb04.inst.cfg @@ -1,18 +1,18 @@ [general] +definition = ultimaker_s5 name = BB 0.4 version = 4 -definition = ultimaker_s5 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) -acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) -acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500) acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 3500) +acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) +acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500) +acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) cool_fan_speed_max = =cool_fan_speed machine_nozzle_heat_up_speed = 1.5 machine_nozzle_id = BB 0.4 @@ -20,9 +20,10 @@ machine_nozzle_tip_outer_diameter = 1.0 retraction_min_travel = =3 * line_width speed_prime_tower = =math.ceil(speed_print * 10 / 35) speed_support = =math.ceil(speed_print * 25 / 35) -speed_support_interface = =math.ceil(speed_support * 20 / 25) speed_support_bottom = =math.ceil(speed_support_interface * 10 / 20) +speed_support_interface = =math.ceil(speed_support * 20 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 30) support_bottom_height = =layer_height * 2 support_interface_enable = True switch_extruder_retraction_amount = 12 + diff --git a/resources/variants/ultimaker_s5_cc04.inst.cfg b/resources/variants/ultimaker_s5_cc04.inst.cfg index aca6187fa8..e2ade4e28c 100644 --- a/resources/variants/ultimaker_s5_cc04.inst.cfg +++ b/resources/variants/ultimaker_s5_cc04.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = ultimaker_s5 name = CC 0.4 version = 4 -definition = ultimaker_s5 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] brim_width = 7 @@ -29,3 +29,4 @@ support_z_distance = =layer_height * 2 switch_extruder_prime_speed = =switch_extruder_retraction_speeds switch_extruder_retraction_amount = =machine_heat_zone_length top_bottom_thickness = =layer_height * 6 + diff --git a/resources/variants/ultimaker_s5_cc06.inst.cfg b/resources/variants/ultimaker_s5_cc06.inst.cfg index dcbdba18fe..db74c99393 100644 --- a/resources/variants/ultimaker_s5_cc06.inst.cfg +++ b/resources/variants/ultimaker_s5_cc06.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = ultimaker_s5 name = CC 0.6 version = 4 -definition = ultimaker_s5 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] brim_width = 7 @@ -29,3 +29,4 @@ support_z_distance = =layer_height * 2 switch_extruder_prime_speed = =switch_extruder_retraction_speeds switch_extruder_retraction_amount = =machine_heat_zone_length top_bottom_thickness = =layer_height * 6 + diff --git a/resources/variants/ultimaker_s5_dd04.inst.cfg b/resources/variants/ultimaker_s5_dd04.inst.cfg index faad9ceefe..4bda54f187 100644 --- a/resources/variants/ultimaker_s5_dd04.inst.cfg +++ b/resources/variants/ultimaker_s5_dd04.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = ultimaker_s5 name = DD 0.4 version = 4 -definition = ultimaker_s5 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_cool_down_speed = 0.9 @@ -14,3 +14,4 @@ machine_nozzle_id = DD 0.4 machine_nozzle_size = 0.4 machine_nozzle_tip_outer_diameter = 1.2 retraction_prime_speed = =retraction_speed + diff --git a/resources/variants/ultimaker_s5_glass.inst.cfg b/resources/variants/ultimaker_s5_glass.inst.cfg index 2e646854f9..6ad50498b2 100644 --- a/resources/variants/ultimaker_s5_glass.inst.cfg +++ b/resources/variants/ultimaker_s5_glass.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = ultimaker_s5 name = Glass version = 4 -definition = ultimaker_s5 [metadata] +hardware_type = buildplate setting_version = 20 type = variant -hardware_type = buildplate [values] -material_bed_temperature = =default_material_bed_temperature machine_buildplate_type = glass +material_bed_temperature = =default_material_bed_temperature + diff --git a/resources/variants/uni_200_0.30.inst.cfg b/resources/variants/uni/uni_200_0.30.inst.cfg similarity index 99% rename from resources/variants/uni_200_0.30.inst.cfg rename to resources/variants/uni/uni_200_0.30.inst.cfg index a10fc7235b..100836e49f 100644 --- a/resources/variants/uni_200_0.30.inst.cfg +++ b/resources/variants/uni/uni_200_0.30.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = uni_200 name = 0.30mm Nozzle version = 4 -definition = uni_200 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/uni_200_0.40.inst.cfg b/resources/variants/uni/uni_200_0.40.inst.cfg similarity index 99% rename from resources/variants/uni_200_0.40.inst.cfg rename to resources/variants/uni/uni_200_0.40.inst.cfg index 2fa8514166..668c1d1244 100644 --- a/resources/variants/uni_200_0.40.inst.cfg +++ b/resources/variants/uni/uni_200_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = uni_200 name = 0.40mm Nozzle version = 4 -definition = uni_200 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/uni_200_0.50.inst.cfg b/resources/variants/uni/uni_200_0.50.inst.cfg similarity index 99% rename from resources/variants/uni_200_0.50.inst.cfg rename to resources/variants/uni/uni_200_0.50.inst.cfg index 0faa82bcb6..5c5aff6833 100644 --- a/resources/variants/uni_200_0.50.inst.cfg +++ b/resources/variants/uni/uni_200_0.50.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = uni_200 name = 0.50mm Nozzle version = 4 -definition = uni_200 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/uni_250_0.30.inst.cfg b/resources/variants/uni/uni_250_0.30.inst.cfg similarity index 99% rename from resources/variants/uni_250_0.30.inst.cfg rename to resources/variants/uni/uni_250_0.30.inst.cfg index b34e30c290..f2f208caa1 100644 --- a/resources/variants/uni_250_0.30.inst.cfg +++ b/resources/variants/uni/uni_250_0.30.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = uni_250 name = 0.30mm Nozzle version = 4 -definition = uni_250 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/uni_250_0.40.inst.cfg b/resources/variants/uni/uni_250_0.40.inst.cfg similarity index 99% rename from resources/variants/uni_250_0.40.inst.cfg rename to resources/variants/uni/uni_250_0.40.inst.cfg index 00e86f3a25..d224965882 100644 --- a/resources/variants/uni_250_0.40.inst.cfg +++ b/resources/variants/uni/uni_250_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = uni_250 name = 0.40mm Nozzle version = 4 -definition = uni_250 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/uni_250_0.50.inst.cfg b/resources/variants/uni/uni_250_0.50.inst.cfg similarity index 99% rename from resources/variants/uni_250_0.50.inst.cfg rename to resources/variants/uni/uni_250_0.50.inst.cfg index d1e2c073ed..6949e014de 100644 --- a/resources/variants/uni_250_0.50.inst.cfg +++ b/resources/variants/uni/uni_250_0.50.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = uni_250 name = 0.50mm Nozzle version = 4 -definition = uni_250 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/uni_300_0.30.inst.cfg b/resources/variants/uni/uni_300_0.30.inst.cfg similarity index 99% rename from resources/variants/uni_300_0.30.inst.cfg rename to resources/variants/uni/uni_300_0.30.inst.cfg index c5399476ec..7be133bedf 100644 --- a/resources/variants/uni_300_0.30.inst.cfg +++ b/resources/variants/uni/uni_300_0.30.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = uni_300 name = 0.30mm Nozzle version = 4 -definition = uni_300 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/uni_300_0.40.inst.cfg b/resources/variants/uni/uni_300_0.40.inst.cfg similarity index 99% rename from resources/variants/uni_300_0.40.inst.cfg rename to resources/variants/uni/uni_300_0.40.inst.cfg index 74225271cc..034709c59d 100644 --- a/resources/variants/uni_300_0.40.inst.cfg +++ b/resources/variants/uni/uni_300_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = uni_300 name = 0.40mm Nozzle version = 4 -definition = uni_300 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/uni_300_0.50.inst.cfg b/resources/variants/uni/uni_300_0.50.inst.cfg similarity index 99% rename from resources/variants/uni_300_0.50.inst.cfg rename to resources/variants/uni/uni_300_0.50.inst.cfg index 1647785ecc..f2f2ce6070 100644 --- a/resources/variants/uni_300_0.50.inst.cfg +++ b/resources/variants/uni/uni_300_0.50.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = uni_300 name = 0.50mm Nozzle version = 4 -definition = uni_300 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/uni_base_0.30.inst.cfg b/resources/variants/uni/uni_base_0.30.inst.cfg similarity index 99% rename from resources/variants/uni_base_0.30.inst.cfg rename to resources/variants/uni/uni_base_0.30.inst.cfg index 4cd89d10d8..c1fae8c100 100644 --- a/resources/variants/uni_base_0.30.inst.cfg +++ b/resources/variants/uni/uni_base_0.30.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = uni_base name = 0.30mm Nozzle version = 4 -definition = uni_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/uni_base_0.40.inst.cfg b/resources/variants/uni/uni_base_0.40.inst.cfg similarity index 99% rename from resources/variants/uni_base_0.40.inst.cfg rename to resources/variants/uni/uni_base_0.40.inst.cfg index e0eb808593..7557687372 100644 --- a/resources/variants/uni_base_0.40.inst.cfg +++ b/resources/variants/uni/uni_base_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = uni_base name = 0.40mm Nozzle version = 4 -definition = uni_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/uni_base_0.50.inst.cfg b/resources/variants/uni/uni_base_0.50.inst.cfg similarity index 99% rename from resources/variants/uni_base_0.50.inst.cfg rename to resources/variants/uni/uni_base_0.50.inst.cfg index 7a3f3f146f..b746655f35 100644 --- a/resources/variants/uni_base_0.50.inst.cfg +++ b/resources/variants/uni/uni_base_0.50.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = uni_base name = 0.50mm Nozzle version = 4 -definition = uni_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/uni_mini_0.30.inst.cfg b/resources/variants/uni/uni_mini_0.30.inst.cfg similarity index 99% rename from resources/variants/uni_mini_0.30.inst.cfg rename to resources/variants/uni/uni_mini_0.30.inst.cfg index 10c3c623cb..d852269c26 100644 --- a/resources/variants/uni_mini_0.30.inst.cfg +++ b/resources/variants/uni/uni_mini_0.30.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = uni_mini name = 0.30mm Nozzle version = 4 -definition = uni_mini [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/uni_mini_0.40.inst.cfg b/resources/variants/uni/uni_mini_0.40.inst.cfg similarity index 99% rename from resources/variants/uni_mini_0.40.inst.cfg rename to resources/variants/uni/uni_mini_0.40.inst.cfg index 4a6fda6370..f3e020b5d8 100644 --- a/resources/variants/uni_mini_0.40.inst.cfg +++ b/resources/variants/uni/uni_mini_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = uni_mini name = 0.40mm Nozzle version = 4 -definition = uni_mini [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/uni_mini_0.50.inst.cfg b/resources/variants/uni/uni_mini_0.50.inst.cfg similarity index 99% rename from resources/variants/uni_mini_0.50.inst.cfg rename to resources/variants/uni/uni_mini_0.50.inst.cfg index 4de27e37d1..7cc96b7325 100644 --- a/resources/variants/uni_mini_0.50.inst.cfg +++ b/resources/variants/uni/uni_mini_0.50.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = uni_mini name = 0.50mm Nozzle version = 4 -definition = uni_mini [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/vivedino_trex2plus_0.2.inst.cfg b/resources/variants/vivedino/vivedino_trex2plus_0.2.inst.cfg similarity index 99% rename from resources/variants/vivedino_trex2plus_0.2.inst.cfg rename to resources/variants/vivedino/vivedino_trex2plus_0.2.inst.cfg index d2cfe24e79..29c1390a79 100644 --- a/resources/variants/vivedino_trex2plus_0.2.inst.cfg +++ b/resources/variants/vivedino/vivedino_trex2plus_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = vivedino_trex2plus name = 0.2mm Nozzle version = 4 -definition = vivedino_trex2plus [metadata] +hardware_type = nozzle 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/vivedino_trex2plus_0.4.inst.cfg similarity index 99% rename from resources/variants/vivedino_trex2plus_0.4.inst.cfg rename to resources/variants/vivedino/vivedino_trex2plus_0.4.inst.cfg index ca1590f819..c884f9f808 100644 --- a/resources/variants/vivedino_trex2plus_0.4.inst.cfg +++ b/resources/variants/vivedino/vivedino_trex2plus_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = vivedino_trex2plus name = 0.4mm Nozzle version = 4 -definition = vivedino_trex2plus [metadata] +hardware_type = nozzle 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/vivedino_trex2plus_0.6.inst.cfg similarity index 85% rename from resources/variants/vivedino_trex2plus_0.6.inst.cfg rename to resources/variants/vivedino/vivedino_trex2plus_0.6.inst.cfg index 8a69ab0161..a7bdbd4cbd 100644 --- a/resources/variants/vivedino_trex2plus_0.6.inst.cfg +++ b/resources/variants/vivedino/vivedino_trex2plus_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = vivedino_trex2plus name = 0.6mm Nozzle version = 4 -definition = vivedino_trex2plus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.6 \ No newline at end of file +machine_nozzle_size = 0.6 + diff --git a/resources/variants/vivedino_trex2plus_0.8.inst.cfg b/resources/variants/vivedino/vivedino_trex2plus_0.8.inst.cfg similarity index 100% rename from resources/variants/vivedino_trex2plus_0.8.inst.cfg rename to resources/variants/vivedino/vivedino_trex2plus_0.8.inst.cfg index d9843d5497..7b3c290621 100644 --- a/resources/variants/vivedino_trex2plus_0.8.inst.cfg +++ b/resources/variants/vivedino/vivedino_trex2plus_0.8.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = vivedino_trex2plus name = 0.8mm Nozzle version = 4 -definition = vivedino_trex2plus [metadata] +hardware_type = nozzle 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/vivedino_trex3_0.2.inst.cfg similarity index 99% rename from resources/variants/vivedino_trex3_0.2.inst.cfg rename to resources/variants/vivedino/vivedino_trex3_0.2.inst.cfg index 30548fd3d3..e41c6d70fb 100644 --- a/resources/variants/vivedino_trex3_0.2.inst.cfg +++ b/resources/variants/vivedino/vivedino_trex3_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = vivedino_trex3 name = 0.2mm Nozzle version = 4 -definition = vivedino_trex3 [metadata] +hardware_type = nozzle 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/vivedino_trex3_0.4.inst.cfg similarity index 99% rename from resources/variants/vivedino_trex3_0.4.inst.cfg rename to resources/variants/vivedino/vivedino_trex3_0.4.inst.cfg index fedd92b5a9..d6379c6ede 100644 --- a/resources/variants/vivedino_trex3_0.4.inst.cfg +++ b/resources/variants/vivedino/vivedino_trex3_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = vivedino_trex3 name = 0.4mm Nozzle version = 4 -definition = vivedino_trex3 [metadata] +hardware_type = nozzle 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/vivedino_trex3_0.6.inst.cfg similarity index 84% rename from resources/variants/vivedino_trex3_0.6.inst.cfg rename to resources/variants/vivedino/vivedino_trex3_0.6.inst.cfg index 6dd8ddf460..1a2c9401dd 100644 --- a/resources/variants/vivedino_trex3_0.6.inst.cfg +++ b/resources/variants/vivedino/vivedino_trex3_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = vivedino_trex3 name = 0.6mm Nozzle version = 4 -definition = vivedino_trex3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.6 \ No newline at end of file +machine_nozzle_size = 0.6 + diff --git a/resources/variants/vivedino_trex3_0.8.inst.cfg b/resources/variants/vivedino/vivedino_trex3_0.8.inst.cfg similarity index 100% rename from resources/variants/vivedino_trex3_0.8.inst.cfg rename to resources/variants/vivedino/vivedino_trex3_0.8.inst.cfg index f207d55bf3..1b3a7a2429 100644 --- a/resources/variants/vivedino_trex3_0.8.inst.cfg +++ b/resources/variants/vivedino/vivedino_trex3_0.8.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = vivedino_trex3 name = 0.8mm Nozzle version = 4 -definition = vivedino_trex3 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 diff --git a/resources/variants/voron0_120_v6_0.25.inst.cfg b/resources/variants/voron/voron0_120_v6_0.25.inst.cfg similarity index 99% rename from resources/variants/voron0_120_v6_0.25.inst.cfg rename to resources/variants/voron/voron0_120_v6_0.25.inst.cfg index 1c417f9132..8a7b114b13 100644 --- a/resources/variants/voron0_120_v6_0.25.inst.cfg +++ b/resources/variants/voron/voron0_120_v6_0.25.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron0_120 name = V6 0.25mm version = 4 -definition = voron0_120 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.25 + diff --git a/resources/variants/voron0_120_v6_0.30.inst.cfg b/resources/variants/voron/voron0_120_v6_0.30.inst.cfg similarity index 99% rename from resources/variants/voron0_120_v6_0.30.inst.cfg rename to resources/variants/voron/voron0_120_v6_0.30.inst.cfg index b13505fbaf..a79f5d6a4e 100644 --- a/resources/variants/voron0_120_v6_0.30.inst.cfg +++ b/resources/variants/voron/voron0_120_v6_0.30.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron0_120 name = V6 0.30mm version = 4 -definition = voron0_120 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/voron0_120_v6_0.40.inst.cfg b/resources/variants/voron/voron0_120_v6_0.40.inst.cfg similarity index 99% rename from resources/variants/voron0_120_v6_0.40.inst.cfg rename to resources/variants/voron/voron0_120_v6_0.40.inst.cfg index 80c02d10d5..e2d104229b 100644 --- a/resources/variants/voron0_120_v6_0.40.inst.cfg +++ b/resources/variants/voron/voron0_120_v6_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron0_120 name = V6 0.40mm version = 4 -definition = voron0_120 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/voron0_120_v6_0.50.inst.cfg b/resources/variants/voron/voron0_120_v6_0.50.inst.cfg similarity index 99% rename from resources/variants/voron0_120_v6_0.50.inst.cfg rename to resources/variants/voron/voron0_120_v6_0.50.inst.cfg index 3e3c2dc71f..1065b7dd59 100644 --- a/resources/variants/voron0_120_v6_0.50.inst.cfg +++ b/resources/variants/voron/voron0_120_v6_0.50.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron0_120 name = V6 0.50mm version = 4 -definition = voron0_120 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/voron0_120_v6_0.60.inst.cfg b/resources/variants/voron/voron0_120_v6_0.60.inst.cfg similarity index 99% rename from resources/variants/voron0_120_v6_0.60.inst.cfg rename to resources/variants/voron/voron0_120_v6_0.60.inst.cfg index 920f267c8e..23453e166b 100644 --- a/resources/variants/voron0_120_v6_0.60.inst.cfg +++ b/resources/variants/voron/voron0_120_v6_0.60.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron0_120 name = V6 0.60mm version = 4 -definition = voron0_120 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/voron0_120_v6_0.80.inst.cfg b/resources/variants/voron/voron0_120_v6_0.80.inst.cfg similarity index 99% rename from resources/variants/voron0_120_v6_0.80.inst.cfg rename to resources/variants/voron/voron0_120_v6_0.80.inst.cfg index 4fa33b559f..39e92f0ef5 100644 --- a/resources/variants/voron0_120_v6_0.80.inst.cfg +++ b/resources/variants/voron/voron0_120_v6_0.80.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron0_120 name = V6 0.80mm version = 4 -definition = voron0_120 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/voron2_250_v6_0.25.inst.cfg b/resources/variants/voron/voron2_250_v6_0.25.inst.cfg similarity index 99% rename from resources/variants/voron2_250_v6_0.25.inst.cfg rename to resources/variants/voron/voron2_250_v6_0.25.inst.cfg index 40edebcbad..ca25524e30 100644 --- a/resources/variants/voron2_250_v6_0.25.inst.cfg +++ b/resources/variants/voron/voron2_250_v6_0.25.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_250 name = V6 0.25mm version = 4 -definition = voron2_250 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.25 + diff --git a/resources/variants/voron2_250_v6_0.30.inst.cfg b/resources/variants/voron/voron2_250_v6_0.30.inst.cfg similarity index 99% rename from resources/variants/voron2_250_v6_0.30.inst.cfg rename to resources/variants/voron/voron2_250_v6_0.30.inst.cfg index 61813ba0e5..9f98769370 100644 --- a/resources/variants/voron2_250_v6_0.30.inst.cfg +++ b/resources/variants/voron/voron2_250_v6_0.30.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_250 name = V6 0.30mm version = 4 -definition = voron2_250 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.30 + diff --git a/resources/variants/voron2_250_v6_0.35.inst.cfg b/resources/variants/voron/voron2_250_v6_0.35.inst.cfg similarity index 99% rename from resources/variants/voron2_250_v6_0.35.inst.cfg rename to resources/variants/voron/voron2_250_v6_0.35.inst.cfg index 0bf3a37aea..44e7716db2 100644 --- a/resources/variants/voron2_250_v6_0.35.inst.cfg +++ b/resources/variants/voron/voron2_250_v6_0.35.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_250 name = V6 0.35mm version = 4 -definition = voron2_250 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.35 + diff --git a/resources/variants/voron2_250_v6_0.40.inst.cfg b/resources/variants/voron/voron2_250_v6_0.40.inst.cfg similarity index 99% rename from resources/variants/voron2_250_v6_0.40.inst.cfg rename to resources/variants/voron/voron2_250_v6_0.40.inst.cfg index b64ba5a935..cbe1a6cf25 100644 --- a/resources/variants/voron2_250_v6_0.40.inst.cfg +++ b/resources/variants/voron/voron2_250_v6_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_250 name = V6 0.40mm version = 4 -definition = voron2_250 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/voron2_250_v6_0.50.inst.cfg b/resources/variants/voron/voron2_250_v6_0.50.inst.cfg similarity index 99% rename from resources/variants/voron2_250_v6_0.50.inst.cfg rename to resources/variants/voron/voron2_250_v6_0.50.inst.cfg index 1d46de7c9e..69ef8a3d20 100644 --- a/resources/variants/voron2_250_v6_0.50.inst.cfg +++ b/resources/variants/voron/voron2_250_v6_0.50.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_250 name = V6 0.50mm version = 4 -definition = voron2_250 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/voron2_250_v6_0.60.inst.cfg b/resources/variants/voron/voron2_250_v6_0.60.inst.cfg similarity index 99% rename from resources/variants/voron2_250_v6_0.60.inst.cfg rename to resources/variants/voron/voron2_250_v6_0.60.inst.cfg index 9861d15daa..fabc7e0135 100644 --- a/resources/variants/voron2_250_v6_0.60.inst.cfg +++ b/resources/variants/voron/voron2_250_v6_0.60.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_250 name = V6 0.60mm version = 4 -definition = voron2_250 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/voron2_250_v6_0.80.inst.cfg b/resources/variants/voron/voron2_250_v6_0.80.inst.cfg similarity index 99% rename from resources/variants/voron2_250_v6_0.80.inst.cfg rename to resources/variants/voron/voron2_250_v6_0.80.inst.cfg index 0f66d4b3f5..385d40c95e 100644 --- a/resources/variants/voron2_250_v6_0.80.inst.cfg +++ b/resources/variants/voron/voron2_250_v6_0.80.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_250 name = V6 0.80mm version = 4 -definition = voron2_250 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/voron2_250_volcano_0.40.inst.cfg b/resources/variants/voron/voron2_250_volcano_0.40.inst.cfg similarity index 99% rename from resources/variants/voron2_250_volcano_0.40.inst.cfg rename to resources/variants/voron/voron2_250_volcano_0.40.inst.cfg index 49777a5eaa..c6c6adc3cd 100644 --- a/resources/variants/voron2_250_volcano_0.40.inst.cfg +++ b/resources/variants/voron/voron2_250_volcano_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_250 name = Volcano 0.40mm version = 4 -definition = voron2_250 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/voron2_250_volcano_0.60.inst.cfg b/resources/variants/voron/voron2_250_volcano_0.60.inst.cfg similarity index 99% rename from resources/variants/voron2_250_volcano_0.60.inst.cfg rename to resources/variants/voron/voron2_250_volcano_0.60.inst.cfg index f479fa0d44..f0e22f5cd4 100644 --- a/resources/variants/voron2_250_volcano_0.60.inst.cfg +++ b/resources/variants/voron/voron2_250_volcano_0.60.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_250 name = Volcano 0.60mm version = 4 -definition = voron2_250 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/voron2_250_volcano_0.80.inst.cfg b/resources/variants/voron/voron2_250_volcano_0.80.inst.cfg similarity index 99% rename from resources/variants/voron2_250_volcano_0.80.inst.cfg rename to resources/variants/voron/voron2_250_volcano_0.80.inst.cfg index bc67a41a36..b620c0b147 100644 --- a/resources/variants/voron2_250_volcano_0.80.inst.cfg +++ b/resources/variants/voron/voron2_250_volcano_0.80.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_250 name = Volcano 0.80mm version = 4 -definition = voron2_250 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/voron2_250_volcano_1.00.inst.cfg b/resources/variants/voron/voron2_250_volcano_1.00.inst.cfg similarity index 99% rename from resources/variants/voron2_250_volcano_1.00.inst.cfg rename to resources/variants/voron/voron2_250_volcano_1.00.inst.cfg index b3d96b83ea..c4515e734a 100644 --- a/resources/variants/voron2_250_volcano_1.00.inst.cfg +++ b/resources/variants/voron/voron2_250_volcano_1.00.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_250 name = Volcano 1.00mm version = 4 -definition = voron2_250 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/voron2_250_volcano_1.20.inst.cfg b/resources/variants/voron/voron2_250_volcano_1.20.inst.cfg similarity index 99% rename from resources/variants/voron2_250_volcano_1.20.inst.cfg rename to resources/variants/voron/voron2_250_volcano_1.20.inst.cfg index 1c31ce96a8..efe7b04398 100644 --- a/resources/variants/voron2_250_volcano_1.20.inst.cfg +++ b/resources/variants/voron/voron2_250_volcano_1.20.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_250 name = Volcano 1.20mm version = 4 -definition = voron2_250 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.2 + diff --git a/resources/variants/voron2_300_v6_0.25.inst.cfg b/resources/variants/voron/voron2_300_v6_0.25.inst.cfg similarity index 99% rename from resources/variants/voron2_300_v6_0.25.inst.cfg rename to resources/variants/voron/voron2_300_v6_0.25.inst.cfg index 86705951b4..312654321b 100644 --- a/resources/variants/voron2_300_v6_0.25.inst.cfg +++ b/resources/variants/voron/voron2_300_v6_0.25.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_300 name = V6 0.25mm version = 4 -definition = voron2_300 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.25 + diff --git a/resources/variants/voron2_300_v6_0.30.inst.cfg b/resources/variants/voron/voron2_300_v6_0.30.inst.cfg similarity index 99% rename from resources/variants/voron2_300_v6_0.30.inst.cfg rename to resources/variants/voron/voron2_300_v6_0.30.inst.cfg index 99aae77246..1cd3aef2d5 100644 --- a/resources/variants/voron2_300_v6_0.30.inst.cfg +++ b/resources/variants/voron/voron2_300_v6_0.30.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_300 name = V6 0.30mm version = 4 -definition = voron2_300 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.30 + diff --git a/resources/variants/voron2_300_v6_0.35.inst.cfg b/resources/variants/voron/voron2_300_v6_0.35.inst.cfg similarity index 99% rename from resources/variants/voron2_300_v6_0.35.inst.cfg rename to resources/variants/voron/voron2_300_v6_0.35.inst.cfg index 29bc419b2c..6046f7eae8 100644 --- a/resources/variants/voron2_300_v6_0.35.inst.cfg +++ b/resources/variants/voron/voron2_300_v6_0.35.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_300 name = V6 0.35mm version = 4 -definition = voron2_300 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.35 + diff --git a/resources/variants/voron2_300_v6_0.40.inst.cfg b/resources/variants/voron/voron2_300_v6_0.40.inst.cfg similarity index 99% rename from resources/variants/voron2_300_v6_0.40.inst.cfg rename to resources/variants/voron/voron2_300_v6_0.40.inst.cfg index d95036e3be..aecbb82fdb 100644 --- a/resources/variants/voron2_300_v6_0.40.inst.cfg +++ b/resources/variants/voron/voron2_300_v6_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_300 name = V6 0.40mm version = 4 -definition = voron2_300 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/voron2_300_v6_0.50.inst.cfg b/resources/variants/voron/voron2_300_v6_0.50.inst.cfg similarity index 99% rename from resources/variants/voron2_300_v6_0.50.inst.cfg rename to resources/variants/voron/voron2_300_v6_0.50.inst.cfg index df5b61f48b..66c3c9e61d 100644 --- a/resources/variants/voron2_300_v6_0.50.inst.cfg +++ b/resources/variants/voron/voron2_300_v6_0.50.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_300 name = V6 0.50mm version = 4 -definition = voron2_300 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/voron2_300_v6_0.60.inst.cfg b/resources/variants/voron/voron2_300_v6_0.60.inst.cfg similarity index 99% rename from resources/variants/voron2_300_v6_0.60.inst.cfg rename to resources/variants/voron/voron2_300_v6_0.60.inst.cfg index ac303dc82b..03d3988746 100644 --- a/resources/variants/voron2_300_v6_0.60.inst.cfg +++ b/resources/variants/voron/voron2_300_v6_0.60.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_300 name = V6 0.60mm version = 4 -definition = voron2_300 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/voron2_300_v6_0.80.inst.cfg b/resources/variants/voron/voron2_300_v6_0.80.inst.cfg similarity index 99% rename from resources/variants/voron2_300_v6_0.80.inst.cfg rename to resources/variants/voron/voron2_300_v6_0.80.inst.cfg index a76487288e..6bdae73ce8 100644 --- a/resources/variants/voron2_300_v6_0.80.inst.cfg +++ b/resources/variants/voron/voron2_300_v6_0.80.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_300 name = V6 0.80mm version = 4 -definition = voron2_300 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/voron2_300_volcano_0.40.inst.cfg b/resources/variants/voron/voron2_300_volcano_0.40.inst.cfg similarity index 99% rename from resources/variants/voron2_300_volcano_0.40.inst.cfg rename to resources/variants/voron/voron2_300_volcano_0.40.inst.cfg index 3c2055d412..a73732e8c0 100644 --- a/resources/variants/voron2_300_volcano_0.40.inst.cfg +++ b/resources/variants/voron/voron2_300_volcano_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_300 name = Volcano 0.40mm version = 4 -definition = voron2_300 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/voron2_300_volcano_0.60.inst.cfg b/resources/variants/voron/voron2_300_volcano_0.60.inst.cfg similarity index 99% rename from resources/variants/voron2_300_volcano_0.60.inst.cfg rename to resources/variants/voron/voron2_300_volcano_0.60.inst.cfg index 267dd2319e..c06f01ebb8 100644 --- a/resources/variants/voron2_300_volcano_0.60.inst.cfg +++ b/resources/variants/voron/voron2_300_volcano_0.60.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_300 name = Volcano 0.60mm version = 4 -definition = voron2_300 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/voron2_300_volcano_0.80.inst.cfg b/resources/variants/voron/voron2_300_volcano_0.80.inst.cfg similarity index 99% rename from resources/variants/voron2_300_volcano_0.80.inst.cfg rename to resources/variants/voron/voron2_300_volcano_0.80.inst.cfg index c8b651de6c..adb6c06242 100644 --- a/resources/variants/voron2_300_volcano_0.80.inst.cfg +++ b/resources/variants/voron/voron2_300_volcano_0.80.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_300 name = Volcano 0.80mm version = 4 -definition = voron2_300 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/voron2_300_volcano_1.00.inst.cfg b/resources/variants/voron/voron2_300_volcano_1.00.inst.cfg similarity index 99% rename from resources/variants/voron2_300_volcano_1.00.inst.cfg rename to resources/variants/voron/voron2_300_volcano_1.00.inst.cfg index 2ea749e355..1f024a8322 100644 --- a/resources/variants/voron2_300_volcano_1.00.inst.cfg +++ b/resources/variants/voron/voron2_300_volcano_1.00.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_300 name = Volcano 1.00mm version = 4 -definition = voron2_300 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/voron2_300_volcano_1.20.inst.cfg b/resources/variants/voron/voron2_300_volcano_1.20.inst.cfg similarity index 99% rename from resources/variants/voron2_300_volcano_1.20.inst.cfg rename to resources/variants/voron/voron2_300_volcano_1.20.inst.cfg index 71caf0ad4b..b3057cecd2 100644 --- a/resources/variants/voron2_300_volcano_1.20.inst.cfg +++ b/resources/variants/voron/voron2_300_volcano_1.20.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_300 name = Volcano 1.20mm version = 4 -definition = voron2_300 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.2 + diff --git a/resources/variants/voron2_350_v6_0.25.inst.cfg b/resources/variants/voron/voron2_350_v6_0.25.inst.cfg similarity index 99% rename from resources/variants/voron2_350_v6_0.25.inst.cfg rename to resources/variants/voron/voron2_350_v6_0.25.inst.cfg index 6d436755bc..ece8c24573 100644 --- a/resources/variants/voron2_350_v6_0.25.inst.cfg +++ b/resources/variants/voron/voron2_350_v6_0.25.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_350 name = V6 0.25mm version = 4 -definition = voron2_350 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.25 + diff --git a/resources/variants/voron2_350_v6_0.30.inst.cfg b/resources/variants/voron/voron2_350_v6_0.30.inst.cfg similarity index 99% rename from resources/variants/voron2_350_v6_0.30.inst.cfg rename to resources/variants/voron/voron2_350_v6_0.30.inst.cfg index 793e0db9e8..291ed5adcb 100644 --- a/resources/variants/voron2_350_v6_0.30.inst.cfg +++ b/resources/variants/voron/voron2_350_v6_0.30.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_350 name = V6 0.30mm version = 4 -definition = voron2_350 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.30 + diff --git a/resources/variants/voron2_350_v6_0.35.inst.cfg b/resources/variants/voron/voron2_350_v6_0.35.inst.cfg similarity index 99% rename from resources/variants/voron2_350_v6_0.35.inst.cfg rename to resources/variants/voron/voron2_350_v6_0.35.inst.cfg index e39d1c9be2..d035f62196 100644 --- a/resources/variants/voron2_350_v6_0.35.inst.cfg +++ b/resources/variants/voron/voron2_350_v6_0.35.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_350 name = V6 0.35mm version = 4 -definition = voron2_350 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.35 + diff --git a/resources/variants/voron2_350_v6_0.40.inst.cfg b/resources/variants/voron/voron2_350_v6_0.40.inst.cfg similarity index 99% rename from resources/variants/voron2_350_v6_0.40.inst.cfg rename to resources/variants/voron/voron2_350_v6_0.40.inst.cfg index ec19197f9c..d008b58548 100644 --- a/resources/variants/voron2_350_v6_0.40.inst.cfg +++ b/resources/variants/voron/voron2_350_v6_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_350 name = V6 0.40mm version = 4 -definition = voron2_350 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/voron2_350_v6_0.50.inst.cfg b/resources/variants/voron/voron2_350_v6_0.50.inst.cfg similarity index 99% rename from resources/variants/voron2_350_v6_0.50.inst.cfg rename to resources/variants/voron/voron2_350_v6_0.50.inst.cfg index f69402a137..db6677dd51 100644 --- a/resources/variants/voron2_350_v6_0.50.inst.cfg +++ b/resources/variants/voron/voron2_350_v6_0.50.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_350 name = V6 0.50mm version = 4 -definition = voron2_350 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/voron2_350_v6_0.60.inst.cfg b/resources/variants/voron/voron2_350_v6_0.60.inst.cfg similarity index 99% rename from resources/variants/voron2_350_v6_0.60.inst.cfg rename to resources/variants/voron/voron2_350_v6_0.60.inst.cfg index 67aba63a9a..4fe3b0a431 100644 --- a/resources/variants/voron2_350_v6_0.60.inst.cfg +++ b/resources/variants/voron/voron2_350_v6_0.60.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_350 name = V6 0.60mm version = 4 -definition = voron2_350 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/voron2_350_v6_0.80.inst.cfg b/resources/variants/voron/voron2_350_v6_0.80.inst.cfg similarity index 99% rename from resources/variants/voron2_350_v6_0.80.inst.cfg rename to resources/variants/voron/voron2_350_v6_0.80.inst.cfg index 6bf82dcedf..14b8b3f1b3 100644 --- a/resources/variants/voron2_350_v6_0.80.inst.cfg +++ b/resources/variants/voron/voron2_350_v6_0.80.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_350 name = V6 0.80mm version = 4 -definition = voron2_350 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/voron2_350_volcano_0.40.inst.cfg b/resources/variants/voron/voron2_350_volcano_0.40.inst.cfg similarity index 99% rename from resources/variants/voron2_350_volcano_0.40.inst.cfg rename to resources/variants/voron/voron2_350_volcano_0.40.inst.cfg index bef5b6cc03..e17b51a8b0 100644 --- a/resources/variants/voron2_350_volcano_0.40.inst.cfg +++ b/resources/variants/voron/voron2_350_volcano_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_350 name = Volcano 0.40mm version = 4 -definition = voron2_350 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/voron2_350_volcano_0.60.inst.cfg b/resources/variants/voron/voron2_350_volcano_0.60.inst.cfg similarity index 99% rename from resources/variants/voron2_350_volcano_0.60.inst.cfg rename to resources/variants/voron/voron2_350_volcano_0.60.inst.cfg index a66086f0fa..f254c106ec 100644 --- a/resources/variants/voron2_350_volcano_0.60.inst.cfg +++ b/resources/variants/voron/voron2_350_volcano_0.60.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_350 name = Volcano 0.60mm version = 4 -definition = voron2_350 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/voron2_350_volcano_0.80.inst.cfg b/resources/variants/voron/voron2_350_volcano_0.80.inst.cfg similarity index 99% rename from resources/variants/voron2_350_volcano_0.80.inst.cfg rename to resources/variants/voron/voron2_350_volcano_0.80.inst.cfg index b618425278..457532fd10 100644 --- a/resources/variants/voron2_350_volcano_0.80.inst.cfg +++ b/resources/variants/voron/voron2_350_volcano_0.80.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_350 name = Volcano 0.80mm version = 4 -definition = voron2_350 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/voron2_350_volcano_1.00.inst.cfg b/resources/variants/voron/voron2_350_volcano_1.00.inst.cfg similarity index 99% rename from resources/variants/voron2_350_volcano_1.00.inst.cfg rename to resources/variants/voron/voron2_350_volcano_1.00.inst.cfg index 0b3d783be0..ccb0e8d290 100644 --- a/resources/variants/voron2_350_volcano_1.00.inst.cfg +++ b/resources/variants/voron/voron2_350_volcano_1.00.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_350 name = Volcano 1.00mm version = 4 -definition = voron2_350 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/voron2_350_volcano_1.20.inst.cfg b/resources/variants/voron/voron2_350_volcano_1.20.inst.cfg similarity index 99% rename from resources/variants/voron2_350_volcano_1.20.inst.cfg rename to resources/variants/voron/voron2_350_volcano_1.20.inst.cfg index 5b991afa2a..c1d43a123f 100644 --- a/resources/variants/voron2_350_volcano_1.20.inst.cfg +++ b/resources/variants/voron/voron2_350_volcano_1.20.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_350 name = Volcano 1.20mm version = 4 -definition = voron2_350 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.2 + diff --git a/resources/variants/voron2_custom_v6_0.25.inst.cfg b/resources/variants/voron/voron2_custom_v6_0.25.inst.cfg similarity index 99% rename from resources/variants/voron2_custom_v6_0.25.inst.cfg rename to resources/variants/voron/voron2_custom_v6_0.25.inst.cfg index f219f2db1f..45984fadd0 100644 --- a/resources/variants/voron2_custom_v6_0.25.inst.cfg +++ b/resources/variants/voron/voron2_custom_v6_0.25.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_custom name = V6 0.25mm version = 4 -definition = voron2_custom [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.25 + diff --git a/resources/variants/voron2_custom_v6_0.30.inst.cfg b/resources/variants/voron/voron2_custom_v6_0.30.inst.cfg similarity index 99% rename from resources/variants/voron2_custom_v6_0.30.inst.cfg rename to resources/variants/voron/voron2_custom_v6_0.30.inst.cfg index 94d65b7fe3..8f6968cd1d 100644 --- a/resources/variants/voron2_custom_v6_0.30.inst.cfg +++ b/resources/variants/voron/voron2_custom_v6_0.30.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_custom name = V6 0.30mm version = 4 -definition = voron2_custom [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.30 + diff --git a/resources/variants/voron2_custom_v6_0.35.inst.cfg b/resources/variants/voron/voron2_custom_v6_0.35.inst.cfg similarity index 99% rename from resources/variants/voron2_custom_v6_0.35.inst.cfg rename to resources/variants/voron/voron2_custom_v6_0.35.inst.cfg index 3aa9325a05..e28dc46821 100644 --- a/resources/variants/voron2_custom_v6_0.35.inst.cfg +++ b/resources/variants/voron/voron2_custom_v6_0.35.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_custom name = V6 0.35mm version = 4 -definition = voron2_custom [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.35 + diff --git a/resources/variants/voron2_custom_v6_0.40.inst.cfg b/resources/variants/voron/voron2_custom_v6_0.40.inst.cfg similarity index 99% rename from resources/variants/voron2_custom_v6_0.40.inst.cfg rename to resources/variants/voron/voron2_custom_v6_0.40.inst.cfg index bea32ae3e0..fac58ea4ce 100644 --- a/resources/variants/voron2_custom_v6_0.40.inst.cfg +++ b/resources/variants/voron/voron2_custom_v6_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_custom name = V6 0.40mm version = 4 -definition = voron2_custom [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/voron2_custom_v6_0.50.inst.cfg b/resources/variants/voron/voron2_custom_v6_0.50.inst.cfg similarity index 99% rename from resources/variants/voron2_custom_v6_0.50.inst.cfg rename to resources/variants/voron/voron2_custom_v6_0.50.inst.cfg index 01e0086ccd..f1454b21e6 100644 --- a/resources/variants/voron2_custom_v6_0.50.inst.cfg +++ b/resources/variants/voron/voron2_custom_v6_0.50.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_custom name = V6 0.50mm version = 4 -definition = voron2_custom [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/voron2_custom_v6_0.60.inst.cfg b/resources/variants/voron/voron2_custom_v6_0.60.inst.cfg similarity index 99% rename from resources/variants/voron2_custom_v6_0.60.inst.cfg rename to resources/variants/voron/voron2_custom_v6_0.60.inst.cfg index 4de2900131..23d8a2e505 100644 --- a/resources/variants/voron2_custom_v6_0.60.inst.cfg +++ b/resources/variants/voron/voron2_custom_v6_0.60.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_custom name = V6 0.60mm version = 4 -definition = voron2_custom [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/voron2_custom_v6_0.80.inst.cfg b/resources/variants/voron/voron2_custom_v6_0.80.inst.cfg similarity index 99% rename from resources/variants/voron2_custom_v6_0.80.inst.cfg rename to resources/variants/voron/voron2_custom_v6_0.80.inst.cfg index b6cf830a5b..9bc89c2173 100644 --- a/resources/variants/voron2_custom_v6_0.80.inst.cfg +++ b/resources/variants/voron/voron2_custom_v6_0.80.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_custom name = V6 0.80mm version = 4 -definition = voron2_custom [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/voron2_custom_volcano_0.40.inst.cfg b/resources/variants/voron/voron2_custom_volcano_0.40.inst.cfg similarity index 99% rename from resources/variants/voron2_custom_volcano_0.40.inst.cfg rename to resources/variants/voron/voron2_custom_volcano_0.40.inst.cfg index f2d3909675..04a8637605 100644 --- a/resources/variants/voron2_custom_volcano_0.40.inst.cfg +++ b/resources/variants/voron/voron2_custom_volcano_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_custom name = Volcano 0.40mm version = 4 -definition = voron2_custom [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/voron2_custom_volcano_0.60.inst.cfg b/resources/variants/voron/voron2_custom_volcano_0.60.inst.cfg similarity index 99% rename from resources/variants/voron2_custom_volcano_0.60.inst.cfg rename to resources/variants/voron/voron2_custom_volcano_0.60.inst.cfg index 648901577a..ce2c0039f4 100644 --- a/resources/variants/voron2_custom_volcano_0.60.inst.cfg +++ b/resources/variants/voron/voron2_custom_volcano_0.60.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_custom name = Volcano 0.60mm version = 4 -definition = voron2_custom [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/voron2_custom_volcano_0.80.inst.cfg b/resources/variants/voron/voron2_custom_volcano_0.80.inst.cfg similarity index 99% rename from resources/variants/voron2_custom_volcano_0.80.inst.cfg rename to resources/variants/voron/voron2_custom_volcano_0.80.inst.cfg index cc15bc5116..a27343dc57 100644 --- a/resources/variants/voron2_custom_volcano_0.80.inst.cfg +++ b/resources/variants/voron/voron2_custom_volcano_0.80.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_custom name = Volcano 0.80mm version = 4 -definition = voron2_custom [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/voron2_custom_volcano_1.00.inst.cfg b/resources/variants/voron/voron2_custom_volcano_1.00.inst.cfg similarity index 99% rename from resources/variants/voron2_custom_volcano_1.00.inst.cfg rename to resources/variants/voron/voron2_custom_volcano_1.00.inst.cfg index 1f1c06dd1a..013aa4512f 100644 --- a/resources/variants/voron2_custom_volcano_1.00.inst.cfg +++ b/resources/variants/voron/voron2_custom_volcano_1.00.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_custom name = Volcano 1.00mm version = 4 -definition = voron2_custom [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/voron2_custom_volcano_1.20.inst.cfg b/resources/variants/voron/voron2_custom_volcano_1.20.inst.cfg similarity index 99% rename from resources/variants/voron2_custom_volcano_1.20.inst.cfg rename to resources/variants/voron/voron2_custom_volcano_1.20.inst.cfg index bbca4835cf..7eb26a6cce 100644 --- a/resources/variants/voron2_custom_volcano_1.20.inst.cfg +++ b/resources/variants/voron/voron2_custom_volcano_1.20.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = voron2_custom name = Volcano 1.20mm version = 4 -definition = voron2_custom [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.2 + diff --git a/resources/variants/vzbot_235_0.2.inst.cfg b/resources/variants/vzbot/vzbot_235_0.2.inst.cfg similarity index 99% rename from resources/variants/vzbot_235_0.2.inst.cfg rename to resources/variants/vzbot/vzbot_235_0.2.inst.cfg index 5c2b903dda..44c3f31228 100644 --- a/resources/variants/vzbot_235_0.2.inst.cfg +++ b/resources/variants/vzbot/vzbot_235_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = vzbot_235 name = 0.2mm Nozzle version = 4 -definition = vzbot_235 [metadata] +hardware_type = nozzle 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/vzbot_235_0.3.inst.cfg similarity index 99% rename from resources/variants/vzbot_235_0.3.inst.cfg rename to resources/variants/vzbot/vzbot_235_0.3.inst.cfg index 4a5bced2d4..2c6ee2a1ac 100644 --- a/resources/variants/vzbot_235_0.3.inst.cfg +++ b/resources/variants/vzbot/vzbot_235_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = vzbot_235 name = 0.3mm Nozzle version = 4 -definition = vzbot_235 [metadata] +hardware_type = nozzle 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/vzbot_235_0.4.inst.cfg similarity index 99% rename from resources/variants/vzbot_235_0.4.inst.cfg rename to resources/variants/vzbot/vzbot_235_0.4.inst.cfg index 9ecffce8ed..dc44ab0b95 100644 --- a/resources/variants/vzbot_235_0.4.inst.cfg +++ b/resources/variants/vzbot/vzbot_235_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = vzbot_235 name = 0.4mm Nozzle version = 4 -definition = vzbot_235 [metadata] +hardware_type = nozzle 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/vzbot_235_0.5.inst.cfg similarity index 99% rename from resources/variants/vzbot_235_0.5.inst.cfg rename to resources/variants/vzbot/vzbot_235_0.5.inst.cfg index 893d31971f..94e4bdd47f 100644 --- a/resources/variants/vzbot_235_0.5.inst.cfg +++ b/resources/variants/vzbot/vzbot_235_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = vzbot_235 name = 0.5mm Nozzle version = 4 -definition = vzbot_235 [metadata] +hardware_type = nozzle 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/vzbot_235_0.6.inst.cfg similarity index 99% rename from resources/variants/vzbot_235_0.6.inst.cfg rename to resources/variants/vzbot/vzbot_235_0.6.inst.cfg index 817d15cc1e..8b204d374f 100644 --- a/resources/variants/vzbot_235_0.6.inst.cfg +++ b/resources/variants/vzbot/vzbot_235_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = vzbot_235 name = 0.6mm Nozzle version = 4 -definition = vzbot_235 [metadata] +hardware_type = nozzle 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/vzbot_235_0.8.inst.cfg similarity index 99% rename from resources/variants/vzbot_235_0.8.inst.cfg rename to resources/variants/vzbot/vzbot_235_0.8.inst.cfg index 2fc4f93e35..3961d54925 100644 --- a/resources/variants/vzbot_235_0.8.inst.cfg +++ b/resources/variants/vzbot/vzbot_235_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = vzbot_235 name = 0.8mm Nozzle version = 4 -definition = vzbot_235 [metadata] +hardware_type = nozzle 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/vzbot_235_1.0.inst.cfg similarity index 99% rename from resources/variants/vzbot_235_1.0.inst.cfg rename to resources/variants/vzbot/vzbot_235_1.0.inst.cfg index a7579393f4..6f7ed38705 100644 --- a/resources/variants/vzbot_235_1.0.inst.cfg +++ b/resources/variants/vzbot/vzbot_235_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = vzbot_235 name = 1.0mm Nozzle version = 4 -definition = vzbot_235 [metadata] +hardware_type = nozzle 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/vzbot_330_0.2.inst.cfg similarity index 99% rename from resources/variants/vzbot_330_0.2.inst.cfg rename to resources/variants/vzbot/vzbot_330_0.2.inst.cfg index 8282d0b515..3b072b471e 100644 --- a/resources/variants/vzbot_330_0.2.inst.cfg +++ b/resources/variants/vzbot/vzbot_330_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = vzbot_330 name = 0.2mm Nozzle version = 4 -definition = vzbot_330 [metadata] +hardware_type = nozzle 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/vzbot_330_0.3.inst.cfg similarity index 99% rename from resources/variants/vzbot_330_0.3.inst.cfg rename to resources/variants/vzbot/vzbot_330_0.3.inst.cfg index 47aa3da7a4..d0e2567f58 100644 --- a/resources/variants/vzbot_330_0.3.inst.cfg +++ b/resources/variants/vzbot/vzbot_330_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = vzbot_330 name = 0.3mm Nozzle version = 4 -definition = vzbot_330 [metadata] +hardware_type = nozzle 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/vzbot_330_0.4.inst.cfg similarity index 99% rename from resources/variants/vzbot_330_0.4.inst.cfg rename to resources/variants/vzbot/vzbot_330_0.4.inst.cfg index 0ab8682c14..da5c3345e4 100644 --- a/resources/variants/vzbot_330_0.4.inst.cfg +++ b/resources/variants/vzbot/vzbot_330_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = vzbot_330 name = 0.4mm Nozzle version = 4 -definition = vzbot_330 [metadata] +hardware_type = nozzle 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/vzbot_330_0.5.inst.cfg similarity index 99% rename from resources/variants/vzbot_330_0.5.inst.cfg rename to resources/variants/vzbot/vzbot_330_0.5.inst.cfg index 2f6c769157..4b142c85a6 100644 --- a/resources/variants/vzbot_330_0.5.inst.cfg +++ b/resources/variants/vzbot/vzbot_330_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = vzbot_330 name = 0.5mm Nozzle version = 4 -definition = vzbot_330 [metadata] +hardware_type = nozzle 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/vzbot_330_0.6.inst.cfg similarity index 99% rename from resources/variants/vzbot_330_0.6.inst.cfg rename to resources/variants/vzbot/vzbot_330_0.6.inst.cfg index af6056193b..d399d4eb31 100644 --- a/resources/variants/vzbot_330_0.6.inst.cfg +++ b/resources/variants/vzbot/vzbot_330_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = vzbot_330 name = 0.6mm Nozzle version = 4 -definition = vzbot_330 [metadata] +hardware_type = nozzle 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/vzbot_330_0.8.inst.cfg similarity index 99% rename from resources/variants/vzbot_330_0.8.inst.cfg rename to resources/variants/vzbot/vzbot_330_0.8.inst.cfg index e3cc83dc14..ca2be6a097 100644 --- a/resources/variants/vzbot_330_0.8.inst.cfg +++ b/resources/variants/vzbot/vzbot_330_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = vzbot_330 name = 0.8mm Nozzle version = 4 -definition = vzbot_330 [metadata] +hardware_type = nozzle 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/vzbot_330_1.0.inst.cfg similarity index 99% rename from resources/variants/vzbot_330_1.0.inst.cfg rename to resources/variants/vzbot/vzbot_330_1.0.inst.cfg index 941923dbc4..5e0bfb2264 100644 --- a/resources/variants/vzbot_330_1.0.inst.cfg +++ b/resources/variants/vzbot/vzbot_330_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = vzbot_330 name = 1.0mm Nozzle version = 4 -definition = vzbot_330 [metadata] +hardware_type = nozzle 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/vzbot_base_0.2.inst.cfg similarity index 99% rename from resources/variants/vzbot_base_0.2.inst.cfg rename to resources/variants/vzbot/vzbot_base_0.2.inst.cfg index 096566ba7e..8b31e8994b 100644 --- a/resources/variants/vzbot_base_0.2.inst.cfg +++ b/resources/variants/vzbot/vzbot_base_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = vzbot_base name = 0.2mm Nozzle version = 4 -definition = vzbot_base [metadata] +hardware_type = nozzle 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/vzbot_base_0.3.inst.cfg similarity index 99% rename from resources/variants/vzbot_base_0.3.inst.cfg rename to resources/variants/vzbot/vzbot_base_0.3.inst.cfg index 30846ff01e..8daa3e0cb9 100644 --- a/resources/variants/vzbot_base_0.3.inst.cfg +++ b/resources/variants/vzbot/vzbot_base_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = vzbot_base name = 0.3mm Nozzle version = 4 -definition = vzbot_base [metadata] +hardware_type = nozzle 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/vzbot_base_0.4.inst.cfg similarity index 99% rename from resources/variants/vzbot_base_0.4.inst.cfg rename to resources/variants/vzbot/vzbot_base_0.4.inst.cfg index 0a688f554f..e754bab01c 100644 --- a/resources/variants/vzbot_base_0.4.inst.cfg +++ b/resources/variants/vzbot/vzbot_base_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = vzbot_base name = 0.4mm Nozzle version = 4 -definition = vzbot_base [metadata] +hardware_type = nozzle 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/vzbot_base_0.5.inst.cfg similarity index 99% rename from resources/variants/vzbot_base_0.5.inst.cfg rename to resources/variants/vzbot/vzbot_base_0.5.inst.cfg index a0f1a78052..da8be06fa1 100644 --- a/resources/variants/vzbot_base_0.5.inst.cfg +++ b/resources/variants/vzbot/vzbot_base_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = vzbot_base name = 0.5mm Nozzle version = 4 -definition = vzbot_base [metadata] +hardware_type = nozzle 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/vzbot_base_0.6.inst.cfg similarity index 99% rename from resources/variants/vzbot_base_0.6.inst.cfg rename to resources/variants/vzbot/vzbot_base_0.6.inst.cfg index f6b8b1e26e..1fa9b1ba22 100644 --- a/resources/variants/vzbot_base_0.6.inst.cfg +++ b/resources/variants/vzbot/vzbot_base_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = vzbot_base name = 0.6mm Nozzle version = 4 -definition = vzbot_base [metadata] +hardware_type = nozzle 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/vzbot_base_0.8.inst.cfg similarity index 99% rename from resources/variants/vzbot_base_0.8.inst.cfg rename to resources/variants/vzbot/vzbot_base_0.8.inst.cfg index e8edeebd0c..9f68c4ad8a 100644 --- a/resources/variants/vzbot_base_0.8.inst.cfg +++ b/resources/variants/vzbot/vzbot_base_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = vzbot_base name = 0.8mm Nozzle version = 4 -definition = vzbot_base [metadata] +hardware_type = nozzle 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/vzbot_base_1.0.inst.cfg similarity index 99% rename from resources/variants/vzbot_base_1.0.inst.cfg rename to resources/variants/vzbot/vzbot_base_1.0.inst.cfg index 146af12ed5..d9e68d31de 100644 --- a/resources/variants/vzbot_base_1.0.inst.cfg +++ b/resources/variants/vzbot/vzbot_base_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = vzbot_base name = 1.0mm Nozzle version = 4 -definition = vzbot_base [metadata] +hardware_type = nozzle 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/vzbot_custom_0.2.inst.cfg similarity index 99% rename from resources/variants/vzbot_custom_0.2.inst.cfg rename to resources/variants/vzbot/vzbot_custom_0.2.inst.cfg index 0995beb6aa..a983bd8272 100644 --- a/resources/variants/vzbot_custom_0.2.inst.cfg +++ b/resources/variants/vzbot/vzbot_custom_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = vzbot_custom name = 0.2mm Nozzle version = 4 -definition = vzbot_custom [metadata] +hardware_type = nozzle 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/vzbot_custom_0.3.inst.cfg similarity index 99% rename from resources/variants/vzbot_custom_0.3.inst.cfg rename to resources/variants/vzbot/vzbot_custom_0.3.inst.cfg index e69dccecf5..e28b4bcf3d 100644 --- a/resources/variants/vzbot_custom_0.3.inst.cfg +++ b/resources/variants/vzbot/vzbot_custom_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = vzbot_custom name = 0.3mm Nozzle version = 4 -definition = vzbot_custom [metadata] +hardware_type = nozzle 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/vzbot_custom_0.4.inst.cfg similarity index 99% rename from resources/variants/vzbot_custom_0.4.inst.cfg rename to resources/variants/vzbot/vzbot_custom_0.4.inst.cfg index 92aa190807..1565c937e0 100644 --- a/resources/variants/vzbot_custom_0.4.inst.cfg +++ b/resources/variants/vzbot/vzbot_custom_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = vzbot_custom name = 0.4mm Nozzle version = 4 -definition = vzbot_custom [metadata] +hardware_type = nozzle 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/vzbot_custom_0.5.inst.cfg similarity index 99% rename from resources/variants/vzbot_custom_0.5.inst.cfg rename to resources/variants/vzbot/vzbot_custom_0.5.inst.cfg index eecc26ea6d..00380828c7 100644 --- a/resources/variants/vzbot_custom_0.5.inst.cfg +++ b/resources/variants/vzbot/vzbot_custom_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = vzbot_custom name = 0.5mm Nozzle version = 4 -definition = vzbot_custom [metadata] +hardware_type = nozzle 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/vzbot_custom_0.6.inst.cfg similarity index 99% rename from resources/variants/vzbot_custom_0.6.inst.cfg rename to resources/variants/vzbot/vzbot_custom_0.6.inst.cfg index 3b094400b2..b456eb1b3f 100644 --- a/resources/variants/vzbot_custom_0.6.inst.cfg +++ b/resources/variants/vzbot/vzbot_custom_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = vzbot_custom name = 0.6mm Nozzle version = 4 -definition = vzbot_custom [metadata] +hardware_type = nozzle 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/vzbot_custom_0.8.inst.cfg similarity index 99% rename from resources/variants/vzbot_custom_0.8.inst.cfg rename to resources/variants/vzbot/vzbot_custom_0.8.inst.cfg index d8a16a7e99..b90db64480 100644 --- a/resources/variants/vzbot_custom_0.8.inst.cfg +++ b/resources/variants/vzbot/vzbot_custom_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = vzbot_custom name = 0.8mm Nozzle version = 4 -definition = vzbot_custom [metadata] +hardware_type = nozzle 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/vzbot_custom_1.0.inst.cfg similarity index 99% rename from resources/variants/vzbot_custom_1.0.inst.cfg rename to resources/variants/vzbot/vzbot_custom_1.0.inst.cfg index 74b029a6a0..b7f15e6273 100644 --- a/resources/variants/vzbot_custom_1.0.inst.cfg +++ b/resources/variants/vzbot/vzbot_custom_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = vzbot_custom name = 1.0mm Nozzle version = 4 -definition = vzbot_custom [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/weedo_x40_weedo_0.4.inst.cfg b/resources/variants/weedo/weedo_x40_weedo_0.4.inst.cfg similarity index 99% rename from resources/variants/weedo_x40_weedo_0.4.inst.cfg rename to resources/variants/weedo/weedo_x40_weedo_0.4.inst.cfg index cf626e62ac..021b63f254 100644 --- a/resources/variants/weedo_x40_weedo_0.4.inst.cfg +++ b/resources/variants/weedo/weedo_x40_weedo_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = weedo_x40 name = 0.4mm Nozzle version = 4 -definition = weedo_x40 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/weedo_x40_weedo_0.6.inst.cfg b/resources/variants/weedo/weedo_x40_weedo_0.6.inst.cfg similarity index 99% rename from resources/variants/weedo_x40_weedo_0.6.inst.cfg rename to resources/variants/weedo/weedo_x40_weedo_0.6.inst.cfg index cf67c40978..f27e15ba71 100644 --- a/resources/variants/weedo_x40_weedo_0.6.inst.cfg +++ b/resources/variants/weedo/weedo_x40_weedo_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = weedo_x40 name = 0.6mm Nozzle version = 4 -definition = weedo_x40 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/weedo_x40_weedo_0.8.inst.cfg b/resources/variants/weedo/weedo_x40_weedo_0.8.inst.cfg similarity index 99% rename from resources/variants/weedo_x40_weedo_0.8.inst.cfg rename to resources/variants/weedo/weedo_x40_weedo_0.8.inst.cfg index c9afadf4aa..3ee94c61bf 100644 --- a/resources/variants/weedo_x40_weedo_0.8.inst.cfg +++ b/resources/variants/weedo/weedo_x40_weedo_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = weedo_x40 name = 0.8mm Nozzle version = 4 -definition = weedo_x40 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/xyzprinting_base_0.40.inst.cfg b/resources/variants/xyz_printing/xyzprinting_base_0.40.inst.cfg similarity index 99% rename from resources/variants/xyzprinting_base_0.40.inst.cfg rename to resources/variants/xyz_printing/xyzprinting_base_0.40.inst.cfg index 61b6c22e98..0ceed679c1 100644 --- a/resources/variants/xyzprinting_base_0.40.inst.cfg +++ b/resources/variants/xyz_printing/xyzprinting_base_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = xyzprinting_base name = 0.4mm Nozzle version = 4 -definition = xyzprinting_base [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/xyzprinting_da_vinci_1p0_pro_copper_0.40.inst.cfg b/resources/variants/xyz_printing/xyzprinting_da_vinci_1p0_pro_copper_0.40.inst.cfg similarity index 82% rename from resources/variants/xyzprinting_da_vinci_1p0_pro_copper_0.40.inst.cfg rename to resources/variants/xyz_printing/xyzprinting_da_vinci_1p0_pro_copper_0.40.inst.cfg index 21bff4ac30..d92bf045b5 100644 --- a/resources/variants/xyzprinting_da_vinci_1p0_pro_copper_0.40.inst.cfg +++ b/resources/variants/xyz_printing/xyzprinting_da_vinci_1p0_pro_copper_0.40.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = xyzprinting_da_vinci_1p0_pro name = Copper 0.4mm Nozzle version = 4 -definition = xyzprinting_da_vinci_1p0_pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +machine_nozzle_id = Copper 0.4mm Nozzle machine_nozzle_size = 0.4 -machine_nozzle_id = Copper 0.4mm Nozzle \ No newline at end of file + diff --git a/resources/variants/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40.inst.cfg b/resources/variants/xyz_printing/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40.inst.cfg similarity index 83% rename from resources/variants/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40.inst.cfg rename to resources/variants/xyz_printing/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40.inst.cfg index 3eaa537267..6d05978ffa 100644 --- a/resources/variants/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40.inst.cfg +++ b/resources/variants/xyz_printing/xyzprinting_da_vinci_jr_1p0a_pro_copper_0.40.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = xyzprinting_da_vinci_jr_1p0a_pro name = Copper 0.4mm Nozzle version = 4 -definition = xyzprinting_da_vinci_jr_1p0a_pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +machine_nozzle_id = Copper 0.4mm Nozzle machine_nozzle_size = 0.4 -machine_nozzle_id = Copper 0.4mm Nozzle \ No newline at end of file + diff --git a/resources/variants/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40.inst.cfg b/resources/variants/xyz_printing/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40.inst.cfg similarity index 81% rename from resources/variants/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40.inst.cfg rename to resources/variants/xyz_printing/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40.inst.cfg index 7438b3137b..2049e13a65 100644 --- a/resources/variants/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40.inst.cfg +++ b/resources/variants/xyz_printing/xyzprinting_da_vinci_jr_1p0a_pro_hs_0.40.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = xyzprinting_da_vinci_jr_1p0a_pro name = Hardened Steel 0.4mm Nozzle version = 4 -definition = xyzprinting_da_vinci_jr_1p0a_pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +machine_nozzle_id = Hardened Steel 0.4mm Nozzle machine_nozzle_size = 0.4 -machine_nozzle_id = Hardened Steel 0.4mm Nozzle \ No newline at end of file + diff --git a/resources/variants/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40.inst.cfg b/resources/variants/xyz_printing/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40.inst.cfg similarity index 99% rename from resources/variants/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40.inst.cfg rename to resources/variants/xyz_printing/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40.inst.cfg index 1596afe256..d22dc6f316 100644 --- a/resources/variants/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40.inst.cfg +++ b/resources/variants/xyz_printing/xyzprinting_da_vinci_jr_pro_xeplus_copper_0.40.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = xyzprinting_da_vinci_jr_pro_xeplus name = Copper 0.4mm Nozzle version = 4 -definition = xyzprinting_da_vinci_jr_pro_xeplus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.4 machine_nozzle_id = Copper 0.4mm Nozzle +machine_nozzle_size = 0.4 + diff --git a/resources/variants/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40.inst.cfg b/resources/variants/xyz_printing/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40.inst.cfg similarity index 99% rename from resources/variants/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40.inst.cfg rename to resources/variants/xyz_printing/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40.inst.cfg index 8b454ffd0a..7c7ee583a1 100644 --- a/resources/variants/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40.inst.cfg +++ b/resources/variants/xyz_printing/xyzprinting_da_vinci_jr_pro_xeplus_hs_0.40.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = xyzprinting_da_vinci_jr_pro_xeplus name = Hardened Steel 0.4mm Nozzle version = 4 -definition = xyzprinting_da_vinci_jr_pro_xeplus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.4 machine_nozzle_id = Hardened Steel 0.4mm Nozzle +machine_nozzle_size = 0.4 + diff --git a/resources/variants/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40.inst.cfg b/resources/variants/xyz_printing/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40.inst.cfg similarity index 99% rename from resources/variants/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40.inst.cfg rename to resources/variants/xyz_printing/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40.inst.cfg index e809c2805e..28db7a6059 100644 --- a/resources/variants/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40.inst.cfg +++ b/resources/variants/xyz_printing/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = xyzprinting_da_vinci_jr_pro_xplus name = Copper 0.4mm Nozzle version = 4 -definition = xyzprinting_da_vinci_jr_pro_xplus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.4 machine_nozzle_id = Copper 0.4mm Nozzle +machine_nozzle_size = 0.4 + diff --git a/resources/variants/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40.inst.cfg b/resources/variants/xyz_printing/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40.inst.cfg similarity index 99% rename from resources/variants/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40.inst.cfg rename to resources/variants/xyz_printing/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40.inst.cfg index 0a1141cbb0..fb629e6742 100644 --- a/resources/variants/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40.inst.cfg +++ b/resources/variants/xyz_printing/xyzprinting_da_vinci_jr_pro_xplus_hs_0.40.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = xyzprinting_da_vinci_jr_pro_xplus name = Hardened Steel 0.4mm Nozzle version = 4 -definition = xyzprinting_da_vinci_jr_pro_xplus [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.4 machine_nozzle_id = Hardened Steel 0.4mm Nozzle +machine_nozzle_size = 0.4 + diff --git a/resources/variants/xyzprinting_da_vinci_jr_w_pro_hs_0.40.inst.cfg b/resources/variants/xyz_printing/xyzprinting_da_vinci_jr_w_pro_hs_0.40.inst.cfg similarity index 80% rename from resources/variants/xyzprinting_da_vinci_jr_w_pro_hs_0.40.inst.cfg rename to resources/variants/xyz_printing/xyzprinting_da_vinci_jr_w_pro_hs_0.40.inst.cfg index cc90d08d61..7f1d6eb50d 100644 --- a/resources/variants/xyzprinting_da_vinci_jr_w_pro_hs_0.40.inst.cfg +++ b/resources/variants/xyz_printing/xyzprinting_da_vinci_jr_w_pro_hs_0.40.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = xyzprinting_da_vinci_jr_w_pro name = Hardened Steel 0.4mm Nozzle version = 4 -definition = xyzprinting_da_vinci_jr_w_pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +machine_nozzle_id = Hardened Steel 0.4mm Nozzle machine_nozzle_size = 0.4 -machine_nozzle_id = Hardened Steel 0.4mm Nozzle \ No newline at end of file + diff --git a/resources/variants/xyzprinting_da_vinci_jr_w_pro_ss_0.40.inst.cfg b/resources/variants/xyz_printing/xyzprinting_da_vinci_jr_w_pro_ss_0.40.inst.cfg similarity index 80% rename from resources/variants/xyzprinting_da_vinci_jr_w_pro_ss_0.40.inst.cfg rename to resources/variants/xyz_printing/xyzprinting_da_vinci_jr_w_pro_ss_0.40.inst.cfg index 2b5dd8f184..1a57748099 100644 --- a/resources/variants/xyzprinting_da_vinci_jr_w_pro_ss_0.40.inst.cfg +++ b/resources/variants/xyz_printing/xyzprinting_da_vinci_jr_w_pro_ss_0.40.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = xyzprinting_da_vinci_jr_w_pro name = Stainless Steel 0.4mm Nozzle version = 4 -definition = xyzprinting_da_vinci_jr_w_pro [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] +machine_nozzle_id = Stainless Steel 0.4mm Nozzle machine_nozzle_size = 0.4 -machine_nozzle_id = Stainless Steel 0.4mm Nozzle \ No newline at end of file + diff --git a/resources/variants/xyzprinting_da_vinci_pro_evo_hs_0.40.inst.cfg b/resources/variants/xyz_printing/xyzprinting_da_vinci_pro_evo_hs_0.40.inst.cfg similarity index 99% rename from resources/variants/xyzprinting_da_vinci_pro_evo_hs_0.40.inst.cfg rename to resources/variants/xyz_printing/xyzprinting_da_vinci_pro_evo_hs_0.40.inst.cfg index 087644e208..94402d7792 100644 --- a/resources/variants/xyzprinting_da_vinci_pro_evo_hs_0.40.inst.cfg +++ b/resources/variants/xyz_printing/xyzprinting_da_vinci_pro_evo_hs_0.40.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = xyzprinting_da_vinci_pro_evo name = Hardened Steel 0.4mm Nozzle version = 4 -definition = xyzprinting_da_vinci_pro_evo [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.4 machine_nozzle_id = Hardened Steel 0.4mm Nozzle +machine_nozzle_size = 0.4 + diff --git a/resources/variants/xyzprinting_da_vinci_pro_evo_hsht_0.60.inst.cfg b/resources/variants/xyz_printing/xyzprinting_da_vinci_pro_evo_hsht_0.60.inst.cfg similarity index 99% rename from resources/variants/xyzprinting_da_vinci_pro_evo_hsht_0.60.inst.cfg rename to resources/variants/xyz_printing/xyzprinting_da_vinci_pro_evo_hsht_0.60.inst.cfg index 1337d87cbc..57d341d485 100644 --- a/resources/variants/xyzprinting_da_vinci_pro_evo_hsht_0.60.inst.cfg +++ b/resources/variants/xyz_printing/xyzprinting_da_vinci_pro_evo_hsht_0.60.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = xyzprinting_da_vinci_pro_evo name = Hardened Steel High Temp. 0.6mm Nozzle version = 4 -definition = xyzprinting_da_vinci_pro_evo [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.6 machine_nozzle_id = Hardened Steel High Temp. 0.6mm Nozzle +machine_nozzle_size = 0.6 + diff --git a/resources/variants/xyzprinting_da_vinci_super_copper_0.40.inst.cfg b/resources/variants/xyz_printing/xyzprinting_da_vinci_super_copper_0.40.inst.cfg similarity index 99% rename from resources/variants/xyzprinting_da_vinci_super_copper_0.40.inst.cfg rename to resources/variants/xyz_printing/xyzprinting_da_vinci_super_copper_0.40.inst.cfg index 328d7df137..e5db76b348 100644 --- a/resources/variants/xyzprinting_da_vinci_super_copper_0.40.inst.cfg +++ b/resources/variants/xyz_printing/xyzprinting_da_vinci_super_copper_0.40.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = xyzprinting_da_vinci_super name = Copper 0.4mm Nozzle version = 4 -definition = xyzprinting_da_vinci_super [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.4 machine_nozzle_id = Copper 0.4mm Nozzle +machine_nozzle_size = 0.4 + diff --git a/resources/variants/xyzprinting_da_vinci_super_hs_0.40.inst.cfg b/resources/variants/xyz_printing/xyzprinting_da_vinci_super_hs_0.40.inst.cfg similarity index 99% rename from resources/variants/xyzprinting_da_vinci_super_hs_0.40.inst.cfg rename to resources/variants/xyz_printing/xyzprinting_da_vinci_super_hs_0.40.inst.cfg index abdb0041fd..bd7c836c42 100644 --- a/resources/variants/xyzprinting_da_vinci_super_hs_0.40.inst.cfg +++ b/resources/variants/xyz_printing/xyzprinting_da_vinci_super_hs_0.40.inst.cfg @@ -1,13 +1,14 @@ [general] +definition = xyzprinting_da_vinci_super name = Hardened Steel 0.4mm Nozzle version = 4 -definition = xyzprinting_da_vinci_super [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.4 machine_nozzle_id = Hardened Steel 0.4mm Nozzle +machine_nozzle_size = 0.4 + diff --git a/resources/variants/zav_base_0.20.inst.cfg b/resources/variants/zav/zav_base_0.20.inst.cfg similarity index 85% rename from resources/variants/zav_base_0.20.inst.cfg rename to resources/variants/zav/zav_base_0.20.inst.cfg index 31773522e9..40ae02553d 100644 --- a/resources/variants/zav_base_0.20.inst.cfg +++ b/resources/variants/zav/zav_base_0.20.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.20mm_ZAV_Nozzle -version = 4 definition = zav_base +name = 0.20mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/zav_base_0.25.inst.cfg b/resources/variants/zav/zav_base_0.25.inst.cfg similarity index 85% rename from resources/variants/zav_base_0.25.inst.cfg rename to resources/variants/zav/zav_base_0.25.inst.cfg index 86dcf25383..9b2aa230bb 100644 --- a/resources/variants/zav_base_0.25.inst.cfg +++ b/resources/variants/zav/zav_base_0.25.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.25mm_ZAV_Nozzle -version = 4 definition = zav_base +name = 0.25mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.25 + diff --git a/resources/variants/zav_base_0.30.inst.cfg b/resources/variants/zav/zav_base_0.30.inst.cfg similarity index 85% rename from resources/variants/zav_base_0.30.inst.cfg rename to resources/variants/zav/zav_base_0.30.inst.cfg index 02ce05d5a5..2a551789f7 100644 --- a/resources/variants/zav_base_0.30.inst.cfg +++ b/resources/variants/zav/zav_base_0.30.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.30mm_ZAV_Nozzle -version = 4 definition = zav_base +name = 0.30mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/zav_base_0.35.inst.cfg b/resources/variants/zav/zav_base_0.35.inst.cfg similarity index 85% rename from resources/variants/zav_base_0.35.inst.cfg rename to resources/variants/zav/zav_base_0.35.inst.cfg index 75af3f362f..7827703e08 100644 --- a/resources/variants/zav_base_0.35.inst.cfg +++ b/resources/variants/zav/zav_base_0.35.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.35mm_ZAV_Nozzle -version = 4 definition = zav_base +name = 0.35mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.35 + diff --git a/resources/variants/zav_base_0.40.inst.cfg b/resources/variants/zav/zav_base_0.40.inst.cfg similarity index 85% rename from resources/variants/zav_base_0.40.inst.cfg rename to resources/variants/zav/zav_base_0.40.inst.cfg index ab0c247cc5..40916e38cc 100644 --- a/resources/variants/zav_base_0.40.inst.cfg +++ b/resources/variants/zav/zav_base_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.40mm_ZAV_Nozzle -version = 4 definition = zav_base +name = 0.40mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/zav_base_0.45.inst.cfg b/resources/variants/zav/zav_base_0.45.inst.cfg similarity index 85% rename from resources/variants/zav_base_0.45.inst.cfg rename to resources/variants/zav/zav_base_0.45.inst.cfg index ef78321972..532a2da0fc 100644 --- a/resources/variants/zav_base_0.45.inst.cfg +++ b/resources/variants/zav/zav_base_0.45.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.45mm_ZAV_Nozzle -version = 4 definition = zav_base +name = 0.45mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.45 + diff --git a/resources/variants/zav_base_0.50.inst.cfg b/resources/variants/zav/zav_base_0.50.inst.cfg similarity index 85% rename from resources/variants/zav_base_0.50.inst.cfg rename to resources/variants/zav/zav_base_0.50.inst.cfg index b9a855a575..03509c7fe7 100644 --- a/resources/variants/zav_base_0.50.inst.cfg +++ b/resources/variants/zav/zav_base_0.50.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.50mm_ZAV_Nozzle -version = 4 definition = zav_base +name = 0.50mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/zav_base_0.60.inst.cfg b/resources/variants/zav/zav_base_0.60.inst.cfg similarity index 85% rename from resources/variants/zav_base_0.60.inst.cfg rename to resources/variants/zav/zav_base_0.60.inst.cfg index 6c36067e96..d27e7ba1c2 100644 --- a/resources/variants/zav_base_0.60.inst.cfg +++ b/resources/variants/zav/zav_base_0.60.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.60mm_ZAV_Nozzle -version = 4 definition = zav_base +name = 0.60mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/zav_base_0.80.inst.cfg b/resources/variants/zav/zav_base_0.80.inst.cfg similarity index 85% rename from resources/variants/zav_base_0.80.inst.cfg rename to resources/variants/zav/zav_base_0.80.inst.cfg index dcd7d65128..d934b6c623 100644 --- a/resources/variants/zav_base_0.80.inst.cfg +++ b/resources/variants/zav/zav_base_0.80.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.80mm_ZAV_Nozzle -version = 4 definition = zav_base +name = 0.80mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/zav_base_1.00.inst.cfg b/resources/variants/zav/zav_base_1.00.inst.cfg similarity index 85% rename from resources/variants/zav_base_1.00.inst.cfg rename to resources/variants/zav/zav_base_1.00.inst.cfg index 501fa3ca30..9bb6c5dd96 100644 --- a/resources/variants/zav_base_1.00.inst.cfg +++ b/resources/variants/zav/zav_base_1.00.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 1.00mm_ZAV_Nozzle -version = 4 definition = zav_base +name = 1.00mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/zav_big_0.20.inst.cfg b/resources/variants/zav/zav_big_0.20.inst.cfg similarity index 85% rename from resources/variants/zav_big_0.20.inst.cfg rename to resources/variants/zav/zav_big_0.20.inst.cfg index d217275e4d..be45ba28df 100644 --- a/resources/variants/zav_big_0.20.inst.cfg +++ b/resources/variants/zav/zav_big_0.20.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.20mm_ZAV_Nozzle -version = 4 definition = zav_big +name = 0.20mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/zav_big_0.25.inst.cfg b/resources/variants/zav/zav_big_0.25.inst.cfg similarity index 85% rename from resources/variants/zav_big_0.25.inst.cfg rename to resources/variants/zav/zav_big_0.25.inst.cfg index 8c4412eada..e148927026 100644 --- a/resources/variants/zav_big_0.25.inst.cfg +++ b/resources/variants/zav/zav_big_0.25.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.25mm_ZAV_Nozzle -version = 4 definition = zav_big +name = 0.25mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.25 + diff --git a/resources/variants/zav_big_0.30.inst.cfg b/resources/variants/zav/zav_big_0.30.inst.cfg similarity index 85% rename from resources/variants/zav_big_0.30.inst.cfg rename to resources/variants/zav/zav_big_0.30.inst.cfg index aba2e32e05..e6648e68fe 100644 --- a/resources/variants/zav_big_0.30.inst.cfg +++ b/resources/variants/zav/zav_big_0.30.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.30mm_ZAV_Nozzle -version = 4 definition = zav_big +name = 0.30mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/zav_big_0.35.inst.cfg b/resources/variants/zav/zav_big_0.35.inst.cfg similarity index 85% rename from resources/variants/zav_big_0.35.inst.cfg rename to resources/variants/zav/zav_big_0.35.inst.cfg index 75e75f40ff..22a1d6c535 100644 --- a/resources/variants/zav_big_0.35.inst.cfg +++ b/resources/variants/zav/zav_big_0.35.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.35mm_ZAV_Nozzle -version = 4 definition = zav_big +name = 0.35mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.35 + diff --git a/resources/variants/zav_big_0.40.inst.cfg b/resources/variants/zav/zav_big_0.40.inst.cfg similarity index 85% rename from resources/variants/zav_big_0.40.inst.cfg rename to resources/variants/zav/zav_big_0.40.inst.cfg index 70dc568bae..7fc3ca425e 100644 --- a/resources/variants/zav_big_0.40.inst.cfg +++ b/resources/variants/zav/zav_big_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.40mm_ZAV_Nozzle -version = 4 definition = zav_big +name = 0.40mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/zav_big_0.45.inst.cfg b/resources/variants/zav/zav_big_0.45.inst.cfg similarity index 85% rename from resources/variants/zav_big_0.45.inst.cfg rename to resources/variants/zav/zav_big_0.45.inst.cfg index dbee670deb..66fe37f522 100644 --- a/resources/variants/zav_big_0.45.inst.cfg +++ b/resources/variants/zav/zav_big_0.45.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.45mm_ZAV_Nozzle -version = 4 definition = zav_big +name = 0.45mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.45 + diff --git a/resources/variants/zav_big_0.50.inst.cfg b/resources/variants/zav/zav_big_0.50.inst.cfg similarity index 85% rename from resources/variants/zav_big_0.50.inst.cfg rename to resources/variants/zav/zav_big_0.50.inst.cfg index 9bd2b4d00c..3846e8e920 100644 --- a/resources/variants/zav_big_0.50.inst.cfg +++ b/resources/variants/zav/zav_big_0.50.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.50mm_ZAV_Nozzle -version = 4 definition = zav_big +name = 0.50mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/zav_big_0.60.inst.cfg b/resources/variants/zav/zav_big_0.60.inst.cfg similarity index 85% rename from resources/variants/zav_big_0.60.inst.cfg rename to resources/variants/zav/zav_big_0.60.inst.cfg index fed52a95de..49562b52de 100644 --- a/resources/variants/zav_big_0.60.inst.cfg +++ b/resources/variants/zav/zav_big_0.60.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.60mm_ZAV_Nozzle -version = 4 definition = zav_big +name = 0.60mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/zav_big_0.80.inst.cfg b/resources/variants/zav/zav_big_0.80.inst.cfg similarity index 85% rename from resources/variants/zav_big_0.80.inst.cfg rename to resources/variants/zav/zav_big_0.80.inst.cfg index 79f1c96b81..c8f61e8645 100644 --- a/resources/variants/zav_big_0.80.inst.cfg +++ b/resources/variants/zav/zav_big_0.80.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.80mm_ZAV_Nozzle -version = 4 definition = zav_big +name = 0.80mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/zav_big_1.00.inst.cfg b/resources/variants/zav/zav_big_1.00.inst.cfg similarity index 85% rename from resources/variants/zav_big_1.00.inst.cfg rename to resources/variants/zav/zav_big_1.00.inst.cfg index 54a6ced552..e4a11282b8 100644 --- a/resources/variants/zav_big_1.00.inst.cfg +++ b/resources/variants/zav/zav_big_1.00.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 1.00mm_ZAV_Nozzle -version = 4 definition = zav_big +name = 1.00mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/zav_bigplus_0.20.inst.cfg b/resources/variants/zav/zav_bigplus_0.20.inst.cfg similarity index 85% rename from resources/variants/zav_bigplus_0.20.inst.cfg rename to resources/variants/zav/zav_bigplus_0.20.inst.cfg index 87f2b80ce3..6466b0a7a3 100644 --- a/resources/variants/zav_bigplus_0.20.inst.cfg +++ b/resources/variants/zav/zav_bigplus_0.20.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.20mm_ZAV_Nozzle -version = 4 definition = zav_bigplus +name = 0.20mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/zav_bigplus_0.25.inst.cfg b/resources/variants/zav/zav_bigplus_0.25.inst.cfg similarity index 85% rename from resources/variants/zav_bigplus_0.25.inst.cfg rename to resources/variants/zav/zav_bigplus_0.25.inst.cfg index b4998e45e2..79769b52f2 100644 --- a/resources/variants/zav_bigplus_0.25.inst.cfg +++ b/resources/variants/zav/zav_bigplus_0.25.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.25mm_ZAV_Nozzle -version = 4 definition = zav_bigplus +name = 0.25mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.25 + diff --git a/resources/variants/zav_bigplus_0.30.inst.cfg b/resources/variants/zav/zav_bigplus_0.30.inst.cfg similarity index 85% rename from resources/variants/zav_bigplus_0.30.inst.cfg rename to resources/variants/zav/zav_bigplus_0.30.inst.cfg index 5be877da9e..9044961e37 100644 --- a/resources/variants/zav_bigplus_0.30.inst.cfg +++ b/resources/variants/zav/zav_bigplus_0.30.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.30mm_ZAV_Nozzle -version = 4 definition = zav_bigplus +name = 0.30mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/zav_bigplus_0.35.inst.cfg b/resources/variants/zav/zav_bigplus_0.35.inst.cfg similarity index 85% rename from resources/variants/zav_bigplus_0.35.inst.cfg rename to resources/variants/zav/zav_bigplus_0.35.inst.cfg index 0cd82bebca..80f51b6416 100644 --- a/resources/variants/zav_bigplus_0.35.inst.cfg +++ b/resources/variants/zav/zav_bigplus_0.35.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.35mm_ZAV_Nozzle -version = 4 definition = zav_bigplus +name = 0.35mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.35 + diff --git a/resources/variants/zav_bigplus_0.40.inst.cfg b/resources/variants/zav/zav_bigplus_0.40.inst.cfg similarity index 85% rename from resources/variants/zav_bigplus_0.40.inst.cfg rename to resources/variants/zav/zav_bigplus_0.40.inst.cfg index e2f295d539..b7b5d47908 100644 --- a/resources/variants/zav_bigplus_0.40.inst.cfg +++ b/resources/variants/zav/zav_bigplus_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.40mm_ZAV_Nozzle -version = 4 definition = zav_bigplus +name = 0.40mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/zav_bigplus_0.45.inst.cfg b/resources/variants/zav/zav_bigplus_0.45.inst.cfg similarity index 85% rename from resources/variants/zav_bigplus_0.45.inst.cfg rename to resources/variants/zav/zav_bigplus_0.45.inst.cfg index 165b362a8e..3b36e003f0 100644 --- a/resources/variants/zav_bigplus_0.45.inst.cfg +++ b/resources/variants/zav/zav_bigplus_0.45.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.45mm_ZAV_Nozzle -version = 4 definition = zav_bigplus +name = 0.45mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.45 + diff --git a/resources/variants/zav_bigplus_0.50.inst.cfg b/resources/variants/zav/zav_bigplus_0.50.inst.cfg similarity index 85% rename from resources/variants/zav_bigplus_0.50.inst.cfg rename to resources/variants/zav/zav_bigplus_0.50.inst.cfg index 7a06e8195a..889352f035 100644 --- a/resources/variants/zav_bigplus_0.50.inst.cfg +++ b/resources/variants/zav/zav_bigplus_0.50.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.50mm_ZAV_Nozzle -version = 4 definition = zav_bigplus +name = 0.50mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/zav_bigplus_0.60.inst.cfg b/resources/variants/zav/zav_bigplus_0.60.inst.cfg similarity index 85% rename from resources/variants/zav_bigplus_0.60.inst.cfg rename to resources/variants/zav/zav_bigplus_0.60.inst.cfg index c83f35cf0c..038030c675 100644 --- a/resources/variants/zav_bigplus_0.60.inst.cfg +++ b/resources/variants/zav/zav_bigplus_0.60.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.60mm_ZAV_Nozzle -version = 4 definition = zav_bigplus +name = 0.60mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/zav_bigplus_0.80.inst.cfg b/resources/variants/zav/zav_bigplus_0.80.inst.cfg similarity index 85% rename from resources/variants/zav_bigplus_0.80.inst.cfg rename to resources/variants/zav/zav_bigplus_0.80.inst.cfg index 8d7e49f17b..a95a9ce28d 100644 --- a/resources/variants/zav_bigplus_0.80.inst.cfg +++ b/resources/variants/zav/zav_bigplus_0.80.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.80mm_ZAV_Nozzle -version = 4 definition = zav_bigplus +name = 0.80mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/zav_bigplus_1.00.inst.cfg b/resources/variants/zav/zav_bigplus_1.00.inst.cfg similarity index 85% rename from resources/variants/zav_bigplus_1.00.inst.cfg rename to resources/variants/zav/zav_bigplus_1.00.inst.cfg index 4887b9d30e..bf3cef169c 100644 --- a/resources/variants/zav_bigplus_1.00.inst.cfg +++ b/resources/variants/zav/zav_bigplus_1.00.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 1.00mm_ZAV_Nozzle -version = 4 definition = zav_bigplus +name = 1.00mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/zav_l_0.20.inst.cfg b/resources/variants/zav/zav_l_0.20.inst.cfg similarity index 85% rename from resources/variants/zav_l_0.20.inst.cfg rename to resources/variants/zav/zav_l_0.20.inst.cfg index bf5f664a62..2b92a5da70 100644 --- a/resources/variants/zav_l_0.20.inst.cfg +++ b/resources/variants/zav/zav_l_0.20.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.20mm_ZAV_Nozzle -version = 4 definition = zav_l +name = 0.20mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/zav_l_0.25.inst.cfg b/resources/variants/zav/zav_l_0.25.inst.cfg similarity index 85% rename from resources/variants/zav_l_0.25.inst.cfg rename to resources/variants/zav/zav_l_0.25.inst.cfg index c77151f211..8c0b0de6c8 100644 --- a/resources/variants/zav_l_0.25.inst.cfg +++ b/resources/variants/zav/zav_l_0.25.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.25mm_ZAV_Nozzle -version = 4 definition = zav_l +name = 0.25mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.25 + diff --git a/resources/variants/zav_l_0.30.inst.cfg b/resources/variants/zav/zav_l_0.30.inst.cfg similarity index 85% rename from resources/variants/zav_l_0.30.inst.cfg rename to resources/variants/zav/zav_l_0.30.inst.cfg index ca04f061f5..e56edee89a 100644 --- a/resources/variants/zav_l_0.30.inst.cfg +++ b/resources/variants/zav/zav_l_0.30.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.30mm_ZAV_Nozzle -version = 4 definition = zav_l +name = 0.30mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/zav_l_0.35.inst.cfg b/resources/variants/zav/zav_l_0.35.inst.cfg similarity index 85% rename from resources/variants/zav_l_0.35.inst.cfg rename to resources/variants/zav/zav_l_0.35.inst.cfg index 603c5e2a2e..b1c54fabc6 100644 --- a/resources/variants/zav_l_0.35.inst.cfg +++ b/resources/variants/zav/zav_l_0.35.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.35mm_ZAV_Nozzle -version = 4 definition = zav_l +name = 0.35mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.35 + diff --git a/resources/variants/zav_l_0.40.inst.cfg b/resources/variants/zav/zav_l_0.40.inst.cfg similarity index 85% rename from resources/variants/zav_l_0.40.inst.cfg rename to resources/variants/zav/zav_l_0.40.inst.cfg index 8a554e3fd8..fb0f7e0c68 100644 --- a/resources/variants/zav_l_0.40.inst.cfg +++ b/resources/variants/zav/zav_l_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.40mm_ZAV_Nozzle -version = 4 definition = zav_l +name = 0.40mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/zav_l_0.45.inst.cfg b/resources/variants/zav/zav_l_0.45.inst.cfg similarity index 85% rename from resources/variants/zav_l_0.45.inst.cfg rename to resources/variants/zav/zav_l_0.45.inst.cfg index 6a1b88ae7a..d389239b15 100644 --- a/resources/variants/zav_l_0.45.inst.cfg +++ b/resources/variants/zav/zav_l_0.45.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.45mm_ZAV_Nozzle -version = 4 definition = zav_l +name = 0.45mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.45 + diff --git a/resources/variants/zav_l_0.50.inst.cfg b/resources/variants/zav/zav_l_0.50.inst.cfg similarity index 85% rename from resources/variants/zav_l_0.50.inst.cfg rename to resources/variants/zav/zav_l_0.50.inst.cfg index 183b1c71a4..d7deee7978 100644 --- a/resources/variants/zav_l_0.50.inst.cfg +++ b/resources/variants/zav/zav_l_0.50.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.50mm_ZAV_Nozzle -version = 4 definition = zav_l +name = 0.50mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/zav_l_0.60.inst.cfg b/resources/variants/zav/zav_l_0.60.inst.cfg similarity index 85% rename from resources/variants/zav_l_0.60.inst.cfg rename to resources/variants/zav/zav_l_0.60.inst.cfg index 96d9335d0f..22e1baae7e 100644 --- a/resources/variants/zav_l_0.60.inst.cfg +++ b/resources/variants/zav/zav_l_0.60.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.60mm_ZAV_Nozzle -version = 4 definition = zav_l +name = 0.60mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/zav_l_0.80.inst.cfg b/resources/variants/zav/zav_l_0.80.inst.cfg similarity index 85% rename from resources/variants/zav_l_0.80.inst.cfg rename to resources/variants/zav/zav_l_0.80.inst.cfg index ee863e81c6..4cfe8be823 100644 --- a/resources/variants/zav_l_0.80.inst.cfg +++ b/resources/variants/zav/zav_l_0.80.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.80mm_ZAV_Nozzle -version = 4 definition = zav_l +name = 0.80mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/zav_l_1.00.inst.cfg b/resources/variants/zav/zav_l_1.00.inst.cfg similarity index 85% rename from resources/variants/zav_l_1.00.inst.cfg rename to resources/variants/zav/zav_l_1.00.inst.cfg index ad5f7a1357..b761f5044c 100644 --- a/resources/variants/zav_l_1.00.inst.cfg +++ b/resources/variants/zav/zav_l_1.00.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 1.00mm_ZAV_Nozzle -version = 4 definition = zav_l +name = 1.00mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/zav_max_0.20.inst.cfg b/resources/variants/zav/zav_max_0.20.inst.cfg similarity index 85% rename from resources/variants/zav_max_0.20.inst.cfg rename to resources/variants/zav/zav_max_0.20.inst.cfg index 2def0d756a..b1dd7a65ff 100644 --- a/resources/variants/zav_max_0.20.inst.cfg +++ b/resources/variants/zav/zav_max_0.20.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.20mm_ZAV_Nozzle -version = 4 definition = zav_max +name = 0.20mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/zav_max_0.25.inst.cfg b/resources/variants/zav/zav_max_0.25.inst.cfg similarity index 85% rename from resources/variants/zav_max_0.25.inst.cfg rename to resources/variants/zav/zav_max_0.25.inst.cfg index ce817e2d64..b2e6de6a5d 100644 --- a/resources/variants/zav_max_0.25.inst.cfg +++ b/resources/variants/zav/zav_max_0.25.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.25mm_ZAV_Nozzle -version = 4 definition = zav_max +name = 0.25mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.25 + diff --git a/resources/variants/zav_max_0.30.inst.cfg b/resources/variants/zav/zav_max_0.30.inst.cfg similarity index 85% rename from resources/variants/zav_max_0.30.inst.cfg rename to resources/variants/zav/zav_max_0.30.inst.cfg index 6813b6b889..113669ef81 100644 --- a/resources/variants/zav_max_0.30.inst.cfg +++ b/resources/variants/zav/zav_max_0.30.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.30mm_ZAV_Nozzle -version = 4 definition = zav_max +name = 0.30mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/zav_max_0.35.inst.cfg b/resources/variants/zav/zav_max_0.35.inst.cfg similarity index 85% rename from resources/variants/zav_max_0.35.inst.cfg rename to resources/variants/zav/zav_max_0.35.inst.cfg index 2f3f59a196..232dfc77fd 100644 --- a/resources/variants/zav_max_0.35.inst.cfg +++ b/resources/variants/zav/zav_max_0.35.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.35mm_ZAV_Nozzle -version = 4 definition = zav_max +name = 0.35mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.35 + diff --git a/resources/variants/zav_max_0.40.inst.cfg b/resources/variants/zav/zav_max_0.40.inst.cfg similarity index 85% rename from resources/variants/zav_max_0.40.inst.cfg rename to resources/variants/zav/zav_max_0.40.inst.cfg index 4a54767b1c..8136bc6f13 100644 --- a/resources/variants/zav_max_0.40.inst.cfg +++ b/resources/variants/zav/zav_max_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.40mm_ZAV_Nozzle -version = 4 definition = zav_max +name = 0.40mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/zav_max_0.45.inst.cfg b/resources/variants/zav/zav_max_0.45.inst.cfg similarity index 85% rename from resources/variants/zav_max_0.45.inst.cfg rename to resources/variants/zav/zav_max_0.45.inst.cfg index 76406ed9cf..620b1a96ac 100644 --- a/resources/variants/zav_max_0.45.inst.cfg +++ b/resources/variants/zav/zav_max_0.45.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.45mm_ZAV_Nozzle -version = 4 definition = zav_max +name = 0.45mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.45 + diff --git a/resources/variants/zav_max_0.50.inst.cfg b/resources/variants/zav/zav_max_0.50.inst.cfg similarity index 85% rename from resources/variants/zav_max_0.50.inst.cfg rename to resources/variants/zav/zav_max_0.50.inst.cfg index 247c25e8be..e2f63c330c 100644 --- a/resources/variants/zav_max_0.50.inst.cfg +++ b/resources/variants/zav/zav_max_0.50.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.50mm_ZAV_Nozzle -version = 4 definition = zav_max +name = 0.50mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/zav_max_0.60.inst.cfg b/resources/variants/zav/zav_max_0.60.inst.cfg similarity index 85% rename from resources/variants/zav_max_0.60.inst.cfg rename to resources/variants/zav/zav_max_0.60.inst.cfg index e9b12b8fed..d990c3b475 100644 --- a/resources/variants/zav_max_0.60.inst.cfg +++ b/resources/variants/zav/zav_max_0.60.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.60mm_ZAV_Nozzle -version = 4 definition = zav_max +name = 0.60mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/zav_max_0.80.inst.cfg b/resources/variants/zav/zav_max_0.80.inst.cfg similarity index 85% rename from resources/variants/zav_max_0.80.inst.cfg rename to resources/variants/zav/zav_max_0.80.inst.cfg index 88c1ff6bc3..2de75d8958 100644 --- a/resources/variants/zav_max_0.80.inst.cfg +++ b/resources/variants/zav/zav_max_0.80.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.80mm_ZAV_Nozzle -version = 4 definition = zav_max +name = 0.80mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/zav_max_1.00.inst.cfg b/resources/variants/zav/zav_max_1.00.inst.cfg similarity index 85% rename from resources/variants/zav_max_1.00.inst.cfg rename to resources/variants/zav/zav_max_1.00.inst.cfg index f23cb6b1e8..8032965271 100644 --- a/resources/variants/zav_max_1.00.inst.cfg +++ b/resources/variants/zav/zav_max_1.00.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 1.00mm_ZAV_Nozzle -version = 4 definition = zav_max +name = 1.00mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/zav_maxpro_0.20.inst.cfg b/resources/variants/zav/zav_maxpro_0.20.inst.cfg similarity index 85% rename from resources/variants/zav_maxpro_0.20.inst.cfg rename to resources/variants/zav/zav_maxpro_0.20.inst.cfg index 1961bcbe70..852031c935 100644 --- a/resources/variants/zav_maxpro_0.20.inst.cfg +++ b/resources/variants/zav/zav_maxpro_0.20.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.20mm_ZAV_Nozzle -version = 4 definition = zav_maxpro +name = 0.20mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/zav_maxpro_0.25.inst.cfg b/resources/variants/zav/zav_maxpro_0.25.inst.cfg similarity index 85% rename from resources/variants/zav_maxpro_0.25.inst.cfg rename to resources/variants/zav/zav_maxpro_0.25.inst.cfg index 523f6ca623..642510e56e 100644 --- a/resources/variants/zav_maxpro_0.25.inst.cfg +++ b/resources/variants/zav/zav_maxpro_0.25.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.25mm_ZAV_Nozzle -version = 4 definition = zav_maxpro +name = 0.25mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.25 + diff --git a/resources/variants/zav_maxpro_0.30.inst.cfg b/resources/variants/zav/zav_maxpro_0.30.inst.cfg similarity index 85% rename from resources/variants/zav_maxpro_0.30.inst.cfg rename to resources/variants/zav/zav_maxpro_0.30.inst.cfg index 2939f48702..7716e80a58 100644 --- a/resources/variants/zav_maxpro_0.30.inst.cfg +++ b/resources/variants/zav/zav_maxpro_0.30.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.30mm_ZAV_Nozzle -version = 4 definition = zav_maxpro +name = 0.30mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/zav_maxpro_0.35.inst.cfg b/resources/variants/zav/zav_maxpro_0.35.inst.cfg similarity index 85% rename from resources/variants/zav_maxpro_0.35.inst.cfg rename to resources/variants/zav/zav_maxpro_0.35.inst.cfg index b7fb8f3b5f..c9d1e16804 100644 --- a/resources/variants/zav_maxpro_0.35.inst.cfg +++ b/resources/variants/zav/zav_maxpro_0.35.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.35mm_ZAV_Nozzle -version = 4 definition = zav_maxpro +name = 0.35mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.35 + diff --git a/resources/variants/zav_maxpro_0.40.inst.cfg b/resources/variants/zav/zav_maxpro_0.40.inst.cfg similarity index 85% rename from resources/variants/zav_maxpro_0.40.inst.cfg rename to resources/variants/zav/zav_maxpro_0.40.inst.cfg index 069b2898d6..a5ae2ca885 100644 --- a/resources/variants/zav_maxpro_0.40.inst.cfg +++ b/resources/variants/zav/zav_maxpro_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.40mm_ZAV_Nozzle -version = 4 definition = zav_maxpro +name = 0.40mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/zav_maxpro_0.45.inst.cfg b/resources/variants/zav/zav_maxpro_0.45.inst.cfg similarity index 85% rename from resources/variants/zav_maxpro_0.45.inst.cfg rename to resources/variants/zav/zav_maxpro_0.45.inst.cfg index c9a21963d3..bc00518ed1 100644 --- a/resources/variants/zav_maxpro_0.45.inst.cfg +++ b/resources/variants/zav/zav_maxpro_0.45.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.45mm_ZAV_Nozzle -version = 4 definition = zav_maxpro +name = 0.45mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.45 + diff --git a/resources/variants/zav_maxpro_0.50.inst.cfg b/resources/variants/zav/zav_maxpro_0.50.inst.cfg similarity index 85% rename from resources/variants/zav_maxpro_0.50.inst.cfg rename to resources/variants/zav/zav_maxpro_0.50.inst.cfg index fc3b0e7fb0..892a2c9fda 100644 --- a/resources/variants/zav_maxpro_0.50.inst.cfg +++ b/resources/variants/zav/zav_maxpro_0.50.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.50mm_ZAV_Nozzle -version = 4 definition = zav_maxpro +name = 0.50mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/zav_maxpro_0.60.inst.cfg b/resources/variants/zav/zav_maxpro_0.60.inst.cfg similarity index 85% rename from resources/variants/zav_maxpro_0.60.inst.cfg rename to resources/variants/zav/zav_maxpro_0.60.inst.cfg index 2b53d56ed1..3502743544 100644 --- a/resources/variants/zav_maxpro_0.60.inst.cfg +++ b/resources/variants/zav/zav_maxpro_0.60.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.60mm_ZAV_Nozzle -version = 4 definition = zav_maxpro +name = 0.60mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/zav_maxpro_0.80.inst.cfg b/resources/variants/zav/zav_maxpro_0.80.inst.cfg similarity index 85% rename from resources/variants/zav_maxpro_0.80.inst.cfg rename to resources/variants/zav/zav_maxpro_0.80.inst.cfg index 5d8ef3c6d2..4c72765b3c 100644 --- a/resources/variants/zav_maxpro_0.80.inst.cfg +++ b/resources/variants/zav/zav_maxpro_0.80.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.80mm_ZAV_Nozzle -version = 4 definition = zav_maxpro +name = 0.80mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/zav_maxpro_1.00.inst.cfg b/resources/variants/zav/zav_maxpro_1.00.inst.cfg similarity index 85% rename from resources/variants/zav_maxpro_1.00.inst.cfg rename to resources/variants/zav/zav_maxpro_1.00.inst.cfg index 225ab963ce..8ab7dbf0e9 100644 --- a/resources/variants/zav_maxpro_1.00.inst.cfg +++ b/resources/variants/zav/zav_maxpro_1.00.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 1.00mm_ZAV_Nozzle -version = 4 definition = zav_maxpro +name = 1.00mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + diff --git a/resources/variants/zav_mini_0.20.inst.cfg b/resources/variants/zav/zav_mini_0.20.inst.cfg similarity index 85% rename from resources/variants/zav_mini_0.20.inst.cfg rename to resources/variants/zav/zav_mini_0.20.inst.cfg index cb0cc6ac47..e627b87256 100644 --- a/resources/variants/zav_mini_0.20.inst.cfg +++ b/resources/variants/zav/zav_mini_0.20.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.20mm_ZAV_Nozzle -version = 4 definition = zav_mini +name = 0.20mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/zav_mini_0.25.inst.cfg b/resources/variants/zav/zav_mini_0.25.inst.cfg similarity index 85% rename from resources/variants/zav_mini_0.25.inst.cfg rename to resources/variants/zav/zav_mini_0.25.inst.cfg index c3d9f494eb..df000840ea 100644 --- a/resources/variants/zav_mini_0.25.inst.cfg +++ b/resources/variants/zav/zav_mini_0.25.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.25mm_ZAV_Nozzle -version = 4 definition = zav_mini +name = 0.25mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.25 + diff --git a/resources/variants/zav_mini_0.30.inst.cfg b/resources/variants/zav/zav_mini_0.30.inst.cfg similarity index 85% rename from resources/variants/zav_mini_0.30.inst.cfg rename to resources/variants/zav/zav_mini_0.30.inst.cfg index 5c0ff4d031..d59bbf10df 100644 --- a/resources/variants/zav_mini_0.30.inst.cfg +++ b/resources/variants/zav/zav_mini_0.30.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.30mm_ZAV_Nozzle -version = 4 definition = zav_mini +name = 0.30mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/zav_mini_0.35.inst.cfg b/resources/variants/zav/zav_mini_0.35.inst.cfg similarity index 85% rename from resources/variants/zav_mini_0.35.inst.cfg rename to resources/variants/zav/zav_mini_0.35.inst.cfg index 6b8e5517c9..f25ce3f819 100644 --- a/resources/variants/zav_mini_0.35.inst.cfg +++ b/resources/variants/zav/zav_mini_0.35.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.35mm_ZAV_Nozzle -version = 4 definition = zav_mini +name = 0.35mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.35 + diff --git a/resources/variants/zav_mini_0.40.inst.cfg b/resources/variants/zav/zav_mini_0.40.inst.cfg similarity index 85% rename from resources/variants/zav_mini_0.40.inst.cfg rename to resources/variants/zav/zav_mini_0.40.inst.cfg index e2e8af1337..3db6cace44 100644 --- a/resources/variants/zav_mini_0.40.inst.cfg +++ b/resources/variants/zav/zav_mini_0.40.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.40mm_ZAV_Nozzle -version = 4 definition = zav_mini +name = 0.40mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/zav_mini_0.45.inst.cfg b/resources/variants/zav/zav_mini_0.45.inst.cfg similarity index 85% rename from resources/variants/zav_mini_0.45.inst.cfg rename to resources/variants/zav/zav_mini_0.45.inst.cfg index bdf446f71e..2efd8c25b0 100644 --- a/resources/variants/zav_mini_0.45.inst.cfg +++ b/resources/variants/zav/zav_mini_0.45.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.45mm_ZAV_Nozzle -version = 4 definition = zav_mini +name = 0.45mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.45 + diff --git a/resources/variants/zav_mini_0.50.inst.cfg b/resources/variants/zav/zav_mini_0.50.inst.cfg similarity index 85% rename from resources/variants/zav_mini_0.50.inst.cfg rename to resources/variants/zav/zav_mini_0.50.inst.cfg index a4ec5593cc..bd0fa776c6 100644 --- a/resources/variants/zav_mini_0.50.inst.cfg +++ b/resources/variants/zav/zav_mini_0.50.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.50mm_ZAV_Nozzle -version = 4 definition = zav_mini +name = 0.50mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/zav_mini_0.60.inst.cfg b/resources/variants/zav/zav_mini_0.60.inst.cfg similarity index 85% rename from resources/variants/zav_mini_0.60.inst.cfg rename to resources/variants/zav/zav_mini_0.60.inst.cfg index ca9424d776..f7d3a766f4 100644 --- a/resources/variants/zav_mini_0.60.inst.cfg +++ b/resources/variants/zav/zav_mini_0.60.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.60mm_ZAV_Nozzle -version = 4 definition = zav_mini +name = 0.60mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/zav_mini_0.80.inst.cfg b/resources/variants/zav/zav_mini_0.80.inst.cfg similarity index 85% rename from resources/variants/zav_mini_0.80.inst.cfg rename to resources/variants/zav/zav_mini_0.80.inst.cfg index 90ac3e2422..87dc9847b5 100644 --- a/resources/variants/zav_mini_0.80.inst.cfg +++ b/resources/variants/zav/zav_mini_0.80.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 0.80mm_ZAV_Nozzle -version = 4 definition = zav_mini +name = 0.80mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/zav_mini_1.00.inst.cfg b/resources/variants/zav/zav_mini_1.00.inst.cfg similarity index 85% rename from resources/variants/zav_mini_1.00.inst.cfg rename to resources/variants/zav/zav_mini_1.00.inst.cfg index 89e7617e95..a4a461eca2 100644 --- a/resources/variants/zav_mini_1.00.inst.cfg +++ b/resources/variants/zav/zav_mini_1.00.inst.cfg @@ -1,12 +1,13 @@ [general] -name = 1.00mm_ZAV_Nozzle -version = 4 definition = zav_mini +name = 1.00mm_ZAV_Nozzle +version = 4 [metadata] +hardware_type = nozzle setting_version = 20 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 +